« back to all changes in this revision
Viewing changes to po/es.po
- browse files at revision 6468.5.2
- compare with another revision
- compare with revision 5401
- download diff
- download tarball
- view history from revision 6468.5.2
- Committer: Vincent Ladeuil
- Date: 2012-03-08 18:30:33 UTC
- mfrom: (6487 +trunk)
- mto: This revision was merged to the branch mainline in revision 6488.
- Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts
- files added:
- po/ar.po
- files modified:
- bzrlib/branch.py
added
removed
po/es.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
"Language-Team: Spanish <es@li.org>\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:17+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
20
21
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
26
msgid "Unstacking"
27
27
msgstr "Desapilando"
28
28
29
#: bzrlib/branch.py:3183
29
#: bzrlib/branch.py:3205
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "Subido a la revisión %d."
33
33
34
#: bzrlib/branch.py:3185
34
#: bzrlib/branch.py:3207
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] "%d etiqueta actualizada"
39
39
msgstr[1] "%d etiquetas actualizadas"
40
40
41
#: bzrlib/branch.py:3188
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
43
msgstr "No hay revisiones o etiquetas para subir."
44
44
45
#: bzrlib/branch.py:3190
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
47
msgstr "No hay revisiones para subir."
48
48
49
#: bzrlib/branch.py:3210
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr "rama comprobada {0} formato {1}"
52
52
53
#: bzrlib/branch.py:3213
53
#: bzrlib/branch.py:3235
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr "error encontrado: %s"
57
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr "Ignorando archivos fuera de la vista. La vista es %s"
62
62
63
#: bzrlib/builtins.py:130
63
#: bzrlib/builtins.py:218
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
67
68
#: bzrlib/builtins.py:215
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
70
msgstr "Mostrar resumen de estado."
71
71
72
#: bzrlib/builtins.py:217
72
#: bzrlib/builtins.py:305
73
73
msgid ""
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
77
77
"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
78
78
"agrupados por estado. Los estados posibles son:"
79
79
80
#: bzrlib/builtins.py:220
80
#: bzrlib/builtins.py:308
81
81
msgid ""
82
82
"added\n"
83
83
" Versioned in the working copy but not in the previous revision."
85
85
"añadido\n"
86
86
" Versionado en la copia de trabajo pero no en la revisión anterior."
87
87
88
#: bzrlib/builtins.py:223
88
#: bzrlib/builtins.py:311
89
89
msgid ""
90
90
"removed\n"
91
91
" Versioned in the previous revision but removed or deleted\n"
95
95
" Versionado en la revisión anterior pero borrado o eliminado\n"
96
96
" en la copia de trabajo."
97
97
98
#: bzrlib/builtins.py:227
98
#: bzrlib/builtins.py:315
99
99
msgid ""
100
100
"renamed\n"
101
101
" Path of this file changed from the previous revision;\n"
107
107
" el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
108
108
" directorio padre ha sido renombrado."
109
109
110
#: bzrlib/builtins.py:232
110
#: bzrlib/builtins.py:320
111
111
msgid ""
112
112
"modified\n"
113
113
" Text has changed since the previous revision."
115
115
"modificado\n"
116
116
" El texto ha cambiado desde una revisión previa."
117
117
118
#: bzrlib/builtins.py:235
118
#: bzrlib/builtins.py:323
119
119
msgid ""
120
120
"kind changed\n"
121
121
" File kind has been changed (e.g. from file to directory)."
123
123
"tipo cambiado\n"
124
124
" El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
125
125
126
#: bzrlib/builtins.py:238
126
#: bzrlib/builtins.py:326
127
127
msgid ""
128
128
"unknown\n"
129
129
" Not versioned and not matching an ignore pattern."
131
131
"desconocido\n"
132
132
" Ni se ha versionado ni se ha encontrado un patrón ignorado."
133
133
134
#: bzrlib/builtins.py:241
134
#: bzrlib/builtins.py:329
135
135
msgid ""
136
136
"Additionally for directories, symlinks and files with a changed\n"
137
137
"executable bit, Bazaar indicates their type using a trailing\n"
144
144
"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
145
145
"desactivadas usando la opción «--no-classify»."
146
146
147
#: bzrlib/builtins.py:246
147
#: bzrlib/builtins.py:334
148
148
msgid ""
149
149
"To see ignored files use 'bzr ignored'. For details on the\n"
150
150
"changes to file texts, use 'bzr diff'."
152
152
"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
153
153
"cambios de textos en los archivos, use «bzr diff»."
154
154
155
#: bzrlib/builtins.py:249
155
#: bzrlib/builtins.py:337
156
156
msgid ""
157
157
"Note that --short or -S gives status flags for each item, similar\n"
158
158
"to Subversion's status command. To get output similar to svn -q,\n"
159
159
"use bzr status -SV."
160
160
msgstr ""
161
"Note que --short o -S devuelve indicadores de estado para cada elemento, de "
162
"forma\n"
163
"similar a la orden status de Subversion. Para obtener una salida similar a "
164
"svn -q\n"
165
" use bzr status -SV."
161
166
162
#: bzrlib/builtins.py:253
167
#: bzrlib/builtins.py:341
163
168
msgid ""
164
169
"If no arguments are specified, the status of the entire working\n"
165
170
"directory is shown. Otherwise, only the status of the specified\n"
166
171
"files or directories is reported. If a directory is given, status\n"
167
172
"is reported for everything inside that directory."
168
173
msgstr ""
174
"Si no se indican argumentos, se muestra el estado del directorio de\n"
175
"trabajo completo. De otra forma, solo se informa del estado de los\n"
176
"archivos o directorios indicados. Si se proporciona un directorio, se\n"
177
"informa del estado de todo lo contenido en ese directorio."
169
178
170
#: bzrlib/builtins.py:258
179
#: bzrlib/builtins.py:346
171
180
msgid ""
172
181
"Before merges are committed, the pending merge tip revisions are\n"
173
182
"shown. To see all pending merge revisions, use the -v option.\n"
174
183
"To skip the display of pending merge information altogether, use\n"
175
184
"the no-pending option or specify a file/directory."
176
185
msgstr ""
186
"Antes de que se confirmen las fusiones, se muestran las sugerencias de\n"
187
"fusión de las revisiones. Para ver todas las fusiones pendientes, use la "
188
"opción -v.\n"
189
"Para evitar que se muestre la información de fusiones pendientes del todo, "
190
"use\n"
191
"la opción no-pending o indique un archivo/directorio."
177
192
178
#: bzrlib/builtins.py:263
193
#: bzrlib/builtins.py:351
179
194
msgid ""
180
195
"To compare the working directory to a specific revision, pass a\n"
181
196
"single revision to the revision argument."
182
197
msgstr ""
198
"Para comparar el directorio de trabajo con una revisión concreta, pase una\n"
199
"única revisión como argumento a la revisión."
183
200
184
#: bzrlib/builtins.py:266
201
#: bzrlib/builtins.py:354
185
202
msgid ""
186
203
"To see which files have changed in a specific revision, or between\n"
187
204
"two revisions, pass a revision range to the revision argument.\n"
188
205
"This will produce the same results as calling 'bzr diff --summarize'."
189
206
msgstr ""
207
"Para ver que archivos han cambiado en una revisión concreta, o entre\n"
208
"dos revisiones, pase un rango de revisiones al argumento de la revisión.\n"
209
"Esto producirá los mismos resultados que llamar «bzr diff --summarize»."
190
210
191
#: bzrlib/builtins.py:275
211
#: bzrlib/builtins.py:363
192
212
msgid "Use short status indicators."
193
213
msgstr "Usar indicadores de estado cortos."
194
214
195
#: bzrlib/builtins.py:277
215
#: bzrlib/builtins.py:365
196
216
msgid "Only show versioned files."
197
217
msgstr "Solo mostrar archivos versionados."
198
218
199
#: bzrlib/builtins.py:279
219
#: bzrlib/builtins.py:367
200
220
msgid "Don't show pending merges."
201
221
msgstr "No mostrar fusiones pendientes."
202
222
203
#: bzrlib/builtins.py:282
223
#: bzrlib/builtins.py:370
204
224
msgid "Do not mark object type using indicator."
205
225
msgstr "No marcar tipo de objeto usando indicador."
206
226
207
#: bzrlib/builtins.py:297
227
#: bzrlib/builtins.py:385
208
228
msgid "bzr status --revision takes exactly one or two revision specifiers"
209
229
msgstr ""
210
230
"bzr status --revision toma exactamente uno o dos especificadores de revisión"
211
231
212
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
232
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
213
233
msgid "You can only supply one of revision_id or --revision"
214
234
msgstr "Puede suiministrar solo uno revision_id o --revision"
215
235
216
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
236
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
217
237
msgid "You must supply either --revision or a revision_id"
218
238
msgstr "Puede suiministrar ambos revision_id o --revision"
219
239
220
#: bzrlib/builtins.py:351
240
#: bzrlib/builtins.py:439
221
241
#, python-format
222
242
msgid "Repository %r does not support access to raw revision texts"
223
243
msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
224
244
225
#: bzrlib/builtins.py:362
245
#: bzrlib/builtins.py:450
226
246
msgid "The repository {0} contains no revision {1}."
227
247
msgstr "El repositorio {0} no contiene revisión {1}."
228
248
229
#: bzrlib/builtins.py:369
249
#: bzrlib/builtins.py:457
230
250
msgid "You cannot specify a NULL revision."
231
251
msgstr "No puede especificar una revisión NULL."
232
252
233
#: bzrlib/builtins.py:461
253
#: bzrlib/builtins.py:549
234
254
msgid "Remove the working tree from a given branch/checkout."
235
255
msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
236
256
237
#: bzrlib/builtins.py:463
257
#: bzrlib/builtins.py:551
238
258
msgid ""
239
259
"Since a lightweight checkout is little more than a working tree\n"
240
260
"this will refuse to run against one."
241
261
msgstr ""
262
"Dado que una extracción ligera es poco más que un árbol de trabajo\n"
263
"esto impedirá que se ejecute contra una."
242
264
243
#: bzrlib/builtins.py:466
265
#: bzrlib/builtins.py:554
244
266
msgid "To re-create the working tree, use \"bzr checkout\"."
245
267
msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
246
268
247
#: bzrlib/builtins.py:472
269
#: bzrlib/builtins.py:560
248
270
msgid ""
249
271
"Remove the working tree even if it has uncommitted or shelved changes."
250
272
msgstr ""
273
"Eliminar el árbol de trabajo incluso si tiene cambios no confirmados o "
274
"archivados."
251
275
252
#: bzrlib/builtins.py:486
276
#: bzrlib/builtins.py:574
253
277
msgid "No working tree to remove"
254
278
msgstr "No existe un árbol de trabajo para eliminar"
255
279
256
#: bzrlib/builtins.py:488
280
#: bzrlib/builtins.py:576
257
281
msgid "You cannot remove the working tree of a remote path"
258
282
msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
259
283
260
#: bzrlib/builtins.py:497
284
#: bzrlib/builtins.py:585
261
285
msgid "You cannot remove the working tree from a lightweight checkout"
262
286
msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
263
287
264
#: bzrlib/builtins.py:537
288
#: bzrlib/builtins.py:625
265
289
msgid ""
266
290
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
267
291
"instead. Use \"--force\" if you are sure you want to reset the working tree."
268
292
msgstr ""
293
"El árbol no parece estar corrupto. Probablemente quiera «bzr revert» en su "
294
"lugar. Use «--force» si está seguro de que quiere reiniciar el árbol de "
295
"trabajo."
269
296
270
#: bzrlib/builtins.py:548
297
#: bzrlib/builtins.py:636
271
298
msgid ""
272
299
", the header appears corrupt, try passing -r -1 to set the state to the last "
273
300
"commit"
274
301
msgstr ""
302
", la cabecera parece corrupta, intente pasando -r -1 para establecer el "
303
"estado del último envío"
275
304
276
#: bzrlib/builtins.py:552
305
#: bzrlib/builtins.py:640
277
306
msgid "failed to reset the tree state{0}"
278
307
msgstr "fallo al restablecer el estado{0} del árbol"
279
308
280
#: bzrlib/builtins.py:556
309
#: bzrlib/builtins.py:644
281
310
msgid "Show current revision number."
282
311
msgstr "Mostrar número de revisión actual."
283
312
284
#: bzrlib/builtins.py:558
313
#: bzrlib/builtins.py:646
285
314
msgid "This is equal to the number of revisions on this branch."
286
315
msgstr "Esto es igual al número de revisiones en esta rama."
287
316
288
#: bzrlib/builtins.py:571
317
#: bzrlib/builtins.py:659
289
318
msgid "--tree and --revision can not be used together"
290
319
msgstr "--tree y --revision no se pueden usar juntos"
291
320
292
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
321
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
293
322
msgid "Tags can only be placed on a single revision, not on a range"
294
323
msgstr ""
295
324
"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
296
325
297
#: bzrlib/builtins.py:612
326
#: bzrlib/builtins.py:700
298
327
msgid "Show revno of working tree."
299
328
msgstr "Mostrar número de revisión del árbol de trabajo."
300
329
301
#: bzrlib/builtins.py:660
330
#: bzrlib/builtins.py:748
302
331
msgid "Add specified files or directories."
303
332
msgstr "Añadir archivos especificados o directorios."
304
333
305
#: bzrlib/builtins.py:662
334
#: bzrlib/builtins.py:750
306
335
msgid ""
307
336
"In non-recursive mode, all the named items are added, regardless\n"
308
337
"of whether they were previously ignored. A warning is given if\n"
312
341
"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
313
342
"cualquiera de los archivos nombrados ya está versionado."
314
343
315
#: bzrlib/builtins.py:666
344
#: bzrlib/builtins.py:754
316
345
msgid ""
317
346
"In recursive mode (the default), files are treated the same way\n"
318
347
"but the behaviour for directories is different. Directories that\n"
322
351
"are added. This search proceeds recursively into versioned\n"
323
352
"directories. If no names are given '.' is assumed."
324
353
msgstr ""
354
"En modo recursivo (predeterminado), los archivos se tratan de la misma "
355
"manera\n"
356
"pero el comportamiento para directorios es diferente. Los directorios que\n"
357
"ya han sido versionados no generan un aviso. Todos los directorios,\n"
358
"hayan sido versionados o no, son recorridos buscando archivos o\n"
359
"subdirectorios que no hayan sido versionados o ignorados, y estos\n"
360
"son añadidos. Esta búsqueda procede recursivamente por los directorios\n"
361
"versionados. SI no se indican nombres se asume «.»."
325
362
326
#: bzrlib/builtins.py:674
363
#: bzrlib/builtins.py:762
327
364
msgid ""
328
365
"A warning will be printed when nested trees are encountered,\n"
329
366
"unless they are explicitly ignored."
330
367
msgstr ""
331
368
332
#: bzrlib/builtins.py:677
369
#: bzrlib/builtins.py:765
333
370
msgid ""
334
371
"Therefore simply saying 'bzr add' will version all files that\n"
335
372
"are currently unknown."
337
374
"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
338
375
"desconocidos actualmente."
339
376
340
#: bzrlib/builtins.py:680
377
#: bzrlib/builtins.py:768
341
378
msgid ""
342
379
"Adding a file whose parent directory is not versioned will\n"
343
380
"implicitly add the parent, and so on up to the root. This means\n"
344
381
"you should never need to explicitly add a directory, they'll just\n"
345
382
"get added when you add a file in the directory."
346
383
msgstr ""
384
"Al añadir un archivos cuyo padre no esté versionado añadirá\n"
385
"implícitamente al padre, y así sucesivamente hasta la raíz. Esto\n"
386
"significa que nunca necesitaría añadir explícitamente un directorio,\n"
387
"ya que serán añadidos cuando añada un archivo del directorio."
347
388
348
#: bzrlib/builtins.py:685
389
#: bzrlib/builtins.py:773
349
390
msgid ""
350
391
"--dry-run will show which files would be added, but not actually\n"
351
392
"add them."
353
394
"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
354
395
"añade realmente."
355
396
356
#: bzrlib/builtins.py:688
397
#: bzrlib/builtins.py:776
357
398
msgid ""
358
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
359
400
"It looks up ids trying to find a matching parent directory with the\n"
363
404
"adds as a conflict). It is also useful when merging another project\n"
364
405
"into a subdirectory of this one."
365
406
msgstr ""
407
"--file-ids-from intentará usar el archivo de ids de la ruta proporcionada.\n"
408
"Busca ids intentado encontrar un directorio padre que coincida con el\n"
409
"mismo nombre de archivo, y luego por ruta pura. Esta opción raramente\n"
410
"se necesita pero puede ser útil al añadir el mismo archivo lógico en dos\n"
411
"ramas que se fusionarán posteriormente (sin mostrar las dos adiciones\n"
412
"diferentes como un conflicto). También es útil al fusionar otro proyecto\n"
413
"en un subdirectorio de éste."
366
414
367
#: bzrlib/builtins.py:696
415
#: bzrlib/builtins.py:784
368
416
msgid ""
369
417
"Any files matching patterns in the ignore list will not be added\n"
370
418
"unless they are explicitly mentioned."
373
421
"se añadirá\n"
374
422
"salvo que se mencione explícitamente."
375
423
376
#: bzrlib/builtins.py:699
424
#: bzrlib/builtins.py:787
377
425
msgid ""
378
426
"In recursive mode, files larger than the configuration option \n"
379
427
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
384
432
"omitirán\n"
385
433
"por su tamaño."
386
434
387
#: bzrlib/builtins.py:706
435
#: bzrlib/builtins.py:794
388
436
msgid "Don't recursively add the contents of directories."
389
437
msgstr "No añade de manera recursiva los contenidos de los directorios."
390
438
391
#: bzrlib/builtins.py:712
439
#: bzrlib/builtins.py:800
392
440
msgid "Lookup file ids from this tree."
393
441
msgstr "Buscar id de archivos desde este árbol."
394
442
395
#: bzrlib/builtins.py:748
443
#: bzrlib/builtins.py:836
396
444
msgid "ignored {0} matching \"{1}\"\n"
397
445
msgstr "ignorado {0} coincidente «{1}»\n"
398
446
399
#: bzrlib/builtins.py:753
447
#: bzrlib/builtins.py:841
400
448
msgid "Create a new versioned directory."
401
449
msgstr "Crear un directorio versionado nuevo."
402
450
403
#: bzrlib/builtins.py:755
451
#: bzrlib/builtins.py:843
404
452
msgid "This is equivalent to creating the directory and then adding it."
405
453
msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
406
454
407
#: bzrlib/builtins.py:762
455
#: bzrlib/builtins.py:850
408
456
msgid "No error if existing, make parent directories as needed."
409
457
msgstr ""
410
458
411
#: bzrlib/builtins.py:796
459
#: bzrlib/builtins.py:884
412
460
#, python-format
413
461
msgid "added %s\n"
414
462
msgstr "añadido %s\n"
415
463
416
#: bzrlib/builtins.py:838
464
#: bzrlib/builtins.py:926
417
465
#, python-format
418
466
msgid "invalid kind %r specified"
419
467
msgstr "tipo inválido %r especificado"
420
468
421
#: bzrlib/builtins.py:875
469
#: bzrlib/builtins.py:963
422
470
msgid "Move or rename a file."
423
471
msgstr "Mover o renombrar un archivo."
424
472
425
#: bzrlib/builtins.py:877
473
#: bzrlib/builtins.py:965
426
474
msgid " bzr mv SOURCE... DESTINATION"
427
475
msgstr " bzr mv ORIGEN... DESTINO"
428
476
429
#: bzrlib/builtins.py:879
477
#: bzrlib/builtins.py:967
430
478
msgid ""
431
479
"If the last argument is a versioned directory, all the other names\n"
432
480
"are moved into it. Otherwise, there must be exactly two arguments\n"
433
481
"and the file is changed to a new name."
434
482
msgstr ""
483
"Si el último argumento es un directorio versionado, todos los demás nombres\n"
484
"se moverán a él. De otra forma, deben haber exactamente dos argumentos\n"
485
"y el archivo se cambia al nuevo nombre."
435
486
436
#: bzrlib/builtins.py:883
487
#: bzrlib/builtins.py:971
437
488
msgid ""
438
489
"If OLDNAME does not exist on the filesystem but is versioned and\n"
439
490
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
441
492
"its internal inventory to reflect that change.\n"
442
493
"The same is valid when moving many SOURCE files to a DESTINATION."
443
494
msgstr ""
495
"Si NOMBREANTIGUO no existe en el sistema de archivos pero esta versionado y\n"
496
"NOMBRENUEVO existe en el sistema de archivos pero no está versionado, mv\n"
497
"asume que el archivo se ha movido manualmente y sólo actualiza su\n"
498
"inventario interno para reflejar ese cambio.\n"
499
"Lo mismo es válido cuando se mueven muchos archivos ORIGEN a un DESTINO."
444
500
445
#: bzrlib/builtins.py:889
501
#: bzrlib/builtins.py:977
446
502
msgid "Files cannot be moved between branches."
447
503
msgstr "Los archivos no se pueden mover entre ramas."
448
504
449
#: bzrlib/builtins.py:896
505
#: bzrlib/builtins.py:984
450
506
msgid ""
451
507
"Move only the bzr identifier of the file, because the file has already been "
452
508
"moved."
453
509
msgstr ""
510
"Mover solo el identificador bzr del archivo, porque el archivo ya ha sido "
511
"movido."
454
512
455
#: bzrlib/builtins.py:898
513
#: bzrlib/builtins.py:986
456
514
msgid "Automatically guess renames."
457
515
msgstr "Adivinar automáticamente rel renombrado."
458
516
459
#: bzrlib/builtins.py:899
517
#: bzrlib/builtins.py:987
460
518
msgid "Avoid making changes when guessing renames."
461
519
msgstr "Evitar hacer cambios cunado se adivina el renombrado."
462
520
463
#: bzrlib/builtins.py:908
521
#: bzrlib/builtins.py:996
464
522
msgid "--dry-run requires --auto."
465
523
msgstr "--dry-run requiere --auto."
466
524
467
#: bzrlib/builtins.py:912
525
#: bzrlib/builtins.py:1000
468
526
msgid "missing file argument"
469
527
msgstr "falta el argumento de archivo"
470
528
471
#: bzrlib/builtins.py:916
529
#: bzrlib/builtins.py:1004
472
530
msgid "can not move root of branch"
473
531
msgstr "no se puede mover la raíz de la rama"
474
532
475
#: bzrlib/builtins.py:922
533
#: bzrlib/builtins.py:1010
476
534
msgid "Only one path may be specified to --auto."
477
535
msgstr "Solo se puede especificar una ruta a --auto"
478
536
479
#: bzrlib/builtins.py:925
537
#: bzrlib/builtins.py:1013
480
538
msgid "--after cannot be specified with --auto."
481
539
msgstr "--after no se puede especificar con --auto."
482
540
483
#: bzrlib/builtins.py:962
541
#: bzrlib/builtins.py:1050
484
542
msgid "to mv multiple files the destination must be a versioned directory"
485
543
msgstr ""
486
544
"para hacer mv a múltiples archivos el destino debe ser un directorio "
487
545
"versionado"
488
546
489
#: bzrlib/builtins.py:1014
547
#: bzrlib/builtins.py:1102
490
548
msgid "Turn this branch into a mirror of another branch."
491
549
msgstr "Cambiar esta rama a una réplica de otra rama."
492
550
493
#: bzrlib/builtins.py:1016
551
#: bzrlib/builtins.py:1104
494
552
msgid ""
495
553
"By default, this command only works on branches that have not diverged.\n"
496
554
"Branches are considered diverged if the destination branch's most recent \n"
497
555
"commit is one that has not been merged (directly or indirectly) into the \n"
498
556
"parent."
499
557
msgstr ""
558
"Predeterminado, esta orden solo funciona en ramas que no han divergido.\n"
559
"Las ramas se consideran divergidas si la confirmación más reciente de la \n"
560
"rama destino es una que no ha sido fusionada (directa o indirectamente) \n"
561
"en el padre."
500
562
501
#: bzrlib/builtins.py:1021
563
#: bzrlib/builtins.py:1109
502
564
msgid ""
503
565
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
504
566
"from one into the other. Once one branch has merged, the other should\n"
505
567
"be able to pull it again."
506
568
msgstr ""
569
"Si las ramas han divergido, puede usar «bzr merge» para integrar los "
570
"cambios\n"
571
"de una en la otra. Una vez que una rama se ha fusionado, la otra debería\n"
572
"ser capaz de extraer de nuevo."
507
573
508
#: bzrlib/builtins.py:1025
574
#: bzrlib/builtins.py:1113
509
575
msgid ""
510
576
"If you want to replace your local changes and just want your branch to\n"
511
577
"match the remote one, use pull --overwrite. This will work even if the two\n"
512
578
"branches have diverged."
513
579
msgstr ""
580
"Si quiere reemplazar su cambios locales y solo quiere que su rama\n"
581
"coincida con la remota, use pull --overwrite. Esto funcionará incluso\n"
582
"si las dos ramas han divergido."
514
583
515
#: bzrlib/builtins.py:1029
584
#: bzrlib/builtins.py:1117
516
585
msgid ""
517
586
"If there is no default location set, the first pull will set it (use\n"
518
587
"--no-remember to avoid setting it). After that, you can omit the\n"
519
588
"location to use the default. To change the default, use --remember. The\n"
520
589
"value will only be saved if the remote location can be accessed."
521
590
msgstr ""
591
"Si no hay ubicación predeterminada establecida, la primera extracción la \n"
592
"establecerá (use --no-remember para evitarlo). Después puede omitir la \n"
593
"ubicación para usar la predeterminada. Para cambiarla, use --remember. El\n"
594
"valor solo se guardará si la ubicación remota es accesible."
522
595
523
#: bzrlib/builtins.py:1034
596
#: bzrlib/builtins.py:1122
524
597
msgid ""
525
598
"The --verbose option will display the revisions pulled using the log_format\n"
526
599
"configuration option. You can use a different format by overriding it with\n"
527
600
"-Olog_format=<other_format>."
528
601
msgstr ""
602
"La opción --verbose mostrará las revisiones extraídas usando la opción de\n"
603
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
604
"con -Olog_format=<otro_formato>."
529
605
530
#: bzrlib/builtins.py:1038
606
#: bzrlib/builtins.py:1126
531
607
msgid ""
532
608
"Note: The location can be specified either in the form of a branch,\n"
533
609
"or in the form of a path to a file containing a merge directive generated\n"
534
610
"with bzr send."
535
611
msgstr ""
612
"Nota: la ubicación se puede indicar bien en forma de una rama,\n"
613
"o en forma de una ruta a un archivo conteniendo una directiva de\n"
614
"fusión generada con bzr send."
536
615
537
#: bzrlib/builtins.py:1046
616
#: bzrlib/builtins.py:1134
538
617
msgid "Show logs of pulled revisions."
539
618
msgstr "Mostrar registros de revisiones extraídas."
540
619
541
#: bzrlib/builtins.py:1048
620
#: bzrlib/builtins.py:1136
542
621
msgid ""
543
622
"Branch to pull into, rather than the one containing the working directory."
544
623
msgstr ""
624
"Rama en la que extraer, en lugar de la que contiene el directorio de trabajo."
545
625
546
#: bzrlib/builtins.py:1051
626
#: bzrlib/builtins.py:1139
547
627
msgid ""
548
628
"Perform a local pull in a bound branch. Local pulls are not applied to the "
549
629
"master branch."
550
630
msgstr ""
631
"Efectuar una extracción local en una rama ligada. Las extracciones locales "
632
"no se aplican a la rama maestra."
551
633
552
#: bzrlib/builtins.py:1080
634
#: bzrlib/builtins.py:1168
553
635
msgid "Need working tree for --show-base."
554
636
msgstr "Se necesita árbol de trabajo para --show-base."
555
637
556
#: bzrlib/builtins.py:1096
638
#: bzrlib/builtins.py:1184
557
639
msgid "No pull location known or specified."
558
msgstr ""
640
msgstr "Ubicación de extración no conocida ni indicada."
559
641
560
#: bzrlib/builtins.py:1102
642
#: bzrlib/builtins.py:1190
561
643
#, python-format
562
644
msgid "Using saved parent location: %s\n"
563
645
msgstr "Usar ubicaciones padre guardadas: %s\n"
564
646
565
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
647
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
566
648
msgid "Cannot use -r with merge directives or bundles"
567
msgstr ""
649
msgstr "No se puede usar -r con directivas de fusión o paquetes"
568
650
569
#: bzrlib/builtins.py:1150
651
#: bzrlib/builtins.py:1238
570
652
msgid "Update a mirror of this branch."
571
653
msgstr "Actualizar una réplica de esta rama."
572
654
573
#: bzrlib/builtins.py:1152
655
#: bzrlib/builtins.py:1240
574
656
msgid ""
575
657
"The target branch will not have its working tree populated because this\n"
576
658
"is both expensive, and is not supported on remote file systems."
577
659
msgstr ""
660
"El árbol de trabajo de la rama destino no se rellenará porque esto\n"
661
"es tanto costoso como no soportado por sistemas de archivos remotos."
578
662
579
#: bzrlib/builtins.py:1155
663
#: bzrlib/builtins.py:1243
580
664
msgid ""
581
665
"Some smart servers or protocols *may* put the working tree in place in\n"
582
666
"the future."
583
667
msgstr ""
668
"Algunos servidores inteligentes o protocolos *pueden* poner el árbol de "
669
"trabajo\n"
670
"en su lugar en el futuro."
584
671
585
#: bzrlib/builtins.py:1158
672
#: bzrlib/builtins.py:1246
586
673
msgid ""
587
674
"This command only works on branches that have not diverged. Branches are\n"
588
675
"considered diverged if the destination branch's most recent commit is one\n"
589
676
"that has not been merged (directly or indirectly) by the source branch."
590
677
msgstr ""
678
"Esta orden solo funciona en ramas que no han divergido. Las ramas se\n"
679
"consideran divergidas si la confirmación más reciente de la rama destino es\n"
680
"una que no ha sido fusionada (directa o indirectamente) por la rama origen."
591
681
592
#: bzrlib/builtins.py:1162
682
#: bzrlib/builtins.py:1250
593
683
msgid ""
594
684
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
595
685
"the other branch completely, discarding its unmerged changes."
598
688
"reemplazar\n"
599
689
"la otra rama completamente, descartando sus cambios no fusionados."
600
690
601
#: bzrlib/builtins.py:1165
691
#: bzrlib/builtins.py:1253
602
692
msgid ""
603
693
"If you want to ensure you have the different changes in the other branch,\n"
604
694
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
605
695
"After that you will be able to do a push without '--overwrite'."
606
696
msgstr ""
697
"Si quiere asegurarse de que tiene los distintos cambios de la otra rama,\n"
698
"haga una fusión (vea bzr help merge) desde la otra rama y confirmela.\n"
699
"Después eso será capaz de hacer una inserción sin «--overwrite»."
607
700
608
#: bzrlib/builtins.py:1169
701
#: bzrlib/builtins.py:1257
609
702
msgid ""
610
703
"If there is no default push location set, the first push will set it (use\n"
611
704
"--no-remember to avoid setting it). After that, you can omit the\n"
613
706
"value will only be saved if the remote location can be accessed."
614
707
msgstr ""
615
708
616
#: bzrlib/builtins.py:1174
709
#: bzrlib/builtins.py:1262
617
710
msgid ""
618
711
"The --verbose option will display the revisions pushed using the log_format\n"
619
712
"configuration option. You can use a different format by overriding it with\n"
620
713
"-Olog_format=<other_format>."
621
714
msgstr ""
715
"La opción --verbose mostrará las revisiones insertadas usando la opción de\n"
716
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
717
"con -Olog_format=<otro_formato>."
622
718
623
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
719
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
624
720
msgid ""
625
721
"Branch to push from, rather than the one containing the working directory."
626
722
msgstr ""
627
723
"Rama desde la que impulsar en vez de la que contiene el directorio de "
628
724
"trabajo."
629
725
630
#: bzrlib/builtins.py:1188
726
#: bzrlib/builtins.py:1276
631
727
msgid ""
632
728
"By default push will fail if the target directory exists, but does not "
633
729
"already have a control directory. This flag will allow push to proceed."
634
730
msgstr ""
731
"Por defecto «push» fallará si el directorio destino existe, pero no tiene "
732
"todavía un directorio de control. Este marcador permitirá a «push» proceder."
635
733
636
#: bzrlib/builtins.py:1193
734
#: bzrlib/builtins.py:1281
637
735
msgid ""
638
736
"Create a stacked branch that references the public location of the parent "
639
737
"branch."
641
739
"Crear una rama apilada que referencia a la ubicación pública de la rama "
642
740
"padre."
643
741
644
#: bzrlib/builtins.py:1196
742
#: bzrlib/builtins.py:1284
645
743
msgid ""
646
744
"Create a stacked branch that refers to another branch for the commit "
647
745
"history. Only the work not present in the referenced branch is included in "
648
746
"the branch created."
649
747
msgstr ""
748
"Crear una rama apilada que se refiera a otra para historial de "
749
"confirmaciones. Solo el trabajo no presente en la rama referenciada se "
750
"incluye en la rama creada."
650
751
651
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
752
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
652
753
msgid ""
653
754
"Refuse to push if there are uncommitted changes in the working tree, --no-"
654
755
"strict disables the check."
656
757
"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
657
758
"strict desactiva la comprobación."
658
759
659
#: bzrlib/builtins.py:1204
760
#: bzrlib/builtins.py:1292
660
761
msgid "Don't populate the working tree, even for protocols that support it."
661
762
msgstr ""
662
763
"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
663
764
664
#: bzrlib/builtins.py:1248
765
#: bzrlib/builtins.py:1336
665
766
msgid "Could not determine branch to refer to."
666
767
msgstr "No se puede determinar la rama a la que referirse."
667
768
668
#: bzrlib/builtins.py:1257
769
#: bzrlib/builtins.py:1345
669
770
#, python-format
670
771
msgid ""
671
772
"No push location known or specified. To push to the parent branch (at %s), "
672
773
"use 'bzr push :parent'."
673
774
msgstr ""
775
"Ubicación de inserción no conocida ni indicada. Para insertar en la rama "
776
"padre (en %s), use «bzr push :parent»."
674
777
675
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
778
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
676
779
msgid "No push location known or specified."
677
780
msgstr "No hay una ubicación para impulsar conocida o especificada."
678
781
679
#: bzrlib/builtins.py:1267
782
#: bzrlib/builtins.py:1355
680
783
#, python-format
681
784
msgid "Using saved push location: %s"
682
785
msgstr "Usar la ubicación para impulsar guardada: %s"
683
786
684
#: bzrlib/builtins.py:1277
787
#: bzrlib/builtins.py:1365
685
788
msgid "Create a new branch that is a copy of an existing branch."
686
789
msgstr "Crea una nueva rama que es una copia de la rama existente."
687
790
688
#: bzrlib/builtins.py:1279
791
#: bzrlib/builtins.py:1367
689
792
msgid ""
690
793
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
691
794
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
696
799
"create ./foo-bar."
697
800
msgstr ""
698
801
699
#: bzrlib/builtins.py:1286
802
#: bzrlib/builtins.py:1374
700
803
msgid ""
701
804
"To retrieve the branch as of a particular revision, supply the --revision\n"
702
805
"parameter, as in \"branch foo/bar -r 5\"."
705
808
"-revision\n"
706
809
"como en «branch foo/bar -r 5»."
707
810
708
#: bzrlib/builtins.py:1289
811
#: bzrlib/builtins.py:1377
709
812
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
710
813
msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
711
814
712
#: bzrlib/builtins.py:1299
815
#: bzrlib/builtins.py:1387
713
816
msgid "Create a branch without a working-tree."
714
817
msgstr "Crear una rama sin directorio de trabajo."
715
818
716
#: bzrlib/builtins.py:1301
819
#: bzrlib/builtins.py:1389
717
820
msgid "Switch the checkout in the current directory to the new branch."
718
821
msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
719
822
720
#: bzrlib/builtins.py:1304
823
#: bzrlib/builtins.py:1392
721
824
msgid ""
722
825
"Create a stacked branch referring to the source branch. The new branch will "
723
826
"depend on the availability of the source branch for all operations."
724
827
msgstr ""
828
"Crear una rama apilada refiriéndose a la rama origen. La nueva rama "
829
"dependerá de la disponibilidad de la rama fuente para todas las operaciones."
725
830
726
#: bzrlib/builtins.py:1308
831
#: bzrlib/builtins.py:1396
727
832
msgid "Do not use a shared repository, even if available."
728
833
msgstr "No usar un repositorio compartido, incluso si está disponible."
729
834
730
#: bzrlib/builtins.py:1310
835
#: bzrlib/builtins.py:1398
731
836
msgid ""
732
837
"By default branch will fail if the target directory exists, but does not "
733
838
"already have a control directory. This flag will allow branch to proceed."
734
839
msgstr ""
840
"Por defecto «branch» fallará si el directorio destino existe, pero no tiene "
841
"todavía un directorio de control. Este marcador permitirá a «branch» "
842
"proceder."
735
843
736
#: bzrlib/builtins.py:1315
844
#: bzrlib/builtins.py:1403
737
845
msgid "Bind new branch to from location."
738
846
msgstr "Vincular una rama nueva desde la ubicación."
739
847
740
#: bzrlib/builtins.py:1362
848
#: bzrlib/builtins.py:1450
741
849
#, python-format
742
850
msgid "Target directory \"%s\" already exists."
743
851
msgstr "El directorio objetivo «%s» ya existe."
744
852
745
#: bzrlib/builtins.py:1374
853
#: bzrlib/builtins.py:1462
746
854
#, python-format
747
855
msgid "Parent of \"%s\" does not exist."
748
856
msgstr "El padre de «%s» no existe."
749
857
750
#: bzrlib/builtins.py:1393
858
#: bzrlib/builtins.py:1481
751
859
msgid "The branch {0} has no revision {1}."
752
860
msgstr "La rama {0} no tiene revisión {1}."
753
861
754
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
862
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
755
863
#, python-format
756
864
msgid "Created new stacked branch referring to %s."
757
865
msgstr "Creada rama apilada nueva referida a %s."
758
866
759
#: bzrlib/builtins.py:1407
867
#: bzrlib/builtins.py:1500
760
868
#, python-format
761
869
msgid "Branched %d revision."
762
870
msgid_plural "Branched %d revisions."
763
871
msgstr[0] "%d revisión enramada"
764
872
msgstr[1] "%d revisiones enramadas"
765
873
766
#: bzrlib/builtins.py:1412
874
#: bzrlib/builtins.py:1505
767
875
#, python-format
768
876
msgid "New branch bound to %s"
769
877
msgstr "Nueva rama unida a %s"
770
878
771
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
879
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
772
880
#, python-format
773
881
msgid "Switched to branch: %s"
774
882
msgstr "Cambiado a la rama: %s"
775
883
776
#: bzrlib/builtins.py:1422
884
#: bzrlib/builtins.py:1515
777
885
msgid "List the branches available at the current location."
778
886
msgstr "Lista las ramas disponibles en la ubicación actual."
779
887
780
#: bzrlib/builtins.py:1424
888
#: bzrlib/builtins.py:1517
781
889
msgid ""
782
890
"This command will print the names of all the branches at the current\n"
783
891
"location."
785
893
"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
786
894
"actual."
787
895
788
#: bzrlib/builtins.py:1431
896
#: bzrlib/builtins.py:1524
789
897
msgid ""
790
898
"Recursively scan for branches rather than just looking in the specified "
791
899
"location."
792
900
msgstr ""
901
"Buscar recursivamente en las ramas en lugar de mirar solo en la ubicación "
902
"indicada."
793
903
794
#: bzrlib/builtins.py:1461
904
#: bzrlib/builtins.py:1554
795
905
msgid "(default)"
796
msgstr ""
906
msgstr "(predeterminado)"
797
907
798
#: bzrlib/builtins.py:1473
908
#: bzrlib/builtins.py:1566
799
909
msgid "Create a new checkout of an existing branch."
800
910
msgstr "Crea una nueva comprobación de una rama existente."
801
911
802
#: bzrlib/builtins.py:1475
912
#: bzrlib/builtins.py:1568
803
913
msgid ""
804
914
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
805
915
"for\n"
809
919
"location using SFTP."
810
920
msgstr ""
811
921
812
#: bzrlib/builtins.py:1480
922
#: bzrlib/builtins.py:1573
813
923
msgid ""
814
924
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
815
925
"will\n"
821
931
"create ./foo-bar."
822
932
msgstr ""
823
933
824
#: bzrlib/builtins.py:1487
934
#: bzrlib/builtins.py:1580
825
935
msgid ""
826
936
"To retrieve the branch as of a particular revision, supply the --revision\n"
827
937
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
830
940
"old\n"
831
941
"code.)"
832
942
msgstr ""
943
"Para recuperar la rama de una revisión particular, proporcione el parámetro\n"
944
"--revision, como en «checkout foo/bar -r 5». Note que esto estará "
945
"inmediatamente\n"
946
"desfasado [por lo que no puede confirmar] pero aún así puede ser útil (por \n"
947
"ejemplo, para examinar código antiguo)."
833
948
834
#: bzrlib/builtins.py:1497
949
#: bzrlib/builtins.py:1590
835
950
msgid ""
836
951
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
837
952
"the branch for every operation. Normal checkouts can perform common "
838
953
"operations like diff and status without such access, and also support local "
839
954
"commits."
840
955
msgstr ""
956
"Realizar una extracción ligera. Las extracciones ligeras depende del acceso "
957
"a la rama para cada operación. Las extracciones normales pueden realizar "
958
"operaciones habituales como diff y status sin este acceso, así como permitir "
959
"confirmaciones locales."
841
960
842
#: bzrlib/builtins.py:1504
961
#: bzrlib/builtins.py:1597
843
962
msgid "Get file contents from this tree."
844
963
msgstr "Conseguir contenidos de archivo desde este árbol."
845
964
846
#: bzrlib/builtins.py:1506
965
#: bzrlib/builtins.py:1599
847
966
msgid "Hard-link working tree files where possible."
848
967
msgstr ""
849
968
"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
850
969
851
#: bzrlib/builtins.py:1547
970
#: bzrlib/builtins.py:1640
852
971
msgid ""
853
972
"Show list of renamed files.\n"
854
973
" "
856
975
"Mostrar la lista de archivos renombrados\n"
857
976
" "
858
977
859
#: bzrlib/builtins.py:1577
978
#: bzrlib/builtins.py:1670
860
979
msgid "Update a working tree to a new revision."
861
980
msgstr "Actualiza un árbol de trabajo a una revisión nueva."
862
981
863
#: bzrlib/builtins.py:1579
982
#: bzrlib/builtins.py:1672
864
983
msgid ""
865
984
"This will perform a merge of the destination revision (the tip of the\n"
866
985
"branch, or the specified revision) into the working tree, and then make\n"
867
986
"that revision the basis revision for the working tree. "
868
987
msgstr ""
988
"Efectuará una fusión de la revisión de destino (el extremo de la\n"
989
"rama, o la revisión indicada) en el árbol de trabajo, y hará esa\n"
990
"revisión la revisión base del árbol de trabajo. "
869
991
870
#: bzrlib/builtins.py:1583
992
#: bzrlib/builtins.py:1676
871
993
msgid ""
872
994
"You can use this to visit an older revision, or to update a working tree\n"
873
995
"that is out of date from its branch."
874
996
msgstr ""
997
"Puede usar esto para visitar una revisión antigua, o para actualizar un "
998
"árbol de trabajo\n"
999
"que esté desactualizado de su rama."
875
1000
876
#: bzrlib/builtins.py:1586
1001
#: bzrlib/builtins.py:1679
877
1002
msgid ""
878
1003
"If there are any uncommitted changes in the tree, they will be carried\n"
879
1004
"across and remain as uncommitted changes after the update. To discard\n"
881
1006
"with the changes brought in by the change in basis revision."
882
1007
msgstr ""
883
1008
884
#: bzrlib/builtins.py:1591
1009
#: bzrlib/builtins.py:1684
885
1010
msgid ""
886
1011
"If the tree's branch is bound to a master branch, bzr will also update\n"
887
1012
"the branch from the master."
888
1013
msgstr ""
1014
"Si la rama del árbol esta atada a una rama superior, bzr también "
1015
"actualizará\n"
1016
"la rama de la superior."
889
1017
890
#: bzrlib/builtins.py:1594
1018
#: bzrlib/builtins.py:1687
891
1019
msgid ""
892
1020
"You cannot update just a single file or directory, because each Bazaar\n"
893
1021
"working tree has just a single basis revision. If you want to restore a\n"
897
1025
"out the old content of that file to a new location."
898
1026
msgstr ""
899
1027
900
#: bzrlib/builtins.py:1601
1028
#: bzrlib/builtins.py:1694
901
1029
msgid ""
902
1030
"The 'dir' argument, if given, must be the location of the root of a\n"
903
1031
"working tree to update. By default, the working tree that contains the \n"
904
1032
"current working directory is used."
905
1033
msgstr ""
906
1034
907
#: bzrlib/builtins.py:1617
1035
#: bzrlib/builtins.py:1710
908
1036
msgid "bzr update --revision takes exactly one revision"
909
1037
msgstr "bzr update --revision toma exactamente una revisión"
910
1038
911
#: bzrlib/builtins.py:1625
1039
#: bzrlib/builtins.py:1718
912
1040
msgid "bzr update can only update a whole tree, not a file or subdirectory"
913
1041
msgstr ""
914
1042
"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
915
1043
916
#: bzrlib/builtins.py:1656
1044
#: bzrlib/builtins.py:1749
917
1045
msgid "Tree is up to date at revision {0} of branch {1}"
918
1046
msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
919
1047
920
#: bzrlib/builtins.py:1672
1048
#: bzrlib/builtins.py:1765
921
1049
#, python-format
922
1050
msgid ""
923
1051
"branch has no revision %s\n"
927
1055
"bzr update --revision solo funciona para una revisión en el histórico de la "
928
1056
"rama"
929
1057
930
#: bzrlib/builtins.py:1678
1058
#: bzrlib/builtins.py:1771
931
1059
msgid "Updated to revision {0} of branch {1}"
932
1060
msgstr "Actualizado a la revisión {0} de la rama {1}"
933
1061
934
#: bzrlib/builtins.py:1682
1062
#: bzrlib/builtins.py:1775
935
1063
msgid ""
936
1064
"Your local commits will now show as pending merges with 'bzr status', and "
937
1065
"can be committed with 'bzr commit'."
938
1066
msgstr ""
1067
"Sus confirmaciones locales serán ahora mostradas como fusiones pendientes "
1068
"con «bzr status», y pueden ser confirmadas con «bzr commit»."
939
1069
940
#: bzrlib/builtins.py:1691
1070
#: bzrlib/builtins.py:1784
941
1071
msgid "Show information about a working tree, branch or repository."
942
1072
msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
943
1073
944
#: bzrlib/builtins.py:1693
1074
#: bzrlib/builtins.py:1786
945
1075
msgid ""
946
1076
"This command will show all known locations and formats associated to the\n"
947
1077
"tree, branch or repository."
949
1079
"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
950
1080
"árbol, rama o repositorio."
951
1081
952
#: bzrlib/builtins.py:1696
1082
#: bzrlib/builtins.py:1789
953
1083
msgid ""
954
1084
"In verbose mode, statistical information is included with each report.\n"
955
1085
"To see extended statistic information, use a verbosity level of 2 or\n"
956
1086
"higher by specifying the verbose option multiple times, e.g. -vv."
957
1087
msgstr ""
958
1088
959
#: bzrlib/builtins.py:1700
1089
#: bzrlib/builtins.py:1793
960
1090
msgid "Branches and working trees will also report any missing revisions."
961
1091
msgstr ""
962
1092
"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
963
1093
"que falte."
964
1094
965
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
966
#: bzrlib/builtins.py:6389
1095
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1096
#: bzrlib/builtins.py:6442
967
1097
msgid ":Examples:"
968
1098
msgstr ":Ejemplos:"
969
1099
970
#: bzrlib/builtins.py:1704
1100
#: bzrlib/builtins.py:1797
971
1101
msgid " Display information on the format and related locations:"
972
1102
msgstr " Muestra información en el formato y ubicaciones relacionadas:"
973
1103
974
#: bzrlib/builtins.py:1706
1104
#: bzrlib/builtins.py:1799
975
1105
msgid " bzr info"
976
1106
msgstr " información bzr"
977
1107
978
#: bzrlib/builtins.py:1708
1108
#: bzrlib/builtins.py:1801
979
1109
msgid ""
980
1110
" Display the above together with extended format information and\n"
981
1111
" basic statistics (like the number of files in the working tree and\n"
982
1112
" number of revisions in the branch and repository):"
983
1113
msgstr ""
984
1114
985
#: bzrlib/builtins.py:1712
1115
#: bzrlib/builtins.py:1805
986
1116
msgid " bzr info -v"
987
1117
msgstr " bzr info -v"
988
1118
989
#: bzrlib/builtins.py:1714
1119
#: bzrlib/builtins.py:1807
990
1120
msgid " Display the above together with number of committers to the branch:"
991
1121
msgstr " Mostrar lo anterior junto con el número de aplicadores de la rama:"
992
1122
993
#: bzrlib/builtins.py:1716
1123
#: bzrlib/builtins.py:1809
994
1124
msgid " bzr info -vv"
995
1125
msgstr " bzr info -vv"
996
1126
997
#: bzrlib/builtins.py:1735
1127
#: bzrlib/builtins.py:1828
998
1128
msgid "Remove files or directories."
999
1129
msgstr "Elimina archivos o directorios."
1000
1130
1001
#: bzrlib/builtins.py:1737
1131
#: bzrlib/builtins.py:1830
1002
1132
msgid ""
1003
1133
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1004
1134
"delete them if they can easily be recovered using revert otherwise they\n"
1007
1137
"Bazaar but missing in your tree and stop tracking them for you."
1008
1138
msgstr ""
1009
1139
1010
#: bzrlib/builtins.py:1745
1140
#: bzrlib/builtins.py:1838
1011
1141
msgid "Only remove files that have never been committed."
1012
1142
msgstr "Eliminar solo los archivos que nunca se han aplicado."
1013
1143
1014
#: bzrlib/builtins.py:1747
1144
#: bzrlib/builtins.py:1840
1015
1145
msgid "The file deletion mode to be used."
1016
1146
msgstr "El modo de borrado de archivo a usar."
1017
1147
1018
#: bzrlib/builtins.py:1748
1148
#: bzrlib/builtins.py:1841
1019
1149
msgid "Deletion Strategy"
1020
1150
msgstr "Estrategia de borrado"
1021
1151
1022
#: bzrlib/builtins.py:1749
1152
#: bzrlib/builtins.py:1842
1023
1153
msgid "Backup changed files (default)."
1024
msgstr ""
1154
msgstr "Copiar archivos modificados (predeterminado)."
1025
1155
1026
#: bzrlib/builtins.py:1750
1156
#: bzrlib/builtins.py:1843
1027
1157
msgid "Delete from bzr but leave the working copy."
1028
msgstr ""
1158
msgstr "Borrar de bzr pero dejar la copia de trabajo."
1029
1159
1030
#: bzrlib/builtins.py:1751
1160
#: bzrlib/builtins.py:1844
1031
1161
msgid "Don't backup changed files."
1032
msgstr ""
1162
msgstr "No copiar los archivos modificados."
1033
1163
1034
#: bzrlib/builtins.py:1752
1164
#: bzrlib/builtins.py:1845
1035
1165
msgid ""
1036
1166
"Delete all the specified files, even if they can not be recovered and even "
1037
1167
"if they are non-empty directories. (deprecated, use no-backup)"
1038
1168
msgstr ""
1169
"Borrar todos los archivos indicados, incluso si no pueden ser recuperados y "
1170
"aunque existan directorios no vacíos (obsoleto, use no-backup)."
1039
1171
1040
#: bzrlib/builtins.py:1761
1172
#: bzrlib/builtins.py:1854
1041
1173
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1042
1174
msgstr ""
1043
1175
"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
1044
1176
1045
#: bzrlib/builtins.py:1778
1177
#: bzrlib/builtins.py:1871
1046
1178
msgid "No matching files."
1047
1179
msgstr "No hay archivos coincidentes."
1048
1180
1049
#: bzrlib/builtins.py:1839
1181
#: bzrlib/builtins.py:1932
1050
1182
msgid "Reconcile bzr metadata in a branch."
1051
1183
msgstr "Reconcilia metadatos bzr en una rama."
1052
1184
1053
#: bzrlib/builtins.py:1841
1185
#: bzrlib/builtins.py:1934
1054
1186
msgid ""
1055
1187
"This can correct data mismatches that may have been caused by\n"
1056
1188
"previous ghost operations or bzr upgrades. You should only\n"
1058
1190
"advises you to run it."
1059
1191
msgstr ""
1060
1192
1061
#: bzrlib/builtins.py:1846
1193
#: bzrlib/builtins.py:1939
1062
1194
msgid ""
1063
1195
"If a second branch is provided, cross-branch reconciliation is\n"
1064
1196
"also attempted, which will check that data like the tree root\n"
1066
1198
"correctly in both branches."
1067
1199
msgstr ""
1068
1200
1069
#: bzrlib/builtins.py:1851
1201
#: bzrlib/builtins.py:1944
1070
1202
msgid ""
1071
1203
"At the same time it is run it may recompress data resulting in\n"
1072
1204
"a potential saving in disk space or performance gain."
1074
1206
"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
1075
1207
"un ahorro potencial de espacio en disco o aumento el rendimiento."
1076
1208
1077
#: bzrlib/builtins.py:1854
1209
#: bzrlib/builtins.py:1947
1078
1210
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1079
1211
msgstr ""
1080
1212
"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
1081
1213
"o sftp."
1082
1214
1083
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1215
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1084
1216
msgid ""
1085
1217
"Format for the bzr 2.0 series.\n"
1086
1218
"Uses group-compress storage.\n"
1087
1219
"Provides rich roots which are a one-way transition.\n"
1088
1220
msgstr ""
1089
1221
1090
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1222
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1091
1223
msgid ""
1092
1224
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1093
1225
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1094
1226
msgstr ""
1095
1227
1096
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1228
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1097
1229
msgid "The 2a format with experimental support for colocated branches.\n"
1098
1230
msgstr ""
1099
1231
1100
#: bzrlib/builtins.py:1922
1232
#: bzrlib/builtins.py:2015
1101
1233
msgid "Make a directory into a versioned branch."
1102
1234
msgstr "Hacer un directorio en una rama versionada."
1103
1235
1104
#: bzrlib/builtins.py:1924
1236
#: bzrlib/builtins.py:2017
1105
1237
msgid ""
1106
1238
"Use this to create an empty branch, or before importing an\n"
1107
1239
"existing project."
1109
1241
"Use esto para crear una rama nueva o antes de importar un\n"
1110
1242
"proyecto existente."
1111
1243
1112
#: bzrlib/builtins.py:1927
1244
#: bzrlib/builtins.py:2020
1113
1245
msgid ""
1114
1246
"If there is a repository in a parent directory of the location, then\n"
1115
1247
"the history of the branch will be stored in the repository. Otherwise\n"
1116
1248
"init creates a standalone branch which carries its own history\n"
1117
1249
"in the .bzr directory."
1118
1250
msgstr ""
1251
"SI hay un repositorio en un directorio padre de la ubicación, el\n"
1252
"historial de la rama se almacenará en el repositorio. En otro caso\n"
1253
"init crea una rama independiente que lleva su propio historial \n"
1254
"en el directorio .bzr."
1119
1255
1120
#: bzrlib/builtins.py:1932
1256
#: bzrlib/builtins.py:2025
1121
1257
msgid ""
1122
1258
"If there is already a branch at the location but it has no working tree,\n"
1123
1259
"the tree can be populated with 'bzr checkout'."
1124
1260
msgstr ""
1261
"Si existe ya una rama en la ubicación, pero no tiene árbol de trabajo,\n"
1262
"se puede poblar el árbol con «bzr checkout»."
1125
1263
1126
#: bzrlib/builtins.py:1935
1264
#: bzrlib/builtins.py:2028
1127
1265
msgid "Recipe for importing a tree of files::"
1128
1266
msgstr "Recipiente para importar un árbol de archivos:"
1129
1267
1130
#: bzrlib/builtins.py:1937
1268
#: bzrlib/builtins.py:2030
1131
1269
msgid ""
1132
1270
" cd ~/project\n"
1133
1271
" bzr init\n"
1141
1279
" bzr status\n"
1142
1280
" bzr commit -m «proyecto importado»"
1143
1281
1144
#: bzrlib/builtins.py:1948
1282
#: bzrlib/builtins.py:2041
1145
1283
msgid ""
1146
1284
"Create the path leading up to the branch if it does not already exist."
1147
1285
msgstr "Crea la ruta que conduce a la rama si no existe ya."
1148
1286
1149
#: bzrlib/builtins.py:1951
1287
#: bzrlib/builtins.py:2044
1150
1288
msgid "Specify a format for this branch. See \"help formats\"."
1151
1289
msgstr "Especificar un formato para esta rama. Vea «help formats»"
1152
1290
1153
#: bzrlib/builtins.py:1959
1291
#: bzrlib/builtins.py:2052
1154
1292
msgid ""
1155
1293
"Never change revnos or the existing log. Append revisions to it only."
1156
1294
msgstr ""
1157
1295
1158
#: bzrlib/builtins.py:1962
1296
#: bzrlib/builtins.py:2055
1159
1297
msgid "Create a branch without a working tree."
1160
1298
msgstr "Crea una rama sin árbol de trabajo."
1161
1299
1162
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1300
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1163
1301
#, python-format
1164
1302
msgid ""
1165
1303
"Parent directory of %s does not exist.\n"
1166
1304
"You may supply --create-prefix to create all leading parent directories."
1167
1305
msgstr ""
1168
1306
1169
#: bzrlib/builtins.py:2016
1307
#: bzrlib/builtins.py:2109
1170
1308
msgid ""
1171
1309
"This branch format cannot be set to append-revisions-only. Try --default."
1172
1310
msgstr ""
1173
1311
"Este formato de rama no se puede establecer como append-revisions-only. "
1174
1312
"Intente --default."
1175
1313
1176
#: bzrlib/builtins.py:2027
1314
#: bzrlib/builtins.py:2120
1177
1315
msgid "Created a {0} (format: {1})\n"
1178
1316
msgstr "Creado un {0} (formaot: {1})\n"
1179
1317
1180
#: bzrlib/builtins.py:2036
1318
#: bzrlib/builtins.py:2129
1181
1319
#, python-format
1182
1320
msgid "Using shared repository: %s\n"
1183
1321
msgstr "Usando el repositorio compartido: %s\n"
1184
1322
1185
#: bzrlib/builtins.py:2040
1323
#: bzrlib/builtins.py:2133
1186
1324
msgid "Create a shared repository for branches to share storage space."
1187
1325
msgstr ""
1188
1326
"Crea un repositorio compartido para ramas para compartir el espacio de "
1189
1327
"almacenamiento."
1190
1328
1191
#: bzrlib/builtins.py:2042
1329
#: bzrlib/builtins.py:2135
1192
1330
msgid ""
1193
1331
"New branches created under the repository directory will store their\n"
1194
1332
"revisions in the repository, not in the branch directory. For branches\n"
1196
1334
"speeds up the creation of new branches."
1197
1335
msgstr ""
1198
1336
1199
#: bzrlib/builtins.py:2047
1337
#: bzrlib/builtins.py:2140
1200
1338
msgid ""
1201
1339
"If the --no-trees option is given then the branches in the repository\n"
1202
1340
"will not have working trees by default. They will still exist as \n"
1206
1344
"branches, such as on a server."
1207
1345
msgstr ""
1208
1346
1209
#: bzrlib/builtins.py:2054
1347
#: bzrlib/builtins.py:2147
1210
1348
msgid ""
1211
1349
":Examples:\n"
1212
1350
" Create a shared repository holding just branches::"
1214
1352
":Ejemplos:\n"
1215
1353
" Crear un repositorio compartido manteniendo solo las ramas::"
1216
1354
1217
#: bzrlib/builtins.py:2057
1355
#: bzrlib/builtins.py:2150
1218
1356
msgid ""
1219
1357
" bzr init-repo --no-trees repo\n"
1220
1358
" bzr init repo/trunk"
1222
1360
" bzr init-repo --no-trees repo\n"
1223
1361
" bzr init repo/trunk"
1224
1362
1225
#: bzrlib/builtins.py:2060
1363
#: bzrlib/builtins.py:2153
1226
1364
msgid " Make a lightweight checkout elsewhere::"
1227
1365
msgstr " Hace una comprobación ligera en cualquier sitio::"
1228
1366
1229
#: bzrlib/builtins.py:2062
1367
#: bzrlib/builtins.py:2155
1230
1368
msgid ""
1231
1369
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1232
1370
" cd trunk-checkout\n"
1233
1371
" (add files here)"
1234
1372
msgstr ""
1235
1373
1236
#: bzrlib/builtins.py:2070
1374
#: bzrlib/builtins.py:2163
1237
1375
msgid ""
1238
1376
"Specify a format for this repository. See \"bzr help formats\" for details."
1239
1377
msgstr ""
1240
1378
"Especificar un formato para este repositorio, Vea «bzr help formats» para "
1241
1379
"tener más detalles."
1242
1380
1243
#: bzrlib/builtins.py:2074
1381
#: bzrlib/builtins.py:2167
1244
1382
msgid "Repository format"
1245
1383
msgstr "Formato de repositorio"
1246
1384
1247
#: bzrlib/builtins.py:2076
1385
#: bzrlib/builtins.py:2169
1248
1386
msgid "Branches in the repository will default to not having a working tree."
1249
1387
msgstr ""
1250
1388
"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
1251
1389
"trabajo."
1252
1390
1253
#: bzrlib/builtins.py:2102
1391
#: bzrlib/builtins.py:2195
1254
1392
msgid "Show differences in the working tree, between revisions or branches."
1255
1393
msgstr ""
1256
1394
"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
1257
1395
1258
#: bzrlib/builtins.py:2104
1396
#: bzrlib/builtins.py:2197
1259
1397
msgid ""
1260
1398
"If no arguments are given, all changes for the current tree are listed.\n"
1261
1399
"If files are given, only the changes in those files are listed.\n"
1265
1403
"given."
1266
1404
msgstr ""
1267
1405
1268
#: bzrlib/builtins.py:2111
1406
#: bzrlib/builtins.py:2204
1269
1407
msgid ""
1270
1408
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1271
1409
"produces patches suitable for \"patch -p1\"."
1272
1410
msgstr ""
1411
"«bzr diff -p1» es equivalente a «bzr diff --prefix old/:new/», y\n"
1412
"produce parches adecuados para «patch -p1»."
1273
1413
1274
#: bzrlib/builtins.py:2114
1414
#: bzrlib/builtins.py:2207
1275
1415
msgid ""
1276
1416
"Note that when using the -r argument with a range of revisions, the\n"
1277
1417
"differences are computed between the two specified revisions. That\n"
1281
1421
"in the range."
1282
1422
msgstr ""
1283
1423
1284
#: bzrlib/builtins.py:2121
1424
#: bzrlib/builtins.py:2214
1285
1425
msgid ""
1286
1426
":Exit values:\n"
1287
1427
" 1 - changed\n"
1295
1435
" 3 - error\n"
1296
1436
" 0 - sin cambios"
1297
1437
1298
#: bzrlib/builtins.py:2127
1438
#: bzrlib/builtins.py:2220
1299
1439
msgid ""
1300
1440
":Examples:\n"
1301
1441
" Shows the difference in the working tree versus the last commit::"
1304
1444
" Muestra las diferencias en el árbol de trabajo contra la última "
1305
1445
"aplicación::"
1306
1446
1307
#: bzrlib/builtins.py:2130
1447
#: bzrlib/builtins.py:2223
1308
1448
msgid " bzr diff"
1309
1449
msgstr " bzr diff"
1310
1450
1311
#: bzrlib/builtins.py:2132
1451
#: bzrlib/builtins.py:2225
1312
1452
msgid " Difference between the working tree and revision 1::"
1313
1453
msgstr " Diferencia entre el árbol de trabajo y la revisión 1::"
1314
1454
1315
#: bzrlib/builtins.py:2134
1455
#: bzrlib/builtins.py:2227
1316
1456
msgid " bzr diff -r1"
1317
1457
msgstr " bzr diff -r1"
1318
1458
1319
#: bzrlib/builtins.py:2136
1459
#: bzrlib/builtins.py:2229
1320
1460
msgid " Difference between revision 3 and revision 1::"
1321
1461
msgstr " Diferencia entre revisión 3 y revisión 1::"
1322
1462
1323
#: bzrlib/builtins.py:2138
1463
#: bzrlib/builtins.py:2231
1324
1464
msgid " bzr diff -r1..3"
1325
1465
msgstr " bzr diff -r1..3"
1326
1466
1327
#: bzrlib/builtins.py:2140
1467
#: bzrlib/builtins.py:2233
1328
1468
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1329
1469
msgstr " Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
1330
1470
1331
#: bzrlib/builtins.py:2142
1471
#: bzrlib/builtins.py:2235
1332
1472
msgid " bzr diff -r1..3 xxx"
1333
1473
msgstr " bzr diff -r1..3 xxx"
1334
1474
1335
#: bzrlib/builtins.py:2144
1475
#: bzrlib/builtins.py:2237
1336
1476
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1337
1477
msgstr ""
1338
1478
" Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
1339
1479
1340
#: bzrlib/builtins.py:2146
1480
#: bzrlib/builtins.py:2239
1341
1481
msgid " bzr diff -c2"
1342
1482
msgstr " bzr diff -c2"
1343
1483
1344
#: bzrlib/builtins.py:2148
1484
#: bzrlib/builtins.py:2241
1345
1485
msgid ""
1346
1486
" To see the changes introduced by revision X::\n"
1347
1487
" \n"
1351
1491
" \n"
1352
1492
" bzr diff -cX"
1353
1493
1354
#: bzrlib/builtins.py:2152
1494
#: bzrlib/builtins.py:2245
1355
1495
msgid ""
1356
1496
" Note that in the case of a merge, the -c option shows the changes\n"
1357
1497
" compared to the left hand parent. To see the changes against\n"
1358
1498
" another parent, use::"
1359
1499
msgstr ""
1360
1500
1361
#: bzrlib/builtins.py:2156
1501
#: bzrlib/builtins.py:2249
1362
1502
msgid " bzr diff -r<chosen_parent>..X"
1363
1503
msgstr " bzr diff -r<padre_elegido>..X"
1364
1504
1365
#: bzrlib/builtins.py:2158
1505
#: bzrlib/builtins.py:2251
1366
1506
msgid ""
1367
1507
" The changes between the current revision and the previous revision\n"
1368
1508
" (equivalent to -c-1 and -r-2..-1)"
1370
1510
" Los cambios entre la versión actual y la previa\n"
1371
1511
" (equivalente a -c-1 y -r-2..-1)"
1372
1512
1373
#: bzrlib/builtins.py:2161
1513
#: bzrlib/builtins.py:2254
1374
1514
msgid " bzr diff -r-2.."
1375
1515
msgstr " bzr diff -r-2.."
1376
1516
1377
#: bzrlib/builtins.py:2163
1517
#: bzrlib/builtins.py:2256
1378
1518
msgid " Show just the differences for file NEWS::"
1379
1519
msgstr " Solo muestra las diferencias para el archivo NEWS::"
1380
1520
1381
#: bzrlib/builtins.py:2165
1521
#: bzrlib/builtins.py:2258
1382
1522
msgid " bzr diff NEWS"
1383
1523
msgstr " bzr diff NEWS"
1384
1524
1385
#: bzrlib/builtins.py:2167
1525
#: bzrlib/builtins.py:2260
1386
1526
msgid " Show the differences in working tree xxx for file NEWS::"
1387
1527
msgstr ""
1388
1528
" Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
1389
1529
1390
#: bzrlib/builtins.py:2169
1530
#: bzrlib/builtins.py:2262
1391
1531
msgid " bzr diff xxx/NEWS"
1392
1532
msgstr " bzr diff xxx/NEWS"
1393
1533
1394
#: bzrlib/builtins.py:2171
1534
#: bzrlib/builtins.py:2264
1395
1535
msgid " Show the differences from branch xxx to this working tree:"
1396
1536
msgstr ""
1397
1537
" Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
1398
1538
1399
#: bzrlib/builtins.py:2173
1539
#: bzrlib/builtins.py:2266
1400
1540
msgid " bzr diff --old xxx"
1401
1541
msgstr " bzr diff --old xxx"
1402
1542
1403
#: bzrlib/builtins.py:2175
1543
#: bzrlib/builtins.py:2268
1404
1544
msgid " Show the differences between two branches for file NEWS::"
1405
1545
msgstr " Muestra las diferencias entre dos ramas para el archivo NEWS:"
1406
1546
1407
#: bzrlib/builtins.py:2177
1547
#: bzrlib/builtins.py:2270
1408
1548
msgid " bzr diff --old xxx --new yyy NEWS"
1409
1549
msgstr " bzr diff --old xxx --new yyy NEWS"
1410
1550
1411
#: bzrlib/builtins.py:2179
1551
#: bzrlib/builtins.py:2272
1412
1552
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1413
1553
msgstr ""
1414
1554
" Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
1415
1555
1416
#: bzrlib/builtins.py:2181
1556
#: bzrlib/builtins.py:2274
1417
1557
msgid ""
1418
1558
" bzr diff --prefix old/:new/\n"
1419
1559
" \n"
1422
1562
" bzr diff --using /usr/bin/diff --diff-options -wu"
1423
1563
msgstr ""
1424
1564
1425
#: bzrlib/builtins.py:2191
1565
#: bzrlib/builtins.py:2284
1426
1566
msgid "Pass these options to the external diff program."
1427
1567
msgstr "Pasa esta opciones para el programa diff externo."
1428
1568
1429
#: bzrlib/builtins.py:2194
1569
#: bzrlib/builtins.py:2287
1430
1570
msgid ""
1431
1571
"Set prefixes added to old and new filenames, as two values separated by a "
1432
1572
"colon. (eg \"old/:new/\")."
1433
1573
msgstr ""
1434
1574
1435
#: bzrlib/builtins.py:2197
1575
#: bzrlib/builtins.py:2290
1436
1576
msgid "Branch/tree to compare from."
1437
1577
msgstr "Rama/árbol desde donde comparar."
1438
1578
1439
#: bzrlib/builtins.py:2201
1579
#: bzrlib/builtins.py:2294
1440
1580
msgid "Branch/tree to compare to."
1441
1581
msgstr "Rama/árbol a la que comparar."
1442
1582
1443
#: bzrlib/builtins.py:2207
1583
#: bzrlib/builtins.py:2300
1444
1584
msgid "Use this command to compare files."
1445
1585
msgstr "Use esta orden para comparar archivos."
1446
1586
1447
#: bzrlib/builtins.py:2212
1587
#: bzrlib/builtins.py:2305
1448
1588
msgid "Diff format to use."
1449
1589
msgstr "Formato diff a usar."
1450
1590
1451
#: bzrlib/builtins.py:2214
1591
#: bzrlib/builtins.py:2307
1452
1592
msgid "Diff format"
1453
1593
msgstr "Formato diff"
1454
1594
1455
#: bzrlib/builtins.py:2236
1595
#: bzrlib/builtins.py:2329
1456
1596
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1457
1597
msgstr ""
1458
1598
"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
1459
1599
1460
#: bzrlib/builtins.py:2240
1600
#: bzrlib/builtins.py:2333
1461
1601
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1462
1602
msgstr ""
1463
1603
"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
1464
1604
1465
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1466
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1605
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1606
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1467
1607
msgid "{0} and {1} are mutually exclusive"
1468
1608
msgstr "{0} y {1} se excluyen mutuamente"
1469
1609
1470
#: bzrlib/builtins.py:2265
1610
#: bzrlib/builtins.py:2358
1471
1611
msgid ""
1472
1612
"List files deleted in the working tree.\n"
1473
1613
" "
1475
1615
"Lista archivos eliminados en el árbol de trabajo.\n"
1476
1616
" "
1477
1617
1478
#: bzrlib/builtins.py:2343
1618
#: bzrlib/builtins.py:2436
1479
1619
msgid "Show the tree root directory."
1480
1620
msgstr "Muestra el directorio raíz del árbol."
1481
1621
1482
#: bzrlib/builtins.py:2345
1622
#: bzrlib/builtins.py:2438
1483
1623
msgid ""
1484
1624
"The root is the nearest enclosing directory with a .bzr control\n"
1485
1625
"directory."
1486
1626
msgstr ""
1487
1627
1488
#: bzrlib/builtins.py:2360
1628
#: bzrlib/builtins.py:2453
1489
1629
msgid "The limit argument must be an integer."
1490
1630
msgstr "El argumento límite debe ser un entero."
1491
1631
1492
#: bzrlib/builtins.py:2368
1632
#: bzrlib/builtins.py:2461
1493
1633
msgid "The levels argument must be an integer."
1494
1634
msgstr "Los argumentos de niveles deben ser un entero."
1495
1635
1496
#: bzrlib/builtins.py:2373
1636
#: bzrlib/builtins.py:2466
1497
1637
msgid "Show historical log for a branch or subset of a branch."
1498
1638
msgstr ""
1499
1639
"Muestra el registro histórico de una rama o un subconjunto de una rama."
1500
1640
1501
#: bzrlib/builtins.py:2375
1641
#: bzrlib/builtins.py:2468
1502
1642
msgid ""
1503
1643
"log is bzr's default tool for exploring the history of a branch.\n"
1504
1644
"The branch to use is taken from the first parameter. If no parameters\n"
1506
1646
"Here are some simple examples::"
1507
1647
msgstr ""
1508
1648
1509
#: bzrlib/builtins.py:2380
1649
#: bzrlib/builtins.py:2473
1510
1650
msgid ""
1511
1651
" bzr log log the current branch\n"
1512
1652
" bzr log foo.py log a file in its branch\n"
1516
1656
" bzr log foo.py registra un archivo en esta rama\n"
1517
1657
" bzr log http://servidor/rama registra una rama en un servidor"
1518
1658
1519
#: bzrlib/builtins.py:2384
1659
#: bzrlib/builtins.py:2477
1520
1660
msgid ""
1521
1661
"The filtering, ordering and information shown for each revision can\n"
1522
1662
"be controlled as explained below. By default, all revisions are\n"
1526
1666
"were merged."
1527
1667
msgstr ""
1528
1668
1529
#: bzrlib/builtins.py:2391
1669
#: bzrlib/builtins.py:2484
1530
1670
msgid ":Output control:"
1531
1671
msgstr ":Control de saliuda:"
1532
1672
1533
#: bzrlib/builtins.py:2393
1673
#: bzrlib/builtins.py:2486
1534
1674
msgid ""
1535
1675
" The log format controls how information about each revision is\n"
1536
1676
" displayed. The standard log formats are called ``long``, ``short``\n"
1538
1678
" for more details on log formats."
1539
1679
msgstr ""
1540
1680
1541
#: bzrlib/builtins.py:2398
1681
#: bzrlib/builtins.py:2491
1542
1682
msgid ""
1543
1683
" The following options can be used to control what information is\n"
1544
1684
" displayed::"
1546
1686
" Las siguientes opciones se pueden usar para controlar qué información\n"
1547
1687
" se muestra::"
1548
1688
1549
#: bzrlib/builtins.py:2401
1689
#: bzrlib/builtins.py:2494
1550
1690
msgid ""
1551
1691
" -l N display a maximum of N revisions\n"
1552
1692
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1555
1695
" --show-ids display revision-ids (and file-ids), not just revnos"
1556
1696
msgstr ""
1557
1697
1558
#: bzrlib/builtins.py:2407
1698
#: bzrlib/builtins.py:2500
1559
1699
msgid ""
1560
1700
" Note that the default number of levels to display is a function of the\n"
1561
1701
" log format. If the -n option is not used, the standard log formats show\n"
1562
1702
" just the top level (mainline)."
1563
1703
msgstr ""
1564
1704
1565
#: bzrlib/builtins.py:2411
1705
#: bzrlib/builtins.py:2504
1566
1706
msgid ""
1567
1707
" Status summaries are shown using status flags like A, M, etc. To see\n"
1568
1708
" the changes explained using words like ``added`` and ``modified``\n"
1569
1709
" instead, use the -vv option."
1570
1710
msgstr ""
1571
1711
1572
#: bzrlib/builtins.py:2415
1712
#: bzrlib/builtins.py:2508
1573
1713
msgid ":Ordering control:"
1574
1714
msgstr ":Control de ordenación:"
1575
1715
1576
#: bzrlib/builtins.py:2417
1716
#: bzrlib/builtins.py:2510
1577
1717
msgid ""
1578
1718
" To display revisions from oldest to newest, use the --forward option.\n"
1579
1719
" In most cases, using this option will have little impact on the total\n"
1581
1721
" display revisions like --reverse does when it can."
1582
1722
msgstr ""
1583
1723
1584
#: bzrlib/builtins.py:2422
1724
#: bzrlib/builtins.py:2515
1585
1725
msgid ":Revision filtering:"
1586
1726
msgstr ":Filtrado de revisión:"
1587
1727
1588
#: bzrlib/builtins.py:2424
1728
#: bzrlib/builtins.py:2517
1589
1729
msgid ""
1590
1730
" The -r option can be used to specify what revision or range of revisions\n"
1591
1731
" to filter against. The various forms are shown below::"
1592
1732
msgstr ""
1593
1733
1594
#: bzrlib/builtins.py:2427
1734
#: bzrlib/builtins.py:2520
1595
1735
msgid ""
1596
1736
" -rX display revision X\n"
1597
1737
" -rX.. display revision X and later\n"
1603
1743
" -r..Y muestra hasta la revisión Y inclusive\n"
1604
1744
" -rX..Y muestra desde X a Y inclusive"
1605
1745
1606
#: bzrlib/builtins.py:2432
1746
#: bzrlib/builtins.py:2525
1607
1747
msgid ""
1608
1748
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1609
1749
" Some common examples are given below::"
1612
1752
"X e Y.\n"
1613
1753
" Más abajo se listan algunos ejemplos::"
1614
1754
1615
#: bzrlib/builtins.py:2435
1755
#: bzrlib/builtins.py:2528
1616
1756
msgid ""
1617
1757
" -r-1 show just the tip\n"
1618
1758
" -r-10.. show the last 10 mainline revisions\n"
1622
1762
" -rdate:yesterday.. show changes since yesterday"
1623
1763
msgstr ""
1624
1764
1625
#: bzrlib/builtins.py:2442
1765
#: bzrlib/builtins.py:2535
1626
1766
msgid ""
1627
1767
" When logging a range of revisions using -rX..Y, log starts at\n"
1628
1768
" revision Y and searches back in history through the primary\n"
1632
1772
" a nested merge revision and the log will be truncated accordingly."
1633
1773
msgstr ""
1634
1774
1635
#: bzrlib/builtins.py:2449
1775
#: bzrlib/builtins.py:2542
1636
1776
msgid ":Path filtering:"
1637
1777
msgstr ":Filtrado de ruta:"
1638
1778
1639
#: bzrlib/builtins.py:2451
1779
#: bzrlib/builtins.py:2544
1640
1780
msgid ""
1641
1781
" If parameters are given and the first one is not a branch, the log\n"
1642
1782
" will be filtered to show only those revisions that changed the\n"
1646
1786
" se filtrará para mostrar solo las revisiones que cambiaron los\n"
1647
1787
" archivos o directorios nominados."
1648
1788
1649
#: bzrlib/builtins.py:2455
1789
#: bzrlib/builtins.py:2548
1650
1790
msgid ""
1651
1791
" Filenames are interpreted within their historical context. To log a\n"
1652
1792
" deleted file, specify a revision range so that the file existed at\n"
1653
1793
" the end or start of the range."
1654
1794
msgstr ""
1655
1795
1656
#: bzrlib/builtins.py:2459
1796
#: bzrlib/builtins.py:2552
1657
1797
msgid ""
1658
1798
" Historical context is also important when interpreting pathnames of\n"
1659
1799
" renamed files/directories. Consider the following example:"
1660
1800
msgstr ""
1661
1801
1662
#: bzrlib/builtins.py:2462
1802
#: bzrlib/builtins.py:2555
1663
1803
msgid ""
1664
1804
" * revision 1: add tutorial.txt\n"
1665
1805
" * revision 2: modify tutorial.txt\n"
1666
1806
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1667
1807
msgstr ""
1808
" * revisión 1: añadir tutorial.txt\n"
1809
" * revisión 2: modificar tutorial.txt\n"
1810
" * revisión 3: renombrar tutorial.txt a guide.txt; añadir tutorial.txt"
1668
1811
1669
#: bzrlib/builtins.py:2466
1812
#: bzrlib/builtins.py:2559
1670
1813
msgid " In this case:"
1671
1814
msgstr " en este caso:"
1672
1815
1673
#: bzrlib/builtins.py:2468
1816
#: bzrlib/builtins.py:2561
1674
1817
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1675
1818
msgstr ""
1676
1819
" * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
1677
1820
1678
#: bzrlib/builtins.py:2470
1821
#: bzrlib/builtins.py:2563
1679
1822
msgid ""
1680
1823
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1681
1824
msgstr ""
1682
1825
" * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
1683
1826
"revisión 3"
1684
1827
1685
#: bzrlib/builtins.py:2472
1828
#: bzrlib/builtins.py:2565
1686
1829
msgid ""
1687
1830
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1688
1831
" the original file in revision 2."
1690
1833
" * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
1691
1834
" archivo original en la revisión 2."
1692
1835
1693
#: bzrlib/builtins.py:2475
1836
#: bzrlib/builtins.py:2568
1694
1837
msgid ""
1695
1838
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1696
1839
" was no file called guide.txt in revision 2."
1697
1840
msgstr ""
1698
1841
1699
#: bzrlib/builtins.py:2478
1842
#: bzrlib/builtins.py:2571
1700
1843
msgid ""
1701
1844
" Renames are always followed by log. By design, there is no need to\n"
1702
1845
" explicitly ask for this (and no way to stop logging a file back\n"
1703
1846
" until it was last renamed)."
1704
1847
msgstr ""
1705
1848
1706
#: bzrlib/builtins.py:2482
1849
#: bzrlib/builtins.py:2575
1707
1850
msgid ":Other filtering:"
1708
1851
msgstr ":Otro filtrado:"
1709
1852
1710
#: bzrlib/builtins.py:2484
1853
#: bzrlib/builtins.py:2577
1711
1854
msgid ""
1712
1855
" The --match option can be used for finding revisions that match a\n"
1713
1856
" regular expression in a commit message, committer, author or bug.\n"
1716
1859
" --match-message can be used to only match a specific field."
1717
1860
msgstr ""
1718
1861
1719
#: bzrlib/builtins.py:2490
1862
#: bzrlib/builtins.py:2583
1720
1863
msgid ":Tips & tricks:"
1721
1864
msgstr ":Trucos y consejos:"
1722
1865
1723
#: bzrlib/builtins.py:2492
1866
#: bzrlib/builtins.py:2585
1724
1867
msgid ""
1725
1868
" GUI tools and IDEs are often better at exploring history than command\n"
1726
1869
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1729
1872
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1730
1873
msgstr ""
1731
1874
1732
#: bzrlib/builtins.py:2498
1875
#: bzrlib/builtins.py:2591
1733
1876
msgid ""
1734
1877
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1735
1878
msgstr ""
1736
1879
1737
#: bzrlib/builtins.py:2500
1880
#: bzrlib/builtins.py:2593
1738
1881
msgid ""
1739
1882
" [ALIASES]\n"
1740
1883
" tip = log -r-1\n"
1746
1889
" top = log -l10 --line\n"
1747
1890
" show = log -v -p"
1748
1891
1749
#: bzrlib/builtins.py:2505
1892
#: bzrlib/builtins.py:2598
1750
1893
msgid ""
1751
1894
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1752
1895
" will show the last 10 mainline revisions. To see the details of a\n"
1753
1896
" particular revision X, ``bzr show -rX``."
1754
1897
msgstr ""
1755
1898
1756
#: bzrlib/builtins.py:2509
1899
#: bzrlib/builtins.py:2602
1757
1900
msgid ""
1758
1901
" If you are interested in looking deeper into a particular merge X,\n"
1759
1902
" use ``bzr log -n0 -rX``."
1761
1904
" Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
1762
1905
" use «bzr log -n0 -rX»."
1763
1906
1764
#: bzrlib/builtins.py:2512
1907
#: bzrlib/builtins.py:2605
1765
1908
msgid ""
1766
1909
" ``bzr log -v`` on a branch with lots of history is currently\n"
1767
1910
" very slow. A fix for this issue is currently under development.\n"
1769
1912
" be given when using the -v option."
1770
1913
msgstr ""
1771
1914
1772
#: bzrlib/builtins.py:2517
1915
#: bzrlib/builtins.py:2610
1773
1916
msgid ""
1774
1917
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1775
1918
" used to find revisions matching user names, commit messages, etc.\n"
1777
1920
" a list of words but not others."
1778
1921
msgstr ""
1779
1922
1780
#: bzrlib/builtins.py:2522
1923
#: bzrlib/builtins.py:2615
1781
1924
msgid ""
1782
1925
" When exploring non-mainline history on large projects with deep\n"
1783
1926
" history, the performance of log can be greatly improved by installing\n"
1785
1928
" trading disk space for faster speed."
1786
1929
msgstr ""
1787
1930
1788
#: bzrlib/builtins.py:2531
1931
#: bzrlib/builtins.py:2624
1789
1932
msgid "Show from oldest to newest."
1790
1933
msgstr "Muestra desde el más antiguo al más moderno."
1791
1934
1792
#: bzrlib/builtins.py:2534
1935
#: bzrlib/builtins.py:2627
1793
1936
msgid "Show files changed in each revision."
1794
1937
msgstr "Muestra los archivos cambiados en cada revisión."
1795
1938
1796
#: bzrlib/builtins.py:2540
1939
#: bzrlib/builtins.py:2633
1797
1940
msgid "Show just the specified revision. See also \"help revisionspec\"."
1798
1941
msgstr ""
1799
1942
"Muestra solo la revisión especificada. Vea también «help revisionspec»."
1800
1943
1801
#: bzrlib/builtins.py:2544
1944
#: bzrlib/builtins.py:2637
1802
1945
msgid "What names to list as authors - first, all or committer."
1803
1946
msgstr ""
1804
1947
1805
#: bzrlib/builtins.py:2545
1948
#: bzrlib/builtins.py:2638
1806
1949
msgid "Authors"
1807
1950
msgstr "Autores"
1808
1951
1809
#: bzrlib/builtins.py:2550
1952
#: bzrlib/builtins.py:2643
1810
1953
msgid "Number of levels to display - 0 for all, 1 for flat."
1811
1954
msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
1812
1955
1813
#: bzrlib/builtins.py:2560
1956
#: bzrlib/builtins.py:2653
1814
1957
msgid "Limit the output to the first N revisions."
1815
1958
msgstr "Límite de salida para las primeras N revisiones."
1816
1959
1817
#: bzrlib/builtins.py:2565
1960
#: bzrlib/builtins.py:2658
1818
1961
msgid "Show changes made in each revision as a patch."
1819
1962
msgstr "Mostrar cambios realizados en cada revisión como un parche."
1820
1963
1821
#: bzrlib/builtins.py:2567
1964
#: bzrlib/builtins.py:2660
1822
1965
msgid "Show merged revisions like --levels 0 does."
1823
1966
msgstr ""
1824
1967
1825
#: bzrlib/builtins.py:2571
1968
#: bzrlib/builtins.py:2664
1826
1969
msgid "Do not report commits with more than one parent."
1827
1970
msgstr "No informar de ejecuciones con más de un padre."
1828
1971
1829
#: bzrlib/builtins.py:2573
1972
#: bzrlib/builtins.py:2666
1830
1973
msgid ""
1831
1974
"Display only the revisions that are not part of both ancestries (require -"
1832
1975
"rX..Y)."
1833
1976
msgstr ""
1834
1977
1835
#: bzrlib/builtins.py:2577
1978
#: bzrlib/builtins.py:2670
1836
1979
msgid "Show digital signature validity."
1837
1980
msgstr ""
1838
1981
1839
#: bzrlib/builtins.py:2580
1982
#: bzrlib/builtins.py:2673
1840
1983
msgid "Show revisions whose properties match this expression."
1841
1984
msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
1842
1985
1843
#: bzrlib/builtins.py:2584
1986
#: bzrlib/builtins.py:2677
1844
1987
msgid "Show revisions whose message matches this expression."
1845
1988
msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
1846
1989
1847
#: bzrlib/builtins.py:2588
1990
#: bzrlib/builtins.py:2681
1848
1991
msgid "Show revisions whose committer matches this expression."
1849
1992
msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
1850
1993
1851
#: bzrlib/builtins.py:2592
1994
#: bzrlib/builtins.py:2685
1852
1995
msgid "Show revisions whose authors match this expression."
1853
1996
msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
1854
1997
1855
#: bzrlib/builtins.py:2596
1998
#: bzrlib/builtins.py:2689
1856
1999
msgid "Show revisions whose bugs match this expression."
1857
2000
msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
1858
2001
1859
#: bzrlib/builtins.py:2650
2002
#: bzrlib/builtins.py:2743
1860
2003
msgid "--exclude-common-ancestry requires -r with two revisions"
1861
2004
msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
1862
2005
1863
#: bzrlib/builtins.py:2678
2006
#: bzrlib/builtins.py:2771
1864
2007
#, python-format
1865
2008
msgid "Path unknown at end or start of revision range: %s"
1866
2009
msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
1867
2010
1868
#: bzrlib/builtins.py:2795
2011
#: bzrlib/builtins.py:2888
1869
2012
#, python-format
1870
2013
msgid "bzr %s doesn't accept two revisions in different branches."
1871
2014
msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
1872
2015
1873
#: bzrlib/builtins.py:2811
2016
#: bzrlib/builtins.py:2904
1874
2017
#, python-format
1875
2018
msgid "bzr %s --revision takes one or two values."
1876
2019
msgstr "bzr %s --revision toma uno o dos valores."
1877
2020
1878
#: bzrlib/builtins.py:2856
2021
#: bzrlib/builtins.py:2949
1879
2022
msgid ""
1880
2023
"List files in a tree.\n"
1881
2024
" "
1883
2026
"Lista archivos en un árbol\n"
1884
2027
" "
1885
2028
1886
#: bzrlib/builtins.py:2865
2029
#: bzrlib/builtins.py:2958
1887
2030
msgid "Recurse into subdirectories."
1888
2031
msgstr ""
1889
2032
1890
#: bzrlib/builtins.py:2867
2033
#: bzrlib/builtins.py:2960
1891
2034
msgid "Print paths relative to the root of the branch."
1892
2035
msgstr "Imprime rutas relativas a la raíz de la rama."
1893
2036
1894
#: bzrlib/builtins.py:2869
2037
#: bzrlib/builtins.py:2962
1895
2038
msgid "Print unknown files."
1896
2039
msgstr "Imprimir archivos desconocidos."
1897
2040
1898
#: bzrlib/builtins.py:2870
2041
#: bzrlib/builtins.py:2963
1899
2042
msgid "Print versioned files."
1900
2043
msgstr "Imprimir archivos versionados."
1901
2044
1902
#: bzrlib/builtins.py:2873
2045
#: bzrlib/builtins.py:2966
1903
2046
msgid "Print ignored files."
1904
2047
msgstr "Imprimir archivos ignorados."
1905
2048
1906
#: bzrlib/builtins.py:2875
2049
#: bzrlib/builtins.py:2968
1907
2050
msgid "List entries of a particular kind: file, directory, symlink."
1908
2051
msgstr ""
1909
2052
"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
1910
2053
1911
#: bzrlib/builtins.py:2888
2054
#: bzrlib/builtins.py:2981
1912
2055
msgid "invalid kind specified"
1913
2056
msgstr "tivo inválido especificado"
1914
2057
1915
#: bzrlib/builtins.py:2891
2058
#: bzrlib/builtins.py:2984
1916
2059
msgid "Cannot set both --verbose and --null"
1917
2060
msgstr "No se pueden establecer ambos --verbose y --null"
1918
2061
1919
#: bzrlib/builtins.py:2900
2062
#: bzrlib/builtins.py:2993
1920
2063
msgid "cannot specify both --from-root and PATH"
1921
2064
msgstr "No se pueden establecer ambos --from-root y PATH"
1922
2065
1923
#: bzrlib/builtins.py:2987
2066
#: bzrlib/builtins.py:3080
1924
2067
msgid "Ignore specified files or patterns."
1925
2068
msgstr "Ignorar archivos o patrones especificados."
1926
2069
1927
#: bzrlib/builtins.py:2989
2070
#: bzrlib/builtins.py:3082
1928
2071
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1929
2072
msgstr ""
1930
2073
"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
1931
2074
1932
#: bzrlib/builtins.py:2991
2075
#: bzrlib/builtins.py:3084
1933
2076
msgid ""
1934
2077
"If a .bzrignore file does not exist, the ignore command\n"
1935
2078
"will create one and add the specified files or patterns to the newly\n"
1938
2081
"the use of the ignore command will require an explicit add command."
1939
2082
msgstr ""
1940
2083
1941
#: bzrlib/builtins.py:2997
2084
#: bzrlib/builtins.py:3090
1942
2085
msgid ""
1943
2086
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1944
2087
"After adding, editing or deleting that file either indirectly by\n"
1951
2094
"el uso de esta orden, o directamente mediante un editor, asegúrese de "
1952
2095
"ejecutarlo."
1953
2096
1954
#: bzrlib/builtins.py:3002
2097
#: bzrlib/builtins.py:3095
1955
2098
msgid ""
1956
2099
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1957
2100
"the global ignore file can be found in the application data directory as\n"
1960
2103
"can be edited directly using an editor."
1961
2104
msgstr ""
1962
2105
1963
#: bzrlib/builtins.py:3008
2106
#: bzrlib/builtins.py:3101
1964
2107
msgid ""
1965
2108
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1966
2109
"precedence over regular ignores. Such exceptions are used to specify\n"
1967
2110
"files that should be versioned which would otherwise be ignored."
1968
2111
msgstr ""
1969
2112
1970
#: bzrlib/builtins.py:3012
2113
#: bzrlib/builtins.py:3105
1971
2114
msgid ""
1972
2115
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1973
2116
"precedence over the '!' exception patterns."
1974
2117
msgstr ""
1975
2118
1976
#: bzrlib/builtins.py:3015
2119
#: bzrlib/builtins.py:3108
1977
2120
msgid ""
1978
2121
":Notes: \n"
1979
2122
" \n"
1981
2124
" the shell on Unix."
1982
2125
msgstr ""
1983
2126
1984
#: bzrlib/builtins.py:3020
2127
#: bzrlib/builtins.py:3113
1985
2128
msgid ""
1986
2129
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1987
2130
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1988
2131
msgstr ""
1989
2132
1990
#: bzrlib/builtins.py:3023
2133
#: bzrlib/builtins.py:3116
1991
2134
msgid ""
1992
2135
":Examples:\n"
1993
2136
" Ignore the top level Makefile::"
1994
2137
msgstr ""
1995
2138
1996
#: bzrlib/builtins.py:3026
2139
#: bzrlib/builtins.py:3119
1997
2140
msgid " bzr ignore ./Makefile"
1998
2141
msgstr " bzr ignore ./Makefile"
1999
2142
2000
#: bzrlib/builtins.py:3028
2143
#: bzrlib/builtins.py:3121
2001
2144
msgid " Ignore .class files in all directories...::"
2002
2145
msgstr " Ignorar archivos .class en todos los directorios...::"
2003
2146
2004
#: bzrlib/builtins.py:3030
2147
#: bzrlib/builtins.py:3123
2005
2148
msgid " bzr ignore \"*.class\""
2006
2149
msgstr " bzr ignore \"*.class\""
2007
2150
2008
#: bzrlib/builtins.py:3032
2151
#: bzrlib/builtins.py:3125
2009
2152
msgid " ...but do not ignore \"special.class\"::"
2010
2153
msgstr " ...pero no ignora «special.class»::"
2011
2154
2012
#: bzrlib/builtins.py:3034
2155
#: bzrlib/builtins.py:3127
2013
2156
msgid " bzr ignore \"!special.class\""
2014
2157
msgstr " bzr ignore «!special.class»"
2015
2158
2016
#: bzrlib/builtins.py:3036
2159
#: bzrlib/builtins.py:3129
2017
2160
msgid " Ignore files whose name begins with the \"#\" character::"
2018
2161
msgstr " Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
2019
2162
2020
#: bzrlib/builtins.py:3038
2163
#: bzrlib/builtins.py:3131
2021
2164
msgid " bzr ignore \"RE:^#\""
2022
2165
msgstr " bzr ignore \"RE:^#\""
2023
2166
2024
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
2167
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2025
2168
msgid " Ignore .o files under the lib directory::"
2026
2169
msgstr " Ignorar archivos .o bajo el directorio lib::"
2027
2170
2028
#: bzrlib/builtins.py:3042
2171
#: bzrlib/builtins.py:3135
2029
2172
msgid " bzr ignore \"lib/**/*.o\""
2030
2173
msgstr " bzr ignore \"lib/**/*.o\""
2031
2174
2032
#: bzrlib/builtins.py:3046
2175
#: bzrlib/builtins.py:3139
2033
2176
msgid " bzr ignore \"RE:lib/.*\\.o\""
2034
2177
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2035
2178
2036
#: bzrlib/builtins.py:3048
2179
#: bzrlib/builtins.py:3141
2037
2180
msgid " Ignore everything but the \"debian\" toplevel directory::"
2038
2181
msgstr ""
2039
2182
" Ignorar todo excepto el directorio de nivel superior de «debian»::"
2040
2183
2041
#: bzrlib/builtins.py:3050
2184
#: bzrlib/builtins.py:3143
2042
2185
msgid ""
2043
2186
" bzr ignore \"RE:(?!debian/).*\"\n"
2044
2187
" \n"
2050
2193
" bzr ignore \"!!*~\""
2051
2194
msgstr ""
2052
2195
2053
#: bzrlib/builtins.py:3064
2196
#: bzrlib/builtins.py:3157
2054
2197
msgid "Display the default ignore rules that bzr uses."
2055
2198
msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
2056
2199
2057
#: bzrlib/builtins.py:3076
2200
#: bzrlib/builtins.py:3169
2058
2201
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2059
2202
msgstr ""
2060
2203
2061
#: bzrlib/builtins.py:3087
2204
#: bzrlib/builtins.py:3180
2062
2205
#, python-format
2063
2206
msgid "Invalid ignore pattern found. %s"
2064
2207
msgid_plural "Invalid ignore patterns found. %s"
2065
2208
msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
2066
2209
msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
2067
2210
2068
#: bzrlib/builtins.py:3096
2211
#: bzrlib/builtins.py:3189
2069
2212
msgid "NAME_PATTERN should not be an absolute path"
2070
2213
msgstr "NAME_PATTERN no debe ser una ruta absoluta"
2071
2214
2072
#: bzrlib/builtins.py:3109
2215
#: bzrlib/builtins.py:3202
2073
2216
#, python-format
2074
2217
msgid ""
2075
2218
"Warning: the following files are version controlled and match your ignore "
2079
2222
"them.\n"
2080
2223
msgstr ""
2081
2224
2082
#: bzrlib/builtins.py:3116
2225
#: bzrlib/builtins.py:3209
2083
2226
msgid "List ignored files and the patterns that matched them."
2084
2227
msgstr "Lista todos los archivos ignorados y patrones que conciden."
2085
2228
2086
#: bzrlib/builtins.py:3118
2229
#: bzrlib/builtins.py:3211
2087
2230
msgid ""
2088
2231
"List all the ignored files and the ignore pattern that caused the file to\n"
2089
2232
"be ignored."
2090
2233
msgstr ""
2091
2234
2092
#: bzrlib/builtins.py:3121
2235
#: bzrlib/builtins.py:3214
2093
2236
msgid "Alternatively, to list just the files::"
2094
2237
msgstr "Alternativamente, lista solo los archivos:"
2095
2238
2096
#: bzrlib/builtins.py:3123
2239
#: bzrlib/builtins.py:3216
2097
2240
msgid " bzr ls --ignored"
2098
2241
msgstr " bzr ls --ignored"
2099
2242
2100
#: bzrlib/builtins.py:3157
2243
#: bzrlib/builtins.py:3250
2101
2244
#, python-format
2102
2245
msgid "not a valid revision-number: %r"
2103
2246
msgstr "no es un número de revisión válido: %r"
2104
2247
2105
#: bzrlib/builtins.py:3164
2248
#: bzrlib/builtins.py:3257
2106
2249
msgid ""
2107
2250
"Export current or past revision to a destination directory or archive."
2108
2251
msgstr ""
2109
2252
"Exporta la revisión actual o pasada a un directorio de destino o un "
2110
2253
"archivador."
2111
2254
2112
#: bzrlib/builtins.py:3166
2255
#: bzrlib/builtins.py:3259
2113
2256
msgid "If no revision is specified this exports the last committed revision."
2114
2257
msgstr "Si no se especifica revisión, exporta la última revisión ejecutada."
2115
2258
2116
#: bzrlib/builtins.py:3168
2259
#: bzrlib/builtins.py:3261
2117
2260
msgid ""
2118
2261
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2119
2262
"given, try to find the format with the extension. If no extension\n"
2120
2263
"is found exports to a directory (equivalent to --format=dir)."
2121
2264
msgstr ""
2122
2265
2123
#: bzrlib/builtins.py:3172
2266
#: bzrlib/builtins.py:3265
2124
2267
msgid ""
2125
2268
"If root is supplied, it will be used as the root directory inside\n"
2126
2269
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2127
2270
"to the exported filename. The root option has no effect for 'dir' format."
2128
2271
msgstr ""
2129
2272
2130
#: bzrlib/builtins.py:3176
2273
#: bzrlib/builtins.py:3269
2131
2274
msgid ""
2132
2275
"If branch is omitted then the branch containing the current working\n"
2133
2276
"directory will be used."
2135
2278
"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
2136
2279
"de trabajo actual."
2137
2280
2138
#: bzrlib/builtins.py:3179
2281
#: bzrlib/builtins.py:3272
2139
2282
msgid ""
2140
2283
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2141
2284
msgstr ""
2142
2285
"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
2143
2286
2144
#: bzrlib/builtins.py:3181
2287
#: bzrlib/builtins.py:3274
2145
2288
msgid ""
2146
2289
" ================= =========================\n"
2147
2290
" Supported formats Autodetected by extension\n"
2163
2306
" zip .zip\n"
2164
2307
" ================= ==================================="
2165
2308
2166
#: bzrlib/builtins.py:3195
2309
#: bzrlib/builtins.py:3288
2167
2310
msgid "Type of file to export to."
2168
2311
msgstr "Tipo de archivo para exportar."
2169
2312
2170
#: bzrlib/builtins.py:3198
2313
#: bzrlib/builtins.py:3291
2171
2314
msgid "Apply content filters to export the convenient form."
2172
2315
msgstr ""
2173
2316
"Aplicar los filtros de contenido para exportar el formulario conveniente."
2174
2317
2175
#: bzrlib/builtins.py:3202
2318
#: bzrlib/builtins.py:3295
2176
2319
msgid "Name of the root directory inside the exported file."
2177
2320
msgstr "Nombre del directorio raíz dentro del archivo exportado."
2178
2321
2179
#: bzrlib/builtins.py:3204
2322
#: bzrlib/builtins.py:3297
2180
2323
msgid ""
2181
2324
"Set modification time of files to that of the last revision in which it was "
2182
2325
"changed."
2184
2327
"Establecer la fecha de modificación de los archivos a la de la última "
2185
2328
"revisión en la que se cambió."
2186
2329
2187
#: bzrlib/builtins.py:3207
2330
#: bzrlib/builtins.py:3300
2188
2331
msgid ""
2189
2332
"Export the working tree contents rather than that of the last revision."
2190
2333
msgstr ""
2191
2334
2192
#: bzrlib/builtins.py:3226
2335
#: bzrlib/builtins.py:3319
2193
2336
msgid "--uncommitted requires a working tree"
2194
2337
msgstr ""
2195
2338
2196
#: bzrlib/builtins.py:3235
2339
#: bzrlib/builtins.py:3328
2197
2340
#, python-format
2198
2341
msgid "Unsupported export format: %s"
2199
2342
msgstr "Formato de exportación no permitido: %s"
2200
2343
2201
#: bzrlib/builtins.py:3239
2344
#: bzrlib/builtins.py:3332
2202
2345
msgid ""
2203
2346
"Write the contents of a file as of a given revision to standard output."
2204
2347
msgstr ""
2205
2348
"Escribir los contenidos de un archivo como una revisión dada a la salida "
2206
2349
"estándar."
2207
2350
2208
#: bzrlib/builtins.py:3241
2351
#: bzrlib/builtins.py:3334
2209
2352
msgid "If no revision is nominated, the last revision is used."
2210
2353
msgstr "SI no hay una revisión nominada, se usa la última revisión."
2211
2354
2212
#: bzrlib/builtins.py:3243
2355
#: bzrlib/builtins.py:3336
2213
2356
msgid ""
2214
2357
"Note: Take care to redirect standard output when using this command on a\n"
2215
2358
"binary file."
2216
2359
msgstr ""
2217
2360
2218
#: bzrlib/builtins.py:3249
2361
#: bzrlib/builtins.py:3342
2219
2362
msgid "The path name in the old tree."
2220
2363
msgstr "La ruta en el árbol antiguo."
2221
2364
2222
#: bzrlib/builtins.py:3250
2365
#: bzrlib/builtins.py:3343
2223
2366
msgid "Apply content filters to display the convenience form."
2224
2367
msgstr ""
2225
2368
2226
#: bzrlib/builtins.py:3261
2369
#: bzrlib/builtins.py:3354
2227
2370
msgid "bzr cat --revision takes exactly one revision specifier"
2228
2371
msgstr "bzr cat --revision toma específicamente un especificador de revisión"
2229
2372
2230
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2373
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2231
2374
msgid "{0!r} is not present in revision {1}"
2232
2375
msgstr "{0!r} no está presente en la revisión {1}"
2233
2376
2234
#: bzrlib/builtins.py:3321
2377
#: bzrlib/builtins.py:3414
2235
2378
msgid "Commit changes into a new revision."
2236
2379
msgstr "Ejecutar cambios en una revisión nueva."
2237
2380
2238
#: bzrlib/builtins.py:3323
2381
#: bzrlib/builtins.py:3416
2239
2382
msgid ""
2240
2383
"An explanatory message needs to be given for each commit. This is\n"
2241
2384
"often done by using the --message option (getting the message from the\n"
2245
2388
"boilerplate text loaded into the editor, use the --show-diff option."
2246
2389
msgstr ""
2247
2390
2248
#: bzrlib/builtins.py:3330
2391
#: bzrlib/builtins.py:3423
2249
2392
msgid ""
2250
2393
"By default, the entire tree is committed and the person doing the\n"
2251
2394
"commit is assumed to be the author. These defaults can be overridden\n"
2252
2395
"as explained below."
2253
2396
msgstr ""
2254
2397
2255
#: bzrlib/builtins.py:3334
2398
#: bzrlib/builtins.py:3427
2256
2399
msgid ":Selective commits:"
2257
2400
msgstr ""
2258
2401
2259
#: bzrlib/builtins.py:3336
2402
#: bzrlib/builtins.py:3429
2260
2403
msgid ""
2261
2404
" If selected files are specified, only changes to those files are\n"
2262
2405
" committed. If a directory is specified then the directory and\n"
2263
2406
" everything within it is committed."
2264
2407
msgstr ""
2265
2408
2266
#: bzrlib/builtins.py:3340
2409
#: bzrlib/builtins.py:3433
2267
2410
msgid ""
2268
2411
" When excludes are given, they take precedence over selected files.\n"
2269
2412
" For example, to commit only changes within foo, but not changes\n"
2270
2413
" within foo/bar::"
2271
2414
msgstr ""
2272
2415
2273
#: bzrlib/builtins.py:3344
2416
#: bzrlib/builtins.py:3437
2274
2417
msgid " bzr commit foo -x foo/bar"
2275
2418
msgstr " bzr commit foo -x foo/bar"
2276
2419
2277
#: bzrlib/builtins.py:3346
2420
#: bzrlib/builtins.py:3439
2278
2421
msgid " A selective commit after a merge is not yet supported."
2279
2422
msgstr " No está permitida una ejecución selectiva después de una fusión."
2280
2423
2281
#: bzrlib/builtins.py:3348
2424
#: bzrlib/builtins.py:3441
2282
2425
msgid ":Custom authors:"
2283
2426
msgstr ":Autores personalizados:"
2284
2427
2285
#: bzrlib/builtins.py:3350
2428
#: bzrlib/builtins.py:3443
2286
2429
msgid ""
2287
2430
" If the author of the change is not the same person as the committer,\n"
2288
2431
" you can specify the author's name using the --author option. The\n"
2292
2435
" author."
2293
2436
msgstr ""
2294
2437
2295
#: bzrlib/builtins.py:3357
2438
#: bzrlib/builtins.py:3450
2296
2439
msgid ":Checks:"
2297
2440
msgstr ":Comprobaciones:"
2298
2441
2299
#: bzrlib/builtins.py:3359
2442
#: bzrlib/builtins.py:3452
2300
2443
msgid ""
2301
2444
" A common mistake is to forget to add a new file or directory before\n"
2302
2445
" running the commit command. The --strict option checks for unknown\n"
2305
2448
" for details."
2306
2449
msgstr ""
2307
2450
2308
#: bzrlib/builtins.py:3365
2451
#: bzrlib/builtins.py:3458
2309
2452
msgid ":Things to note:"
2310
2453
msgstr ":Cosas a tener en cuenta:"
2311
2454
2312
#: bzrlib/builtins.py:3367
2455
#: bzrlib/builtins.py:3460
2313
2456
msgid ""
2314
2457
" If you accidentially commit the wrong changes or make a spelling\n"
2315
2458
" mistake in the commit message say, you can use the uncommit command\n"
2316
2459
" to undo it. See ``bzr help uncommit`` for details."
2317
2460
msgstr ""
2318
2461
2319
#: bzrlib/builtins.py:3371
2462
#: bzrlib/builtins.py:3464
2320
2463
msgid ""
2321
2464
" Hooks can also be configured to run after a commit. This allows you\n"
2322
2465
" to trigger updates to external systems like bug trackers. The --fixes\n"
2324
2467
" one or more bugs. See ``bzr help bugs`` for details."
2325
2468
msgstr ""
2326
2469
2327
#: bzrlib/builtins.py:3381
2470
#: bzrlib/builtins.py:3474
2328
2471
msgid "Do not consider changes made to a given path."
2329
2472
msgstr "No considerar los cambios realizados en una ruta dada."
2330
2473
2331
#: bzrlib/builtins.py:3384
2474
#: bzrlib/builtins.py:3477
2332
2475
msgid "Description of the new revision."
2333
2476
msgstr "Descripción de la revisión nueva."
2334
2477
2335
#: bzrlib/builtins.py:3387
2478
#: bzrlib/builtins.py:3480
2336
2479
msgid "Commit even if nothing has changed."
2337
2480
msgstr "Ejecutar incluso si no ha cambiado nada."
2338
2481
2339
#: bzrlib/builtins.py:3391
2482
#: bzrlib/builtins.py:3484
2340
2483
msgid "Take commit message from this file."
2341
2484
msgstr "Tomar el mensaje de ejecución desde este archivo."
2342
2485
2343
#: bzrlib/builtins.py:3393
2486
#: bzrlib/builtins.py:3486
2344
2487
msgid "Refuse to commit if there are unknown files in the working tree."
2345
2488
msgstr ""
2346
2489
"Rechazar la ejecución si hay archivos desconocidos en el árbol de trabajo."
2347
2490
2348
#: bzrlib/builtins.py:3396
2491
#: bzrlib/builtins.py:3489
2349
2492
msgid ""
2350
2493
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2351
2494
"08:00:00 +0100'."
2353
2496
"Establecer manualmente la hora de ejecución usando un formato de fecha de "
2354
2497
"ejecución, por ejemplo «2009-10-10 08:00:00 +0100»."
2355
2498
2356
#: bzrlib/builtins.py:3399
2499
#: bzrlib/builtins.py:3492
2357
2500
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2358
2501
msgstr ""
2359
2502
"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
2360
2503
2361
#: bzrlib/builtins.py:3402
2504
#: bzrlib/builtins.py:3495
2362
2505
msgid "Set the author's name, if it's different from the committer."
2363
2506
msgstr ""
2364
2507
"Establecer el nombre del autor, si este es diferente al del ejecutor."
2365
2508
2366
#: bzrlib/builtins.py:3405
2509
#: bzrlib/builtins.py:3498
2367
2510
msgid ""
2368
2511
"Perform a local commit in a bound branch. Local commits are not pushed to "
2369
2512
"the master branch until a normal commit is performed."
2370
2513
msgstr ""
2371
2514
2372
#: bzrlib/builtins.py:3411
2515
#: bzrlib/builtins.py:3504
2373
2516
msgid ""
2374
2517
"When no message is supplied, show the diff along with the status summary in "
2375
2518
"the message editor."
2376
2519
msgstr ""
2377
2520
2378
#: bzrlib/builtins.py:3414
2521
#: bzrlib/builtins.py:3507
2379
2522
msgid ""
2380
2523
"When committing to a foreign version control system do not push data that "
2381
2524
"can not be natively represented."
2382
2525
msgstr ""
2383
2526
2384
#: bzrlib/builtins.py:3432
2527
#: bzrlib/builtins.py:3525
2385
2528
#, python-format
2386
2529
msgid ""
2387
2530
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2389
2532
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2390
2533
msgstr ""
2391
2534
2392
#: bzrlib/builtins.py:3441
2535
#: bzrlib/builtins.py:3534
2393
2536
#, python-format
2394
2537
msgid ""
2395
2538
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2397
2540
"Commit refused."
2398
2541
msgstr ""
2399
2542
2400
#: bzrlib/builtins.py:3450
2543
#: bzrlib/builtins.py:3543
2401
2544
#, python-format
2402
2545
msgid "Unrecognized bug %s. Commit refused."
2403
2546
msgstr "Error no reconocido %s. Ejecución rechazada."
2404
2547
2405
#: bzrlib/builtins.py:3453
2548
#: bzrlib/builtins.py:3546
2406
2549
#, python-format
2407
2550
msgid ""
2408
2551
"%s\n"
2411
2554
"%s\n"
2412
2555
"Ejecución rechazada."
2413
2556
2414
#: bzrlib/builtins.py:3477
2557
#: bzrlib/builtins.py:3570
2415
2558
msgid "Could not parse --commit-time: "
2416
2559
msgstr "No se puede analizar --commit-time: "
2417
2560
2418
#: bzrlib/builtins.py:3517
2561
#: bzrlib/builtins.py:3610
2419
2562
msgid "please specify either --message or --file"
2420
2563
msgstr "especifique uno --message o --file"
2421
2564
2422
#: bzrlib/builtins.py:3546
2565
#: bzrlib/builtins.py:3639
2423
2566
msgid "please specify a commit message with either --message or --file"
2424
2567
msgstr "especifique un mensaje de ejecución con --message o --file"
2425
2568
2426
#: bzrlib/builtins.py:3549
2569
#: bzrlib/builtins.py:3642
2427
2570
msgid ""
2428
2571
"Empty commit message specified. Please specify a commit message with either -"
2429
2572
"-message or --file or leave a blank message with --message \"\"."
2430
2573
msgstr ""
2431
2574
2432
#: bzrlib/builtins.py:3569
2575
#: bzrlib/builtins.py:3662
2433
2576
msgid ""
2434
2577
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2435
2578
"-unchanged to force an empty commit."
2437
2580
"No hay cambios que ejecutar. «bzr add» los archivos que quiera ejecutar o "
2438
2581
"use --unchanged para forzar una ejecución vacía."
2439
2582
2440
#: bzrlib/builtins.py:3573
2583
#: bzrlib/builtins.py:3666
2441
2584
msgid ""
2442
2585
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2443
2586
"resolve FILE\" to resolve."
2445
2588
"Conflictos detectados en el árbol de trabajo. Use «bzr conflicts» para "
2446
2589
"listar, «bzr resolve ARCHIVO»\" para resolver."
2447
2590
2448
#: bzrlib/builtins.py:3577
2591
#: bzrlib/builtins.py:3670
2449
2592
msgid "Commit refused because there are unknown files in the working tree."
2450
2593
msgstr ""
2451
2594
"Ejecución rechazada porque hay archivos desconocidos en el árbol de trabajo."
2452
2595
2453
#: bzrlib/builtins.py:3580
2596
#: bzrlib/builtins.py:3673
2454
2597
msgid ""
2455
2598
"\n"
2456
2599
"To commit to master branch, run update and then commit.\n"
2457
2600
"You can also pass --local to commit to continue working disconnected."
2458
2601
msgstr ""
2459
2602
2460
#: bzrlib/builtins.py:3588
2603
#: bzrlib/builtins.py:3681
2461
2604
msgid ""
2462
2605
"Validate working tree structure, branch consistency and repository history."
2463
2606
msgstr ""
2464
2607
"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
2465
2608
"historial del repositorio."
2466
2609
2467
#: bzrlib/builtins.py:3590
2610
#: bzrlib/builtins.py:3683
2468
2611
msgid ""
2469
2612
"This command checks various invariants about branch and repository storage\n"
2470
2613
"to detect data corruption or bzr bugs."
2471
2614
msgstr ""
2472
2615
2473
#: bzrlib/builtins.py:3593
2616
#: bzrlib/builtins.py:3686
2474
2617
msgid ""
2475
2618
"The working tree and branch checks will only give output if a problem is\n"
2476
2619
"detected. The output fields of the repository check are:"
2477
2620
msgstr ""
2478
2621
2479
#: bzrlib/builtins.py:3596
2622
#: bzrlib/builtins.py:3689
2480
2623
msgid ""
2481
2624
"revisions\n"
2482
2625
" This is just the number of revisions checked. It doesn't\n"
2486
2629
" Esto es solo el número de revisiones comprobadas, No\n"
2487
2630
" indica un problema."
2488
2631
2489
#: bzrlib/builtins.py:3600
2632
#: bzrlib/builtins.py:3693
2490
2633
msgid ""
2491
2634
"versionedfiles\n"
2492
2635
" This is just the number of versionedfiles checked. It\n"
2496
2639
" Esto es solo el número de archivos versionados comprobados.. No\n"
2497
2640
" indica un problema."
2498
2641
2499
#: bzrlib/builtins.py:3604
2642
#: bzrlib/builtins.py:3697
2500
2643
msgid ""
2501
2644
"unreferenced ancestors\n"
2502
2645
" Texts that are ancestors of other texts, but\n"
2504
2647
" subtle problem that Bazaar can work around."
2505
2648
msgstr ""
2506
2649
2507
#: bzrlib/builtins.py:3609
2650
#: bzrlib/builtins.py:3702
2508
2651
msgid ""
2509
2652
"unique file texts\n"
2510
2653
" This is the total number of unique file contents\n"
2511
2654
" seen in the checked revisions. It does not indicate a problem."
2512
2655
msgstr ""
2513
2656
2514
#: bzrlib/builtins.py:3613
2657
#: bzrlib/builtins.py:3706
2515
2658
msgid ""
2516
2659
"repeated file texts\n"
2517
2660
" This is the total number of repeated texts seen\n"
2520
2663
" indicate a problem."
2521
2664
msgstr ""
2522
2665
2523
#: bzrlib/builtins.py:3619
2666
#: bzrlib/builtins.py:3712
2524
2667
msgid ""
2525
2668
"If no restrictions are specified, all Bazaar data that is found at the "
2526
2669
"given\n"
2527
2670
"location will be checked."
2528
2671
msgstr ""
2529
2672
2530
#: bzrlib/builtins.py:3624
2673
#: bzrlib/builtins.py:3717
2531
2674
msgid " Check the tree and branch at 'foo'::"
2532
2675
msgstr " Comprueba el árbol y la rama en «foo»::"
2533
2676
2534
#: bzrlib/builtins.py:3626
2677
#: bzrlib/builtins.py:3719
2535
2678
msgid " bzr check --tree --branch foo"
2536
2679
msgstr " bzr check --tree --branch foo"
2537
2680
2538
#: bzrlib/builtins.py:3628
2681
#: bzrlib/builtins.py:3721
2539
2682
msgid " Check only the repository at 'bar'::"
2540
2683
msgstr " Comprueba solo el repositorio en «bar»::"
2541
2684
2542
#: bzrlib/builtins.py:3630
2685
#: bzrlib/builtins.py:3723
2543
2686
msgid " bzr check --repo bar"
2544
2687
msgstr " bzr check --repo bar"
2545
2688
2546
#: bzrlib/builtins.py:3632
2689
#: bzrlib/builtins.py:3725
2547
2690
msgid " Check everything at 'baz'::"
2548
2691
msgstr " Comprueba todo en «baz»::"
2549
2692
2550
#: bzrlib/builtins.py:3634
2693
#: bzrlib/builtins.py:3727
2551
2694
msgid " bzr check baz"
2552
2695
msgstr " bzr check baz"
2553
2696
2554
#: bzrlib/builtins.py:3640
2697
#: bzrlib/builtins.py:3733
2555
2698
msgid "Check the branch related to the current directory."
2556
2699
msgstr "Comprueba la rama relacionada con el directorio actual."
2557
2700
2558
#: bzrlib/builtins.py:3642
2701
#: bzrlib/builtins.py:3735
2559
2702
msgid "Check the repository related to the current directory."
2560
2703
msgstr "Comprueba el repositorio relacionado con el directorio actual."
2561
2704
2562
#: bzrlib/builtins.py:3644
2705
#: bzrlib/builtins.py:3737
2563
2706
msgid "Check the working tree related to the current directory."
2564
2707
msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
2565
2708
2566
#: bzrlib/builtins.py:3658
2709
#: bzrlib/builtins.py:3751
2567
2710
msgid "Upgrade a repository, branch or working tree to a newer format."
2568
2711
msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
2569
2712
2570
#: bzrlib/builtins.py:3660
2713
#: bzrlib/builtins.py:3753
2571
2714
msgid ""
2572
2715
"When the default format has changed after a major new release of\n"
2573
2716
"Bazaar, you may be informed during certain operations that you\n"
2576
2719
"with older repositories or with older versions of Bazaar."
2577
2720
msgstr ""
2578
2721
2579
#: bzrlib/builtins.py:3666
2722
#: bzrlib/builtins.py:3759
2580
2723
msgid ""
2581
2724
"If you wish to upgrade to a particular format rather than the\n"
2582
2725
"current default, that can be specified using the --format option.\n"
2586
2729
"2.x default) so downgrading is not always possible."
2587
2730
msgstr ""
2588
2731
2589
#: bzrlib/builtins.py:3673
2732
#: bzrlib/builtins.py:3766
2590
2733
msgid ""
2591
2734
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2592
2735
"process (where # is a number). By default, this is left there on\n"
2597
2740
"afterwards."
2598
2741
msgstr ""
2599
2742
2600
#: bzrlib/builtins.py:3681
2743
#: bzrlib/builtins.py:3774
2601
2744
msgid ""
2602
2745
"If the location given is a shared repository, dependent branches\n"
2603
2746
"are also converted provided the repository converts successfully.\n"
2605
2748
"tried."
2606
2749
msgstr ""
2607
2750
2608
#: bzrlib/builtins.py:3686
2751
#: bzrlib/builtins.py:3779
2609
2752
msgid ""
2610
2753
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2611
2754
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2614
2757
"actualización de Bazaar,\n"
2615
2758
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2616
2759
2617
#: bzrlib/builtins.py:3694
2760
#: bzrlib/builtins.py:3787
2618
2761
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2619
2762
msgstr ""
2620
2763
"Actualizar a un formato específico. Vea «bzr help formats» para tener más "
2621
2764
"detalles."
2622
2765
2623
#: bzrlib/builtins.py:3698
2766
#: bzrlib/builtins.py:3791
2624
2767
msgid "Branch format"
2625
2768
msgstr "Formato de la rama"
2626
2769
2627
#: bzrlib/builtins.py:3700
2770
#: bzrlib/builtins.py:3793
2628
2771
msgid "Remove the backup.bzr directory if successful."
2629
2772
msgstr "Elimina el directorio backup.bzr si tiene éxito."
2630
2773
2631
#: bzrlib/builtins.py:3702
2774
#: bzrlib/builtins.py:3795
2632
2775
msgid "Show what would be done, but don't actually do anything."
2633
2776
msgstr ""
2634
2777
2635
#: bzrlib/builtins.py:3717
2778
#: bzrlib/builtins.py:3810
2636
2779
msgid "Show or set bzr user id."
2637
2780
msgstr "Muestra o establece la id de usuario bzr."
2638
2781
2639
#: bzrlib/builtins.py:3719
2782
#: bzrlib/builtins.py:3812
2640
2783
msgid ""
2641
2784
":Examples:\n"
2642
2785
" Show the email of the current user::"
2644
2787
":Ejemplos:\n"
2645
2788
" Muestra el correo del usuario actual::"
2646
2789
2647
#: bzrlib/builtins.py:3722
2790
#: bzrlib/builtins.py:3815
2648
2791
msgid " bzr whoami --email"
2649
2792
msgstr " bzr whoami --email"
2650
2793
2651
#: bzrlib/builtins.py:3724
2794
#: bzrlib/builtins.py:3817
2652
2795
msgid " Set the current user::"
2653
2796
msgstr " Establece el usuario actual::"
2654
2797
2655
#: bzrlib/builtins.py:3726
2798
#: bzrlib/builtins.py:3819
2656
2799
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2657
2800
msgstr " bzr whoami «Frank Chu <fchu@example.com>»"
2658
2801
2659
#: bzrlib/builtins.py:3730
2802
#: bzrlib/builtins.py:3823
2660
2803
msgid "Display email address only."
2661
2804
msgstr "Muestra solo la dirección de correo."
2662
2805
2663
#: bzrlib/builtins.py:3732
2806
#: bzrlib/builtins.py:3825
2664
2807
msgid "Set identity for the current branch instead of globally."
2665
2808
msgstr "Establece la identidad de la rama actual en lugar de globalmente."
2666
2809
2667
#: bzrlib/builtins.py:3758
2810
#: bzrlib/builtins.py:3851
2668
2811
msgid "--email can only be used to display existing identity"
2669
2812
msgstr "--email solo se puede usar para mostrar la identidad del directorio"
2670
2813
2671
#: bzrlib/builtins.py:3780
2814
#: bzrlib/builtins.py:3873
2672
2815
msgid "Print or set the branch nickname."
2673
2816
msgstr "Muestra o establece el apodo de la rama."
2674
2817
2675
#: bzrlib/builtins.py:3782
2818
#: bzrlib/builtins.py:3875
2676
2819
msgid ""
2677
2820
"If unset, the tree root directory name is used as the nickname.\n"
2678
2821
"To print the current nickname, execute with no argument."
2679
2822
msgstr ""
2680
2823
2681
#: bzrlib/builtins.py:3785
2824
#: bzrlib/builtins.py:3878
2682
2825
msgid ""
2683
2826
"Bound branches use the nickname of its master branch unless it is set\n"
2684
2827
"locally."
2685
2828
msgstr ""
2686
2829
2687
#: bzrlib/builtins.py:3805
2830
#: bzrlib/builtins.py:3898
2688
2831
msgid "Set/unset and display aliases."
2689
2832
msgstr "Establece/desestablece y muestra alias."
2690
2833
2691
#: bzrlib/builtins.py:3807
2834
#: bzrlib/builtins.py:3900
2692
2835
msgid ""
2693
2836
":Examples:\n"
2694
2837
" Show the current aliases::"
2696
2839
":Ejemplos:\n"
2697
2840
" Muestra los alias actuales::"
2698
2841
2699
#: bzrlib/builtins.py:3810
2842
#: bzrlib/builtins.py:3903
2700
2843
msgid " bzr alias"
2701
2844
msgstr " bzr alias"
2702
2845
2703
#: bzrlib/builtins.py:3812
2846
#: bzrlib/builtins.py:3905
2704
2847
msgid " Show the alias specified for 'll'::"
2705
2848
msgstr " Muestra los alias especificados por «ll»::"
2706
2849
2707
#: bzrlib/builtins.py:3814
2850
#: bzrlib/builtins.py:3907
2708
2851
msgid " bzr alias ll"
2709
2852
msgstr " bzr alias ll"
2710
2853
2711
#: bzrlib/builtins.py:3816
2854
#: bzrlib/builtins.py:3909
2712
2855
msgid " Set an alias for 'll'::"
2713
2856
msgstr " Establece un alias para «ll»::"
2714
2857
2715
#: bzrlib/builtins.py:3818
2858
#: bzrlib/builtins.py:3911
2716
2859
msgid " bzr alias ll=\"log --line -r-10..-1\""
2717
2860
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2718
2861
2719
#: bzrlib/builtins.py:3820
2862
#: bzrlib/builtins.py:3913
2720
2863
msgid " To remove an alias for 'll'::"
2721
2864
msgstr " Para eliminar un alias de «ll»::"
2722
2865
2723
#: bzrlib/builtins.py:3822
2866
#: bzrlib/builtins.py:3915
2724
2867
msgid " bzr alias --remove ll"
2725
2868
msgstr " bzr alias --remove ll"
2726
2869
2727
#: bzrlib/builtins.py:3827
2870
#: bzrlib/builtins.py:3920
2728
2871
msgid "Remove the alias."
2729
2872
msgstr "Elimina los alias."
2730
2873
2731
#: bzrlib/builtins.py:3845
2874
#: bzrlib/builtins.py:3938
2732
2875
msgid "bzr alias --remove expects an alias to remove."
2733
2876
msgstr ""
2734
2877
2735
#: bzrlib/builtins.py:4026
2878
#: bzrlib/builtins.py:4119
2736
2879
msgid ""
2737
2880
"subunit not available. subunit needs to be installed to use --subunit."
2738
2881
msgstr ""
2739
2882
2740
#: bzrlib/builtins.py:4043
2883
#: bzrlib/builtins.py:4136
2741
2884
msgid ""
2742
2885
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2743
2886
msgstr ""
2744
2887
"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
2745
2888
2746
#: bzrlib/builtins.py:4090
2889
#: bzrlib/builtins.py:4183
2747
2890
msgid "Show version of bzr."
2748
2891
msgstr "Muestra la versión de bzr."
2749
2892
2750
#: bzrlib/builtins.py:4094
2893
#: bzrlib/builtins.py:4187
2751
2894
msgid "Print just the version number."
2752
2895
msgstr "Solamente imprime el número de versión."
2753
2896
2754
#: bzrlib/builtins.py:4113
2897
#: bzrlib/builtins.py:4206
2755
2898
msgid "It sure does!\n"
2756
2899
msgstr "¡Seguro que si!\n"
2757
2900
2758
#: bzrlib/builtins.py:4137
2901
#: bzrlib/builtins.py:4230
2759
2902
#, python-format
2760
2903
msgid "merge base is revision %s\n"
2761
2904
msgstr ""
2762
2905
2763
#: bzrlib/builtins.py:4141
2906
#: bzrlib/builtins.py:4234
2764
2907
msgid "Perform a three-way merge."
2765
2908
msgstr "Realiza una fusión de tres vías."
2766
2909
2767
#: bzrlib/builtins.py:4143
2910
#: bzrlib/builtins.py:4236
2768
2911
msgid ""
2769
2912
"The source of the merge can be specified either in the form of a branch,\n"
2770
2913
"or in the form of a path to a file containing a merge directive generated\n"
2775
2918
"the current working tree."
2776
2919
msgstr ""
2777
2920
2778
#: bzrlib/builtins.py:4151
2921
#: bzrlib/builtins.py:4244
2779
2922
msgid ""
2780
2923
"When merging from a branch, by default bzr will try to merge in all new\n"
2781
2924
"work from the other branch, automatically determining an appropriate base\n"
2782
2925
"revision. If this fails, you may need to give an explicit base."
2783
2926
msgstr ""
2784
2927
2785
#: bzrlib/builtins.py:4155
2928
#: bzrlib/builtins.py:4248
2786
2929
msgid ""
2787
2930
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2788
2931
"try to merge in all new work up to and including revision OTHER."
2789
2932
msgstr ""
2790
2933
2791
#: bzrlib/builtins.py:4158
2934
#: bzrlib/builtins.py:4251
2792
2935
msgid ""
2793
2936
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2794
2937
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2799
2942
"changes from the other branch is not stored in the commit."
2800
2943
msgstr ""
2801
2944
2802
#: bzrlib/builtins.py:4166
2945
#: bzrlib/builtins.py:4259
2803
2946
msgid "Revision numbers are always relative to the source branch."
2804
2947
msgstr ""
2805
2948
"Los números de revisión están siempre relacionados con la rama origen."
2806
2949
2807
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2950
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2808
2951
msgid ""
2809
2952
"Merge will do its best to combine the changes in two branches, but there\n"
2810
2953
"are some kinds of problems only a human can fix. When it encounters those,\n"
2811
2954
"it will mark a conflict. A conflict means that you need to fix something,\n"
2812
"before you should commit."
2955
"before you can commit."
2813
2956
msgstr ""
2814
2957
2815
#: bzrlib/builtins.py:4173
2958
#: bzrlib/builtins.py:4266
2816
2959
msgid ""
2817
2960
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2818
2961
msgstr ""
2819
2962
"Use bzr resolve cuando tenga un problema arreglado. Vea también bzr "
2820
2963
"conflicts."
2821
2964
2822
#: bzrlib/builtins.py:4175
2965
#: bzrlib/builtins.py:4268
2823
2966
msgid ""
2824
2967
"If there is no default branch set, the first merge will set it (use\n"
2825
2968
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2827
2970
"only be saved if the remote location can be accessed."
2828
2971
msgstr ""
2829
2972
2830
#: bzrlib/builtins.py:4180
2973
#: bzrlib/builtins.py:4273
2831
2974
msgid ""
2832
2975
"The results of the merge are placed into the destination working\n"
2833
2976
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2834
2977
"committed to record the result of the merge."
2835
2978
msgstr ""
2836
2979
2837
#: bzrlib/builtins.py:4184
2980
#: bzrlib/builtins.py:4277
2838
2981
msgid ""
2839
2982
"merge refuses to run if there are any uncommitted changes, unless\n"
2840
2983
"--force is given. If --force is given, then the changes from the source \n"
2843
2986
"merge revision which has more than two parents."
2844
2987
msgstr ""
2845
2988
2846
#: bzrlib/builtins.py:4190
2989
#: bzrlib/builtins.py:4283
2847
2990
msgid ""
2848
2991
"If one would like to merge changes from the working tree of the other\n"
2849
2992
"branch without merging any committed revisions, the --uncommitted option\n"
2850
2993
"can be given."
2851
2994
msgstr ""
2852
2995
2853
#: bzrlib/builtins.py:4194
2996
#: bzrlib/builtins.py:4287
2854
2997
msgid ""
2855
2998
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2856
2999
"you to apply each diff hunk and file change, similar to \"shelve\"."
2857
3000
msgstr ""
2858
3001
2859
#: bzrlib/builtins.py:4197
3002
#: bzrlib/builtins.py:4290
2860
3003
msgid ""
2861
3004
":Examples:\n"
2862
3005
" To merge all new revisions from bzr.dev::"
2864
3007
":Ejemplos:\n"
2865
3008
" Para fusionar todas las revisiones nuevas de bzr.dev::"
2866
3009
2867
#: bzrlib/builtins.py:4200
3010
#: bzrlib/builtins.py:4293
2868
3011
msgid " bzr merge ../bzr.dev"
2869
3012
msgstr " bzr merge ../bzr.dev"
2870
3013
2871
#: bzrlib/builtins.py:4202
3014
#: bzrlib/builtins.py:4295
2872
3015
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2873
3016
msgstr " Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
2874
3017
2875
#: bzrlib/builtins.py:4204
3018
#: bzrlib/builtins.py:4297
2876
3019
msgid " bzr merge -r 82 ../bzr.dev"
2877
3020
msgstr " bzr merge -r 82 ../bzr.dev"
2878
3021
2879
#: bzrlib/builtins.py:4206
3022
#: bzrlib/builtins.py:4299
2880
3023
msgid " To merge the changes introduced by 82, without previous changes::"
2881
3024
msgstr ""
2882
3025
" Para fusionar los cambios introducidos por 82, sin cambios previos::"
2883
3026
2884
#: bzrlib/builtins.py:4208
3027
#: bzrlib/builtins.py:4301
2885
3028
msgid " bzr merge -r 81..82 ../bzr.dev"
2886
3029
msgstr " bzr merge -r 81..82 ../bzr.dev"
2887
3030
2888
#: bzrlib/builtins.py:4210
3031
#: bzrlib/builtins.py:4303
2889
3032
msgid " To apply a merge directive contained in /tmp/merge::"
2890
3033
msgstr " Para aplicar una directiva de fusión contenida en /tmp/merge::"
2891
3034
2892
#: bzrlib/builtins.py:4212
3035
#: bzrlib/builtins.py:4305
2893
3036
msgid " bzr merge /tmp/merge"
2894
3037
msgstr " bzr merge /tmp/merge"
2895
3038
2896
#: bzrlib/builtins.py:4214
3039
#: bzrlib/builtins.py:4307
2897
3040
msgid ""
2898
3041
" To create a merge revision with three parents from two branches\n"
2899
3042
" feature1a and feature1b:"
2900
3043
msgstr ""
2901
3044
2902
#: bzrlib/builtins.py:4217
3045
#: bzrlib/builtins.py:4310
2903
3046
msgid ""
2904
3047
" bzr merge ../feature1a\n"
2905
3048
" bzr merge ../feature1b --force\n"
2906
3049
" bzr commit -m 'revision with three parents'"
2907
3050
msgstr ""
2908
3051
2909
#: bzrlib/builtins.py:4229
3052
#: bzrlib/builtins.py:4322
2910
3053
msgid "Merge even if the destination tree has uncommitted changes."
2911
3054
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin ejecutar."
2912
3055
2913
#: bzrlib/builtins.py:4235
3056
#: bzrlib/builtins.py:4328
2914
3057
msgid ""
2915
3058
"Apply uncommitted changes from a working copy, instead of branch changes."
2916
3059
msgstr ""
2917
3060
"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
2918
3061
"de rama."
2919
3062
2920
#: bzrlib/builtins.py:4237
3063
#: bzrlib/builtins.py:4330
2921
3064
msgid ""
2922
3065
"If the destination is already completely merged into the source, pull from "
2923
3066
"the source rather than merging. When this happens, you do not need to "
2924
3067
"commit the result."
2925
3068
msgstr ""
2926
3069
2927
#: bzrlib/builtins.py:4242
3070
#: bzrlib/builtins.py:4335
2928
3071
msgid ""
2929
3072
"Branch to merge into, rather than the one containing the working directory."
2930
3073
msgstr ""
2931
3074
2932
#: bzrlib/builtins.py:4244
3075
#: bzrlib/builtins.py:4337
2933
3076
msgid "Instead of merging, show a diff of the merge."
2934
3077
msgstr ""
2935
3078
2936
#: bzrlib/builtins.py:4246
3079
#: bzrlib/builtins.py:4339
2937
3080
msgid "Select changes interactively."
2938
3081
msgstr "Seleccionar cambios de manera interactiva."
2939
3082
2940
#: bzrlib/builtins.py:4268
3083
#: bzrlib/builtins.py:4361
2941
3084
msgid ""
2942
3085
"Merging into empty branches not currently supported, "
2943
3086
"https://bugs.launchpad.net/bzr/+bug/308562"
2944
3087
msgstr ""
2945
3088
2946
#: bzrlib/builtins.py:4295
3089
#: bzrlib/builtins.py:4388
2947
3090
msgid "Cannot use --uncommitted with bundles or merge directives."
2948
3091
msgstr ""
2949
3092
2950
#: bzrlib/builtins.py:4306
3093
#: bzrlib/builtins.py:4399
2951
3094
msgid "Cannot use --uncommitted and --revision at the same time."
2952
3095
msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
2953
3096
2954
#: bzrlib/builtins.py:4326
3097
#: bzrlib/builtins.py:4419
2955
3098
msgid "merger: "
2956
3099
msgstr "fusión: "
2957
3100
2958
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
3101
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2959
3102
msgid "Nothing to do."
2960
3103
msgstr "Nada que hacer."
2961
3104
2962
#: bzrlib/builtins.py:4332
3105
#: bzrlib/builtins.py:4425
2963
3106
msgid "Cannot pull individual files"
2964
3107
msgstr "No se puede tirar de archivos individuales"
2965
3108
2966
#: bzrlib/builtins.py:4340
3109
#: bzrlib/builtins.py:4433
2967
3110
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2968
3111
msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
2969
3112
2970
#: bzrlib/builtins.py:4398
3113
#: bzrlib/builtins.py:4491
2971
3114
#, python-format
2972
3115
msgid "Show-base is not supported for this merge type. %s"
2973
3116
msgstr "Show-base no está permitido en este tipo de fusión. %s"
2974
3117
2975
#: bzrlib/builtins.py:4407
3118
#: bzrlib/builtins.py:4500
2976
3119
#, python-format
2977
3120
msgid "Conflict reduction is not supported for merge type %s."
2978
3121
msgstr ""
2979
3122
"La reducción de conflicot no está permitida para el tipo de fusión %s."
2980
3123
2981
#: bzrlib/builtins.py:4411
3124
#: bzrlib/builtins.py:4504
2982
3125
msgid "Cannot do conflict reduction and show base."
2983
3126
msgstr ""
2984
3127
2985
#: bzrlib/builtins.py:4522
3128
#: bzrlib/builtins.py:4615
2986
3129
msgid "No location specified or remembered"
2987
3130
msgstr "No hay ubicación especificada o recordada"
2988
3131
2989
#: bzrlib/builtins.py:4524
3132
#: bzrlib/builtins.py:4617
2990
3133
msgid "{0} remembered {1} location {2}"
2991
3134
msgstr ""
2992
3135
2993
#: bzrlib/builtins.py:4530
3136
#: bzrlib/builtins.py:4623
2994
3137
msgid "Redo a merge."
2995
3138
msgstr "Rehacer una fusión."
2996
3139
2997
#: bzrlib/builtins.py:4532
3140
#: bzrlib/builtins.py:4625
2998
3141
msgid ""
2999
3142
"Use this if you want to try a different merge technique while resolving\n"
3000
3143
"conflicts. Some merge techniques are better than others, and remerge\n"
3001
3144
"lets you try different ones on different files."
3002
3145
msgstr ""
3003
3146
3004
#: bzrlib/builtins.py:4536
3147
#: bzrlib/builtins.py:4629
3005
3148
msgid ""
3006
3149
"The options for remerge have the same meaning and defaults as the ones for\n"
3007
3150
"merge. The difference is that remerge can (only) be run when there is a\n"
3008
3151
"pending merge, and it lets you specify particular files."
3009
3152
msgstr ""
3010
3153
3011
#: bzrlib/builtins.py:4540
3154
#: bzrlib/builtins.py:4633
3012
3155
msgid ""
3013
3156
":Examples:\n"
3014
3157
" Re-do the merge of all conflicted files, and show the base text in\n"
3015
3158
" conflict regions, in addition to the usual THIS and OTHER texts::"
3016
3159
msgstr ""
3017
3160
3018
#: bzrlib/builtins.py:4544
3161
#: bzrlib/builtins.py:4637
3019
3162
msgid " bzr remerge --show-base"
3020
3163
msgstr " bzr remerge --show-base"
3021
3164
3022
#: bzrlib/builtins.py:4546
3165
#: bzrlib/builtins.py:4639
3023
3166
msgid ""
3024
3167
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3025
3168
" additional processing to reduce the size of conflict regions::"
3026
3169
msgstr ""
3027
3170
3028
#: bzrlib/builtins.py:4549
3171
#: bzrlib/builtins.py:4642
3029
3172
msgid " bzr remerge --merge-type weave --reprocess foobar"
3030
3173
msgstr ""
3031
3174
3032
#: bzrlib/builtins.py:4556
3175
#: bzrlib/builtins.py:4649
3033
3176
msgid "Show base revision text in conflicts."
3034
3177
msgstr "Mostrar el texto de revisión base en los conflictos."
3035
3178
3036
#: bzrlib/builtins.py:4568
3179
#: bzrlib/builtins.py:4661
3037
3180
msgid ""
3038
3181
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3039
3182
"merges."
3040
3183
msgstr ""
3041
3184
3042
#: bzrlib/builtins.py:4624
3185
#: bzrlib/builtins.py:4717
3043
3186
msgid "Revert files to a previous revision."
3044
3187
msgstr "Revierte los archivos a la revisión previa."
3045
3188
3046
#: bzrlib/builtins.py:4626
3189
#: bzrlib/builtins.py:4719
3047
3190
msgid ""
3048
3191
"Giving a list of files will revert only those files. Otherwise, all files\n"
3049
3192
"will be reverted. If the revision is not specified with '--revision', the\n"
3050
3193
"last committed revision is used."
3051
3194
msgstr ""
3052
3195
3053
#: bzrlib/builtins.py:4630
3196
#: bzrlib/builtins.py:4723
3054
3197
msgid ""
3055
3198
"To remove only some changes, without reverting to a prior version, use\n"
3056
3199
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3059
3202
"certain changes on a hunk-by-hunk basis, see the shelve command."
3060
3203
msgstr ""
3061
3204
3062
#: bzrlib/builtins.py:4636
3205
#: bzrlib/builtins.py:4729
3063
3206
msgid ""
3064
3207
"By default, any files that have been manually changed will be backed up\n"
3065
3208
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3066
3209
"'.~#~' appended to their name, where # is a number."
3067
3210
msgstr ""
3068
3211
3069
#: bzrlib/builtins.py:4640
3212
#: bzrlib/builtins.py:4733
3070
3213
msgid ""
3071
3214
"When you provide files, you can use their current pathname or the pathname\n"
3072
3215
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3074
3217
"reverted."
3075
3218
msgstr ""
3076
3219
3077
#: bzrlib/builtins.py:4645
3220
#: bzrlib/builtins.py:4738
3078
3221
msgid ""
3079
3222
"If you have newly added files since the target revision, they will be\n"
3080
3223
"removed. If the files to be removed have been changed, backups will be\n"
3082
3225
"deleted."
3083
3226
msgstr ""
3084
3227
3085
#: bzrlib/builtins.py:4650
3228
#: bzrlib/builtins.py:4743
3086
3229
msgid ""
3087
3230
"The working tree contains a list of revisions that have been merged but\n"
3088
3231
"not yet committed. These revisions will be included as additional parents\n"
3094
3237
"reverting any files."
3095
3238
msgstr ""
3096
3239
3097
#: bzrlib/builtins.py:4659
3240
#: bzrlib/builtins.py:4752
3098
3241
msgid ""
3099
3242
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3100
3243
"changes from a branch in a single revision. To do this, perform the merge\n"
3108
3251
"target branches."
3109
3252
msgstr ""
3110
3253
3111
#: bzrlib/builtins.py:4673
3254
#: bzrlib/builtins.py:4766
3112
3255
msgid "Do not save backups of reverted files."
3113
3256
msgstr "No guardar respaldos de los archivos revertidos"
3114
3257
3115
#: bzrlib/builtins.py:4675
3258
#: bzrlib/builtins.py:4768
3116
3259
msgid "Remove pending merge marker, without changing any files."
3117
3260
msgstr ""
3118
3261
"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
3119
3262
3120
#: bzrlib/builtins.py:4706
3263
#: bzrlib/builtins.py:4799
3121
3264
msgid ""
3122
3265
"Show help on a command or other topic.\n"
3123
3266
" "
3125
3268
"Muestra ayuda en una orden u otro tema.\n"
3126
3269
" "
3127
3270
3128
#: bzrlib/builtins.py:4711
3271
#: bzrlib/builtins.py:4804
3129
3272
msgid "Show help on all commands."
3130
3273
msgstr "Muestra ayuda en todas las órdenes"
3131
3274
3132
#: bzrlib/builtins.py:4740
3275
#: bzrlib/builtins.py:4833
3133
3276
msgid "Show unmerged/unpulled revisions between two branches."
3134
3277
msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
3135
3278
3136
#: bzrlib/builtins.py:4742
3279
#: bzrlib/builtins.py:4835
3137
3280
msgid "OTHER_BRANCH may be local or remote."
3138
3281
msgstr "OTHER_BRANCH puede ser local o remoto."
3139
3282
3140
#: bzrlib/builtins.py:4744
3283
#: bzrlib/builtins.py:4837
3141
3284
msgid ""
3142
3285
"To filter on a range of revisions, you can use the command -r begin..end\n"
3143
3286
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3148
3291
" 0 - no missing revisions"
3149
3292
msgstr ""
3150
3293
3151
#: bzrlib/builtins.py:4754
3294
#: bzrlib/builtins.py:4847
3152
3295
msgid ""
3153
3296
" Determine the missing revisions between this and the branch at the\n"
3154
3297
" remembered pull location::"
3155
3298
msgstr ""
3156
3299
3157
#: bzrlib/builtins.py:4757
3300
#: bzrlib/builtins.py:4850
3158
3301
msgid " bzr missing"
3159
3302
msgstr " bzr missing"
3160
3303
3161
#: bzrlib/builtins.py:4759
3304
#: bzrlib/builtins.py:4852
3162
3305
msgid " Determine the missing revisions between this and another branch::"
3163
3306
msgstr " Determina las revisiones perdidas entre esta y otra rama::"
3164
3307
3165
#: bzrlib/builtins.py:4761
3308
#: bzrlib/builtins.py:4854
3166
3309
msgid " bzr missing http://server/branch"
3167
3310
msgstr " bzr missing http://server/branch"
3168
3311
3169
#: bzrlib/builtins.py:4763
3312
#: bzrlib/builtins.py:4856
3170
3313
msgid ""
3171
3314
" Determine the missing revisions up to a specific revision on the other\n"
3172
3315
" branch::"
3173
3316
msgstr ""
3174
3317
3175
#: bzrlib/builtins.py:4766
3318
#: bzrlib/builtins.py:4859
3176
3319
msgid " bzr missing -r ..-10"
3177
3320
msgstr " bzr missing -r ..-10"
3178
3321
3179
#: bzrlib/builtins.py:4768
3322
#: bzrlib/builtins.py:4861
3180
3323
msgid ""
3181
3324
" Determine the missing revisions up to a specific revision on this\n"
3182
3325
" branch::"
3183
3326
msgstr ""
3184
3327
3185
#: bzrlib/builtins.py:4771
3328
#: bzrlib/builtins.py:4864
3186
3329
msgid " bzr missing --my-revision ..-10"
3187
3330
msgstr " bzr missing --my-revision ..-10"
3188
3331
3189
#: bzrlib/builtins.py:4778
3332
#: bzrlib/builtins.py:4871
3190
3333
msgid "Reverse the order of revisions."
3191
3334
msgstr "Revierte el orden de las revisiones."
3192
3335
3193
#: bzrlib/builtins.py:4780
3336
#: bzrlib/builtins.py:4873
3194
3337
msgid "Display changes in the local branch only."
3195
3338
msgstr "Muestra cambios solo en la rama local."
3196
3339
3197
#: bzrlib/builtins.py:4781
3340
#: bzrlib/builtins.py:4874
3198
3341
msgid "Same as --mine-only."
3199
3342
msgstr "Lo mismo que --mine-only."
3200
3343
3201
#: bzrlib/builtins.py:4783
3344
#: bzrlib/builtins.py:4876
3202
3345
msgid "Display changes in the remote branch only."
3203
3346
msgstr "Muestra cambios solo en la rama remota."
3204
3347
3205
#: bzrlib/builtins.py:4784
3348
#: bzrlib/builtins.py:4877
3206
3349
msgid "Same as --theirs-only."
3207
3350
msgstr "Lo mismo que --theirs-only."
3208
3351
3209
#: bzrlib/builtins.py:4789
3352
#: bzrlib/builtins.py:4882
3210
3353
msgid ""
3211
3354
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3212
3355
"details."
3214
3357
"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
3215
3358
"tener más detalles."
3216
3359
3217
#: bzrlib/builtins.py:4793
3360
#: bzrlib/builtins.py:4886
3218
3361
msgid ""
3219
3362
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3220
3363
"details."
3222
3365
"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
3223
3366
"para tener más detalles."
3224
3367
3225
#: bzrlib/builtins.py:4796
3368
#: bzrlib/builtins.py:4889
3226
3369
msgid "Show all revisions in addition to the mainline ones."
3227
3370
msgstr ""
3228
3371
3229
#: bzrlib/builtins.py:4850
3372
#: bzrlib/builtins.py:4943
3230
3373
msgid "No peer location known or specified."
3231
3374
msgstr "No hay ubicación del par conocida o especificada."
3232
3375
3233
#: bzrlib/builtins.py:4854
3376
#: bzrlib/builtins.py:4947
3234
3377
msgid "Using saved parent location: {0}\n"
3235
3378
msgstr "Usar ubicación padre guardada: {0}\n"
3236
3379
3237
#: bzrlib/builtins.py:4887
3380
#: bzrlib/builtins.py:4980
3238
3381
#, python-format
3239
3382
msgid "You have %d extra revision:\n"
3240
3383
msgid_plural "You have %d extra revisions:\n"
3241
3384
msgstr[0] "Tiene %d revisión extra:\n"
3242
3385
msgstr[1] "Tiene %d revisiones extra:\n"
3243
3386
3244
#: bzrlib/builtins.py:4903
3387
#: bzrlib/builtins.py:4996
3245
3388
#, python-format
3246
3389
msgid "You are missing %d revision:\n"
3247
3390
msgid_plural "You are missing %d revisions:\n"
3248
3391
msgstr[0] "Tiene %d revisión perdida:\n"
3249
3392
msgstr[1] "Tiene %d revisiones perdidas:\n"
3250
3393
3251
#: bzrlib/builtins.py:4915
3394
#: bzrlib/builtins.py:5008
3252
3395
msgid "This branch has no new revisions.\n"
3253
3396
msgstr "Esta rama no tiene revisiones.\n"
3254
3397
3255
#: bzrlib/builtins.py:4918
3398
#: bzrlib/builtins.py:5011
3256
3399
msgid "Other branch has no new revisions.\n"
3257
3400
msgstr "Otra rama no tiene revisiones nuevas.\n"
3258
3401
3259
#: bzrlib/builtins.py:4923
3402
#: bzrlib/builtins.py:5016
3260
3403
msgid "Branches are up to date.\n"
3261
3404
msgstr "La rama está actualizada:\n"
3262
3405
3263
#: bzrlib/builtins.py:4934
3406
#: bzrlib/builtins.py:5027
3264
3407
msgid "Compress the data within a repository."
3265
3408
msgstr "Comprime los datos en un repositorio."
3266
3409
3267
#: bzrlib/builtins.py:4936
3410
#: bzrlib/builtins.py:5029
3268
3411
msgid ""
3269
3412
"This operation compresses the data within a bazaar repository. As\n"
3270
3413
"bazaar supports automatic packing of repository, this operation is\n"
3271
3414
"normally not required to be done manually."
3272
3415
msgstr ""
3273
3416
3274
#: bzrlib/builtins.py:4940
3417
#: bzrlib/builtins.py:5033
3275
3418
msgid ""
3276
3419
"During the pack operation, bazaar takes a backup of existing repository\n"
3277
3420
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3280
3423
"used."
3281
3424
msgstr ""
3282
3425
3283
#: bzrlib/builtins.py:4946
3426
#: bzrlib/builtins.py:5039
3284
3427
msgid ""
3285
3428
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3286
3429
"during or immediately after repacking, you may be left with a state\n"
3288
3431
"been. In this case the repository may be unusable."
3289
3432
msgstr ""
3290
3433
3291
#: bzrlib/builtins.py:4955
3434
#: bzrlib/builtins.py:5048
3292
3435
msgid "Delete obsolete packs to save disk space."
3293
3436
msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
3294
3437
3295
#: bzrlib/builtins.py:4969
3438
#: bzrlib/builtins.py:5062
3296
3439
msgid "List the installed plugins."
3297
3440
msgstr "Lista los complementos instalados."
3298
3441
3299
#: bzrlib/builtins.py:4971
3442
#: bzrlib/builtins.py:5064
3300
3443
msgid ""
3301
3444
"This command displays the list of installed plugins including\n"
3302
3445
"version of plugin and a short description of each."
3304
3447
"Esta orden muestra la lista de complementos instalados incluyendo\n"
3305
3448
"versión del complemento y una breve descripción de cada uno."
3306
3449
3307
#: bzrlib/builtins.py:4974
3450
#: bzrlib/builtins.py:5067
3308
3451
msgid "--verbose shows the path where each plugin is located."
3309
3452
msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
3310
3453
3311
#: bzrlib/builtins.py:4976
3454
#: bzrlib/builtins.py:5069
3312
3455
msgid ""
3313
3456
"A plugin is an external component for Bazaar that extends the\n"
3314
3457
"revision control system, by adding or replacing code in Bazaar.\n"
3317
3460
"customizing log output."
3318
3461
msgstr ""
3319
3462
3320
#: bzrlib/builtins.py:4982
3463
#: bzrlib/builtins.py:5075
3321
3464
msgid ""
3322
3465
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3323
3466
"for further information on plugins including where to find them and how to\n"
3325
3468
"plugins using the Python programming language."
3326
3469
msgstr ""
3327
3470
3328
#: bzrlib/builtins.py:4998
3471
#: bzrlib/builtins.py:5091
3329
3472
msgid "Show testament (signing-form) of a revision."
3330
3473
msgstr ""
3331
3474
3332
#: bzrlib/builtins.py:5001
3475
#: bzrlib/builtins.py:5094
3333
3476
msgid "Produce long-format testament."
3334
3477
msgstr "Produce testamento en formato largo."
3335
3478
3336
#: bzrlib/builtins.py:5003
3479
#: bzrlib/builtins.py:5096
3337
3480
msgid "Produce a strict-format testament."
3338
3481
msgstr "Produce testamento en formato estricto."
3339
3482
3340
#: bzrlib/builtins.py:5029
3483
#: bzrlib/builtins.py:5122
3341
3484
msgid "Show the origin of each line in a file."
3342
3485
msgstr "Muestra el origen de cada línea en un archivo"
3343
3486
3344
#: bzrlib/builtins.py:5031
3487
#: bzrlib/builtins.py:5124
3345
3488
msgid ""
3346
3489
"This prints out the given file with an annotation on the left side\n"
3347
3490
"indicating which revision, author and date introduced the change."
3348
3491
msgstr ""
3349
3492
3350
#: bzrlib/builtins.py:5034
3493
#: bzrlib/builtins.py:5127
3351
3494
msgid ""
3352
3495
"If the origin is the same for a run of consecutive lines, it is\n"
3353
3496
"shown only at the top, unless the --all option is given."
3354
3497
msgstr ""
3355
3498
3356
#: bzrlib/builtins.py:5042
3499
#: bzrlib/builtins.py:5135
3357
3500
msgid "Show annotations on all lines."
3358
3501
msgstr "Muestra anotaciones en todas las líneas."
3359
3502
3360
#: bzrlib/builtins.py:5043
3503
#: bzrlib/builtins.py:5136
3361
3504
msgid "Show commit date in annotations."
3362
3505
msgstr "Muestra la fecha de ejecución en anotaciones."
3363
3506
3364
#: bzrlib/builtins.py:5130
3507
#: bzrlib/builtins.py:5223
3365
3508
msgid "Cannot sign a range of non-revision-history revisions"
3366
3509
msgstr ""
3367
3510
3368
#: bzrlib/builtins.py:5142
3511
#: bzrlib/builtins.py:5235
3369
3512
msgid "Please supply either one revision, or a range."
3370
3513
msgstr "Proporcione una revisión o un rango."
3371
3514
3372
#: bzrlib/builtins.py:5146
3515
#: bzrlib/builtins.py:5239
3373
3516
msgid ""
3374
3517
"Convert the current branch into a checkout of the supplied branch.\n"
3375
3518
"If no branch is supplied, rebind to the last bound location."
3376
3519
msgstr ""
3377
3520
3378
#: bzrlib/builtins.py:5149
3521
#: bzrlib/builtins.py:5242
3379
3522
msgid ""
3380
3523
"Once converted into a checkout, commits must succeed on the master branch\n"
3381
3524
"before they will be applied to the local branch."
3382
3525
msgstr ""
3383
3526
3384
#: bzrlib/builtins.py:5152
3527
#: bzrlib/builtins.py:5245
3385
3528
msgid ""
3386
3529
"Bound branches use the nickname of its master branch unless it is set\n"
3387
3530
"locally, in which case binding will update the local nickname to be\n"
3388
3531
"that of the master."
3389
3532
msgstr ""
3390
3533
3391
#: bzrlib/builtins.py:5167
3534
#: bzrlib/builtins.py:5260
3392
3535
msgid "No location supplied. This format does not remember old locations."
3393
3536
msgstr ""
3394
3537
"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
3395
3538
3396
#: bzrlib/builtins.py:5172
3539
#: bzrlib/builtins.py:5265
3397
3540
msgid "Branch is already bound"
3398
3541
msgstr "La rama ya está asociada"
3399
3542
3400
#: bzrlib/builtins.py:5174
3543
#: bzrlib/builtins.py:5267
3401
3544
msgid "No location supplied and no previous location known"
3402
3545
msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
3403
3546
3404
#: bzrlib/builtins.py:5180
3547
#: bzrlib/builtins.py:5273
3405
3548
msgid "These branches have diverged. Try merging, and then bind again."
3406
3549
msgstr ""
3407
3550
"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
3408
3551
3409
#: bzrlib/builtins.py:5187
3552
#: bzrlib/builtins.py:5280
3410
3553
msgid "Convert the current checkout into a regular branch."
3411
3554
msgstr "Convertir la comprobación actual en una rama regular."
3412
3555
3413
#: bzrlib/builtins.py:5189
3556
#: bzrlib/builtins.py:5282
3414
3557
msgid ""
3415
3558
"After unbinding, the local branch is considered independent and subsequent\n"
3416
3559
"commits will be local only."
3417
3560
msgstr ""
3418
3561
3419
#: bzrlib/builtins.py:5200
3562
#: bzrlib/builtins.py:5293
3420
3563
msgid "Local branch is not bound"
3421
3564
msgstr "La rama local no está vinculada"
3422
3565
3423
#: bzrlib/builtins.py:5204
3566
#: bzrlib/builtins.py:5297
3424
3567
msgid "Remove the last committed revision."
3425
3568
msgstr "Elimina la última revisión ejecutada."
3426
3569
3427
#: bzrlib/builtins.py:5206
3570
#: bzrlib/builtins.py:5299
3428
3571
msgid ""
3429
3572
"--verbose will print out what is being removed.\n"
3430
3573
"--dry-run will go through all the motions, but not actually\n"
3431
3574
"remove anything."
3432
3575
msgstr ""
3433
3576
3434
#: bzrlib/builtins.py:5210
3577
#: bzrlib/builtins.py:5303
3435
3578
msgid ""
3436
3579
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3437
3580
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3438
3581
"branch at revision 15."
3439
3582
msgstr ""
3440
3583
3441
#: bzrlib/builtins.py:5214
3584
#: bzrlib/builtins.py:5307
3442
3585
msgid ""
3443
3586
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3444
3587
"it may make is to restore any pending merges that were present before\n"
3445
3588
"the commit."
3446
3589
msgstr ""
3447
3590
3448
#: bzrlib/builtins.py:5225
3591
#: bzrlib/builtins.py:5318
3449
3592
msgid "Don't actually make changes."
3450
3593
msgstr "En relaidad no hace cambios."
3451
3594
3452
#: bzrlib/builtins.py:5226
3595
#: bzrlib/builtins.py:5319
3453
3596
msgid "Say yes to all questions."
3454
3597
msgstr "Decir sí a todas las preguntas."
3455
3598
3456
#: bzrlib/builtins.py:5228
3599
#: bzrlib/builtins.py:5321
3457
3600
msgid "Keep tags that point to removed revisions."
3458
3601
msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
3459
3602
3460
#: bzrlib/builtins.py:5230
3603
#: bzrlib/builtins.py:5323
3461
3604
msgid "Only remove the commits from the local branch when in a checkout."
3462
3605
msgstr ""
3463
3606
"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
3464
3607
3465
#: bzrlib/builtins.py:5279
3608
#: bzrlib/builtins.py:5372
3466
3609
msgid "No revisions to uncommit.\n"
3467
3610
msgstr "No hay revisiones para desejecutar.\n"
3468
3611
3469
#: bzrlib/builtins.py:5294
3612
#: bzrlib/builtins.py:5387
3470
3613
msgid "Dry-run, pretending to remove the above revisions.\n"
3471
3614
msgstr ""
3472
3615
3473
#: bzrlib/builtins.py:5297
3616
#: bzrlib/builtins.py:5390
3474
3617
msgid "The above revision(s) will be removed.\n"
3475
3618
msgstr "Las revisiones de arriba se eliminarán.\n"
3476
3619
3477
#: bzrlib/builtins.py:5301
3620
#: bzrlib/builtins.py:5394
3478
3621
msgid "Uncommit these revisions"
3479
3622
msgstr "Desejecutar estas revisiones"
3480
3623
3481
#: bzrlib/builtins.py:5304
3624
#: bzrlib/builtins.py:5397
3482
3625
msgid "Canceled\n"
3483
3626
msgstr "Cancelado\n"
3484
3627
3485
#: bzrlib/builtins.py:5311
3628
#: bzrlib/builtins.py:5404
3486
3629
#, python-format
3487
3630
msgid ""
3488
3631
"You can restore the old tip by running:\n"
3491
3634
"Puede restaurar el consejo antiguo ejecutando:\n"
3492
3635
" bzr pull . -r revid:%s\n"
3493
3636
3494
#: bzrlib/builtins.py:5316
3637
#: bzrlib/builtins.py:5409
3495
3638
msgid "Break a dead lock."
3496
3639
msgstr "Romper un bloqueo."
3497
3640
3498
#: bzrlib/builtins.py:5318
3641
#: bzrlib/builtins.py:5411
3499
3642
msgid ""
3500
3643
"This command breaks a lock on a repository, branch, working directory or\n"
3501
3644
"config file."
3504
3647
"o\n"
3505
3648
"archivo de configuración."
3506
3649
3507
#: bzrlib/builtins.py:5321
3650
#: bzrlib/builtins.py:5414
3508
3651
msgid ""
3509
3652
"CAUTION: Locks should only be broken when you are sure that the process\n"
3510
3653
"holding the lock has been stopped."
3511
3654
msgstr ""
3512
3655
3513
#: bzrlib/builtins.py:5324
3656
#: bzrlib/builtins.py:5417
3514
3657
msgid ""
3515
3658
"You can get information on what locks are open via the 'bzr info\n"
3516
3659
"[location]' command."
3517
3660
msgstr ""
3518
3661
3519
#: bzrlib/builtins.py:5327
3662
#: bzrlib/builtins.py:5420
3520
3663
msgid ""
3521
3664
":Examples:\n"
3522
3665
" bzr break-lock\n"
3528
3671
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3529
3672
" bzr break-lock --conf ~/.bazaar"
3530
3673
3531
#: bzrlib/builtins.py:5336
3674
#: bzrlib/builtins.py:5429
3532
3675
msgid "LOCATION is the directory where the config lock is."
3533
3676
msgstr ""
3534
3677
3535
#: bzrlib/builtins.py:5338
3678
#: bzrlib/builtins.py:5431
3536
3679
msgid "Do not ask for confirmation before breaking the lock."
3537
3680
msgstr "No pedir confirmación antes de romper el bloqueo."
3538
3681
3539
#: bzrlib/builtins.py:5373
3682
#: bzrlib/builtins.py:5466
3540
3683
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3541
3684
msgstr ""
3542
3685
3543
#: bzrlib/builtins.py:5374
3686
#: bzrlib/builtins.py:5467
3544
3687
msgid "Run the bzr server."
3545
3688
msgstr "Ejecutar el servidor bzr."
3546
3689
3547
#: bzrlib/builtins.py:5380
3690
#: bzrlib/builtins.py:5473
3548
3691
msgid "Serve on stdin/out for use from inetd or sshd."
3549
3692
msgstr ""
3550
3693
3551
#: bzrlib/builtins.py:5381
3694
#: bzrlib/builtins.py:5474
3552
3695
msgid "protocol"
3553
3696
msgstr "protocolo"
3554
3697
3555
#: bzrlib/builtins.py:5382
3698
#: bzrlib/builtins.py:5475
3556
3699
msgid "Protocol to serve."
3557
3700
msgstr "Protocolo a servir."
3558
3701
3559
#: bzrlib/builtins.py:5386
3702
#: bzrlib/builtins.py:5479
3560
3703
msgid ""
3561
3704
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3562
3705
"Passing 0 as the port number will result in a dynamically allocated port. "
3563
3706
"The default port depends on the protocol."
3564
3707
msgstr ""
3565
3708
3566
#: bzrlib/builtins.py:5392
3709
#: bzrlib/builtins.py:5485
3567
3710
msgid "Serve contents of this directory."
3568
3711
msgstr ""
3569
3712
3570
#: bzrlib/builtins.py:5394
3713
#: bzrlib/builtins.py:5487
3571
3714
msgid ""
3572
3715
"By default the server is a readonly server. Supplying --allow-writes "
3573
3716
"enables write access to the contents of the served directory and below. "
3576
3719
"uncontrolled write access to your file system."
3577
3720
msgstr ""
3578
3721
3579
#: bzrlib/builtins.py:5403
3722
#: bzrlib/builtins.py:5496
3580
3723
msgid "Override the default idle client timeout (5min)."
3581
3724
msgstr ""
3582
3725
3583
#: bzrlib/builtins.py:5453
3726
#: bzrlib/builtins.py:5546
3584
3727
msgid "Combine a tree into its containing tree."
3585
3728
msgstr "Combina un árbol en su árbol contenedor."
3586
3729
3587
#: bzrlib/builtins.py:5455
3730
#: bzrlib/builtins.py:5548
3588
3731
msgid "This command requires the target tree to be in a rich-root format."
3589
3732
msgstr ""
3590
3733
3591
#: bzrlib/builtins.py:5457
3734
#: bzrlib/builtins.py:5550
3592
3735
msgid ""
3593
3736
"The TREE argument should be an independent tree, inside another tree, but\n"
3594
3737
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3595
3738
"running \"bzr branch\" with the target inside a tree.)"
3596
3739
msgstr ""
3597
3740
3598
#: bzrlib/builtins.py:5461
3741
#: bzrlib/builtins.py:5554
3599
3742
msgid ""
3600
3743
"The result is a combined tree, with the subtree no longer an independent\n"
3601
3744
"part. This is marked as a merge of the subtree into the containing tree,\n"
3602
3745
"and all history is preserved."
3603
3746
msgstr ""
3604
3747
3605
#: bzrlib/builtins.py:5479
3748
#: bzrlib/builtins.py:5572
3606
3749
#, python-format
3607
3750
msgid ""
3608
3751
"Can't join trees because %s doesn't support rich root data.\n"
3609
3752
"You can use bzr upgrade on the repository."
3610
3753
msgstr ""
3611
3754
3612
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3755
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3613
3756
msgid "Cannot join {0}. {1}"
3614
3757
msgstr "No se puede unir {0}. {1}"
3615
3758
3616
#: bzrlib/builtins.py:5499
3759
#: bzrlib/builtins.py:5592
3617
3760
msgid "Split a subdirectory of a tree into a separate tree."
3618
3761
msgstr "Divide un subdirectorio de un árbol en un árbol separado."
3619
3762
3620
#: bzrlib/builtins.py:5501
3763
#: bzrlib/builtins.py:5594
3621
3764
msgid ""
3622
3765
"This command will produce a target tree in a format that supports\n"
3623
3766
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3624
3767
"converted into earlier formats like 'dirstate-tags'."
3625
3768
msgstr ""
3626
3769
3627
#: bzrlib/builtins.py:5505
3770
#: bzrlib/builtins.py:5598
3628
3771
msgid ""
3629
3772
"The TREE argument should be a subdirectory of a working tree. That\n"
3630
3773
"subdirectory will be converted into an independent tree, with its own\n"
3631
3774
"branch. Commits in the top-level tree will not apply to the new subtree."
3632
3775
msgstr ""
3633
3776
3634
#: bzrlib/builtins.py:5585
3777
#: bzrlib/builtins.py:5678
3635
3778
msgid "No submit branch specified or known"
3636
3779
msgstr "No se ha enviado una rama especificada o conocida"
3637
3780
3638
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3781
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3639
3782
msgid "No public branch specified or known"
3640
3783
msgstr "No hay una rama especificada o conocida pública"
3641
3784
3642
#: bzrlib/builtins.py:5598
3785
#: bzrlib/builtins.py:5691
3643
3786
msgid "bzr merge-directive takes at most two one revision identifiers"
3644
3787
msgstr ""
3645
3788
3646
#: bzrlib/builtins.py:5607
3789
#: bzrlib/builtins.py:5700
3647
3790
msgid "No revisions to bundle."
3648
3791
msgstr ""
3649
3792
3650
#: bzrlib/builtins.py:5626
3793
#: bzrlib/builtins.py:5719
3651
3794
msgid "Mail or create a merge-directive for submitting changes."
3652
3795
msgstr ""
3653
3796
3654
#: bzrlib/builtins.py:5628
3797
#: bzrlib/builtins.py:5721
3655
3798
msgid "A merge directive provides many things needed for requesting merges:"
3656
3799
msgstr ""
3657
3800
3658
#: bzrlib/builtins.py:5630
3801
#: bzrlib/builtins.py:5723
3659
3802
msgid "* A machine-readable description of the merge to perform"
3660
3803
msgstr ""
3661
3804
3662
#: bzrlib/builtins.py:5632
3805
#: bzrlib/builtins.py:5725
3663
3806
msgid "* An optional patch that is a preview of the changes requested"
3664
3807
msgstr ""
3665
3808
"* Una ruta opcional que es una vista previa de los cambios requeridos"
3666
3809
3667
#: bzrlib/builtins.py:5634
3810
#: bzrlib/builtins.py:5727
3668
3811
msgid ""
3669
3812
"* An optional bundle of revision data, so that the changes can be applied\n"
3670
3813
" directly from the merge directive, without retrieving data from a\n"
3671
3814
" branch."
3672
3815
msgstr ""
3673
3816
3674
#: bzrlib/builtins.py:5638
3817
#: bzrlib/builtins.py:5731
3675
3818
msgid ""
3676
3819
"`bzr send` creates a compact data set that, when applied using bzr\n"
3677
3820
"merge, has the same effect as merging from the source branch. "
3678
3821
msgstr ""
3679
3822
3680
#: bzrlib/builtins.py:5641
3823
#: bzrlib/builtins.py:5734
3681
3824
msgid ""
3682
3825
"By default the merge directive is self-contained and can be applied to any\n"
3683
3826
"branch containing submit_branch in its ancestory without needing access to\n"
3684
3827
"the source branch."
3685
3828
msgstr ""
3686
3829
3687
#: bzrlib/builtins.py:5645
3830
#: bzrlib/builtins.py:5738
3688
3831
msgid ""
3689
3832
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3690
3833
"revisions, but only a structured request to merge from the\n"
3693
3836
"included if known, so that people can check it later."
3694
3837
msgstr ""
3695
3838
3696
#: bzrlib/builtins.py:5651
3839
#: bzrlib/builtins.py:5744
3697
3840
msgid ""
3698
3841
"The submit branch defaults to the parent of the source branch, but can be\n"
3699
3842
"overridden. Both submit branch and public branch will be remembered in\n"
3702
3845
"be changed using --from."
3703
3846
msgstr ""
3704
3847
3705
#: bzrlib/builtins.py:5657
3848
#: bzrlib/builtins.py:5750
3706
3849
msgid ""
3707
3850
"Both the submit branch and the public branch follow the usual behavior with\n"
3708
3851
"respect to --remember: If there is no default location set, the first send\n"
3711
3854
"--remember. The value will only be saved if the location can be accessed."
3712
3855
msgstr ""
3713
3856
3714
#: bzrlib/builtins.py:5663
3857
#: bzrlib/builtins.py:5756
3715
3858
msgid ""
3716
3859
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3717
3860
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3719
3862
"in the merge directive."
3720
3863
msgstr ""
3721
3864
3722
#: bzrlib/builtins.py:5668
3865
#: bzrlib/builtins.py:5761
3723
3866
msgid ""
3724
3867
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3725
3868
"given, in which case it is sent to a file."
3726
3869
msgstr ""
3727
3870
3728
#: bzrlib/builtins.py:5671
3871
#: bzrlib/builtins.py:5764
3729
3872
msgid ""
3730
3873
"Mail is sent using your preferred mail program. This should be transparent\n"
3731
3874
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3732
3875
"If the preferred client can't be found (or used), your editor will be used."
3733
3876
msgstr ""
3734
3877
3735
#: bzrlib/builtins.py:5675
3878
#: bzrlib/builtins.py:5768
3736
3879
msgid ""
3737
3880
"To use a specific mail program, set the mail_client configuration option.\n"
3738
3881
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3744
3887
"supported clients."
3745
3888
msgstr ""
3746
3889
3747
#: bzrlib/builtins.py:5682
3890
#: bzrlib/builtins.py:5775
3748
3891
msgid ""
3749
3892
"If mail is being sent, a to address is required. This can be supplied\n"
3750
3893
"either on the commandline, by setting the submit_to configuration\n"
3752
3895
"in the submit branch."
3753
3896
msgstr ""
3754
3897
3755
#: bzrlib/builtins.py:5687
3898
#: bzrlib/builtins.py:5780
3756
3899
msgid ""
3757
3900
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3758
3901
"and\n"
3762
3905
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3763
3906
msgstr ""
3764
3907
3765
#: bzrlib/builtins.py:5693
3908
#: bzrlib/builtins.py:5786
3766
3909
msgid ""
3767
3910
"The merge directives created by bzr send may be applied using bzr merge or\n"
3768
3911
"bzr pull by specifying a file containing a merge directive as the location."
3769
3912
msgstr ""
3770
3913
3771
#: bzrlib/builtins.py:5696
3914
#: bzrlib/builtins.py:5789
3772
3915
msgid ""
3773
3916
"bzr send makes extensive use of public locations to map local locations "
3774
3917
"into\n"
3776
3919
"set them, and use `bzr info` to display them."
3777
3920
msgstr ""
3778
3921
3779
#: bzrlib/builtins.py:5720
3922
#: bzrlib/builtins.py:5813
3780
3923
msgid "Write merge directive to this file or directory; use - for stdout."
3781
3924
msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
3782
3925
3783
#: bzrlib/builtins.py:5724
3926
#: bzrlib/builtins.py:5817
3784
3927
msgid ""
3785
3928
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3786
3929
"strict disables the check."
3787
3930
msgstr ""
3788
3931
3789
#: bzrlib/builtins.py:5726
3932
#: bzrlib/builtins.py:5819
3790
3933
msgid "Mail the request to this address."
3791
3934
msgstr "Enviar por correo la petición a esta dirección"
3792
3935
3793
#: bzrlib/builtins.py:5730
3936
#: bzrlib/builtins.py:5823
3794
3937
msgid "Body for the email."
3795
3938
msgstr "Cuerpo para el correo."
3796
3939
3797
#: bzrlib/builtins.py:5783
3940
#: bzrlib/builtins.py:5876
3798
3941
msgid "Do not include a bundle in the merge directive."
3799
3942
msgstr ""
3800
3943
3801
#: bzrlib/builtins.py:5784
3944
#: bzrlib/builtins.py:5877
3802
3945
msgid "Do not include a preview patch in the merge directive."
3803
3946
msgstr "No incluir una ruta de vista previa en la directiva de fusión."
3804
3947
3805
#: bzrlib/builtins.py:5787
3948
#: bzrlib/builtins.py:5880
3806
3949
msgid "Remember submit and public branch."
3807
3950
msgstr "Recordar el envío y la rama pública."
3808
3951
3809
#: bzrlib/builtins.py:5789
3952
#: bzrlib/builtins.py:5882
3810
3953
msgid ""
3811
3954
"Branch to generate the submission from, rather than the one containing the "
3812
3955
"working directory."
3813
3956
msgstr ""
3814
3957
3815
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3958
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3816
3959
msgid "format"
3817
3960
msgstr "formato"
3818
3961
3819
#: bzrlib/builtins.py:5800
3962
#: bzrlib/builtins.py:5893
3820
3963
msgid "Use the specified output format."
3821
3964
msgstr "Usar el formato de salida especificado."
3822
3965
3823
#: bzrlib/builtins.py:5822
3966
#: bzrlib/builtins.py:5915
3824
3967
msgid "Create, remove or modify a tag naming a revision."
3825
3968
msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
3826
3969
3827
#: bzrlib/builtins.py:5824
3970
#: bzrlib/builtins.py:5917
3828
3971
msgid ""
3829
3972
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3830
3973
"(--revision) option can be given -rtag:X, where X is any previously\n"
3831
3974
"created tag."
3832
3975
msgstr ""
3833
3976
3834
#: bzrlib/builtins.py:5828
3977
#: bzrlib/builtins.py:5921
3835
3978
msgid ""
3836
3979
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3837
3980
"along when you branch, push, pull or merge."
3838
3981
msgstr ""
3839
3982
3840
#: bzrlib/builtins.py:5831
3983
#: bzrlib/builtins.py:5924
3841
3984
msgid ""
3842
3985
"It is an error to give a tag name that already exists unless you pass\n"
3843
3986
"--force, in which case the tag is moved to point to the new revision."
3844
3987
msgstr ""
3845
3988
3846
#: bzrlib/builtins.py:5834
3989
#: bzrlib/builtins.py:5927
3847
3990
msgid ""
3848
3991
"To rename a tag (change the name but keep it on the same revsion), run "
3849
3992
"``bzr\n"
3850
3993
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3851
3994
msgstr ""
3852
3995
3853
#: bzrlib/builtins.py:5837
3996
#: bzrlib/builtins.py:5930
3854
3997
msgid ""
3855
3998
"If no tag name is specified it will be determined through the \n"
3856
3999
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3858
4001
"details."
3859
4002
msgstr ""
3860
4003
3861
#: bzrlib/builtins.py:5847
4004
#: bzrlib/builtins.py:5940
3862
4005
msgid "Delete this tag rather than placing it."
3863
4006
msgstr "Eliminar esta etiqueta en lugar de colocarla."
3864
4007
3865
#: bzrlib/builtins.py:5850
4008
#: bzrlib/builtins.py:5943
3866
4009
msgid "Branch in which to place the tag."
3867
4010
msgstr ""
3868
4011
3869
#: bzrlib/builtins.py:5852
4012
#: bzrlib/builtins.py:5945
3870
4013
msgid "Replace existing tags."
3871
4014
msgstr "Reemplazar las etiquetas existentes."
3872
4015
3873
#: bzrlib/builtins.py:5867
4016
#: bzrlib/builtins.py:5960
3874
4017
msgid "No tag specified to delete."
3875
4018
msgstr "No hay etiquetas especificadas para eliminar."
3876
4019
3877
#: bzrlib/builtins.py:5869
4020
#: bzrlib/builtins.py:5962
3878
4021
#, python-format
3879
4022
msgid "Deleted tag %s."
3880
4023
msgstr "Etiqueta%s eliminada."
3881
4024
3882
#: bzrlib/builtins.py:5883
4025
#: bzrlib/builtins.py:5976
3883
4026
msgid "Please specify a tag name."
3884
4027
msgstr "Especifique un nombre de etiqueta."
3885
4028
3886
#: bzrlib/builtins.py:5891
4029
#: bzrlib/builtins.py:5984
3887
4030
#, python-format
3888
4031
msgid "Tag %s already exists for that revision."
3889
4032
msgstr "La etiqueta %s existe para esta revisión."
3890
4033
3891
#: bzrlib/builtins.py:5895
4034
#: bzrlib/builtins.py:5988
3892
4035
#, python-format
3893
4036
msgid "Created tag %s."
3894
4037
msgstr "Etiqueta %s creada."
3895
4038
3896
#: bzrlib/builtins.py:5897
4039
#: bzrlib/builtins.py:5990
3897
4040
#, python-format
3898
4041
msgid "Updated tag %s."
3899
4042
msgstr "Etiqueta actualizada %s."
3900
4043
3901
#: bzrlib/builtins.py:5901
4044
#: bzrlib/builtins.py:5994
3902
4045
msgid "List tags."
3903
4046
msgstr "Listar etiquetas."
3904
4047
3905
#: bzrlib/builtins.py:5903
4048
#: bzrlib/builtins.py:5996
3906
4049
msgid ""
3907
4050
"This command shows a table of tag names and the revisions they reference."
3908
4051
msgstr ""
3909
4052
3910
#: bzrlib/builtins.py:5909
4053
#: bzrlib/builtins.py:6002
3911
4054
msgid "Branch whose tags should be displayed."
3912
4055
msgstr "Rama cuyas etiquetas se deben mostrar."
3913
4056
3914
#: bzrlib/builtins.py:5911
4057
#: bzrlib/builtins.py:6004
3915
4058
msgid "Sort tags by different criteria."
3916
4059
msgstr "Ordenar etiquetas con diferentes criterios."
3917
4060
3918
#: bzrlib/builtins.py:5911
4061
#: bzrlib/builtins.py:6004
3919
4062
msgid "Sorting"
3920
4063
msgstr "Ordenación"
3921
4064
3922
#: bzrlib/builtins.py:5980
4065
#: bzrlib/builtins.py:6073
3923
4066
msgid "Reconfigure the type of a bzr directory."
3924
4067
msgstr "Reconfigura el tipo de un directorio bzr."
3925
4068
3926
#: bzrlib/builtins.py:5982
4069
#: bzrlib/builtins.py:6075
3927
4070
msgid "A target configuration must be specified."
3928
4071
msgstr "Se debe especificar una configuración objetivo."
3929
4072
3930
#: bzrlib/builtins.py:5984
4073
#: bzrlib/builtins.py:6077
3931
4074
msgid ""
3932
4075
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3933
4076
"The order of preference is\n"
3938
4081
"If none of these is available, --bind-to must be specified."
3939
4082
msgstr ""
3940
4083
3941
#: bzrlib/builtins.py:5998
4084
#: bzrlib/builtins.py:6091
3942
4085
msgid "Tree type"
3943
4086
msgstr "Tipo de árbol"
3944
4087
3945
#: bzrlib/builtins.py:5999
4088
#: bzrlib/builtins.py:6092
3946
4089
msgid "The relation between branch and tree."
3947
4090
msgstr "La relación entre rama y árbol."
3948
4091
3949
#: bzrlib/builtins.py:6001
4092
#: bzrlib/builtins.py:6094
3950
4093
msgid "Reconfigure to be an unbound branch with no working tree."
3951
4094
msgstr ""
3952
4095
3953
#: bzrlib/builtins.py:6002
4096
#: bzrlib/builtins.py:6095
3954
4097
msgid "Reconfigure to be an unbound branch with a working tree."
3955
4098
msgstr ""
3956
4099
3957
#: bzrlib/builtins.py:6003
4100
#: bzrlib/builtins.py:6096
3958
4101
msgid "Reconfigure to be a bound branch with a working tree."
3959
4102
msgstr ""
3960
4103
3961
#: bzrlib/builtins.py:6004
4104
#: bzrlib/builtins.py:6097
3962
4105
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3963
4106
msgstr ""
3964
4107
3965
#: bzrlib/builtins.py:6009
4108
#: bzrlib/builtins.py:6102
3966
4109
msgid "Repository type"
3967
4110
msgstr "Tipo de repositorio"
3968
4111
3969
#: bzrlib/builtins.py:6010
4112
#: bzrlib/builtins.py:6103
3970
4113
msgid "Location fo the repository."
3971
4114
msgstr "Ubicación en el repositorio."
3972
4115
3973
#: bzrlib/builtins.py:6012
4116
#: bzrlib/builtins.py:6105
3974
4117
msgid ""
3975
4118
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3976
4119
msgstr ""
3977
4120
3978
#: bzrlib/builtins.py:6014
4121
#: bzrlib/builtins.py:6107
3979
4122
msgid "Reconfigure to use a shared repository."
3980
4123
msgstr ""
3981
4124
3982
#: bzrlib/builtins.py:6018
4125
#: bzrlib/builtins.py:6111
3983
4126
msgid "Trees in Repository"
3984
4127
msgstr "Árboles en el repositorio"
3985
4128
3986
#: bzrlib/builtins.py:6019
4129
#: bzrlib/builtins.py:6112
3987
4130
msgid "Whether new branches in the repository have trees."
3988
4131
msgstr "Si las ramas nuevas en el repositorio tienen árboles."
3989
4132
3990
#: bzrlib/builtins.py:6021
4133
#: bzrlib/builtins.py:6114
3991
4134
msgid ""
3992
4135
"Reconfigure repository to create working trees on branches by default."
3993
4136
msgstr ""
3994
4137
3995
#: bzrlib/builtins.py:6023
4138
#: bzrlib/builtins.py:6116
3996
4139
msgid ""
3997
4140
"Reconfigure repository to not create working trees on branches by default."
3998
4141
msgstr ""
3999
4142
4000
#: bzrlib/builtins.py:6026
4143
#: bzrlib/builtins.py:6119
4001
4144
msgid "Branch to bind checkout to."
4002
4145
msgstr ""
4003
4146
4004
#: bzrlib/builtins.py:6028
4147
#: bzrlib/builtins.py:6121
4005
4148
msgid "Perform reconfiguration even if local changes will be lost."
4006
4149
msgstr ""
4007
4150
"Realizar reconfiguración incluso si se han perdido los cambios locales."
4008
4151
4009
#: bzrlib/builtins.py:6031
4152
#: bzrlib/builtins.py:6124
4010
4153
msgid "Reconfigure a branch to be stacked on another branch."
4011
4154
msgstr "Reconfigurar una rama para apilarla en otra rama."
4012
4155
4013
#: bzrlib/builtins.py:6035
4156
#: bzrlib/builtins.py:6128
4014
4157
msgid ""
4015
4158
"Reconfigure a branch to be unstacked. This may require copying substantial "
4016
4159
"data into it."
4017
4160
msgstr ""
4018
4161
4019
#: bzrlib/builtins.py:6045
4162
#: bzrlib/builtins.py:6138
4020
4163
msgid "Can't use both --stacked-on and --unstacked"
4021
4164
msgstr "No se pueden usar ambos --stacked-on y --unstacked"
4022
4165
4023
#: bzrlib/builtins.py:6059
4166
#: bzrlib/builtins.py:6152
4024
4167
msgid "No target configuration specified"
4025
4168
msgstr "No se ha especificado una configuración objetivo"
4026
4169
4027
#: bzrlib/builtins.py:6094
4170
#: bzrlib/builtins.py:6187
4028
4171
msgid "Set the branch of a checkout and update."
4029
4172
msgstr "Establezca la rama de una comprobación y actualización."
4030
4173
4031
#: bzrlib/builtins.py:6096
4174
#: bzrlib/builtins.py:6189
4032
4175
msgid ""
4033
4176
"For lightweight checkouts, this changes the branch being referenced.\n"
4034
4177
"For heavyweight checkouts, this checks that there are no local commits\n"
4036
4179
"of the new location and binds to it."
4037
4180
msgstr ""
4038
4181
4039
#: bzrlib/builtins.py:6101
4182
#: bzrlib/builtins.py:6194
4040
4183
msgid ""
4041
4184
"In both cases, the working tree is updated and uncommitted changes\n"
4042
4185
"are merged. The user can commit or revert these as they desire."
4043
4186
msgstr ""
4044
4187
4045
#: bzrlib/builtins.py:6104
4188
#: bzrlib/builtins.py:6197
4046
4189
msgid "Pending merges need to be committed or reverted before using switch."
4047
4190
msgstr ""
4048
4191
4049
#: bzrlib/builtins.py:6106
4192
#: bzrlib/builtins.py:6199
4050
4193
msgid ""
4051
4194
"The path to the branch to switch to can be specified relative to the parent\n"
4052
4195
"directory of the current branch. For example, if you are currently in a\n"
4054
4197
"/path/to/newbranch."
4055
4198
msgstr ""
4056
4199
4057
#: bzrlib/builtins.py:6111
4200
#: bzrlib/builtins.py:6204
4058
4201
msgid ""
4059
4202
"Bound branches use the nickname of its master branch unless it is set\n"
4060
4203
"locally, in which case switching will update the local nickname to be\n"
4061
4204
"that of the master."
4062
4205
msgstr ""
4063
4206
4064
#: bzrlib/builtins.py:6119
4207
#: bzrlib/builtins.py:6212
4065
4208
msgid "Switch even if local commits will be lost."
4066
4209
msgstr "Cambiar incluso si las ejecuciones se han perdido."
4067
4210
4068
#: bzrlib/builtins.py:6122
4211
#: bzrlib/builtins.py:6215
4069
4212
msgid "Create the target branch from this one before switching to it."
4070
4213
msgstr ""
4071
4214
4072
#: bzrlib/builtins.py:6134
4215
#: bzrlib/builtins.py:6229
4073
4216
msgid "You must supply either a revision or a location"
4074
4217
msgstr "Debe especificar una revisión o una ubicación"
4075
4218
4076
#: bzrlib/builtins.py:6145
4219
#: bzrlib/builtins.py:6242
4077
4220
msgid "cannot create branch without source branch"
4078
4221
msgstr "no se puede crear una rama sin rama origen"
4079
4222
4080
#: bzrlib/builtins.py:6209
4223
#: bzrlib/builtins.py:6262
4081
4224
msgid "Manage filtered views."
4082
4225
msgstr "Gestionar vistas filtradas."
4083
4226
4084
#: bzrlib/builtins.py:6211
4227
#: bzrlib/builtins.py:6264
4085
4228
msgid ""
4086
4229
"Views provide a mask over the tree so that users can focus on\n"
4087
4230
"a subset of a tree when doing their work. After creating a view,\n"
4091
4234
"must be within the current view."
4092
4235
msgstr ""
4093
4236
4094
#: bzrlib/builtins.py:6218
4237
#: bzrlib/builtins.py:6271
4095
4238
msgid ""
4096
4239
"In most cases, a view has a short life-span: it is created to make\n"
4097
4240
"a selected change and is deleted once that change is committed.\n"
4099
4242
"and switch between them."
4100
4243
msgstr ""
4101
4244
4102
#: bzrlib/builtins.py:6223
4245
#: bzrlib/builtins.py:6276
4103
4246
msgid ""
4104
4247
"To disable the current view without deleting it, you can switch to\n"
4105
4248
"the pseudo view called ``off``. This can be useful when you need\n"
4107
4250
"want to switch back to your view after that."
4108
4251
msgstr ""
4109
4252
4110
#: bzrlib/builtins.py:6228
4253
#: bzrlib/builtins.py:6281
4111
4254
msgid ""
4112
4255
":Examples:\n"
4113
4256
" To define the current view::"
4115
4258
":Ejemplos:\n"
4116
4259
" Para definir la vista actual::"
4117
4260
4118
#: bzrlib/builtins.py:6231
4261
#: bzrlib/builtins.py:6284
4119
4262
msgid " bzr view file1 dir1 ..."
4120
4263
msgstr " bzr view file1 dir1 ..."
4121
4264
4122
#: bzrlib/builtins.py:6233
4265
#: bzrlib/builtins.py:6286
4123
4266
msgid " To list the current view::"
4124
4267
msgstr " Para listar la vista actual::"
4125
4268
4126
#: bzrlib/builtins.py:6235
4269
#: bzrlib/builtins.py:6288
4127
4270
msgid " bzr view"
4128
4271
msgstr " vista bzr"
4129
4272
4130
#: bzrlib/builtins.py:6237
4273
#: bzrlib/builtins.py:6290
4131
4274
msgid " To delete the current view::"
4132
4275
msgstr " Para eliminar la vista actual::"
4133
4276
4134
#: bzrlib/builtins.py:6239
4277
#: bzrlib/builtins.py:6292
4135
4278
msgid " bzr view --delete"
4136
4279
msgstr " bzr view --delete"
4137
4280
4138
#: bzrlib/builtins.py:6241
4281
#: bzrlib/builtins.py:6294
4139
4282
msgid " To disable the current view without deleting it::"
4140
4283
msgstr " Para desactivar la vista actual sin eliminarla::"
4141
4284
4142
#: bzrlib/builtins.py:6243
4285
#: bzrlib/builtins.py:6296
4143
4286
msgid " bzr view --switch off"
4144
4287
msgstr " bzr view --switch off"
4145
4288
4146
#: bzrlib/builtins.py:6245
4289
#: bzrlib/builtins.py:6298
4147
4290
msgid " To define a named view and switch to it::"
4148
4291
msgstr ""
4149
4292
4150
#: bzrlib/builtins.py:6247
4293
#: bzrlib/builtins.py:6300
4151
4294
msgid " bzr view --name view-name file1 dir1 ..."
4152
4295
msgstr " bzr view --name view-name file1 dir1 ..."
4153
4296
4154
#: bzrlib/builtins.py:6249
4297
#: bzrlib/builtins.py:6302
4155
4298
msgid " To list a named view::"
4156
4299
msgstr " Para lista la vista nombrada::"
4157
4300
4158
#: bzrlib/builtins.py:6251
4301
#: bzrlib/builtins.py:6304
4159
4302
msgid " bzr view --name view-name"
4160
4303
msgstr " bzr view --name view-name"
4161
4304
4162
#: bzrlib/builtins.py:6253
4305
#: bzrlib/builtins.py:6306
4163
4306
msgid " To delete a named view::"
4164
4307
msgstr " Para eliminar una vista nombrada::"
4165
4308
4166
#: bzrlib/builtins.py:6255
4309
#: bzrlib/builtins.py:6308
4167
4310
msgid " bzr view --name view-name --delete"
4168
4311
msgstr " bzr view --name view-name --delete"
4169
4312
4170
#: bzrlib/builtins.py:6257
4313
#: bzrlib/builtins.py:6310
4171
4314
msgid " To switch to a named view::"
4172
4315
msgstr " Para cambiar a una vista nombrada::"
4173
4316
4174
#: bzrlib/builtins.py:6259
4317
#: bzrlib/builtins.py:6312
4175
4318
msgid " bzr view --switch view-name"
4176
4319
msgstr " bzr view --switch view-name"
4177
4320
4178
#: bzrlib/builtins.py:6261
4321
#: bzrlib/builtins.py:6314
4179
4322
msgid " To list all views defined::"
4180
4323
msgstr " Para listar todas las vistas definidas::"
4181
4324
4182
#: bzrlib/builtins.py:6263
4325
#: bzrlib/builtins.py:6316
4183
4326
msgid " bzr view --all"
4184
4327
msgstr " bzr view --all"
4185
4328
4186
#: bzrlib/builtins.py:6265
4329
#: bzrlib/builtins.py:6318
4187
4330
msgid " To delete all views::"
4188
4331
msgstr " Para eliminar todas las vistas::"
4189
4332
4190
#: bzrlib/builtins.py:6267
4333
#: bzrlib/builtins.py:6320
4191
4334
msgid " bzr view --delete --all"
4192
4335
msgstr " bzr view --delete --all"
4193
4336
4194
#: bzrlib/builtins.py:6274
4337
#: bzrlib/builtins.py:6327
4195
4338
msgid "Apply list or delete action to all views."
4196
4339
msgstr ""
4197
4340
4198
#: bzrlib/builtins.py:6277
4341
#: bzrlib/builtins.py:6330
4199
4342
msgid "Delete the view."
4200
4343
msgstr "Eliminar la vista."
4201
4344
4202
#: bzrlib/builtins.py:6280
4345
#: bzrlib/builtins.py:6333
4203
4346
msgid "Name of the view to define, list or delete."
4204
4347
msgstr "Nombre de la vista a definir, listar o eliminar."
4205
4348
4206
#: bzrlib/builtins.py:6284
4349
#: bzrlib/builtins.py:6337
4207
4350
msgid "Name of the view to switch to."
4208
4351
msgstr "Nombre de la vista a la que cambiar."
4209
4352
4210
#: bzrlib/builtins.py:6303
4353
#: bzrlib/builtins.py:6356
4211
4354
msgid "Both --delete and a file list specified"
4212
4355
msgstr ""
4213
4356
4214
#: bzrlib/builtins.py:6306
4357
#: bzrlib/builtins.py:6359
4215
4358
msgid "Both --delete and --switch specified"
4216
4359
msgstr "Ambos --delete y --switch especificados"
4217
4360
4218
#: bzrlib/builtins.py:6309
4361
#: bzrlib/builtins.py:6362
4219
4362
msgid "Deleted all views.\n"
4220
4363
msgstr "Eliminar todas las vistas.\n"
4221
4364
4222
#: bzrlib/builtins.py:6311
4365
#: bzrlib/builtins.py:6364
4223
4366
msgid "No current view to delete"
4224
4367
msgstr "No hay vista para eliminar"
4225
4368
4226
#: bzrlib/builtins.py:6314
4369
#: bzrlib/builtins.py:6367
4227
4370
#, python-format
4228
4371
msgid "Deleted '%s' view.\n"
4229
4372
msgstr "Vista «%s» eliminada.\n"
4230
4373
4231
#: bzrlib/builtins.py:6318
4374
#: bzrlib/builtins.py:6371
4232
4375
msgid "Both --switch and a file list specified"
4233
4376
msgstr ""
4234
4377
4235
#: bzrlib/builtins.py:6321
4378
#: bzrlib/builtins.py:6374
4236
4379
msgid "Both --switch and --all specified"
4237
4380
msgstr "Ambos --switch y --all especificados"
4238
4381
4239
#: bzrlib/builtins.py:6324
4382
#: bzrlib/builtins.py:6377
4240
4383
msgid "No current view to disable"
4241
4384
msgstr "No hay vista actual que desactivar"
4242
4385
4243
#: bzrlib/builtins.py:6326
4386
#: bzrlib/builtins.py:6379
4244
4387
#, python-format
4245
4388
msgid "Disabled '%s' view.\n"
4246
4389
msgstr "Vista «%s» desactivada.\n"
4247
4390
4248
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4391
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4249
4392
msgid "Using '{0}' view: {1}\n"
4250
4393
msgstr "Usar «{0}» vista: {1}\n"
4251
4394
4252
#: bzrlib/builtins.py:6333
4395
#: bzrlib/builtins.py:6386
4253
4396
msgid "Views defined:\n"
4254
4397
msgstr "Vistas definidas:\n"
4255
4398
4256
#: bzrlib/builtins.py:6342
4399
#: bzrlib/builtins.py:6395
4257
4400
msgid "No views defined.\n"
4258
4401
msgstr "No hay vista definida.\n"
4259
4402
4260
#: bzrlib/builtins.py:6349
4403
#: bzrlib/builtins.py:6402
4261
4404
msgid "Cannot change the 'off' pseudo view"
4262
4405
msgstr ""
4263
4406
4264
#: bzrlib/builtins.py:6357
4407
#: bzrlib/builtins.py:6410
4265
4408
msgid "No current view.\n"
4266
4409
msgstr "No hay vista actual.\n"
4267
4410
4268
#: bzrlib/builtins.py:6360
4411
#: bzrlib/builtins.py:6413
4269
4412
msgid "'{0}' view is: {1}\n"
4270
4413
msgstr "«{0}» vista es: {1}\n"
4271
4414
4272
#: bzrlib/builtins.py:6380
4415
#: bzrlib/builtins.py:6433
4273
4416
msgid " <no hooks installed>\n"
4274
4417
msgstr ""
4275
4418
4276
#: bzrlib/builtins.py:6384
4419
#: bzrlib/builtins.py:6437
4277
4420
msgid "Remove a branch."
4278
4421
msgstr "Eliminar una rama."
4279
4422
4280
#: bzrlib/builtins.py:6386
4423
#: bzrlib/builtins.py:6439
4281
4424
msgid ""
4282
4425
"This will remove the branch from the specified location but \n"
4283
4426
"will keep any working tree or repository in place."
4284
4427
msgstr ""
4285
4428
4286
#: bzrlib/builtins.py:6391
4429
#: bzrlib/builtins.py:6444
4287
4430
msgid " Remove the branch at repo/trunk::"
4288
4431
msgstr " Eliminar la rama en repo/trunk::"
4289
4432
4290
#: bzrlib/builtins.py:6393
4433
#: bzrlib/builtins.py:6446
4291
4434
msgid " bzr remove-branch repo/trunk"
4292
4435
msgstr " bzr remove-branch repo/trunk"
4293
4436
4294
#: bzrlib/builtins.py:6408
4437
#: bzrlib/builtins.py:6461
4295
4438
msgid "Plaintext diff output."
4296
4439
msgstr ""
4297
4440
4298
#: bzrlib/builtins.py:6409
4441
#: bzrlib/builtins.py:6462
4299
4442
msgid "Temporarily set aside some changes from the current tree."
4300
4443
msgstr ""
4301
4444
4302
#: bzrlib/builtins.py:6411
4445
#: bzrlib/builtins.py:6464
4303
4446
msgid ""
4304
4447
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4305
4448
"ie. out of the way, until a later time when you can bring them back from\n"
4308
4451
"will they survive its deletion."
4309
4452
msgstr ""
4310
4453
4311
#: bzrlib/builtins.py:6417
4454
#: bzrlib/builtins.py:6470
4312
4455
msgid "If shelve --list is specified, previously-shelved changes are listed."
4313
4456
msgstr ""
4314
4457
4315
#: bzrlib/builtins.py:6419
4458
#: bzrlib/builtins.py:6472
4316
4459
msgid ""
4317
4460
"Shelve is intended to help separate several sets of changes that have\n"
4318
4461
"been inappropriately mingled. If you just want to get rid of all changes\n"
4320
4463
"shelve all text changes at once, use shelve --all."
4321
4464
msgstr ""
4322
4465
4323
#: bzrlib/builtins.py:6424
4466
#: bzrlib/builtins.py:6477
4324
4467
msgid ""
4325
4468
"If filenames are specified, only the changes to those files will be\n"
4326
4469
"shelved. Other files will be left untouched."
4327
4470
msgstr ""
4328
4471
4329
#: bzrlib/builtins.py:6427
4472
#: bzrlib/builtins.py:6480
4330
4473
msgid ""
4331
4474
"If a revision is specified, changes since that revision will be shelved."
4332
4475
msgstr ""
4333
4476
"Si se especifica una revisión, los cambios realizados desde esta revisión "
4334
4477
"serán archivados."
4335
4478
4336
#: bzrlib/builtins.py:6429
4479
#: bzrlib/builtins.py:6482
4337
4480
msgid ""
4338
4481
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4339
4482
"restore the most recently shelved changes."
4340
4483
msgstr ""
4341
4484
4342
#: bzrlib/builtins.py:6432
4485
#: bzrlib/builtins.py:6485
4343
4486
msgid ""
4344
4487
"For complicated changes, it is possible to edit the changes in a separate\n"
4345
4488
"editor program to decide what the file remaining in the working copy\n"
4346
4489
"should look like. To do this, add the configuration option"
4347
4490
msgstr ""
4348
4491
4349
#: bzrlib/builtins.py:6436
4492
#: bzrlib/builtins.py:6489
4350
4493
msgid " change_editor = PROGRAM @new_path @old_path"
4351
4494
msgstr ""
4352
4495
4353
#: bzrlib/builtins.py:6438
4496
#: bzrlib/builtins.py:6491
4354
4497
msgid ""
4355
4498
"where @new_path is replaced with the path of the new version of the \n"
4356
4499
"file and @old_path is replaced with the path of the old version of \n"
4359
4502
" "
4360
4503
msgstr ""
4361
4504
4362
#: bzrlib/builtins.py:6450
4505
#: bzrlib/builtins.py:6503
4363
4506
msgid "Shelve all changes."
4364
4507
msgstr "Guardar todos los cambios."
4365
4508
4366
#: bzrlib/builtins.py:6452
4509
#: bzrlib/builtins.py:6505
4367
4510
msgid "Method to use for writing diffs."
4368
4511
msgstr "Método a usar para escribir diferencias."
4369
4512
4370
#: bzrlib/builtins.py:6452
4513
#: bzrlib/builtins.py:6505
4371
4514
msgid "writer"
4372
4515
msgstr "escritor"
4373
4516
4374
#: bzrlib/builtins.py:6456
4517
#: bzrlib/builtins.py:6509
4375
4518
msgid "List shelved changes."
4376
4519
msgstr "Listar cambios guardados."
4377
4520
4378
#: bzrlib/builtins.py:6458
4521
#: bzrlib/builtins.py:6511
4379
4522
msgid "Destroy removed changes instead of shelving them."
4380
4523
msgstr "Destruir cambios eliminados en vez de guardarlos."
4381
4524
4382
#: bzrlib/builtins.py:6487
4525
#: bzrlib/builtins.py:6540
4383
4526
msgid "No shelved changes."
4384
4527
msgstr "No ha cambios guardados."
4385
4528
4386
#: bzrlib/builtins.py:6498
4529
#: bzrlib/builtins.py:6551
4387
4530
msgid "Restore shelved changes."
4388
4531
msgstr "Restaurar cambios guardados."
4389
4532
4390
#: bzrlib/builtins.py:6500
4533
#: bzrlib/builtins.py:6553
4391
4534
msgid ""
4392
4535
"By default, the most recently shelved changes are restored. However if you\n"
4393
4536
"specify a shelf by id those changes will be restored instead. This works\n"
4394
4537
"best when the changes don't depend on each other."
4395
4538
msgstr ""
4396
4539
4397
#: bzrlib/builtins.py:6509
4540
#: bzrlib/builtins.py:6562
4398
4541
msgid "The action to perform."
4399
4542
msgstr "La acción a realizar."
4400
4543
4401
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4544
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4402
4545
msgid "action"
4403
4546
msgstr "acción"
4404
4547
4405
#: bzrlib/builtins.py:6511
4548
#: bzrlib/builtins.py:6564
4406
4549
msgid "Apply changes and remove from the shelf."
4407
4550
msgstr ""
4408
4551
4409
#: bzrlib/builtins.py:6512
4552
#: bzrlib/builtins.py:6565
4410
4553
msgid "Show changes, but do not apply or remove them."
4411
4554
msgstr ""
4412
4555
4413
#: bzrlib/builtins.py:6513
4556
#: bzrlib/builtins.py:6566
4414
4557
msgid ""
4415
4558
"Instead of unshelving the changes, show the diff that would result from "
4416
4559
"unshelving."
4417
4560
msgstr ""
4418
4561
4419
#: bzrlib/builtins.py:6515
4562
#: bzrlib/builtins.py:6568
4420
4563
msgid "Delete changes without applying them."
4421
4564
msgstr ""
4422
4565
4423
#: bzrlib/builtins.py:6516
4566
#: bzrlib/builtins.py:6569
4424
4567
msgid "Apply changes but don't delete them."
4425
4568
msgstr ""
4426
4569
4427
#: bzrlib/builtins.py:6531
4570
#: bzrlib/builtins.py:6584
4428
4571
msgid "Remove unwanted files from working tree."
4429
4572
msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
4430
4573
4431
#: bzrlib/builtins.py:6533
4574
#: bzrlib/builtins.py:6586
4432
4575
msgid ""
4433
4576
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4434
4577
"files are never deleted."
4435
4578
msgstr ""
4436
4579
4437
#: bzrlib/builtins.py:6536
4580
#: bzrlib/builtins.py:6589
4438
4581
msgid ""
4439
4582
"Another class is 'detritus', which includes files emitted by bzr during\n"
4440
4583
"normal operations and selftests. (The value of these files decreases with\n"
4441
4584
"time.)"
4442
4585
msgstr ""
4443
4586
4444
#: bzrlib/builtins.py:6540
4587
#: bzrlib/builtins.py:6593
4445
4588
msgid ""
4446
4589
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4447
4590
"flags are respected, and may be combined."
4448
4591
msgstr ""
4449
4592
4450
#: bzrlib/builtins.py:6543
4593
#: bzrlib/builtins.py:6596
4451
4594
msgid "To check what clean-tree will do, use --dry-run."
4452
4595
msgstr ""
4453
4596
4454
#: bzrlib/builtins.py:6546
4597
#: bzrlib/builtins.py:6599
4455
4598
msgid "Delete all ignored files."
4456
4599
msgstr "Eliminar todos los archivos ignorados."
4457
4600
4458
#: bzrlib/builtins.py:6547
4601
#: bzrlib/builtins.py:6600
4459
4602
msgid ""
4460
4603
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4461
4604
msgstr ""
4462
4605
4463
#: bzrlib/builtins.py:6550
4606
#: bzrlib/builtins.py:6603
4464
4607
msgid "Delete files unknown to bzr (default)."
4465
4608
msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
4466
4609
4467
#: bzrlib/builtins.py:6551
4610
#: bzrlib/builtins.py:6604
4468
4611
msgid "Show files to delete instead of deleting them."
4469
4612
msgstr "Mostrar archivos a eliminar en vez de eliminarles."
4470
4613
4471
#: bzrlib/builtins.py:6553
4614
#: bzrlib/builtins.py:6606
4472
4615
msgid "Do not prompt before deleting."
4473
4616
msgstr "No preguntar antes de eliminar."
4474
4617
4528
4671
msgstr[0] ""
4529
4672
msgstr[1] ""
4530
4673
4531
#: bzrlib/bzrdir.py:489
4674
#: bzrlib/bzrdir.py:490
4532
4675
msgid ""
4533
4676
"making backup of {0}\n"
4534
4677
" to {1}"
4536
4679
"haciendo respaldo de {0}\n"
4537
4680
" a {1}"
4538
4681
4539
#: bzrlib/bzrdir.py:512
4682
#: bzrlib/bzrdir.py:513
4540
4683
msgid "renamed {0} to {1}"
4541
4684
msgstr "renombrado {0} a {1}"
4542
4685
4543
#: bzrlib/bzrdir.py:1663
4686
#: bzrlib/bzrdir.py:1652
4544
4687
#, python-format
4545
4688
msgid ""
4546
4689
"Source repository format does not support stacking, using format:\n"
4547
4690
" %s"
4548
4691
msgstr ""
4549
4692
4550
#: bzrlib/bzrdir.py:1683
4693
#: bzrlib/bzrdir.py:1672
4551
4694
#, python-format
4552
4695
msgid ""
4553
4696
"Source branch format does not support stacking, using format:\n"
4554
4697
" %s"
4555
4698
msgstr ""
4556
4699
4557
#: bzrlib/bzrdir.py:1829
4700
#: bzrlib/bzrdir.py:1818
4558
4701
msgid "starting repository conversion"
4559
4702
msgstr "iniciar conversión de repositorio"
4560
4703
4561
#: bzrlib/bzrdir.py:2058
4704
#: bzrlib/bzrdir.py:2039
4562
4705
msgid "Using default stacking branch {0} at {1}"
4563
4706
msgstr ""
4564
4707
4797
4940
msgid "bzr version-info --revision takes exactly one revision specifier"
4798
4941
msgstr ""
4799
4942
4800
#: bzrlib/commands.py:228
4943
#: bzrlib/commands.py:229
4801
4944
#, python-format
4802
4945
msgid "unknown command \"%s\""
4803
4946
msgstr "orden «%s» desconocida"
4804
4947
4805
#: bzrlib/commands.py:475
4948
#: bzrlib/commands.py:476
4806
4949
msgid "No help for this command."
4807
4950
msgstr "No hay ayuda para esta orden."
4808
4951
4809
#: bzrlib/commands.py:488
4952
#: bzrlib/commands.py:489
4810
4953
#, python-format
4811
4954
msgid ":Purpose: %s\n"
4812
4955
msgstr ":Propósito: %s\n"
4813
4956
4814
#: bzrlib/commands.py:490
4957
#: bzrlib/commands.py:491
4815
4958
#, python-format
4816
4959
msgid ""
4817
4960
":Usage:\n"
4820
4963
":Uso:\n"
4821
4964
"%s\n"
4822
4965
4823
#: bzrlib/commands.py:492
4966
#: bzrlib/commands.py:493
4824
4967
#, python-format
4825
4968
msgid ":Usage: %s\n"
4826
4969
msgstr ":Uso: %s\n"
4827
4970
4828
#: bzrlib/commands.py:511
4971
#: bzrlib/commands.py:512
4829
4972
#, python-format
4830
4973
msgid ":Options:%s"
4831
4974
msgstr ":Opciones:%s"
4832
4975
4833
#: bzrlib/commands.py:522
4976
#: bzrlib/commands.py:523
4834
4977
#, python-format
4835
4978
msgid ""
4836
4979
":Description:\n"
4841
4984
" %s\n"
4842
4985
"\n"
4843
4986
4844
#: bzrlib/commands.py:532
4987
#: bzrlib/commands.py:533
4845
4988
#, python-format
4846
4989
msgid ""
4847
4990
"See bzr help %s for more details and examples.\n"
4848
4991
"\n"
4849
4992
msgstr ""
4850
4993
4851
#: bzrlib/commands.py:537
4994
#: bzrlib/commands.py:538
4852
4995
msgid ":Aliases: "
4853
4996
msgstr ":Alias: "
4854
4997
4855
#: bzrlib/commands.py:541
4998
#: bzrlib/commands.py:542
4856
4999
#, python-format
4857
5000
msgid ":From: plugin \"%s\"\n"
4858
5001
msgstr ":Desde: complemento «%s»\n"
4859
5002
4860
#: bzrlib/commands.py:553
5003
#: bzrlib/commands.py:554
4861
5004
msgid ":doc:`{0} <{1}-help>`"
4862
5005
msgstr ":doc:`{0} <{1}-help>`"
4863
5006
4864
#: bzrlib/commands.py:557
5007
#: bzrlib/commands.py:558
4865
5008
#, python-format
4866
5009
msgid ":See also: %s"
4867
5010
msgstr ":Vea también: %s"
4868
5011
4869
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
5012
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4870
5013
msgid "Only ASCII permitted in option names"
4871
5014
msgstr "Solo se permiten nombres de opción en ASCII"
4872
5015
4873
#: bzrlib/commands.py:840 bzrlib/commands.py:848
5016
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4874
5017
msgid "command {0!r} needs one or more {1}"
4875
5018
msgstr "la orden {0!r} necesita una o más {1}"
4876
5019
4877
#: bzrlib/commands.py:857
5020
#: bzrlib/commands.py:858
4878
5021
msgid "command {0!r} requires argument {1}"
4879
5022
msgstr "la orden {0!r} necesita un argumento {1}"
4880
5023
4881
#: bzrlib/commands.py:864
5024
#: bzrlib/commands.py:865
4882
5025
msgid "extra argument to command {0}: {1}"
4883
5026
msgstr ""
4884
5027
4885
#: bzrlib/commands.py:961
5028
#: bzrlib/commands.py:962
4886
5029
#, python-format
4887
5030
msgid "Profile data written to \"%s\"."
4888
5031
msgstr "Datos de perfil escritos en «%s»"
4984
5127
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4985
5128
msgstr ""
4986
5129
4987
#: bzrlib/config.py:2499
5130
#: bzrlib/config.py:2485
4988
5131
msgid "{0} is not an SI unit."
4989
5132
msgstr ""
4990
5133
4991
#: bzrlib/config.py:2956
5134
#: bzrlib/config.py:2949
4992
5135
msgid ""
4993
5136
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4994
5137
"will be saved."
4995
5138
msgstr ""
4996
5139
4997
#: bzrlib/config.py:3100
5140
#: bzrlib/config.py:3093
4998
5141
#, python-format
4999
5142
msgid "Invalid '%s', should be of the form 'name=value'"
5000
5143
msgstr ""
5001
5144
5002
#: bzrlib/config.py:3969
5145
#: bzrlib/config.py:3962
5003
5146
msgid "Display, set or remove a configuration option."
5004
5147
msgstr ""
5005
5148
5006
#: bzrlib/config.py:3971
5149
#: bzrlib/config.py:3964
5007
5150
msgid "Display the active value for a given option."
5008
5151
msgstr ""
5009
5152
5010
#: bzrlib/config.py:3973
5153
#: bzrlib/config.py:3966
5011
5154
msgid ""
5012
5155
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5013
5156
"matching options are displayed mentioning their scope. The active value\n"
5014
5157
"that bzr will take into account is the first one displayed for each option."
5015
5158
msgstr ""
5016
5159
5017
#: bzrlib/config.py:3977
5160
#: bzrlib/config.py:3970
5018
5161
msgid "If no NAME is given, --all .* is implied."
5019
5162
msgstr ""
5020
5163
5021
#: bzrlib/config.py:3979
5164
#: bzrlib/config.py:3972
5022
5165
msgid ""
5023
5166
"Setting a value is achieved by using name=value without spaces. The value\n"
5024
5167
"is set in the most relevant scope and can be checked by displaying the\n"
5025
5168
"option again."
5026
5169
msgstr ""
5027
5170
5028
#: bzrlib/config.py:3991
5171
#: bzrlib/config.py:3984
5029
5172
msgid "Reduce the scope to the specified configuration file."
5030
5173
msgstr ""
5031
5174
5032
#: bzrlib/config.py:3995
5175
#: bzrlib/config.py:3988
5033
5176
msgid "Display all the defined values for the matching options."
5034
5177
msgstr ""
5035
5178
5036
#: bzrlib/config.py:3997
5179
#: bzrlib/config.py:3990
5037
5180
msgid "Remove the option from the configuration file."
5038
5181
msgstr ""
5039
5182
5113
5256
msgstr[0] ""
5114
5257
msgstr[1] ""
5115
5258
5116
#: bzrlib/controldir.py:698
5259
#: bzrlib/controldir.py:710
5117
5260
msgid "{0} is{1} redirected to {2}"
5118
5261
msgstr "{0} es{1} redirigido a {2}"
5119
5262
5219
5362
msgid "The value '%(value)s' is not a valid value."
5220
5363
msgstr ""
5221
5364
5365
#: bzrlib/errors.py:424
5366
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5367
msgstr ""
5368
5222
5369
#: bzrlib/errors.py:443
5223
5370
msgid "Generic path error: %(path)r%(extra)s)"
5224
5371
msgstr ""
5318
5465
msgstr ""
5319
5466
5320
5467
#: bzrlib/errors.py:705
5468
msgid "A control directory already exists: \"%(path)s\"."
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:710
5321
5472
msgid "Already a branch: \"%(path)s\"."
5322
5473
msgstr ""
5323
5474
5324
#: bzrlib/errors.py:711
5475
#: bzrlib/errors.py:715
5476
msgid "Parent branch already exists: \"%(path)s\"."
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:721
5325
5480
msgid ""
5326
5481
"Directory contains a branch, but no working tree (use bzr checkout if you "
5327
5482
"wish to build a working tree): \"%(path)s\""
5328
5483
msgstr ""
5329
5484
5330
#: bzrlib/errors.py:716
5485
#: bzrlib/errors.py:726
5331
5486
msgid ""
5332
5487
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5333
5488
msgstr ""
5334
5489
5335
#: bzrlib/errors.py:726
5490
#: bzrlib/errors.py:736
5336
5491
msgid ""
5337
5492
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5338
5493
msgstr ""
5339
5494
5340
#: bzrlib/errors.py:736
5495
#: bzrlib/errors.py:746
5341
5496
msgid "No repository present: \"%(path)s\""
5342
5497
msgstr ""
5343
5498
5344
#: bzrlib/errors.py:743
5499
#: bzrlib/errors.py:753
5345
5500
msgid ""
5346
5501
"Unsupported branch format: %(format)s\n"
5347
5502
"Please run 'bzr upgrade'"
5348
5503
msgstr ""
5349
5504
5350
#: bzrlib/errors.py:749
5505
#: bzrlib/errors.py:759
5351
5506
msgid "Unknown %(kind)s format: %(format)r"
5352
5507
msgstr ""
5353
5508
5354
#: bzrlib/errors.py:758
5509
#: bzrlib/errors.py:768
5355
5510
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5356
5511
msgstr ""
5357
5512
5358
#: bzrlib/errors.py:768
5513
#: bzrlib/errors.py:778
5359
5514
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5360
5515
msgstr ""
5361
5516
5362
#: bzrlib/errors.py:783
5517
#: bzrlib/errors.py:793
5363
5518
msgid ""
5364
5519
"%(target)s\n"
5365
5520
"is not compatible with\n"
5367
5522
"%(details)s"
5368
5523
msgstr ""
5369
5524
5370
#: bzrlib/errors.py:799
5525
#: bzrlib/errors.py:809
5371
5526
msgid "Revision is not compatible with %(repo_format)s"
5372
5527
msgstr ""
5373
5528
5374
#: bzrlib/errors.py:809
5529
#: bzrlib/errors.py:819
5375
5530
msgid "%(context_info)s%(path)s is already versioned."
5376
5531
msgstr ""
5377
5532
5378
#: bzrlib/errors.py:830
5533
#: bzrlib/errors.py:840
5379
5534
msgid "%(context_info)s%(path)s is not versioned."
5380
5535
msgstr ""
5381
5536
5382
#: bzrlib/errors.py:851
5537
#: bzrlib/errors.py:861
5383
5538
msgid "Path(s) are not versioned: %(paths_as_string)s"
5384
5539
msgstr ""
5385
5540
5386
#: bzrlib/errors.py:862
5541
#: bzrlib/errors.py:872
5387
5542
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5388
5543
msgstr ""
5389
5544
5390
#: bzrlib/errors.py:881
5545
#: bzrlib/errors.py:891
5391
5546
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5392
5547
msgstr ""
5393
5548
5394
#: bzrlib/errors.py:889
5549
#: bzrlib/errors.py:899
5395
5550
msgid ""
5396
5551
"Filename %(filename)r is not valid in your current filesystem encoding "
5397
5552
"%(fs_encoding)s"
5398
5553
msgstr ""
5399
5554
5400
#: bzrlib/errors.py:900
5555
#: bzrlib/errors.py:910
5401
5556
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5402
5557
msgstr ""
5403
5558
5404
#: bzrlib/errors.py:918
5559
#: bzrlib/errors.py:928
5405
5560
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5406
5561
msgstr ""
5407
5562
5408
#: bzrlib/errors.py:957
5563
#: bzrlib/errors.py:967
5409
5564
msgid "Cannot lock %(lock)s: %(why)s"
5410
5565
msgstr ""
5411
5566
5412
#: bzrlib/errors.py:967
5567
#: bzrlib/errors.py:977
5413
5568
msgid ""
5414
5569
"A transaction related operation was attempted after the transaction finished."
5415
5570
msgstr ""
5416
5571
5417
#: bzrlib/errors.py:994
5572
#: bzrlib/errors.py:1004
5418
5573
msgid "Cannot lock: transport is read only: %(transport)s"
5419
5574
msgstr ""
5420
5575
5421
#: bzrlib/errors.py:1002
5576
#: bzrlib/errors.py:1012
5422
5577
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5423
5578
msgstr ""
5424
5579
5425
#: bzrlib/errors.py:1013
5580
#: bzrlib/errors.py:1023
5426
5581
msgid ""
5427
5582
"Lock was broken while still open: %(lock)s - check storage consistency!"
5428
5583
msgstr ""
5429
5584
5430
#: bzrlib/errors.py:1024
5585
#: bzrlib/errors.py:1034
5431
5586
msgid ""
5432
5587
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5433
5588
"%(holder)r, wanted to break %(target)r"
5434
5589
msgstr ""
5435
5590
5436
#: bzrlib/errors.py:1036
5591
#: bzrlib/errors.py:1046
5437
5592
msgid ""
5438
5593
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5439
5594
"Use 'bzr break-lock' to clear it"
5440
5595
msgstr ""
5441
5596
5442
#: bzrlib/errors.py:1049
5597
#: bzrlib/errors.py:1059
5443
5598
msgid "Lock not held: %(lock)s"
5444
5599
msgstr ""
5445
5600
5446
#: bzrlib/errors.py:1078
5601
#: bzrlib/errors.py:1088
5447
5602
msgid "No changes to commit"
5448
5603
msgstr "No hay cambios que ejecutar."
5449
5604
5450
#: bzrlib/errors.py:1083
5605
#: bzrlib/errors.py:1093
5451
5606
msgid ""
5452
5607
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5453
5608
msgstr ""
5454
5609
5455
#: bzrlib/errors.py:1093
5610
#: bzrlib/errors.py:1103
5456
5611
msgid ""
5457
5612
"Excluding paths during commit is not supported by repository at "
5458
5613
"%(repository)r."
5459
5614
msgstr ""
5460
5615
5461
#: bzrlib/errors.py:1102
5616
#: bzrlib/errors.py:1112
5462
5617
msgid ""
5463
5618
"The specified commit message contains characters unsupported by the current "
5464
5619
"encoding."
5465
5620
msgstr ""
5466
5621
5467
#: bzrlib/errors.py:1108
5622
#: bzrlib/errors.py:1118
5468
5623
msgid "Upgrade URL cannot work with readonly URLs."
5469
5624
msgstr ""
5470
5625
5471
#: bzrlib/errors.py:1113
5626
#: bzrlib/errors.py:1123
5472
5627
msgid "The branch format %(format)s is already at the most recent format."
5473
5628
msgstr ""
5474
5629
5475
#: bzrlib/errors.py:1136
5630
#: bzrlib/errors.py:1146
5476
5631
msgid "Option --change does not accept revision ranges"
5477
5632
msgstr ""
5478
5633
5479
#: bzrlib/errors.py:1141
5634
#: bzrlib/errors.py:1151
5480
5635
msgid "No namespace registered for string: %(spec)r"
5481
5636
msgstr ""
5482
5637
5483
#: bzrlib/errors.py:1160
5638
#: bzrlib/errors.py:1170
5484
5639
msgid ""
5485
5640
"Requested revision: '%(spec)s' does not exist in branch: "
5486
5641
"%(branch_url)s%(extra)s"
5487
5642
msgstr ""
5488
5643
5489
#: bzrlib/errors.py:1174
5644
#: bzrlib/errors.py:1184
5490
5645
msgid ""
5491
5646
"Operation denied because it would change the main history, which is not "
5492
5647
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5493
5648
msgstr ""
5494
5649
5495
#: bzrlib/errors.py:1185
5650
#: bzrlib/errors.py:1195
5496
5651
msgid ""
5497
5652
"These branches have diverged. Use the missing command to see how.\n"
5498
5653
"Use the merge command to reconcile them."
5499
5654
msgstr ""
5500
5655
5501
#: bzrlib/errors.py:1205
5656
#: bzrlib/errors.py:1215
5502
5657
msgid ""
5503
5658
"Branches have no common ancestor, and no merge base revision was specified."
5504
5659
msgstr ""
5505
5660
5506
#: bzrlib/errors.py:1211
5661
#: bzrlib/errors.py:1221
5507
5662
msgid ""
5508
5663
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5509
5664
msgstr ""
5510
5665
5511
#: bzrlib/errors.py:1217
5666
#: bzrlib/errors.py:1227
5512
5667
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5513
5668
msgstr ""
5514
5669
5515
#: bzrlib/errors.py:1226
5670
#: bzrlib/errors.py:1236
5516
5671
msgid ""
5517
5672
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5518
5673
msgstr ""
5519
5674
5520
#: bzrlib/errors.py:1235
5675
#: bzrlib/errors.py:1245
5521
5676
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5522
5677
msgstr ""
5523
5678
5524
#: bzrlib/errors.py:1244
5679
#: bzrlib/errors.py:1254
5525
5680
msgid "Branch %(branch)s has no commits."
5526
5681
msgstr ""
5527
5682
5528
#: bzrlib/errors.py:1262
5683
#: bzrlib/errors.py:1272
5529
5684
msgid ""
5530
5685
"Bound branch %(branch)s is out of date with master branch "
5531
5686
"%(master)s.%(extra_help)s"
5532
5687
msgstr ""
5533
5688
5534
#: bzrlib/errors.py:1274
5689
#: bzrlib/errors.py:1284
5535
5690
msgid ""
5536
5691
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5537
5692
"bound to %(remote)s."
5538
5693
msgstr ""
5539
5694
5540
#: bzrlib/errors.py:1286
5695
#: bzrlib/errors.py:1296
5541
5696
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5542
5697
msgstr ""
5543
5698
5544
#: bzrlib/errors.py:1295
5699
#: bzrlib/errors.py:1305
5545
5700
msgid ""
5546
5701
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5547
5702
"%(error)s"
5548
5703
msgstr ""
5549
5704
5550
#: bzrlib/errors.py:1307
5705
#: bzrlib/errors.py:1317
5551
5706
msgid "Error in processing weave: %(msg)s"
5552
5707
msgstr ""
5553
5708
5554
#: bzrlib/errors.py:1316
5709
#: bzrlib/errors.py:1326
5555
5710
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5556
5711
msgstr ""
5557
5712
5558
#: bzrlib/errors.py:1327
5713
#: bzrlib/errors.py:1337
5559
5714
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5560
5715
msgstr ""
5561
5716
5562
#: bzrlib/errors.py:1337
5717
#: bzrlib/errors.py:1347
5563
5718
msgid "Weave invariant violated: %(what)s"
5564
5719
msgstr ""
5565
5720
5566
#: bzrlib/errors.py:1346
5721
#: bzrlib/errors.py:1356
5567
5722
msgid "Parents are mismatched between two revisions. %(msg)s"
5568
5723
msgstr ""
5569
5724
5570
#: bzrlib/errors.py:1368
5725
#: bzrlib/errors.py:1378
5571
5726
msgid ""
5572
5727
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5573
5728
"%(weave_b)s"
5574
5729
msgstr ""
5575
5730
5576
#: bzrlib/errors.py:1380
5731
#: bzrlib/errors.py:1390
5577
5732
msgid "Versioned file error"
5578
5733
msgstr "Error en el archivo versiondao"
5579
5734
5580
#: bzrlib/errors.py:1385
5735
#: bzrlib/errors.py:1395
5581
5736
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5582
5737
msgstr ""
5583
5738
5584
#: bzrlib/errors.py:1395
5739
#: bzrlib/errors.py:1405
5585
5740
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5586
5741
msgstr ""
5587
5742
5588
#: bzrlib/errors.py:1405
5743
#: bzrlib/errors.py:1415
5589
5744
msgid "Text did not match its checksum: %(msg)s"
5590
5745
msgstr ""
5591
5746
5592
#: bzrlib/errors.py:1531
5747
#: bzrlib/errors.py:1541
5593
5748
msgid "Export format %(format)r not supported"
5594
5749
msgstr ""
5595
5750
5596
#: bzrlib/errors.py:1540
5751
#: bzrlib/errors.py:1550
5597
5752
msgid "Transport error: %(msg)s %(orig_error)s"
5598
5753
msgstr ""
5599
5754
5600
#: bzrlib/errors.py:1566
5755
#: bzrlib/errors.py:1576
5601
5756
msgid "Generic bzr smart protocol error: %(details)s"
5602
5757
msgstr ""
5603
5758
5604
#: bzrlib/errors.py:1574
5759
#: bzrlib/errors.py:1584
5605
5760
msgid "Received bad protocol version marker: %(marker)r"
5606
5761
msgstr ""
5607
5762
5608
#: bzrlib/errors.py:1606
5763
#: bzrlib/errors.py:1616
5609
5764
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5610
5765
msgstr ""
5611
5766
5612
#: bzrlib/errors.py:1611
5767
#: bzrlib/errors.py:1621
5613
5768
msgid "Connection error: %(msg)s %(orig_error)s"
5614
5769
msgstr ""
5615
5770
5616
#: bzrlib/errors.py:1616
5771
#: bzrlib/errors.py:1626
5617
5772
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5618
5773
msgstr ""
5619
5774
5620
#: bzrlib/errors.py:1637
5775
#: bzrlib/errors.py:1647
5621
5776
msgid "Connection closed: %(msg)s %(orig_error)s"
5622
5777
msgstr ""
5623
5778
5624
#: bzrlib/errors.py:1642
5779
#: bzrlib/errors.py:1652
5625
5780
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5626
5781
msgstr ""
5627
5782
5628
#: bzrlib/errors.py:1647
5783
#: bzrlib/errors.py:1657
5629
5784
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5630
5785
msgstr ""
5631
5786
5632
#: bzrlib/errors.py:1657
5787
#: bzrlib/errors.py:1667
5633
5788
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5634
5789
msgstr ""
5635
5790
5636
#: bzrlib/errors.py:1672
5791
#: bzrlib/errors.py:1682
5792
msgid "Certificate error: %(error)s"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:1690
5637
5796
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5638
5797
msgstr ""
5639
5798
5640
#: bzrlib/errors.py:1686
5799
#: bzrlib/errors.py:1704
5641
5800
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5642
5801
msgstr ""
5643
5802
5644
#: bzrlib/errors.py:1694
5803
#: bzrlib/errors.py:1712
5645
5804
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5646
5805
msgstr ""
5647
5806
5648
#: bzrlib/errors.py:1703
5807
#: bzrlib/errors.py:1721
5649
5808
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5650
5809
msgstr ""
5651
5810
5652
#: bzrlib/errors.py:1717
5811
#: bzrlib/errors.py:1735
5653
5812
msgid "Too many redirections"
5654
5813
msgstr "Demasiadas redirecciones"
5655
5814
5656
#: bzrlib/errors.py:1722
5815
#: bzrlib/errors.py:1740
5657
5816
msgid "Working tree has conflicts."
5658
5817
msgstr ""
5659
5818
5660
#: bzrlib/errors.py:1726
5819
#: bzrlib/errors.py:1744
5661
5820
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5662
5821
msgstr ""
5663
5822
5664
#: bzrlib/errors.py:1735
5823
#: bzrlib/errors.py:1753
5665
5824
msgid ""
5666
5825
"Error(s) parsing config file %(filename)s:\n"
5667
5826
"%(errors)s"
5668
5827
msgstr ""
5669
5828
5670
#: bzrlib/errors.py:1746
5671
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5829
#: bzrlib/errors.py:1763
5830
msgid ""
5831
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5832
"See ``bzr help %(name)s``"
5672
5833
msgstr ""
5673
5834
5674
#: bzrlib/errors.py:1754
5835
#: bzrlib/errors.py:1773
5675
5836
msgid "%(username)r does not seem to contain a reasonable email address"
5676
5837
msgstr ""
5677
5838
5678
#: bzrlib/errors.py:1763
5839
#: bzrlib/errors.py:1782
5679
5840
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5680
5841
msgstr ""
5681
5842
5682
#: bzrlib/errors.py:1771
5843
#: bzrlib/errors.py:1790
5683
5844
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5684
5845
msgstr ""
5685
5846
5686
#: bzrlib/errors.py:1779
5847
#: bzrlib/errors.py:1798
5687
5848
msgid "Unable to import library \"%(library)s\": %(error)s"
5688
5849
msgstr ""
5689
5850
5690
#: bzrlib/errors.py:1787
5851
#: bzrlib/errors.py:1806
5691
5852
msgid "python-gpgme is not installed, it is needed to verify signatures"
5692
5853
msgstr ""
5693
5854
5694
#: bzrlib/errors.py:1795
5855
#: bzrlib/errors.py:1814
5695
5856
msgid ""
5696
5857
"The working tree for %(basedir)s has changed since the last commit, but "
5697
5858
"weave merge requires that it be unchanged"
5698
5859
msgstr ""
5699
5860
5700
#: bzrlib/errors.py:1805
5861
#: bzrlib/errors.py:1824
5701
5862
msgid ""
5702
5863
"Can't reprocess and show base, because reprocessing obscures the "
5703
5864
"relationship of conflicting lines to the base"
5704
5865
msgstr ""
5705
5866
5706
#: bzrlib/errors.py:1811
5867
#: bzrlib/errors.py:1830
5707
5868
msgid "Cycle in graph %(graph)r"
5708
5869
msgstr ""
5709
5870
5710
#: bzrlib/errors.py:1839
5871
#: bzrlib/errors.py:1858
5711
5872
msgid "File %(filename)s is not conflicted."
5712
5873
msgstr ""
5713
5874
5714
#: bzrlib/errors.py:1861
5875
#: bzrlib/errors.py:1880
5715
5876
msgid "No bundle was found in \"%(filename)s\"."
5716
5877
msgstr ""
5717
5878
5718
#: bzrlib/errors.py:1870
5879
#: bzrlib/errors.py:1889
5719
5880
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5720
5881
msgstr ""
5721
5882
5722
#: bzrlib/errors.py:1880
5883
#: bzrlib/errors.py:1899
5723
5884
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5724
5885
msgstr ""
5725
5886
5726
#: bzrlib/errors.py:1893
5887
#: bzrlib/errors.py:1912
5727
5888
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5728
5889
msgstr ""
5729
5890
5730
#: bzrlib/errors.py:1903
5891
#: bzrlib/errors.py:1922
5731
5892
msgid "Key %(key)s is already present in map"
5732
5893
msgstr ""
5733
5894
5734
#: bzrlib/errors.py:1908
5895
#: bzrlib/errors.py:1927
5735
5896
msgid "The prefix %(prefix)s is in the help search path twice."
5736
5897
msgstr ""
5737
5898
5738
#: bzrlib/errors.py:1918
5899
#: bzrlib/errors.py:1937
5739
5900
msgid ""
5740
5901
"No final name for trans_id %(trans_id)r\n"
5741
5902
"file-id: %(file_id)r\n"
5742
5903
"root trans-id: %(root_trans_id)r\n"
5743
5904
msgstr ""
5744
5905
5745
#: bzrlib/errors.py:1950
5906
#: bzrlib/errors.py:1969
5746
5907
msgid "Attempt to reuse a transform that has already been applied."
5747
5908
msgstr ""
5748
5909
5749
#: bzrlib/errors.py:1955
5910
#: bzrlib/errors.py:1974
5750
5911
msgid "Moving the root directory is not supported at this time"
5751
5912
msgstr ""
5752
5913
5753
#: bzrlib/errors.py:1960
5914
#: bzrlib/errors.py:1979
5754
5915
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5755
5916
msgstr ""
5756
5917
5757
#: bzrlib/errors.py:1971
5918
#: bzrlib/errors.py:1990
5758
5919
msgid ""
5759
5920
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5760
5921
msgstr ""
5761
5922
5762
#: bzrlib/errors.py:2007
5923
#: bzrlib/errors.py:2026
5763
5924
msgid ""
5764
5925
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5765
5926
msgstr ""
5766
5927
5767
#: bzrlib/errors.py:2037
5928
#: bzrlib/errors.py:2056
5768
5929
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5769
5930
msgstr ""
5770
5931
5771
#: bzrlib/errors.py:2045
5932
#: bzrlib/errors.py:2064
5772
5933
msgid "Nothing to merge."
5773
5934
msgstr "Nada a fusionar."
5774
5935
5775
#: bzrlib/errors.py:2050
5936
#: bzrlib/errors.py:2069
5776
5937
msgid "Format %(format)s cannot be initialised by this version of bzr."
5777
5938
msgstr ""
5778
5939
5779
#: bzrlib/errors.py:2059
5940
#: bzrlib/errors.py:2078
5780
5941
msgid ""
5781
5942
"Cannot convert from format %(from_format)s to format %(format)s. "
5782
5943
"%(problem)s"
5783
5944
msgstr ""
5784
5945
5785
#: bzrlib/errors.py:2071
5946
#: bzrlib/errors.py:2090
5786
5947
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5787
5948
msgstr ""
5788
5949
5789
#: bzrlib/errors.py:2079
5950
#: bzrlib/errors.py:2098
5790
5951
msgid "%(exe_name)s could not be found on this machine"
5791
5952
msgstr ""
5792
5953
5793
#: bzrlib/errors.py:2087
5954
#: bzrlib/errors.py:2106
5794
5955
msgid "Diff is not installed on this machine: %(msg)s"
5795
5956
msgstr ""
5796
5957
5797
#: bzrlib/errors.py:2095
5958
#: bzrlib/errors.py:2114
5798
5959
msgid "Diff3 is not installed on this machine."
5799
5960
msgstr ""
5800
5961
5801
#: bzrlib/errors.py:2101
5962
#: bzrlib/errors.py:2120
5802
5963
msgid "The content being inserted is already present."
5803
5964
msgstr ""
5804
5965
5805
#: bzrlib/errors.py:2106
5966
#: bzrlib/errors.py:2125
5806
5967
msgid ""
5807
5968
"This tree contains left-over files from a failed operation.\n"
5808
5969
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5810
5971
" keep, and delete it when you are done."
5811
5972
msgstr ""
5812
5973
5813
#: bzrlib/errors.py:2117
5974
#: bzrlib/errors.py:2136
5814
5975
msgid ""
5815
5976
"This tree contains left-over files from a failed operation.\n"
5816
5977
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5817
5978
" wish to keep, and delete it when you are done."
5818
5979
msgstr ""
5819
5980
5820
#: bzrlib/errors.py:2127
5981
#: bzrlib/errors.py:2146
5821
5982
msgid ""
5822
5983
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5823
5984
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5825
5986
" keep, and delete it when you are done."
5826
5987
msgstr ""
5827
5988
5828
#: bzrlib/errors.py:2138
5989
#: bzrlib/errors.py:2157
5829
5990
msgid ""
5830
5991
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5831
5992
"examine %(pending_deletion)s to see if it contains any files you wish to "
5832
5993
"keep, and delete it when you are done."
5833
5994
msgstr ""
5834
5995
5835
#: bzrlib/errors.py:2148
5996
#: bzrlib/errors.py:2167
5836
5997
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5837
5998
msgstr ""
5838
5999
5839
#: bzrlib/errors.py:2162
6000
#: bzrlib/errors.py:2181
5840
6001
msgid ""
5841
6002
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5842
6003
msgstr ""
5843
6004
5844
#: bzrlib/errors.py:2175
6005
#: bzrlib/errors.py:2194
5845
6006
msgid "Error in merge modified format"
5846
6007
msgstr "Error en el formato modificado de fusión"
5847
6008
5848
#: bzrlib/errors.py:2180
6009
#: bzrlib/errors.py:2199
5849
6010
msgid "Format error in conflict listings"
5850
6011
msgstr ""
5851
6012
5852
#: bzrlib/errors.py:2184
6013
#: bzrlib/errors.py:2203
5853
6014
msgid ""
5854
6015
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5855
6016
"Error: %(description)s"
5856
6017
msgstr ""
5857
6018
5858
#: bzrlib/errors.py:2195
6019
#: bzrlib/errors.py:2214
5859
6020
msgid ""
5860
6021
"An error has been detected in the repository %(repo_path)s.\n"
5861
6022
"Please run bzr reconcile on this repository."
5862
6023
msgstr ""
5863
6024
5864
#: bzrlib/errors.py:2206
6025
#: bzrlib/errors.py:2225
5865
6026
msgid ""
5866
6027
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5867
6028
"reason: %(reason)s"
5868
6029
msgstr ""
5869
6030
5870
#: bzrlib/errors.py:2219
6031
#: bzrlib/errors.py:2238
5871
6032
msgid ""
5872
6033
"An inconsistent delta was supplied: %(delta)r\n"
5873
6034
"reason: %(reason)s"
5874
6035
msgstr ""
5875
6036
5876
#: bzrlib/errors.py:2231
6037
#: bzrlib/errors.py:2250
5877
6038
msgid "To use this feature you must upgrade your branch at %(path)s."
5878
6039
msgstr ""
5879
6040
5880
#: bzrlib/errors.py:2240
6041
#: bzrlib/errors.py:2259
5881
6042
msgid "To use this feature you must upgrade your repository at %(path)s."
5882
6043
msgstr ""
5883
6044
5884
#: bzrlib/errors.py:2245
6045
#: bzrlib/errors.py:2264
5885
6046
msgid ""
5886
6047
"To use this feature you must upgrade your branch at %(path)s to a format "
5887
6048
"which supports rich roots."
5888
6049
msgstr ""
5889
6050
5890
#: bzrlib/errors.py:2251
6051
#: bzrlib/errors.py:2270
5891
6052
msgid "Cannot perform local-only commits on unbound branches."
5892
6053
msgstr ""
5893
6054
5894
#: bzrlib/errors.py:2256
6055
#: bzrlib/errors.py:2275
5895
6056
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5896
6057
msgstr ""
5897
6058
5898
#: bzrlib/errors.py:2277
6059
#: bzrlib/errors.py:2296
5899
6060
msgid "Ghost tags not supported by format %(format)r."
5900
6061
msgstr ""
5901
6062
5902
#: bzrlib/errors.py:2285
6063
#: bzrlib/errors.py:2304
5903
6064
msgid "File is binary but should be text."
5904
6065
msgstr ""
5905
6066
5906
#: bzrlib/errors.py:2290
6067
#: bzrlib/errors.py:2309
5907
6068
msgid "The path %(path)s is not permitted on this platform"
5908
6069
msgstr ""
5909
6070
5910
#: bzrlib/errors.py:2299
6071
#: bzrlib/errors.py:2318
5911
6072
msgid ""
5912
6073
"Testament did not match expected value.\n"
5913
6074
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5914
6075
" {%(measured)s}"
5915
6076
msgstr ""
5916
6077
5917
#: bzrlib/errors.py:2311
6078
#: bzrlib/errors.py:2330
5918
6079
msgid "Not a bzr revision-bundle: %(text)r"
5919
6080
msgstr ""
5920
6081
5921
#: bzrlib/errors.py:2320
6082
#: bzrlib/errors.py:2339
5922
6083
msgid "Bad bzr revision-bundle: %(text)r"
5923
6084
msgstr ""
5924
6085
5925
#: bzrlib/errors.py:2329
6086
#: bzrlib/errors.py:2348
5926
6087
msgid "Malformed bzr revision-bundle header: %(text)r"
5927
6088
msgstr ""
5928
6089
5929
#: bzrlib/errors.py:2334
6090
#: bzrlib/errors.py:2353
5930
6091
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5931
6092
msgstr ""
5932
6093
5933
#: bzrlib/errors.py:2339
6094
#: bzrlib/errors.py:2358
5934
6095
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5935
6096
msgstr ""
5936
6097
5937
#: bzrlib/errors.py:2344
6098
#: bzrlib/errors.py:2363
5938
6099
msgid "End of line marker was not \\n in bzr revision-bundle"
5939
6100
msgstr ""
5940
6101
5941
#: bzrlib/errors.py:2354
6102
#: bzrlib/errors.py:2373
5942
6103
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5943
6104
msgstr ""
5944
6105
5945
#: bzrlib/errors.py:2364
6106
#: bzrlib/errors.py:2383
5946
6107
msgid "Root class for inventory serialization errors"
5947
6108
msgstr ""
5948
6109
5949
#: bzrlib/errors.py:2368
6110
#: bzrlib/errors.py:2387
5950
6111
msgid ""
5951
6112
"The inventory was not in the expected format:\n"
5952
6113
" %(msg)s"
5953
6114
msgstr ""
5954
6115
5955
#: bzrlib/errors.py:2377
6116
#: bzrlib/errors.py:2396
5956
6117
msgid "This operation requires rich root data storage"
5957
6118
msgstr ""
5958
6119
5959
#: bzrlib/errors.py:2390
6120
#: bzrlib/errors.py:2409
5960
6121
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5961
6122
msgstr ""
5962
6123
5963
#: bzrlib/errors.py:2399
6124
#: bzrlib/errors.py:2418
5964
6125
msgid ""
5965
6126
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5966
6127
"variable."
5967
6128
msgstr ""
5968
6129
5969
#: bzrlib/errors.py:2406
6130
#: bzrlib/errors.py:2425
5970
6131
msgid ""
5971
6132
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5972
6133
"ghost at {%(ghost_revision_id)s}"
5973
6134
msgstr ""
5974
6135
5975
#: bzrlib/errors.py:2416
6136
#: bzrlib/errors.py:2435
5976
6137
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5977
6138
msgstr ""
5978
6139
5979
#: bzrlib/errors.py:2467
6140
#: bzrlib/errors.py:2486
5980
6141
msgid ""
5981
6142
"A merge directive must provide either a bundle or a public branch location."
5982
6143
msgstr ""
5983
6144
5984
#: bzrlib/errors.py:2474
6145
#: bzrlib/errors.py:2493
5985
6146
msgid "Bad merge directive payload %(start)r"
5986
6147
msgstr ""
5987
6148
5988
#: bzrlib/errors.py:2484
6149
#: bzrlib/errors.py:2503
5989
6150
msgid "Preview patch does not match requested changes."
5990
6151
msgstr ""
5991
6152
5992
#: bzrlib/errors.py:2490
6153
#: bzrlib/errors.py:2509
5993
6154
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5994
6155
msgstr ""
5995
6156
5996
#: bzrlib/errors.py:2500
6157
#: bzrlib/errors.py:2519
5997
6158
msgid ""
5998
6159
"Your branch does not have all of the revisions required in order to merge "
5999
6160
"this merge directive and the target location specified in the merge "
6000
6161
"directive is not a branch: %(location)s."
6001
6162
msgstr ""
6002
6163
6003
#: bzrlib/errors.py:2512
6164
#: bzrlib/errors.py:2531
6004
6165
msgid "Unsupported entry kind %(kind)s"
6005
6166
msgstr ""
6006
6167
6007
#: bzrlib/errors.py:2520
6168
#: bzrlib/errors.py:2539
6008
6169
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6009
6170
msgstr ""
6010
6171
6011
#: bzrlib/errors.py:2530
6172
#: bzrlib/errors.py:2549
6012
6173
msgid "Subsume target %(other_tree)s needs to be upgraded."
6013
6174
msgstr ""
6014
6175
6015
#: bzrlib/errors.py:2549
6176
#: bzrlib/errors.py:2568
6016
6177
msgid "No such tag: %(tag_name)s"
6017
6178
msgstr ""
6018
6179
6019
#: bzrlib/errors.py:2557
6180
#: bzrlib/errors.py:2576
6020
6181
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6021
6182
msgstr ""
6022
6183
6023
#: bzrlib/errors.py:2566
6184
#: bzrlib/errors.py:2585
6024
6185
msgid "Tag %(tag_name)s already exists."
6025
6186
msgstr ""
6026
6187
6027
#: bzrlib/errors.py:2574
6188
#: bzrlib/errors.py:2593
6028
6189
msgid ""
6029
6190
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6030
6191
"bugs\" for more information on this feature."
6031
6192
msgstr ""
6032
6193
6033
#: bzrlib/errors.py:2584
6194
#: bzrlib/errors.py:2603
6034
6195
msgid ""
6035
6196
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6036
6197
msgstr ""
6037
6198
6038
#: bzrlib/errors.py:2594
6199
#: bzrlib/errors.py:2613
6039
6200
msgid ""
6040
6201
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6041
6202
msgstr ""
6042
6203
6043
#: bzrlib/errors.py:2604
6204
#: bzrlib/errors.py:2623
6044
6205
msgid "Invalid line in bugs property: '%(line)s'"
6045
6206
msgstr ""
6046
6207
6047
#: bzrlib/errors.py:2612
6208
#: bzrlib/errors.py:2631
6048
6209
msgid "Invalid bug status: '%(status)s'"
6049
6210
msgstr ""
6050
6211
6051
#: bzrlib/errors.py:2620
6212
#: bzrlib/errors.py:2639
6052
6213
msgid "Could not understand response from smart server: %(response_tuple)r"
6053
6214
msgstr ""
6054
6215
6055
#: bzrlib/errors.py:2659
6216
#: bzrlib/errors.py:2678
6056
6217
msgid "Server sent an unexpected error: %(error_tuple)r"
6057
6218
msgstr "El servidor envió un error inesperado: %(error_tuple)r"
6058
6219
6059
#: bzrlib/errors.py:2678
6220
#: bzrlib/errors.py:2697
6060
6221
msgid "Unrecognised container format: %(container_format)r"
6061
6222
msgstr ""
6062
6223
6063
#: bzrlib/errors.py:2686
6224
#: bzrlib/errors.py:2705
6064
6225
msgid "Unexpected end of container stream"
6065
6226
msgstr "Final inesperado del flujo del contenedor"
6066
6227
6067
#: bzrlib/errors.py:2691
6228
#: bzrlib/errors.py:2710
6068
6229
msgid "Unknown record type: %(record_type)r"
6069
6230
msgstr "Tipo de registro inesperado: %(record_type)r"
6070
6231
6071
#: bzrlib/errors.py:2699
6232
#: bzrlib/errors.py:2718
6072
6233
msgid "Invalid record: %(reason)s"
6073
6234
msgstr "Registro inesperado: %(reason)s"
6074
6235
6075
#: bzrlib/errors.py:2707
6236
#: bzrlib/errors.py:2726
6076
6237
msgid "Container has data after end marker: %(excess)r"
6077
6238
msgstr ""
6078
6239
6079
#: bzrlib/errors.py:2715
6240
#: bzrlib/errors.py:2734
6080
6241
msgid "Container has multiple records with the same name: %(name)s"
6081
6242
msgstr ""
6082
6243
6083
#: bzrlib/errors.py:2728
6244
#: bzrlib/errors.py:2747
6084
6245
msgid "Corrupt or incompatible data stream: %(reason)s"
6085
6246
msgstr ""
6086
6247
6087
#: bzrlib/errors.py:2736
6248
#: bzrlib/errors.py:2755
6088
6249
msgid "SMTP error: %(error)s"
6089
6250
msgstr "Error SMTP: %(error)s"
6090
6251
6091
#: bzrlib/errors.py:2744
6252
#: bzrlib/errors.py:2763
6092
6253
msgid "No message supplied."
6093
6254
msgstr "No se ha proporcionado mensaje."
6094
6255
6095
#: bzrlib/errors.py:2749
6256
#: bzrlib/errors.py:2768
6096
6257
msgid "No mail-to address (--mail-to) or output (-o) specified."
6097
6258
msgstr ""
6098
6259
"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
6099
6260
"o)."
6100
6261
6101
#: bzrlib/errors.py:2754
6262
#: bzrlib/errors.py:2773
6102
6263
msgid "Unknown mail client: %(mail_client)s"
6103
6264
msgstr "Correo de cliente desconocido: %(mail_client)s"
6104
6265
6105
#: bzrlib/errors.py:2762
6266
#: bzrlib/errors.py:2781
6106
6267
msgid ""
6107
6268
"Unable to find mail client with the following names: "
6108
6269
"%(mail_command_list_string)s"
6109
6270
msgstr ""
6110
6271
6111
#: bzrlib/errors.py:2772
6272
#: bzrlib/errors.py:2791
6112
6273
msgid "SMTP connection to %(host)s refused"
6113
6274
msgstr "Las conexiones SMTP a %(host)s se han rechazado"
6114
6275
6115
#: bzrlib/errors.py:2781
6276
#: bzrlib/errors.py:2800
6116
6277
msgid "Please specify smtp_server. No server at default %(host)s."
6117
6278
msgstr ""
6118
6279
6119
#: bzrlib/errors.py:2795
6280
#: bzrlib/errors.py:2814
6120
6281
msgid ""
6121
6282
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6122
6283
"reconfigure."
6123
6284
msgstr ""
6124
6285
6125
#: bzrlib/errors.py:2807
6286
#: bzrlib/errors.py:2826
6126
6287
msgid "'%(display_url)s' is already a branch."
6127
6288
msgstr "«%(display_url)s» ya es una la rama."
6128
6289
6129
#: bzrlib/errors.py:2812
6290
#: bzrlib/errors.py:2831
6130
6291
msgid "'%(display_url)s' is already a tree."
6131
6292
msgstr "«%(display_url)s» ya es un árbol."
6132
6293
6133
#: bzrlib/errors.py:2817
6294
#: bzrlib/errors.py:2836
6134
6295
msgid "'%(display_url)s' is already a checkout."
6135
6296
msgstr "«%(display_url)s» ya es una comprobación."
6136
6297
6137
#: bzrlib/errors.py:2822
6298
#: bzrlib/errors.py:2841
6138
6299
msgid "'%(display_url)s' is already a lightweight checkout."
6139
6300
msgstr "«%(display_url)s» ya es una comprobación ligera."
6140
6301
6141
#: bzrlib/errors.py:2827
6302
#: bzrlib/errors.py:2846
6142
6303
msgid "'%(display_url)s' is already using a shared repository."
6143
6304
msgstr "«%(display_url)s» ya está usando un repositorio compartido."
6144
6305
6145
#: bzrlib/errors.py:2832
6306
#: bzrlib/errors.py:2851
6146
6307
msgid "'%(display_url)s' is already standalone."
6147
6308
msgstr "«%(display_url)s» ya es autónomo."
6148
6309
6149
#: bzrlib/errors.py:2837
6310
#: bzrlib/errors.py:2856
6150
6311
msgid "Shared repository '%(display_url)s' already creates working trees."
6151
6312
msgstr ""
6152
6313
6153
#: bzrlib/errors.py:2843
6314
#: bzrlib/errors.py:2862
6154
6315
msgid ""
6155
6316
"Shared repository '%(display_url)s' already doesn't create working trees."
6156
6317
msgstr ""
6157
6318
6158
#: bzrlib/errors.py:2849
6319
#: bzrlib/errors.py:2868
6159
6320
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6160
6321
msgstr ""
6161
6322
6162
#: bzrlib/errors.py:2854
6323
#: bzrlib/errors.py:2873
6163
6324
msgid "No location could be found to bind to at %(display_url)s."
6164
6325
msgstr "No se encontró ubicación a donde vincular %(display_url)s."
6165
6326
6166
#: bzrlib/errors.py:2859
6327
#: bzrlib/errors.py:2878
6167
6328
msgid ""
6168
6329
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6169
6330
"status).%(more)s"
6170
6331
msgstr ""
6171
6332
6172
#: bzrlib/errors.py:2878
6333
#: bzrlib/errors.py:2897
6173
6334
msgid ""
6174
6335
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6175
6336
"list).%(more)s"
6176
6337
msgstr ""
6177
6338
6178
#: bzrlib/errors.py:2884
6339
#: bzrlib/errors.py:2903
6179
6340
msgid "Variable {%(name)s} is not available."
6180
6341
msgstr "La variable {%(name)s} no está disponible."
6181
6342
6182
#: bzrlib/errors.py:2892
6343
#: bzrlib/errors.py:2911
6183
6344
msgid "No template specified."
6184
6345
msgstr "No se ha especificado una plantilla."
6185
6346
6186
#: bzrlib/errors.py:2897
6347
#: bzrlib/errors.py:2916
6187
6348
msgid "Unable to create symlink %(path_str)son this platform"
6188
6349
msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
6189
6350
6190
#: bzrlib/errors.py:2912
6351
#: bzrlib/errors.py:2931
6191
6352
msgid ""
6192
6353
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6193
6354
"\"original\", \"local\"."
6195
6356
"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
6196
6357
"«original», «local»."
6197
6358
6198
#: bzrlib/errors.py:2946
6359
#: bzrlib/errors.py:2965
6199
6360
msgid ""
6200
6361
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6201
6362
msgstr ""
6202
6363
6203
#: bzrlib/errors.py:2958
6364
#: bzrlib/errors.py:2977
6204
6365
msgid "The \"%(config_id)s\" configuration does not exist."
6205
6366
msgstr ""
6206
6367
6207
#: bzrlib/errors.py:2966
6368
#: bzrlib/errors.py:2985
6208
6369
msgid "The \"%(option_name)s\" configuration option does not exist."
6209
6370
msgstr ""
6210
6371
6211
#: bzrlib/errors.py:2974
6372
#: bzrlib/errors.py:2993
6212
6373
msgid "The alias \"%(alias_name)s\" does not exist."
6213
6374
msgstr ""
6214
6375
6215
#: bzrlib/errors.py:2988
6376
#: bzrlib/errors.py:3007
6216
6377
msgid "\"%(alias_name)s\" is not a valid location alias."
6217
6378
msgstr ""
6218
6379
6219
#: bzrlib/errors.py:2996
6380
#: bzrlib/errors.py:3015
6220
6381
msgid "No %(alias_name)s location assigned."
6221
6382
msgstr ""
6222
6383
6223
#: bzrlib/errors.py:3004
6384
#: bzrlib/errors.py:3023
6224
6385
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6225
6386
msgstr ""
6226
6387
6227
#: bzrlib/errors.py:3014
6388
#: bzrlib/errors.py:3033
6228
6389
msgid "Unknown rules detected: %(unknowns_str)s."
6229
6390
msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
6230
6391
6231
#: bzrlib/errors.py:3025
6392
#: bzrlib/errors.py:3044
6232
6393
msgid "Tip change rejected: %(msg)s"
6233
6394
msgstr ""
6234
6395
6235
#: bzrlib/errors.py:3033
6396
#: bzrlib/errors.py:3052
6236
6397
msgid "Shelf corrupt."
6237
6398
msgstr ""
6238
6399
6239
#: bzrlib/errors.py:3038
6400
#: bzrlib/errors.py:3057
6240
6401
msgid "Corruption while decompressing repository file%(orig_error)s"
6241
6402
msgstr ""
6242
6403
6243
#: bzrlib/errors.py:3050
6404
#: bzrlib/errors.py:3069
6244
6405
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6245
6406
msgstr ""
6246
6407
6247
#: bzrlib/errors.py:3058
6408
#: bzrlib/errors.py:3077
6248
6409
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6249
6410
msgstr ""
6250
6411
6251
#: bzrlib/errors.py:3066
6412
#: bzrlib/errors.py:3085
6252
6413
msgid ""
6253
6414
"An attempt to access a url outside the server jail was made: '%(url)s'."
6254
6415
msgstr ""
6255
6416
6256
#: bzrlib/errors.py:3074
6417
#: bzrlib/errors.py:3093
6257
6418
msgid "The user aborted the operation."
6258
6419
msgstr "El usuario abortó la operación."
6259
6420
6260
#: bzrlib/errors.py:3079
6421
#: bzrlib/errors.py:3098
6261
6422
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6262
6423
msgstr ""
6263
6424
6264
#: bzrlib/errors.py:3089
6425
#: bzrlib/errors.py:3108
6265
6426
msgid "No such view: %(view_name)s."
6266
6427
msgstr ""
6267
6428
6268
#: bzrlib/errors.py:3099
6429
#: bzrlib/errors.py:3118
6269
6430
msgid ""
6270
6431
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6271
6432
"to a later format."
6272
6433
msgstr ""
6273
6434
6274
#: bzrlib/errors.py:3108
6435
#: bzrlib/errors.py:3127
6275
6436
msgid ""
6276
6437
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6277
6438
msgstr ""
6278
6439
6279
#: bzrlib/errors.py:3175
6440
#: bzrlib/errors.py:3194
6280
6441
msgid "%(bzrdir)r does not support co-located branches."
6281
6442
msgstr ""
6282
6443
6283
#: bzrlib/errors.py:3181
6444
#: bzrlib/errors.py:3200
6284
6445
msgid ""
6285
6446
"Unable to determine your name.\n"
6286
6447
"Please, set your name with the 'whoami' command.\n"
6287
6448
"E.g. bzr whoami \"Your Name <name@example.com>\""
6288
6449
msgstr ""
6289
6450
6290
#: bzrlib/errors.py:3190
6451
#: bzrlib/errors.py:3209
6291
6452
msgid "Invalid pattern(s) found. %(msg)s"
6292
6453
msgstr "Se encontró un patrón inválido. %(msg)s"
6293
6454
6294
#: bzrlib/errors.py:3198
6455
#: bzrlib/errors.py:3217
6295
6456
msgid ""
6296
6457
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6297
6458
"unbind` to fix."
6298
6459
msgstr ""
6299
6460
6300
#: bzrlib/errors.py:3209
6461
#: bzrlib/errors.py:3228
6301
6462
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6302
6463
msgstr ""
6303
6464
6304
#: bzrlib/errors.py:3218
6465
#: bzrlib/errors.py:3237
6305
6466
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6306
6467
msgstr ""
6307
6468
6308
#: bzrlib/errors.py:3227
6469
#: bzrlib/errors.py:3246
6309
6470
msgid ""
6310
6471
"No compatible object available for operations from %(source)r to %(target)r."
6311
6472
msgstr ""
6312
6473
6313
#: bzrlib/errors.py:3237
6474
#: bzrlib/errors.py:3256
6314
6475
msgid ""
6315
6476
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6316
6477
"%(arguments)s."
6317
6478
msgstr ""
6318
6479
6319
#: bzrlib/errors.py:3247
6480
#: bzrlib/errors.py:3266
6320
6481
msgid ""
6321
6482
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6322
6483
"format %(format)r"
6323
6484
msgstr ""
6324
6485
6325
#: bzrlib/errors.py:3259
6486
#: bzrlib/errors.py:3278
6326
6487
msgid ""
6327
6488
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6328
6489
"plugin."
6329
6490
msgstr ""
6330
6491
6331
#: bzrlib/errors.py:3272
6492
#: bzrlib/errors.py:3291
6332
6493
msgid "Binary files section encountered."
6333
6494
msgstr ""
6334
6495
6335
#: bzrlib/errors.py:3280
6496
#: bzrlib/errors.py:3299
6336
6497
msgid ""
6337
6498
"Malformed patch header. %(desc)s\n"
6338
6499
"%(line)r"
6339
6500
msgstr ""
6340
6501
6341
#: bzrlib/errors.py:3289
6502
#: bzrlib/errors.py:3308
6342
6503
msgid ""
6343
6504
"Malformed hunk header. %(desc)s\n"
6344
6505
"%(line)r"
6345
6506
msgstr ""
6346
6507
6347
#: bzrlib/errors.py:3298
6508
#: bzrlib/errors.py:3317
6348
6509
msgid ""
6349
6510
"Malformed line. %(desc)s\n"
6350
6511
"%(line)r"
6351
6512
msgstr ""
6352
6513
6353
#: bzrlib/errors.py:3308
6514
#: bzrlib/errors.py:3327
6354
6515
msgid ""
6355
6516
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6356
6517
"but patch says it should be \"%(patch_line)s\""
6357
6518
msgstr ""
6358
6519
6359
#: bzrlib/errors.py:3319
6520
#: bzrlib/errors.py:3338
6360
6521
msgid "The feature %(feature)s has already been registered."
6361
6522
msgstr ""
6362
6523
6686
6847
msgid "lstat/stat of ({0!r}): {1!r}"
6687
6848
msgstr "lstat/stat de ({0!r}): {1!r}"
6688
6849
6689
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6850
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6690
6851
#, python-format
6691
6852
msgid "sorry, %r not allowed in path"
6692
6853
msgstr ""
6693
6854
6694
#: bzrlib/osutils.py:1226
6855
#: bzrlib/osutils.py:1237
6695
6856
#, python-format
6696
6857
msgid "%r is too short to calculate a relative path"
6697
6858
msgstr ""
7135
7296
msgid "Created new branch."
7136
7297
msgstr "Rama nueva creada."
7137
7298
7138
#: bzrlib/push.py:98
7299
#: bzrlib/push.py:97
7139
7300
#, python-format
7140
7301
msgid ""
7141
7302
"Target directory %s already contains a .bzr directory, but it is not valid."
7262
7423
msgid "%s is now not stacked\n"
7263
7424
msgstr ""
7264
7425
7265
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7426
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7266
7427
#, python-format
7267
7428
msgid "bzr: ERROR (ignored): %s"
7268
7429
msgstr "bzr: ERROR (ignorado): %s"
7269
7430
7270
#: bzrlib/remote.py:2493
7431
#: bzrlib/remote.py:2541
7271
7432
msgid "Copying repository content as tarball..."
7272
7433
msgstr ""
7273
7434
7482
7643
msgid "listening on port: %s"
7483
7644
msgstr ""
7484
7645
7485
#: bzrlib/switch.py:69
7646
#: bzrlib/switch.py:73
7486
7647
msgid "Pending merges must be committed or reverted before using switch."
7487
7648
msgstr ""
7488
7649
7489
#: bzrlib/switch.py:96
7650
#: bzrlib/switch.py:100
7490
7651
msgid ""
7491
7652
"Cannot switch as local commits found in the checkout. Commit these to the "
7492
7653
"bound branch or use --force to throw them away."
7493
7654
msgstr ""
7494
7655
7495
#: bzrlib/switch.py:101
7656
#: bzrlib/switch.py:105
7496
7657
#, python-format
7497
7658
msgid ""
7498
7659
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7499
7660
"anyway, use --force."
7500
7661
msgstr ""
7501
7662
7502
#: bzrlib/switch.py:110
7663
#: bzrlib/switch.py:125
7503
7664
msgid "Cannot switch a branch, only a checkout."
7504
7665
msgstr ""
7505
7666
7506
#: bzrlib/switch.py:146
7667
#: bzrlib/switch.py:163
7507
7668
#, python-format
7508
7669
msgid "Tree is up to date at revision %d."
7509
7670
msgstr ""
7510
7671
7511
#: bzrlib/switch.py:152
7672
#: bzrlib/switch.py:169
7512
7673
#, python-format
7513
7674
msgid "Updated to revision %d."
7514
7675
msgstr ""
7515
7676
7516
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7677
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7517
7678
msgid "Apply phase"
7518
7679
msgstr "Aplicar fase"
7519
7680
7520
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7681
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7521
7682
msgid "removing file"
7522
7683
msgstr "eliminar archivo"
7523
7684
7524
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7685
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7525
7686
msgid "adding file"
7526
7687
msgstr "añadiendo archivo"
7527
7688
7528
#: bzrlib/transform.py:2587
7689
#: bzrlib/transform.py:2591
7529
7690
msgid "Building tree"
7530
7691
msgstr "Construyendo árbol"
7531
7692
7532
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7693
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7533
7694
msgid "Adding file contents"
7534
7695
msgstr "Añadiendo contenidos de archivo"
7535
7696
7536
#: bzrlib/transform.py:3024
7697
#: bzrlib/transform.py:3028
7537
7698
msgid "Resolution pass"
7538
7699
msgstr ""
7539
7700
7682
7843
7683
7844
#: dummy/help_topics/basic/detail.txt:1
7684
7845
msgid ""
7685
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7846
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7686
7847
"http://bazaar.canonical.com/"
7687
7848
msgstr ""
7688
7849
12270
12431
"post_change_branch_tip\n"
12271
12432
"~~~~~~~~~~~~~~~~~~~~~~"
12272
12433
12273
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
12434
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12274
12435
msgid "Introduced in: 1.4"
12275
12436
msgstr "Introducido en: 1.4"
12276
12437
12486
12647
"~~~~~~~~~~~"
12487
12648
12488
12649
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12489
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12650
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12490
12651
msgid "Introduced in: 1.17"
12491
12652
msgstr "Introducido en: 1.17"
12492
12653
12550
12711
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12551
12712
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12552
12713
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12553
#: en/help_topics/hooks.txt:427
12714
#: en/help_topics/hooks.txt:443
12554
12715
msgid "Introduced in: 2.4"
12555
12716
msgstr "Introducido en: 2.4"
12556
12717
12667
12828
"~~~~~~~~~~"
12668
12829
12669
12830
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12670
#: en/help_topics/hooks.txt:505
12831
#: en/help_topics/hooks.txt:521
12671
12832
msgid "Introduced in: 1.15"
12672
12833
msgstr "Introducido en: 1.15"
12673
12834
12761
12922
msgstr ""
12762
12923
12763
12924
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12764
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
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
12765
12927
msgid "Introduced in: 2.5"
12766
12928
msgstr ""
12767
12929
12892
13054
12893
13055
#: en/help_topics/hooks.txt:399
12894
13056
msgid ""
12895
"start_commit\n"
12896
"~~~~~~~~~~~~"
13057
"post_transform\n"
13058
"~~~~~~~~~~~~~~"
12897
13059
msgstr ""
12898
"start_commit\n"
12899
"~~~~~~~~~~~~"
12900
13060
12901
13061
#: en/help_topics/hooks.txt:404
12902
13062
msgid ""
13063
"Called after a tree transform has been performed on a tree. The hook\n"
13064
"is called with the tree that is being transformed and the transform."
13065
msgstr ""
13066
13067
#: en/help_topics/hooks.txt:407
13068
msgid ""
13069
"pre_transform\n"
13070
"~~~~~~~~~~~~~"
13071
msgstr ""
13072
13073
#: en/help_topics/hooks.txt:412
13074
msgid ""
13075
"Called before a tree transform on this tree. The hook is called with\n"
13076
"the tree that is being transformed and the transform."
13077
msgstr ""
13078
13079
#: en/help_topics/hooks.txt:415
13080
msgid ""
13081
"start_commit\n"
13082
"~~~~~~~~~~~~"
13083
msgstr ""
13084
"start_commit\n"
13085
"~~~~~~~~~~~~"
13086
13087
#: en/help_topics/hooks.txt:420
13088
msgid ""
12903
13089
"Called before a commit is performed on a tree. The start commit hook\n"
12904
13090
"is able to change the tree before the commit takes place. start_commit\n"
12905
13091
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12906
13092
"being performed on."
12907
13093
msgstr ""
12908
13094
12909
#: en/help_topics/hooks.txt:409
12910
msgid ""
12911
"SmartClientHooks\n"
12912
"----------------"
12913
msgstr ""
12914
"SmartClientHooks\n"
12915
"----------------"
12916
12917
#: en/help_topics/hooks.txt:412
12918
msgid ""
12919
"call\n"
12920
"~~~~"
12921
msgstr ""
12922
"call\n"
12923
"~~~~"
12924
12925
#: en/help_topics/hooks.txt:415
13095
#: en/help_topics/hooks.txt:425
13096
msgid ""
13097
"SmartClientHooks\n"
13098
"----------------"
13099
msgstr ""
13100
"SmartClientHooks\n"
13101
"----------------"
13102
13103
#: en/help_topics/hooks.txt:428
13104
msgid ""
13105
"call\n"
13106
"~~~~"
13107
msgstr ""
13108
"call\n"
13109
"~~~~"
13110
13111
#: en/help_topics/hooks.txt:431
12926
13112
msgid "Introduced in: unknown"
12927
13113
msgstr ""
12928
13114
12929
#: en/help_topics/hooks.txt:417
13115
#: en/help_topics/hooks.txt:433
12930
13116
msgid ""
12931
13117
"Called when the smart client is submitting a request to the smart\n"
12932
13118
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12933
13119
"Streaming request bodies, and responses, are not accessible."
12934
13120
msgstr ""
12935
13121
12936
#: en/help_topics/hooks.txt:421
12937
msgid ""
12938
"SmartServerHooks\n"
12939
"----------------"
12940
msgstr ""
12941
"SmartServerHooks\n"
12942
"----------------"
12943
12944
#: en/help_topics/hooks.txt:424
12945
msgid ""
12946
"server_exception\n"
12947
"~~~~~~~~~~~~~~~~"
12948
msgstr ""
12949
"server_exception\n"
12950
"~~~~~~~~~~~~~~~~"
12951
12952
#: en/help_topics/hooks.txt:429
13122
#: en/help_topics/hooks.txt:437
13123
msgid ""
13124
"SmartServerHooks\n"
13125
"----------------"
13126
msgstr ""
13127
"SmartServerHooks\n"
13128
"----------------"
13129
13130
#: en/help_topics/hooks.txt:440
13131
msgid ""
13132
"server_exception\n"
13133
"~~~~~~~~~~~~~~~~"
13134
msgstr ""
13135
"server_exception\n"
13136
"~~~~~~~~~~~~~~~~"
13137
13138
#: en/help_topics/hooks.txt:445
12953
13139
msgid ""
12954
13140
"Called by the bzr server when an exception occurs. server_exception is\n"
12955
13141
"called with the sys.exc_info() tuple return true for the hook if the\n"
12957
13143
"normally."
12958
13144
msgstr ""
12959
13145
12960
#: en/help_topics/hooks.txt:434
13146
#: en/help_topics/hooks.txt:450
12961
13147
msgid ""
12962
13148
"server_started\n"
12963
13149
"~~~~~~~~~~~~~~"
12965
13151
"server_started\n"
12966
13152
"~~~~~~~~~~~~~~"
12967
13153
12968
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
13154
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12969
13155
msgid "Introduced in: 0.16"
12970
13156
msgstr ""
12971
13157
12972
#: en/help_topics/hooks.txt:439
13158
#: en/help_topics/hooks.txt:455
12973
13159
msgid ""
12974
13160
"Called by the bzr server when it starts serving a directory.\n"
12975
13161
"server_started is called with (backing urls, public url), where\n"
12978
13164
"served."
12979
13165
msgstr ""
12980
13166
12981
#: en/help_topics/hooks.txt:445
13167
#: en/help_topics/hooks.txt:461
12982
13168
msgid ""
12983
13169
"server_started_ex\n"
12984
13170
"~~~~~~~~~~~~~~~~~"
12986
13172
"server_started_ex\n"
12987
13173
"~~~~~~~~~~~~~~~~~"
12988
13174
12989
#: en/help_topics/hooks.txt:450
13175
#: en/help_topics/hooks.txt:466
12990
13176
msgid ""
12991
13177
"Called by the bzr server when it starts serving a directory.\n"
12992
13178
"server_started is called with (backing_urls, server_obj)."
12993
13179
msgstr ""
12994
13180
12995
#: en/help_topics/hooks.txt:453
13181
#: en/help_topics/hooks.txt:469
12996
13182
msgid ""
12997
13183
"server_stopped\n"
12998
13184
"~~~~~~~~~~~~~~"
13000
13186
"server_stopped\n"
13001
13187
"~~~~~~~~~~~~~~"
13002
13188
13003
#: en/help_topics/hooks.txt:458
13189
#: en/help_topics/hooks.txt:474
13004
13190
msgid ""
13005
13191
"Called by the bzr server when it stops serving a directory.\n"
13006
13192
"server_stopped is called with the same parameters as the\n"
13007
13193
"server_started hook: (backing_urls, public_url)."
13008
13194
msgstr ""
13009
13195
13010
#: en/help_topics/hooks.txt:462
13011
msgid ""
13012
"StatusHooks\n"
13013
"-----------"
13014
msgstr ""
13015
"StatusHooks\n"
13016
"-----------"
13017
13018
#: en/help_topics/hooks.txt:465
13019
msgid ""
13020
"post_status\n"
13021
"~~~~~~~~~~~"
13022
msgstr ""
13023
"post_status\n"
13024
"~~~~~~~~~~~"
13025
13026
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
13196
#: en/help_topics/hooks.txt:478
13197
msgid ""
13198
"StatusHooks\n"
13199
"-----------"
13200
msgstr ""
13201
"StatusHooks\n"
13202
"-----------"
13203
13204
#: en/help_topics/hooks.txt:481
13205
msgid ""
13206
"post_status\n"
13207
"~~~~~~~~~~~"
13208
msgstr ""
13209
"post_status\n"
13210
"~~~~~~~~~~~"
13211
13212
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13027
13213
msgid "Introduced in: 2.3"
13028
13214
msgstr ""
13029
13215
13030
#: en/help_topics/hooks.txt:470
13216
#: en/help_topics/hooks.txt:486
13031
13217
msgid ""
13032
13218
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13033
13219
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13036
13222
"status command. to_file is the output stream for writing."
13037
13223
msgstr ""
13038
13224
13039
#: en/help_topics/hooks.txt:476
13225
#: en/help_topics/hooks.txt:492
13040
13226
msgid ""
13041
13227
"pre_status\n"
13042
13228
"~~~~~~~~~~"
13044
13230
"pre_status\n"
13045
13231
"~~~~~~~~~~"
13046
13232
13047
#: en/help_topics/hooks.txt:481
13233
#: en/help_topics/hooks.txt:497
13048
13234
msgid ""
13049
13235
"Called with argument StatusHookParams before Bazaar displays the\n"
13050
13236
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13053
13239
"status command. to_file is the output stream for writing."
13054
13240
msgstr ""
13055
13241
13056
#: en/help_topics/hooks.txt:487
13242
#: en/help_topics/hooks.txt:503
13057
13243
msgid ""
13058
13244
"TransportHooks\n"
13059
13245
"--------------"
13060
13246
msgstr ""
13061
13247
13062
#: en/help_topics/hooks.txt:490
13248
#: en/help_topics/hooks.txt:506
13063
13249
msgid ""
13064
13250
"post_connect\n"
13065
13251
"~~~~~~~~~~~~"
13066
13252
msgstr ""
13067
13253
13068
#: en/help_topics/hooks.txt:495
13254
#: en/help_topics/hooks.txt:511
13069
13255
msgid ""
13070
13256
"Called after a new connection is established or a reconnect occurs.\n"
13071
13257
"The sole argument passed is either the connected transport or smart\n"
13072
13258
"medium instance."
13073
13259
msgstr ""
13074
13260
13075
#: en/help_topics/hooks.txt:499
13261
#: en/help_topics/hooks.txt:515
13076
13262
msgid ""
13077
13263
"RioVersionInfoBuilderHooks\n"
13078
13264
"--------------------------"
13080
13266
"RioVersionInfoBuilderHooks\n"
13081
13267
"--------------------------"
13082
13268
13083
#: en/help_topics/hooks.txt:502
13269
#: en/help_topics/hooks.txt:518
13084
13270
msgid ""
13085
13271
"revision\n"
13086
13272
"~~~~~~~~"
13088
13274
"revisión\n"
13089
13275
"~~~~~~~~"
13090
13276
13091
#: en/help_topics/hooks.txt:507
13277
#: en/help_topics/hooks.txt:523
13092
13278
msgid ""
13093
13279
"Invoked when adding information about a revision to the RIO stanza\n"
13094
13280
"that is printed. revision is called with a revision object and a RIO\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1