« back to all changes in this revision
Viewing changes to po/es.po
- browse files at revision 6620.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6620.1.1
- Committer: Vincent Ladeuil
- Date: 2017-01-30 14:30:10 UTC
- mfrom: (6615.3.7 merges)
- mto: This revision was merged to the branch mainline in revision 6621.
- Revision ID: v.ladeuil+lp@free.fr-20170130143010-p31t1ranfeqbaeki
Merge 2.7 into trunk including fix for bug #1657238
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- files modified:
- .bzrignore
added
removed
po/es.po
1
# Spanish translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
# Paco Molinero <paco@byasl.com>, 2011.
6
#
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bzr\n"
10
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
12
"PO-Revision-Date: 2013-06-29 08:13+0000\n"
13
"Last-Translator: Jose Luis Tirado <Unknown>\n"
14
"Language-Team: Spanish <es@li.org>\n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
"Plural-Forms: nplurals=2; plural=n != 1;\n"
19
"X-Launchpad-Export-Date: 2013-06-30 04:30+0000\n"
20
"X-Generator: Launchpad (build 16692)\n"
21
22
#: bzrlib/add.py:93
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr "omitiendo {0} (mayor que {1} de {2} bytes)"
25
26
#: bzrlib/branch.py:854
27
msgid "Unstacking"
28
msgstr "Desapilando"
29
30
#: bzrlib/branch.py:2955
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr "Subido a la revisión %d."
34
35
#: bzrlib/branch.py:2957
36
#, python-format
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] "%d etiqueta actualizada."
40
msgstr[1] "%d etiquetas actualizadas."
41
42
#: bzrlib/branch.py:2960
43
msgid "No new revisions or tags to push."
44
msgstr "No hay revisiones o etiquetas para subir."
45
46
#: bzrlib/branch.py:2962
47
msgid "No new revisions to push."
48
msgstr "No hay revisiones para subir."
49
50
#: bzrlib/branch.py:2982
51
msgid "checked branch {0} format {1}"
52
msgstr "rama comprobada {0} formato {1}"
53
54
#: bzrlib/branch.py:2985
55
#, python-format
56
msgid "found error:%s"
57
msgstr "error encontrado: %s"
58
59
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
60
#, python-format
61
msgid "Ignoring files outside view. View is %s"
62
msgstr "Ignorando archivos fuera de la vista. La vista es %s"
63
64
#: bzrlib/builtins.py:260
65
#, python-format
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
68
69
#: bzrlib/builtins.py:315
70
msgid "Display status summary."
71
msgstr "Mostrar resumen de estado."
72
73
#: bzrlib/builtins.py:317
74
msgid ""
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
77
msgstr ""
78
"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
79
"agrupados por estado. Los estados posibles son:"
80
81
#: bzrlib/builtins.py:320
82
msgid ""
83
"added\n"
84
" Versioned in the working copy but not in the previous revision."
85
msgstr ""
86
"añadido\n"
87
" Versionado en la copia de trabajo pero no en la revisión anterior."
88
89
#: bzrlib/builtins.py:323
90
msgid ""
91
"removed\n"
92
" Versioned in the previous revision but removed or deleted\n"
93
" in the working copy."
94
msgstr ""
95
"eliminado\n"
96
" Versionado en la revisión anterior pero borrado o eliminado\n"
97
" en la copia de trabajo."
98
99
#: bzrlib/builtins.py:327
100
msgid ""
101
"renamed\n"
102
" Path of this file changed from the previous revision;\n"
103
" the text may also have changed. This includes files whose\n"
104
" parent directory was renamed."
105
msgstr ""
106
"renombrado\n"
107
" La ruta de este archivo ha cambiado desde una revisión anterior;\n"
108
" el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
109
" directorio padre ha sido renombrado."
110
111
#: bzrlib/builtins.py:332
112
msgid ""
113
"modified\n"
114
" Text has changed since the previous revision."
115
msgstr ""
116
"modificado\n"
117
" El texto ha cambiado desde una revisión previa."
118
119
#: bzrlib/builtins.py:335
120
msgid ""
121
"kind changed\n"
122
" File kind has been changed (e.g. from file to directory)."
123
msgstr ""
124
"tipo cambiado\n"
125
" El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
126
127
#: bzrlib/builtins.py:338
128
msgid ""
129
"unknown\n"
130
" Not versioned and not matching an ignore pattern."
131
msgstr ""
132
"desconocido\n"
133
" Ni se ha versionado ni se ha encontrado un patrón ignorado."
134
135
#: bzrlib/builtins.py:341
136
msgid ""
137
"Additionally for directories, symlinks and files with a changed\n"
138
"executable bit, Bazaar indicates their type using a trailing\n"
139
"character: '/', '@' or '*' respectively. These decorations can be\n"
140
"disabled using the '--no-classify' option."
141
msgstr ""
142
"Adicionalmente para directorios, vínculos simbólicos y archivos con el bit "
143
"de\n"
144
"ejecutable cambiado, Bazaar indica su tipo usando un carácter \n"
145
"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
146
"desactivadas usando la opción «--no-classify»."
147
148
#: bzrlib/builtins.py:346
149
msgid ""
150
"To see ignored files use 'bzr ignored'. For details on the\n"
151
"changes to file texts, use 'bzr diff'."
152
msgstr ""
153
"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
154
"cambios de textos en los archivos, use «bzr diff»."
155
156
#: bzrlib/builtins.py:349
157
msgid ""
158
"Note that --short or -S gives status flags for each item, similar\n"
159
"to Subversion's status command. To get output similar to svn -q,\n"
160
"use bzr status -SV."
161
msgstr ""
162
"Note que --short o -S devuelve indicadores de estado para cada elemento, de "
163
"forma\n"
164
"similar a la orden status de Subversion. Para obtener una salida similar a "
165
"svn -q\n"
166
" use bzr status -SV."
167
168
#: bzrlib/builtins.py:353
169
msgid ""
170
"If no arguments are specified, the status of the entire working\n"
171
"directory is shown. Otherwise, only the status of the specified\n"
172
"files or directories is reported. If a directory is given, status\n"
173
"is reported for everything inside that directory."
174
msgstr ""
175
"Si no se indican argumentos, se muestra el estado del directorio de\n"
176
"trabajo completo. De otra forma, solo se informa del estado de los\n"
177
"archivos o directorios indicados. Si se proporciona un directorio, se\n"
178
"informa del estado de todo lo contenido en ese directorio."
179
180
#: bzrlib/builtins.py:358
181
msgid ""
182
"Before merges are committed, the pending merge tip revisions are\n"
183
"shown. To see all pending merge revisions, use the -v option.\n"
184
"To skip the display of pending merge information altogether, use\n"
185
"the no-pending option or specify a file/directory."
186
msgstr ""
187
"Antes de que se confirmen las fusiones, se muestran las sugerencias de\n"
188
"fusión de las revisiones. Para ver todas las fusiones pendientes, use la "
189
"opción -v.\n"
190
"Para evitar que se muestre la información de fusiones pendientes del todo, "
191
"use\n"
192
"la opción no-pending o indique un archivo/directorio."
193
194
#: bzrlib/builtins.py:363
195
msgid ""
196
"To compare the working directory to a specific revision, pass a\n"
197
"single revision to the revision argument."
198
msgstr ""
199
"Para comparar el directorio de trabajo con una revisión concreta, pase una\n"
200
"única revisión como argumento a la revisión."
201
202
#: bzrlib/builtins.py:366
203
msgid ""
204
"To see which files have changed in a specific revision, or between\n"
205
"two revisions, pass a revision range to the revision argument.\n"
206
"This will produce the same results as calling 'bzr diff --summarize'."
207
msgstr ""
208
"Para ver que archivos han cambiado en una revisión concreta, o entre\n"
209
"dos revisiones, pase un rango de revisiones al argumento de la revisión.\n"
210
"Esto producirá los mismos resultados que llamar «bzr diff --summarize»."
211
212
#: bzrlib/builtins.py:375
213
msgid "Use short status indicators."
214
msgstr "Usar indicadores de estado cortos."
215
216
#: bzrlib/builtins.py:377
217
msgid "Only show versioned files."
218
msgstr "Solo mostrar archivos versionados."
219
220
#: bzrlib/builtins.py:379
221
msgid "Don't show pending merges."
222
msgstr "No mostrar fusiones pendientes."
223
224
#: bzrlib/builtins.py:382
225
msgid "Do not mark object type using indicator."
226
msgstr "No marcar tipo de objeto usando indicador."
227
228
#: bzrlib/builtins.py:397
229
msgid "bzr status --revision takes exactly one or two revision specifiers"
230
msgstr ""
231
"bzr status --revision toma exactamente uno o dos especificadores de revisión"
232
233
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
234
msgid "You can only supply one of revision_id or --revision"
235
msgstr "Puede suiministrar solo uno revision_id o --revision"
236
237
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
238
msgid "You must supply either --revision or a revision_id"
239
msgstr "Puede suiministrar ambos revision_id o --revision"
240
241
#: bzrlib/builtins.py:451
242
#, python-format
243
msgid "Repository %r does not support access to raw revision texts"
244
msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
245
246
#: bzrlib/builtins.py:462
247
msgid "The repository {0} contains no revision {1}."
248
msgstr "El repositorio {0} no contiene revisión {1}."
249
250
#: bzrlib/builtins.py:469
251
msgid "You cannot specify a NULL revision."
252
msgstr "No puede especificar una revisión NULL."
253
254
#: bzrlib/builtins.py:561
255
msgid "Remove the working tree from a given branch/checkout."
256
msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
257
258
#: bzrlib/builtins.py:563
259
msgid ""
260
"Since a lightweight checkout is little more than a working tree\n"
261
"this will refuse to run against one."
262
msgstr ""
263
"Dado que una extracción ligera es poco más que un árbol de trabajo\n"
264
"esto impedirá que se ejecute contra una."
265
266
#: bzrlib/builtins.py:566
267
msgid "To re-create the working tree, use \"bzr checkout\"."
268
msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
269
270
#: bzrlib/builtins.py:572
271
msgid ""
272
"Remove the working tree even if it has uncommitted or shelved changes."
273
msgstr ""
274
"Eliminar el árbol de trabajo incluso si tiene cambios no confirmados o "
275
"archivados."
276
277
#: bzrlib/builtins.py:586
278
msgid "No working tree to remove"
279
msgstr "No existe un árbol de trabajo para eliminar"
280
281
#: bzrlib/builtins.py:588
282
msgid "You cannot remove the working tree of a remote path"
283
msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
284
285
#: bzrlib/builtins.py:597
286
msgid "You cannot remove the working tree from a lightweight checkout"
287
msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
288
289
#: bzrlib/builtins.py:637
290
msgid ""
291
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
292
"instead. Use \"--force\" if you are sure you want to reset the working tree."
293
msgstr ""
294
"El árbol no parece estar corrupto. Probablemente quiera «bzr revert» en su "
295
"lugar. Use «--force» si está seguro de que quiere reiniciar el árbol de "
296
"trabajo."
297
298
#: bzrlib/builtins.py:648
299
msgid ""
300
", the header appears corrupt, try passing -r -1 to set the state to the last "
301
"commit"
302
msgstr ""
303
", la cabecera parece corrupta, intente pasando -r -1 para establecer el "
304
"estado del último envío"
305
306
#: bzrlib/builtins.py:652
307
msgid "failed to reset the tree state{0}"
308
msgstr "fallo al restablecer el estado{0} del árbol"
309
310
#: bzrlib/builtins.py:656
311
msgid "Show current revision number."
312
msgstr "Mostrar número de revisión actual."
313
314
#: bzrlib/builtins.py:658
315
msgid "This is equal to the number of revisions on this branch."
316
msgstr "Esto es igual al número de revisiones en esta rama."
317
318
#: bzrlib/builtins.py:671
319
msgid "--tree and --revision can not be used together"
320
msgstr "--tree y --revision no se pueden usar juntos"
321
322
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
323
msgid "Tags can only be placed on a single revision, not on a range"
324
msgstr ""
325
"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
326
327
#: bzrlib/builtins.py:712
328
msgid "Show revno of working tree."
329
msgstr "Mostrar número de revisión del árbol de trabajo."
330
331
#: bzrlib/builtins.py:760
332
msgid "Add specified files or directories."
333
msgstr "Añadir archivos especificados o directorios."
334
335
#: bzrlib/builtins.py:762
336
msgid ""
337
"In non-recursive mode, all the named items are added, regardless\n"
338
"of whether they were previously ignored. A warning is given if\n"
339
"any of the named files are already versioned."
340
msgstr ""
341
"En el modo no recursivo, todos los puntos mencionados se añaden, \n"
342
"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
343
"cualquiera de los archivos nombrados ya está versionado."
344
345
#: bzrlib/builtins.py:766
346
msgid ""
347
"In recursive mode (the default), files are treated the same way\n"
348
"but the behaviour for directories is different. Directories that\n"
349
"are already versioned do not give a warning. All directories,\n"
350
"whether already versioned or not, are searched for files or\n"
351
"subdirectories that are neither versioned or ignored, and these\n"
352
"are added. This search proceeds recursively into versioned\n"
353
"directories. If no names are given '.' is assumed."
354
msgstr ""
355
"En modo recursivo (predeterminado), los archivos se tratan de la misma "
356
"manera\n"
357
"pero el comportamiento para directorios es diferente. Los directorios que\n"
358
"ya han sido versionados no generan un aviso. Todos los directorios,\n"
359
"hayan sido versionados o no, son recorridos buscando archivos o\n"
360
"subdirectorios que no hayan sido versionados o ignorados, y estos\n"
361
"son añadidos. Esta búsqueda procede recursivamente por los directorios\n"
362
"versionados. SI no se indican nombres se asume «.»."
363
364
#: bzrlib/builtins.py:774
365
msgid ""
366
"A warning will be printed when nested trees are encountered,\n"
367
"unless they are explicitly ignored."
368
msgstr ""
369
"Se imprimirá un aviso cuando se encuentren árboles anidados\n"
370
"a menos que se ignoren explícitamente."
371
372
#: bzrlib/builtins.py:777
373
msgid ""
374
"Therefore simply saying 'bzr add' will version all files that\n"
375
"are currently unknown."
376
msgstr ""
377
"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
378
"desconocidos actualmente."
379
380
#: bzrlib/builtins.py:780
381
msgid ""
382
"Adding a file whose parent directory is not versioned will\n"
383
"implicitly add the parent, and so on up to the root. This means\n"
384
"you should never need to explicitly add a directory, they'll just\n"
385
"get added when you add a file in the directory."
386
msgstr ""
387
"Al añadir un archivos cuyo padre no esté versionado añadirá\n"
388
"implícitamente al padre, y así sucesivamente hasta la raíz. Esto\n"
389
"significa que nunca necesitaría añadir explícitamente un directorio,\n"
390
"ya que serán añadidos cuando añada un archivo del directorio."
391
392
#: bzrlib/builtins.py:785
393
msgid ""
394
"--dry-run will show which files would be added, but not actually\n"
395
"add them."
396
msgstr ""
397
"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
398
"añade realmente."
399
400
#: bzrlib/builtins.py:788
401
msgid ""
402
"--file-ids-from will try to use the file ids from the supplied path.\n"
403
"It looks up ids trying to find a matching parent directory with the\n"
404
"same filename, and then by pure path. This option is rarely needed\n"
405
"but can be useful when adding the same logical file into two\n"
406
"branches that will be merged later (without showing the two different\n"
407
"adds as a conflict). It is also useful when merging another project\n"
408
"into a subdirectory of this one."
409
msgstr ""
410
"--file-ids-from intentará usar el archivo de ids de la ruta proporcionada.\n"
411
"Busca ids intentado encontrar un directorio padre que coincida con el\n"
412
"mismo nombre de archivo, y luego por ruta pura. Esta opción raramente\n"
413
"se necesita pero puede ser útil al añadir el mismo archivo lógico en dos\n"
414
"ramas que se fusionarán posteriormente (sin mostrar las dos adiciones\n"
415
"diferentes como un conflicto). También es útil al fusionar otro proyecto\n"
416
"en un subdirectorio de éste."
417
418
#: bzrlib/builtins.py:796
419
msgid ""
420
"Any files matching patterns in the ignore list will not be added\n"
421
"unless they are explicitly mentioned."
422
msgstr ""
423
"Cualquier archivo que coincida con los patrones en la lista de ignorados no "
424
"se añadirá\n"
425
"salvo que se mencione explícitamente."
426
427
#: bzrlib/builtins.py:799
428
msgid ""
429
"In recursive mode, files larger than the configuration option \n"
430
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
431
"to file size."
432
msgstr ""
433
"En modo recursivo, los archivos mayores que la opción de configuración \n"
434
"add.maximum_file_size se omitirán. Los elementos nombrados nunca se "
435
"omitirán\n"
436
"por su tamaño."
437
438
#: bzrlib/builtins.py:806
439
msgid "Don't recursively add the contents of directories."
440
msgstr "No añade de manera recursiva los contenidos de los directorios."
441
442
#: bzrlib/builtins.py:813
443
msgid "Lookup file ids from this tree."
444
msgstr "Buscar id de archivos desde este árbol."
445
446
#: bzrlib/builtins.py:849
447
msgid "ignored {0} matching \"{1}\"\n"
448
msgstr "ignorado {0} coincidente «{1}»\n"
449
450
#: bzrlib/builtins.py:854
451
msgid "Create a new versioned directory."
452
msgstr "Crear un directorio versionado nuevo."
453
454
#: bzrlib/builtins.py:856
455
msgid "This is equivalent to creating the directory and then adding it."
456
msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
457
458
#: bzrlib/builtins.py:863
459
msgid "No error if existing, make parent directories as needed."
460
msgstr ""
461
"Sin error si existen, creará los directorios padre según se necesiten."
462
463
#: bzrlib/builtins.py:897
464
#, python-format
465
msgid "added %s\n"
466
msgstr "añadido %s\n"
467
468
#: bzrlib/builtins.py:939
469
#, python-format
470
msgid "invalid kind %r specified"
471
msgstr "tipo inválido %r especificado"
472
473
#: bzrlib/builtins.py:976
474
msgid "Move or rename a file."
475
msgstr "Mover o renombrar un archivo."
476
477
#: bzrlib/builtins.py:978
478
msgid " bzr mv SOURCE... DESTINATION"
479
msgstr " bzr mv ORIGEN... DESTINO"
480
481
#: bzrlib/builtins.py:980
482
msgid ""
483
"If the last argument is a versioned directory, all the other names\n"
484
"are moved into it. Otherwise, there must be exactly two arguments\n"
485
"and the file is changed to a new name."
486
msgstr ""
487
"Si el último argumento es un directorio versionado, todos los demás nombres\n"
488
"se moverán a él. De otra forma, deben haber exactamente dos argumentos\n"
489
"y el archivo se cambia al nuevo nombre."
490
491
#: bzrlib/builtins.py:984
492
msgid ""
493
"If OLDNAME does not exist on the filesystem but is versioned and\n"
494
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
495
"assumes that the file has been manually moved and only updates\n"
496
"its internal inventory to reflect that change.\n"
497
"The same is valid when moving many SOURCE files to a DESTINATION."
498
msgstr ""
499
"Si NOMBREANTIGUO no existe en el sistema de archivos pero esta versionado y\n"
500
"NOMBRENUEVO existe en el sistema de archivos pero no está versionado, mv\n"
501
"asume que el archivo se ha movido manualmente y sólo actualiza su\n"
502
"inventario interno para reflejar ese cambio.\n"
503
"Lo mismo es válido cuando se mueven muchos archivos ORIGEN a un DESTINO."
504
505
#: bzrlib/builtins.py:990
506
msgid "Files cannot be moved between branches."
507
msgstr "Los archivos no se pueden mover entre ramas."
508
509
#: bzrlib/builtins.py:997
510
msgid ""
511
"Move only the bzr identifier of the file, because the file has already been "
512
"moved."
513
msgstr ""
514
"Mover solo el identificador bzr del archivo, porque el archivo ya ha sido "
515
"movido."
516
517
#: bzrlib/builtins.py:999
518
msgid "Automatically guess renames."
519
msgstr "Adivinar automáticamente rel renombrado."
520
521
#: bzrlib/builtins.py:1000
522
msgid "Avoid making changes when guessing renames."
523
msgstr "Evitar hacer cambios cunado se adivina el renombrado."
524
525
#: bzrlib/builtins.py:1009
526
msgid "--dry-run requires --auto."
527
msgstr "--dry-run requiere --auto."
528
529
#: bzrlib/builtins.py:1013
530
msgid "missing file argument"
531
msgstr "falta el argumento de archivo"
532
533
#: bzrlib/builtins.py:1017
534
msgid "can not move root of branch"
535
msgstr "no se puede mover la raíz de la rama"
536
537
#: bzrlib/builtins.py:1023
538
msgid "Only one path may be specified to --auto."
539
msgstr "Solo se puede especificar una ruta a --auto"
540
541
#: bzrlib/builtins.py:1026
542
msgid "--after cannot be specified with --auto."
543
msgstr "--after no se puede especificar con --auto."
544
545
#: bzrlib/builtins.py:1062
546
msgid "to mv multiple files the destination must be a versioned directory"
547
msgstr ""
548
"para hacer mv a múltiples archivos el destino debe ser un directorio "
549
"versionado"
550
551
#: bzrlib/builtins.py:1114
552
msgid "Turn this branch into a mirror of another branch."
553
msgstr "Cambiar esta rama a una réplica de otra rama."
554
555
#: bzrlib/builtins.py:1116
556
msgid ""
557
"By default, this command only works on branches that have not diverged.\n"
558
"Branches are considered diverged if the destination branch's most recent \n"
559
"commit is one that has not been merged (directly or indirectly) into the \n"
560
"parent."
561
msgstr ""
562
"Predeterminado, esta orden solo funciona en ramas que no han divergido.\n"
563
"Las ramas se consideran divergidas si la confirmación más reciente de la \n"
564
"rama destino es una que no ha sido fusionada (directa o indirectamente) \n"
565
"en el padre."
566
567
#: bzrlib/builtins.py:1121
568
msgid ""
569
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
570
"from one into the other. Once one branch has merged, the other should\n"
571
"be able to pull it again."
572
msgstr ""
573
"Si las ramas han divergido, puede usar «bzr merge» para integrar los "
574
"cambios\n"
575
"de una en la otra. Una vez que una rama se ha fusionado, la otra debería\n"
576
"ser capaz de extraer de nuevo."
577
578
#: bzrlib/builtins.py:1125
579
msgid ""
580
"If you want to replace your local changes and just want your branch to\n"
581
"match the remote one, use pull --overwrite. This will work even if the two\n"
582
"branches have diverged."
583
msgstr ""
584
"Si quiere reemplazar su cambios locales y solo quiere que su rama\n"
585
"coincida con la remota, use pull --overwrite. Esto funcionará incluso\n"
586
"si las dos ramas han divergido."
587
588
#: bzrlib/builtins.py:1129
589
msgid ""
590
"If there is no default location set, the first pull will set it (use\n"
591
"--no-remember to avoid setting it). After that, you can omit the\n"
592
"location to use the default. To change the default, use --remember. The\n"
593
"value will only be saved if the remote location can be accessed."
594
msgstr ""
595
"Si no hay ubicación predeterminada establecida, la primera extracción la \n"
596
"establecerá (use --no-remember para evitarlo). Después puede omitir la \n"
597
"ubicación para usar la predeterminada. Para cambiarla, use --remember. El\n"
598
"valor solo se guardará si la ubicación remota es accesible."
599
600
#: bzrlib/builtins.py:1134
601
msgid ""
602
"The --verbose option will display the revisions pulled using the log_format\n"
603
"configuration option. You can use a different format by overriding it with\n"
604
"-Olog_format=<other_format>."
605
msgstr ""
606
"La opción --verbose mostrará las revisiones extraídas usando la opción de\n"
607
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
608
"con -Olog_format=<otro_formato>."
609
610
#: bzrlib/builtins.py:1138
611
msgid ""
612
"Note: The location can be specified either in the form of a branch,\n"
613
"or in the form of a path to a file containing a merge directive generated\n"
614
"with bzr send."
615
msgstr ""
616
"Nota: la ubicación se puede indicar bien en forma de una rama,\n"
617
"o en forma de una ruta a un archivo conteniendo una directiva de\n"
618
"fusión generada con bzr send."
619
620
#: bzrlib/builtins.py:1146
621
msgid "Show logs of pulled revisions."
622
msgstr "Mostrar registros de revisiones extraídas."
623
624
#: bzrlib/builtins.py:1148
625
msgid ""
626
"Branch to pull into, rather than the one containing the working directory."
627
msgstr ""
628
"Rama en la que extraer, en lugar de la que contiene el directorio de trabajo."
629
630
#: bzrlib/builtins.py:1151
631
msgid ""
632
"Perform a local pull in a bound branch. Local pulls are not applied to the "
633
"master branch."
634
msgstr ""
635
"Efectuar una extracción local en una rama ligada. Las extracciones locales "
636
"no se aplican a la rama maestra."
637
638
#: bzrlib/builtins.py:1189
639
msgid "Need working tree for --show-base."
640
msgstr "Se necesita árbol de trabajo para --show-base."
641
642
#: bzrlib/builtins.py:1205
643
msgid "No pull location known or specified."
644
msgstr "Ubicación de extración no conocida ni indicada."
645
646
#: bzrlib/builtins.py:1211
647
#, python-format
648
msgid "Using saved parent location: %s\n"
649
msgstr "Usar ubicaciones padre guardadas: %s\n"
650
651
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
652
msgid "Cannot use -r with merge directives or bundles"
653
msgstr "No se puede usar -r con directivas de fusión o paquetes"
654
655
#: bzrlib/builtins.py:1261
656
msgid "Update a mirror of this branch."
657
msgstr "Actualizar una réplica de esta rama."
658
659
#: bzrlib/builtins.py:1263
660
msgid ""
661
"The target branch will not have its working tree populated because this\n"
662
"is both expensive, and is not supported on remote file systems."
663
msgstr ""
664
"El árbol de trabajo de la rama destino no se rellenará porque esto\n"
665
"es tanto costoso como no soportado por sistemas de archivos remotos."
666
667
#: bzrlib/builtins.py:1266
668
msgid ""
669
"Some smart servers or protocols *may* put the working tree in place in\n"
670
"the future."
671
msgstr ""
672
"Algunos servidores inteligentes o protocolos *pueden* poner el árbol de "
673
"trabajo\n"
674
"en su lugar en el futuro."
675
676
#: bzrlib/builtins.py:1269
677
msgid ""
678
"This command only works on branches that have not diverged. Branches are\n"
679
"considered diverged if the destination branch's most recent commit is one\n"
680
"that has not been merged (directly or indirectly) by the source branch."
681
msgstr ""
682
"Esta orden solo funciona en ramas que no han divergido. Las ramas se\n"
683
"consideran divergidas si la confirmación más reciente de la rama destino es\n"
684
"una que no ha sido fusionada (directa o indirectamente) por la rama origen."
685
686
#: bzrlib/builtins.py:1273
687
msgid ""
688
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
689
"the other branch completely, discarding its unmerged changes."
690
msgstr ""
691
"Si las ramas tienen divergencias, puede usar «bzr push --overwrite» para "
692
"reemplazar\n"
693
"la otra rama completamente, descartando sus cambios no fusionados."
694
695
#: bzrlib/builtins.py:1276
696
msgid ""
697
"If you want to ensure you have the different changes in the other branch,\n"
698
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
699
"After that you will be able to do a push without '--overwrite'."
700
msgstr ""
701
"Si quiere asegurarse de que tiene los distintos cambios de la otra rama,\n"
702
"haga una fusión (vea bzr help merge) desde la otra rama y confirmela.\n"
703
"Después eso será capaz de hacer una inserción sin «--overwrite»."
704
705
#: bzrlib/builtins.py:1280
706
msgid ""
707
"If there is no default push location set, the first push will set it (use\n"
708
"--no-remember to avoid setting it). After that, you can omit the\n"
709
"location to use the default. To change the default, use --remember. The\n"
710
"value will only be saved if the remote location can be accessed."
711
msgstr ""
712
"Si no existe una ubicación de «pushx definida, el primer «push» la "
713
"determinará (Usar \n"
714
"--no-remember para evitar su configuración). Después de esto, podrá omitir "
715
"la\n"
716
"ubicación para usar la predeterminada. Para cambiar la ubicación "
717
"predeterminada, usar --remember. El\n"
718
"parámetro solo será guardado si es posible el acceso a la ubicación remota."
719
720
#: bzrlib/builtins.py:1285
721
msgid ""
722
"The --verbose option will display the revisions pushed using the log_format\n"
723
"configuration option. You can use a different format by overriding it with\n"
724
"-Olog_format=<other_format>."
725
msgstr ""
726
"La opción --verbose mostrará las revisiones insertadas usando la opción de\n"
727
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
728
"con -Olog_format=<otro_formato>."
729
730
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
731
msgid ""
732
"Branch to push from, rather than the one containing the working directory."
733
msgstr ""
734
"Rama desde la que impulsar en vez de la que contiene el directorio de "
735
"trabajo."
736
737
#: bzrlib/builtins.py:1299
738
msgid ""
739
"By default push will fail if the target directory exists, but does not "
740
"already have a control directory. This flag will allow push to proceed."
741
msgstr ""
742
"Por defecto «push» fallará si el directorio destino existe, pero no tiene "
743
"todavía un directorio de control. Este marcador permitirá a «push» proceder."
744
745
#: bzrlib/builtins.py:1304
746
msgid ""
747
"Create a stacked branch that references the public location of the parent "
748
"branch."
749
msgstr ""
750
"Crear una rama apilada que referencia a la ubicación pública de la rama "
751
"padre."
752
753
#: bzrlib/builtins.py:1307
754
msgid ""
755
"Create a stacked branch that refers to another branch for the commit "
756
"history. Only the work not present in the referenced branch is included in "
757
"the branch created."
758
msgstr ""
759
"Crear una rama apilada que se refiera a otra para historial de "
760
"confirmaciones. Solo el trabajo no presente en la rama referenciada se "
761
"incluye en la rama creada."
762
763
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
764
msgid ""
765
"Refuse to push if there are uncommitted changes in the working tree, --no-"
766
"strict disables the check."
767
msgstr ""
768
"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
769
"strict desactiva la comprobación."
770
771
#: bzrlib/builtins.py:1315
772
msgid "Don't populate the working tree, even for protocols that support it."
773
msgstr ""
774
"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
775
776
#: bzrlib/builtins.py:1318
777
msgid "Overwrite tags only."
778
msgstr "Solo sobreescribir las etiquetas."
779
780
#: bzrlib/builtins.py:1369
781
msgid "Could not determine branch to refer to."
782
msgstr "No se puede determinar la rama a la que referirse."
783
784
#: bzrlib/builtins.py:1378
785
#, python-format
786
msgid ""
787
"No push location known or specified. To push to the parent branch (at %s), "
788
"use 'bzr push :parent'."
789
msgstr ""
790
"Ubicación de inserción no conocida ni indicada. Para insertar en la rama "
791
"padre (en %s), use «bzr push :parent»."
792
793
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
794
msgid "No push location known or specified."
795
msgstr "No hay una ubicación para impulsar conocida o especificada."
796
797
#: bzrlib/builtins.py:1388
798
#, python-format
799
msgid "Using saved push location: %s"
800
msgstr "Usar la ubicación para impulsar guardada: %s"
801
802
#: bzrlib/builtins.py:1398
803
msgid "Create a new branch that is a copy of an existing branch."
804
msgstr "Crea una nueva rama que es una copia de la rama existente."
805
806
#: bzrlib/builtins.py:1400
807
msgid ""
808
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
809
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
810
"./bar.\n"
811
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
812
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
813
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
814
"create ./foo-bar."
815
msgstr ""
816
"Si se omite TO_LOCATION, se usará el último componente de FROM_LOCATION. \n"
817
"En otras palabras, «branch ../foo/bar» intentará crear ./bar.\n"
818
"Si FROM_LOCATION no posee un / o un separador de ubicación incrustado, "
819
"TO_LOCATION\n"
820
"se deriva de FROM_LOCATION al liquidar un esquema líder o identificador\n"
821
"de unidad, si existe alguno. Por ejemplo, «branch lp:foo-bar» intentará "
822
"crear ./foo-bar."
823
824
#: bzrlib/builtins.py:1407
825
msgid ""
826
"To retrieve the branch as of a particular revision, supply the --revision\n"
827
"parameter, as in \"branch foo/bar -r 5\"."
828
msgstr ""
829
"Para conseguir la rama de una revisión particular, proporcione el parámetro -"
830
"-revision\n"
831
"como en «branch foo/bar -r 5»."
832
833
#: bzrlib/builtins.py:1410
834
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
835
msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
836
837
#: bzrlib/builtins.py:1420
838
msgid "Create a branch without a working-tree."
839
msgstr "Crear una rama sin directorio de trabajo."
840
841
#: bzrlib/builtins.py:1422
842
msgid "Switch the checkout in the current directory to the new branch."
843
msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
844
845
#: bzrlib/builtins.py:1425
846
msgid ""
847
"Create a stacked branch referring to the source branch. The new branch will "
848
"depend on the availability of the source branch for all operations."
849
msgstr ""
850
"Crear una rama apilada refiriéndose a la rama origen. La nueva rama "
851
"dependerá de la disponibilidad de la rama fuente para todas las operaciones."
852
853
#: bzrlib/builtins.py:1429
854
msgid "Do not use a shared repository, even if available."
855
msgstr "No usar un repositorio compartido, incluso si está disponible."
856
857
#: bzrlib/builtins.py:1431
858
msgid ""
859
"By default branch will fail if the target directory exists, but does not "
860
"already have a control directory. This flag will allow branch to proceed."
861
msgstr ""
862
"Por defecto «branch» fallará si el directorio destino existe, pero no tiene "
863
"todavía un directorio de control. Este marcador permitirá a «branch» "
864
"proceder."
865
866
#: bzrlib/builtins.py:1436
867
msgid "Bind new branch to from location."
868
msgstr "Vincular una rama nueva desde la ubicación."
869
870
#: bzrlib/builtins.py:1483
871
#, python-format
872
msgid "Target directory \"%s\" already exists."
873
msgstr "El directorio objetivo «%s» ya existe."
874
875
#: bzrlib/builtins.py:1495
876
#, python-format
877
msgid "Parent of \"%s\" does not exist."
878
msgstr "El padre de «%s» no existe."
879
880
#: bzrlib/builtins.py:1514
881
msgid "The branch {0} has no revision {1}."
882
msgstr "La rama {0} no tiene revisión {1}."
883
884
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
885
#, python-format
886
msgid "Created new stacked branch referring to %s."
887
msgstr "Creada rama apilada nueva referida a %s."
888
889
#: bzrlib/builtins.py:1533
890
#, python-format
891
msgid "Branched %d revision."
892
msgid_plural "Branched %d revisions."
893
msgstr[0] "%d revisión enramada"
894
msgstr[1] "%d revisiones enramadas"
895
896
#: bzrlib/builtins.py:1538
897
#, python-format
898
msgid "New branch bound to %s"
899
msgstr "Nueva rama unida a %s"
900
901
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
902
#, python-format
903
msgid "Switched to branch: %s"
904
msgstr "Cambiado a la rama: %s"
905
906
#: bzrlib/builtins.py:1548
907
msgid "List the branches available at the current location."
908
msgstr "Lista las ramas disponibles en la ubicación actual."
909
910
#: bzrlib/builtins.py:1550
911
msgid ""
912
"This command will print the names of all the branches at the current\n"
913
"location."
914
msgstr ""
915
"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
916
"actual."
917
918
#: bzrlib/builtins.py:1557
919
msgid ""
920
"Recursively scan for branches rather than just looking in the specified "
921
"location."
922
msgstr ""
923
"Buscar recursivamente en las ramas en lugar de mirar solo en la ubicación "
924
"indicada."
925
926
#: bzrlib/builtins.py:1586
927
msgid "(default)"
928
msgstr "(predeterminado)"
929
930
#: bzrlib/builtins.py:1598
931
msgid "Create a new checkout of an existing branch."
932
msgstr "Crea una nueva comprobación de una rama existente."
933
934
#: bzrlib/builtins.py:1600
935
msgid ""
936
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
937
"for\n"
938
"the branch found in '.'. This is useful if you have removed the working "
939
"tree\n"
940
"or if it was never created - i.e. if you pushed the branch to its current\n"
941
"location using SFTP."
942
msgstr ""
943
"Si BRANCH_LOCATION se omie, checkout reconstituirá un árbol funcional para\n"
944
"la rama encontrada en «.». Esto es útil si se ha eliminado el árbol "
945
"funcional actual\n"
946
"o si nunca fué creado - es decir si se empujó la rama a la ubicación actual "
947
"\n"
948
"usando SFTP."
949
950
#: bzrlib/builtins.py:1605
951
msgid ""
952
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
953
"will\n"
954
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
955
"./bar.\n"
956
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
957
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
958
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
959
"create ./foo-bar."
960
msgstr ""
961
"Si se omite TO_LOCATION, se usará el último componente de FROM_LOCATION.\n"
962
"En otras palabras, «branch ../foo/bar» intentará crear ./bar.\n"
963
"Si FROM_LOCATION no posee un / o un separador de ubicación incrustado, "
964
"TO_LOCATION\n"
965
"es derivada desde FROM_LOCATION al liquidar un esquema líder o "
966
"identificador\n"
967
"de unidad, si existe alguno. Por ejemplo, «branch lp:foo-bar» intentará "
968
"crear ./foo-bar."
969
970
#: bzrlib/builtins.py:1612
971
msgid ""
972
"To retrieve the branch as of a particular revision, supply the --revision\n"
973
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
974
"immediately\n"
975
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
976
"old\n"
977
"code.)"
978
msgstr ""
979
"Para recuperar la rama de una revisión particular, proporcione el parámetro\n"
980
"--revision, como en «checkout foo/bar -r 5». Note que esto estará "
981
"inmediatamente\n"
982
"desfasado [por lo que no puede confirmar] pero aún así puede ser útil (por \n"
983
"ejemplo, para examinar código antiguo)."
984
985
#: bzrlib/builtins.py:1622
986
msgid ""
987
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
988
"the branch for every operation. Normal checkouts can perform common "
989
"operations like diff and status without such access, and also support local "
990
"commits."
991
msgstr ""
992
"Realizar una extracción ligera. Las extracciones ligeras depende del acceso "
993
"a la rama para cada operación. Las extracciones normales pueden realizar "
994
"operaciones habituales como diff y status sin este acceso, así como permitir "
995
"confirmaciones locales."
996
997
#: bzrlib/builtins.py:1629
998
msgid "Get file contents from this tree."
999
msgstr "Conseguir contenidos de archivo desde este árbol."
1000
1001
#: bzrlib/builtins.py:1631
1002
msgid "Hard-link working tree files where possible."
1003
msgstr ""
1004
"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
1005
1006
#: bzrlib/builtins.py:1672
1007
msgid ""
1008
"Show list of renamed files.\n"
1009
" "
1010
msgstr ""
1011
"Mostrar la lista de archivos renombrados\n"
1012
" "
1013
1014
#: bzrlib/builtins.py:1700
1015
msgid "Update a working tree to a new revision."
1016
msgstr "Actualiza un árbol de trabajo a una revisión nueva."
1017
1018
#: bzrlib/builtins.py:1702
1019
msgid ""
1020
"This will perform a merge of the destination revision (the tip of the\n"
1021
"branch, or the specified revision) into the working tree, and then make\n"
1022
"that revision the basis revision for the working tree. "
1023
msgstr ""
1024
"Efectuará una fusión de la revisión de destino (el extremo de la\n"
1025
"rama, o la revisión indicada) en el árbol de trabajo, y hará esa\n"
1026
"revisión la revisión base del árbol de trabajo. "
1027
1028
#: bzrlib/builtins.py:1706
1029
msgid ""
1030
"You can use this to visit an older revision, or to update a working tree\n"
1031
"that is out of date from its branch."
1032
msgstr ""
1033
"Puede usar esto para visitar una revisión antigua, o para actualizar un "
1034
"árbol de trabajo\n"
1035
"que esté desactualizado de su rama."
1036
1037
#: bzrlib/builtins.py:1709
1038
msgid ""
1039
"If there are any uncommitted changes in the tree, they will be carried\n"
1040
"across and remain as uncommitted changes after the update. To discard\n"
1041
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1042
"with the changes brought in by the change in basis revision."
1043
msgstr ""
1044
"Si hay cambios sin confirmar en el árbol, serán traspasados y permanecerán \n"
1045
"como cambios sin confirmar después de la actualización. Para descartar\n"
1046
"estos cambios, use «bzr revert». Los cambios no confirmados puede entrar\n"
1047
"en conflicto con los cambios traídos por modificaciones en la revisión base."
1048
1049
#: bzrlib/builtins.py:1714
1050
msgid ""
1051
"If the tree's branch is bound to a master branch, bzr will also update\n"
1052
"the branch from the master."
1053
msgstr ""
1054
"Si la rama del árbol esta atada a una rama superior, bzr también "
1055
"actualizará\n"
1056
"la rama de la superior."
1057
1058
#: bzrlib/builtins.py:1717
1059
msgid ""
1060
"You cannot update just a single file or directory, because each Bazaar\n"
1061
"working tree has just a single basis revision. If you want to restore a\n"
1062
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1063
"update'. If you want to restore a file to its state in a previous\n"
1064
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1065
"out the old content of that file to a new location."
1066
msgstr ""
1067
"No puede actualizar solo un único fichero o directorio, porque cada árbol\n"
1068
"de trabajo Bazaar tiene una única revisión base. Si quiere restaurar un\n"
1069
"archivo que ha sido borrado localmente, use «bzr revert» en lugar de «bzr\n"
1070
"update». Si quiere restaurar un archivo a su estado en una revisión\n"
1071
"previa, use «bzr revert» con la opción «-r», o use «bzr cat» para escribir "
1072
"el\n"
1073
"contenido antiguo de ese archivo en una nueva ubicación."
1074
1075
#: bzrlib/builtins.py:1724
1076
msgid ""
1077
"The 'dir' argument, if given, must be the location of the root of a\n"
1078
"working tree to update. By default, the working tree that contains the \n"
1079
"current working directory is used."
1080
msgstr ""
1081
"El argumento «dir», si se indica, debe ser la ubicación de la raíz de un\n"
1082
"árbol de trabajo a actualizar. Por defecto, se usa el árbol de trabajo \n"
1083
"que contiene el directorio de trabajo actual."
1084
1085
#: bzrlib/builtins.py:1740
1086
msgid "bzr update --revision takes exactly one revision"
1087
msgstr "bzr update --revision toma exactamente una revisión"
1088
1089
#: bzrlib/builtins.py:1748
1090
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1091
msgstr ""
1092
"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
1093
1094
#: bzrlib/builtins.py:1779
1095
msgid "Tree is up to date at revision {0} of branch {1}"
1096
msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
1097
1098
#: bzrlib/builtins.py:1795
1099
#, python-format
1100
msgid ""
1101
"branch has no revision %s\n"
1102
"bzr update --revision only works for a revision in the branch history"
1103
msgstr ""
1104
"la rama no tiene revisión %s\n"
1105
"bzr update --revision solo funciona para una revisión en el histórico de la "
1106
"rama"
1107
1108
#: bzrlib/builtins.py:1801
1109
msgid "Updated to revision {0} of branch {1}"
1110
msgstr "Actualizado a la revisión {0} de la rama {1}"
1111
1112
#: bzrlib/builtins.py:1805
1113
msgid ""
1114
"Your local commits will now show as pending merges with 'bzr status', and "
1115
"can be committed with 'bzr commit'."
1116
msgstr ""
1117
"Sus envíos locales se mostrarán ahora como fusiones pendientes con «bzr "
1118
"status», y pueden enviarse con «bzr commit»."
1119
1120
#: bzrlib/builtins.py:1814
1121
msgid "Show information about a working tree, branch or repository."
1122
msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
1123
1124
#: bzrlib/builtins.py:1816
1125
msgid ""
1126
"This command will show all known locations and formats associated to the\n"
1127
"tree, branch or repository."
1128
msgstr ""
1129
"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
1130
"árbol, rama o repositorio."
1131
1132
#: bzrlib/builtins.py:1819
1133
msgid ""
1134
"In verbose mode, statistical information is included with each report.\n"
1135
"To see extended statistic information, use a verbosity level of 2 or\n"
1136
"higher by specifying the verbose option multiple times, e.g. -vv."
1137
msgstr ""
1138
"En modo verboso, se incluye información estadística con cada informe.\n"
1139
"Para ver información estadística extendida, use un nivel de verbosidad de 2 "
1140
"o\n"
1141
"superior indicando la opción verbosa varias veces, p.e. -vv."
1142
1143
#: bzrlib/builtins.py:1823
1144
msgid "Branches and working trees will also report any missing revisions."
1145
msgstr ""
1146
"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
1147
"que falte."
1148
1149
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1150
#: bzrlib/builtins.py:6466
1151
msgid ":Examples:"
1152
msgstr ":Ejemplos:"
1153
1154
#: bzrlib/builtins.py:1827
1155
msgid " Display information on the format and related locations:"
1156
msgstr " Muestra información en el formato y ubicaciones relacionadas:"
1157
1158
#: bzrlib/builtins.py:1829
1159
msgid " bzr info"
1160
msgstr " información bzr"
1161
1162
#: bzrlib/builtins.py:1831
1163
msgid ""
1164
" Display the above together with extended format information and\n"
1165
" basic statistics (like the number of files in the working tree and\n"
1166
" number of revisions in the branch and repository):"
1167
msgstr ""
1168
" Mostrar lo anterior junto a información extendida de formato y\n"
1169
" estadísticas básicas (como el número de archivos en el árbol funcional y\n"
1170
" el número de revisiones en la rama y el repositorio):"
1171
1172
#: bzrlib/builtins.py:1835
1173
msgid " bzr info -v"
1174
msgstr " bzr info -v"
1175
1176
#: bzrlib/builtins.py:1837
1177
msgid " Display the above together with number of committers to the branch:"
1178
msgstr " Mostrar lo anterior junto con el número de aplicadores de la rama:"
1179
1180
#: bzrlib/builtins.py:1839
1181
msgid " bzr info -vv"
1182
msgstr " bzr info -vv"
1183
1184
#: bzrlib/builtins.py:1858
1185
msgid "Remove files or directories."
1186
msgstr "Elimina archivos o directorios."
1187
1188
#: bzrlib/builtins.py:1860
1189
msgid ""
1190
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1191
"delete them if they can easily be recovered using revert otherwise they\n"
1192
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1193
"parameters are given Bazaar will scan for files that are being tracked by\n"
1194
"Bazaar but missing in your tree and stop tracking them for you."
1195
msgstr ""
1196
"Esto hace que Bazaar deje tracear cambios de los archivos especificados. "
1197
"Bazaar \n"
1198
"eliminará estos archivos si pueden ser recuperados fácilmente usando "
1199
"revertir, en caso contrario \n"
1200
"serán respaldados (añadiendo una extensión de la forma .~#~). Si no se "
1201
"proporcionan opciones o \n"
1202
"parámetros, Bazaar escaneará los archivos que están siendo seguidos por\n"
1203
" Bazaar pero que faltan en tu árbol y dejarán de ser seguidos."
1204
1205
#: bzrlib/builtins.py:1868
1206
msgid "Only remove files that have never been committed."
1207
msgstr "Eliminar solo los archivos que nunca se han enviado."
1208
1209
#: bzrlib/builtins.py:1870
1210
msgid "The file deletion mode to be used."
1211
msgstr "El modo de borrado de archivo a usar."
1212
1213
#: bzrlib/builtins.py:1871
1214
msgid "Deletion Strategy"
1215
msgstr "Estrategia de borrado"
1216
1217
#: bzrlib/builtins.py:1872
1218
msgid "Backup changed files (default)."
1219
msgstr "Copiar archivos modificados (predeterminado)."
1220
1221
#: bzrlib/builtins.py:1873
1222
msgid "Delete from bzr but leave the working copy."
1223
msgstr "Borrar de bzr pero dejar la copia de trabajo."
1224
1225
#: bzrlib/builtins.py:1874
1226
msgid "Don't backup changed files."
1227
msgstr "No copiar los archivos modificados."
1228
1229
#: bzrlib/builtins.py:1875
1230
msgid ""
1231
"Delete all the specified files, even if they can not be recovered and even "
1232
"if they are non-empty directories. (deprecated, use no-backup)"
1233
msgstr ""
1234
"Borrar todos los archivos indicados, incluso si no pueden ser recuperados y "
1235
"aunque existan directorios no vacíos (obsoleto, use no-backup)."
1236
1237
#: bzrlib/builtins.py:1884
1238
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1239
msgstr ""
1240
"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
1241
1242
#: bzrlib/builtins.py:1901
1243
msgid "No matching files."
1244
msgstr "No hay archivos coincidentes."
1245
1246
#: bzrlib/builtins.py:1962
1247
msgid "Reconcile bzr metadata in a branch."
1248
msgstr "Reconcilia metadatos bzr en una rama."
1249
1250
#: bzrlib/builtins.py:1964
1251
msgid ""
1252
"This can correct data mismatches that may have been caused by\n"
1253
"previous ghost operations or bzr upgrades. You should only\n"
1254
"need to run this command if 'bzr check' or a bzr developer\n"
1255
"advises you to run it."
1256
msgstr ""
1257
"Esto puede corregir discrepancias en los datos que puedan haber sido "
1258
"causadas por\n"
1259
"operaciones fantasma previas o por actualizaciones de bzr. Solo debería "
1260
"necesitar\n"
1261
"ejecutar este comando si «bzr check» o un desarrollador de bzr le \n"
1262
"aconsejan hacerlo."
1263
1264
#: bzrlib/builtins.py:1969
1265
msgid ""
1266
"If a second branch is provided, cross-branch reconciliation is\n"
1267
"also attempted, which will check that data like the tree root\n"
1268
"id which was not present in very early bzr versions is represented\n"
1269
"correctly in both branches."
1270
msgstr ""
1271
"Si se proporciona una rama secundaria, se intentará una reconciliación \n"
1272
"entre las ramas, la cual, verificará que información como el número de "
1273
"identificación \n"
1274
"del árbol raíz que no estaba presente en versiones anteriores de bzr esté\n"
1275
"representada correctamente en ambas ramas."
1276
1277
#: bzrlib/builtins.py:1974
1278
msgid ""
1279
"At the same time it is run it may recompress data resulting in\n"
1280
"a potential saving in disk space or performance gain."
1281
msgstr ""
1282
"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
1283
"un ahorro potencial de espacio en disco o aumento el rendimiento."
1284
1285
#: bzrlib/builtins.py:1977
1286
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1287
msgstr ""
1288
"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
1289
"o sftp."
1290
1291
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1292
msgid ""
1293
"Format for the bzr 2.0 series.\n"
1294
"Uses group-compress storage.\n"
1295
"Provides rich roots which are a one-way transition.\n"
1296
msgstr ""
1297
"Formato para las series bzr 2.0.\n"
1298
"Usa almacenamiento group-compress.\n"
1299
"Proporciona roots ricas que tienen una transición de una dirección.\n"
1300
1301
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1302
msgid ""
1303
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1304
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1305
msgstr ""
1306
"Formato basado en paquete usado en la versión 1.x. Introducido en 0.92. "
1307
"Interopera con repositorios de bzr antes de 0.92, pero no es compatible con "
1308
"versiones de bzr < 0.92. "
1309
1310
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1311
msgid "The 2a format with experimental support for colocated branches.\n"
1312
msgstr "El formato 2a con soporte experimental para ramas colocadas.\n"
1313
1314
#: bzrlib/builtins.py:2045
1315
msgid "Make a directory into a versioned branch."
1316
msgstr "Hacer un directorio en una rama versionada."
1317
1318
#: bzrlib/builtins.py:2047
1319
msgid ""
1320
"Use this to create an empty branch, or before importing an\n"
1321
"existing project."
1322
msgstr ""
1323
"Use esto para crear una rama nueva o antes de importar un\n"
1324
"proyecto existente."
1325
1326
#: bzrlib/builtins.py:2050
1327
msgid ""
1328
"If there is a repository in a parent directory of the location, then\n"
1329
"the history of the branch will be stored in the repository. Otherwise\n"
1330
"init creates a standalone branch which carries its own history\n"
1331
"in the .bzr directory."
1332
msgstr ""
1333
"SI hay un repositorio en un directorio padre de la ubicación, el\n"
1334
"historial de la rama se almacenará en el repositorio. En otro caso\n"
1335
"init crea una rama independiente que lleva su propio historial \n"
1336
"en el directorio .bzr."
1337
1338
#: bzrlib/builtins.py:2055
1339
msgid ""
1340
"If there is already a branch at the location but it has no working tree,\n"
1341
"the tree can be populated with 'bzr checkout'."
1342
msgstr ""
1343
"Si existe ya una rama en la ubicación, pero no tiene árbol de trabajo,\n"
1344
"se puede poblar el árbol con «bzr checkout»."
1345
1346
#: bzrlib/builtins.py:2058
1347
msgid "Recipe for importing a tree of files::"
1348
msgstr "Recipiente para importar un árbol de archivos:"
1349
1350
#: bzrlib/builtins.py:2060
1351
msgid ""
1352
" cd ~/project\n"
1353
" bzr init\n"
1354
" bzr add .\n"
1355
" bzr status\n"
1356
" bzr commit -m \"imported project\""
1357
msgstr ""
1358
" cd ~/project\n"
1359
" bzr init\n"
1360
" bzr add .\n"
1361
" bzr status\n"
1362
" bzr commit -m «proyecto importado»"
1363
1364
#: bzrlib/builtins.py:2071
1365
msgid ""
1366
"Create the path leading up to the branch if it does not already exist."
1367
msgstr "Crea la ruta que conduce a la rama si no existe ya."
1368
1369
#: bzrlib/builtins.py:2074
1370
msgid "Specify a format for this branch. See \"help formats\"."
1371
msgstr "Especificar un formato para esta rama. Vea «help formats»"
1372
1373
#: bzrlib/builtins.py:2082
1374
msgid ""
1375
"Never change revnos or the existing log. Append revisions to it only."
1376
msgstr ""
1377
"Nunca cambiar revnos o el registro existente. Solo añadir revisiones."
1378
1379
#: bzrlib/builtins.py:2085
1380
msgid "Create a branch without a working tree."
1381
msgstr "Crea una rama sin árbol de trabajo."
1382
1383
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1384
#, python-format
1385
msgid ""
1386
"Parent directory of %s does not exist.\n"
1387
"You may supply --create-prefix to create all leading parent directories."
1388
msgstr ""
1389
"El directorio padre de %s no existe.\n"
1390
"Debe indicar --create-prefix para crear todos los directorios padre "
1391
"precedentes."
1392
1393
#: bzrlib/builtins.py:2139
1394
msgid ""
1395
"This branch format cannot be set to append-revisions-only. Try --default."
1396
msgstr ""
1397
"Este formato de rama no se puede establecer como append-revisions-only. "
1398
"Intente --default."
1399
1400
#: bzrlib/builtins.py:2150
1401
msgid "Created a {0} (format: {1})\n"
1402
msgstr "Creado un {0} (formaot: {1})\n"
1403
1404
#: bzrlib/builtins.py:2159
1405
#, python-format
1406
msgid "Using shared repository: %s\n"
1407
msgstr "Usando el repositorio compartido: %s\n"
1408
1409
#: bzrlib/builtins.py:2163
1410
msgid "Create a shared repository for branches to share storage space."
1411
msgstr ""
1412
"Crea un repositorio compartido para ramas para compartir el espacio de "
1413
"almacenamiento."
1414
1415
#: bzrlib/builtins.py:2165
1416
msgid ""
1417
"New branches created under the repository directory will store their\n"
1418
"revisions in the repository, not in the branch directory. For branches\n"
1419
"with shared history, this reduces the amount of storage needed and \n"
1420
"speeds up the creation of new branches."
1421
msgstr ""
1422
"Las nuevas ramas creadas en la ubicación del repositorio, guardarán sus\n"
1423
"revisiones en el mismo, no en el directorio de la rama. Para las ramas\n"
1424
"con historia compartida, significa una reducción en el espacio de "
1425
"almacenamiento necesario y \n"
1426
"aceleramiento en la cración de nuevas ramas."
1427
1428
#: bzrlib/builtins.py:2170
1429
msgid ""
1430
"If the --no-trees option is given then the branches in the repository\n"
1431
"will not have working trees by default. They will still exist as \n"
1432
"directories on disk, but they will not have separate copies of the \n"
1433
"files at a certain revision. This can be useful for repositories that\n"
1434
"store branches which are interacted with through checkouts or remote\n"
1435
"branches, such as on a server."
1436
msgstr ""
1437
"Si se da la opción --no-trees entonces las ramas en el repositorio\n"
1438
"no tendrá árboles de trabajo por defecto. Seguirán existiendo como\n"
1439
"directorios en el disco, pero no van a tener copias separadas de los\n"
1440
"archivos en una cierta revisión. Esto puede ser útil para repositorios que\n"
1441
"almacenan ramas para interactuar a través de comprobaciones o ramas\n"
1442
"remotas, como en un servidor."
1443
1444
#: bzrlib/builtins.py:2177
1445
msgid ""
1446
":Examples:\n"
1447
" Create a shared repository holding just branches::"
1448
msgstr ""
1449
":Ejemplos:\n"
1450
" Crear un repositorio compartido manteniendo solo las ramas::"
1451
1452
#: bzrlib/builtins.py:2180
1453
msgid ""
1454
" bzr init-repo --no-trees repo\n"
1455
" bzr init repo/trunk"
1456
msgstr ""
1457
" bzr init-repo --no-trees repo\n"
1458
" bzr init repo/trunk"
1459
1460
#: bzrlib/builtins.py:2183
1461
msgid " Make a lightweight checkout elsewhere::"
1462
msgstr " Hace una comprobación ligera en cualquier sitio::"
1463
1464
#: bzrlib/builtins.py:2185
1465
msgid ""
1466
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1467
" cd trunk-checkout\n"
1468
" (add files here)"
1469
msgstr ""
1470
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1471
" cd trunk-checkout\n"
1472
" (añadir archivos aquí)"
1473
1474
#: bzrlib/builtins.py:2193
1475
msgid ""
1476
"Specify a format for this repository. See \"bzr help formats\" for details."
1477
msgstr ""
1478
"Especificar un formato para este repositorio, Vea «bzr help formats» para "
1479
"tener más detalles."
1480
1481
#: bzrlib/builtins.py:2197
1482
msgid "Repository format"
1483
msgstr "Formato de repositorio"
1484
1485
#: bzrlib/builtins.py:2199
1486
msgid "Branches in the repository will default to not having a working tree."
1487
msgstr ""
1488
"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
1489
"trabajo."
1490
1491
#: bzrlib/builtins.py:2225
1492
msgid "Show differences in the working tree, between revisions or branches."
1493
msgstr ""
1494
"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
1495
1496
#: bzrlib/builtins.py:2227
1497
msgid ""
1498
"If no arguments are given, all changes for the current tree are listed.\n"
1499
"If files are given, only the changes in those files are listed.\n"
1500
"Remote and multiple branches can be compared by using the --old and\n"
1501
"--new options. If not provided, the default for both is derived from\n"
1502
"the first argument, if any, or the current tree if no arguments are\n"
1503
"given."
1504
msgstr ""
1505
"Si no se dan argumentos, todos los cambios aparecen en el árbol actual.\n"
1506
"Si se facilitan los archivos, solo se mostrarán los cambios en esos "
1507
"archivos.\n"
1508
"Las ramas múltiples y remotas podrán compararse mediante las opciones --old "
1509
"y\n"
1510
"--new. Si no se facilita, el valor predeterminado para ambos se deriva\n"
1511
"desde el primer argumento, si lo hay, o al árbol actual si no los tiene."
1512
1513
#: bzrlib/builtins.py:2234
1514
msgid ""
1515
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1516
"produces patches suitable for \"patch -p1\"."
1517
msgstr ""
1518
"«bzr diff -p1» es equivalente a «bzr diff --prefix old/:new/», y\n"
1519
"produce parches adecuados para «patch -p1»."
1520
1521
#: bzrlib/builtins.py:2237
1522
msgid ""
1523
"Note that when using the -r argument with a range of revisions, the\n"
1524
"differences are computed between the two specified revisions. That\n"
1525
"is, the command does not show the changes introduced by the first \n"
1526
"revision in the range. This differs from the interpretation of \n"
1527
"revision ranges used by \"bzr log\" which includes the first revision\n"
1528
"in the range."
1529
msgstr ""
1530
"Tenga en cuenta que cuando se use el argumento -r con un rango de "
1531
"revisiones, las\n"
1532
"diferencias se calculan entre las dos revisiones indicadas. Esto es, la\n"
1533
"orden no muestra los cambios introducidos por la primera \n"
1534
"revisión del rango. Esto difiere de la interpretación de rangos de \n"
1535
"revisiones usada por «bzr log» el cuál incluye la primera revisión\n"
1536
"del rango."
1537
1538
#: bzrlib/builtins.py:2244
1539
msgid ""
1540
":Exit values:\n"
1541
" 1 - changed\n"
1542
" 2 - unrepresentable changes\n"
1543
" 3 - error\n"
1544
" 0 - no change"
1545
msgstr ""
1546
":Valores de salida:\n"
1547
" 1 - cambiado\n"
1548
" 2 - cambios no representables\n"
1549
" 3 - error\n"
1550
" 0 - sin cambios"
1551
1552
#: bzrlib/builtins.py:2250
1553
msgid ""
1554
":Examples:\n"
1555
" Shows the difference in the working tree versus the last commit::"
1556
msgstr ""
1557
":Ejemplos:\n"
1558
" Muestra las diferencias en el árbol de trabajo contra el último envío::"
1559
1560
#: bzrlib/builtins.py:2253
1561
msgid " bzr diff"
1562
msgstr " bzr diff"
1563
1564
#: bzrlib/builtins.py:2255
1565
msgid " Difference between the working tree and revision 1::"
1566
msgstr " Diferencia entre el árbol de trabajo y la revisión 1::"
1567
1568
#: bzrlib/builtins.py:2257
1569
msgid " bzr diff -r1"
1570
msgstr " bzr diff -r1"
1571
1572
#: bzrlib/builtins.py:2259
1573
msgid " Difference between revision 3 and revision 1::"
1574
msgstr " Diferencia entre revisión 3 y revisión 1::"
1575
1576
#: bzrlib/builtins.py:2261
1577
msgid " bzr diff -r1..3"
1578
msgstr " bzr diff -r1..3"
1579
1580
#: bzrlib/builtins.py:2263
1581
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1582
msgstr " Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
1583
1584
#: bzrlib/builtins.py:2265
1585
msgid " bzr diff -r1..3 xxx"
1586
msgstr " bzr diff -r1..3 xxx"
1587
1588
#: bzrlib/builtins.py:2267
1589
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1590
msgstr ""
1591
" Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
1592
1593
#: bzrlib/builtins.py:2269
1594
msgid " bzr diff -c2"
1595
msgstr " bzr diff -c2"
1596
1597
#: bzrlib/builtins.py:2271
1598
msgid ""
1599
" To see the changes introduced by revision X::\n"
1600
" \n"
1601
" bzr diff -cX"
1602
msgstr ""
1603
" Para ver los cambios introducidos por la revisión X::\n"
1604
" \n"
1605
" bzr diff -cX"
1606
1607
#: bzrlib/builtins.py:2275
1608
msgid ""
1609
" Note that in the case of a merge, the -c option shows the changes\n"
1610
" compared to the left hand parent. To see the changes against\n"
1611
" another parent, use::"
1612
msgstr ""
1613
" Note que en caso de fusión, la opción -c muestra los cambios\n"
1614
" comparados con el padre a la izquierda. Para ver los cambios contra\n"
1615
" otro padre, use::"
1616
1617
#: bzrlib/builtins.py:2279
1618
msgid " bzr diff -r<chosen_parent>..X"
1619
msgstr " bzr diff -r<padre_elegido>..X"
1620
1621
#: bzrlib/builtins.py:2281
1622
msgid ""
1623
" The changes between the current revision and the previous revision\n"
1624
" (equivalent to -c-1 and -r-2..-1)"
1625
msgstr ""
1626
" Los cambios entre la versión actual y la previa\n"
1627
" (equivalente a -c-1 y -r-2..-1)"
1628
1629
#: bzrlib/builtins.py:2284
1630
msgid " bzr diff -r-2.."
1631
msgstr " bzr diff -r-2.."
1632
1633
#: bzrlib/builtins.py:2286
1634
msgid " Show just the differences for file NEWS::"
1635
msgstr " Solo muestra las diferencias para el archivo NEWS::"
1636
1637
#: bzrlib/builtins.py:2288
1638
msgid " bzr diff NEWS"
1639
msgstr " bzr diff NEWS"
1640
1641
#: bzrlib/builtins.py:2290
1642
msgid " Show the differences in working tree xxx for file NEWS::"
1643
msgstr ""
1644
" Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
1645
1646
#: bzrlib/builtins.py:2292
1647
msgid " bzr diff xxx/NEWS"
1648
msgstr " bzr diff xxx/NEWS"
1649
1650
#: bzrlib/builtins.py:2294
1651
msgid " Show the differences from branch xxx to this working tree:"
1652
msgstr ""
1653
" Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
1654
1655
#: bzrlib/builtins.py:2296
1656
msgid " bzr diff --old xxx"
1657
msgstr " bzr diff --old xxx"
1658
1659
#: bzrlib/builtins.py:2298
1660
msgid " Show the differences between two branches for file NEWS::"
1661
msgstr " Muestra las diferencias entre dos ramas para el archivo NEWS:"
1662
1663
#: bzrlib/builtins.py:2300
1664
msgid " bzr diff --old xxx --new yyy NEWS"
1665
msgstr " bzr diff --old xxx --new yyy NEWS"
1666
1667
#: bzrlib/builtins.py:2302
1668
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1669
msgstr ""
1670
" Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
1671
1672
#: bzrlib/builtins.py:2304
1673
msgid ""
1674
" bzr diff --prefix old/:new/\n"
1675
" \n"
1676
" Show the differences using a custom diff program with options::\n"
1677
" \n"
1678
" bzr diff --using /usr/bin/diff --diff-options -wu"
1679
msgstr ""
1680
" bzr diff --prefix old/:new/\n"
1681
" \n"
1682
" Mostrar las diferencias usando un programa de comparación externo con "
1683
"opciones:\n"
1684
" \n"
1685
" bzr diff --using /usr/bin/diff --diff-options -wu"
1686
1687
#: bzrlib/builtins.py:2314
1688
msgid "Pass these options to the external diff program."
1689
msgstr "Pasa esta opciones para el programa diff externo."
1690
1691
#: bzrlib/builtins.py:2317
1692
msgid ""
1693
"Set prefixes added to old and new filenames, as two values separated by a "
1694
"colon. (eg \"old/:new/\")."
1695
msgstr ""
1696
"Establecer los prefijos añadidos a los nombres de archivos antiguo y nuevo "
1697
"como dos valores separados por dos puntos. (ejemplo, «old/:new/»)."
1698
1699
#: bzrlib/builtins.py:2320
1700
msgid "Branch/tree to compare from."
1701
msgstr "Rama/árbol desde donde comparar."
1702
1703
#: bzrlib/builtins.py:2324
1704
msgid "Branch/tree to compare to."
1705
msgstr "Rama/árbol a la que comparar."
1706
1707
#: bzrlib/builtins.py:2330
1708
msgid "Use this command to compare files."
1709
msgstr "Use esta orden para comparar archivos."
1710
1711
#: bzrlib/builtins.py:2335
1712
msgid "Diff format to use."
1713
msgstr "Formato diff a usar."
1714
1715
#: bzrlib/builtins.py:2337
1716
msgid "Diff format"
1717
msgstr "Formato diff"
1718
1719
#: bzrlib/builtins.py:2359
1720
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1721
msgstr ""
1722
"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
1723
1724
#: bzrlib/builtins.py:2363
1725
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1726
msgstr ""
1727
"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
1728
1729
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1730
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1731
msgid "{0} and {1} are mutually exclusive"
1732
msgstr "{0} y {1} se excluyen mutuamente"
1733
1734
#: bzrlib/builtins.py:2388
1735
msgid ""
1736
"List files deleted in the working tree.\n"
1737
" "
1738
msgstr ""
1739
"Lista archivos eliminados en el árbol de trabajo.\n"
1740
" "
1741
1742
#: bzrlib/builtins.py:2465
1743
msgid "Show the tree root directory."
1744
msgstr "Muestra el directorio raíz del árbol."
1745
1746
#: bzrlib/builtins.py:2467
1747
msgid ""
1748
"The root is the nearest enclosing directory with a .bzr control\n"
1749
"directory."
1750
msgstr ""
1751
"El raíz es el directorio envolvente más cercando con un directorio \n"
1752
"de control .bzr."
1753
1754
#: bzrlib/builtins.py:2482
1755
msgid "The limit argument must be an integer."
1756
msgstr "El argumento límite debe ser un entero."
1757
1758
#: bzrlib/builtins.py:2490
1759
msgid "The levels argument must be an integer."
1760
msgstr "Los argumentos de niveles deben ser un entero."
1761
1762
#: bzrlib/builtins.py:2495
1763
msgid "Show historical log for a branch or subset of a branch."
1764
msgstr ""
1765
"Muestra el registro histórico de una rama o un subconjunto de una rama."
1766
1767
#: bzrlib/builtins.py:2497
1768
msgid ""
1769
"log is bzr's default tool for exploring the history of a branch.\n"
1770
"The branch to use is taken from the first parameter. If no parameters\n"
1771
"are given, the branch containing the working directory is logged.\n"
1772
"Here are some simple examples::"
1773
msgstr ""
1774
"El registro es la herramienta predeterminada de bzr para explorar la "
1775
"historia\n"
1776
"de una rama. La rama a usar se toma del primer parámetro. Si no se da "
1777
"ningún\n"
1778
"parámetro, se registra la rama que contiene el directorio de trabajo.\n"
1779
"Aquí hay algunos ejemplos sencillos::"
1780
1781
#: bzrlib/builtins.py:2502
1782
msgid ""
1783
" bzr log log the current branch\n"
1784
" bzr log foo.py log a file in its branch\n"
1785
" bzr log http://server/branch log a branch on a server"
1786
msgstr ""
1787
" bzr log registra la rama actual\n"
1788
" bzr log foo.py registra un archivo en esta rama\n"
1789
" bzr log http://servidor/rama registra una rama en un servidor"
1790
1791
#: bzrlib/builtins.py:2506
1792
msgid ""
1793
"The filtering, ordering and information shown for each revision can\n"
1794
"be controlled as explained below. By default, all revisions are\n"
1795
"shown sorted (topologically) so that newer revisions appear before\n"
1796
"older ones and descendants always appear before ancestors. If displayed,\n"
1797
"merged revisions are shown indented under the revision in which they\n"
1798
"were merged."
1799
msgstr ""
1800
"El filtrado, la ordenación y la información mostrada para cada revisión se "
1801
"puede\n"
1802
"controlar tal y como se explica debajo. Por defecto, se muestran todas las\n"
1803
"revisiones (topológicamente) para que las nuevas revisiones aparezcan antes\n"
1804
"que las más antiguas y las descendientes siempre aparezcan antes que las\n"
1805
"ancestras. Si se muestran, las revisiones fusionadas aparecen sangradas "
1806
"bajo la \n"
1807
"revisión en la cual se fusionaron."
1808
1809
#: bzrlib/builtins.py:2513
1810
msgid ":Output control:"
1811
msgstr ":Control de saliuda:"
1812
1813
#: bzrlib/builtins.py:2515
1814
msgid ""
1815
" The log format controls how information about each revision is\n"
1816
" displayed. The standard log formats are called ``long``, ``short``\n"
1817
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1818
" for more details on log formats."
1819
msgstr ""
1820
1821
#: bzrlib/builtins.py:2520
1822
msgid ""
1823
" The following options can be used to control what information is\n"
1824
" displayed::"
1825
msgstr ""
1826
" Las siguientes opciones se pueden usar para controlar qué información\n"
1827
" se muestra::"
1828
1829
#: bzrlib/builtins.py:2523
1830
msgid ""
1831
" -l N display a maximum of N revisions\n"
1832
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1833
" -v display a status summary (delta) for each revision\n"
1834
" -p display a diff (patch) for each revision\n"
1835
" --show-ids display revision-ids (and file-ids), not just revnos"
1836
msgstr ""
1837
1838
#: bzrlib/builtins.py:2529
1839
msgid ""
1840
" Note that the default number of levels to display is a function of the\n"
1841
" log format. If the -n option is not used, the standard log formats show\n"
1842
" just the top level (mainline)."
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:2533
1846
msgid ""
1847
" Status summaries are shown using status flags like A, M, etc. To see\n"
1848
" the changes explained using words like ``added`` and ``modified``\n"
1849
" instead, use the -vv option."
1850
msgstr ""
1851
1852
#: bzrlib/builtins.py:2537
1853
msgid ":Ordering control:"
1854
msgstr ":Control de ordenación:"
1855
1856
#: bzrlib/builtins.py:2539
1857
msgid ""
1858
" To display revisions from oldest to newest, use the --forward option.\n"
1859
" In most cases, using this option will have little impact on the total\n"
1860
" time taken to produce a log, though --forward does not incrementally\n"
1861
" display revisions like --reverse does when it can."
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:2544
1865
msgid ":Revision filtering:"
1866
msgstr ":Filtrado de revisión:"
1867
1868
#: bzrlib/builtins.py:2546
1869
msgid ""
1870
" The -r option can be used to specify what revision or range of revisions\n"
1871
" to filter against. The various forms are shown below::"
1872
msgstr ""
1873
" La opción -r se puede usar para indicar qué revisión o rango de "
1874
"revisiones\n"
1875
" contra las que filtrar. Las diferentes formas se muestran a continuación:"
1876
1877
#: bzrlib/builtins.py:2549
1878
msgid ""
1879
" -rX display revision X\n"
1880
" -rX.. display revision X and later\n"
1881
" -r..Y display up to and including revision Y\n"
1882
" -rX..Y display from X to Y inclusive"
1883
msgstr ""
1884
" -rX muestra revisión X\n"
1885
" -rX.. muestra revisión X y posterior\n"
1886
" -r..Y muestra hasta la revisión Y inclusive\n"
1887
" -rX..Y muestra desde X a Y inclusive"
1888
1889
#: bzrlib/builtins.py:2554
1890
msgid ""
1891
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1892
" Some common examples are given below::"
1893
msgstr ""
1894
" Vea «bzr help revisionspec» para tener más detalles sobre como especificar "
1895
"X e Y.\n"
1896
" Más abajo se listan algunos ejemplos::"
1897
1898
#: bzrlib/builtins.py:2557
1899
msgid ""
1900
" -r-1 show just the tip\n"
1901
" -r-10.. show the last 10 mainline revisions\n"
1902
" -rsubmit:.. show what's new on this branch\n"
1903
" -rancestor:path.. show changes since the common ancestor of this\n"
1904
" branch and the one at location path\n"
1905
" -rdate:yesterday.. show changes since yesterday"
1906
msgstr ""
1907
1908
#: bzrlib/builtins.py:2564
1909
msgid ""
1910
" When logging a range of revisions using -rX..Y, log starts at\n"
1911
" revision Y and searches back in history through the primary\n"
1912
" (\"left-hand\") parents until it finds X. When logging just the\n"
1913
" top level (using -n1), an error is reported if X is not found\n"
1914
" along the way. If multi-level logging is used (-n0), X may be\n"
1915
" a nested merge revision and the log will be truncated accordingly."
1916
msgstr ""
1917
1918
#: bzrlib/builtins.py:2571
1919
msgid ":Path filtering:"
1920
msgstr ":Filtrado de ruta:"
1921
1922
#: bzrlib/builtins.py:2573
1923
msgid ""
1924
" If parameters are given and the first one is not a branch, the log\n"
1925
" will be filtered to show only those revisions that changed the\n"
1926
" nominated files or directories."
1927
msgstr ""
1928
" Si se dan los parámetros y el primero no es una rama, el registro\n"
1929
" se filtrará para mostrar solo las revisiones que cambiaron los\n"
1930
" archivos o directorios nominados."
1931
1932
#: bzrlib/builtins.py:2577
1933
msgid ""
1934
" Filenames are interpreted within their historical context. To log a\n"
1935
" deleted file, specify a revision range so that the file existed at\n"
1936
" the end or start of the range."
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:2581
1940
msgid ""
1941
" Historical context is also important when interpreting pathnames of\n"
1942
" renamed files/directories. Consider the following example:"
1943
msgstr ""
1944
" El contexto histórico también es importante al interpretar las rutas de\n"
1945
" archivos/directorios renombrados. Considere el siguiente ejemplo:"
1946
1947
#: bzrlib/builtins.py:2584
1948
msgid ""
1949
" * revision 1: add tutorial.txt\n"
1950
" * revision 2: modify tutorial.txt\n"
1951
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1952
msgstr ""
1953
" * revisión 1: añadir tutorial.txt\n"
1954
" * revisión 2: modificar tutorial.txt\n"
1955
" * revisión 3: renombrar tutorial.txt a guide.txt; añadir tutorial.txt"
1956
1957
#: bzrlib/builtins.py:2588
1958
msgid " In this case:"
1959
msgstr " en este caso:"
1960
1961
#: bzrlib/builtins.py:2590
1962
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1963
msgstr ""
1964
" * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
1965
1966
#: bzrlib/builtins.py:2592
1967
msgid ""
1968
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1969
msgstr ""
1970
" * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
1971
"revisión 3"
1972
1973
#: bzrlib/builtins.py:2594
1974
msgid ""
1975
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1976
" the original file in revision 2."
1977
msgstr ""
1978
" * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
1979
" archivo original en la revisión 2."
1980
1981
#: bzrlib/builtins.py:2597
1982
msgid ""
1983
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1984
" was no file called guide.txt in revision 2."
1985
msgstr ""
1986
" * «bzr log -r2 -p guide.txt» mostrará un mensaje de error de que\n"
1987
" no había un archivo llamado guide.txt en la revisión 2."
1988
1989
#: bzrlib/builtins.py:2600
1990
msgid ""
1991
" Renames are always followed by log. By design, there is no need to\n"
1992
" explicitly ask for this (and no way to stop logging a file back\n"
1993
" until it was last renamed)."
1994
msgstr ""
1995
1996
#: bzrlib/builtins.py:2604
1997
msgid ":Other filtering:"
1998
msgstr ":Otro filtrado:"
1999
2000
#: bzrlib/builtins.py:2606
2001
msgid ""
2002
" The --match option can be used for finding revisions that match a\n"
2003
" regular expression in a commit message, committer, author or bug.\n"
2004
" Specifying the option several times will match any of the supplied\n"
2005
" expressions. --match-author, --match-bugs, --match-committer and\n"
2006
" --match-message can be used to only match a specific field."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:2612
2010
msgid ":Tips & tricks:"
2011
msgstr ":Trucos y consejos:"
2012
2013
#: bzrlib/builtins.py:2614
2014
msgid ""
2015
" GUI tools and IDEs are often better at exploring history than command\n"
2016
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
2017
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
2018
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
2019
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
2020
msgstr ""
2021
2022
#: bzrlib/builtins.py:2620
2023
msgid ""
2024
" You may find it useful to add the aliases below to ``bazaar.conf``::"
2025
msgstr ""
2026
" Puede resultarle útil añadir los alias de abajo para «bazaar.conf»::"
2027
2028
#: bzrlib/builtins.py:2622
2029
msgid ""
2030
" [ALIASES]\n"
2031
" tip = log -r-1\n"
2032
" top = log -l10 --line\n"
2033
" show = log -v -p"
2034
msgstr ""
2035
" [ALIAS]\n"
2036
" tip = log -r-1\n"
2037
" top = log -l10 --line\n"
2038
" show = log -v -p"
2039
2040
#: bzrlib/builtins.py:2627
2041
msgid ""
2042
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2043
" will show the last 10 mainline revisions. To see the details of a\n"
2044
" particular revision X, ``bzr show -rX``."
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:2631
2048
msgid ""
2049
" If you are interested in looking deeper into a particular merge X,\n"
2050
" use ``bzr log -n0 -rX``."
2051
msgstr ""
2052
" Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
2053
" use «bzr log -n0 -rX»."
2054
2055
#: bzrlib/builtins.py:2634
2056
msgid ""
2057
" ``bzr log -v`` on a branch with lots of history is currently\n"
2058
" very slow. A fix for this issue is currently under development.\n"
2059
" With or without that fix, it is recommended that a revision range\n"
2060
" be given when using the -v option."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:2639
2064
msgid ""
2065
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2066
" used to find revisions matching user names, commit messages, etc.\n"
2067
" Among other features, this plugin can find all revisions containing\n"
2068
" a list of words but not others."
2069
msgstr ""
2070
2071
#: bzrlib/builtins.py:2644
2072
msgid ""
2073
" When exploring non-mainline history on large projects with deep\n"
2074
" history, the performance of log can be greatly improved by installing\n"
2075
" the historycache plugin. This plugin buffers historical information\n"
2076
" trading disk space for faster speed."
2077
msgstr ""
2078
2079
#: bzrlib/builtins.py:2653
2080
msgid "Show from oldest to newest."
2081
msgstr "Muestra desde el más antiguo al más moderno."
2082
2083
#: bzrlib/builtins.py:2656
2084
msgid "Show files changed in each revision."
2085
msgstr "Muestra los archivos cambiados en cada revisión."
2086
2087
#: bzrlib/builtins.py:2662
2088
msgid "Show just the specified revision. See also \"help revisionspec\"."
2089
msgstr ""
2090
"Muestra solo la revisión especificada. Vea también «help revisionspec»."
2091
2092
#: bzrlib/builtins.py:2666
2093
msgid "What names to list as authors - first, all or committer."
2094
msgstr "Qué nombres listar como autores - primero, todos o ejecutor."
2095
2096
#: bzrlib/builtins.py:2667
2097
msgid "Authors"
2098
msgstr "Autores"
2099
2100
#: bzrlib/builtins.py:2672
2101
msgid "Number of levels to display - 0 for all, 1 for flat."
2102
msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
2103
2104
#: bzrlib/builtins.py:2682
2105
msgid "Limit the output to the first N revisions."
2106
msgstr "Límite de salida para las primeras N revisiones."
2107
2108
#: bzrlib/builtins.py:2687
2109
msgid "Show changes made in each revision as a patch."
2110
msgstr "Mostrar cambios realizados en cada revisión como un parche."
2111
2112
#: bzrlib/builtins.py:2689
2113
msgid "Show merged revisions like --levels 0 does."
2114
msgstr "Muestra las revisiones combinadas como lo hace --levels 0."
2115
2116
#: bzrlib/builtins.py:2693
2117
msgid "Do not report commits with more than one parent."
2118
msgstr "No informar de envíos con más de un padre."
2119
2120
#: bzrlib/builtins.py:2695
2121
msgid ""
2122
"Display only the revisions that are not part of both ancestries (require -"
2123
"rX..Y)."
2124
msgstr ""
2125
"Muestra solo las revisiones que no sean parte de ambas ascendencias "
2126
"(requiere -rX..Y)."
2127
2128
#: bzrlib/builtins.py:2699
2129
msgid "Show digital signature validity."
2130
msgstr "Mostrar la validez de la firma digital"
2131
2132
#: bzrlib/builtins.py:2702
2133
msgid "Show revisions whose properties match this expression."
2134
msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
2135
2136
#: bzrlib/builtins.py:2706
2137
msgid "Show revisions whose message matches this expression."
2138
msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
2139
2140
#: bzrlib/builtins.py:2710
2141
msgid "Show revisions whose committer matches this expression."
2142
msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
2143
2144
#: bzrlib/builtins.py:2714
2145
msgid "Show revisions whose authors match this expression."
2146
msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
2147
2148
#: bzrlib/builtins.py:2718
2149
msgid "Show revisions whose bugs match this expression."
2150
msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
2151
2152
#: bzrlib/builtins.py:2772
2153
msgid "--exclude-common-ancestry requires -r with two revisions"
2154
msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
2155
2156
#: bzrlib/builtins.py:2800
2157
#, python-format
2158
msgid "Path unknown at end or start of revision range: %s"
2159
msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
2160
2161
#: bzrlib/builtins.py:2917
2162
#, python-format
2163
msgid "bzr %s doesn't accept two revisions in different branches."
2164
msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
2165
2166
#: bzrlib/builtins.py:2933
2167
#, python-format
2168
msgid "bzr %s --revision takes one or two values."
2169
msgstr "bzr %s --revision toma uno o dos valores."
2170
2171
#: bzrlib/builtins.py:2978
2172
msgid ""
2173
"List files in a tree.\n"
2174
" "
2175
msgstr ""
2176
"Lista archivos en un árbol\n"
2177
" "
2178
2179
#: bzrlib/builtins.py:2987
2180
msgid "Recurse into subdirectories."
2181
msgstr "Recurrir en subdirectorios."
2182
2183
#: bzrlib/builtins.py:2989
2184
msgid "Print paths relative to the root of the branch."
2185
msgstr "Imprime rutas relativas a la raíz de la rama."
2186
2187
#: bzrlib/builtins.py:2991
2188
msgid "Print unknown files."
2189
msgstr "Imprimir archivos desconocidos."
2190
2191
#: bzrlib/builtins.py:2992
2192
msgid "Print versioned files."
2193
msgstr "Imprimir archivos versionados."
2194
2195
#: bzrlib/builtins.py:2995
2196
msgid "Print ignored files."
2197
msgstr "Imprimir archivos ignorados."
2198
2199
#: bzrlib/builtins.py:2997
2200
msgid "List entries of a particular kind: file, directory, symlink."
2201
msgstr ""
2202
"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
2203
2204
#: bzrlib/builtins.py:3010
2205
msgid "invalid kind specified"
2206
msgstr "tivo inválido especificado"
2207
2208
#: bzrlib/builtins.py:3013
2209
msgid "Cannot set both --verbose and --null"
2210
msgstr "No se pueden establecer ambos --verbose y --null"
2211
2212
#: bzrlib/builtins.py:3022
2213
msgid "cannot specify both --from-root and PATH"
2214
msgstr "No se pueden establecer ambos --from-root y PATH"
2215
2216
#: bzrlib/builtins.py:3109
2217
msgid "Ignore specified files or patterns."
2218
msgstr "Ignorar archivos o patrones especificados."
2219
2220
#: bzrlib/builtins.py:3111
2221
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2222
msgstr ""
2223
"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
2224
2225
#: bzrlib/builtins.py:3113
2226
msgid ""
2227
"If a .bzrignore file does not exist, the ignore command\n"
2228
"will create one and add the specified files or patterns to the newly\n"
2229
"created file. The ignore command will also automatically add the \n"
2230
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2231
"the use of the ignore command will require an explicit add command."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3119
2235
msgid ""
2236
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2237
"After adding, editing or deleting that file either indirectly by\n"
2238
"using this command or directly by using an editor, be sure to commit\n"
2239
"it."
2240
msgstr ""
2241
"Para eliminar los patrones de la lista de ignorados, edite el archivo "
2242
".bzrignore.\n"
2243
"Después de añadir, editar o borrar el archivo o bien indirectamente por\n"
2244
"el uso de esta orden, o directamente mediante un editor, asegúrese de "
2245
"ejecutarlo."
2246
2247
#: bzrlib/builtins.py:3124
2248
msgid ""
2249
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2250
"the global ignore file can be found in the application data directory as\n"
2251
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2252
"Global ignores are not touched by this command. The global ignore file\n"
2253
"can be edited directly using an editor."
2254
msgstr ""
2255
2256
#: bzrlib/builtins.py:3130
2257
msgid ""
2258
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2259
"precedence over regular ignores. Such exceptions are used to specify\n"
2260
"files that should be versioned which would otherwise be ignored."
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3134
2264
msgid ""
2265
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2266
"precedence over the '!' exception patterns."
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3137
2270
msgid ""
2271
":Notes: \n"
2272
" \n"
2273
"* Ignore patterns containing shell wildcards must be quoted from\n"
2274
" the shell on Unix."
2275
msgstr ""
2276
2277
#: bzrlib/builtins.py:3142
2278
msgid ""
2279
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2280
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3145
2284
msgid ""
2285
":Examples:\n"
2286
" Ignore the top level Makefile::"
2287
msgstr ""
2288
":Ejemplos:\n"
2289
" Ignore el Makefile del nivel superior::"
2290
2291
#: bzrlib/builtins.py:3148
2292
msgid " bzr ignore ./Makefile"
2293
msgstr " bzr ignore ./Makefile"
2294
2295
#: bzrlib/builtins.py:3150
2296
msgid " Ignore .class files in all directories...::"
2297
msgstr " Ignorar archivos .class en todos los directorios...::"
2298
2299
#: bzrlib/builtins.py:3152
2300
msgid " bzr ignore \"*.class\""
2301
msgstr " bzr ignore \"*.class\""
2302
2303
#: bzrlib/builtins.py:3154
2304
msgid " ...but do not ignore \"special.class\"::"
2305
msgstr " ...pero no ignora «special.class»::"
2306
2307
#: bzrlib/builtins.py:3156
2308
msgid " bzr ignore \"!special.class\""
2309
msgstr " bzr ignore «!special.class»"
2310
2311
#: bzrlib/builtins.py:3158
2312
msgid " Ignore files whose name begins with the \"#\" character::"
2313
msgstr " Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
2314
2315
#: bzrlib/builtins.py:3160
2316
msgid " bzr ignore \"RE:^#\""
2317
msgstr " bzr ignore \"RE:^#\""
2318
2319
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2320
msgid " Ignore .o files under the lib directory::"
2321
msgstr " Ignorar archivos .o bajo el directorio lib::"
2322
2323
#: bzrlib/builtins.py:3164
2324
msgid " bzr ignore \"lib/**/*.o\""
2325
msgstr " bzr ignore \"lib/**/*.o\""
2326
2327
#: bzrlib/builtins.py:3168
2328
msgid " bzr ignore \"RE:lib/.*\\.o\""
2329
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2330
2331
#: bzrlib/builtins.py:3170
2332
msgid " Ignore everything but the \"debian\" toplevel directory::"
2333
msgstr ""
2334
" Ignorar todo excepto el directorio de nivel superior de «debian»::"
2335
2336
#: bzrlib/builtins.py:3172
2337
msgid ""
2338
" bzr ignore \"RE:(?!debian/).*\"\n"
2339
" \n"
2340
" Ignore everything except the \"local\" toplevel directory,\n"
2341
" but always ignore autosave files ending in ~, even under local/::\n"
2342
" \n"
2343
" bzr ignore \"*\"\n"
2344
" bzr ignore \"!./local\"\n"
2345
" bzr ignore \"!!*~\""
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3186
2349
msgid "Display the default ignore rules that bzr uses."
2350
msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
2351
2352
#: bzrlib/builtins.py:3198
2353
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2354
msgstr "ignore requiere al menos un NAME_PATTERN o --default-rules."
2355
2356
#: bzrlib/builtins.py:3209
2357
#, python-format
2358
msgid "Invalid ignore pattern found. %s"
2359
msgid_plural "Invalid ignore patterns found. %s"
2360
msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
2361
msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
2362
2363
#: bzrlib/builtins.py:3218
2364
msgid "NAME_PATTERN should not be an absolute path"
2365
msgstr "NAME_PATTERN no debe ser una ruta absoluta"
2366
2367
#: bzrlib/builtins.py:3231
2368
#, python-format
2369
msgid ""
2370
"Warning: the following files are version controlled and match your ignore "
2371
"pattern:\n"
2372
"%s\n"
2373
"These files will continue to be version controlled unless you 'bzr remove' "
2374
"them.\n"
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3238
2378
msgid "List ignored files and the patterns that matched them."
2379
msgstr "Lista todos los archivos ignorados y patrones que conciden."
2380
2381
#: bzrlib/builtins.py:3240
2382
msgid ""
2383
"List all the ignored files and the ignore pattern that caused the file to\n"
2384
"be ignored."
2385
msgstr ""
2386
"Listar todos los archivos ignorados y el patrón de ignorar que hicieron que "
2387
"el archivo\n"
2388
"fuese ignorado."
2389
2390
#: bzrlib/builtins.py:3243
2391
msgid "Alternatively, to list just the files::"
2392
msgstr "Alternativamente, lista solo los archivos:"
2393
2394
#: bzrlib/builtins.py:3245
2395
msgid " bzr ls --ignored"
2396
msgstr " bzr ls --ignored"
2397
2398
#: bzrlib/builtins.py:3279
2399
#, python-format
2400
msgid "not a valid revision-number: %r"
2401
msgstr "no es un número de revisión válido: %r"
2402
2403
#: bzrlib/builtins.py:3286
2404
msgid ""
2405
"Export current or past revision to a destination directory or archive."
2406
msgstr ""
2407
"Exporta la revisión actual o pasada a un directorio de destino o un "
2408
"archivador."
2409
2410
#: bzrlib/builtins.py:3288
2411
msgid "If no revision is specified this exports the last committed revision."
2412
msgstr "Si no se especifica la revisión, exporta la última revisión enviada."
2413
2414
#: bzrlib/builtins.py:3290
2415
msgid ""
2416
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2417
"given, try to find the format with the extension. If no extension\n"
2418
"is found exports to a directory (equivalent to --format=dir)."
2419
msgstr ""
2420
2421
#: bzrlib/builtins.py:3294
2422
msgid ""
2423
"If root is supplied, it will be used as the root directory inside\n"
2424
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2425
"to the exported filename. The root option has no effect for 'dir' format."
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3298
2429
msgid ""
2430
"If branch is omitted then the branch containing the current working\n"
2431
"directory will be used."
2432
msgstr ""
2433
"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
2434
"de trabajo actual."
2435
2436
#: bzrlib/builtins.py:3301
2437
msgid ""
2438
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2439
msgstr ""
2440
"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
2441
2442
#: bzrlib/builtins.py:3303
2443
msgid ""
2444
" ================= =========================\n"
2445
" Supported formats Autodetected by extension\n"
2446
" ================= =========================\n"
2447
" dir (none)\n"
2448
" tar .tar\n"
2449
" tbz2 .tar.bz2, .tbz2\n"
2450
" tgz .tar.gz, .tgz\n"
2451
" zip .zip\n"
2452
" ================= ========================="
2453
msgstr ""
2454
" ================= ===================================\n"
2455
" Formatos permitidos Detectados automáticamente por extensión\n"
2456
" ================= ===================================\n"
2457
" dir (ninguno)\n"
2458
" tar .tar\n"
2459
" tbz2 .tar.bz2, .tbz2\n"
2460
" tgz .tar.gz, .tgz\n"
2461
" zip .zip\n"
2462
" ================= ==================================="
2463
2464
#: bzrlib/builtins.py:3317
2465
msgid "Type of file to export to."
2466
msgstr "Tipo de archivo para exportar."
2467
2468
#: bzrlib/builtins.py:3320
2469
msgid "Apply content filters to export the convenient form."
2470
msgstr ""
2471
"Aplicar los filtros de contenido para exportar el formulario conveniente."
2472
2473
#: bzrlib/builtins.py:3324
2474
msgid "Name of the root directory inside the exported file."
2475
msgstr "Nombre del directorio raíz dentro del archivo exportado."
2476
2477
#: bzrlib/builtins.py:3326
2478
msgid ""
2479
"Set modification time of files to that of the last revision in which it was "
2480
"changed."
2481
msgstr ""
2482
"Establecer la fecha de modificación de los archivos a la de la última "
2483
"revisión en la que se cambió."
2484
2485
#: bzrlib/builtins.py:3329
2486
msgid ""
2487
"Export the working tree contents rather than that of the last revision."
2488
msgstr ""
2489
"Exportar el contenido del árbol de trabajo en lugar de la de la última "
2490
"revisión."
2491
2492
#: bzrlib/builtins.py:3348
2493
msgid "--uncommitted requires a working tree"
2494
msgstr "--uncommitted requiere un árbol de trabajo"
2495
2496
#: bzrlib/builtins.py:3357
2497
#, python-format
2498
msgid "Unsupported export format: %s"
2499
msgstr "Formato de exportación no permitido: %s"
2500
2501
#: bzrlib/builtins.py:3361
2502
msgid ""
2503
"Write the contents of a file as of a given revision to standard output."
2504
msgstr ""
2505
"Escribir los contenidos de un archivo como una revisión dada a la salida "
2506
"estándar."
2507
2508
#: bzrlib/builtins.py:3363
2509
msgid "If no revision is nominated, the last revision is used."
2510
msgstr "SI no hay una revisión nominada, se usa la última revisión."
2511
2512
#: bzrlib/builtins.py:3365
2513
msgid ""
2514
"Note: Take care to redirect standard output when using this command on a\n"
2515
"binary file."
2516
msgstr ""
2517
"Nota: asegúrese de redirigir la salida estándar al utilizar esta orden en "
2518
"un\n"
2519
"archivo binario."
2520
2521
#: bzrlib/builtins.py:3371
2522
msgid "The path name in the old tree."
2523
msgstr "La ruta en el árbol antiguo."
2524
2525
#: bzrlib/builtins.py:3372
2526
msgid "Apply content filters to display the convenience form."
2527
msgstr "Aplicar los filtros de contenido para mostrar la forma conveniente."
2528
2529
#: bzrlib/builtins.py:3383
2530
msgid "bzr cat --revision takes exactly one revision specifier"
2531
msgstr "bzr cat --revision toma específicamente un especificador de revisión"
2532
2533
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2534
msgid "{0!r} is not present in revision {1}"
2535
msgstr "{0!r} no está presente en la revisión {1}"
2536
2537
#: bzrlib/builtins.py:3443
2538
msgid "Commit changes into a new revision."
2539
msgstr "Ejecutar cambios en una revisión nueva."
2540
2541
#: bzrlib/builtins.py:3445
2542
msgid ""
2543
"An explanatory message needs to be given for each commit. This is\n"
2544
"often done by using the --message option (getting the message from the\n"
2545
"command line) or by using the --file option (getting the message from\n"
2546
"a file). If neither of these options is given, an editor is opened for\n"
2547
"the user to enter the message. To see the changed files in the\n"
2548
"boilerplate text loaded into the editor, use the --show-diff option."
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:3452
2552
msgid ""
2553
"By default, the entire tree is committed and the person doing the\n"
2554
"commit is assumed to be the author. These defaults can be overridden\n"
2555
"as explained below."
2556
msgstr ""
2557
"Por defecto, el árbol entero está comprometido y la persona que realiza\n"
2558
"la confirmación se da por supuesto que es el autor. Estos valores por "
2559
"defecto pueden ser reemplazados\n"
2560
"tal y como se explica más abajo."
2561
2562
#: bzrlib/builtins.py:3456
2563
msgid ":Selective commits:"
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:3458
2567
msgid ""
2568
" If selected files are specified, only changes to those files are\n"
2569
" committed. If a directory is specified then the directory and\n"
2570
" everything within it is committed."
2571
msgstr ""
2572
2573
#: bzrlib/builtins.py:3462
2574
msgid ""
2575
" When excludes are given, they take precedence over selected files.\n"
2576
" For example, to commit only changes within foo, but not changes\n"
2577
" within foo/bar::"
2578
msgstr ""
2579
2580
#: bzrlib/builtins.py:3466
2581
msgid " bzr commit foo -x foo/bar"
2582
msgstr " bzr commit foo -x foo/bar"
2583
2584
#: bzrlib/builtins.py:3468
2585
msgid " A selective commit after a merge is not yet supported."
2586
msgstr " No está permitida una ejecución selectiva después de una fusión."
2587
2588
#: bzrlib/builtins.py:3470
2589
msgid ":Custom authors:"
2590
msgstr ":Autores personalizados:"
2591
2592
#: bzrlib/builtins.py:3472
2593
msgid ""
2594
" If the author of the change is not the same person as the committer,\n"
2595
" you can specify the author's name using the --author option. The\n"
2596
" name should be in the same format as a committer-id, e.g.\n"
2597
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2598
" the change you can specify the option multiple times, once for each\n"
2599
" author."
2600
msgstr ""
2601
" Si el autor del cambio no es la misma persona que la que hace el envío,\n"
2602
" puede especificar el nombre del autor con la opción --author. El\n"
2603
" nombre debería estar en el mismo formato que un committer-id, p.ej.\n"
2604
" «Juan Pérez <jperez@ejemplo.com>». Si el cambio tiene más de un autor\n"
2605
" puede especificar la opción varias veces, una por cada autor."
2606
2607
#: bzrlib/builtins.py:3479
2608
msgid ":Checks:"
2609
msgstr ":Comprobaciones:"
2610
2611
#: bzrlib/builtins.py:3481
2612
msgid ""
2613
" A common mistake is to forget to add a new file or directory before\n"
2614
" running the commit command. The --strict option checks for unknown\n"
2615
" files and aborts the commit if any are found. More advanced pre-commit\n"
2616
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2617
" for details."
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:3487
2621
msgid ":Things to note:"
2622
msgstr ":Cosas a tener en cuenta:"
2623
2624
#: bzrlib/builtins.py:3489
2625
msgid ""
2626
" If you accidentially commit the wrong changes or make a spelling\n"
2627
" mistake in the commit message say, you can use the uncommit command\n"
2628
" to undo it. See ``bzr help uncommit`` for details."
2629
msgstr ""
2630
2631
#: bzrlib/builtins.py:3493
2632
msgid ""
2633
" Hooks can also be configured to run after a commit. This allows you\n"
2634
" to trigger updates to external systems like bug trackers. The --fixes\n"
2635
" option can be used to record the association between a revision and\n"
2636
" one or more bugs. See ``bzr help bugs`` for details."
2637
msgstr ""
2638
2639
#: bzrlib/builtins.py:3503
2640
msgid "Do not consider changes made to a given path."
2641
msgstr "No considerar los cambios realizados en una ruta dada."
2642
2643
#: bzrlib/builtins.py:3506
2644
msgid "Description of the new revision."
2645
msgstr "Descripción de la revisión nueva."
2646
2647
#: bzrlib/builtins.py:3509
2648
msgid "Commit even if nothing has changed."
2649
msgstr "Enviar incluso si no ha cambiado nada."
2650
2651
#: bzrlib/builtins.py:3513
2652
msgid "Take commit message from this file."
2653
msgstr "Tomar el mensaje de envío desde este archivo."
2654
2655
#: bzrlib/builtins.py:3515
2656
msgid "Refuse to commit if there are unknown files in the working tree."
2657
msgstr ""
2658
"Rechazar el envío si hay archivos desconocidos en el árbol de trabajo."
2659
2660
#: bzrlib/builtins.py:3518
2661
msgid ""
2662
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2663
"08:00:00 +0100'."
2664
msgstr ""
2665
"Establecer manualmente la hora de envío usando un formato de fecha de envío, "
2666
"p.ej. «2009-10-10 08:00:00 +0100»."
2667
2668
#: bzrlib/builtins.py:3521
2669
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2670
msgstr ""
2671
"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
2672
2673
#: bzrlib/builtins.py:3524
2674
msgid "Set the author's name, if it's different from the committer."
2675
msgstr ""
2676
"Establecer el nombre del autor, si este es diferente al del ejecutor."
2677
2678
#: bzrlib/builtins.py:3527
2679
msgid ""
2680
"Perform a local commit in a bound branch. Local commits are not pushed to "
2681
"the master branch until a normal commit is performed."
2682
msgstr ""
2683
"Se realiza un compromiso local en una rama unida. Ese compromiso hace que no "
2684
"sean empujadas a la rama principal hasta que no se realice una confirmación "
2685
"normal."
2686
2687
#: bzrlib/builtins.py:3533
2688
msgid ""
2689
"When no message is supplied, show the diff along with the status summary in "
2690
"the message editor."
2691
msgstr ""
2692
"Cuando no se suministra ningún mensaje, se muestra el diff en conjunto con "
2693
"el resumen estado del editor de mensajes."
2694
2695
#: bzrlib/builtins.py:3536
2696
msgid ""
2697
"When committing to a foreign version control system do not push data that "
2698
"can not be natively represented."
2699
msgstr ""
2700
"Al comprometerse con un sistema de control de versiones extranjeras no "
2701
"enviará datos que no puedan ser representados de forma nativa."
2702
2703
#: bzrlib/builtins.py:3554
2704
#, python-format
2705
msgid ""
2706
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2707
"default bug tracker using the `bugtracker` option.\n"
2708
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:3563
2712
#, python-format
2713
msgid ""
2714
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2715
"for more information on this feature.\n"
2716
"Commit refused."
2717
msgstr ""
2718
"Informe de error no válido %s. Debe estar en el formato «rastreador:id». "
2719
"Consulte «bzr help bugs» para más información sobre esta función.\n"
2720
"Envío rechazado."
2721
2722
#: bzrlib/builtins.py:3572
2723
#, python-format
2724
msgid "Unrecognized bug %s. Commit refused."
2725
msgstr "Informe de error no reconocido %s. Envío rechazado."
2726
2727
#: bzrlib/builtins.py:3575
2728
#, python-format
2729
msgid ""
2730
"%s\n"
2731
"Commit refused."
2732
msgstr ""
2733
"%s\n"
2734
"Envío rechazado."
2735
2736
#: bzrlib/builtins.py:3599
2737
msgid "Could not parse --commit-time: "
2738
msgstr "No se puede analizar --commit-time: "
2739
2740
#: bzrlib/builtins.py:3639
2741
msgid "please specify either --message or --file"
2742
msgstr "especifique uno --message o --file"
2743
2744
#: bzrlib/builtins.py:3668
2745
msgid "please specify a commit message with either --message or --file"
2746
msgstr "especifique un mensaje de ejecución con --message o --file"
2747
2748
#: bzrlib/builtins.py:3671
2749
msgid ""
2750
"Empty commit message specified. Please specify a commit message with either -"
2751
"-message or --file or leave a blank message with --message \"\"."
2752
msgstr ""
2753
"El mensaje de envío está vacío. Especifique un mensaje de envío con --"
2754
"message o --file o déjelo en blanco con --message \"\"."
2755
2756
#: bzrlib/builtins.py:3691
2757
msgid ""
2758
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2759
"-unchanged to force an empty commit."
2760
msgstr ""
2761
"No hay cambios que enviar. Use «bzr add» con los archivos que quiera enviar "
2762
"o use --unchanged para forzar un envío vacío."
2763
2764
#: bzrlib/builtins.py:3695
2765
msgid ""
2766
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2767
"resolve FILE\" to resolve."
2768
msgstr ""
2769
"Conflictos detectados en el árbol de trabajo. Use «bzr conflicts» para "
2770
"listar, «bzr resolve ARCHIVO»\" para resolver."
2771
2772
#: bzrlib/builtins.py:3699
2773
msgid "Commit refused because there are unknown files in the working tree."
2774
msgstr ""
2775
"Se rechazó el envío porque hay archivos desconocidos en el árbol de trabajo."
2776
2777
#: bzrlib/builtins.py:3702
2778
msgid ""
2779
"\n"
2780
"To commit to master branch, run update and then commit.\n"
2781
"You can also pass --local to commit to continue working disconnected."
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:3710
2785
msgid ""
2786
"Validate working tree structure, branch consistency and repository history."
2787
msgstr ""
2788
"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
2789
"historial del repositorio."
2790
2791
#: bzrlib/builtins.py:3712
2792
msgid ""
2793
"This command checks various invariants about branch and repository storage\n"
2794
"to detect data corruption or bzr bugs."
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:3715
2798
msgid ""
2799
"The working tree and branch checks will only give output if a problem is\n"
2800
"detected. The output fields of the repository check are:"
2801
msgstr ""
2802
"El árbol de trabajo y los controles de rama sólo darán resultado si se "
2803
"detecta\n"
2804
"un problema. El resultado de los campos de verificación del repositorio son "
2805
"los siguientes:"
2806
2807
#: bzrlib/builtins.py:3718
2808
msgid ""
2809
"revisions\n"
2810
" This is just the number of revisions checked. It doesn't\n"
2811
" indicate a problem."
2812
msgstr ""
2813
"revisions\n"
2814
" Esto es solo el número de revisiones comprobadas, No\n"
2815
" indica un problema."
2816
2817
#: bzrlib/builtins.py:3722
2818
msgid ""
2819
"versionedfiles\n"
2820
" This is just the number of versionedfiles checked. It\n"
2821
" doesn't indicate a problem."
2822
msgstr ""
2823
"versionedfiles\n"
2824
" Esto es solo el número de archivos versionados comprobados.. No\n"
2825
" indica un problema."
2826
2827
#: bzrlib/builtins.py:3726
2828
msgid ""
2829
"unreferenced ancestors\n"
2830
" Texts that are ancestors of other texts, but\n"
2831
" are not properly referenced by the revision ancestry. This is a\n"
2832
" subtle problem that Bazaar can work around."
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:3731
2836
msgid ""
2837
"unique file texts\n"
2838
" This is the total number of unique file contents\n"
2839
" seen in the checked revisions. It does not indicate a problem."
2840
msgstr ""
2841
2842
#: bzrlib/builtins.py:3735
2843
msgid ""
2844
"repeated file texts\n"
2845
" This is the total number of repeated texts seen\n"
2846
" in the checked revisions. Texts can be repeated when their file\n"
2847
" entries are modified, but the file contents are not. It does not\n"
2848
" indicate a problem."
2849
msgstr ""
2850
2851
#: bzrlib/builtins.py:3741
2852
msgid ""
2853
"If no restrictions are specified, all Bazaar data that is found at the "
2854
"given\n"
2855
"location will be checked."
2856
msgstr ""
2857
"Si no se aplican las restricciones especificadas, se verificarán todos los "
2858
"datos\n"
2859
" Bazaar que están en la localización."
2860
2861
#: bzrlib/builtins.py:3746
2862
msgid " Check the tree and branch at 'foo'::"
2863
msgstr " Comprueba el árbol y la rama en «foo»::"
2864
2865
#: bzrlib/builtins.py:3748
2866
msgid " bzr check --tree --branch foo"
2867
msgstr " bzr check --tree --branch foo"
2868
2869
#: bzrlib/builtins.py:3750
2870
msgid " Check only the repository at 'bar'::"
2871
msgstr " Comprueba solo el repositorio en «bar»::"
2872
2873
#: bzrlib/builtins.py:3752
2874
msgid " bzr check --repo bar"
2875
msgstr " bzr check --repo bar"
2876
2877
#: bzrlib/builtins.py:3754
2878
msgid " Check everything at 'baz'::"
2879
msgstr " Comprueba todo en «baz»::"
2880
2881
#: bzrlib/builtins.py:3756
2882
msgid " bzr check baz"
2883
msgstr " bzr check baz"
2884
2885
#: bzrlib/builtins.py:3762
2886
msgid "Check the branch related to the current directory."
2887
msgstr "Comprueba la rama relacionada con el directorio actual."
2888
2889
#: bzrlib/builtins.py:3764
2890
msgid "Check the repository related to the current directory."
2891
msgstr "Comprueba el repositorio relacionado con el directorio actual."
2892
2893
#: bzrlib/builtins.py:3766
2894
msgid "Check the working tree related to the current directory."
2895
msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
2896
2897
#: bzrlib/builtins.py:3780
2898
msgid "Upgrade a repository, branch or working tree to a newer format."
2899
msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
2900
2901
#: bzrlib/builtins.py:3782
2902
msgid ""
2903
"When the default format has changed after a major new release of\n"
2904
"Bazaar, you may be informed during certain operations that you\n"
2905
"should upgrade. Upgrading to a newer format may improve performance\n"
2906
"or make new features available. It may however limit interoperability\n"
2907
"with older repositories or with older versions of Bazaar."
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:3788
2911
msgid ""
2912
"If you wish to upgrade to a particular format rather than the\n"
2913
"current default, that can be specified using the --format option.\n"
2914
"As a consequence, you can use the upgrade command this way to\n"
2915
"\"downgrade\" to an earlier format, though some conversions are\n"
2916
"a one way process (e.g. changing from the 1.x default to the\n"
2917
"2.x default) so downgrading is not always possible."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:3795
2921
msgid ""
2922
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2923
"process (where # is a number). By default, this is left there on\n"
2924
"completion. If the conversion fails, delete the new .bzr directory\n"
2925
"and rename this one back in its place. Use the --clean option to ask\n"
2926
"for the backup.bzr directory to be removed on successful conversion.\n"
2927
"Alternatively, you can delete it by hand if everything looks good\n"
2928
"afterwards."
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:3803
2932
msgid ""
2933
"If the location given is a shared repository, dependent branches\n"
2934
"are also converted provided the repository converts successfully.\n"
2935
"If the conversion of a branch fails, remaining branches are still\n"
2936
"tried."
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:3808
2940
msgid ""
2941
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2942
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2943
msgstr ""
2944
"Para tener más información sobre actualizaciones, vea la Guía de "
2945
"actualización de Bazaar,\n"
2946
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2947
2948
#: bzrlib/builtins.py:3816
2949
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2950
msgstr ""
2951
"Actualizar a un formato específico. Vea «bzr help formats» para tener más "
2952
"detalles."
2953
2954
#: bzrlib/builtins.py:3820
2955
msgid "Branch format"
2956
msgstr "Formato de la rama"
2957
2958
#: bzrlib/builtins.py:3822
2959
msgid "Remove the backup.bzr directory if successful."
2960
msgstr "Elimina el directorio backup.bzr si tiene éxito."
2961
2962
#: bzrlib/builtins.py:3824
2963
msgid "Show what would be done, but don't actually do anything."
2964
msgstr "Muestra lo que se haría, pero no hace nada en realidad."
2965
2966
#: bzrlib/builtins.py:3839
2967
msgid "Show or set bzr user id."
2968
msgstr "Muestra o establece la id de usuario bzr."
2969
2970
#: bzrlib/builtins.py:3841
2971
msgid ""
2972
":Examples:\n"
2973
" Show the email of the current user::"
2974
msgstr ""
2975
":Ejemplos:\n"
2976
" Muestra el correo del usuario actual::"
2977
2978
#: bzrlib/builtins.py:3844
2979
msgid " bzr whoami --email"
2980
msgstr " bzr whoami --email"
2981
2982
#: bzrlib/builtins.py:3846
2983
msgid " Set the current user::"
2984
msgstr " Establece el usuario actual::"
2985
2986
#: bzrlib/builtins.py:3848
2987
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2988
msgstr " bzr whoami «Frank Chu <fchu@example.com>»"
2989
2990
#: bzrlib/builtins.py:3852
2991
msgid "Display email address only."
2992
msgstr "Muestra solo la dirección de correo."
2993
2994
#: bzrlib/builtins.py:3854
2995
msgid "Set identity for the current branch instead of globally."
2996
msgstr "Establece la identidad de la rama actual en lugar de globalmente."
2997
2998
#: bzrlib/builtins.py:3880
2999
msgid "--email can only be used to display existing identity"
3000
msgstr "--email solo se puede usar para mostrar la identidad del directorio"
3001
3002
#: bzrlib/builtins.py:3904
3003
msgid "Print or set the branch nickname."
3004
msgstr "Muestra o establece el apodo de la rama."
3005
3006
#: bzrlib/builtins.py:3906
3007
msgid ""
3008
"If unset, the colocated branch name is used for colocated branches, and\n"
3009
"the branch directory name is used for other branches. To print the\n"
3010
"current nickname, execute with no argument."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:3910
3014
msgid ""
3015
"Bound branches use the nickname of its master branch unless it is set\n"
3016
"locally."
3017
msgstr ""
3018
"Las ramas enlazadas usarán el apodo de su rama principal a menos que se "
3019
"ajuste\n"
3020
"localmente."
3021
3022
#: bzrlib/builtins.py:3930
3023
msgid "Set/unset and display aliases."
3024
msgstr "Establece/desestablece y muestra alias."
3025
3026
#: bzrlib/builtins.py:3932
3027
msgid ""
3028
":Examples:\n"
3029
" Show the current aliases::"
3030
msgstr ""
3031
":Ejemplos:\n"
3032
" Muestra los alias actuales::"
3033
3034
#: bzrlib/builtins.py:3935
3035
msgid " bzr alias"
3036
msgstr " bzr alias"
3037
3038
#: bzrlib/builtins.py:3937
3039
msgid " Show the alias specified for 'll'::"
3040
msgstr " Muestra los alias especificados por «ll»::"
3041
3042
#: bzrlib/builtins.py:3939
3043
msgid " bzr alias ll"
3044
msgstr " bzr alias ll"
3045
3046
#: bzrlib/builtins.py:3941
3047
msgid " Set an alias for 'll'::"
3048
msgstr " Establece un alias para «ll»::"
3049
3050
#: bzrlib/builtins.py:3943
3051
msgid " bzr alias ll=\"log --line -r-10..-1\""
3052
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3053
3054
#: bzrlib/builtins.py:3945
3055
msgid " To remove an alias for 'll'::"
3056
msgstr " Para eliminar un alias de «ll»::"
3057
3058
#: bzrlib/builtins.py:3947
3059
msgid " bzr alias --remove ll"
3060
msgstr " bzr alias --remove ll"
3061
3062
#: bzrlib/builtins.py:3952
3063
msgid "Remove the alias."
3064
msgstr "Elimina los alias."
3065
3066
#: bzrlib/builtins.py:3970
3067
msgid "bzr alias --remove expects an alias to remove."
3068
msgstr "bzr alias --remove está esperando un alias para ser eliminado."
3069
3070
#: bzrlib/builtins.py:4151
3071
msgid ""
3072
"subunit not available. subunit needs to be installed to use --subunit."
3073
msgstr ""
3074
"subunit ni disponible. Necesita instalar subunit para usar --subunit."
3075
3076
#: bzrlib/builtins.py:4168
3077
msgid ""
3078
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3079
msgstr ""
3080
"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
3081
3082
#: bzrlib/builtins.py:4215
3083
msgid "Show version of bzr."
3084
msgstr "Muestra la versión de bzr."
3085
3086
#: bzrlib/builtins.py:4219
3087
msgid "Print just the version number."
3088
msgstr "Solamente imprime el número de versión."
3089
3090
#: bzrlib/builtins.py:4238
3091
msgid "It sure does!\n"
3092
msgstr "¡Seguro que si!\n"
3093
3094
#: bzrlib/builtins.py:4262
3095
#, python-format
3096
msgid "merge base is revision %s\n"
3097
msgstr "la base de combinación es la revisión %s\n"
3098
3099
#: bzrlib/builtins.py:4266
3100
msgid "Perform a three-way merge."
3101
msgstr "Realiza una fusión de tres vías."
3102
3103
#: bzrlib/builtins.py:4268
3104
msgid ""
3105
"The source of the merge can be specified either in the form of a branch,\n"
3106
"or in the form of a path to a file containing a merge directive generated\n"
3107
"with bzr send. If neither is specified, the default is the upstream branch\n"
3108
"or the branch most recently merged using --remember. The source of the\n"
3109
"merge may also be specified in the form of a path to a file in another\n"
3110
"branch: in this case, only the modifications to that file are merged into\n"
3111
"the current working tree."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:4276
3115
msgid ""
3116
"When merging from a branch, by default bzr will try to merge in all new\n"
3117
"work from the other branch, automatically determining an appropriate base\n"
3118
"revision. If this fails, you may need to give an explicit base."
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:4280
3122
msgid ""
3123
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3124
"try to merge in all new work up to and including revision OTHER."
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:4283
3128
msgid ""
3129
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3130
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3131
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3132
"not already contain revision BASE, such a merge is commonly referred to as\n"
3133
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3134
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3135
"changes from the other branch is not stored in the commit."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:4291
3139
msgid "Revision numbers are always relative to the source branch."
3140
msgstr ""
3141
"Los números de revisión están siempre relacionados con la rama origen."
3142
3143
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3144
msgid ""
3145
"Merge will do its best to combine the changes in two branches, but there\n"
3146
"are some kinds of problems only a human can fix. When it encounters those,\n"
3147
"it will mark a conflict. A conflict means that you need to fix something,\n"
3148
"before you can commit."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:4298
3152
msgid ""
3153
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3154
msgstr ""
3155
"Use bzr resolve cuando tenga un problema arreglado. Vea también bzr "
3156
"conflicts."
3157
3158
#: bzrlib/builtins.py:4300
3159
msgid ""
3160
"If there is no default branch set, the first merge will set it (use\n"
3161
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3162
"to use the default. To change the default, use --remember. The value will\n"
3163
"only be saved if the remote location can be accessed."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:4305
3167
msgid ""
3168
"The results of the merge are placed into the destination working\n"
3169
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3170
"committed to record the result of the merge."
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:4309
3174
msgid ""
3175
"merge refuses to run if there are any uncommitted changes, unless\n"
3176
"--force is given. If --force is given, then the changes from the source \n"
3177
"will be merged with the current working tree, including any uncommitted\n"
3178
"changes in the tree. The --force option can also be used to create a\n"
3179
"merge revision which has more than two parents."
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:4315
3183
msgid ""
3184
"If one would like to merge changes from the working tree of the other\n"
3185
"branch without merging any committed revisions, the --uncommitted option\n"
3186
"can be given."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:4319
3190
msgid ""
3191
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3192
"you to apply each diff hunk and file change, similar to \"shelve\"."
3193
msgstr ""
3194
3195
#: bzrlib/builtins.py:4322
3196
msgid ""
3197
":Examples:\n"
3198
" To merge all new revisions from bzr.dev::"
3199
msgstr ""
3200
":Ejemplos:\n"
3201
" Para fusionar todas las revisiones nuevas de bzr.dev::"
3202
3203
#: bzrlib/builtins.py:4325
3204
msgid " bzr merge ../bzr.dev"
3205
msgstr " bzr merge ../bzr.dev"
3206
3207
#: bzrlib/builtins.py:4327
3208
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3209
msgstr " Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
3210
3211
#: bzrlib/builtins.py:4329
3212
msgid " bzr merge -r 82 ../bzr.dev"
3213
msgstr " bzr merge -r 82 ../bzr.dev"
3214
3215
#: bzrlib/builtins.py:4331
3216
msgid " To merge the changes introduced by 82, without previous changes::"
3217
msgstr ""
3218
" Para fusionar los cambios introducidos por 82, sin cambios previos::"
3219
3220
#: bzrlib/builtins.py:4333
3221
msgid " bzr merge -r 81..82 ../bzr.dev"
3222
msgstr " bzr merge -r 81..82 ../bzr.dev"
3223
3224
#: bzrlib/builtins.py:4335
3225
msgid " To apply a merge directive contained in /tmp/merge::"
3226
msgstr " Para aplicar una directiva de fusión contenida en /tmp/merge::"
3227
3228
#: bzrlib/builtins.py:4337
3229
msgid " bzr merge /tmp/merge"
3230
msgstr " bzr merge /tmp/merge"
3231
3232
#: bzrlib/builtins.py:4339
3233
msgid ""
3234
" To create a merge revision with three parents from two branches\n"
3235
" feature1a and feature1b:"
3236
msgstr ""
3237
3238
#: bzrlib/builtins.py:4342
3239
msgid ""
3240
" bzr merge ../feature1a\n"
3241
" bzr merge ../feature1b --force\n"
3242
" bzr commit -m 'revision with three parents'"
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:4354
3246
msgid "Merge even if the destination tree has uncommitted changes."
3247
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin enviar."
3248
3249
#: bzrlib/builtins.py:4360
3250
msgid ""
3251
"Apply uncommitted changes from a working copy, instead of branch changes."
3252
msgstr ""
3253
"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
3254
"de rama."
3255
3256
#: bzrlib/builtins.py:4362
3257
msgid ""
3258
"If the destination is already completely merged into the source, pull from "
3259
"the source rather than merging. When this happens, you do not need to "
3260
"commit the result."
3261
msgstr ""
3262
"Si el destino ya está totalmente combinado con la fuente, use la fuente en "
3263
"vez de la combinación. Cuando esto ocurra, no debe comprometerse con el "
3264
"resultado."
3265
3266
#: bzrlib/builtins.py:4367
3267
msgid ""
3268
"Branch to merge into, rather than the one containing the working directory."
3269
msgstr ""
3270
"Branch desea combinarse, en lugar de aquel contenido en el directorio de "
3271
"trabajo."
3272
3273
#: bzrlib/builtins.py:4369
3274
msgid "Instead of merging, show a diff of the merge."
3275
msgstr "En lugar de la combinación, se muestra un resumen de la combinación."
3276
3277
#: bzrlib/builtins.py:4371
3278
msgid "Select changes interactively."
3279
msgstr "Seleccionar cambios de manera interactiva."
3280
3281
#: bzrlib/builtins.py:4393
3282
msgid ""
3283
"Merging into empty branches not currently supported, "
3284
"https://bugs.launchpad.net/bzr/+bug/308562"
3285
msgstr ""
3286
"La combinación en ramas vacías no se soporta actualmente, "
3287
"https://bugs.launchpad.net/bzr/+bug/308562"
3288
3289
#: bzrlib/builtins.py:4420
3290
msgid "Cannot use --uncommitted with bundles or merge directives."
3291
msgstr ""
3292
"No puede usarse --uncommited con los paquetes o cdirectivas combinadas."
3293
3294
#: bzrlib/builtins.py:4431
3295
msgid "Cannot use --uncommitted and --revision at the same time."
3296
msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
3297
3298
#: bzrlib/builtins.py:4451
3299
msgid "merger: "
3300
msgstr "fusión: "
3301
3302
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3303
msgid "Nothing to do."
3304
msgstr "Nada que hacer."
3305
3306
#: bzrlib/builtins.py:4457
3307
msgid "Cannot pull individual files"
3308
msgstr "No se puede tirar de archivos individuales"
3309
3310
#: bzrlib/builtins.py:4465
3311
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3312
msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
3313
3314
#: bzrlib/builtins.py:4523
3315
#, python-format
3316
msgid "Show-base is not supported for this merge type. %s"
3317
msgstr "Show-base no está permitido en este tipo de fusión. %s"
3318
3319
#: bzrlib/builtins.py:4532
3320
#, python-format
3321
msgid "Conflict reduction is not supported for merge type %s."
3322
msgstr ""
3323
"La reducción de conflicot no está permitida para el tipo de fusión %s."
3324
3325
#: bzrlib/builtins.py:4536
3326
msgid "Cannot do conflict reduction and show base."
3327
msgstr "No se pueden realizar la reducción de conflictos y mostrar la base."
3328
3329
#: bzrlib/builtins.py:4647
3330
msgid "No location specified or remembered"
3331
msgstr "No hay ubicación especificada o recordada"
3332
3333
#: bzrlib/builtins.py:4649
3334
msgid "{0} remembered {1} location {2}"
3335
msgstr "{0} recordados {1} ubicación {2}"
3336
3337
#: bzrlib/builtins.py:4655
3338
msgid "Redo a merge."
3339
msgstr "Rehacer una fusión."
3340
3341
#: bzrlib/builtins.py:4657
3342
msgid ""
3343
"Use this if you want to try a different merge technique while resolving\n"
3344
"conflicts. Some merge techniques are better than others, and remerge\n"
3345
"lets you try different ones on different files."
3346
msgstr ""
3347
"Utilice esto si lo que se pretende es probar un técnica de combinación "
3348
"diferente para resolver\n"
3349
"conflictos. Algunas técnicas de combinación son mejores que otras y "
3350
"reinstalar\n"
3351
"le permite probar distintas cosas en diferentes archivos."
3352
3353
#: bzrlib/builtins.py:4661
3354
msgid ""
3355
"The options for remerge have the same meaning and defaults as the ones for\n"
3356
"merge. The difference is that remerge can (only) be run when there is a\n"
3357
"pending merge, and it lets you specify particular files."
3358
msgstr ""
3359
"Las opciones para la reinstalación tienen el mismo significado que los "
3360
"valores predeterminados.\n"
3361
"La única diferencia que existe es que la reinstalación (solo) se ejecuta "
3362
"cuando hay\n"
3363
"pendiente una combinación, y se permite la especificación de los archivos "
3364
"particulares."
3365
3366
#: bzrlib/builtins.py:4665
3367
msgid ""
3368
":Examples:\n"
3369
" Re-do the merge of all conflicted files, and show the base text in\n"
3370
" conflict regions, in addition to the usual THIS and OTHER texts::"
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:4669
3374
msgid " bzr remerge --show-base"
3375
msgstr " bzr remerge --show-base"
3376
3377
#: bzrlib/builtins.py:4671
3378
msgid ""
3379
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3380
" additional processing to reduce the size of conflict regions::"
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:4674
3384
msgid " bzr remerge --merge-type weave --reprocess foobar"
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:4681
3388
msgid "Show base revision text in conflicts."
3389
msgstr "Mostrar el texto de revisión base en los conflictos."
3390
3391
#: bzrlib/builtins.py:4693
3392
msgid ""
3393
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3394
"merges."
3395
msgstr ""
3396
"Lo sentimos, la reinstalación solo funciona después de fusiones normales. No "
3397
"hay repesca ni combinaciones múltiples."
3398
3399
#: bzrlib/builtins.py:4751
3400
msgid ""
3401
"Set files in the working tree back to the contents of a previous revision."
3402
msgstr ""
3403
"Establece los archivos de nuevo en el árbol de trabajo con el contenido de "
3404
"una revisión anterior."
3405
3406
#: bzrlib/builtins.py:4753
3407
msgid ""
3408
"Giving a list of files will revert only those files. Otherwise, all files\n"
3409
"will be reverted. If the revision is not specified with '--revision', the\n"
3410
"working tree basis revision is used. A revert operation affects only the\n"
3411
"working tree, not any revision history like the branch and repository or\n"
3412
"the working tree basis revision."
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:4759
3416
msgid ""
3417
"To remove only some changes, without reverting to a prior version, use\n"
3418
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3419
"will remove the changes introduced by the second last commit (-2), without\n"
3420
"affecting the changes introduced by the last commit (-1). To remove\n"
3421
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3422
"To update the branch to a specific revision or the latest revision and\n"
3423
"update the working tree accordingly while preserving local changes, see the\n"
3424
"update command."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:4768
3428
msgid ""
3429
"Uncommitted changes to files that are reverted will be discarded.\n"
3430
"Howver, by default, any files that have been manually changed will be\n"
3431
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3432
"files have '.~#~' appended to their name, where # is a number."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:4773
3436
msgid ""
3437
"When you provide files, you can use their current pathname or the pathname\n"
3438
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3439
"name. If you name a directory, all the contents of that directory will be\n"
3440
"reverted."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:4778
3444
msgid ""
3445
"If you have newly added files since the target revision, they will be\n"
3446
"removed. If the files to be removed have been changed, backups will be\n"
3447
"created as above. Directories containing unknown files will not be\n"
3448
"deleted."
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:4783
3452
msgid ""
3453
"The working tree contains a list of revisions that have been merged but\n"
3454
"not yet committed. These revisions will be included as additional parents\n"
3455
"of the next commit. Normally, using revert clears that list as well as\n"
3456
"reverting the files. If any files are specified, revert leaves the list\n"
3457
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3458
".`` in the tree root to revert all files but keep the recorded merges,\n"
3459
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3460
"reverting any files."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:4792
3464
msgid ""
3465
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3466
"changes from a branch in a single revision. To do this, perform the merge\n"
3467
"as desired. Then doing revert with the \"--forget-merges\" option will "
3468
"keep\n"
3469
"the content of the tree as it was, but it will clear the list of pending\n"
3470
"merges. The next commit will then contain all of the changes that are\n"
3471
"present in the other branch, but without any other parent revisions.\n"
3472
"Because this technique forgets where these changes originated, it may\n"
3473
"cause additional conflicts on later merges involving the same source and\n"
3474
"target branches."
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:4806
3478
msgid "Do not save backups of reverted files."
3479
msgstr "No guardar respaldos de los archivos revertidos"
3480
3481
#: bzrlib/builtins.py:4808
3482
msgid "Remove pending merge marker, without changing any files."
3483
msgstr ""
3484
"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
3485
3486
#: bzrlib/builtins.py:4839
3487
msgid ""
3488
"Show help on a command or other topic.\n"
3489
" "
3490
msgstr ""
3491
"Muestra ayuda en una orden u otro tema.\n"
3492
" "
3493
3494
#: bzrlib/builtins.py:4844
3495
msgid "Show help on all commands."
3496
msgstr "Muestra ayuda en todas las órdenes"
3497
3498
#: bzrlib/builtins.py:4873
3499
msgid "Show unmerged/unpulled revisions between two branches."
3500
msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
3501
3502
#: bzrlib/builtins.py:4875
3503
msgid "OTHER_BRANCH may be local or remote."
3504
msgstr "OTHER_BRANCH puede ser local o remoto."
3505
3506
#: bzrlib/builtins.py:4877
3507
msgid ""
3508
"To filter on a range of revisions, you can use the command -r begin..end\n"
3509
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3510
"also valid.\n"
3511
" \n"
3512
":Exit values:\n"
3513
" 1 - some missing revisions\n"
3514
" 0 - no missing revisions"
3515
msgstr ""
3516
3517
#: bzrlib/builtins.py:4887
3518
msgid ""
3519
" Determine the missing revisions between this and the branch at the\n"
3520
" remembered pull location::"
3521
msgstr ""
3522
3523
#: bzrlib/builtins.py:4890
3524
msgid " bzr missing"
3525
msgstr " bzr missing"
3526
3527
#: bzrlib/builtins.py:4892
3528
msgid " Determine the missing revisions between this and another branch::"
3529
msgstr " Determina las revisiones perdidas entre esta y otra rama::"
3530
3531
#: bzrlib/builtins.py:4894
3532
msgid " bzr missing http://server/branch"
3533
msgstr " bzr missing http://server/branch"
3534
3535
#: bzrlib/builtins.py:4896
3536
msgid ""
3537
" Determine the missing revisions up to a specific revision on the other\n"
3538
" branch::"
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:4899
3542
msgid " bzr missing -r ..-10"
3543
msgstr " bzr missing -r ..-10"
3544
3545
#: bzrlib/builtins.py:4901
3546
msgid ""
3547
" Determine the missing revisions up to a specific revision on this\n"
3548
" branch::"
3549
msgstr ""
3550
3551
#: bzrlib/builtins.py:4904
3552
msgid " bzr missing --my-revision ..-10"
3553
msgstr " bzr missing --my-revision ..-10"
3554
3555
#: bzrlib/builtins.py:4911
3556
msgid "Reverse the order of revisions."
3557
msgstr "Revierte el orden de las revisiones."
3558
3559
#: bzrlib/builtins.py:4913
3560
msgid "Display changes in the local branch only."
3561
msgstr "Muestra cambios solo en la rama local."
3562
3563
#: bzrlib/builtins.py:4914
3564
msgid "Same as --mine-only."
3565
msgstr "Lo mismo que --mine-only."
3566
3567
#: bzrlib/builtins.py:4916
3568
msgid "Display changes in the remote branch only."
3569
msgstr "Muestra cambios solo en la rama remota."
3570
3571
#: bzrlib/builtins.py:4917
3572
msgid "Same as --theirs-only."
3573
msgstr "Lo mismo que --theirs-only."
3574
3575
#: bzrlib/builtins.py:4922
3576
msgid ""
3577
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3578
"details."
3579
msgstr ""
3580
"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
3581
"tener más detalles."
3582
3583
#: bzrlib/builtins.py:4926
3584
msgid ""
3585
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3586
"details."
3587
msgstr ""
3588
"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
3589
"para tener más detalles."
3590
3591
#: bzrlib/builtins.py:4929
3592
msgid "Show all revisions in addition to the mainline ones."
3593
msgstr "Mostrar todas las revisiones además de las líneas principales."
3594
3595
#: bzrlib/builtins.py:4983
3596
msgid "No peer location known or specified."
3597
msgstr "No hay ubicación del par conocida o especificada."
3598
3599
#: bzrlib/builtins.py:4987
3600
msgid "Using saved parent location: {0}\n"
3601
msgstr "Usar ubicación padre guardada: {0}\n"
3602
3603
#: bzrlib/builtins.py:5020
3604
#, python-format
3605
msgid "You have %d extra revision:\n"
3606
msgid_plural "You have %d extra revisions:\n"
3607
msgstr[0] "Tiene %d revisión extra:\n"
3608
msgstr[1] "Tiene %d revisiones extra:\n"
3609
3610
#: bzrlib/builtins.py:5040
3611
#, python-format
3612
msgid "You are missing %d revision:\n"
3613
msgid_plural "You are missing %d revisions:\n"
3614
msgstr[0] "Tiene %d revisión perdida:\n"
3615
msgstr[1] "Tiene %d revisiones perdidas:\n"
3616
3617
#: bzrlib/builtins.py:5055
3618
msgid "This branch has no new revisions.\n"
3619
msgstr "Esta rama no tiene revisiones.\n"
3620
3621
#: bzrlib/builtins.py:5058
3622
msgid "Other branch has no new revisions.\n"
3623
msgstr "Otra rama no tiene revisiones nuevas.\n"
3624
3625
#: bzrlib/builtins.py:5063
3626
msgid "Branches are up to date.\n"
3627
msgstr "La rama está actualizada:\n"
3628
3629
#: bzrlib/builtins.py:5074
3630
msgid "Compress the data within a repository."
3631
msgstr "Comprime los datos en un repositorio."
3632
3633
#: bzrlib/builtins.py:5076
3634
msgid ""
3635
"This operation compresses the data within a bazaar repository. As\n"
3636
"bazaar supports automatic packing of repository, this operation is\n"
3637
"normally not required to be done manually."
3638
msgstr ""
3639
3640
#: bzrlib/builtins.py:5080
3641
msgid ""
3642
"During the pack operation, bazaar takes a backup of existing repository\n"
3643
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3644
"automatically when it is safe to do so. To save disk space by removing\n"
3645
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3646
"used."
3647
msgstr ""
3648
3649
#: bzrlib/builtins.py:5086
3650
msgid ""
3651
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3652
"during or immediately after repacking, you may be left with a state\n"
3653
"where the deletion has been written to disk but the new packs have not\n"
3654
"been. In this case the repository may be unusable."
3655
msgstr ""
3656
3657
#: bzrlib/builtins.py:5095
3658
msgid "Delete obsolete packs to save disk space."
3659
msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
3660
3661
#: bzrlib/builtins.py:5109
3662
msgid "List the installed plugins."
3663
msgstr "Lista los complementos instalados."
3664
3665
#: bzrlib/builtins.py:5111
3666
msgid ""
3667
"This command displays the list of installed plugins including\n"
3668
"version of plugin and a short description of each."
3669
msgstr ""
3670
"Esta orden muestra la lista de complementos instalados incluyendo\n"
3671
"versión del complemento y una breve descripción de cada uno."
3672
3673
#: bzrlib/builtins.py:5114
3674
msgid "--verbose shows the path where each plugin is located."
3675
msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
3676
3677
#: bzrlib/builtins.py:5116
3678
msgid ""
3679
"A plugin is an external component for Bazaar that extends the\n"
3680
"revision control system, by adding or replacing code in Bazaar.\n"
3681
"Plugins can do a variety of things, including overriding commands,\n"
3682
"adding new commands, providing additional network transports and\n"
3683
"customizing log output."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5122
3687
msgid ""
3688
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3689
"for further information on plugins including where to find them and how to\n"
3690
"install them. Instructions are also provided there on how to write new\n"
3691
"plugins using the Python programming language."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5138
3695
msgid "Show testament (signing-form) of a revision."
3696
msgstr "Mostrar el testamento (formulario de firma) de una revisión."
3697
3698
#: bzrlib/builtins.py:5141
3699
msgid "Produce long-format testament."
3700
msgstr "Produce testamento en formato largo."
3701
3702
#: bzrlib/builtins.py:5143
3703
msgid "Produce a strict-format testament."
3704
msgstr "Produce testamento en formato estricto."
3705
3706
#: bzrlib/builtins.py:5169
3707
msgid "Show the origin of each line in a file."
3708
msgstr "Muestra el origen de cada línea en un archivo"
3709
3710
#: bzrlib/builtins.py:5171
3711
msgid ""
3712
"This prints out the given file with an annotation on the left side\n"
3713
"indicating which revision, author and date introduced the change."
3714
msgstr ""
3715
"Esto solo imprime el archivo dado con una anotación en el lado izquierdo\n"
3716
"que indica la revisión, el autor y la fecha en que se realizó el cambio."
3717
3718
#: bzrlib/builtins.py:5174
3719
msgid ""
3720
"If the origin is the same for a run of consecutive lines, it is\n"
3721
"shown only at the top, unless the --all option is given."
3722
msgstr ""
3723
"Si el origen es igual para el funcionamiento entre línea consecutivas, solo\n"
3724
"se muestra en la parte superior, a menos que la opción --all así lo diga."
3725
3726
#: bzrlib/builtins.py:5182
3727
msgid "Show annotations on all lines."
3728
msgstr "Muestra anotaciones en todas las líneas."
3729
3730
#: bzrlib/builtins.py:5183
3731
msgid "Show commit date in annotations."
3732
msgstr "Muestra la fecha de ejecución en anotaciones."
3733
3734
#: bzrlib/builtins.py:5270
3735
msgid "Cannot sign a range of non-revision-history revisions"
3736
msgstr ""
3737
"No se puede firmar un rango de revisiones sin el historial de esas revisiones"
3738
3739
#: bzrlib/builtins.py:5282
3740
msgid "Please supply either one revision, or a range."
3741
msgstr "Proporcione una revisión o un rango."
3742
3743
#: bzrlib/builtins.py:5286
3744
msgid ""
3745
"Convert the current branch into a checkout of the supplied branch.\n"
3746
"If no branch is supplied, rebind to the last bound location."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:5289
3750
msgid ""
3751
"Once converted into a checkout, commits must succeed on the master branch\n"
3752
"before they will be applied to the local branch."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5292
3756
msgid ""
3757
"Bound branches use the nickname of its master branch unless it is set\n"
3758
"locally, in which case binding will update the local nickname to be\n"
3759
"that of the master."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:5307
3763
msgid "No location supplied. This format does not remember old locations."
3764
msgstr ""
3765
"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
3766
3767
#: bzrlib/builtins.py:5313
3768
msgid "Branch is already bound"
3769
msgstr "La rama ya está asociada"
3770
3771
#: bzrlib/builtins.py:5316
3772
msgid "No location supplied and no previous location known"
3773
msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
3774
3775
#: bzrlib/builtins.py:5322
3776
msgid "These branches have diverged. Try merging, and then bind again."
3777
msgstr ""
3778
"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
3779
3780
#: bzrlib/builtins.py:5329
3781
msgid "Convert the current checkout into a regular branch."
3782
msgstr "Convertir la comprobación actual en una rama regular."
3783
3784
#: bzrlib/builtins.py:5331
3785
msgid ""
3786
"After unbinding, the local branch is considered independent and subsequent\n"
3787
"commits will be local only."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:5342
3791
msgid "Local branch is not bound"
3792
msgstr "La rama local no está vinculada"
3793
3794
#: bzrlib/builtins.py:5346
3795
msgid "Remove the last committed revision."
3796
msgstr "Elimina la última revisión ejecutada."
3797
3798
#: bzrlib/builtins.py:5348
3799
msgid ""
3800
"--verbose will print out what is being removed.\n"
3801
"--dry-run will go through all the motions, but not actually\n"
3802
"remove anything."
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:5352
3806
msgid ""
3807
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3808
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3809
"branch at revision 15."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:5356
3813
msgid ""
3814
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3815
"it may make is to restore any pending merges that were present before\n"
3816
"the commit."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:5367
3820
msgid "Don't actually make changes."
3821
msgstr "En relaidad no hace cambios."
3822
3823
#: bzrlib/builtins.py:5368
3824
msgid "Say yes to all questions."
3825
msgstr "Decir sí a todas las preguntas."
3826
3827
#: bzrlib/builtins.py:5370
3828
msgid "Keep tags that point to removed revisions."
3829
msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
3830
3831
#: bzrlib/builtins.py:5372
3832
msgid "Only remove the commits from the local branch when in a checkout."
3833
msgstr ""
3834
"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
3835
3836
#: bzrlib/builtins.py:5421
3837
msgid "No revisions to uncommit.\n"
3838
msgstr "No hay revisiones para desejecutar.\n"
3839
3840
#: bzrlib/builtins.py:5436
3841
msgid "Dry-run, pretending to remove the above revisions.\n"
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:5439
3845
msgid "The above revision(s) will be removed.\n"
3846
msgstr "Las revisiones de arriba se eliminarán.\n"
3847
3848
#: bzrlib/builtins.py:5443
3849
msgid "Uncommit these revisions"
3850
msgstr "Desejecutar estas revisiones"
3851
3852
#: bzrlib/builtins.py:5446
3853
msgid "Canceled\n"
3854
msgstr "Cancelado\n"
3855
3856
#: bzrlib/builtins.py:5453
3857
#, python-format
3858
msgid ""
3859
"You can restore the old tip by running:\n"
3860
" bzr pull . -r revid:%s\n"
3861
msgstr ""
3862
"Puede restaurar el consejo antiguo ejecutando:\n"
3863
" bzr pull . -r revid:%s\n"
3864
3865
#: bzrlib/builtins.py:5458
3866
msgid "Break a dead lock."
3867
msgstr "Romper un bloqueo."
3868
3869
#: bzrlib/builtins.py:5460
3870
msgid ""
3871
"This command breaks a lock on a repository, branch, working directory or\n"
3872
"config file."
3873
msgstr ""
3874
"Esta orden rompe un bloqueo en un repositorio, rama, directorio de trabajo "
3875
"o\n"
3876
"archivo de configuración."
3877
3878
#: bzrlib/builtins.py:5463
3879
msgid ""
3880
"CAUTION: Locks should only be broken when you are sure that the process\n"
3881
"holding the lock has been stopped."
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:5466
3885
msgid ""
3886
"You can get information on what locks are open via the 'bzr info\n"
3887
"[location]' command."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:5469
3891
msgid ""
3892
":Examples:\n"
3893
" bzr break-lock\n"
3894
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3895
" bzr break-lock --conf ~/.bazaar"
3896
msgstr ""
3897
":Ejemplos:\n"
3898
" bzr break-lock\n"
3899
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3900
" bzr break-lock --conf ~/.bazaar"
3901
3902
#: bzrlib/builtins.py:5478
3903
msgid "LOCATION is the directory where the config lock is."
3904
msgstr ""
3905
3906
#: bzrlib/builtins.py:5480
3907
msgid "Do not ask for confirmation before breaking the lock."
3908
msgstr "No pedir confirmación antes de romper el bloqueo."
3909
3910
#: bzrlib/builtins.py:5515
3911
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:5516
3915
msgid "Run the bzr server."
3916
msgstr "Ejecutar el servidor bzr."
3917
3918
#: bzrlib/builtins.py:5522
3919
msgid "Serve on stdin/out for use from inetd or sshd."
3920
msgstr ""
3921
3922
#: bzrlib/builtins.py:5523
3923
msgid "protocol"
3924
msgstr "protocolo"
3925
3926
#: bzrlib/builtins.py:5524
3927
msgid "Protocol to serve."
3928
msgstr "Protocolo a servir."
3929
3930
#: bzrlib/builtins.py:5528
3931
msgid "Listen for connections on nominated address."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:5530
3935
msgid ""
3936
"Listen for connections on nominated port. Passing 0 as the port number will "
3937
"result in a dynamically allocated port. The default port depends on the "
3938
"protocol."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:5535
3942
msgid "Serve contents of this directory."
3943
msgstr "Servir contenidos de esta carpeta"
3944
3945
#: bzrlib/builtins.py:5537
3946
msgid ""
3947
"By default the server is a readonly server. Supplying --allow-writes "
3948
"enables write access to the contents of the served directory and below. "
3949
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3950
"of external authentication is arranged supplying this option leads to global "
3951
"uncontrolled write access to your file system."
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:5546
3955
msgid "Override the default idle client timeout (5min)."
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:5564
3959
msgid "Combine a tree into its containing tree."
3960
msgstr "Combina un árbol en su árbol contenedor."
3961
3962
#: bzrlib/builtins.py:5566
3963
msgid "This command requires the target tree to be in a rich-root format."
3964
msgstr ""
3965
3966
#: bzrlib/builtins.py:5568
3967
msgid ""
3968
"The TREE argument should be an independent tree, inside another tree, but\n"
3969
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3970
"running \"bzr branch\" with the target inside a tree.)"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:5572
3974
msgid ""
3975
"The result is a combined tree, with the subtree no longer an independent\n"
3976
"part. This is marked as a merge of the subtree into the containing tree,\n"
3977
"and all history is preserved."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:5590
3981
#, python-format
3982
msgid ""
3983
"Can't join trees because %s doesn't support rich root data.\n"
3984
"You can use bzr upgrade on the repository."
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3988
msgid "Cannot join {0}. {1}"
3989
msgstr "No se puede unir {0}. {1}"
3990
3991
#: bzrlib/builtins.py:5610
3992
msgid "Split a subdirectory of a tree into a separate tree."
3993
msgstr "Divide un subdirectorio de un árbol en un árbol separado."
3994
3995
#: bzrlib/builtins.py:5612
3996
msgid ""
3997
"This command will produce a target tree in a format that supports\n"
3998
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3999
"converted into earlier formats like 'dirstate-tags'."
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:5616
4003
msgid ""
4004
"The TREE argument should be a subdirectory of a working tree. That\n"
4005
"subdirectory will be converted into an independent tree, with its own\n"
4006
"branch. Commits in the top-level tree will not apply to the new subtree."
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:5696
4010
msgid "No submit branch specified or known"
4011
msgstr "No se ha enviado una rama especificada o conocida"
4012
4013
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
4014
msgid "No public branch specified or known"
4015
msgstr "No hay una rama especificada o conocida pública"
4016
4017
#: bzrlib/builtins.py:5710
4018
msgid "bzr merge-directive takes at most two one revision identifiers"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:5719
4022
msgid "No revisions to bundle."
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:5738
4026
msgid "Mail or create a merge-directive for submitting changes."
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:5740
4030
msgid "A merge directive provides many things needed for requesting merges:"
4031
msgstr ""
4032
4033
#: bzrlib/builtins.py:5742
4034
msgid "* A machine-readable description of the merge to perform"
4035
msgstr ""
4036
4037
#: bzrlib/builtins.py:5744
4038
msgid "* An optional patch that is a preview of the changes requested"
4039
msgstr ""
4040
"* Una ruta opcional que es una vista previa de los cambios requeridos"
4041
4042
#: bzrlib/builtins.py:5746
4043
msgid ""
4044
"* An optional bundle of revision data, so that the changes can be applied\n"
4045
" directly from the merge directive, without retrieving data from a\n"
4046
" branch."
4047
msgstr ""
4048
4049
#: bzrlib/builtins.py:5750
4050
msgid ""
4051
"`bzr send` creates a compact data set that, when applied using bzr\n"
4052
"merge, has the same effect as merging from the source branch. "
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:5753
4056
msgid ""
4057
"By default the merge directive is self-contained and can be applied to any\n"
4058
"branch containing submit_branch in its ancestory without needing access to\n"
4059
"the source branch."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:5757
4063
msgid ""
4064
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4065
"revisions, but only a structured request to merge from the\n"
4066
"public_location. In that case the public_branch is needed and it must be\n"
4067
"up-to-date and accessible to the recipient. The public_branch is always\n"
4068
"included if known, so that people can check it later."
4069
msgstr ""
4070
4071
#: bzrlib/builtins.py:5763
4072
msgid ""
4073
"The submit branch defaults to the parent of the source branch, but can be\n"
4074
"overridden. Both submit branch and public branch will be remembered in\n"
4075
"branch.conf the first time they are used for a particular branch. The\n"
4076
"source branch defaults to that containing the working directory, but can\n"
4077
"be changed using --from."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:5769
4081
msgid ""
4082
"Both the submit branch and the public branch follow the usual behavior with\n"
4083
"respect to --remember: If there is no default location set, the first send\n"
4084
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4085
"omit the location to use the default. To change the default, use\n"
4086
"--remember. The value will only be saved if the location can be accessed."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:5775
4090
msgid ""
4091
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4092
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4093
"If a public location is known for the submit_branch, that location is used\n"
4094
"in the merge directive."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:5780
4098
msgid ""
4099
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4100
"given, in which case it is sent to a file."
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:5783
4104
msgid ""
4105
"Mail is sent using your preferred mail program. This should be transparent\n"
4106
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4107
"If the preferred client can't be found (or used), your editor will be used."
4108
msgstr ""
4109
4110
#: bzrlib/builtins.py:5787
4111
msgid ""
4112
"To use a specific mail program, set the mail_client configuration option.\n"
4113
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4114
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4115
"(MacOS X's\n"
4116
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4117
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4118
"add\n"
4119
"supported clients."
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:5794
4123
msgid ""
4124
"If mail is being sent, a to address is required. This can be supplied\n"
4125
"either on the commandline, by setting the submit_to configuration\n"
4126
"option in the branch itself or the child_submit_to configuration option\n"
4127
"in the submit branch."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:5799
4131
msgid ""
4132
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4133
"and\n"
4134
"merge directive format 2. It is significantly faster and smaller than\n"
4135
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4136
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4137
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:5805
4141
msgid ""
4142
"The merge directives created by bzr send may be applied using bzr merge or\n"
4143
"bzr pull by specifying a file containing a merge directive as the location."
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:5808
4147
msgid ""
4148
"bzr send makes extensive use of public locations to map local locations "
4149
"into\n"
4150
"URLs that can be used by other people. See `bzr help configuration` to\n"
4151
"set them, and use `bzr info` to display them."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:5832
4155
msgid "Write merge directive to this file or directory; use - for stdout."
4156
msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
4157
4158
#: bzrlib/builtins.py:5836
4159
msgid ""
4160
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4161
"strict disables the check."
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:5838
4165
msgid "Mail the request to this address."
4166
msgstr "Enviar por correo la petición a esta dirección"
4167
4168
#: bzrlib/builtins.py:5842
4169
msgid "Body for the email."
4170
msgstr "Cuerpo para el correo."
4171
4172
#: bzrlib/builtins.py:5895
4173
msgid "Do not include a bundle in the merge directive."
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:5896
4177
msgid "Do not include a preview patch in the merge directive."
4178
msgstr "No incluir una ruta de vista previa en la directiva de fusión."
4179
4180
#: bzrlib/builtins.py:5899
4181
msgid "Remember submit and public branch."
4182
msgstr "Recordar el envío y la rama pública."
4183
4184
#: bzrlib/builtins.py:5901
4185
msgid ""
4186
"Branch to generate the submission from, rather than the one containing the "
4187
"working directory."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4191
msgid "format"
4192
msgstr "formato"
4193
4194
#: bzrlib/builtins.py:5912
4195
msgid "Use the specified output format."
4196
msgstr "Usar el formato de salida especificado."
4197
4198
#: bzrlib/builtins.py:5934
4199
msgid "Create, remove or modify a tag naming a revision."
4200
msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
4201
4202
#: bzrlib/builtins.py:5936
4203
msgid ""
4204
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4205
"(--revision) option can be given -rtag:X, where X is any previously\n"
4206
"created tag."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:5940
4210
msgid ""
4211
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4212
"along when you branch, push, pull or merge."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:5943
4216
msgid ""
4217
"It is an error to give a tag name that already exists unless you pass\n"
4218
"--force, in which case the tag is moved to point to the new revision."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:5946
4222
msgid ""
4223
"To rename a tag (change the name but keep it on the same revsion), run "
4224
"``bzr\n"
4225
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:5949
4229
msgid ""
4230
"If no tag name is specified it will be determined through the \n"
4231
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4232
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4233
"details."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:5959
4237
msgid "Delete this tag rather than placing it."
4238
msgstr "Eliminar esta etiqueta en lugar de colocarla."
4239
4240
#: bzrlib/builtins.py:5962
4241
msgid "Branch in which to place the tag."
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:5964
4245
msgid "Replace existing tags."
4246
msgstr "Reemplazar las etiquetas existentes."
4247
4248
#: bzrlib/builtins.py:5979
4249
msgid "No tag specified to delete."
4250
msgstr "No hay etiquetas especificadas para eliminar."
4251
4252
#: bzrlib/builtins.py:5981
4253
#, python-format
4254
msgid "Deleted tag %s."
4255
msgstr "Etiqueta%s eliminada."
4256
4257
#: bzrlib/builtins.py:5995
4258
msgid "Please specify a tag name."
4259
msgstr "Especifique un nombre de etiqueta."
4260
4261
#: bzrlib/builtins.py:6003
4262
#, python-format
4263
msgid "Tag %s already exists for that revision."
4264
msgstr "La etiqueta %s existe para esta revisión."
4265
4266
#: bzrlib/builtins.py:6007
4267
#, python-format
4268
msgid "Created tag %s."
4269
msgstr "Etiqueta %s creada."
4270
4271
#: bzrlib/builtins.py:6009
4272
#, python-format
4273
msgid "Updated tag %s."
4274
msgstr "Etiqueta actualizada %s."
4275
4276
#: bzrlib/builtins.py:6013
4277
msgid "List tags."
4278
msgstr "Listar etiquetas."
4279
4280
#: bzrlib/builtins.py:6015
4281
msgid ""
4282
"This command shows a table of tag names and the revisions they reference."
4283
msgstr ""
4284
4285
#: bzrlib/builtins.py:6021
4286
msgid "Branch whose tags should be displayed."
4287
msgstr "Rama cuyas etiquetas se deben mostrar."
4288
4289
#: bzrlib/builtins.py:6023
4290
msgid "Sort tags by different criteria."
4291
msgstr "Ordenar etiquetas con diferentes criterios."
4292
4293
#: bzrlib/builtins.py:6023
4294
msgid "Sorting"
4295
msgstr "Ordenación"
4296
4297
#: bzrlib/builtins.py:6092
4298
msgid "Reconfigure the type of a bzr directory."
4299
msgstr "Reconfigura el tipo de un directorio bzr."
4300
4301
#: bzrlib/builtins.py:6094
4302
msgid "A target configuration must be specified."
4303
msgstr "Se debe especificar una configuración objetivo."
4304
4305
#: bzrlib/builtins.py:6096
4306
msgid ""
4307
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4308
"The order of preference is\n"
4309
"1. For a lightweight checkout, the current bound location.\n"
4310
"2. For branches that used to be checkouts, the previously-bound location.\n"
4311
"3. The push location.\n"
4312
"4. The parent location.\n"
4313
"If none of these is available, --bind-to must be specified."
4314
msgstr ""
4315
4316
#: bzrlib/builtins.py:6110
4317
msgid "Tree type"
4318
msgstr "Tipo de árbol"
4319
4320
#: bzrlib/builtins.py:6111
4321
msgid "The relation between branch and tree."
4322
msgstr "La relación entre rama y árbol."
4323
4324
#: bzrlib/builtins.py:6113
4325
msgid "Reconfigure to be an unbound branch with no working tree."
4326
msgstr ""
4327
4328
#: bzrlib/builtins.py:6114
4329
msgid "Reconfigure to be an unbound branch with a working tree."
4330
msgstr ""
4331
4332
#: bzrlib/builtins.py:6115
4333
msgid "Reconfigure to be a bound branch with a working tree."
4334
msgstr ""
4335
4336
#: bzrlib/builtins.py:6116
4337
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4338
msgstr ""
4339
4340
#: bzrlib/builtins.py:6121
4341
msgid "Repository type"
4342
msgstr "Tipo de repositorio"
4343
4344
#: bzrlib/builtins.py:6122
4345
msgid "Location fo the repository."
4346
msgstr "Ubicación en el repositorio."
4347
4348
#: bzrlib/builtins.py:6124
4349
msgid ""
4350
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4351
msgstr ""
4352
4353
#: bzrlib/builtins.py:6126
4354
msgid "Reconfigure to use a shared repository."
4355
msgstr "Reconfigure para usar un repositorio compartido."
4356
4357
#: bzrlib/builtins.py:6130
4358
msgid "Trees in Repository"
4359
msgstr "Árboles en el repositorio"
4360
4361
#: bzrlib/builtins.py:6131
4362
msgid "Whether new branches in the repository have trees."
4363
msgstr "Si las ramas nuevas en el repositorio tienen árboles."
4364
4365
#: bzrlib/builtins.py:6133
4366
msgid ""
4367
"Reconfigure repository to create working trees on branches by default."
4368
msgstr ""
4369
4370
#: bzrlib/builtins.py:6135
4371
msgid ""
4372
"Reconfigure repository to not create working trees on branches by default."
4373
msgstr ""
4374
4375
#: bzrlib/builtins.py:6138
4376
msgid "Branch to bind checkout to."
4377
msgstr ""
4378
4379
#: bzrlib/builtins.py:6140
4380
msgid "Perform reconfiguration even if local changes will be lost."
4381
msgstr ""
4382
"Realizar reconfiguración incluso si se han perdido los cambios locales."
4383
4384
#: bzrlib/builtins.py:6143
4385
msgid "Reconfigure a branch to be stacked on another branch."
4386
msgstr "Reconfigurar una rama para apilarla en otra rama."
4387
4388
#: bzrlib/builtins.py:6147
4389
msgid ""
4390
"Reconfigure a branch to be unstacked. This may require copying substantial "
4391
"data into it."
4392
msgstr ""
4393
4394
#: bzrlib/builtins.py:6157
4395
msgid "Can't use both --stacked-on and --unstacked"
4396
msgstr "No se pueden usar ambos --stacked-on y --unstacked"
4397
4398
#: bzrlib/builtins.py:6171
4399
msgid "No target configuration specified"
4400
msgstr "No se ha especificado una configuración objetivo"
4401
4402
#: bzrlib/builtins.py:6206
4403
msgid "Set the branch of a checkout and update."
4404
msgstr "Establezca la rama de una comprobación y actualización."
4405
4406
#: bzrlib/builtins.py:6208
4407
msgid ""
4408
"For lightweight checkouts, this changes the branch being referenced.\n"
4409
"For heavyweight checkouts, this checks that there are no local commits\n"
4410
"versus the current bound branch, then it makes the local branch a mirror\n"
4411
"of the new location and binds to it."
4412
msgstr ""
4413
4414
#: bzrlib/builtins.py:6213
4415
msgid ""
4416
"In both cases, the working tree is updated and uncommitted changes\n"
4417
"are merged. The user can commit or revert these as they desire."
4418
msgstr ""
4419
4420
#: bzrlib/builtins.py:6216
4421
msgid "Pending merges need to be committed or reverted before using switch."
4422
msgstr ""
4423
4424
#: bzrlib/builtins.py:6218
4425
msgid ""
4426
"The path to the branch to switch to can be specified relative to the parent\n"
4427
"directory of the current branch. For example, if you are currently in a\n"
4428
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4429
"/path/to/newbranch."
4430
msgstr ""
4431
4432
#: bzrlib/builtins.py:6223
4433
msgid ""
4434
"Bound branches use the nickname of its master branch unless it is set\n"
4435
"locally, in which case switching will update the local nickname to be\n"
4436
"that of the master."
4437
msgstr ""
4438
4439
#: bzrlib/builtins.py:6231
4440
msgid "Switch even if local commits will be lost."
4441
msgstr "Cambiar incluso si las ejecuciones se han perdido."
4442
4443
#: bzrlib/builtins.py:6234
4444
msgid "Create the target branch from this one before switching to it."
4445
msgstr ""
4446
4447
#: bzrlib/builtins.py:6248
4448
msgid "You must supply either a revision or a location"
4449
msgstr "Debe especificar una revisión o una ubicación"
4450
4451
#: bzrlib/builtins.py:6261
4452
msgid "cannot create branch without source branch"
4453
msgstr "no se puede crear una rama sin rama origen"
4454
4455
#: bzrlib/builtins.py:6286
4456
msgid "Manage filtered views."
4457
msgstr "Gestionar vistas filtradas."
4458
4459
#: bzrlib/builtins.py:6288
4460
msgid ""
4461
"Views provide a mask over the tree so that users can focus on\n"
4462
"a subset of a tree when doing their work. After creating a view,\n"
4463
"commands that support a list of files - status, diff, commit, etc -\n"
4464
"effectively have that list of files implicitly given each time.\n"
4465
"An explicit list of files can still be given but those files\n"
4466
"must be within the current view."
4467
msgstr ""
4468
4469
#: bzrlib/builtins.py:6295
4470
msgid ""
4471
"In most cases, a view has a short life-span: it is created to make\n"
4472
"a selected change and is deleted once that change is committed.\n"
4473
"At other times, you may wish to create one or more named views\n"
4474
"and switch between them."
4475
msgstr ""
4476
4477
#: bzrlib/builtins.py:6300
4478
msgid ""
4479
"To disable the current view without deleting it, you can switch to\n"
4480
"the pseudo view called ``off``. This can be useful when you need\n"
4481
"to see the whole tree for an operation or two (e.g. merge) but\n"
4482
"want to switch back to your view after that."
4483
msgstr ""
4484
4485
#: bzrlib/builtins.py:6305
4486
msgid ""
4487
":Examples:\n"
4488
" To define the current view::"
4489
msgstr ""
4490
":Ejemplos:\n"
4491
" Para definir la vista actual::"
4492
4493
#: bzrlib/builtins.py:6308
4494
msgid " bzr view file1 dir1 ..."
4495
msgstr " bzr view file1 dir1 ..."
4496
4497
#: bzrlib/builtins.py:6310
4498
msgid " To list the current view::"
4499
msgstr " Para listar la vista actual::"
4500
4501
#: bzrlib/builtins.py:6312
4502
msgid " bzr view"
4503
msgstr " vista bzr"
4504
4505
#: bzrlib/builtins.py:6314
4506
msgid " To delete the current view::"
4507
msgstr " Para eliminar la vista actual::"
4508
4509
#: bzrlib/builtins.py:6316
4510
msgid " bzr view --delete"
4511
msgstr " bzr view --delete"
4512
4513
#: bzrlib/builtins.py:6318
4514
msgid " To disable the current view without deleting it::"
4515
msgstr " Para desactivar la vista actual sin eliminarla::"
4516
4517
#: bzrlib/builtins.py:6320
4518
msgid " bzr view --switch off"
4519
msgstr " bzr view --switch off"
4520
4521
#: bzrlib/builtins.py:6322
4522
msgid " To define a named view and switch to it::"
4523
msgstr ""
4524
4525
#: bzrlib/builtins.py:6324
4526
msgid " bzr view --name view-name file1 dir1 ..."
4527
msgstr " bzr view --name view-name file1 dir1 ..."
4528
4529
#: bzrlib/builtins.py:6326
4530
msgid " To list a named view::"
4531
msgstr " Para lista la vista nombrada::"
4532
4533
#: bzrlib/builtins.py:6328
4534
msgid " bzr view --name view-name"
4535
msgstr " bzr view --name view-name"
4536
4537
#: bzrlib/builtins.py:6330
4538
msgid " To delete a named view::"
4539
msgstr " Para eliminar una vista nombrada::"
4540
4541
#: bzrlib/builtins.py:6332
4542
msgid " bzr view --name view-name --delete"
4543
msgstr " bzr view --name view-name --delete"
4544
4545
#: bzrlib/builtins.py:6334
4546
msgid " To switch to a named view::"
4547
msgstr " Para cambiar a una vista nombrada::"
4548
4549
#: bzrlib/builtins.py:6336
4550
msgid " bzr view --switch view-name"
4551
msgstr " bzr view --switch view-name"
4552
4553
#: bzrlib/builtins.py:6338
4554
msgid " To list all views defined::"
4555
msgstr " Para listar todas las vistas definidas::"
4556
4557
#: bzrlib/builtins.py:6340
4558
msgid " bzr view --all"
4559
msgstr " bzr view --all"
4560
4561
#: bzrlib/builtins.py:6342
4562
msgid " To delete all views::"
4563
msgstr " Para eliminar todas las vistas::"
4564
4565
#: bzrlib/builtins.py:6344
4566
msgid " bzr view --delete --all"
4567
msgstr " bzr view --delete --all"
4568
4569
#: bzrlib/builtins.py:6351
4570
msgid "Apply list or delete action to all views."
4571
msgstr ""
4572
4573
#: bzrlib/builtins.py:6354
4574
msgid "Delete the view."
4575
msgstr "Eliminar la vista."
4576
4577
#: bzrlib/builtins.py:6357
4578
msgid "Name of the view to define, list or delete."
4579
msgstr "Nombre de la vista a definir, listar o eliminar."
4580
4581
#: bzrlib/builtins.py:6361
4582
msgid "Name of the view to switch to."
4583
msgstr "Nombre de la vista a la que cambiar."
4584
4585
#: bzrlib/builtins.py:6380
4586
msgid "Both --delete and a file list specified"
4587
msgstr ""
4588
4589
#: bzrlib/builtins.py:6383
4590
msgid "Both --delete and --switch specified"
4591
msgstr "Ambos --delete y --switch especificados"
4592
4593
#: bzrlib/builtins.py:6386
4594
msgid "Deleted all views.\n"
4595
msgstr "Eliminar todas las vistas.\n"
4596
4597
#: bzrlib/builtins.py:6388
4598
msgid "No current view to delete"
4599
msgstr "No hay vista para eliminar"
4600
4601
#: bzrlib/builtins.py:6391
4602
#, python-format
4603
msgid "Deleted '%s' view.\n"
4604
msgstr "Vista «%s» eliminada.\n"
4605
4606
#: bzrlib/builtins.py:6395
4607
msgid "Both --switch and a file list specified"
4608
msgstr ""
4609
4610
#: bzrlib/builtins.py:6398
4611
msgid "Both --switch and --all specified"
4612
msgstr "Ambos --switch y --all especificados"
4613
4614
#: bzrlib/builtins.py:6401
4615
msgid "No current view to disable"
4616
msgstr "No hay vista actual que desactivar"
4617
4618
#: bzrlib/builtins.py:6403
4619
#, python-format
4620
msgid "Disabled '%s' view.\n"
4621
msgstr "Vista «%s» desactivada.\n"
4622
4623
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4624
msgid "Using '{0}' view: {1}\n"
4625
msgstr "Usar «{0}» vista: {1}\n"
4626
4627
#: bzrlib/builtins.py:6410
4628
msgid "Views defined:\n"
4629
msgstr "Vistas definidas:\n"
4630
4631
#: bzrlib/builtins.py:6419
4632
msgid "No views defined.\n"
4633
msgstr "No hay vista definida.\n"
4634
4635
#: bzrlib/builtins.py:6426
4636
msgid "Cannot change the 'off' pseudo view"
4637
msgstr ""
4638
4639
#: bzrlib/builtins.py:6434
4640
msgid "No current view.\n"
4641
msgstr "No hay vista actual.\n"
4642
4643
#: bzrlib/builtins.py:6437
4644
msgid "'{0}' view is: {1}\n"
4645
msgstr "«{0}» vista es: {1}\n"
4646
4647
#: bzrlib/builtins.py:6457
4648
msgid " <no hooks installed>\n"
4649
msgstr ""
4650
4651
#: bzrlib/builtins.py:6461
4652
msgid "Remove a branch."
4653
msgstr "Eliminar una rama."
4654
4655
#: bzrlib/builtins.py:6463
4656
msgid ""
4657
"This will remove the branch from the specified location but \n"
4658
"will keep any working tree or repository in place."
4659
msgstr ""
4660
4661
#: bzrlib/builtins.py:6468
4662
msgid " Remove the branch at repo/trunk::"
4663
msgstr " Eliminar la rama en repo/trunk::"
4664
4665
#: bzrlib/builtins.py:6470
4666
msgid " bzr remove-branch repo/trunk"
4667
msgstr " bzr remove-branch repo/trunk"
4668
4669
#: bzrlib/builtins.py:6477
4670
msgid "Remove branch even if it is the active branch."
4671
msgstr ""
4672
4673
#: bzrlib/builtins.py:6491
4674
msgid "Branch is active. Use --force to remove it."
4675
msgstr ""
4676
4677
#: bzrlib/builtins.py:6495
4678
msgid "Plaintext diff output."
4679
msgstr ""
4680
4681
#: bzrlib/builtins.py:6496
4682
msgid "Temporarily set aside some changes from the current tree."
4683
msgstr ""
4684
4685
#: bzrlib/builtins.py:6498
4686
msgid ""
4687
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4688
"ie. out of the way, until a later time when you can bring them back from\n"
4689
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4690
"your working tree, and so they aren't propagated along with your branch nor\n"
4691
"will they survive its deletion."
4692
msgstr ""
4693
4694
#: bzrlib/builtins.py:6504
4695
msgid "If shelve --list is specified, previously-shelved changes are listed."
4696
msgstr ""
4697
4698
#: bzrlib/builtins.py:6506
4699
msgid ""
4700
"Shelve is intended to help separate several sets of changes that have\n"
4701
"been inappropriately mingled. If you just want to get rid of all changes\n"
4702
"and you don't need to restore them later, use revert. If you want to\n"
4703
"shelve all text changes at once, use shelve --all."
4704
msgstr ""
4705
4706
#: bzrlib/builtins.py:6511
4707
msgid ""
4708
"If filenames are specified, only the changes to those files will be\n"
4709
"shelved. Other files will be left untouched."
4710
msgstr ""
4711
4712
#: bzrlib/builtins.py:6514
4713
msgid ""
4714
"If a revision is specified, changes since that revision will be shelved."
4715
msgstr ""
4716
"Si se especifica una revisión, los cambios realizados desde esta revisión "
4717
"serán archivados."
4718
4719
#: bzrlib/builtins.py:6516
4720
msgid ""
4721
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4722
"restore the most recently shelved changes."
4723
msgstr ""
4724
4725
#: bzrlib/builtins.py:6519
4726
msgid ""
4727
"For complicated changes, it is possible to edit the changes in a separate\n"
4728
"editor program to decide what the file remaining in the working copy\n"
4729
"should look like. To do this, add the configuration option"
4730
msgstr ""
4731
4732
#: bzrlib/builtins.py:6523
4733
msgid " change_editor = PROGRAM @new_path @old_path"
4734
msgstr ""
4735
4736
#: bzrlib/builtins.py:6525
4737
msgid ""
4738
"where @new_path is replaced with the path of the new version of the \n"
4739
"file and @old_path is replaced with the path of the old version of \n"
4740
"the file. The PROGRAM should save the new file with the desired \n"
4741
"contents of the file in the working tree.\n"
4742
" "
4743
msgstr ""
4744
4745
#: bzrlib/builtins.py:6537
4746
msgid "Shelve all changes."
4747
msgstr "Guardar todos los cambios."
4748
4749
#: bzrlib/builtins.py:6539
4750
msgid "Method to use for writing diffs."
4751
msgstr "Método a usar para escribir diferencias."
4752
4753
#: bzrlib/builtins.py:6539
4754
msgid "writer"
4755
msgstr "escritor"
4756
4757
#: bzrlib/builtins.py:6543
4758
msgid "List shelved changes."
4759
msgstr "Listar cambios guardados."
4760
4761
#: bzrlib/builtins.py:6545
4762
msgid "Destroy removed changes instead of shelving them."
4763
msgstr "Destruir cambios eliminados en vez de guardarlos."
4764
4765
#: bzrlib/builtins.py:6574
4766
msgid "No shelved changes."
4767
msgstr "No ha cambios guardados."
4768
4769
#: bzrlib/builtins.py:6585
4770
msgid "Restore shelved changes."
4771
msgstr "Restaurar cambios guardados."
4772
4773
#: bzrlib/builtins.py:6587
4774
msgid ""
4775
"By default, the most recently shelved changes are restored. However if you\n"
4776
"specify a shelf by id those changes will be restored instead. This works\n"
4777
"best when the changes don't depend on each other."
4778
msgstr ""
4779
4780
#: bzrlib/builtins.py:6596
4781
msgid "The action to perform."
4782
msgstr "La acción a realizar."
4783
4784
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4785
msgid "action"
4786
msgstr "acción"
4787
4788
#: bzrlib/builtins.py:6598
4789
msgid "Apply changes and remove from the shelf."
4790
msgstr ""
4791
4792
#: bzrlib/builtins.py:6599
4793
msgid "Show changes, but do not apply or remove them."
4794
msgstr ""
4795
4796
#: bzrlib/builtins.py:6600
4797
msgid ""
4798
"Instead of unshelving the changes, show the diff that would result from "
4799
"unshelving."
4800
msgstr ""
4801
4802
#: bzrlib/builtins.py:6602
4803
msgid "Delete changes without applying them."
4804
msgstr "Eliminar cambios sin aplicarlos."
4805
4806
#: bzrlib/builtins.py:6603
4807
msgid "Apply changes but don't delete them."
4808
msgstr ""
4809
4810
#: bzrlib/builtins.py:6618
4811
msgid "Remove unwanted files from working tree."
4812
msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
4813
4814
#: bzrlib/builtins.py:6620
4815
msgid ""
4816
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4817
"files are never deleted."
4818
msgstr ""
4819
4820
#: bzrlib/builtins.py:6623
4821
msgid ""
4822
"Another class is 'detritus', which includes files emitted by bzr during\n"
4823
"normal operations and selftests. (The value of these files decreases with\n"
4824
"time.)"
4825
msgstr ""
4826
4827
#: bzrlib/builtins.py:6627
4828
msgid ""
4829
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4830
"flags are respected, and may be combined."
4831
msgstr ""
4832
4833
#: bzrlib/builtins.py:6630
4834
msgid "To check what clean-tree will do, use --dry-run."
4835
msgstr ""
4836
4837
#: bzrlib/builtins.py:6633
4838
msgid "Delete all ignored files."
4839
msgstr "Eliminar todos los archivos ignorados."
4840
4841
#: bzrlib/builtins.py:6634
4842
msgid ""
4843
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4844
msgstr ""
4845
4846
#: bzrlib/builtins.py:6637
4847
msgid "Delete files unknown to bzr (default)."
4848
msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
4849
4850
#: bzrlib/builtins.py:6638
4851
msgid "Show files to delete instead of deleting them."
4852
msgstr "Mostrar archivos a eliminar en vez de eliminarles."
4853
4854
#: bzrlib/builtins.py:6640
4855
msgid "Do not prompt before deleting."
4856
msgstr "No preguntar antes de eliminar."
4857
4858
#: bzrlib/bundle/__init__.py:59
4859
msgid "A directory cannot be a bundle"
4860
msgstr ""
4861
4862
#: bzrlib/bundle/apply_bundle.py:40
4863
msgid "Install revisions"
4864
msgstr "Instalar revisiones"
4865
4866
#: bzrlib/bundle/commands.py:64
4867
msgid "--verbose requires a merge directive"
4868
msgstr ""
4869
4870
#: bzrlib/bundle/commands.py:67
4871
msgid "Bundle format not supported"
4872
msgstr ""
4873
4874
#: bzrlib/bundle/commands.py:77
4875
msgid "Records\n"
4876
msgstr "Grabaciones\n"
4877
4878
#: bzrlib/bundle/commands.py:81
4879
msgid "{0}: {1} ({2} multiparent)\n"
4880
msgstr ""
4881
4882
#: bzrlib/bundle/commands.py:83
4883
#, python-format
4884
msgid "unique files: %d\n"
4885
msgstr "archivos únicos: %d\n"
4886
4887
#: bzrlib/bundle/commands.py:92
4888
msgid "Revisions\n"
4889
msgstr "Revisiones\n"
4890
4891
#: bzrlib/bundle/commands.py:93
4892
#, python-format
4893
msgid "nicks: %s\n"
4894
msgstr ""
4895
4896
#: bzrlib/bundle/commands.py:95
4897
#, python-format
4898
msgid ""
4899
"committers: \n"
4900
"%s\n"
4901
msgstr ""
4902
4903
#: bzrlib/bundle/commands.py:103
4904
msgid "Decoded contents\n"
4905
msgstr "Contenidos descodificados\n"
4906
4907
#: bzrlib/bundle/serializer/v4.py:327
4908
#, python-format
4909
msgid "Bundling %d revision."
4910
msgid_plural "Bundling %d revisions."
4911
msgstr[0] ""
4912
msgstr[1] ""
4913
4914
#: bzrlib/bzrdir.py:487
4915
msgid ""
4916
"making backup of {0}\n"
4917
" to {1}"
4918
msgstr ""
4919
"haciendo respaldo de {0}\n"
4920
" a {1}"
4921
4922
#: bzrlib/bzrdir.py:510
4923
msgid "renamed {0} to {1}"
4924
msgstr "renombrado {0} a {1}"
4925
4926
#: bzrlib/bzrdir.py:1639
4927
#, python-format
4928
msgid ""
4929
"Source repository format does not support stacking, using format:\n"
4930
" %s"
4931
msgstr ""
4932
4933
#: bzrlib/bzrdir.py:1659
4934
#, python-format
4935
msgid ""
4936
"Source branch format does not support stacking, using format:\n"
4937
" %s"
4938
msgstr ""
4939
4940
#: bzrlib/bzrdir.py:1805
4941
msgid "starting repository conversion"
4942
msgstr "iniciar conversión de repositorio"
4943
4944
#: bzrlib/bzrdir.py:2026
4945
msgid "Using default stacking branch {0} at {1}"
4946
msgstr ""
4947
4948
#: bzrlib/check.py:108
4949
msgid "check"
4950
msgstr "marcar"
4951
4952
#: bzrlib/check.py:110
4953
msgid "checking revisions"
4954
msgstr "marcar revisiones"
4955
4956
#: bzrlib/check.py:112
4957
msgid "checking commit contents"
4958
msgstr ""
4959
4960
#: bzrlib/check.py:114
4961
msgid "checking file graphs"
4962
msgstr ""
4963
4964
#: bzrlib/check.py:118
4965
msgid "checking branches and trees"
4966
msgstr ""
4967
4968
#: bzrlib/check.py:205
4969
msgid "checked repository {0} format {1}"
4970
msgstr ""
4971
4972
#: bzrlib/check.py:208
4973
#, python-format
4974
msgid "%6d revisions"
4975
msgstr "%6d revisiones"
4976
4977
#: bzrlib/check.py:209
4978
#, python-format
4979
msgid "%6d file-ids"
4980
msgstr ""
4981
4982
#: bzrlib/check.py:211
4983
#, python-format
4984
msgid "%6d unreferenced text versions"
4985
msgstr "%6d versiones de texto no referenciadas"
4986
4987
#: bzrlib/check.py:215
4988
msgid "unreferenced version: {{{0}}} in {1}"
4989
msgstr "versión no referenciada: {{{0}}} en {1}"
4990
4991
#: bzrlib/check.py:218
4992
#, python-format
4993
msgid "%6d revisions are missing inventory_sha1"
4994
msgstr ""
4995
4996
#: bzrlib/check.py:221
4997
#, python-format
4998
msgid "%6d revisions are mentioned but not present"
4999
msgstr "%6d revisiones mencionadas pero no presentes"
5000
5001
#: bzrlib/check.py:224
5002
#, python-format
5003
msgid "%6d ghost revisions"
5004
msgstr "%6d revisiones fantasma"
5005
5006
#: bzrlib/check.py:229
5007
#, python-format
5008
msgid "%6d revisions missing parents in ancestry"
5009
msgstr ""
5010
5011
#: bzrlib/check.py:233
5012
#, python-format
5013
msgid " %s should be in the ancestry for:"
5014
msgstr ""
5015
5016
#: bzrlib/check.py:237
5017
#, python-format
5018
msgid "%6d inconsistent parents"
5019
msgstr "%6d padres inconsistentes"
5020
5021
#: bzrlib/check.py:241
5022
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
5023
msgstr ""
5024
5025
#: bzrlib/check.py:247
5026
#, python-format
5027
msgid "%6d revisions have incorrect parents in the revision index"
5028
msgstr ""
5029
5030
#: bzrlib/check.py:253
5031
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
5032
msgstr ""
5033
5034
#: bzrlib/check.py:267
5035
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
5036
msgstr ""
5037
5038
#: bzrlib/check.py:296
5039
msgid ""
5040
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5041
"{{{4}}}"
5042
msgstr ""
5043
5044
#: bzrlib/check.py:354
5045
#, python-format
5046
msgid "Checking branch at '%s'."
5047
msgstr "Comprobando rama en «%s»."
5048
5049
#: bzrlib/check.py:374
5050
#, python-format
5051
msgid "Checking working tree at '%s'."
5052
msgstr "Comprobando árbol de trabajo en «%s»."
5053
5054
#: bzrlib/check.py:427 bzrlib/check.py:441
5055
msgid "No branch found at specified location."
5056
msgstr "No se ha encontrado rama en la ubicación especificada."
5057
5058
#: bzrlib/check.py:429 bzrlib/check.py:439
5059
msgid "No working tree found at specified location."
5060
msgstr "No se ha encontrado árbol de trabajo en la ubicación especificada."
5061
5062
#: bzrlib/check.py:432
5063
#, python-format
5064
msgid "Checking repository at '%s'."
5065
msgstr "Comprobando repositorio en «%s»."
5066
5067
#: bzrlib/check.py:443
5068
msgid "No repository found at specified location."
5069
msgstr "No se ha encontrado repositorio en la ubicación especificada."
5070
5071
#: bzrlib/clean_tree.py:63
5072
msgid "Nothing to delete."
5073
msgstr "Nada que eliminar."
5074
5075
#: bzrlib/clean_tree.py:68
5076
msgid "Are you sure you wish to delete these"
5077
msgstr "Está seguro de querer eliminar este"
5078
5079
#: bzrlib/clean_tree.py:70
5080
msgid "Canceled"
5081
msgstr "Cancelado"
5082
5083
#: bzrlib/clean_tree.py:107
5084
#, python-format
5085
msgid "unable to remove %s"
5086
msgstr "imposible eliminar %s"
5087
5088
#: bzrlib/clean_tree.py:111
5089
msgid "deleting paths:"
5090
msgstr "eliminar rutas:"
5091
5092
#: bzrlib/clean_tree.py:125
5093
msgid "unable to remove \"{0}\": {1}."
5094
msgstr "imposible eliminar «{0}»: {1}."
5095
5096
#: bzrlib/clean_tree.py:130
5097
msgid "No files deleted."
5098
msgstr "No hay archivos eliminados."
5099
5100
#: bzrlib/cmd_version_info.py:47
5101
msgid "No known version info format {0}. Supported types are: {1}"
5102
msgstr ""
5103
5104
#: bzrlib/cmd_version_info.py:52
5105
msgid "Version info in Custom template-based format."
5106
msgstr ""
5107
5108
#: bzrlib/cmd_version_info.py:52
5109
msgid "Version info in Python format."
5110
msgstr ""
5111
5112
#: bzrlib/cmd_version_info.py:52
5113
msgid "Version info in RIO (simple text) format (default)."
5114
msgstr ""
5115
5116
#: bzrlib/cmd_version_info.py:53
5117
msgid "Show version information about this tree."
5118
msgstr "Mostrar la información de la versión acerca de este árbol."
5119
5120
#: bzrlib/cmd_version_info.py:55
5121
msgid ""
5122
"You can use this command to add information about version into\n"
5123
"source code of an application. The output can be in one of the\n"
5124
"supported formats or in a custom format based on a template."
5125
msgstr ""
5126
5127
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5128
#: en/help_topics/configuration.txt:722
5129
msgid "For example::"
5130
msgstr "Por ejemplo::"
5131
5132
#: bzrlib/cmd_version_info.py:61
5133
msgid ""
5134
" bzr version-info --custom \\\n"
5135
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5136
msgstr ""
5137
5138
#: bzrlib/cmd_version_info.py:64
5139
msgid ""
5140
"will produce a C header file with formatted string containing the\n"
5141
"current revision number. Other supported variables in templates are:"
5142
msgstr ""
5143
5144
#: bzrlib/cmd_version_info.py:67
5145
msgid ""
5146
" * {date} - date of the last revision\n"
5147
" * {build_date} - current date\n"
5148
" * {revno} - revision number\n"
5149
" * {revision_id} - revision id\n"
5150
" * {branch_nick} - branch nickname\n"
5151
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5152
" otherwise 1"
5153
msgstr ""
5154
5155
#: bzrlib/cmd_version_info.py:77
5156
msgid "Select the output format."
5157
msgstr "Seleccionar el formato de salida."
5158
5159
#: bzrlib/cmd_version_info.py:81
5160
msgid "Include all possible information."
5161
msgstr "Incluir toda la información posible."
5162
5163
#: bzrlib/cmd_version_info.py:82
5164
msgid "Check if tree is clean."
5165
msgstr "Comprobar si el árbol está limpio."
5166
5167
#: bzrlib/cmd_version_info.py:84
5168
msgid "Include the revision-history."
5169
msgstr ""
5170
5171
#: bzrlib/cmd_version_info.py:86
5172
msgid "Include the last revision for each file."
5173
msgstr "Incluir la úlima revisión para cada archivo."
5174
5175
#: bzrlib/cmd_version_info.py:87
5176
msgid "Template for the output."
5177
msgstr "Plantilla para la salida."
5178
5179
#: bzrlib/cmd_version_info.py:101
5180
msgid "bzr version-info --revision takes exactly one revision specifier"
5181
msgstr ""
5182
5183
#: bzrlib/commands.py:229
5184
#, python-format
5185
msgid "unknown command \"%s\""
5186
msgstr "orden «%s» desconocida"
5187
5188
#: bzrlib/commands.py:476
5189
msgid "No help for this command."
5190
msgstr "No hay ayuda para esta orden."
5191
5192
#: bzrlib/commands.py:489
5193
#, python-format
5194
msgid ":Purpose: %s\n"
5195
msgstr ":Propósito: %s\n"
5196
5197
#: bzrlib/commands.py:491
5198
#, python-format
5199
msgid ""
5200
":Usage:\n"
5201
"%s\n"
5202
msgstr ""
5203
":Uso:\n"
5204
"%s\n"
5205
5206
#: bzrlib/commands.py:493
5207
#, python-format
5208
msgid ":Usage: %s\n"
5209
msgstr ":Uso: %s\n"
5210
5211
#: bzrlib/commands.py:512
5212
#, python-format
5213
msgid ":Options:%s"
5214
msgstr ":Opciones:%s"
5215
5216
#: bzrlib/commands.py:523
5217
#, python-format
5218
msgid ""
5219
":Description:\n"
5220
" %s\n"
5221
"\n"
5222
msgstr ""
5223
":Descripción:\n"
5224
" %s\n"
5225
"\n"
5226
5227
#: bzrlib/commands.py:533
5228
#, python-format
5229
msgid ""
5230
"See bzr help %s for more details and examples.\n"
5231
"\n"
5232
msgstr ""
5233
"Vea bzr help %s para más detalles y ejemplos.\n"
5234
"\n"
5235
5236
#: bzrlib/commands.py:538
5237
msgid ":Aliases: "
5238
msgstr ":Alias: "
5239
5240
#: bzrlib/commands.py:542
5241
#, python-format
5242
msgid ":From: plugin \"%s\"\n"
5243
msgstr ":Desde: complemento «%s»\n"
5244
5245
#: bzrlib/commands.py:554
5246
msgid ":doc:`{0} <{1}-help>`"
5247
msgstr ":doc:`{0} <{1}-help>`"
5248
5249
#: bzrlib/commands.py:558
5250
#, python-format
5251
msgid ":See also: %s"
5252
msgstr ":Vea también: %s"
5253
5254
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5255
msgid "Only ASCII permitted in option names"
5256
msgstr "Solo se permiten nombres de opción en ASCII"
5257
5258
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5259
msgid "command {0!r} needs one or more {1}"
5260
msgstr "la orden {0!r} necesita una o más {1}"
5261
5262
#: bzrlib/commands.py:868
5263
msgid "command {0!r} requires argument {1}"
5264
msgstr "la orden {0!r} necesita un argumento {1}"
5265
5266
#: bzrlib/commands.py:875
5267
msgid "extra argument to command {0}: {1}"
5268
msgstr ""
5269
5270
#: bzrlib/commands.py:972
5271
#, python-format
5272
msgid "Profile data written to \"%s\"."
5273
msgstr "Datos de perfil escritos en «%s»"
5274
5275
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5276
msgid "added"
5277
msgstr "añadido"
5278
5279
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5280
msgid "modified"
5281
msgstr "modificado"
5282
5283
#: bzrlib/commit.py:131
5284
#, python-format
5285
msgid "Committing%s"
5286
msgstr ""
5287
5288
#: bzrlib/commit.py:134
5289
#, python-format
5290
msgid "Committed revision %d."
5291
msgstr ""
5292
5293
#: bzrlib/commit.py:143
5294
#, python-format
5295
msgid "deleted %s"
5296
msgstr "eliminado %s"
5297
5298
#: bzrlib/commit.py:146
5299
#, python-format
5300
msgid "missing %s"
5301
msgstr "falta %s"
5302
5303
#: bzrlib/commit.py:511
5304
msgid ""
5305
"Conflicting tags in bound branch:\n"
5306
"{0}"
5307
msgstr ""
5308
5309
#: bzrlib/commit.py:742
5310
msgid "renamed"
5311
msgstr "renombrado"
5312
5313
#: bzrlib/commit.py:976
5314
msgid "unchanged"
5315
msgstr "sin cambios"
5316
5317
#: bzrlib/commit.py:998
5318
msgid "{0} [{1}] - Stage"
5319
msgstr ""
5320
5321
#: bzrlib/commit.py:1001
5322
#, python-format
5323
msgid "%s - Stage"
5324
msgstr ""
5325
5326
#: bzrlib/commit_signature_commands.py:34
5327
msgid "Sign all commits by a given committer."
5328
msgstr ""
5329
5330
#: bzrlib/commit_signature_commands.py:36
5331
msgid ""
5332
"If location is not specified the local tree is used.\n"
5333
"If committer is not specified the default committer is used."
5334
msgstr ""
5335
5336
#: bzrlib/commit_signature_commands.py:39
5337
msgid "This does not sign commits that already have signatures."
5338
msgstr ""
5339
5340
#: bzrlib/commit_signature_commands.py:47
5341
msgid ""
5342
"Don't actually sign anything, just print the revisions that would be signed."
5343
msgstr ""
5344
5345
#: bzrlib/commit_signature_commands.py:98
5346
#, python-format
5347
msgid "Signed %d revision.\n"
5348
msgid_plural "Signed %d revisions.\n"
5349
msgstr[0] ""
5350
msgstr[1] ""
5351
5352
#: bzrlib/commit_signature_commands.py:103
5353
msgid "Verify all commit signatures."
5354
msgstr "Verificar todas las firmas de ejecución."
5355
5356
#: bzrlib/commit_signature_commands.py:105
5357
msgid ""
5358
"Verifies that all commits in the branch are signed by known GnuPG keys."
5359
msgstr ""
5360
5361
#: bzrlib/commit_signature_commands.py:110
5362
msgid ""
5363
"Comma separated list of GPG key patterns which are acceptable for "
5364
"verification."
5365
msgstr ""
5366
5367
#: bzrlib/commit_signature_commands.py:148
5368
msgid "Cannot verify a range of non-revision-history revisions"
5369
msgstr ""
5370
5371
#: bzrlib/commit_signature_commands.py:166
5372
msgid "All commits signed with verifiable keys"
5373
msgstr ""
5374
5375
#: bzrlib/config.py:436
5376
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5377
msgstr ""
5378
5379
#: bzrlib/config.py:2452
5380
msgid "{0} is not an SI unit."
5381
msgstr ""
5382
5383
#: bzrlib/config.py:2971
5384
msgid ""
5385
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5386
"will be saved."
5387
msgstr ""
5388
5389
#: bzrlib/config.py:3116
5390
#, python-format
5391
msgid "Invalid '%s', should be of the form 'name=value'"
5392
msgstr ""
5393
5394
#: bzrlib/config.py:4018
5395
msgid "Display, set or remove a configuration option."
5396
msgstr "Mostrar, establecer o eliminar una opción de configuración."
5397
5398
#: bzrlib/config.py:4020
5399
msgid "Display the active value for a given option."
5400
msgstr "Mostrar el valor activo para la opción dada."
5401
5402
#: bzrlib/config.py:4022
5403
msgid ""
5404
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5405
"matching options are displayed mentioning their scope. The active value\n"
5406
"that bzr will take into account is the first one displayed for each option."
5407
msgstr ""
5408
5409
#: bzrlib/config.py:4026
5410
msgid "If no NAME is given, --all .* is implied."
5411
msgstr ""
5412
5413
#: bzrlib/config.py:4028
5414
msgid ""
5415
"Setting a value is achieved by using name=value without spaces. The value\n"
5416
"is set in the most relevant scope and can be checked by displaying the\n"
5417
"option again."
5418
msgstr ""
5419
5420
#: bzrlib/config.py:4040
5421
msgid "Reduce the scope to the specified configuration file."
5422
msgstr ""
5423
5424
#: bzrlib/config.py:4044
5425
msgid "Display all the defined values for the matching options."
5426
msgstr ""
5427
5428
#: bzrlib/config.py:4046
5429
msgid "Remove the option from the configuration file."
5430
msgstr "Eliminar la opción del archivo de configuración."
5431
5432
#: bzrlib/conflicts.py:50
5433
msgid "List files with conflicts."
5434
msgstr "Lista de archivos con conflictos."
5435
5436
#: bzrlib/conflicts.py:57
5437
msgid ""
5438
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5439
"is supplied, the pathnames of files with text conflicts are listed,\n"
5440
"instead. (This is useful for editing all files with text conflicts.)"
5441
msgstr ""
5442
5443
#: bzrlib/conflicts.py:61
5444
msgid "Use bzr resolve when you have fixed a problem."
5445
msgstr ""
5446
5447
#: bzrlib/conflicts.py:66
5448
msgid "List paths of files with text conflicts."
5449
msgstr "Lista de rutas de archivos con conflictos de texto."
5450
5451
#: bzrlib/conflicts.py:85
5452
msgid "Marks the conflict as resolved."
5453
msgstr "Marca el conflicto como resuelto."
5454
5455
#: bzrlib/conflicts.py:88
5456
msgid "Resolve the conflict preserving the version in the working tree."
5457
msgstr ""
5458
5459
#: bzrlib/conflicts.py:91
5460
msgid "Resolve the conflict taking the merged version into account."
5461
msgstr ""
5462
5463
#: bzrlib/conflicts.py:98
5464
msgid "How to resolve the conflict."
5465
msgstr "Cómo resolver el conflicto."
5466
5467
#: bzrlib/conflicts.py:104
5468
msgid "Mark a conflict as resolved."
5469
msgstr "Marcar un conflicto como resuelto."
5470
5471
#: bzrlib/conflicts.py:111
5472
msgid ""
5473
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5474
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5475
"as\n"
5476
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5477
msgstr ""
5478
5479
#: bzrlib/conflicts.py:119
5480
msgid "Resolve all conflicts in this tree."
5481
msgstr "Resolver todos los conflictos es este árbol."
5482
5483
#: bzrlib/conflicts.py:126
5484
msgid "If --all is specified, no FILE may be provided"
5485
msgstr ""
5486
5487
#: bzrlib/conflicts.py:151
5488
#, python-format
5489
msgid "%d conflict auto-resolved."
5490
msgid_plural "%d conflicts auto-resolved."
5491
msgstr[0] ""
5492
msgstr[1] ""
5493
5494
#: bzrlib/conflicts.py:154
5495
msgid "Remaining conflicts:"
5496
msgstr "Mantener conflictos:"
5497
5498
#: bzrlib/conflicts.py:159
5499
msgid "All conflicts resolved."
5500
msgstr "Todos los conflictos resueltos."
5501
5502
#: bzrlib/conflicts.py:168
5503
msgid "{0} conflict resolved, {1} remaining"
5504
msgid_plural "{0} conflicts resolved, {1} remaining"
5505
msgstr[0] ""
5506
msgstr[1] ""
5507
5508
#: bzrlib/controldir.py:712
5509
msgid "{0} is{1} redirected to {2}"
5510
msgstr "{0} es{1} redirigido a {2}"
5511
5512
#: bzrlib/diff.py:399
5513
#, python-format
5514
msgid "*** Ignoring files outside view. View is %s"
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:157
5518
msgid "The tree builder is already building a tree."
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:178
5522
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:197
5526
msgid ""
5527
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5528
"versions \"%(minimum)s\" to \"%(current)s\"."
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:209
5532
msgid "The transport '%(transport)s' is only accessible within this process."
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:227
5536
msgid "Invalid revision number %(revno)s"
5537
msgstr "número de revisión no válido %(revno)s"
5538
5539
#: bzrlib/errors.py:236
5540
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:247
5544
msgid "Reserved revision-id {%(revision_id)s}"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:261
5548
msgid "There is no public branch set for \"%(branch_url)s\"."
5549
msgstr "No hay una rama publica establecida para «%(branch_url)s»."
5550
5551
#: bzrlib/errors.py:271
5552
msgid ""
5553
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5554
"obtain a list of topics."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:280
5558
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:290
5562
msgid ""
5563
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:299
5567
msgid "The branch '%(branch)s' is not stacked."
5568
msgstr "La rama «%(branch)s» no está apilada."
5569
5570
#: bzrlib/errors.py:313
5571
msgid "No WorkingTree exists for \"%(base)s\"."
5572
msgstr "No existe un árbol de trabajo para «%(base)s»."
5573
5574
#: bzrlib/errors.py:322
5575
msgid "Not currently building a tree."
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:327
5579
msgid "%(url)s is not a local path."
5580
msgstr "%(url)s no es una ruta local."
5581
5582
#: bzrlib/errors.py:355
5583
msgid "%(not_locked)r is not write locked but needs to be."
5584
msgstr ""
5585
"%(not_locked)r no está bloqueado contra escritura pero tiene que estarlo."
5586
5587
#: bzrlib/errors.py:363
5588
msgid "Error in command line options"
5589
msgstr "Error en las opciones de la línea de órdenes"
5590
5591
#: bzrlib/errors.py:368
5592
msgid "%(value)s is not an index of type %(_type)s."
5593
msgstr "%(value)s no es un índice de tipo %(_type)s."
5594
5595
#: bzrlib/errors.py:378
5596
msgid "Error in data for index %(value)s."
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:387
5600
msgid "The key '%(key)s' is already in index '%(index)s'."
5601
msgstr "La clave «%(key)s» ya está en el índice «%(index)s»."
5602
5603
#: bzrlib/errors.py:397
5604
msgid "The key '%(key)s' is not a valid key."
5605
msgstr "La clave «%(key)s» no es una clave válida."
5606
5607
#: bzrlib/errors.py:406
5608
msgid "Could not parse options for index %(value)s."
5609
msgstr "No se pueden analizar las opciones para el índice %(value)s."
5610
5611
#: bzrlib/errors.py:415
5612
msgid "The value '%(value)s' is not a valid value."
5613
msgstr "El valor «%(value)s» no es un valor válido."
5614
5615
#: bzrlib/errors.py:424
5616
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5617
msgstr "Valor erróneo «%(value)s» para la opción «%(name)s»."
5618
5619
#: bzrlib/errors.py:443
5620
msgid "Generic path error: %(path)r%(extra)s)"
5621
msgstr "Error ruta genérica: %(path)r%(extra)s)"
5622
5623
#: bzrlib/errors.py:456
5624
msgid "No such file: %(path)r%(extra)s"
5625
msgstr "Ningún archivo: %(path)r%(extra)s"
5626
5627
#: bzrlib/errors.py:461
5628
msgid "File exists: %(path)r%(extra)s"
5629
msgstr "El archivo existe: %(path)r%(extra)s"
5630
5631
#: bzrlib/errors.py:467
5632
msgid ""
5633
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5634
"after to tell bzr about a rename that has already happened)%(extra)s"
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:483
5638
msgid "\"%(path)s\" is not a directory %(extra)s"
5639
msgstr "«%(path)s» no es una carpeta %(extra)s"
5640
5641
#: bzrlib/errors.py:488
5642
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5643
msgstr ""
5644
5645
#: bzrlib/errors.py:493
5646
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5647
msgstr "La carpeta no está vacía: «%(path)s»%(extra)s"
5648
5649
#: bzrlib/errors.py:498
5650
msgid "Hard-linking \"%(path)s\" is not supported"
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:513
5654
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:518
5658
msgid "Permission denied: \"%(path)s\"%(extra)s"
5659
msgstr "Permiso denegado: «%(path)s»%(extra)s"
5660
5661
#: bzrlib/errors.py:523
5662
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5663
msgstr ""
5664
5665
#: bzrlib/errors.py:528
5666
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:539
5670
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:561
5674
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:571
5678
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:579
5682
msgid ""
5683
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5684
"upgrade the branch to permit branch stacking."
5685
msgstr ""
5686
5687
#: bzrlib/errors.py:590
5688
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5689
msgstr ""
5690
5691
#: bzrlib/errors.py:600
5692
msgid ""
5693
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5694
"need to upgrade the repository to permit branch stacking."
5695
msgstr ""
5696
5697
#: bzrlib/errors.py:611
5698
msgid "Error reading from %(path)r."
5699
msgstr ""
5700
5701
#: bzrlib/errors.py:630
5702
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:646
5706
msgid "Path \"%(path)s\" is not unicode normalized"
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:654
5710
msgid "Not a branch: \"%(path)s\"%(detail)s."
5711
msgstr "No es una rama: «%(path)s»%(detail)s."
5712
5713
#: bzrlib/errors.py:696
5714
msgid "No submit branch available for branch \"%(path)s\""
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:705
5718
msgid "A control directory already exists: \"%(path)s\"."
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:710
5722
msgid "Already a branch: \"%(path)s\"."
5723
msgstr "Ya hay una rama: «%(path)s»."
5724
5725
#: bzrlib/errors.py:715
5726
msgid "Invalid branch name: %(name)s"
5727
msgstr "Nombre de rama no válido: %(name)s"
5728
5729
#: bzrlib/errors.py:724
5730
msgid "Parent branch already exists: \"%(path)s\"."
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:730
5734
msgid ""
5735
"Directory contains a branch, but no working tree (use bzr checkout if you "
5736
"wish to build a working tree): \"%(path)s\""
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:735
5740
msgid ""
5741
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:745
5745
msgid ""
5746
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:755
5750
msgid "No repository present: \"%(path)s\""
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:762
5754
msgid ""
5755
"Unsupported branch format: %(format)s\n"
5756
"Please run 'bzr upgrade'"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:768
5760
msgid "Unknown %(kind)s format: %(format)r"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:777
5764
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:787
5768
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:802
5772
msgid ""
5773
"%(target)s\n"
5774
"is not compatible with\n"
5775
"%(source)s\n"
5776
"%(details)s"
5777
msgstr ""
5778
"%(target)s\n"
5779
"no es compatible con\n"
5780
"%(source)s\n"
5781
"%(details)s"
5782
5783
#: bzrlib/errors.py:818
5784
msgid "Revision is not compatible with %(repo_format)s"
5785
msgstr "La revisión no es compatible con %(repo_format)s"
5786
5787
#: bzrlib/errors.py:828
5788
msgid "%(context_info)s%(path)s is already versioned."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:849
5792
msgid "%(context_info)s%(path)s is not versioned."
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:870
5796
msgid "Path(s) are not versioned: %(paths_as_string)s"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:881
5800
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:900
5804
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:908
5808
msgid ""
5809
"Filename %(filename)r is not valid in your current filesystem encoding "
5810
"%(fs_encoding)s"
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:919
5814
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:937
5818
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:976
5822
msgid "Cannot lock %(lock)s: %(why)s"
5823
msgstr "No se puede bloquear %(lock)s: %(why)s"
5824
5825
#: bzrlib/errors.py:986
5826
msgid ""
5827
"A transaction related operation was attempted after the transaction finished."
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:1013
5831
msgid "Cannot lock: transport is read only: %(transport)s"
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:1021
5835
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:1032
5839
msgid ""
5840
"Lock was broken while still open: %(lock)s - check storage consistency!"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:1043
5844
msgid ""
5845
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5846
"%(holder)r, wanted to break %(target)r"
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:1055
5850
msgid ""
5851
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5852
"Use 'bzr break-lock' to clear it"
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:1068
5856
msgid "Lock not held: %(lock)s"
5857
msgstr ""
5858
5859
#: bzrlib/errors.py:1097
5860
msgid "No changes to commit"
5861
msgstr "No hay cambios que ejecutar."
5862
5863
#: bzrlib/errors.py:1102
5864
msgid ""
5865
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:1112
5869
msgid ""
5870
"Excluding paths during commit is not supported by repository at "
5871
"%(repository)r."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:1121
5875
msgid ""
5876
"The specified commit message contains characters unsupported by the current "
5877
"encoding."
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:1127
5881
msgid "Upgrade URL cannot work with readonly URLs."
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:1132
5885
msgid "The branch format %(format)s is already at the most recent format."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:1155
5889
msgid "Option --change does not accept revision ranges"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:1160
5893
msgid "No namespace registered for string: %(spec)r"
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:1179
5897
msgid ""
5898
"Requested revision: '%(spec)s' does not exist in branch: "
5899
"%(branch_url)s%(extra)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:1193
5903
msgid ""
5904
"Operation denied because it would change the main history, which is not "
5905
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:1204
5909
msgid ""
5910
"These branches have diverged. Use the missing command to see how.\n"
5911
"Use the merge command to reconcile them."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:1224
5915
msgid ""
5916
"Branches have no common ancestor, and no merge base revision was specified."
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:1230
5920
msgid ""
5921
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:1236
5925
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:1245
5929
msgid ""
5930
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:1254
5934
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:1263
5938
msgid "Branch %(branch)s has no commits."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:1281
5942
msgid ""
5943
"Bound branch %(branch)s is out of date with master branch "
5944
"%(master)s.%(extra_help)s"
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:1293
5948
msgid ""
5949
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5950
"bound to %(remote)s."
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:1305
5954
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:1314
5958
msgid ""
5959
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5960
"%(error)s"
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:1326
5964
msgid "Error in processing weave: %(msg)s"
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:1335
5968
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:1346
5972
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:1356
5976
msgid "Weave invariant violated: %(what)s"
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:1365
5980
msgid "Parents are mismatched between two revisions. %(msg)s"
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:1387
5984
msgid ""
5985
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5986
"%(weave_b)s"
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:1399
5990
msgid "Versioned file error"
5991
msgstr "Error en el archivo versiondao"
5992
5993
#: bzrlib/errors.py:1404
5994
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:1414
5998
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:1424
6002
msgid "Text did not match its checksum: %(msg)s"
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:1550
6006
msgid "Export format %(format)r not supported"
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:1559
6010
msgid "Transport error: %(msg)s %(orig_error)s"
6011
msgstr "Error de transporte: %(msg)s %(orig_error)s"
6012
6013
#: bzrlib/errors.py:1585
6014
msgid "Generic bzr smart protocol error: %(details)s"
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:1593
6018
msgid "Received bad protocol version marker: %(marker)r"
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:1625
6022
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:1630
6026
msgid "Connection error: %(msg)s %(orig_error)s"
6027
msgstr "Error de conexión: %(msg)s %(orig_error)s"
6028
6029
#: bzrlib/errors.py:1635
6030
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:1656
6034
msgid "Connection closed: %(msg)s %(orig_error)s"
6035
msgstr "Conexión cerrada: %(msg)s %(orig_error)s"
6036
6037
#: bzrlib/errors.py:1661
6038
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6039
msgstr "Tiempo de espera de la conexión agotado: %(msg)s%(orig_error)s"
6040
6041
#: bzrlib/errors.py:1666
6042
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:1676
6046
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:1691
6050
msgid "Certificate error: %(error)s"
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:1699
6054
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6055
msgstr "rango http no válido %(range)r para %(path)s: %(msg)s"
6056
6057
#: bzrlib/errors.py:1713
6058
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:1721
6062
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:1730
6066
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:1744
6070
msgid "Too many redirections"
6071
msgstr "Demasiadas redirecciones"
6072
6073
#: bzrlib/errors.py:1749
6074
msgid "Working tree has conflicts."
6075
msgstr "El árbol de trabajo tiene conflictos."
6076
6077
#: bzrlib/errors.py:1753
6078
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:1762
6082
msgid ""
6083
"Error(s) parsing config file %(filename)s:\n"
6084
"%(errors)s"
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:1772
6088
msgid ""
6089
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6090
"See ``bzr help %(name)s``"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:1782
6094
msgid "%(username)r does not seem to contain a reasonable email address"
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:1791
6098
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:1799
6102
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:1807
6106
msgid "Unable to import library \"%(library)s\": %(error)s"
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:1815
6110
msgid "python-gpgme is not installed, it is needed to verify signatures"
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:1823
6114
msgid ""
6115
"The working tree for %(basedir)s has changed since the last commit, but "
6116
"weave merge requires that it be unchanged"
6117
msgstr ""
6118
6119
#: bzrlib/errors.py:1833
6120
msgid ""
6121
"Can't reprocess and show base, because reprocessing obscures the "
6122
"relationship of conflicting lines to the base"
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:1839
6126
msgid "Cycle in graph %(graph)r"
6127
msgstr ""
6128
6129
#: bzrlib/errors.py:1867
6130
msgid "File %(filename)s is not conflicted."
6131
msgstr ""
6132
6133
#: bzrlib/errors.py:1889
6134
msgid "No bundle was found in \"%(filename)s\"."
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:1898
6138
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:1908
6142
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:1921
6146
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:1931
6150
msgid "Key %(key)s is already present in map"
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:1936
6154
msgid "The prefix %(prefix)s is in the help search path twice."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:1946
6158
msgid ""
6159
"No final name for trans_id %(trans_id)r\n"
6160
"file-id: %(file_id)r\n"
6161
"root trans-id: %(root_trans_id)r\n"
6162
msgstr ""
6163
6164
#: bzrlib/errors.py:1978
6165
msgid "Attempt to reuse a transform that has already been applied."
6166
msgstr ""
6167
6168
#: bzrlib/errors.py:1983
6169
msgid "Moving the root directory is not supported at this time"
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:1988
6173
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6174
msgstr "Fallo al renombrar %(from_path)s a %(to_path)s: %(why)s"
6175
6176
#: bzrlib/errors.py:1999
6177
msgid ""
6178
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6179
msgstr ""
6180
6181
#: bzrlib/errors.py:2035
6182
msgid ""
6183
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6184
msgstr ""
6185
6186
#: bzrlib/errors.py:2065
6187
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6188
msgstr ""
6189
6190
#: bzrlib/errors.py:2073
6191
msgid "Nothing to merge."
6192
msgstr "Nada a fusionar."
6193
6194
#: bzrlib/errors.py:2078
6195
msgid "Format %(format)s cannot be initialised by this version of bzr."
6196
msgstr ""
6197
6198
#: bzrlib/errors.py:2087
6199
msgid ""
6200
"Cannot convert from format %(from_format)s to format %(format)s. "
6201
"%(problem)s"
6202
msgstr ""
6203
6204
#: bzrlib/errors.py:2099
6205
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:2107
6209
msgid "%(exe_name)s could not be found on this machine"
6210
msgstr "%(exe_name)s no se encuentra en este equipo"
6211
6212
#: bzrlib/errors.py:2115
6213
msgid "Diff is not installed on this machine: %(msg)s"
6214
msgstr "Diff no está instalado en este equipo: %(msg)s"
6215
6216
#: bzrlib/errors.py:2123
6217
msgid "Diff3 is not installed on this machine."
6218
msgstr "Diff3 no está instalado en este equipo."
6219
6220
#: bzrlib/errors.py:2129
6221
msgid "The content being inserted is already present."
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:2134
6225
msgid ""
6226
"This tree contains left-over files from a failed operation.\n"
6227
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6228
"to\n"
6229
" keep, and delete it when you are done."
6230
msgstr ""
6231
6232
#: bzrlib/errors.py:2145
6233
msgid ""
6234
"This tree contains left-over files from a failed operation.\n"
6235
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6236
" wish to keep, and delete it when you are done."
6237
msgstr ""
6238
6239
#: bzrlib/errors.py:2155
6240
msgid ""
6241
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6242
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6243
"to\n"
6244
" keep, and delete it when you are done."
6245
msgstr ""
6246
6247
#: bzrlib/errors.py:2166
6248
msgid ""
6249
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6250
"examine %(pending_deletion)s to see if it contains any files you wish to "
6251
"keep, and delete it when you are done."
6252
msgstr ""
6253
6254
#: bzrlib/errors.py:2176
6255
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6256
msgstr ""
6257
6258
#: bzrlib/errors.py:2190
6259
msgid ""
6260
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6261
msgstr ""
6262
6263
#: bzrlib/errors.py:2203
6264
msgid "Error in merge modified format"
6265
msgstr "Error en el formato modificado de fusión"
6266
6267
#: bzrlib/errors.py:2208
6268
msgid "Format error in conflict listings"
6269
msgstr ""
6270
6271
#: bzrlib/errors.py:2212
6272
msgid ""
6273
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6274
"Error: %(description)s"
6275
msgstr ""
6276
6277
#: bzrlib/errors.py:2223
6278
msgid ""
6279
"An error has been detected in the repository %(repo_path)s.\n"
6280
"Please run bzr reconcile on this repository."
6281
msgstr ""
6282
6283
#: bzrlib/errors.py:2234
6284
msgid ""
6285
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6286
"reason: %(reason)s"
6287
msgstr ""
6288
6289
#: bzrlib/errors.py:2247
6290
msgid ""
6291
"An inconsistent delta was supplied: %(delta)r\n"
6292
"reason: %(reason)s"
6293
msgstr ""
6294
6295
#: bzrlib/errors.py:2259
6296
msgid "To use this feature you must upgrade your branch at %(path)s."
6297
msgstr ""
6298
6299
#: bzrlib/errors.py:2268
6300
msgid "To use this feature you must upgrade your repository at %(path)s."
6301
msgstr ""
6302
6303
#: bzrlib/errors.py:2273
6304
msgid ""
6305
"To use this feature you must upgrade your branch at %(path)s to a format "
6306
"which supports rich roots."
6307
msgstr ""
6308
6309
#: bzrlib/errors.py:2279
6310
msgid "Cannot perform local-only commits on unbound branches."
6311
msgstr ""
6312
6313
#: bzrlib/errors.py:2284
6314
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6315
msgstr ""
6316
6317
#: bzrlib/errors.py:2305
6318
msgid "Ghost tags not supported by format %(format)r."
6319
msgstr ""
6320
6321
#: bzrlib/errors.py:2313
6322
msgid "File is binary but should be text."
6323
msgstr "El archivo es binario pero debe ser texto."
6324
6325
#: bzrlib/errors.py:2318
6326
msgid "The path %(path)s is not permitted on this platform"
6327
msgstr "La ruta %(path)s no está permitida en esta plataforma"
6328
6329
#: bzrlib/errors.py:2327
6330
msgid ""
6331
"Testament did not match expected value.\n"
6332
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6333
" {%(measured)s}"
6334
msgstr ""
6335
6336
#: bzrlib/errors.py:2339
6337
msgid "Not a bzr revision-bundle: %(text)r"
6338
msgstr ""
6339
6340
#: bzrlib/errors.py:2348
6341
msgid "Bad bzr revision-bundle: %(text)r"
6342
msgstr ""
6343
6344
#: bzrlib/errors.py:2357
6345
msgid "Malformed bzr revision-bundle header: %(text)r"
6346
msgstr ""
6347
6348
#: bzrlib/errors.py:2362
6349
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6350
msgstr ""
6351
6352
#: bzrlib/errors.py:2367
6353
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6354
msgstr ""
6355
6356
#: bzrlib/errors.py:2372
6357
msgid "End of line marker was not \\n in bzr revision-bundle"
6358
msgstr ""
6359
6360
#: bzrlib/errors.py:2382
6361
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6362
msgstr ""
6363
6364
#: bzrlib/errors.py:2392
6365
msgid "Root class for inventory serialization errors"
6366
msgstr ""
6367
6368
#: bzrlib/errors.py:2396
6369
msgid ""
6370
"The inventory was not in the expected format:\n"
6371
" %(msg)s"
6372
msgstr ""
6373
6374
#: bzrlib/errors.py:2405
6375
msgid "This operation requires rich root data storage"
6376
msgstr ""
6377
6378
#: bzrlib/errors.py:2418
6379
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6380
msgstr ""
6381
6382
#: bzrlib/errors.py:2427
6383
msgid ""
6384
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6385
"variable."
6386
msgstr ""
6387
6388
#: bzrlib/errors.py:2434
6389
msgid ""
6390
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6391
"ghost at {%(ghost_revision_id)s}"
6392
msgstr ""
6393
6394
#: bzrlib/errors.py:2444
6395
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6396
msgstr ""
6397
6398
#: bzrlib/errors.py:2495
6399
msgid ""
6400
"A merge directive must provide either a bundle or a public branch location."
6401
msgstr ""
6402
6403
#: bzrlib/errors.py:2502
6404
msgid "Bad merge directive payload %(start)r"
6405
msgstr ""
6406
6407
#: bzrlib/errors.py:2512
6408
msgid "Preview patch does not match requested changes."
6409
msgstr ""
6410
6411
#: bzrlib/errors.py:2518
6412
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6413
msgstr ""
6414
6415
#: bzrlib/errors.py:2528
6416
msgid ""
6417
"Your branch does not have all of the revisions required in order to merge "
6418
"this merge directive and the target location specified in the merge "
6419
"directive is not a branch: %(location)s."
6420
msgstr ""
6421
6422
#: bzrlib/errors.py:2540
6423
msgid "Unsupported entry kind %(kind)s"
6424
msgstr ""
6425
6426
#: bzrlib/errors.py:2548
6427
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6428
msgstr ""
6429
6430
#: bzrlib/errors.py:2558
6431
msgid "Subsume target %(other_tree)s needs to be upgraded."
6432
msgstr ""
6433
6434
#: bzrlib/errors.py:2577
6435
msgid "No such tag: %(tag_name)s"
6436
msgstr ""
6437
6438
#: bzrlib/errors.py:2585
6439
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6440
msgstr ""
6441
6442
#: bzrlib/errors.py:2594
6443
msgid "Tag %(tag_name)s already exists."
6444
msgstr ""
6445
6446
#: bzrlib/errors.py:2602
6447
msgid ""
6448
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6449
"bugs\" for more information on this feature."
6450
msgstr ""
6451
6452
#: bzrlib/errors.py:2612
6453
msgid ""
6454
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6455
msgstr ""
6456
6457
#: bzrlib/errors.py:2622
6458
msgid ""
6459
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6460
msgstr ""
6461
6462
#: bzrlib/errors.py:2632
6463
msgid "Invalid line in bugs property: '%(line)s'"
6464
msgstr ""
6465
6466
#: bzrlib/errors.py:2640
6467
msgid "Invalid bug status: '%(status)s'"
6468
msgstr ""
6469
6470
#: bzrlib/errors.py:2648
6471
msgid "Could not understand response from smart server: %(response_tuple)r"
6472
msgstr ""
6473
6474
#: bzrlib/errors.py:2687
6475
msgid "Server sent an unexpected error: %(error_tuple)r"
6476
msgstr "El servidor envió un error inesperado: %(error_tuple)r"
6477
6478
#: bzrlib/errors.py:2706
6479
msgid "Unrecognised container format: %(container_format)r"
6480
msgstr ""
6481
6482
#: bzrlib/errors.py:2714
6483
msgid "Unexpected end of container stream"
6484
msgstr "Final inesperado del flujo del contenedor"
6485
6486
#: bzrlib/errors.py:2719
6487
msgid "Unknown record type: %(record_type)r"
6488
msgstr "Tipo de registro inesperado: %(record_type)r"
6489
6490
#: bzrlib/errors.py:2727
6491
msgid "Invalid record: %(reason)s"
6492
msgstr "Registro inesperado: %(reason)s"
6493
6494
#: bzrlib/errors.py:2735
6495
msgid "Container has data after end marker: %(excess)r"
6496
msgstr ""
6497
6498
#: bzrlib/errors.py:2743
6499
msgid "Container has multiple records with the same name: %(name)s"
6500
msgstr ""
6501
6502
#: bzrlib/errors.py:2756
6503
msgid "Corrupt or incompatible data stream: %(reason)s"
6504
msgstr ""
6505
6506
#: bzrlib/errors.py:2764
6507
msgid "SMTP error: %(error)s"
6508
msgstr "Error SMTP: %(error)s"
6509
6510
#: bzrlib/errors.py:2772
6511
msgid "No message supplied."
6512
msgstr "No se ha proporcionado mensaje."
6513
6514
#: bzrlib/errors.py:2777
6515
msgid "No mail-to address (--mail-to) or output (-o) specified."
6516
msgstr ""
6517
"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
6518
"o)."
6519
6520
#: bzrlib/errors.py:2782
6521
msgid ""
6522
"Unable to find mail client with the following names: "
6523
"%(mail_command_list_string)s"
6524
msgstr ""
6525
6526
#: bzrlib/errors.py:2792
6527
msgid "SMTP connection to %(host)s refused"
6528
msgstr "Las conexiones SMTP a %(host)s se han rechazado"
6529
6530
#: bzrlib/errors.py:2801
6531
msgid "Please specify smtp_server. No server at default %(host)s."
6532
msgstr ""
6533
6534
#: bzrlib/errors.py:2815
6535
msgid ""
6536
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6537
"reconfigure."
6538
msgstr ""
6539
6540
#: bzrlib/errors.py:2827
6541
msgid "'%(display_url)s' is already a branch."
6542
msgstr "«%(display_url)s» ya es una la rama."
6543
6544
#: bzrlib/errors.py:2832
6545
msgid "'%(display_url)s' is already a tree."
6546
msgstr "«%(display_url)s» ya es un árbol."
6547
6548
#: bzrlib/errors.py:2837
6549
msgid "'%(display_url)s' is already a checkout."
6550
msgstr "«%(display_url)s» ya es una comprobación."
6551
6552
#: bzrlib/errors.py:2842
6553
msgid "'%(display_url)s' is already a lightweight checkout."
6554
msgstr "«%(display_url)s» ya es una comprobación ligera."
6555
6556
#: bzrlib/errors.py:2847
6557
msgid "'%(display_url)s' is already using a shared repository."
6558
msgstr "«%(display_url)s» ya está usando un repositorio compartido."
6559
6560
#: bzrlib/errors.py:2852
6561
msgid "'%(display_url)s' is already standalone."
6562
msgstr "«%(display_url)s» ya es autónomo."
6563
6564
#: bzrlib/errors.py:2857
6565
msgid "Shared repository '%(display_url)s' already creates working trees."
6566
msgstr ""
6567
6568
#: bzrlib/errors.py:2863
6569
msgid ""
6570
"Shared repository '%(display_url)s' already doesn't create working trees."
6571
msgstr ""
6572
6573
#: bzrlib/errors.py:2869
6574
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6575
msgstr ""
6576
6577
#: bzrlib/errors.py:2874
6578
msgid "No location could be found to bind to at %(display_url)s."
6579
msgstr "No se encontró ubicación a donde vincular %(display_url)s."
6580
6581
#: bzrlib/errors.py:2879
6582
msgid ""
6583
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6584
"status).%(more)s"
6585
msgstr ""
6586
6587
#: bzrlib/errors.py:2898
6588
msgid ""
6589
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6590
"list).%(more)s"
6591
msgstr ""
6592
6593
#: bzrlib/errors.py:2904
6594
msgid "Variable {%(name)s} is not available."
6595
msgstr "La variable {%(name)s} no está disponible."
6596
6597
#: bzrlib/errors.py:2912
6598
msgid "No template specified."
6599
msgstr "No se ha especificado una plantilla."
6600
6601
#: bzrlib/errors.py:2917
6602
msgid "Unable to create symlink %(path_str)son this platform"
6603
msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
6604
6605
#: bzrlib/errors.py:2932
6606
msgid ""
6607
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6608
"\"original\", \"local\"."
6609
msgstr ""
6610
"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
6611
"«original», «local»."
6612
6613
#: bzrlib/errors.py:2966
6614
msgid ""
6615
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6616
msgstr ""
6617
6618
#: bzrlib/errors.py:2978
6619
msgid "The \"%(config_id)s\" configuration does not exist."
6620
msgstr ""
6621
6622
#: bzrlib/errors.py:2986
6623
msgid "The \"%(option_name)s\" configuration option does not exist."
6624
msgstr ""
6625
6626
#: bzrlib/errors.py:2994
6627
msgid "The alias \"%(alias_name)s\" does not exist."
6628
msgstr ""
6629
6630
#: bzrlib/errors.py:3008
6631
msgid "\"%(alias_name)s\" is not a valid location alias."
6632
msgstr ""
6633
6634
#: bzrlib/errors.py:3016
6635
msgid "No %(alias_name)s location assigned."
6636
msgstr ""
6637
6638
#: bzrlib/errors.py:3024
6639
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6640
msgstr ""
6641
6642
#: bzrlib/errors.py:3034
6643
msgid "Unknown rules detected: %(unknowns_str)s."
6644
msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
6645
6646
#: bzrlib/errors.py:3045
6647
msgid "Tip change rejected: %(msg)s"
6648
msgstr ""
6649
6650
#: bzrlib/errors.py:3053
6651
msgid "Shelf corrupt."
6652
msgstr ""
6653
6654
#: bzrlib/errors.py:3058
6655
msgid "Corruption while decompressing repository file%(orig_error)s"
6656
msgstr ""
6657
6658
#: bzrlib/errors.py:3070
6659
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6660
msgstr ""
6661
6662
#: bzrlib/errors.py:3078
6663
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6664
msgstr ""
6665
6666
#: bzrlib/errors.py:3086
6667
msgid ""
6668
"An attempt to access a url outside the server jail was made: '%(url)s'."
6669
msgstr ""
6670
6671
#: bzrlib/errors.py:3094
6672
msgid "The user aborted the operation."
6673
msgstr "El usuario abortó la operación."
6674
6675
#: bzrlib/errors.py:3099
6676
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6677
msgstr ""
6678
6679
#: bzrlib/errors.py:3109
6680
msgid "No such view: %(view_name)s."
6681
msgstr ""
6682
6683
#: bzrlib/errors.py:3119
6684
msgid ""
6685
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6686
"to a later format."
6687
msgstr ""
6688
6689
#: bzrlib/errors.py:3128
6690
msgid ""
6691
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6692
msgstr ""
6693
6694
#: bzrlib/errors.py:3195
6695
msgid "%(bzrdir)r does not support co-located branches."
6696
msgstr ""
6697
6698
#: bzrlib/errors.py:3201
6699
msgid ""
6700
"Unable to determine your name.\n"
6701
"Please, set your name with the 'whoami' command.\n"
6702
"E.g. bzr whoami \"Your Name <name@example.com>\""
6703
msgstr ""
6704
6705
#: bzrlib/errors.py:3210
6706
msgid "Invalid pattern(s) found. %(msg)s"
6707
msgstr "Se encontró un patrón inválido. %(msg)s"
6708
6709
#: bzrlib/errors.py:3218
6710
msgid ""
6711
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6712
"unbind` to fix."
6713
msgstr ""
6714
6715
#: bzrlib/errors.py:3229
6716
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6717
msgstr ""
6718
6719
#: bzrlib/errors.py:3238
6720
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6721
msgstr ""
6722
6723
#: bzrlib/errors.py:3247
6724
msgid ""
6725
"No compatible object available for operations from %(source)r to %(target)r."
6726
msgstr ""
6727
6728
#: bzrlib/errors.py:3257
6729
msgid ""
6730
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6731
"%(arguments)s."
6732
msgstr ""
6733
6734
#: bzrlib/errors.py:3267
6735
msgid ""
6736
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6737
"format %(format)r"
6738
msgstr ""
6739
6740
#: bzrlib/errors.py:3279
6741
msgid ""
6742
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6743
"plugin."
6744
msgstr ""
6745
6746
#: bzrlib/errors.py:3292
6747
msgid "Binary files section encountered."
6748
msgstr ""
6749
6750
#: bzrlib/errors.py:3300
6751
msgid ""
6752
"Malformed patch header. %(desc)s\n"
6753
"%(line)r"
6754
msgstr ""
6755
6756
#: bzrlib/errors.py:3309
6757
msgid ""
6758
"Malformed hunk header. %(desc)s\n"
6759
"%(line)r"
6760
msgstr ""
6761
6762
#: bzrlib/errors.py:3318
6763
msgid ""
6764
"Malformed line. %(desc)s\n"
6765
"%(line)r"
6766
msgstr ""
6767
6768
#: bzrlib/errors.py:3328
6769
msgid ""
6770
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6771
"but patch says it should be \"%(patch_line)s\""
6772
msgstr ""
6773
6774
#: bzrlib/errors.py:3339
6775
msgid "The feature %(feature)s has already been registered."
6776
msgstr ""
6777
6778
#: bzrlib/export_pot.py:252
6779
#, python-format
6780
msgid "Exporting messages from builtin command: %s"
6781
msgstr ""
6782
6783
#: bzrlib/export_pot.py:271
6784
msgid "Exporting messages from plugin command: {0} in {1}"
6785
msgstr ""
6786
6787
#: bzrlib/export_pot.py:292
6788
#, python-format
6789
msgid "Exporting message from error: %s"
6790
msgstr "Exportando mensaje del error: %s"
6791
6792
#: bzrlib/fetch.py:98
6793
msgid "Finding revisions"
6794
msgstr "Buscando revisiones"
6795
6796
#: bzrlib/fetch.py:103
6797
msgid "Fetching revisions"
6798
msgstr "Obteniendo revisiones"
6799
6800
#: bzrlib/foreign.py:262
6801
msgid "Push into a different VCS without any custom bzr metadata."
6802
msgstr ""
6803
6804
#: bzrlib/foreign.py:264
6805
msgid ""
6806
"This will afterwards rebase the local branch on the remote\n"
6807
"branch unless the --no-rebase option is used, in which case \n"
6808
"the two branches will be out of sync after the push. "
6809
msgstr ""
6810
6811
#: bzrlib/foreign.py:277
6812
msgid "Do not rebase after push."
6813
msgstr ""
6814
6815
#: bzrlib/foreign.py:311
6816
#, python-format
6817
msgid "Using saved location: %s\n"
6818
msgstr "Usando las ubicaciones guardadas: %s\n"
6819
6820
#: bzrlib/foreign.py:321
6821
msgid ""
6822
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6823
"regular push."
6824
msgstr ""
6825
6826
#: bzrlib/gpg.py:366
6827
msgid "No GnuPG key results for pattern: {0}"
6828
msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
6829
6830
#: bzrlib/gpg.py:439
6831
msgid "{0} commits with valid signatures"
6832
msgstr "{0} ejecuciones con firmas válidas"
6833
6834
#: bzrlib/gpg.py:445
6835
msgid "{0} commit with unknown key"
6836
msgid_plural "{0} commits with unknown keys"
6837
msgstr[0] "{0} ejecución con clave desconocida"
6838
msgstr[1] "{0} ejecuciones con claves desconocidas"
6839
6840
#: bzrlib/gpg.py:453
6841
msgid "{0} commit not valid"
6842
msgid_plural "{0} commits not valid"
6843
msgstr[0] "{0} ejecución inválida"
6844
msgstr[1] "{0} ejecuciones inválidas"
6845
6846
#: bzrlib/gpg.py:461
6847
msgid "{0} commit not signed"
6848
msgid_plural "{0} commits not signed"
6849
msgstr[0] "{0} ejecución no firmada"
6850
msgstr[1] "{0} ejecuciones no firmadas"
6851
6852
#: bzrlib/gpg.py:469
6853
msgid "{0} commit with key now expired"
6854
msgid_plural "{0} commits with key now expired"
6855
msgstr[0] ""
6856
msgstr[1] ""
6857
6858
#: bzrlib/gpg.py:489
6859
msgid "{0} commit by author {1} with key {2} now expired"
6860
msgid_plural "{0} commits by author {1} with key {2} now expired"
6861
msgstr[0] ""
6862
msgstr[1] ""
6863
6864
#: bzrlib/gpg.py:505
6865
msgid "{0} signed {1} commit"
6866
msgid_plural "{0} signed {1} commits"
6867
msgstr[0] ""
6868
msgstr[1] ""
6869
6870
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6871
msgid "{0} commit by author {1}"
6872
msgid_plural "{0} commits by author {1}"
6873
msgstr[0] ""
6874
msgstr[1] ""
6875
6876
#: bzrlib/gpg.py:554
6877
msgid "Unknown key {0} signed {1} commit"
6878
msgid_plural "Unknown key {0} signed {1} commits"
6879
msgstr[0] ""
6880
msgstr[1] ""
6881
6882
#: bzrlib/groupcompress.py:1739
6883
#, python-format
6884
msgid "Insert claimed random_id=True, but then inserted %r two times"
6885
msgstr ""
6886
6887
#: bzrlib/hooks.py:313
6888
#, python-format
6889
msgid "Introduced in: %s"
6890
msgstr ""
6891
6892
#: bzrlib/hooks.py:316
6893
#, python-format
6894
msgid "Deprecated in: %s"
6895
msgstr ""
6896
6897
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6898
msgid "Walking content"
6899
msgstr ""
6900
6901
#: bzrlib/knit.py:3330
6902
msgid "annotating"
6903
msgstr "anotar"
6904
6905
#: bzrlib/lock.py:548
6906
msgid "{0!r} was {1} locked again"
6907
msgstr ""
6908
6909
#: bzrlib/lockdir.py:321
6910
#, python-format
6911
msgid "error removing pending lock: %s"
6912
msgstr ""
6913
6914
#: bzrlib/lockdir.py:616
6915
msgid "Unable to obtain"
6916
msgstr ""
6917
6918
#: bzrlib/lockdir.py:618
6919
msgid "Lock owner changed for"
6920
msgstr ""
6921
6922
#: bzrlib/lockdir.py:620
6923
msgid "{0} lock {1} {2}."
6924
msgstr ""
6925
6926
#: bzrlib/lockdir.py:627
6927
#, python-format
6928
msgid "Will continue to try until %s, unless you press Ctrl-C."
6929
msgstr ""
6930
6931
#: bzrlib/lockdir.py:629
6932
msgid "See \"bzr help break-lock\" for more."
6933
msgstr ""
6934
6935
#: bzrlib/lockdir.py:739
6936
#, python-format
6937
msgid ""
6938
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6939
msgstr ""
6940
6941
#: bzrlib/log.py:563
6942
msgid "--exclude-common-ancestry requires two different revisions"
6943
msgstr "--exclude-common-ancestry requiere dos revisiones diferentes"
6944
6945
#: bzrlib/log.py:565
6946
#, python-format
6947
msgid "invalid direction %r"
6948
msgstr "dirección %r inválida"
6949
6950
#: bzrlib/log.py:653
6951
msgid "Start revision not found in history of end revision."
6952
msgstr ""
6953
6954
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6955
msgid "Logging revision 0 is invalid."
6956
msgstr ""
6957
6958
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6959
msgid "Start revision must be older than the end revision."
6960
msgstr "El inicio de la revisión debe ser anterior al final."
6961
6962
#: bzrlib/log.py:1818
6963
#, python-format
6964
msgid "unknown log formatter: %r"
6965
msgstr ""
6966
6967
#: bzrlib/log.py:2114
6968
msgid "fixes bug"
6969
msgid_plural "fixes bugs"
6970
msgstr[0] "corrige el error"
6971
msgstr[1] "corrige los errores"
6972
6973
#: bzrlib/merge.py:689
6974
msgid "All changes applied successfully."
6975
msgstr "Todos los cambios se aplicaron correctamente."
6976
6977
#: bzrlib/merge.py:691
6978
#, python-format
6979
msgid "%d conflicts encountered."
6980
msgstr "%d conflictos encontrados."
6981
6982
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6983
msgid "Preparing file merge"
6984
msgstr ""
6985
6986
#: bzrlib/multiparent.py:426
6987
msgid "Importing revisions"
6988
msgstr "Importar revisiones"
6989
6990
#: bzrlib/option.py:526
6991
msgid "Show help message."
6992
msgstr "Mostrar mensaje de ayuda."
6993
6994
#: bzrlib/option.py:528
6995
msgid "Only display errors and warnings."
6996
msgstr "Mostrar solo errores y avisos."
6997
6998
#: bzrlib/option.py:531
6999
msgid "Show usage message and options."
7000
msgstr "Mostrar mensaje de uso y opciones."
7001
7002
#: bzrlib/option.py:533
7003
msgid "Display more information."
7004
msgstr "Mostrar más información."
7005
7006
#: bzrlib/option.py:541
7007
msgid ""
7008
"Select changes introduced by the specified revision. See also \"help "
7009
"revisionspec\"."
7010
msgstr ""
7011
7012
#: bzrlib/option.py:543
7013
msgid "Branch to operate on, instead of working directory."
7014
msgstr ""
7015
7016
#: bzrlib/option.py:545
7017
msgid "Detailed log format."
7018
msgstr ""
7019
7020
#: bzrlib/option.py:545
7021
msgid "Format used by GNU ChangeLog files."
7022
msgstr ""
7023
7024
#: bzrlib/option.py:545
7025
msgid "Log format with one line per revision."
7026
msgstr ""
7027
7028
#: bzrlib/option.py:545
7029
msgid "Moderately short log format."
7030
msgstr ""
7031
7032
#: bzrlib/option.py:545
7033
msgid "Use specified log format."
7034
msgstr "Usar el formato de registro especificado."
7035
7036
#: bzrlib/option.py:547
7037
msgid "Log format"
7038
msgstr "Formato de registro"
7039
7040
#: bzrlib/option.py:549
7041
msgid "LCA-newness merge."
7042
msgstr ""
7043
7044
#: bzrlib/option.py:549
7045
msgid "Merge using external diff3."
7046
msgstr ""
7047
7048
#: bzrlib/option.py:549
7049
msgid "Native diff3-style merge."
7050
msgstr ""
7051
7052
#: bzrlib/option.py:549
7053
msgid "Select a particular merge algorithm."
7054
msgstr "Seleccionar un algoritmo de fusión particular."
7055
7056
#: bzrlib/option.py:549
7057
msgid "Weave-based merge."
7058
msgstr ""
7059
7060
#: bzrlib/option.py:551
7061
msgid "Merge algorithm"
7062
msgstr "Algoritmo de fusión"
7063
7064
#: bzrlib/option.py:554
7065
msgid "Message string."
7066
msgstr "Cadena de mensaje."
7067
7068
#: bzrlib/option.py:556
7069
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7070
msgstr ""
7071
7072
#: bzrlib/option.py:558
7073
msgid "Ignore differences between branches and overwrite unconditionally."
7074
msgstr ""
7075
7076
#: bzrlib/option.py:560
7077
msgid "Remember the specified location as a default."
7078
msgstr "Recordar la ubicación especificada como predeterminada."
7079
7080
#: bzrlib/option.py:562
7081
msgid "Reprocess to reduce spurious conflicts."
7082
msgstr "Reprocesar para reducir los conflictos espurios."
7083
7084
#: bzrlib/option.py:566
7085
msgid "See \"help revisionspec\" for details."
7086
msgstr "Consulte «help revisionspec» para obtener más detalles."
7087
7088
#: bzrlib/option.py:568
7089
msgid "Show internal object ids."
7090
msgstr "Mostrar las id de los objetos internos."
7091
7092
#: bzrlib/option.py:571
7093
msgid "Display timezone as local, original, or utc."
7094
msgstr ""
7095
7096
#: bzrlib/osutils.py:100
7097
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7098
msgstr ""
7099
7100
#: bzrlib/osutils.py:220
7101
msgid "lstat/stat of ({0!r}): {1!r}"
7102
msgstr "lstat/stat de ({0!r}): {1!r}"
7103
7104
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7105
#, python-format
7106
msgid "sorry, %r not allowed in path"
7107
msgstr ""
7108
7109
#: bzrlib/osutils.py:1259
7110
#, python-format
7111
msgid "%r is too short to calculate a relative path"
7112
msgstr ""
7113
7114
#: bzrlib/plugin.py:143
7115
#, python-format
7116
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7117
msgstr ""
7118
7119
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7120
msgid "Enable completions for the selected plugin (default: all plugins)"
7121
msgstr ""
7122
7123
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7124
msgid "Generate a shell function for bash command line completion."
7125
msgstr ""
7126
7127
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7128
msgid ""
7129
"This command generates a shell function which can be used by bash to\n"
7130
"automatically complete the currently typed command when the user presses\n"
7131
"the completion key (usually tab)."
7132
msgstr ""
7133
7134
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7135
msgid ""
7136
"Commonly used like this:\n"
7137
" eval \"`bzr bash-completion`\""
7138
msgstr ""
7139
7140
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7141
msgid "Name of the generated function (default: _bzr)"
7142
msgstr "Nombre de la función generada (predeterminado: _bzr)"
7143
7144
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7145
msgid "Generate only the shell function, don't enable it"
7146
msgstr ""
7147
7148
#: bzrlib/plugins/launchpad/account.py:66
7149
msgid "Setting ssh/sftp usernames for launchpad.net."
7150
msgstr ""
7151
7152
#: bzrlib/plugins/launchpad/cmds.py:44
7153
msgid "Register a branch with launchpad.net."
7154
msgstr "Registrar una rama con launchpad.net."
7155
7156
#: bzrlib/plugins/launchpad/cmds.py:46
7157
msgid ""
7158
"This command lists a bzr branch in the directory of branches on\n"
7159
"launchpad.net. Registration allows the branch to be associated with\n"
7160
"bugs or specifications."
7161
msgstr ""
7162
7163
#: bzrlib/plugins/launchpad/cmds.py:50
7164
msgid ""
7165
"Before using this command you must register the project to which the\n"
7166
"branch belongs, and create an account for yourself on launchpad.net."
7167
msgstr ""
7168
7169
#: bzrlib/plugins/launchpad/cmds.py:53
7170
msgid ""
7171
"arguments:\n"
7172
" public_url: The publicly visible url for the branch to register.\n"
7173
" This must be an http or https url (which Launchpad can read\n"
7174
" from to access the branch). Local file urls, SFTP urls, and\n"
7175
" bzr+ssh urls will not work.\n"
7176
" If no public_url is provided, bzr will use the configured\n"
7177
" public_url if there is one for the current branch, and\n"
7178
" otherwise error."
7179
msgstr ""
7180
7181
#: bzrlib/plugins/launchpad/cmds.py:62
7182
msgid ""
7183
"example:\n"
7184
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7185
" --project fooproject"
7186
msgstr ""
7187
7188
#: bzrlib/plugins/launchpad/cmds.py:69
7189
msgid "Launchpad project short name to associate with the branch."
7190
msgstr "Nombre corto del proyecto de Launchpad para asociar con la rama."
7191
7192
#: bzrlib/plugins/launchpad/cmds.py:76
7193
msgid ""
7194
"Short name for the branch; by default taken from the last component of the "
7195
"url."
7196
msgstr ""
7197
7198
#: bzrlib/plugins/launchpad/cmds.py:80
7199
msgid "One-sentence description of the branch."
7200
msgstr ""
7201
7202
#: bzrlib/plugins/launchpad/cmds.py:83
7203
msgid "Longer description of the purpose or contents of the branch."
7204
msgstr ""
7205
7206
#: bzrlib/plugins/launchpad/cmds.py:86
7207
msgid "Branch author's email address, if not yourself."
7208
msgstr ""
7209
7210
#: bzrlib/plugins/launchpad/cmds.py:89
7211
msgid "The bug this branch fixes."
7212
msgstr "El error que arregla esta rama."
7213
7214
#: bzrlib/plugins/launchpad/cmds.py:92
7215
msgid "Prepare the request but don't actually send it."
7216
msgstr ""
7217
7218
#: bzrlib/plugins/launchpad/cmds.py:114
7219
msgid ""
7220
"register-branch requires a public branch url - see bzr help register-branch."
7221
msgstr ""
7222
7223
#: bzrlib/plugins/launchpad/cmds.py:122
7224
msgid "--product is deprecated; please use --project."
7225
msgstr ""
7226
7227
#: bzrlib/plugins/launchpad/cmds.py:152
7228
msgid "Open a Launchpad branch page in your web browser."
7229
msgstr "Abrir una página de rama de Launchpad en su navegador web."
7230
7231
#: bzrlib/plugins/launchpad/cmds.py:157
7232
msgid "Do not actually open the browser. Just say the URL we would use."
7233
msgstr ""
7234
7235
#: bzrlib/plugins/launchpad/cmds.py:192
7236
#, python-format
7237
msgid "Opening %s in web browser"
7238
msgstr ""
7239
7240
#: bzrlib/plugins/launchpad/cmds.py:200
7241
msgid "Show or set the Launchpad user ID."
7242
msgstr "Mostrar o establecer el ID de usuario de Launchpad."
7243
7244
#: bzrlib/plugins/launchpad/cmds.py:202
7245
msgid ""
7246
"When communicating with Launchpad, some commands need to know your\n"
7247
"Launchpad user ID. This command can be used to set or show the\n"
7248
"user ID that Bazaar will use for such communication."
7249
msgstr ""
7250
7251
#: bzrlib/plugins/launchpad/cmds.py:206
7252
msgid ""
7253
":Examples:\n"
7254
" Show the Launchpad ID of the current user::"
7255
msgstr ""
7256
7257
#: bzrlib/plugins/launchpad/cmds.py:209
7258
msgid " bzr launchpad-login"
7259
msgstr " bzr launchpad-login"
7260
7261
#: bzrlib/plugins/launchpad/cmds.py:211
7262
msgid " Set the Launchpad ID of the current user to 'bob'::"
7263
msgstr ""
7264
7265
#: bzrlib/plugins/launchpad/cmds.py:213
7266
msgid " bzr launchpad-login bob"
7267
msgstr " bzr launchpad-login bob"
7268
7269
#: bzrlib/plugins/launchpad/cmds.py:220
7270
msgid "Don't check that the user name is valid."
7271
msgstr "No comprueba que el nombre de usuario sea válido."
7272
7273
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7274
msgid "Launchpad user ID exists and has SSH keys.\n"
7275
msgstr ""
7276
7277
#: bzrlib/plugins/launchpad/cmds.py:238
7278
msgid "No Launchpad user ID configured.\n"
7279
msgstr ""
7280
7281
#: bzrlib/plugins/launchpad/cmds.py:249
7282
#, python-format
7283
msgid "Launchpad user ID set to '%s'.\n"
7284
msgstr ""
7285
7286
#: bzrlib/plugins/launchpad/cmds.py:255
7287
msgid "Ask Launchpad to mirror a branch now."
7288
msgstr ""
7289
7290
#: bzrlib/plugins/launchpad/cmds.py:272
7291
msgid "Propose merging a branch on Launchpad."
7292
msgstr ""
7293
7294
#: bzrlib/plugins/launchpad/cmds.py:274
7295
msgid ""
7296
"This will open your usual editor to provide the initial comment. When it\n"
7297
"has created the proposal, it will open it in your default web browser."
7298
msgstr ""
7299
7300
#: bzrlib/plugins/launchpad/cmds.py:277
7301
msgid ""
7302
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7303
"is not supplied, the remembered submit branch will be used. If no submit\n"
7304
"branch is remembered, the development focus will be used."
7305
msgstr ""
7306
7307
#: bzrlib/plugins/launchpad/cmds.py:281
7308
msgid ""
7309
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7310
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7311
"The parameter the launchpad account name of the desired reviewer. This\n"
7312
"may optionally be followed by '=' and the review type. For example:"
7313
msgstr ""
7314
7315
#: bzrlib/plugins/launchpad/cmds.py:286
7316
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7317
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
7318
7319
#: bzrlib/plugins/launchpad/cmds.py:288
7320
msgid ""
7321
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7322
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7323
msgstr ""
7324
7325
#: bzrlib/plugins/launchpad/cmds.py:293
7326
msgid "Propose the merge on staging."
7327
msgstr ""
7328
7329
#: bzrlib/plugins/launchpad/cmds.py:295
7330
msgid "Commit message."
7331
msgstr "Mensaje de ejecución."
7332
7333
#: bzrlib/plugins/launchpad/cmds.py:297
7334
msgid "Mark the proposal as approved immediately."
7335
msgstr "Marcar el propuesto como aprobado inmediatamente."
7336
7337
#: bzrlib/plugins/launchpad/cmds.py:298
7338
msgid "The bug this proposal fixes."
7339
msgstr ""
7340
7341
#: bzrlib/plugins/launchpad/cmds.py:300
7342
msgid "Requested reviewer and optional type."
7343
msgstr "Revisor solicitado y tipo opcional."
7344
7345
#: bzrlib/plugins/launchpad/cmds.py:335
7346
msgid "Find the proposal to merge this revision."
7347
msgstr "Buscar el propuesto para fusionar esta revisión."
7348
7349
#: bzrlib/plugins/launchpad/cmds.py:337
7350
msgid ""
7351
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7352
"This works only if the selected branch was the merge proposal target, and\n"
7353
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7354
"are opened in a web browser."
7355
msgstr ""
7356
7357
#: bzrlib/plugins/launchpad/cmds.py:342
7358
msgid ""
7359
"Any revision involved in the merge may be specified-- the revision in\n"
7360
"which the merge was performed, or one of the revisions that was merged."
7361
msgstr ""
7362
7363
#: bzrlib/plugins/launchpad/cmds.py:345
7364
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7365
msgstr ""
7366
7367
#: bzrlib/plugins/launchpad/cmds.py:347
7368
msgid " bzr lp-find-proposal -r annotate:README:1"
7369
msgstr " bzr lp-find-proposal -r annotate:README:1"
7370
7371
#: bzrlib/plugins/launchpad/cmds.py:363
7372
msgid "No review found."
7373
msgstr ""
7374
7375
#: bzrlib/plugins/launchpad/cmds.py:364
7376
#, python-format
7377
msgid "%d proposals(s) found."
7378
msgstr ""
7379
7380
#: bzrlib/plugins/launchpad/cmds.py:374
7381
msgid "Finding revision-id"
7382
msgstr ""
7383
7384
#: bzrlib/plugins/launchpad/cmds.py:381
7385
msgid "Finding merge"
7386
msgstr ""
7387
7388
#: bzrlib/plugins/launchpad/cmds.py:386
7389
msgid "Finding revno"
7390
msgstr ""
7391
7392
#: bzrlib/plugins/launchpad/cmds.py:392
7393
msgid "Finding Launchpad branch"
7394
msgstr ""
7395
7396
#: bzrlib/plugins/launchpad/cmds.py:395
7397
msgid "Finding proposals"
7398
msgstr ""
7399
7400
#: bzrlib/plugins/launchpad/lp_api.py:241
7401
#: bzrlib/plugins/launchpad/lp_api.py:246
7402
#, python-format
7403
msgid "%s is not registered on Launchpad"
7404
msgstr ""
7405
7406
#: bzrlib/plugins/launchpad/lp_api.py:256
7407
#, python-format
7408
msgid "%s has no development focus."
7409
msgstr ""
7410
7411
#: bzrlib/plugins/launchpad/lp_api.py:261
7412
#, python-format
7413
msgid "development focus %s has no branch."
7414
msgstr ""
7415
7416
#: bzrlib/plugins/launchpad/lp_api.py:266
7417
#, python-format
7418
msgid "source package %s has no branch."
7419
msgstr ""
7420
7421
#: bzrlib/plugins/launchpad/lp_api.py:270
7422
#, python-format
7423
msgid "%s has no associated product or source package."
7424
msgstr ""
7425
7426
#: bzrlib/plugins/launchpad/lp_api.py:282
7427
#, python-format
7428
msgid "%s is already up-to-date."
7429
msgstr ""
7430
7431
#: bzrlib/plugins/launchpad/lp_api.py:289
7432
#, python-format
7433
msgid "Pushing to %s"
7434
msgstr ""
7435
7436
#: bzrlib/plugins/launchpad/lp_directory.py:170
7437
msgid ""
7438
"resolution for {0}\n"
7439
" local: {1}\n"
7440
" remote: {2}"
7441
msgstr ""
7442
7443
#: bzrlib/plugins/launchpad/lp_propose.py:150
7444
#, python-format
7445
msgid "There is already a branch merge proposal: %s"
7446
msgstr ""
7447
7448
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7449
msgid "pb parameter to convert() is deprecated"
7450
msgstr ""
7451
7452
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7453
msgid "starting upgrade from format 4 to 5"
7454
msgstr ""
7455
7456
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7457
msgid "note: upgrade may be faster if all store files are ungzipped first"
7458
msgstr ""
7459
7460
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7461
msgid "converting revision"
7462
msgstr ""
7463
7464
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7465
msgid "upgraded to weaves:"
7466
msgstr ""
7467
7468
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7469
#, python-format
7470
msgid "%6d revisions and inventories"
7471
msgstr ""
7472
7473
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7474
#, python-format
7475
msgid "%6d revisions not present"
7476
msgstr ""
7477
7478
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7479
#, python-format
7480
msgid "%6d texts"
7481
msgstr ""
7482
7483
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7484
msgid "writing weave"
7485
msgstr ""
7486
7487
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7488
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7489
msgid "inventory"
7490
msgstr ""
7491
7492
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7493
msgid "write revision"
7494
msgstr ""
7495
7496
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7497
msgid "loading revision"
7498
msgstr ""
7499
7500
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7501
#, python-format
7502
msgid "revision {%s} not present in branch; will be converted as a ghost"
7503
msgstr ""
7504
7505
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7506
msgid "starting upgrade from format 5 to 6"
7507
msgstr ""
7508
7509
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7510
#, python-format
7511
msgid "adding prefixes to %s"
7512
msgstr ""
7513
7514
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7515
msgid "starting upgrade from format 6 to metadir"
7516
msgstr ""
7517
7518
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7519
msgid "Removing ancestry.weave"
7520
msgstr ""
7521
7522
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7523
msgid "Finding branch files"
7524
msgstr ""
7525
7526
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7527
msgid "Upgrading repository"
7528
msgstr ""
7529
7530
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7531
msgid "Upgrading branch"
7532
msgstr ""
7533
7534
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7535
msgid "No working tree."
7536
msgstr ""
7537
7538
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7539
msgid "Upgrading working tree"
7540
msgstr ""
7541
7542
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7543
#, python-format
7544
msgid "Make %s lock"
7545
msgstr ""
7546
7547
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7548
#, python-format
7549
msgid "Moving %s"
7550
msgstr ""
7551
7552
#: bzrlib/push.py:56
7553
msgid "Created new branch."
7554
msgstr "Rama nueva creada."
7555
7556
#: bzrlib/push.py:97
7557
#, python-format
7558
msgid ""
7559
"Target directory %s already contains a .bzr directory, but it is not valid."
7560
msgstr ""
7561
7562
#: bzrlib/push.py:101
7563
#, python-format
7564
msgid ""
7565
"Target directory %s already exists, but does not have a .bzr directory. "
7566
"Supply --use-existing-dir to push there anyway."
7567
msgstr ""
7568
7569
#: bzrlib/push.py:122
7570
#, python-format
7571
msgid "Too many redirections trying to make %s."
7572
msgstr ""
7573
7574
#: bzrlib/push.py:148
7575
msgid ""
7576
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7577
"information."
7578
msgstr ""
7579
7580
#: bzrlib/push.py:152
7581
#, python-format
7582
msgid ""
7583
"It is not possible to losslessly push to %s. You may want to use dpush "
7584
"instead."
7585
msgstr ""
7586
7587
#: bzrlib/push.py:158
7588
#, python-format
7589
msgid ""
7590
"At %s you have a valid .bzr control directory, but not a branch or "
7591
"repository. This is an unsupported configuration. Please move the target "
7592
"directory out of the way and try again."
7593
msgstr ""
7594
7595
#: bzrlib/reconcile.py:97
7596
#, python-format
7597
msgid "Reconciling branch %s"
7598
msgstr "Reconciliando rama %s"
7599
7600
#: bzrlib/reconcile.py:103
7601
#, python-format
7602
msgid "Reconciling repository %s"
7603
msgstr "Reconciliando repositorio %s"
7604
7605
#: bzrlib/reconcile.py:105
7606
msgid "Reconciling repository"
7607
msgstr "Reconciliando repositorio"
7608
7609
#: bzrlib/reconcile.py:111
7610
#, python-format
7611
msgid "%s cannot canonicalize CHKs."
7612
msgstr ""
7613
7614
#: bzrlib/reconcile.py:119
7615
msgid "Reconcile aborted: revision index has inconsistent parents."
7616
msgstr ""
7617
7618
#: bzrlib/reconcile.py:121
7619
msgid "Run \"bzr check\" for more details."
7620
msgstr ""
7621
7622
#: bzrlib/reconcile.py:123
7623
msgid "Reconciliation complete."
7624
msgstr "Reconciliación completa."
7625
7626
#: bzrlib/reconcile.py:166
7627
msgid "Fixing last revision info {0} => {1}"
7628
msgstr ""
7629
7630
#: bzrlib/reconcile.py:173
7631
msgid "revision_history ok."
7632
msgstr ""
7633
7634
#: bzrlib/reconcile.py:234
7635
msgid "Reading inventory data"
7636
msgstr "Leyendo los datos de inventario"
7637
7638
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7639
msgid "Inventory ok."
7640
msgstr ""
7641
7642
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7643
msgid "Backing up inventory"
7644
msgstr "Respaldando inventario"
7645
7646
#: bzrlib/reconcile.py:258
7647
msgid "Backup inventory created."
7648
msgstr ""
7649
7650
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7651
msgid "Writing weave"
7652
msgstr ""
7653
7654
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7655
msgid "Inventory regenerated."
7656
msgstr "Inventario regenerado."
7657
7658
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7659
msgid "Reading indexes"
7660
msgstr "Leyendo índices"
7661
7662
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7663
msgid "Checking unused inventories"
7664
msgstr ""
7665
7666
#: bzrlib/reconcile.py:388
7667
msgid "Backup Inventory created"
7668
msgstr ""
7669
7670
#: bzrlib/reconcile.py:446
7671
msgid "Fixing text parents"
7672
msgstr ""
7673
7674
#: bzrlib/reconfigure.py:54
7675
msgid "{0} is now stacked on {1}\n"
7676
msgstr "{0} está ahora apilado en {1}\n"
7677
7678
#: bzrlib/reconfigure.py:69
7679
#, python-format
7680
msgid "%s is now not stacked\n"
7681
msgstr ""
7682
7683
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7684
#, python-format
7685
msgid "bzr: ERROR (ignored): %s"
7686
msgstr "bzr: ERROR (ignorado): %s"
7687
7688
#: bzrlib/remote.py:2534
7689
msgid "Copying repository content as tarball..."
7690
msgstr ""
7691
7692
#: bzrlib/rename_map.py:69
7693
msgid "Calculating hashes"
7694
msgstr "Calculando hashes"
7695
7696
#: bzrlib/rename_map.py:107
7697
msgid "Determining hash hits"
7698
msgstr ""
7699
7700
#: bzrlib/rename_map.py:242
7701
msgid "{0} => {1}"
7702
msgstr "{0} => {1}"
7703
7704
#: bzrlib/repository.py:1738
7705
msgid "Moving repository to repository.backup"
7706
msgstr ""
7707
7708
#: bzrlib/repository.py:1745
7709
msgid "Creating new repository"
7710
msgstr "Creando repositorio nuevo"
7711
7712
#: bzrlib/repository.py:1750
7713
msgid "Copying content"
7714
msgstr "Copiar contenido"
7715
7716
#: bzrlib/repository.py:1754
7717
msgid "Deleting old repository content"
7718
msgstr ""
7719
7720
#: bzrlib/repository.py:1756
7721
msgid "repository converted"
7722
msgstr "repositorio convertido"
7723
7724
#: bzrlib/revisionspec.py:903
7725
msgid "Using {0} {1}"
7726
msgstr "Usando {0} {1}"
7727
7728
#: bzrlib/send.py:59
7729
#, python-format
7730
msgid "Mail client \"%s\" does not support specifying body"
7731
msgstr ""
7732
7733
#: bzrlib/send.py:63
7734
msgid "--remember requires a branch to be specified."
7735
msgstr ""
7736
7737
#: bzrlib/send.py:78
7738
msgid "No submit branch known or specified"
7739
msgstr ""
7740
7741
#: bzrlib/send.py:81
7742
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7743
msgstr ""
7744
7745
#: bzrlib/send.py:99
7746
#, python-format
7747
msgid "No such send format '%s'."
7748
msgstr ""
7749
7750
#: bzrlib/send.py:115
7751
msgid "bzr send takes at most two one revision identifiers"
7752
msgstr ""
7753
7754
#: bzrlib/send.py:128
7755
msgid "No revisions to submit."
7756
msgstr "No hay revisiones para enviar."
7757
7758
#: bzrlib/send.py:140
7759
msgid ""
7760
"- not supported for merge directives that use more than one output file."
7761
msgstr ""
7762
7763
#: bzrlib/send.py:186
7764
msgid "Format 0.9 does not permit bundle with no patch"
7765
msgstr ""
7766
7767
#: bzrlib/shelf_ui.py:46
7768
#, python-format
7769
msgid "Shelve adding file \"%(path)s\"?"
7770
msgstr ""
7771
7772
#: bzrlib/shelf_ui.py:47
7773
msgid "Shelve binary changes?"
7774
msgstr ""
7775
7776
#: bzrlib/shelf_ui.py:48
7777
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7778
msgstr ""
7779
7780
#: bzrlib/shelf_ui.py:50
7781
#, python-format
7782
msgid "Shelve removing file \"%(path)s\"?"
7783
msgstr ""
7784
7785
#: bzrlib/shelf_ui.py:51
7786
#, python-format
7787
msgid "Shelve %d change(s)?"
7788
msgstr ""
7789
7790
#: bzrlib/shelf_ui.py:52
7791
msgid "Shelve?"
7792
msgstr "¿Arrinconar?"
7793
7794
#: bzrlib/shelf_ui.py:53
7795
#, python-format
7796
msgid ""
7797
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7798
msgstr ""
7799
7800
#: bzrlib/shelf_ui.py:55
7801
#, python-format
7802
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7803
msgstr ""
7804
7805
#: bzrlib/shelf_ui.py:70
7806
#, python-format
7807
msgid "Changes shelved with id \"%d\"."
7808
msgstr ""
7809
7810
#: bzrlib/shelf_ui.py:74
7811
msgid "Selected changes destroyed."
7812
msgstr "Cambios seleccionados destruidos."
7813
7814
#: bzrlib/shelf_ui.py:78
7815
msgid "Selected changes:"
7816
msgstr "Cambios seleccionados:"
7817
7818
#: bzrlib/shelf_ui.py:98
7819
#, python-format
7820
msgid "Delete file \"%(path)s\"?"
7821
msgstr "¿Eliminar archivo «%(path)s»?"
7822
7823
#: bzrlib/shelf_ui.py:99
7824
msgid "Apply binary changes?"
7825
msgstr "¿Aplicar cambios binarios?"
7826
7827
#: bzrlib/shelf_ui.py:100
7828
#, python-format
7829
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7830
msgstr ""
7831
7832
#: bzrlib/shelf_ui.py:102
7833
#, python-format
7834
msgid "Add file \"%(path)s\"?"
7835
msgstr "¿Añadir archivo «%(path)s»?"
7836
7837
#: bzrlib/shelf_ui.py:103
7838
#, python-format
7839
msgid "Apply %d change(s)?"
7840
msgstr "¿Aplicar %d cambio(s)?"
7841
7842
#: bzrlib/shelf_ui.py:104
7843
msgid "Apply change?"
7844
msgstr "¿Aplicar cambio?"
7845
7846
#: bzrlib/shelf_ui.py:105
7847
#, python-format
7848
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7849
msgstr ""
7850
7851
#: bzrlib/shelf_ui.py:107
7852
#, python-format
7853
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7854
msgstr ""
7855
7856
#: bzrlib/shelf_ui.py:402
7857
msgid "No changes are shelved."
7858
msgstr "No se han arrinconado cambios."
7859
7860
#: bzrlib/shelf_ui.py:460
7861
#, python-format
7862
msgid "Using changes with id \"%d\"."
7863
msgstr ""
7864
7865
#: bzrlib/shelf_ui.py:464
7866
#, python-format
7867
msgid "Message: %s"
7868
msgstr "Mensaje: %s"
7869
7870
#: bzrlib/shelf_ui.py:476
7871
#, python-format
7872
msgid "Deleted changes with id \"%d\"."
7873
msgstr ""
7874
7875
#: bzrlib/smart/medium.py:714
7876
msgid "HPSS calls: {0} ({1} vfs) {2}"
7877
msgstr ""
7878
7879
#: bzrlib/smart/server.py:169
7880
msgid "Requested to stop gracefully"
7881
msgstr ""
7882
7883
#: bzrlib/smart/server.py:179
7884
#, python-format
7885
msgid "Waiting for %d client(s) to finish"
7886
msgstr ""
7887
7888
#: bzrlib/smart/server.py:185
7889
#, python-format
7890
msgid "Still waiting for %d client(s) to finish"
7891
msgstr ""
7892
7893
#: bzrlib/smart/server.py:219
7894
#, python-format
7895
msgid "listening socket error: %s"
7896
msgstr ""
7897
7898
#: bzrlib/smart/server.py:452
7899
#, python-format
7900
msgid "listening on port: %s"
7901
msgstr ""
7902
7903
#: bzrlib/switch.py:73
7904
msgid "Pending merges must be committed or reverted before using switch."
7905
msgstr ""
7906
7907
#: bzrlib/switch.py:100
7908
msgid ""
7909
"Cannot switch as local commits found in the checkout. Commit these to the "
7910
"bound branch or use --force to throw them away."
7911
msgstr ""
7912
7913
#: bzrlib/switch.py:105
7914
#, python-format
7915
msgid ""
7916
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7917
"anyway, use --force."
7918
msgstr ""
7919
7920
#: bzrlib/switch.py:129
7921
msgid "Cannot switch a branch, only a checkout."
7922
msgstr ""
7923
7924
#: bzrlib/switch.py:167
7925
#, python-format
7926
msgid "Tree is up to date at revision %d."
7927
msgstr ""
7928
7929
#: bzrlib/switch.py:173
7930
#, python-format
7931
msgid "Updated to revision %d."
7932
msgstr ""
7933
7934
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7935
msgid "Apply phase"
7936
msgstr "Aplicar fase"
7937
7938
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7939
msgid "removing file"
7940
msgstr "eliminar archivo"
7941
7942
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7943
msgid "adding file"
7944
msgstr "añadiendo archivo"
7945
7946
#: bzrlib/transform.py:2598
7947
msgid "Building tree"
7948
msgstr "Construyendo árbol"
7949
7950
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7951
msgid "Adding file contents"
7952
msgstr "Añadiendo contenidos de archivo"
7953
7954
#: bzrlib/transform.py:3017
7955
msgid "Resolution pass"
7956
msgstr ""
7957
7958
#: bzrlib/transport/ftp/_gssapi.py:88
7959
#, python-format
7960
msgid "Authenticated as %s"
7961
msgstr ""
7962
7963
#: bzrlib/tree.py:647
7964
msgid "*** {0} content-filter: {1} => {2!r}"
7965
msgstr ""
7966
7967
#: bzrlib/upgrade.py:77
7968
#, python-format
7969
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7970
msgstr ""
7971
7972
#: bzrlib/upgrade.py:100
7973
#, python-format
7974
msgid "cannot upgrade from bzrdir format %s"
7975
msgstr ""
7976
7977
#: bzrlib/upgrade.py:103
7978
#, python-format
7979
msgid "starting upgrade of %s"
7980
msgstr ""
7981
7982
#: bzrlib/upgrade.py:110
7983
msgid "finished"
7984
msgstr ""
7985
7986
#: bzrlib/upgrade.py:120
7987
msgid "Deleting backup.bzr"
7988
msgstr ""
7989
7990
#: bzrlib/upgrade.py:151
7991
msgid ""
7992
"\n"
7993
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7994
msgstr ""
7995
7996
#: bzrlib/upgrade.py:208
7997
#, python-format
7998
msgid "Found %d dependent branches - upgrading ..."
7999
msgstr ""
8000
8001
#: bzrlib/upgrade.py:276
8002
msgid "Upgrading bzrdirs"
8003
msgstr "Actualizando bzrdirs"
8004
8005
#: bzrlib/upgrade.py:282
8006
#, python-format
8007
msgid "Upgrading %s"
8008
msgstr "Actualizando %s"
8009
8010
#: bzrlib/upgrade.py:283
8011
msgid "Upgrading {0} {1} ..."
8012
msgstr "Actualizando {0} {1} ..."
8013
8014
#: bzrlib/upgrade.py:301
8015
msgid "Removing backup ..."
8016
msgstr ""
8017
8018
#: bzrlib/upgrade.py:305
8019
msgid "failed to clean-up {0}: {1}"
8020
msgstr ""
8021
8022
#: bzrlib/vf_repository.py:1091
8023
msgid "inventories"
8024
msgstr ""
8025
8026
#: bzrlib/vf_repository.py:1117
8027
msgid "texts"
8028
msgstr "textos"
8029
8030
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
8031
msgid "Calculating text parents"
8032
msgstr ""
8033
8034
#: bzrlib/vf_repository.py:1707
8035
msgid "Fetch texts"
8036
msgstr ""
8037
8038
#: bzrlib/vf_repository.py:2536
8039
msgid "loading text store"
8040
msgstr ""
8041
8042
#: bzrlib/vf_repository.py:2542
8043
msgid "checking text graph"
8044
msgstr ""
8045
8046
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8047
#: bzrlib/vf_repository.py:3127
8048
msgid "Transferring revisions"
8049
msgstr ""
8050
8051
#: bzrlib/win32utils.py:146
8052
msgid "Failed to GetProcessMemoryInfo()"
8053
msgstr ""
8054
8055
#: bzrlib/win32utils.py:167
8056
msgid "Cannot debug memory on win32 without ctypes or win32process"
8057
msgstr ""
8058
8059
#: bzrlib/win32utils.py:172
8060
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8061
msgstr ""
8062
8063
#: bzrlib/win32utils.py:180
8064
#, python-format
8065
msgid "WorkingSize %8d KiB"
8066
msgstr ""
8067
8068
#: bzrlib/win32utils.py:181
8069
#, python-format
8070
msgid "PeakWorking %8d KiB"
8071
msgstr ""
8072
8073
#: bzrlib/win32utils.py:182
8074
#, python-format
8075
msgid "PagefileUsage %8d KiB"
8076
msgstr ""
8077
8078
#: bzrlib/win32utils.py:183
8079
#, python-format
8080
msgid "PeakPagefileUsage %8d KiB"
8081
msgstr ""
8082
8083
#: bzrlib/win32utils.py:185
8084
#, python-format
8085
msgid "PrivateUsage %8d KiB"
8086
msgstr ""
8087
8088
#: bzrlib/win32utils.py:186
8089
#, python-format
8090
msgid "PageFaultCount %8d"
8091
msgstr ""
8092
8093
#: bzrlib/workingtree.py:1482
8094
msgid "Rerun update after fixing the conflicts."
8095
msgstr ""
8096
8097
#: dummy/help_topics/authentication/summary.txt:1
8098
msgid "Information on configuring authentication"
8099
msgstr ""
8100
8101
#: dummy/help_topics/basic/detail.txt:1
8102
msgid ""
8103
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8104
"http://bazaar.canonical.com/"
8105
msgstr ""
8106
8107
#: dummy/help_topics/basic/detail.txt:4
8108
msgid ""
8109
"Basic commands:\n"
8110
" bzr init makes this directory a versioned branch\n"
8111
" bzr branch make a copy of another branch"
8112
msgstr ""
8113
8114
#: dummy/help_topics/basic/detail.txt:8
8115
msgid ""
8116
" bzr add make files or directories versioned\n"
8117
" bzr ignore ignore a file or pattern\n"
8118
" bzr mv move or rename a versioned file"
8119
msgstr ""
8120
8121
#: dummy/help_topics/basic/detail.txt:12
8122
msgid ""
8123
" bzr status summarize changes in working copy\n"
8124
" bzr diff show detailed diffs"
8125
msgstr ""
8126
8127
#: dummy/help_topics/basic/detail.txt:15
8128
msgid ""
8129
" bzr merge pull in changes from another branch\n"
8130
" bzr commit save some or all changes\n"
8131
" bzr send send changes via email"
8132
msgstr ""
8133
8134
#: dummy/help_topics/basic/detail.txt:19
8135
msgid ""
8136
" bzr log show history of changes\n"
8137
" bzr check validate storage"
8138
msgstr ""
8139
" bzr log muestra el historial de cambios\n"
8140
" bzr check valida el almacenamiento"
8141
8142
#: dummy/help_topics/basic/detail.txt:22
8143
msgid ""
8144
" bzr help init more help on e.g. init command\n"
8145
" bzr help commands list all commands\n"
8146
" bzr help topics list all help topics\n"
8147
msgstr ""
8148
8149
#: dummy/help_topics/basic/summary.txt:1
8150
msgid "Basic commands"
8151
msgstr "Órdenes básicas"
8152
8153
#: dummy/help_topics/branches/detail.txt:1
8154
msgid "Branches"
8155
msgstr "Ramas"
8156
8157
#: dummy/help_topics/branches/detail.txt:3
8158
msgid ""
8159
"A branch consists of the state of a project, including all of its\n"
8160
"history. All branches have a repository associated (which is where the\n"
8161
"branch history is stored), but multiple branches may share the same\n"
8162
"repository (a shared repository). Branches can be copied and merged."
8163
msgstr ""
8164
8165
#: dummy/help_topics/branches/detail.txt:8
8166
msgid ""
8167
"In addition, one branch may be bound to another one. Binding to another\n"
8168
"branch indicates that commits which happen in this branch must also \n"
8169
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8170
"commits when the two branches are out of date. In order for a commit \n"
8171
"to succeed, it may be necessary to update the current branch using \n"
8172
"``bzr update``."
8173
msgstr ""
8174
8175
#: dummy/help_topics/branches/detail.txt:15
8176
#: dummy/help_topics/checkouts/detail.txt:66
8177
#: dummy/help_topics/repositories/detail.txt:36
8178
msgid "Related commands::"
8179
msgstr "Órdenes relacionadas"
8180
8181
#: dummy/help_topics/branches/detail.txt:17
8182
msgid ""
8183
" init Change a directory into a versioned branch.\n"
8184
" branch Create a new branch that is a copy of an existing branch.\n"
8185
" merge Perform a three-way merge.\n"
8186
" bind Bind a branch to another one.\n"
8187
msgstr ""
8188
8189
#: dummy/help_topics/branches/summary.txt:1
8190
msgid "Information on what a branch is"
8191
msgstr ""
8192
8193
#: dummy/help_topics/bugs/summary.txt:1
8194
msgid "Bug tracker settings"
8195
msgstr "Configuración del seguimiento de errores"
8196
8197
#: dummy/help_topics/checkouts/detail.txt:1
8198
msgid "Checkouts"
8199
msgstr "Comrpobaciones"
8200
8201
#: dummy/help_topics/checkouts/detail.txt:3
8202
msgid ""
8203
"Checkouts are source trees that are connected to a branch, so that when\n"
8204
"you commit in the source tree, the commit goes into that branch. They\n"
8205
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8206
"Bazaar's decentralized features until you want them. Using checkouts\n"
8207
"with shared repositories is very similar to working with SVN or CVS, but\n"
8208
"doesn't have the same restrictions. And using checkouts still allows\n"
8209
"others working on the project to use whatever workflow they like."
8210
msgstr ""
8211
8212
#: dummy/help_topics/checkouts/detail.txt:11
8213
msgid ""
8214
"A checkout is created with the bzr checkout command (see \"help "
8215
"checkout\").\n"
8216
"You pass it a reference to another branch, and it will create a local copy\n"
8217
"for you that still contains a reference to the branch you created the\n"
8218
"checkout from (the master branch). Then if you make any commits they will "
8219
"be\n"
8220
"made on the other branch first. This creates an instant mirror of your work, "
8221
"or\n"
8222
"facilitates lockstep development, where each developer is working together,\n"
8223
"continuously integrating the changes of others."
8224
msgstr ""
8225
8226
#: dummy/help_topics/checkouts/detail.txt:19
8227
msgid ""
8228
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8229
"you have the full history locally. As you have a first class branch you "
8230
"can\n"
8231
"also commit locally if you want, for instance due to the temporary loss af "
8232
"a\n"
8233
"network connection. Use the --local option to commit to do this. All the "
8234
"local\n"
8235
"commits will then be made on the master branch the next time you do a non-"
8236
"local\n"
8237
"commit."
8238
msgstr ""
8239
8240
#: dummy/help_topics/checkouts/detail.txt:26
8241
msgid ""
8242
"If you are using a checkout from a shared branch you will periodically want "
8243
"to\n"
8244
"pull in all the changes made by others. This is done using the \"update\"\n"
8245
"command. The changes need to be applied before any non-local commit, but\n"
8246
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8247
"command when needed."
8248
msgstr ""
8249
8250
#: dummy/help_topics/checkouts/detail.txt:32
8251
msgid ""
8252
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8253
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8254
"SVN checkout in that it is not a first class branch, it mainly consists of "
8255
"the\n"
8256
"working tree. This means that any history operations must query the master\n"
8257
"branch, which could be slow if a network connection is involved. Also, as "
8258
"you\n"
8259
"don't have a local branch, then you cannot commit locally."
8260
msgstr ""
8261
8262
#: dummy/help_topics/checkouts/detail.txt:39
8263
msgid ""
8264
"Lightweight checkouts work best when you have fast reliable access to the\n"
8265
"master branch. This means that if the master branch is on the same disk or "
8266
"LAN\n"
8267
"a lightweight checkout will be faster than a heavyweight one for any "
8268
"commands\n"
8269
"that modify the revision history (as only one copy of the branch needs to\n"
8270
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8271
"that uses the history but does not change it, but if the master branch is "
8272
"on\n"
8273
"the same disk then there won't be a noticeable difference."
8274
msgstr ""
8275
8276
#: dummy/help_topics/checkouts/detail.txt:47
8277
msgid ""
8278
"Another possible use for a checkout is to use it with a treeless repository\n"
8279
"containing your branches, where you maintain only one working tree by\n"
8280
"switching the master branch that the checkout points to when you want to\n"
8281
"work on a different branch."
8282
msgstr ""
8283
8284
#: dummy/help_topics/checkouts/detail.txt:52
8285
msgid ""
8286
"Obviously to commit on a checkout you need to be able to write to the "
8287
"master\n"
8288
"branch. This means that the master branch must be accessible over a "
8289
"writeable\n"
8290
"protocol , such as sftp://, and that you have write permissions at the "
8291
"other\n"
8292
"end. Checkouts also work on the local file system, so that all that matters "
8293
"is\n"
8294
"file permissions."
8295
msgstr ""
8296
8297
#: dummy/help_topics/checkouts/detail.txt:58
8298
msgid ""
8299
"You can change the master of a checkout by using the \"switch\" command "
8300
"(see\n"
8301
"\"help switch\"). This will change the location that the commits are sent "
8302
"to.\n"
8303
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8304
"checkout. If you would like to convert your heavy checkout into a normal\n"
8305
"branch so that every commit is local, you can use the \"unbind\" command. To "
8306
"see\n"
8307
"whether or not a branch is bound or not you can use the \"info\" command. If "
8308
"the\n"
8309
"branch is bound it will tell you the location of the bound branch."
8310
msgstr ""
8311
8312
#: dummy/help_topics/checkouts/detail.txt:68
8313
msgid ""
8314
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8315
" checkout\n"
8316
" update Pull any changes in the master branch in to your checkout\n"
8317
" commit Make a commit that is sent to the master branch. If you have\n"
8318
" a heavy checkout then the --local option will commit to the\n"
8319
" checkout without sending the commit to the master\n"
8320
" switch Change the master branch that the commits in the checkout "
8321
"will\n"
8322
" be sent to\n"
8323
" bind Turn a standalone branch into a heavy checkout so that any\n"
8324
" commits will be sent to the master branch\n"
8325
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8326
" commits are only made locally\n"
8327
" info Displays whether a branch is bound or unbound. If the branch "
8328
"is\n"
8329
" bound, then it will also display the location of the bound "
8330
"branch\n"
8331
msgstr ""
8332
8333
#: dummy/help_topics/checkouts/summary.txt:1
8334
msgid "Information on what a checkout is"
8335
msgstr "información sobre lo que es una comprobación"
8336
8337
#: dummy/help_topics/commands/summary.txt:1
8338
msgid "Basic help for all commands"
8339
msgstr "Ayuda básica para todas las órdenes"
8340
8341
#: dummy/help_topics/configuration/summary.txt:1
8342
msgid "Details on the configuration settings available"
8343
msgstr "Detalles de las configuraciones disponibles"
8344
8345
#: dummy/help_topics/conflict-types/summary.txt:1
8346
msgid "Types of conflicts and what to do about them"
8347
msgstr "Tipos de conflicto y qué hacer con ellos"
8348
8349
#: dummy/help_topics/content-filters/summary.txt:1
8350
msgid "Conversion of content into/from working trees"
8351
msgstr ""
8352
8353
#: dummy/help_topics/criss-cross/detail.txt:1
8354
msgid "Criss-Cross"
8355
msgstr ""
8356
8357
#: dummy/help_topics/criss-cross/detail.txt:3
8358
msgid ""
8359
"A criss-cross in the branch history can cause the default merge technique\n"
8360
"to emit more conflicts than would normally be expected."
8361
msgstr ""
8362
8363
#: dummy/help_topics/criss-cross/detail.txt:6
8364
msgid ""
8365
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8366
"give\n"
8367
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8368
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8369
msgstr ""
8370
8371
#: dummy/help_topics/criss-cross/detail.txt:10
8372
msgid ""
8373
"Criss-crosses occur in a branch's history if two branches merge the same "
8374
"thing\n"
8375
"and then merge one another, or if two branches merge one another at the "
8376
"same\n"
8377
"time. They can be avoided by having each branch only merge from or into a\n"
8378
"designated central branch (a \"star topology\")."
8379
msgstr ""
8380
8381
#: dummy/help_topics/criss-cross/detail.txt:15
8382
msgid ""
8383
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8384
"default\n"
8385
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8386
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8387
"differences between THIS and OTHER are due to one side adding lines, or\n"
8388
"from another side removing lines."
8389
msgstr ""
8390
8391
#: dummy/help_topics/criss-cross/detail.txt:21
8392
msgid ""
8393
"Criss-crosses mean there is no good choice for a base. Selecting the "
8394
"recent\n"
8395
"merge points could cause one side's changes to be silently discarded.\n"
8396
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8397
"are emitted."
8398
msgstr ""
8399
8400
#: dummy/help_topics/criss-cross/detail.txt:26
8401
msgid ""
8402
"The ``weave`` merge type is not affected by this problem because it uses\n"
8403
"line-origin detection instead of a basis revision to determine the cause of\n"
8404
"differences.\n"
8405
msgstr ""
8406
8407
#: dummy/help_topics/criss-cross/summary.txt:1
8408
msgid "Information on criss-cross merging"
8409
msgstr ""
8410
8411
#: dummy/help_topics/current-formats/summary.txt:1
8412
msgid "Current storage formats"
8413
msgstr ""
8414
8415
#: dummy/help_topics/debug-flags/summary.txt:1
8416
msgid "Options to show or record debug information"
8417
msgstr "Opciones para mostrar o grabar información de depuración"
8418
8419
#: dummy/help_topics/diverged-branches/summary.txt:1
8420
msgid "How to fix diverged branches"
8421
msgstr ""
8422
8423
#: dummy/help_topics/env-variables/summary.txt:1
8424
msgid "Environment variable names and values"
8425
msgstr "Nombres y valores de variables de entorno"
8426
8427
#: dummy/help_topics/eol/summary.txt:1
8428
msgid "Information on end-of-line handling"
8429
msgstr ""
8430
8431
#: dummy/help_topics/files/detail.txt:1
8432
msgid "Files"
8433
msgstr "Archivos"
8434
8435
#: dummy/help_topics/files/detail.txt:3
8436
msgid ""
8437
":On Unix: ~/.bazaar/bazaar.conf\n"
8438
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8439
"bazaar\\\\2.0\\\\bazaar.conf"
8440
msgstr ""
8441
8442
#: dummy/help_topics/files/detail.txt:6
8443
msgid ""
8444
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8445
"used to define general configuration that will be applied everywhere.\n"
8446
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8447
"commonly used options."
8448
msgstr ""
8449
8450
#: dummy/help_topics/files/detail.txt:11
8451
msgid "A typical config file might look something like::"
8452
msgstr ""
8453
8454
#: dummy/help_topics/files/detail.txt:13
8455
msgid ""
8456
" [DEFAULT]\n"
8457
" email=John Doe <jdoe@isp.com>"
8458
msgstr ""
8459
8460
#: dummy/help_topics/files/detail.txt:16
8461
msgid ""
8462
" [ALIASES]\n"
8463
" commit = commit --strict\n"
8464
" log10 = log --short -r -10..-1\n"
8465
msgstr ""
8466
" [ALIASES]\n"
8467
" commit = commit --strict\n"
8468
" log10 = log --short -r -10..-1\n"
8469
8470
#: dummy/help_topics/files/summary.txt:1
8471
msgid "Information on configuration and log files"
8472
msgstr "Información sobre configuración y archivos de registro"
8473
8474
#: dummy/help_topics/formats/detail.txt:1
8475
msgid "Storage Formats"
8476
msgstr "Formatos de almacenamiento"
8477
8478
#: dummy/help_topics/formats/detail.txt:3
8479
msgid ""
8480
"To ensure that older clients do not access data incorrectly,\n"
8481
"Bazaar's policy is to introduce a new storage format whenever\n"
8482
"new features requiring new metadata are added. New storage\n"
8483
"formats may also be introduced to improve performance and\n"
8484
"scalability."
8485
msgstr ""
8486
8487
#: dummy/help_topics/formats/detail.txt:9
8488
msgid ""
8489
"The newest format, 2a, is highly recommended. If your\n"
8490
"project is not using 2a, then you should suggest to the\n"
8491
"project owner to upgrade."
8492
msgstr ""
8493
8494
#: dummy/help_topics/formats/detail.txt:13
8495
msgid ""
8496
"\n"
8497
".. note::"
8498
msgstr ""
8499
"\n"
8500
".. nota::"
8501
8502
#: dummy/help_topics/formats/detail.txt:16
8503
msgid ""
8504
" Some of the older formats have two variants:\n"
8505
" a plain one and a rich-root one. The latter include an additional\n"
8506
" field about the root of the tree. There is no performance cost\n"
8507
" for using a rich-root format but you cannot easily merge changes\n"
8508
" from a rich-root format into a plain format. As a consequence,\n"
8509
" moving a project to a rich-root format takes some co-ordination\n"
8510
" in that all contributors need to upgrade their repositories\n"
8511
" around the same time. 2a and all future formats will be\n"
8512
" implicitly rich-root."
8513
msgstr ""
8514
8515
#: dummy/help_topics/formats/detail.txt:26
8516
msgid ""
8517
"See :doc:`current-formats-help` for the complete list of\n"
8518
"currently supported formats. See :doc:`other-formats-help` for\n"
8519
"descriptions of any available experimental and deprecated formats.\n"
8520
msgstr ""
8521
8522
#: dummy/help_topics/formats/summary.txt:1
8523
msgid "Information on choosing a storage format"
8524
msgstr "Información para escoger un formato de almacenamiento"
8525
8526
#: dummy/help_topics/global-options/detail.txt:1
8527
msgid "Global Options"
8528
msgstr "Opciones globales"
8529
8530
#: dummy/help_topics/global-options/detail.txt:3
8531
msgid ""
8532
"These options may be used with any command, and may appear in front of any\n"
8533
"command. (e.g. ``bzr --profile help``)."
8534
msgstr ""
8535
8536
#: dummy/help_topics/global-options/detail.txt:6
8537
msgid ""
8538
"--version Print the version number. Must be supplied before the "
8539
"command.\n"
8540
"--no-aliases Do not process command aliases when running this command.\n"
8541
"--builtin Use the built-in version of a command, not the plugin "
8542
"version.\n"
8543
" This does not suppress other plugin effects.\n"
8544
"--no-plugins Do not process any plugins.\n"
8545
"--no-l10n Do not translate messages.\n"
8546
"--concurrency Number of processes that can be run concurrently (selftest)."
8547
msgstr ""
8548
8549
#: dummy/help_topics/global-options/detail.txt:14
8550
msgid ""
8551
"--profile Profile execution using the hotshot profiler.\n"
8552
"--lsprof Profile execution using the lsprof profiler.\n"
8553
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8554
" results to a specified file. If the filename ends with "
8555
"\".txt\",\n"
8556
" text format will be used. If the filename either starts "
8557
"with\n"
8558
" \"callgrind.out\" or end with \".callgrind\", the output will "
8559
"be\n"
8560
" formatted for use with KCacheGrind. Otherwise, the output\n"
8561
" will be a pickle.\n"
8562
"--coverage Generate line coverage report in the specified directory."
8563
msgstr ""
8564
8565
#: dummy/help_topics/global-options/detail.txt:24
8566
msgid ""
8567
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8568
"for\n"
8569
" the duration of the command. This can be used multiple times "
8570
"if\n"
8571
" several options need to be overridden."
8572
msgstr ""
8573
8574
#: dummy/help_topics/global-options/detail.txt:28
8575
msgid ""
8576
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8577
"information on profiling."
8578
msgstr ""
8579
"Visite http://doc.bazaar.canonical.com/developers/profiling.html para tener\n"
8580
"más información del perfilado."
8581
8582
#: dummy/help_topics/global-options/detail.txt:31
8583
msgid ""
8584
"A number of debug flags are also available to assist troubleshooting and\n"
8585
"development. See :doc:`debug-flags-help`.\n"
8586
msgstr ""
8587
8588
#: dummy/help_topics/global-options/summary.txt:1
8589
msgid "Options that control how Bazaar runs"
8590
msgstr "Opciones que controlan como se ejecuta Bazaar"
8591
8592
#: dummy/help_topics/hidden-commands/summary.txt:1
8593
msgid "All hidden commands"
8594
msgstr "Todas las órdenes ocultas"
8595
8596
#: dummy/help_topics/hooks/summary.txt:1
8597
msgid "Points at which custom processing can be added"
8598
msgstr ""
8599
8600
#: dummy/help_topics/launchpad/detail.txt:1
8601
msgid "Integration with Launchpad.net"
8602
msgstr "Integración con Launchpad.net"
8603
8604
#: dummy/help_topics/launchpad/detail.txt:3
8605
msgid ""
8606
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8607
"specification tracking."
8608
msgstr ""
8609
8610
#: dummy/help_topics/launchpad/detail.txt:6
8611
msgid ""
8612
"The bzr client (through the plugin called 'launchpad') has special\n"
8613
"features to communicate with Launchpad:"
8614
msgstr ""
8615
8616
#: dummy/help_topics/launchpad/detail.txt:9
8617
msgid ""
8618
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8619
"This\n"
8620
" is then used by the 'lp:' transport to download your branches using\n"
8621
" bzr+ssh://."
8622
msgstr ""
8623
8624
#: dummy/help_topics/launchpad/detail.txt:13
8625
msgid ""
8626
" * The 'lp:' transport uses Launchpad as a directory service: for "
8627
"example\n"
8628
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8629
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8630
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8631
msgstr ""
8632
8633
#: dummy/help_topics/launchpad/detail.txt:18
8634
msgid ""
8635
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8636
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8637
"lp:12345'\n"
8638
" will record a revision property that marks that revision as fixing\n"
8639
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8640
" automatically be linked to the bug report."
8641
msgstr ""
8642
8643
#: dummy/help_topics/launchpad/detail.txt:24
8644
msgid ""
8645
" * The register-branch command tells Launchpad about the url of a\n"
8646
" public branch. Launchpad will then mirror the branch, display\n"
8647
" its contents and allow it to be attached to bugs and other\n"
8648
" objects."
8649
msgstr ""
8650
8651
#: dummy/help_topics/launchpad/detail.txt:29
8652
msgid "For more information see http://help.launchpad.net/\n"
8653
msgstr ""
8654
8655
#: dummy/help_topics/launchpad/summary.txt:1
8656
msgid "Using Bazaar with Launchpad.net"
8657
msgstr "Usar Bazaar con Launchpad.net"
8658
8659
#: dummy/help_topics/location-alias/summary.txt:1
8660
msgid "Aliases for remembered locations"
8661
msgstr "Alias para recordar ubicaciones"
8662
8663
#: dummy/help_topics/log-formats/summary.txt:1
8664
msgid "Details on the logging formats available"
8665
msgstr "Detalles sobre los formatos de acceso disponibles"
8666
8667
#: dummy/help_topics/other-formats/summary.txt:1
8668
msgid "Experimental and deprecated storage formats"
8669
msgstr "Formatos de almacenamiento experimentales y obsoletos"
8670
8671
#: dummy/help_topics/patterns/summary.txt:1
8672
msgid "Information on the pattern syntax"
8673
msgstr "Información de la sintaxis de patrones"
8674
8675
#: dummy/help_topics/repositories/detail.txt:1
8676
msgid "Repositories"
8677
msgstr "Repositorios"
8678
8679
#: dummy/help_topics/repositories/detail.txt:3
8680
msgid ""
8681
"Repositories in Bazaar are where committed information is stored. There is\n"
8682
"a repository associated with every branch."
8683
msgstr ""
8684
8685
#: dummy/help_topics/repositories/detail.txt:6
8686
msgid ""
8687
"Repositories are a form of database. Bzr will usually maintain this for\n"
8688
"good performance automatically, but in some situations (e.g. when doing\n"
8689
"very many commits in a short time period) you may want to ask bzr to\n"
8690
"optimise the database indices. This can be done by the 'bzr pack' command."
8691
msgstr ""
8692
8693
#: dummy/help_topics/repositories/detail.txt:11
8694
msgid ""
8695
"By default just running 'bzr init' will create a repository within the new\n"
8696
"branch but it is possible to create a shared repository which allows "
8697
"multiple\n"
8698
"branches to share their information in the same location. When a new branch "
8699
"is\n"
8700
"created it will first look to see if there is a containing shared repository "
8701
"it\n"
8702
"can use."
8703
msgstr ""
8704
8705
#: dummy/help_topics/repositories/detail.txt:17
8706
msgid ""
8707
"When two branches of the same project share a repository, there is\n"
8708
"generally a large space saving. For some operations (e.g. branching\n"
8709
"within the repository) this translates in to a large time saving."
8710
msgstr ""
8711
8712
#: dummy/help_topics/repositories/detail.txt:21
8713
msgid ""
8714
"To create a shared repository use the init-repository command (or the alias\n"
8715
"init-repo). This command takes the location of the repository to create. "
8716
"This\n"
8717
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8718
"which contains a shared repository. Any new branches that are created in "
8719
"this\n"
8720
"directory will then use it for storage."
8721
msgstr ""
8722
8723
#: dummy/help_topics/repositories/detail.txt:27
8724
msgid ""
8725
"It is a good idea to create a repository whenever you might create more\n"
8726
"than one branch of a project. This is true for both working areas where you\n"
8727
"are doing the development, and any server areas that you use for hosting\n"
8728
"projects. In the latter case, it is common to want branches without working\n"
8729
"trees. Since the files in the branch will not be edited directly there is "
8730
"no\n"
8731
"need to use up disk space for a working tree. To create a repository in "
8732
"which\n"
8733
"the branches will not have working trees pass the '--no-trees' option to\n"
8734
"'init-repository'."
8735
msgstr ""
8736
8737
#: dummy/help_topics/repositories/detail.txt:38
8738
msgid ""
8739
" init-repository Create a shared repository. Use --no-trees to create "
8740
"one\n"
8741
" in which new branches won't get a working tree.\n"
8742
msgstr ""
8743
8744
#: dummy/help_topics/repositories/summary.txt:1
8745
msgid "Basic information on shared repositories."
8746
msgstr "Información básica de los repositorios compartidos."
8747
8748
#: dummy/help_topics/revisionspec/summary.txt:1
8749
msgid "Explain how to use --revision"
8750
msgstr "Explicar cómo se usa --revision"
8751
8752
#: dummy/help_topics/rules/summary.txt:1
8753
msgid "Information on defining rule-based preferences"
8754
msgstr ""
8755
8756
#: dummy/help_topics/standalone-trees/detail.txt:1
8757
msgid "Standalone Trees"
8758
msgstr "Áboles autónomos"
8759
8760
#: dummy/help_topics/standalone-trees/detail.txt:3
8761
msgid ""
8762
"A standalone tree is a working tree with an associated repository. It\n"
8763
"is an independently usable branch, with no dependencies on any other.\n"
8764
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8765
"an existing project under version control."
8766
msgstr ""
8767
8768
#: dummy/help_topics/standalone-trees/detail.txt:8
8769
msgid "Related Commands::"
8770
msgstr "Órdenes relacionadas::"
8771
8772
#: dummy/help_topics/standalone-trees/detail.txt:10
8773
msgid " init Make a directory into a versioned branch.\n"
8774
msgstr ""
8775
8776
#: dummy/help_topics/standalone-trees/summary.txt:1
8777
msgid "Information on what a standalone tree is"
8778
msgstr "Información sobre lo que es un árbol autónomo"
8779
8780
#: dummy/help_topics/standard-options/detail.txt:1
8781
msgid "Standard Options"
8782
msgstr "Opciones estándar"
8783
8784
#: dummy/help_topics/standard-options/detail.txt:3
8785
msgid "Standard options are legal for all commands."
8786
msgstr "Las opciones estándar son legales para todas las órdenes."
8787
8788
#: dummy/help_topics/standard-options/detail.txt:5
8789
msgid ""
8790
"--help, -h Show help message.\n"
8791
"--verbose, -v Display more information.\n"
8792
"--quiet, -q Only display errors and warnings."
8793
msgstr ""
8794
8795
#: dummy/help_topics/standard-options/detail.txt:9
8796
msgid "Unlike global options, standard options can be used in aliases.\n"
8797
msgstr ""
8798
8799
#: dummy/help_topics/standard-options/summary.txt:1
8800
msgid "Options that can be used with any command"
8801
msgstr "Opciones que se pueden usar con cualquier orden"
8802
8803
#: dummy/help_topics/status-flags/detail.txt:1
8804
msgid "Status Flags"
8805
msgstr "Marcas de estado"
8806
8807
#: dummy/help_topics/status-flags/detail.txt:3
8808
msgid ""
8809
"Status flags are used to summarise changes to the working tree in a concise\n"
8810
"manner. They are in the form::"
8811
msgstr ""
8812
8813
#: dummy/help_topics/status-flags/detail.txt:6
8814
msgid " xxx <filename>"
8815
msgstr " xxx <nombre de archivo>"
8816
8817
#: dummy/help_topics/status-flags/detail.txt:8
8818
msgid "where the columns' meanings are as follows."
8819
msgstr "donde los significados de las columnas son los siguientes"
8820
8821
#: dummy/help_topics/status-flags/detail.txt:10
8822
msgid "Column 1 - versioning/renames::"
8823
msgstr ""
8824
8825
#: dummy/help_topics/status-flags/detail.txt:12
8826
msgid ""
8827
" + File versioned\n"
8828
" - File unversioned\n"
8829
" R File renamed\n"
8830
" ? File unknown\n"
8831
" X File nonexistent (and unknown to bzr)\n"
8832
" C File has conflicts\n"
8833
" P Entry for a pending merge (not a file)"
8834
msgstr ""
8835
8836
#: dummy/help_topics/status-flags/detail.txt:20
8837
msgid "Column 2 - contents::"
8838
msgstr "Columna 2 - contenidos::"
8839
8840
#: dummy/help_topics/status-flags/detail.txt:22
8841
msgid ""
8842
" N File created\n"
8843
" D File deleted\n"
8844
" K File kind changed\n"
8845
" M File modified"
8846
msgstr ""
8847
8848
#: dummy/help_topics/status-flags/detail.txt:27
8849
msgid "Column 3 - execute::"
8850
msgstr ""
8851
8852
#: dummy/help_topics/status-flags/detail.txt:29
8853
msgid " * The execute bit was changed\n"
8854
msgstr ""
8855
8856
#: dummy/help_topics/status-flags/summary.txt:1
8857
msgid "Help on status flags"
8858
msgstr "Ayuda sobre marcas de estado"
8859
8860
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8861
msgid "Branches Out of Sync"
8862
msgstr "Ramas sin sincronización"
8863
8864
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8865
msgid ""
8866
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8867
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8868
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8869
"have the same last revision as the new reference branch for the lightweight\n"
8870
"checkout, data could be lost, so Bazaar refuses."
8871
msgstr ""
8872
8873
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8874
msgid "How you deal with this depends on *why* the branches are out of sync."
8875
msgstr ""
8876
8877
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8878
msgid ""
8879
"If you have a checkout and have done local commits, you can get back in "
8880
"sync\n"
8881
"by running \"bzr update\" (and possibly \"bzr commit\")."
8882
msgstr ""
8883
8884
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8885
msgid ""
8886
"If you have a branch and the remote branch is out-of-date, you can push\n"
8887
"the local changes using \"bzr push\". If the local branch is out of date, "
8888
"you\n"
8889
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8890
"commit\n"
8891
"and then push your changes. If you decide that some of the changes aren't\n"
8892
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8893
msgstr ""
8894
8895
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8896
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8897
msgstr ""
8898
8899
#: dummy/help_topics/topics/summary.txt:1
8900
msgid "Topics list"
8901
msgstr "Lista de temas"
8902
8903
#: dummy/help_topics/url-special-chars/summary.txt:1
8904
msgid "Special character handling in URLs"
8905
msgstr ""
8906
8907
#: dummy/help_topics/urlspec/summary.txt:1
8908
msgid "Supported transport protocols"
8909
msgstr "Protocolos de transporte permitidos"
8910
8911
#: dummy/help_topics/working-trees/detail.txt:1
8912
msgid "Working Trees"
8913
msgstr "Árboles de trabajo"
8914
8915
#: dummy/help_topics/working-trees/detail.txt:3
8916
msgid ""
8917
"A working tree is the contents of a branch placed on disk so that you can\n"
8918
"see the files and edit them. The working tree is where you make changes to "
8919
"a\n"
8920
"branch, and when you commit the current state of the working tree is the\n"
8921
"snapshot that is recorded in the commit."
8922
msgstr ""
8923
8924
#: dummy/help_topics/working-trees/detail.txt:8
8925
msgid ""
8926
"When you push a branch to a remote system, a working tree will not be\n"
8927
"created. If one is already present the files will not be updated. The\n"
8928
"branch information will be updated and the working tree will be marked\n"
8929
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8930
"may be uncommitted changes or the update may cause content conflicts that "
8931
"are\n"
8932
"difficult to deal with remotely."
8933
msgstr ""
8934
8935
#: dummy/help_topics/working-trees/detail.txt:15
8936
msgid ""
8937
"If you have a branch with no working tree you can use the 'checkout' "
8938
"command\n"
8939
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8940
"will\n"
8941
"create the working tree. If the branch is updated remotely, you can update "
8942
"the\n"
8943
"working tree by running 'bzr update' in that directory."
8944
msgstr ""
8945
8946
#: dummy/help_topics/working-trees/detail.txt:20
8947
msgid ""
8948
"If you have a branch with a working tree that you do not want the 'remove-"
8949
"tree'\n"
8950
"command will remove the tree if it is safe. This can be done to avoid the\n"
8951
"warning about the remote working tree not being updated when pushing to the\n"
8952
"branch. It can also be useful when working with a '--no-trees' repository\n"
8953
"(see 'bzr help repositories')."
8954
msgstr ""
8955
8956
#: dummy/help_topics/working-trees/detail.txt:26
8957
msgid ""
8958
"If you want to have a working tree on a remote machine that you push to you\n"
8959
"can either run 'bzr update' in the remote branch after each push, or use "
8960
"some\n"
8961
"other method to update the tree during the push. There is an 'rspush' "
8962
"plugin\n"
8963
"that will update the working tree using rsync as well as doing a push. "
8964
"There\n"
8965
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8966
"SSH\n"
8967
"after each push."
8968
msgstr ""
8969
8970
#: dummy/help_topics/working-trees/detail.txt:33
8971
msgid "Useful commands::"
8972
msgstr "Órdenes útiles::"
8973
8974
#: dummy/help_topics/working-trees/detail.txt:35
8975
msgid ""
8976
" checkout Create a working tree when a branch does not have one.\n"
8977
" remove-tree Removes the working tree from a branch when it is safe to do "
8978
"so.\n"
8979
" update When a working tree is out of sync with its associated "
8980
"branch\n"
8981
" this will update the tree to match the branch.\n"
8982
msgstr ""
8983
8984
#: dummy/help_topics/working-trees/summary.txt:1
8985
msgid "Information on working trees"
8986
msgstr "Información en árboles de trabajo"
8987
8988
#: en/help_topics/authentication.txt:1
8989
msgid ""
8990
"Authentication Settings\n"
8991
"======================="
8992
msgstr ""
8993
"Configuración de la autenticación\n"
8994
"==========================="
8995
8996
#: en/help_topics/authentication.txt:4
8997
msgid ""
8998
"\n"
8999
"Intent\n"
9000
"------"
9001
msgstr ""
9002
"\n"
9003
"Intento\n"
9004
"-----------"
9005
9006
#: en/help_topics/authentication.txt:8
9007
msgid ""
9008
"Many different authentication policies can be described in the\n"
9009
"``authentication.conf`` file but a particular user should need only a few\n"
9010
"definitions to cover his needs without having to specify a user and a "
9011
"password\n"
9012
"for every branch he uses."
9013
msgstr ""
9014
9015
#: en/help_topics/authentication.txt:13
9016
msgid ""
9017
"The definitions found in this file are used to find the credentials to use "
9018
"for\n"
9019
"a given url. The same credentials can generally be used for as many branches "
9020
"as\n"
9021
"possible by grouping their declaration around the remote servers that need\n"
9022
"them. It's even possible to declare credentials that will be used by "
9023
"different\n"
9024
"servers."
9025
msgstr ""
9026
9027
#: en/help_topics/authentication.txt:19
9028
msgid ""
9029
"The intent is to make this file as small as possible to minimize maintenance."
9030
msgstr ""
9031
"El intento es hacer este archivo tan pequeño como sea posible para minimizar "
9032
"el mantenimiento."
9033
9034
#: en/help_topics/authentication.txt:21
9035
msgid ""
9036
"Once the relevant credentials are declared in this file you may use branch "
9037
"urls\n"
9038
"without embedding passwords (security hazard) or even users (enabling "
9039
"sharing\n"
9040
"of your urls with others)."
9041
msgstr ""
9042
9043
#: en/help_topics/authentication.txt:25
9044
msgid "Instead of using::"
9045
msgstr "en vez de usar::"
9046
9047
#: en/help_topics/authentication.txt:27
9048
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9049
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9050
9051
#: en/help_topics/authentication.txt:29
9052
msgid "you simply use::"
9053
msgstr "simplemente use::"
9054
9055
#: en/help_topics/authentication.txt:31
9056
msgid " bzr branch ftp://host.com/path/to/my/branch"
9057
msgstr " bzr branch ftp://host.com/path/to/my/branch"
9058
9059
#: en/help_topics/authentication.txt:33
9060
msgid ""
9061
"provided you have created the following ``authentication.conf`` file::"
9062
msgstr ""
9063
9064
#: en/help_topics/authentication.txt:35
9065
msgid ""
9066
" [myprojects]\n"
9067
" scheme=ftp\n"
9068
" host=host.com\n"
9069
" user=joe\n"
9070
" password=secret\n"
9071
" "
9072
msgstr ""
9073
" [misproyectos]\n"
9074
" scheme=ftp\n"
9075
" host=host.com\n"
9076
" user=juan\n"
9077
" password=secreta\n"
9078
" "
9079
9080
#: en/help_topics/authentication.txt:42
9081
msgid ""
9082
"Authentication definitions\n"
9083
"--------------------------"
9084
msgstr ""
9085
"Definiciones de autenticación\n"
9086
"--------------------------"
9087
9088
#: en/help_topics/authentication.txt:45
9089
msgid ""
9090
"There are two kinds of authentication used by the various schemes supported "
9091
"by\n"
9092
"bzr:"
9093
msgstr ""
9094
9095
#: en/help_topics/authentication.txt:48
9096
msgid "1. user and password"
9097
msgstr "1. usuario y contraseña"
9098
9099
#: en/help_topics/authentication.txt:50
9100
msgid ""
9101
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9102
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9103
"ssh agents are a better, more secure solution. So we have chosen to not "
9104
"provide\n"
9105
"our own less secure method."
9106
msgstr ""
9107
9108
#: en/help_topics/authentication.txt:55
9109
msgid "2. user, realm and password"
9110
msgstr "2. usuario, reino y contraseña"
9111
9112
#: en/help_topics/authentication.txt:57
9113
msgid ""
9114
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9115
"against a host. But, by using ``.htaccess`` files, for example, it is "
9116
"possible\n"
9117
"to define several (``user, realm, password``) for a given ``host``. So what "
9118
"is\n"
9119
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9120
"is\n"
9121
"not taken into account in the definitions, but will displayed if bzr "
9122
"prompts\n"
9123
"you for a password."
9124
msgstr ""
9125
9126
#: en/help_topics/authentication.txt:64
9127
msgid ""
9128
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9129
"specifying the appropriate port."
9130
msgstr ""
9131
9132
#: en/help_topics/authentication.txt:67
9133
msgid ""
9134
"To take all schemes into account, the password will be deduced from a set "
9135
"of\n"
9136
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9137
"``user``,\n"
9138
"``password``)."
9139
msgstr ""
9140
9141
#: en/help_topics/authentication.txt:71
9142
msgid ""
9143
" * ``scheme``: can be empty (meaning the rest of the definition can be "
9144
"used\n"
9145
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9146
"``ssh``\n"
9147
" should be used instead since this is the real scheme regarding\n"
9148
" authentication,"
9149
msgstr ""
9150
9151
#: en/help_topics/authentication.txt:76
9152
msgid " * ``host``: can be empty (to act as a default for any host),"
9153
msgstr ""
9154
9155
#: en/help_topics/authentication.txt:78
9156
msgid ""
9157
" * ``port`` can be empty (useful when an host provides several servers for "
9158
"the\n"
9159
" same scheme), only numerical values are allowed, this should be used "
9160
"only\n"
9161
" when the server uses a port different than the scheme standard port,"
9162
msgstr ""
9163
9164
#: en/help_topics/authentication.txt:82
9165
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
9166
msgstr ""
9167
9168
#: en/help_topics/authentication.txt:84
9169
msgid ""
9170
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
9171
" ``getpass.get_user()``),"
9172
msgstr ""
9173
9174
#: en/help_topics/authentication.txt:87
9175
msgid ""
9176
" * ``password``: can be empty if you prefer to always be prompted for your\n"
9177
" password."
9178
msgstr ""
9179
9180
#: en/help_topics/authentication.txt:90
9181
msgid ""
9182
"Multiple definitions can be provided and, for a given URL, bzr will select "
9183
"a\n"
9184
"(``user`` [, ``password``]) based on the following rules :"
9185
msgstr ""
9186
9187
#: en/help_topics/authentication.txt:93
9188
msgid " 1. the first match wins,"
9189
msgstr " 1. la primera coincidencia gana,"
9190
9191
#: en/help_topics/authentication.txt:95
9192
msgid " 2. empty fields match everything,"
9193
msgstr " 2. los campos vacíos coinciden siempre,"
9194
9195
#: en/help_topics/authentication.txt:97
9196
msgid ""
9197
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9198
msgstr ""
9199
" 3. «scheme» coincide incluso si los decoradores se han usado en el URL "
9200
"solicitado,"
9201
9202
#: en/help_topics/authentication.txt:99
9203
msgid ""
9204
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9205
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
9206
"``projectbzr.sf.net``\n"
9207
" will not match ``bzr.sf.net``)."
9208
msgstr ""
9209
9210
#: en/help_topics/authentication.txt:103
9211
msgid ""
9212
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9213
msgstr ""
9214
9215
#: en/help_topics/authentication.txt:105
9216
msgid ""
9217
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9218
"above,\n"
9219
" empty paths will match any provided path)."
9220
msgstr ""
9221
9222
#: en/help_topics/authentication.txt:110
9223
msgid ""
9224
"File format\n"
9225
"-----------"
9226
msgstr ""
9227
"Formato de archivo\n"
9228
"------------------"
9229
9230
#: en/help_topics/authentication.txt:113
9231
msgid ""
9232
"The general rules for :doc:`configuration files <configuration-help>`\n"
9233
"apply except for the variable policies."
9234
msgstr ""
9235
9236
#: en/help_topics/authentication.txt:116
9237
msgid "Each section describes an authentication definition."
9238
msgstr "Cada sección describe una definición de autenticación."
9239
9240
#: en/help_topics/authentication.txt:118
9241
msgid ""
9242
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9243
"reserved\n"
9244
"and should appear as the *last* section."
9245
msgstr ""
9246
9247
#: en/help_topics/authentication.txt:121
9248
msgid "Each section should define:"
9249
msgstr "Cada sección debe definir:"
9250
9251
#: en/help_topics/authentication.txt:123
9252
msgid "* ``user``: the login to be used,"
9253
msgstr "* «user»: el acceso a usar,"
9254
9255
#: en/help_topics/authentication.txt:125
9256
msgid "Each section could define:"
9257
msgstr "Cada sección puede definir:"
9258
9259
#: en/help_topics/authentication.txt:127
9260
msgid "* ``host``: the remote server,"
9261
msgstr "* «host»: el servidor remoto,"
9262
9263
#: en/help_topics/authentication.txt:129
9264
msgid "* ``port``: the port the server is listening,"
9265
msgstr "* «port»: el puerto en el que escucha el servidor,"
9266
9267
#: en/help_topics/authentication.txt:131
9268
msgid "* ``path``: the branch location,"
9269
msgstr "* «path»: la ubicación de la rama,"
9270
9271
#: en/help_topics/authentication.txt:133
9272
msgid "* ``password``: the password."
9273
msgstr "* «password»: la contraseña."
9274
9275
#: en/help_topics/authentication.txt:135
9276
msgid ""
9277
"\n"
9278
"Examples\n"
9279
"--------"
9280
msgstr ""
9281
"\n"
9282
"Ejemplos\n"
9283
"--------"
9284
9285
#: en/help_topics/authentication.txt:139
9286
msgid ""
9287
"\n"
9288
"Personal projects hosted outside\n"
9289
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9290
msgstr ""
9291
9292
#: en/help_topics/authentication.txt:143
9293
msgid ""
9294
"All connections are done with the same ``user`` (the remote one for which "
9295
"the\n"
9296
"default bzr one is not appropriate) and the password is always prompted "
9297
"with\n"
9298
"some exceptions::"
9299
msgstr ""
9300
9301
#: en/help_topics/authentication.txt:147
9302
msgid ""
9303
" # Pet projects on hobby.net\n"
9304
" [hobby]\n"
9305
" host=r.hobby.net\n"
9306
" user=jim\n"
9307
" password=obvious1234\n"
9308
" \n"
9309
" # Home server\n"
9310
" [home]\n"
9311
" scheme=https\n"
9312
" host=home.net\n"
9313
" user=joe\n"
9314
" password=1essobV10us\n"
9315
" \n"
9316
" [DEFAULT]\n"
9317
" # Our local user is barbaz, on all remote sites we're known as "
9318
"foobar\n"
9319
" user=foobar"
9320
msgstr ""
9321
" # Proyecto de mascotas para hobby.net\n"
9322
" [hobby]\n"
9323
" host=r.hobby.net\n"
9324
" user=jaime\n"
9325
" password=obvia1234\n"
9326
" \n"
9327
" # Home server\n"
9328
" [home]\n"
9329
" scheme=https\n"
9330
" host=home.net\n"
9331
" user=juan\n"
9332
" password=1essobV10us\n"
9333
" \n"
9334
" [DEFAULT]\n"
9335
" # Nuestro usuario local es barbaz, en todos los sitios remotos se "
9336
"conoce como foobar\n"
9337
" user=foobar"
9338
9339
#: en/help_topics/authentication.txt:164
9340
msgid ""
9341
"\n"
9342
"Source hosting provider\n"
9343
"~~~~~~~~~~~~~~~~~~~~~~~"
9344
msgstr ""
9345
"\n"
9346
"Proveedor del albergue de origen\n"
9347
"~~~~~~~~~~~~~~~~~~~~~~~~~~"
9348
9349
#: en/help_topics/authentication.txt:168
9350
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9351
msgstr ""
9352
"En el dominio shp.net (ficticio) cada proyecto tiene su propio sitio::"
9353
9354
#: en/help_topics/authentication.txt:170
9355
msgid ""
9356
" [shpnet domain]\n"
9357
" # we use sftp, but ssh is the scheme used for authentication\n"
9358
" scheme=ssh\n"
9359
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9360
" host=.shp.net\n"
9361
" user=joe\n"
9362
" # bzr don't support supplying a password for sftp,\n"
9363
" # consider using an ssh agent if you don't want to supply\n"
9364
" # a password interactively. (pageant, ssh-agent, etc)"
9365
msgstr ""
9366
9367
#: en/help_topics/authentication.txt:180
9368
msgid ""
9369
"HTTPS, SFTP servers and their proxy\n"
9370
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9371
msgstr ""
9372
"HTTPS, servidores SFTP y su proxy\n"
9373
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9374
9375
#: en/help_topics/authentication.txt:183
9376
msgid ""
9377
"At company.com, the server hosting release and integration branches is "
9378
"behind a\n"
9379
"proxy, and the two branches use different authentication policies::"
9380
msgstr ""
9381
9382
#: en/help_topics/authentication.txt:186
9383
msgid ""
9384
" [reference code]\n"
9385
" scheme=https\n"
9386
" host=dev.company.com\n"
9387
" path=/dev\n"
9388
" user=user1\n"
9389
" password=pass1"
9390
msgstr ""
9391
" [reference code]\n"
9392
" scheme=https\n"
9393
" host=dev.company.com\n"
9394
" path=/dev\n"
9395
" user=user1\n"
9396
" password=pass1"
9397
9398
#: en/help_topics/authentication.txt:193
9399
msgid ""
9400
" # development branches on dev server\n"
9401
" [dev]\n"
9402
" scheme=ssh # bzr+ssh and sftp are available here\n"
9403
" host=dev.company.com\n"
9404
" path=/dev/integration\n"
9405
" user=user2\n"
9406
" \n"
9407
" # proxy\n"
9408
" [proxy]\n"
9409
" scheme=http\n"
9410
" host=proxy.company.com\n"
9411
" port=3128\n"
9412
" user=proxyuser1\n"
9413
" password=proxypass1"
9414
msgstr ""
9415
9416
#: en/help_topics/authentication.txt:208
9417
msgid ""
9418
"\n"
9419
"Planned enhancements\n"
9420
"--------------------"
9421
msgstr ""
9422
"\n"
9423
"Mejoras planificadas\n"
9424
"--------------------"
9425
9426
#: en/help_topics/authentication.txt:212
9427
msgid ""
9428
"The following are not yet implemented but planned as parts of a work in\n"
9429
"progress:"
9430
msgstr ""
9431
9432
#: en/help_topics/authentication.txt:215
9433
msgid "* add a ``password_encoding`` field allowing:"
9434
msgstr ""
9435
9436
#: en/help_topics/authentication.txt:217
9437
msgid ""
9438
" - storing the passwords in various obfuscating encodings (base64 for one),"
9439
msgstr ""
9440
9441
#: en/help_topics/authentication.txt:219
9442
msgid " - delegate password storage to plugins (.netrc for example)."
9443
msgstr ""
9444
9445
#: en/help_topics/authentication.txt:221
9446
msgid ""
9447
"* update the credentials when the user is prompted for user or password,"
9448
msgstr ""
9449
9450
#: en/help_topics/authentication.txt:223
9451
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9452
msgstr "* añadri un campo «verify_certificates» para «HTTPS»."
9453
9454
#: en/help_topics/authentication.txt:225
9455
msgid ""
9456
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9457
"but\n"
9458
"ignored in the actual implementation.\n"
9459
msgstr ""
9460
9461
#: en/help_topics/bugs.txt:1
9462
msgid "Bug Tracker Settings"
9463
msgstr "Configuración del seguimiento de errores"
9464
9465
#: en/help_topics/bugs.txt:3
9466
msgid ""
9467
"When making a commit, metadata about bugs fixed by that change can be\n"
9468
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9469
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9470
"(The only ``status`` value currently supported is ``fixed.``)"
9471
msgstr ""
9472
9473
#: en/help_topics/bugs.txt:8
9474
msgid ""
9475
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9476
"identifier\n"
9477
"rather than a full URL. This looks like::"
9478
msgstr ""
9479
9480
#: en/help_topics/bugs.txt:11
9481
msgid " bzr commit --fixes <tracker>:<id>"
9482
msgstr " bzr commit --fixes <tracker>:<id>"
9483
9484
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9485
msgid "or::"
9486
msgstr "o::"
9487
9488
#: en/help_topics/bugs.txt:15
9489
msgid " bzr commit --fixes <id>"
9490
msgstr " bzr commit --fixes <id>"
9491
9492
#: en/help_topics/bugs.txt:17
9493
msgid ""
9494
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9495
"the\n"
9496
"identifier for that bug within the bugtracker, usually the bug number.\n"
9497
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9498
"or global configuration is used."
9499
msgstr ""
9500
9501
#: en/help_topics/bugs.txt:22
9502
msgid ""
9503
"Bazaar knows about a few bug trackers that have many users. If\n"
9504
"you use one of these bug trackers then there is no setup required to\n"
9505
"use this feature, you just need to know the tracker identifier to use.\n"
9506
"These are the bugtrackers that are built in:"
9507
msgstr ""
9508
9509
#: en/help_topics/bugs.txt:27
9510
msgid ""
9511
" ============================ ============ ============\n"
9512
" URL Abbreviation Example\n"
9513
" ============================ ============ ============\n"
9514
" https://bugs.launchpad.net/ lp lp:12345\n"
9515
" http://bugs.debian.org/ deb deb:12345\n"
9516
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9517
" ============================ ============ ============"
9518
msgstr ""
9519
" ============================ ============ ============\n"
9520
" URL Ejemplo de abreviatura\n"
9521
" ============================ ============ ============\n"
9522
" https://bugs.launchpad.net/ lp lp:12345\n"
9523
" http://bugs.debian.org/ deb deb:12345\n"
9524
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9525
" ============================ ============ ============"
9526
9527
#: en/help_topics/bugs.txt:35
9528
msgid ""
9529
"For the bug trackers not listed above configuration is required.\n"
9530
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9531
"is built in, along with a template mechanism for other bugtrackers with\n"
9532
"simple URL schemes. If your bug tracker can't be described by one\n"
9533
"of the schemes described below then you can write a plugin to support\n"
9534
"it."
9535
msgstr ""
9536
9537
#: en/help_topics/bugs.txt:42
9538
msgid ""
9539
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9540
"variable which contains the base URL of the bug tracker. These options\n"
9541
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9542
"configuration section in ``locations.conf``. You can set up these values\n"
9543
"for each of the projects you work on."
9544
msgstr ""
9545
9546
#: en/help_topics/bugs.txt:48
9547
msgid ""
9548
"Note: As you provide a short name for each tracker, you can specify one or\n"
9549
"more bugs in one or more trackers at commit time if you wish."
9550
msgstr ""
9551
9552
#: en/help_topics/bugs.txt:51
9553
msgid ""
9554
"Launchpad\n"
9555
"---------"
9556
msgstr ""
9557
"Launchpad\n"
9558
"---------"
9559
9560
#: en/help_topics/bugs.txt:54
9561
msgid ""
9562
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9563
msgstr ""
9564
"Use «bzr commit --fixes lp:2»» para grabar que esta ejecución arregla el "
9565
"error 2."
9566
9567
#: en/help_topics/bugs.txt:56
9568
msgid ""
9569
"bugzilla_<tracker>_url\n"
9570
"----------------------"
9571
msgstr ""
9572
"bugzilla_<tracker>_url\n"
9573
"----------------------"
9574
9575
#: en/help_topics/bugs.txt:59
9576
msgid ""
9577
"If present, the location of the Bugzilla bug tracker referred to by\n"
9578
"<tracker>. This option can then be used together with ``bzr commit\n"
9579
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9580
"example::"
9581
msgstr ""
9582
9583
#: en/help_topics/bugs.txt:64
9584
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9585
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9586
9587
#: en/help_topics/bugs.txt:66
9588
msgid ""
9589
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9590
"fixed."
9591
msgstr ""
9592
9593
#: en/help_topics/bugs.txt:69
9594
msgid ""
9595
"trac_<tracker>_url\n"
9596
"------------------"
9597
msgstr ""
9598
"trac_<tracker>_url\n"
9599
"------------------"
9600
9601
#: en/help_topics/bugs.txt:72
9602
msgid ""
9603
"If present, the location of the Trac instance referred to by\n"
9604
"<tracker>. This option can then be used together with ``bzr commit\n"
9605
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9606
"example::"
9607
msgstr ""
9608
9609
#: en/help_topics/bugs.txt:77
9610
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9611
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9612
9613
#: en/help_topics/bugs.txt:79
9614
msgid ""
9615
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9616
"as\n"
9617
"fixed."
9618
msgstr ""
9619
9620
#: en/help_topics/bugs.txt:82
9621
msgid ""
9622
"bugtracker_<tracker>_url\n"
9623
"------------------------"
9624
msgstr ""
9625
"bugtracker_<tracker>_url\n"
9626
"------------------------"
9627
9628
#: en/help_topics/bugs.txt:85
9629
msgid ""
9630
"If present, the location of a generic bug tracker instance referred to by\n"
9631
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9632
"which will be replaced by a specific bug ID. This option can then be used\n"
9633
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9634
"fixed by that commit. For example::"
9635
msgstr ""
9636
9637
#: en/help_topics/bugs.txt:91
9638
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9639
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
9640
9641
#: en/help_topics/bugs.txt:93
9642
msgid ""
9643
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9644
"Roundup bug tracker as fixed, or::"
9645
msgstr ""
9646
9647
#: en/help_topics/bugs.txt:96
9648
msgid ""
9649
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9650
msgstr ""
9651
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9652
9653
#: en/help_topics/bugs.txt:98
9654
msgid ""
9655
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9656
"RT bug tracker as fixed, or::"
9657
msgstr ""
9658
9659
#: en/help_topics/bugs.txt:101
9660
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9661
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9662
9663
#: en/help_topics/bugs.txt:103
9664
msgid ""
9665
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9666
"1234\n"
9667
"in Hudson's JIRA bug tracker as fixed.\n"
9668
msgstr ""
9669
9670
#: en/help_topics/commands.txt:1
9671
msgid ""
9672
"add Add specified files or directories.\n"
9673
"alias Set/unset and display aliases.\n"
9674
"annotate Show the origin of each line in a file.\n"
9675
"bash-completion Generate a shell function for bash command line "
9676
"completion.\n"
9677
" [bash_completion]\n"
9678
"bind Convert the current branch into a checkout of the "
9679
"supplied\n"
9680
" branch.\n"
9681
"branch Create a new branch that is a copy of an existing branch.\n"
9682
"branches List the branches available at the current location.\n"
9683
"break-lock Break a dead lock.\n"
9684
"cat Write the contents of a file as of a given revision to\n"
9685
" standard output.\n"
9686
"check Validate working tree structure, branch consistency and\n"
9687
" repository history.\n"
9688
"checkout Create a new checkout of an existing branch.\n"
9689
"clean-tree Remove unwanted files from working tree.\n"
9690
"commit Commit changes into a new revision.\n"
9691
"config Display, set or remove a configuration option.\n"
9692
"conflicts List files with conflicts.\n"
9693
"deleted List files deleted in the working tree.\n"
9694
"diff Show differences in the working tree, between revisions "
9695
"or\n"
9696
" branches.\n"
9697
"dpush Push into a different VCS without any custom bzr "
9698
"metadata.\n"
9699
"export Export current or past revision to a destination directory "
9700
"or\n"
9701
" archive.\n"
9702
"help Show help on a command or other topic.\n"
9703
"ignore Ignore specified files or patterns.\n"
9704
"ignored List ignored files and the patterns that matched them.\n"
9705
"info Show information about a working tree, branch or "
9706
"repository.\n"
9707
"init Make a directory into a versioned branch.\n"
9708
"init-repository Create a shared repository for branches to share storage\n"
9709
" space.\n"
9710
"join Combine a tree into its containing tree.\n"
9711
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9712
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9713
"launchpad-open Open a Launchpad branch page in your web browser. "
9714
"[launchpad]\n"
9715
"log Show historical log for a branch or subset of a branch.\n"
9716
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9717
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9718
"ls List files in a tree.\n"
9719
"merge Perform a three-way merge.\n"
9720
"missing Show unmerged/unpulled revisions between two branches.\n"
9721
"mkdir Create a new versioned directory.\n"
9722
"mv Move or rename a file.\n"
9723
"nick Print or set the branch nickname.\n"
9724
"pack Compress the data within a repository.\n"
9725
"plugins List the installed plugins.\n"
9726
"pull Turn this branch into a mirror of another branch.\n"
9727
"push Update a mirror of this branch.\n"
9728
"reconcile Reconcile bzr metadata in a branch.\n"
9729
"reconfigure Reconfigure the type of a bzr directory.\n"
9730
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9731
"remerge Redo a merge.\n"
9732
"remove Remove files or directories.\n"
9733
"remove-branch Remove a branch.\n"
9734
"remove-tree Remove the working tree from a given branch/checkout.\n"
9735
"renames Show list of renamed files.\n"
9736
"resolve Mark a conflict as resolved.\n"
9737
"revert Set files in the working tree back to the contents of a\n"
9738
" previous revision.\n"
9739
"revno Show current revision number.\n"
9740
"root Show the tree root directory.\n"
9741
"send Mail or create a merge-directive for submitting changes.\n"
9742
"serve Run the bzr server.\n"
9743
"shelve Temporarily set aside some changes from the current tree.\n"
9744
"sign-my-commits Sign all commits by a given committer.\n"
9745
"split Split a subdirectory of a tree into a separate tree.\n"
9746
"status Display status summary.\n"
9747
"switch Set the branch of a checkout and update.\n"
9748
"tag Create, remove or modify a tag naming a revision.\n"
9749
"tags List tags.\n"
9750
"testament Show testament (signing-form) of a revision.\n"
9751
"unbind Convert the current checkout into a regular branch.\n"
9752
"uncommit Remove the last committed revision.\n"
9753
"unshelve Restore shelved changes.\n"
9754
"update Update a working tree to a new revision.\n"
9755
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9756
" format.\n"
9757
"verify-signatures Verify all commit signatures.\n"
9758
"version Show version of bzr.\n"
9759
"version-info Show version information about this tree.\n"
9760
"view Manage filtered views.\n"
9761
"whoami Show or set bzr user id.\n"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:1
9765
msgid ""
9766
"Configuration Settings\n"
9767
"======================="
9768
msgstr ""
9769
"Configuración\n"
9770
"============="
9771
9772
#: en/help_topics/configuration.txt:4
9773
msgid ""
9774
"Environment settings\n"
9775
"---------------------"
9776
msgstr ""
9777
"Configuración de entrono\n"
9778
"---------------------"
9779
9780
#: en/help_topics/configuration.txt:7
9781
msgid ""
9782
"While most configuration is handled by configuration files, some options\n"
9783
"which may be semi-permanent can also be controlled through the environment."
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:10
9787
msgid ""
9788
"BZR_EMAIL\n"
9789
"~~~~~~~~~"
9790
msgstr ""
9791
"BZR_EMAIL\n"
9792
"~~~~~~~~~"
9793
9794
#: en/help_topics/configuration.txt:13
9795
msgid "Override the email id used by Bazaar. Typical format::"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:15
9799
msgid " \"John Doe <jdoe@example.com>\""
9800
msgstr " \"Juan Dado <jdado@ejemplo.com>\""
9801
9802
#: en/help_topics/configuration.txt:17
9803
msgid "See also the ``email`` configuration option."
9804
msgstr "Vea también las opciones de configuración de «email»"
9805
9806
#: en/help_topics/configuration.txt:19
9807
msgid ""
9808
"BZR_PROGRESS_BAR\n"
9809
"~~~~~~~~~~~~~~~~"
9810
msgstr ""
9811
"BZR_PROGRESS_BAR\n"
9812
"~~~~~~~~~~~~~~~~"
9813
9814
#: en/help_topics/configuration.txt:22
9815
msgid ""
9816
"Override the progress display. Possible values are \"none\" or \"text\". "
9817
"If\n"
9818
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9819
"draws\n"
9820
"the ordinary command line progress bar."
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:26
9824
msgid ""
9825
"BZR_SIGQUIT_PDB\n"
9826
"~~~~~~~~~~~~~~~"
9827
msgstr ""
9828
"BZR_SIGQUIT_PDB\n"
9829
"~~~~~~~~~~~~~~~"
9830
9831
#: en/help_topics/configuration.txt:29
9832
msgid ""
9833
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9834
msgstr ""
9835
9836
#: en/help_topics/configuration.txt:31
9837
msgid ""
9838
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9839
"* 1 = Invoke breakin debugger (default)"
9840
msgstr ""
9841
9842
#: en/help_topics/configuration.txt:34
9843
msgid ""
9844
"BZR_HOME\n"
9845
"~~~~~~~~"
9846
msgstr ""
9847
"BZR_HOME\n"
9848
"~~~~~~~~"
9849
9850
#: en/help_topics/configuration.txt:37
9851
msgid "Override the home directory used by Bazaar."
9852
msgstr "Sobrescribe el directorio de inicio usado por Bazaar."
9853
9854
#: en/help_topics/configuration.txt:39
9855
msgid ""
9856
"BZR_SSH\n"
9857
"~~~~~~~"
9858
msgstr ""
9859
"BZR_SSH\n"
9860
"~~~~~~~"
9861
9862
#: en/help_topics/configuration.txt:42
9863
msgid "Select a different SSH implementation."
9864
msgstr "Seleccione una implementación SSH diferente."
9865
9866
#: en/help_topics/configuration.txt:44
9867
msgid ""
9868
"BZR_PDB\n"
9869
"~~~~~~~"
9870
msgstr ""
9871
"BZR_PDB\n"
9872
"~~~~~~~"
9873
9874
#: en/help_topics/configuration.txt:47
9875
msgid "Control whether to launch a debugger on error."
9876
msgstr "Controla si lanzar un depurador para el error."
9877
9878
#: en/help_topics/configuration.txt:49
9879
msgid ""
9880
"* 0 = Standard behavior\n"
9881
"* 1 = Launch debugger"
9882
msgstr ""
9883
"* 0 = Comportamiento estándar\n"
9884
"* 1 = Lanzar depurador"
9885
9886
#: en/help_topics/configuration.txt:52
9887
msgid ""
9888
"BZR_REMOTE_PATH\n"
9889
"~~~~~~~~~~~~~~~"
9890
msgstr ""
9891
"BZR_REMOTE_PATH\n"
9892
"~~~~~~~~~~~~~~~"
9893
9894
#: en/help_topics/configuration.txt:55
9895
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:57
9899
msgid "See also the ``bzr_remote_path`` configuration option."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:59
9903
msgid ""
9904
"BZR_EDITOR\n"
9905
"~~~~~~~~~~"
9906
msgstr ""
9907
"BZR_EDITOR\n"
9908
"~~~~~~~~~~"
9909
9910
#: en/help_topics/configuration.txt:62
9911
msgid "Path to the editor Bazaar should use for commit messages, etc."
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:64
9915
msgid ""
9916
"BZR_LOG\n"
9917
"~~~~~~~"
9918
msgstr ""
9919
"BZR_LOG\n"
9920
"~~~~~~~"
9921
9922
#: en/help_topics/configuration.txt:67
9923
msgid ""
9924
"Location of the Bazaar log file. You can check the current location by\n"
9925
"running ``bzr version``."
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:70
9929
msgid ""
9930
"The log file contains debug information that is useful for diagnosing or\n"
9931
"reporting problems with Bazaar."
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:73
9935
msgid ""
9936
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9937
"will disable logging."
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:76
9941
msgid ""
9942
"\n"
9943
"BZR_PLUGIN_PATH\n"
9944
"~~~~~~~~~~~~~~~"
9945
msgstr ""
9946
"\n"
9947
"BZR_PLUGIN_PATH\n"
9948
"~~~~~~~~~~~~~~~"
9949
9950
#: en/help_topics/configuration.txt:80
9951
msgid ""
9952
"The path to the plugins directory that Bazaar should use.\n"
9953
"If not set, Bazaar will search for plugins in:"
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:83
9957
msgid ""
9958
"* the user specific plugin directory (containing the ``user`` plugins),"
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:85
9962
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9963
msgstr "* el directorio bzrlib (contiene los complementos «core»),"
9964
9965
#: en/help_topics/configuration.txt:87
9966
msgid ""
9967
"* the site specific plugin directory if applicable (containing\n"
9968
" the ``site`` plugins)."
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:90
9972
msgid ""
9973
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9974
"the way the plugin are searched. "
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:93
9978
msgid ""
9979
"As for the ``PATH`` variables, if multiple directories are\n"
9980
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9981
"platform specific appropriate character (':' on Unix,\n"
9982
"';' on windows)"
9983
msgstr ""
9984
9985
#: en/help_topics/configuration.txt:98
9986
msgid ""
9987
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9988
"in ``user``. However it will continue to search in ``core`` and\n"
9989
"``site`` unless they are explicitly removed."
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:102
9993
msgid ""
9994
"If you need to change the order or remove one of these\n"
9995
"directories, you should use special values:"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:105
9999
msgid ""
10000
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
10001
" path from the default values,"
10002
msgstr ""
10003
"* «-user», «-core», «-site» eliminarán las correspondientes\n"
10004
" rutas de los valores predeterminados,"
10005
10006
#: en/help_topics/configuration.txt:108
10007
msgid ""
10008
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
10009
" before the remaining default values (and also remove it from\n"
10010
" the default values)."
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:112
10014
msgid ""
10015
"Note that the special values 'user', 'core' and 'site' should be\n"
10016
"used literally, they will be substituted by the corresponding,\n"
10017
"platform specific, values."
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:116
10021
msgid ""
10022
"The examples below use ':' as the separator, windows users\n"
10023
"should use ';'."
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:119
10027
msgid "Overriding the default user plugin directory::"
10028
msgstr ""
10029
"Sobrescribiendo el directorio de complemento de usuario predeterminado::"
10030
10031
#: en/help_topics/configuration.txt:121
10032
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
10033
msgstr " BZR_PLUGIN_PATH='/ruta/a/mis/otros/complementos'"
10034
10035
#: en/help_topics/configuration.txt:123
10036
msgid "Disabling the site directory while retaining the user directory::"
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:125
10040
msgid " BZR_PLUGIN_PATH='-site:+user'"
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:127
10044
msgid "Disabling all plugins (better achieved with --no-plugins)::"
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:129
10048
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
10049
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
10050
10051
#: en/help_topics/configuration.txt:131
10052
msgid "Overriding the default site plugin directory::"
10053
msgstr "Sobrescribe el directorio de complemento de sitio predeterminado::"
10054
10055
#: en/help_topics/configuration.txt:133
10056
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
10057
msgstr " BZR_PLUGIN_PATH='/ruta/a/mi/sitiode/complementos:-sitio':+usuario"
10058
10059
#: en/help_topics/configuration.txt:135
10060
msgid ""
10061
"BZR_DISABLE_PLUGINS\n"
10062
"~~~~~~~~~~~~~~~~~~~"
10063
msgstr ""
10064
"BZR_DISABLE_PLUGINS\n"
10065
"~~~~~~~~~~~~~~~~~~~"
10066
10067
#: en/help_topics/configuration.txt:138
10068
msgid ""
10069
"Under special circumstances (mostly when trying to diagnose a\n"
10070
"bug), it's better to disable a plugin (or several) rather than\n"
10071
"uninstalling them completely. Such plugins can be specified in\n"
10072
"the ``BZR_DISABLE_PLUGINS`` environment variable."
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:143
10076
msgid ""
10077
"In that case, ``bzr`` will stop loading the specified plugins and\n"
10078
"will raise an import error if they are explicitly imported (by\n"
10079
"another plugin that depends on them for example)."
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:147
10083
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
10084
msgstr "Desactivar «myplugin» y «yourplugin» se consigue::"
10085
10086
#: en/help_topics/configuration.txt:149
10087
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
10088
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
10089
10090
#: en/help_topics/configuration.txt:151
10091
msgid ""
10092
"BZR_PLUGINS_AT\n"
10093
"~~~~~~~~~~~~~~"
10094
msgstr ""
10095
"BZR_PLUGINS_AT\n"
10096
"~~~~~~~~~~~~~~"
10097
10098
#: en/help_topics/configuration.txt:154
10099
msgid ""
10100
"When adding a new feature or working on a bug in a plugin,\n"
10101
"developers often need to use a specific version of a given\n"
10102
"plugin. Since python requires that the directory containing the\n"
10103
"code is named like the plugin itself this make it impossible to\n"
10104
"use arbitrary directory names (using a two-level directory scheme\n"
10105
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
10106
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
10107
msgstr ""
10108
10109
#: en/help_topics/configuration.txt:162
10110
msgid ""
10111
"Plugins specified in this environment variable takes precedence\n"
10112
"over the ones in ``BZR_PLUGIN_PATH``."
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:165
10116
msgid ""
10117
"The variable specified a list of ``plugin_name@plugin path``,\n"
10118
"``plugin_name`` being the name of the plugin as it appears in\n"
10119
"python module paths, ``plugin_path`` being the path to the\n"
10120
"directory containing the plugin code itself\n"
10121
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
10122
"separator, use ';' on windows."
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:172
10126
msgid ""
10127
"Example:\n"
10128
"~~~~~~~~"
10129
msgstr ""
10130
"Ejemplo:\n"
10131
"~~~~~~~~"
10132
10133
#: en/help_topics/configuration.txt:175
10134
msgid ""
10135
"Using a specific version of ``myplugin``:\n"
10136
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:178
10140
msgid ""
10141
"BZRPATH\n"
10142
"~~~~~~~"
10143
msgstr ""
10144
"BZRPATH\n"
10145
"~~~~~~~"
10146
10147
#: en/help_topics/configuration.txt:181
10148
msgid "The path where Bazaar should look for shell plugin external commands."
10149
msgstr ""
10150
10151
#: en/help_topics/configuration.txt:183
10152
msgid ""
10153
"\n"
10154
"http_proxy, https_proxy\n"
10155
"~~~~~~~~~~~~~~~~~~~~~~~"
10156
msgstr ""
10157
"\n"
10158
"http_proxy, https_proxy\n"
10159
"~~~~~~~~~~~~~~~~~~~~~~~"
10160
10161
#: en/help_topics/configuration.txt:187
10162
msgid "Specifies the network proxy for outgoing connections, for example::"
10163
msgstr ""
10164
10165
#: en/help_topics/configuration.txt:189
10166
msgid ""
10167
" http_proxy=http://proxy.example.com:3128/ \n"
10168
" https_proxy=http://proxy.example.com:3128/"
10169
msgstr ""
10170
" http_proxy=http://proxy.ejemplo.com:3128/ \n"
10171
" https_proxy=http://proxy.ejemplo.com:3128/"
10172
10173
#: en/help_topics/configuration.txt:192
10174
msgid ""
10175
"\n"
10176
"Configuration files\n"
10177
"-------------------"
10178
msgstr ""
10179
"\n"
10180
"Archivos de configuración\n"
10181
"-------------------------"
10182
10183
#: en/help_topics/configuration.txt:196
10184
msgid ""
10185
"Location\n"
10186
"~~~~~~~~"
10187
msgstr ""
10188
"Ubicación\n"
10189
"~~~~~~~~"
10190
10191
#: en/help_topics/configuration.txt:199
10192
msgid ""
10193
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
10194
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
10195
"on\n"
10196
"Windows. (You can check the location for your system by using\n"
10197
"``bzr version``.)"
10198
msgstr ""
10199
10200
#: en/help_topics/configuration.txt:204
10201
msgid "There are three primary configuration files in this location:"
10202
msgstr "Hay tres archivos de configuración primarios en esta ubicación:"
10203
10204
#: en/help_topics/configuration.txt:206
10205
msgid "* ``bazaar.conf`` describes default configuration options,"
10206
msgstr ""
10207
"* «bazaar.conf» describe las opciones de configuración predeterminadas,"
10208
10209
#: en/help_topics/configuration.txt:208
10210
msgid ""
10211
"* ``locations.conf`` describes configuration information for\n"
10212
" specific branch locations,"
10213
msgstr ""
10214
"* «locations.conf» describe información de configuración para\n"
10215
" ubicaciones de rama específicas,"
10216
10217
#: en/help_topics/configuration.txt:211
10218
msgid ""
10219
"* ``authentication.conf`` describes credential information for\n"
10220
" remote servers."
10221
msgstr ""
10222
"* «authentication.conf» describe información de credencial para\n"
10223
" servidores remotos."
10224
10225
#: en/help_topics/configuration.txt:214
10226
msgid ""
10227
"Each branch can also contain a configuration file that sets values specific\n"
10228
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10229
"the\n"
10230
"branch. This file is visible to all users of a branch, if you wish to "
10231
"override\n"
10232
"one of the values for a branch with a setting that is specific to you then "
10233
"you\n"
10234
"can do so in ``locations.conf``."
10235
msgstr ""
10236
10237
#: en/help_topics/configuration.txt:220
10238
msgid ""
10239
"General format\n"
10240
"~~~~~~~~~~~~~~"
10241
msgstr ""
10242
"Formato general\n"
10243
"~~~~~~~~~~~~~~~"
10244
10245
#: en/help_topics/configuration.txt:223
10246
msgid ""
10247
"An ini file has three types of contructs: section headers, section\n"
10248
"options and comments."
10249
msgstr ""
10250
10251
#: en/help_topics/configuration.txt:226
10252
msgid ""
10253
"Comments\n"
10254
"^^^^^^^^"
10255
msgstr ""
10256
"Commentarios\n"
10257
"^^^^^^^^^^^^"
10258
10259
#: en/help_topics/configuration.txt:229
10260
msgid ""
10261
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10262
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10263
"Bazaar when parsing ini files."
10264
msgstr ""
10265
10266
#: en/help_topics/configuration.txt:233
10267
msgid ""
10268
"Section headers\n"
10269
"^^^^^^^^^^^^^^^"
10270
msgstr ""
10271
"Cabeceras de sección\n"
10272
"^^^^^^^^^^^^^^^^^^^^"
10273
10274
#: en/help_topics/configuration.txt:236
10275
msgid ""
10276
"A section header is a word enclosed in brackets that starts at the begining\n"
10277
"of a line. A typical section header looks like this::"
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:239
10281
msgid " [DEFAULT]"
10282
msgstr " [PREDETERMINADO]"
10283
10284
#: en/help_topics/configuration.txt:241
10285
msgid ""
10286
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10287
"[ALIASES]. Section headers are case sensitive. The default section provides "
10288
"for\n"
10289
"setting options which can be overridden with the branch config file."
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:245
10293
msgid ""
10294
"For ``locations.conf``, the options from the section with the\n"
10295
"longest matching section header are used to the exclusion of other\n"
10296
"potentially valid section headers. A section header uses the path for\n"
10297
"the branch as the section header. Some examples include::"
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:250
10301
msgid ""
10302
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10303
" [/home/jdoe/branches/]"
10304
msgstr ""
10305
" [http://misramas.isp.com/~jdado/dirrama]\n"
10306
" [/home/jdado/ramas/]"
10307
10308
#: en/help_topics/configuration.txt:253
10309
msgid ""
10310
"\n"
10311
"Section options\n"
10312
"^^^^^^^^^^^^^^^"
10313
msgstr ""
10314
10315
#: en/help_topics/configuration.txt:257
10316
msgid ""
10317
"A section option resides within a section. A section option contains an\n"
10318
"option name, an equals sign and a value. For example::"
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:260
10322
msgid ""
10323
" email = John Doe <jdoe@isp.com>\n"
10324
" gpg_signing_key = Amy Pond <amy@example.com>"
10325
msgstr ""
10326
" email = Juan Dado <jdado@isp.com>\n"
10327
" gpg_signing_key = Ana Pons <ana@ejemplo.com>"
10328
10329
#: en/help_topics/configuration.txt:263
10330
msgid ""
10331
"A option can reference other options by enclosing them in curly brackets::"
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:265
10335
msgid ""
10336
" my_branch_name = feature_x\n"
10337
" my_server = bzr+ssh://example.com\n"
10338
" push_location = {my_server}/project/{my_branch_name}"
10339
msgstr ""
10340
10341
#: en/help_topics/configuration.txt:269
10342
msgid ""
10343
"Option policies\n"
10344
"^^^^^^^^^^^^^^^"
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:272
10348
msgid ""
10349
"Options defined in a section affect the named directory or URL plus\n"
10350
"any locations they contain. Policies can be used to change how an\n"
10351
"option value is interpreted for contained locations. Currently\n"
10352
"there are three policies available:"
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:277
10356
msgid ""
10357
" none:\n"
10358
" the value is interpreted the same for contained locations. This is\n"
10359
" the default behaviour.\n"
10360
" norecurse:\n"
10361
" the value is only used for the exact location specified by the\n"
10362
" section name.\n"
10363
" appendpath:\n"
10364
" for contained locations, any additional path components are\n"
10365
" appended to the value."
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:287
10369
msgid ""
10370
"Policies are specified by keys with names of the form "
10371
"\"<option_name>:policy\".\n"
10372
"For example, to define the push location for a tree of branches, the\n"
10373
"following could be used::"
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:291
10377
msgid ""
10378
" [/top/location]\n"
10379
" push_location = sftp://example.com/location\n"
10380
" push_location:policy = appendpath"
10381
msgstr ""
10382
" [/top/ubicacón]\n"
10383
" push_location = sftp://ejemplo.com/ubicaciñon\n"
10384
" push_location:policy = appendpath"
10385
10386
#: en/help_topics/configuration.txt:295
10387
msgid ""
10388
"With this configuration, the push location for ``/top/location/branch1``\n"
10389
"would be ``sftp://example.com/location/branch1``."
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:298
10393
msgid ""
10394
"Section local options\n"
10395
"^^^^^^^^^^^^^^^^^^^^^"
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:301
10399
msgid ""
10400
"Some options are defined automatically inside a given section and can be\n"
10401
"refered to in this section only. "
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:304
10405
msgid "For example, the ``appendpath`` policy can be used like this::"
10406
msgstr ""
10407
10408
#: en/help_topics/configuration.txt:306
10409
msgid ""
10410
" [/home/vila/src/bzr/bugs]\n"
10411
" mypush = lp:~vila/bzr\n"
10412
" mypush:policy=appendpath"
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:310
10416
msgid "Using ``relpath`` to achieve the same result is done like this::"
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:312
10420
msgid ""
10421
" [/home/vila/src/bzr/bugs]\n"
10422
" mypush = lp:~vila/bzr/{relpath}"
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:315
10426
msgid ""
10427
"In both cases, when used in a directory like\n"
10428
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10432
msgid ""
10433
" $ bzr config mypush\n"
10434
" lp:~vila/bzr/832013-expand-in-stack"
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:321
10438
msgid "Another such option is ``basename`` which can be used like this::"
10439
msgstr ""
10440
10441
#: en/help_topics/configuration.txt:323
10442
msgid ""
10443
" [/home/vila/src/bzr]\n"
10444
" mypush = lp:~vila/bzr/{basename}"
10445
msgstr ""
10446
10447
#: en/help_topics/configuration.txt:326
10448
msgid ""
10449
"When used in a directory like\n"
10450
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10451
msgstr ""
10452
10453
#: en/help_topics/configuration.txt:332
10454
msgid ""
10455
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10456
"itself is defined as the relative path between the section name and the\n"
10457
"location it matches."
10458
msgstr ""
10459
10460
#: en/help_topics/configuration.txt:336
10461
msgid ""
10462
"Another such option is ``branchname``, which refers to the name of a "
10463
"colocated\n"
10464
"branch. For non-colocated branches, it behaves like basename. It can be "
10465
"used\n"
10466
"like this::"
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:340
10470
msgid ""
10471
" [/home/vila/src/bzr/bugs]\n"
10472
" mypush = lp:~vila/bzr/{branchname}"
10473
msgstr ""
10474
10475
#: en/help_topics/configuration.txt:343
10476
msgid ""
10477
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10478
"get::"
10479
msgstr ""
10480
10481
#: en/help_topics/configuration.txt:345
10482
msgid ""
10483
" bzr config mypush\n"
10484
" lp:~vila/bzr/832013-expand-in-stack"
10485
msgstr ""
10486
10487
#: en/help_topics/configuration.txt:348
10488
msgid ""
10489
"When an option is local to a Section, it cannot be referred to from option\n"
10490
"values in any other section from the same ``Store`` nor from any other\n"
10491
"``Store``."
10492
msgstr ""
10493
10494
#: en/help_topics/configuration.txt:352
10495
msgid ""
10496
"\n"
10497
"The main configuration file, bazaar.conf\n"
10498
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10499
msgstr ""
10500
"\n"
10501
"El archivo de configuración principal, bazaar.conf\n"
10502
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10503
10504
#: en/help_topics/configuration.txt:356
10505
msgid ""
10506
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10507
"The default section contains the default\n"
10508
"configuration options for all branches. The default section can be\n"
10509
"overriden by providing a branch-specific section in ``locations.conf``."
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:361
10513
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10514
msgstr ""
10515
10516
#: en/help_topics/configuration.txt:363
10517
msgid ""
10518
" [DEFAULT]\n"
10519
" email = John Doe <jdoe@isp.com>\n"
10520
" editor = /usr/bin/vim\n"
10521
" create_signatures = when-required"
10522
msgstr ""
10523
" [DEFAULT]\n"
10524
" email = Juan Dado <jdado@isp.com>\n"
10525
" editor = /usr/bin/vim\n"
10526
" create_signatures = when-required"
10527
10528
#: en/help_topics/configuration.txt:368
10529
msgid ""
10530
"\n"
10531
"The branch location configuration file, locations.conf\n"
10532
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10533
msgstr ""
10534
"\n"
10535
"El archivo de ubicación de la rama, locations.conf\n"
10536
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10537
10538
#: en/help_topics/configuration.txt:372
10539
msgid ""
10540
"``locations.conf`` allows one to specify overriding settings for\n"
10541
"a specific branch. The format is almost identical to the default section in\n"
10542
"bazaar.conf with one significant change: The section header, instead of "
10543
"saying\n"
10544
"default, will be the path to a branch that you wish to override a value\n"
10545
"for. The '?' and '*' wildcards are supported::"
10546
msgstr ""
10547
10548
#: en/help_topics/configuration.txt:378
10549
msgid ""
10550
" [/home/jdoe/branches/nethack]\n"
10551
" email = Nethack Admin <nethack@nethack.com>"
10552
msgstr ""
10553
" [/home/jdado/ramas/nethack]\n"
10554
" email = Nethack Admin <nethack@nethack.com>"
10555
10556
#: en/help_topics/configuration.txt:381
10557
msgid ""
10558
" [http://hypothetical.site.com/branches/devel-branch]\n"
10559
" create_signatures = always"
10560
msgstr ""
10561
" [http://hypothetical.site.com/branches/devel-branch]\n"
10562
" create_signatures = always"
10563
10564
#: en/help_topics/configuration.txt:384
10565
msgid ""
10566
"The authentication configuration file, authentication.conf\n"
10567
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10568
msgstr ""
10569
"El archivo de configuración de la autenticación, authentication.conf\n"
10570
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10571
10572
#: en/help_topics/configuration.txt:387
10573
msgid ""
10574
"``authentication.conf`` allows one to specify credentials for\n"
10575
"remote servers. This can be used for all the supported transports and any "
10576
"part\n"
10577
"of bzr that requires authentication (smtp for example)."
10578
msgstr ""
10579
10580
#: en/help_topics/configuration.txt:391
10581
msgid ""
10582
"The syntax of the file obeys the same rules as the others except for the\n"
10583
"option policies which don't apply."
10584
msgstr ""
10585
10586
#: en/help_topics/configuration.txt:394
10587
msgid ""
10588
"For more information on the possible uses of the authentication "
10589
"configuration\n"
10590
"file see :doc:`authentication-help`."
10591
msgstr ""
10592
10593
#: en/help_topics/configuration.txt:397
10594
msgid ""
10595
"\n"
10596
"Common options\n"
10597
"--------------"
10598
msgstr ""
10599
10600
#: en/help_topics/configuration.txt:401
10601
msgid ""
10602
"debug_flags\n"
10603
"~~~~~~~~~~~"
10604
msgstr ""
10605
"debug_flags\n"
10606
"~~~~~~~~~~~"
10607
10608
#: en/help_topics/configuration.txt:404
10609
msgid ""
10610
"A comma-separated list of debugging options to turn on. The same values\n"
10611
"can be used as with the -D command-line option (see `help global-options`).\n"
10612
"For example::"
10613
msgstr ""
10614
10615
#: en/help_topics/configuration.txt:408
10616
msgid " debug_flags = hpss"
10617
msgstr " debug_flags = hpss"
10618
10619
#: en/help_topics/configuration.txt:412
10620
msgid " debug_flags = hpss,evil"
10621
msgstr " debug_flags = hpss,evil"
10622
10623
#: en/help_topics/configuration.txt:414
10624
msgid ""
10625
"email\n"
10626
"~~~~~"
10627
msgstr ""
10628
"correo\n"
10629
"~~~~~"
10630
10631
#: en/help_topics/configuration.txt:417
10632
msgid ""
10633
"The email address to use when committing a branch. Typically takes the form\n"
10634
"of::"
10635
msgstr ""
10636
10637
#: en/help_topics/configuration.txt:420
10638
msgid " email = Full Name <account@hostname.tld>"
10639
msgstr ""
10640
10641
#: en/help_topics/configuration.txt:422
10642
msgid ""
10643
"editor\n"
10644
"~~~~~~"
10645
msgstr ""
10646
"editor\n"
10647
"~~~~~~"
10648
10649
#: en/help_topics/configuration.txt:425
10650
msgid ""
10651
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10652
"a commit message. This setting is trumped by the environment variable\n"
10653
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10654
"variables."
10655
msgstr ""
10656
10657
#: en/help_topics/configuration.txt:430
10658
msgid ""
10659
"log_format\n"
10660
"~~~~~~~~~~"
10661
msgstr ""
10662
"log_format\n"
10663
"~~~~~~~~~~"
10664
10665
#: en/help_topics/configuration.txt:433
10666
msgid ""
10667
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10668
"and ``line``. Additional formats may be provided by plugins. The default\n"
10669
"value is ``long``."
10670
msgstr ""
10671
10672
#: en/help_topics/configuration.txt:437
10673
msgid ""
10674
"check_signatures\n"
10675
"~~~~~~~~~~~~~~~~"
10676
msgstr ""
10677
"check_signatures\n"
10678
"~~~~~~~~~~~~~~~~"
10679
10680
#: en/help_topics/configuration.txt:440
10681
msgid ""
10682
"Reserved for future use. These options will allow a policy for branches to\n"
10683
"require signatures."
10684
msgstr ""
10685
10686
#: en/help_topics/configuration.txt:443
10687
msgid ""
10688
"require\n"
10689
" The gnupg signature for revisions must be present and must be valid."
10690
msgstr ""
10691
10692
#: en/help_topics/configuration.txt:446
10693
msgid ""
10694
"ignore\n"
10695
" Do not check gnupg signatures of revisions."
10696
msgstr ""
10697
10698
#: en/help_topics/configuration.txt:449
10699
msgid ""
10700
"check-available\n"
10701
" (default) If gnupg signatures for revisions are present, check them.\n"
10702
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10703
" no signature is present."
10704
msgstr ""
10705
10706
#: en/help_topics/configuration.txt:454
10707
msgid ""
10708
"create_signatures\n"
10709
"~~~~~~~~~~~~~~~~~"
10710
msgstr ""
10711
"create_signatures\n"
10712
"~~~~~~~~~~~~~~~~~"
10713
10714
#: en/help_topics/configuration.txt:457
10715
msgid ""
10716
"Defines the behaviour of signing revisions on commits. By default bzr will "
10717
"not\n"
10718
"sign new commits."
10719
msgstr ""
10720
10721
#: en/help_topics/configuration.txt:460
10722
msgid ""
10723
"always\n"
10724
" Sign every new revision that is committed. If the signing fails then "
10725
"the\n"
10726
" commit will not be made."
10727
msgstr ""
10728
10729
#: en/help_topics/configuration.txt:464
10730
msgid ""
10731
"when-required\n"
10732
" Reserved for future use."
10733
msgstr ""
10734
"when-required\n"
10735
" Reservada para uso futuro."
10736
10737
#: en/help_topics/configuration.txt:467
10738
msgid ""
10739
"never\n"
10740
" Reserved for future use."
10741
msgstr ""
10742
"never\n"
10743
" Reservada para uso futuro."
10744
10745
#: en/help_topics/configuration.txt:470
10746
msgid ""
10747
"In future it is planned that ``when-required`` will sign newly\n"
10748
"committed revisions only when the branch requires them. ``never`` will "
10749
"refuse\n"
10750
"to sign newly committed revisions, even if the branch requires signatures."
10751
msgstr ""
10752
10753
#: en/help_topics/configuration.txt:474
10754
msgid ""
10755
"dirstate.fdatasync\n"
10756
"~~~~~~~~~~~~~~~~~~"
10757
msgstr ""
10758
"dirstate.fdatasync\n"
10759
"~~~~~~~~~~~~~~~~~~"
10760
10761
#: en/help_topics/configuration.txt:477
10762
msgid ""
10763
"If true (default), working tree metadata changes are flushed through the\n"
10764
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10765
"should not be lost if the machine crashes. See also repository.fdatasync."
10766
msgstr ""
10767
10768
#: en/help_topics/configuration.txt:481
10769
msgid ""
10770
"gpg_signing_key\n"
10771
"~~~~~~~~~~~~~~~"
10772
msgstr ""
10773
"gpg_signing_key\n"
10774
"~~~~~~~~~~~~~~~"
10775
10776
#: en/help_topics/configuration.txt:484
10777
msgid ""
10778
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10779
"address, key fingerprint or full key ID. When unset or when set to\n"
10780
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10781
msgstr ""
10782
10783
#: en/help_topics/configuration.txt:488
10784
msgid ""
10785
"recurse\n"
10786
"~~~~~~~"
10787
msgstr ""
10788
"recurse\n"
10789
"~~~~~~~"
10790
10791
#: en/help_topics/configuration.txt:491
10792
msgid ""
10793
"Only useful in ``locations.conf``. Defines whether or not the\n"
10794
"configuration for this section applies to subdirectories:"
10795
msgstr ""
10796
10797
#: en/help_topics/configuration.txt:494
10798
msgid ""
10799
"true\n"
10800
" (default) This section applies to subdirectories as well."
10801
msgstr ""
10802
10803
#: en/help_topics/configuration.txt:497
10804
msgid ""
10805
"false\n"
10806
" This section only applies to the branch at this directory and not\n"
10807
" branches below it."
10808
msgstr ""
10809
10810
#: en/help_topics/configuration.txt:501
10811
msgid ""
10812
"gpg_signing_command\n"
10813
"~~~~~~~~~~~~~~~~~~~"
10814
msgstr ""
10815
"gpg_signing_command\n"
10816
"~~~~~~~~~~~~~~~~~~~"
10817
10818
#: en/help_topics/configuration.txt:504
10819
msgid ""
10820
"(Default: \"gpg\"). Which program should be used to sign and check "
10821
"revisions.\n"
10822
"For example::"
10823
msgstr ""
10824
10825
#: en/help_topics/configuration.txt:507
10826
msgid " gpg_signing_command = /usr/bin/gnpg"
10827
msgstr " gpg_signing_command = /usr/bin/gnpg"
10828
10829
#: en/help_topics/configuration.txt:509
10830
msgid ""
10831
"The specified command must accept the options \"--clearsign\" and \"-u "
10832
"<email>\"."
10833
msgstr ""
10834
"La orden especificada puede aceptar las opciones «--clearsign» y «-u "
10835
"<correo>»."
10836
10837
#: en/help_topics/configuration.txt:511
10838
msgid ""
10839
"bzr_remote_path\n"
10840
"~~~~~~~~~~~~~~~"
10841
msgstr ""
10842
"bzr_remote_path\n"
10843
"~~~~~~~~~~~~~~~"
10844
10845
#: en/help_topics/configuration.txt:514
10846
msgid ""
10847
"(Default: \"bzr\"). The path to the command that should be used to run the "
10848
"smart\n"
10849
"server for bzr. This value may only be specified in locations.conf, because:"
10850
msgstr ""
10851
10852
#: en/help_topics/configuration.txt:517
10853
msgid ""
10854
"- it's needed before branch.conf is accessible\n"
10855
"- allowing remote branch.conf files to specify commands would be a security\n"
10856
" risk"
10857
msgstr ""
10858
10859
#: en/help_topics/configuration.txt:521
10860
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10861
msgstr ""
10862
10863
#: en/help_topics/configuration.txt:523
10864
msgid ""
10865
"smtp_server\n"
10866
"~~~~~~~~~~~"
10867
msgstr ""
10868
"smtp_server\n"
10869
"~~~~~~~~~~~"
10870
10871
#: en/help_topics/configuration.txt:526
10872
msgid ""
10873
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10874
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10875
msgstr ""
10876
10877
#: en/help_topics/configuration.txt:529
10878
msgid ""
10879
"smtp_username, smtp_password\n"
10880
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10881
msgstr ""
10882
"smtp_username, smtp_password\n"
10883
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10884
10885
#: en/help_topics/configuration.txt:532
10886
msgid ""
10887
"User and password to authenticate to the SMTP server. If smtp_username\n"
10888
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10889
"These settings are only needed if the SMTP server requires authentication\n"
10890
"to send mail."
10891
msgstr ""
10892
10893
#: en/help_topics/configuration.txt:537
10894
msgid ""
10895
"locks.steal_dead\n"
10896
"~~~~~~~~~~~~~~~~"
10897
msgstr ""
10898
"locks.steal_dead\n"
10899
"~~~~~~~~~~~~~~~~"
10900
10901
#: en/help_topics/configuration.txt:540
10902
msgid ""
10903
"If set to true, bzr will automatically break locks held by processes from\n"
10904
"the same machine and user that are no longer alive. Otherwise, it will\n"
10905
"print a message and you can break the lock manually, if you are satisfied\n"
10906
"the object is no longer in use."
10907
msgstr ""
10908
10909
#: en/help_topics/configuration.txt:545
10910
msgid ""
10911
"mail_client\n"
10912
"~~~~~~~~~~~"
10913
msgstr ""
10914
"mail_client\n"
10915
"~~~~~~~~~~~"
10916
10917
#: en/help_topics/configuration.txt:548
10918
msgid ""
10919
"A mail client to use for sending merge requests.\n"
10920
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10921
"it\n"
10922
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10923
"``editor``."
10924
msgstr ""
10925
10926
#: en/help_topics/configuration.txt:553
10927
msgid "Supported values for specific clients:"
10928
msgstr "Valores permitidos para clientes específicos:"
10929
10930
#: en/help_topics/configuration.txt:555
10931
msgid ""
10932
":claws: Use Claws. This skips a dialog for attaching files.\n"
10933
":evolution: Use Evolution.\n"
10934
":kmail: Use KMail.\n"
10935
":mutt: Use Mutt.\n"
10936
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10937
"1.5,\n"
10938
" this works around some bugs that xdg-email doesn't handle."
10939
msgstr ""
10940
10941
#: en/help_topics/configuration.txt:562
10942
msgid "Supported generic values are:"
10943
msgstr "Los valores genéricos permitidos son:"
10944
10945
#: en/help_topics/configuration.txt:564
10946
msgid ""
10947
":default: See above.\n"
10948
":editor: Use your editor to compose the merge request. This also uses\n"
10949
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10950
" smtp_username and smtp_password.\n"
10951
":mapi: Use your preferred e-mail client on Windows.\n"
10952
":xdg-email: Use xdg-email to run your preferred mail program"
10953
msgstr ""
10954
10955
#: en/help_topics/configuration.txt:571
10956
msgid ""
10957
"repository.fdatasync\n"
10958
"~~~~~~~~~~~~~~~~~~~~"
10959
msgstr ""
10960
"repository.fdatasync\n"
10961
"~~~~~~~~~~~~~~~~~~~~"
10962
10963
#: en/help_topics/configuration.txt:574
10964
msgid ""
10965
"If true (default), repository changes are flushed through the OS buffers\n"
10966
"to physical disk. This is somewhat slower, but means data should not be\n"
10967
"lost if the machine crashes. See also dirstate.fdatasync."
10968
msgstr ""
10969
10970
#: en/help_topics/configuration.txt:578
10971
msgid ""
10972
"submit_branch\n"
10973
"~~~~~~~~~~~~~"
10974
msgstr ""
10975
"submit_branch\n"
10976
"~~~~~~~~~~~~~"
10977
10978
#: en/help_topics/configuration.txt:581
10979
msgid ""
10980
"The branch you intend to submit your current work to. This is "
10981
"automatically\n"
10982
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10983
"This\n"
10984
"should usually be set on a per-branch or per-location basis."
10985
msgstr ""
10986
10987
#: en/help_topics/configuration.txt:585
10988
msgid ""
10989
"public_branch\n"
10990
"~~~~~~~~~~~~~"
10991
msgstr ""
10992
"public_branch\n"
10993
"~~~~~~~~~~~~~"
10994
10995
#: en/help_topics/configuration.txt:588
10996
msgid ""
10997
"A publically-accessible version of this branch (implying that this version "
10998
"is\n"
10999
"not publically-accessible). Used (and set) by ``bzr send``."
11000
msgstr ""
11001
11002
#: en/help_topics/configuration.txt:591
11003
msgid ""
11004
"suppress_warnings\n"
11005
"~~~~~~~~~~~~~~~~~"
11006
msgstr ""
11007
"suppress_warnings\n"
11008
"~~~~~~~~~~~~~~~~~"
11009
11010
#: en/help_topics/configuration.txt:594
11011
msgid ""
11012
"A list of strings, each string represent a warning that can be emitted by\n"
11013
"bzr. Mentioning a warning in this list tells bzr to not emit it."
11014
msgstr ""
11015
11016
#: en/help_topics/configuration.txt:597
11017
msgid "Valid values:"
11018
msgstr "valores válidos:"
11019
11020
#: en/help_topics/configuration.txt:599
11021
msgid ""
11022
"* ``format_deprecation``:\n"
11023
" whether the format deprecation warning is shown on repositories that "
11024
"are\n"
11025
" using deprecated formats."
11026
msgstr ""
11027
11028
#: en/help_topics/configuration.txt:603
11029
msgid ""
11030
"default_format\n"
11031
"~~~~~~~~~~~~~~"
11032
msgstr ""
11033
"default_format\n"
11034
"~~~~~~~~~~~~~~"
11035
11036
#: en/help_topics/configuration.txt:606
11037
msgid ""
11038
"A format name for the default format used when creating branches. See "
11039
"``bzr\n"
11040
"help formats`` for possible values."
11041
msgstr ""
11042
11043
#: en/help_topics/configuration.txt:609
11044
msgid ""
11045
"\n"
11046
"Unicode options\n"
11047
"---------------"
11048
msgstr ""
11049
"\n"
11050
"Opciones Unicode\n"
11051
"---------------"
11052
11053
#: en/help_topics/configuration.txt:613
11054
msgid ""
11055
"output_encoding\n"
11056
"~~~~~~~~~~~~~~~"
11057
msgstr ""
11058
"output_encoding\n"
11059
"~~~~~~~~~~~~~~~"
11060
11061
#: en/help_topics/configuration.txt:616
11062
msgid ""
11063
"A Python unicode encoding name for text output from bzr, such as log\n"
11064
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
11065
"is the terminal encoding prefered by the operating system."
11066
msgstr ""
11067
11068
#: en/help_topics/configuration.txt:620
11069
msgid ""
11070
"\n"
11071
"Branch type specific options\n"
11072
"----------------------------"
11073
msgstr ""
11074
"\n"
11075
"Opciones específicas del tipo de rama\n"
11076
"-----------------------------------------------------------"
11077
11078
#: en/help_topics/configuration.txt:624
11079
msgid ""
11080
"These options apply only to branches that use the ``dirstate-tags`` or\n"
11081
"later format. They\n"
11082
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
11083
"manually set in ``locations.conf`` or ``bazaar.conf``."
11084
msgstr ""
11085
11086
#: en/help_topics/configuration.txt:629
11087
msgid ""
11088
"append_revisions_only\n"
11089
"~~~~~~~~~~~~~~~~~~~~~"
11090
msgstr ""
11091
"append_revisions_only\n"
11092
"~~~~~~~~~~~~~~~~~~~~~"
11093
11094
#: en/help_topics/configuration.txt:632
11095
msgid ""
11096
"If set to \"True\" then revisions can only be appended to the log, not\n"
11097
"removed. A branch with this setting enabled can only pull from another\n"
11098
"branch if the other branch's log is a longer version of its own. This is\n"
11099
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
11100
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
11101
"compatibility with previous bzr versions (older than 2.2)."
11102
msgstr ""
11103
11104
#: en/help_topics/configuration.txt:639
11105
msgid ""
11106
"parent_location\n"
11107
"~~~~~~~~~~~~~~~"
11108
msgstr ""
11109
"parent_location\n"
11110
"~~~~~~~~~~~~~~~"
11111
11112
#: en/help_topics/configuration.txt:642
11113
msgid ""
11114
"If present, the location of the default branch for pull or merge. This "
11115
"option\n"
11116
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
11117
"--remember``."
11118
msgstr ""
11119
11120
#: en/help_topics/configuration.txt:646
11121
msgid ""
11122
"push_location\n"
11123
"~~~~~~~~~~~~~"
11124
msgstr ""
11125
"push_location\n"
11126
"~~~~~~~~~~~~~"
11127
11128
#: en/help_topics/configuration.txt:649
11129
msgid ""
11130
"If present, the location of the default branch for push. This option\n"
11131
"is normally set by the first ``push`` or ``push --remember``."
11132
msgstr ""
11133
11134
#: en/help_topics/configuration.txt:652
11135
msgid ""
11136
"push_strict\n"
11137
"~~~~~~~~~~~"
11138
msgstr ""
11139
"push_strict\n"
11140
"~~~~~~~~~~~"
11141
11142
#: en/help_topics/configuration.txt:655
11143
msgid ""
11144
"If present, defines the ``--strict`` option default value for checking\n"
11145
"uncommitted changes before pushing."
11146
msgstr ""
11147
11148
#: en/help_topics/configuration.txt:658
11149
msgid ""
11150
"dpush_strict\n"
11151
"~~~~~~~~~~~~"
11152
msgstr ""
11153
"dpush_strict\n"
11154
"~~~~~~~~~~~~"
11155
11156
#: en/help_topics/configuration.txt:661
11157
msgid ""
11158
"If present, defines the ``--strict`` option default value for checking\n"
11159
"uncommitted changes before pushing into a different VCS without any\n"
11160
"custom bzr metadata."
11161
msgstr ""
11162
11163
#: en/help_topics/configuration.txt:665
11164
msgid ""
11165
"bound_location\n"
11166
"~~~~~~~~~~~~~~"
11167
msgstr ""
11168
"bound_location\n"
11169
"~~~~~~~~~~~~~~"
11170
11171
#: en/help_topics/configuration.txt:668
11172
msgid ""
11173
"The location that commits should go to when acting as a checkout.\n"
11174
"This option is normally set by ``bind``."
11175
msgstr ""
11176
11177
#: en/help_topics/configuration.txt:671
11178
msgid ""
11179
"bound\n"
11180
"~~~~~"
11181
msgstr ""
11182
"bound\n"
11183
"~~~~~"
11184
11185
#: en/help_topics/configuration.txt:674
11186
msgid ""
11187
"If set to \"True\", the branch should act as a checkout, and push each "
11188
"commit to\n"
11189
"the bound_location. This option is normally set by ``bind``/``unbind``."
11190
msgstr ""
11191
11192
#: en/help_topics/configuration.txt:677
11193
msgid ""
11194
"send_strict\n"
11195
"~~~~~~~~~~~"
11196
msgstr ""
11197
"send_strict\n"
11198
"~~~~~~~~~"
11199
11200
#: en/help_topics/configuration.txt:680
11201
msgid ""
11202
"If present, defines the ``--strict`` option default value for checking\n"
11203
"uncommitted changes before sending a merge directive."
11204
msgstr ""
11205
11206
#: en/help_topics/configuration.txt:683
11207
msgid ""
11208
"add.maximum_file_size\n"
11209
"~~~~~~~~~~~~~~~~~~~~~"
11210
msgstr ""
11211
"add.maximum_file_size\n"
11212
"~~~~~~~~~~~~~~~~~~~"
11213
11214
#: en/help_topics/configuration.txt:686
11215
msgid ""
11216
"Defines the maximum file size the command line \"add\" operation will allow\n"
11217
"in recursive mode, with files larger than this value being skipped. You may "
11218
"\n"
11219
"specify this value as an integer (in which case it is interpreted as bytes), "
11220
"\n"
11221
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
11222
"0 \n"
11223
"will disable skipping."
11224
msgstr ""
11225
11226
#: en/help_topics/configuration.txt:692
11227
msgid ""
11228
"External Merge Tools\n"
11229
"--------------------"
11230
msgstr ""
11231
"Herramientas de fusión externas\n"
11232
"----------------------------------------------------"
11233
11234
#: en/help_topics/configuration.txt:695
11235
msgid ""
11236
"bzr.mergetool.<name>\n"
11237
"~~~~~~~~~~~~~~~~~~~~"
11238
msgstr ""
11239
"bzr.mergetool.<nombre>\n"
11240
"~~~~~~~~~~~~~~~~~~~"
11241
11242
#: en/help_topics/configuration.txt:698
11243
msgid ""
11244
"Defines an external merge tool called <name> with the given command-line.\n"
11245
"Arguments containing spaces should be quoted using single or double quotes. "
11246
"The\n"
11247
"executable may omit its path if it can be found on the PATH."
11248
msgstr ""
11249
11250
#: en/help_topics/configuration.txt:702
11251
msgid ""
11252
"The following markers can be used in the command-line to substitute "
11253
"filenames\n"
11254
"involved in the merge conflict::"
11255
msgstr ""
11256
11257
#: en/help_topics/configuration.txt:705
11258
msgid ""
11259
" {base} file.BASE\n"
11260
" {this} file.THIS\n"
11261
" {other} file.OTHER\n"
11262
" {result} output file\n"
11263
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
11264
"merge\n"
11265
" succeeds."
11266
msgstr ""
11267
11268
#: en/help_topics/configuration.txt:714
11269
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11270
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {este} {otro} -o {resultado}"
11271
11272
#: en/help_topics/configuration.txt:716
11273
msgid ""
11274
"bzr.default_mergetool\n"
11275
"~~~~~~~~~~~~~~~~~~~~~"
11276
msgstr ""
11277
"bzr.default_mergetool\n"
11278
"~~~~~~~~~~~~~~~~~~"
11279
11280
#: en/help_topics/configuration.txt:719
11281
msgid ""
11282
"Specifies which external merge tool (as defined above) should be selected "
11283
"by\n"
11284
"default in tools such as ``bzr qconflicts``."
11285
msgstr ""
11286
11287
#: en/help_topics/configuration.txt:724
11288
msgid " bzr.default_mergetool = kdiff3\n"
11289
msgstr " bzr.default_mergetool = kdiff3\n"
11290
11291
#: en/help_topics/conflict-types.txt:1
11292
msgid ""
11293
"Conflict Types\n"
11294
"=============="
11295
msgstr ""
11296
"Tipos de conflicto\n"
11297
"=================="
11298
11299
#: en/help_topics/conflict-types.txt:4
11300
msgid ""
11301
"Some operations, like merge, revert and pull, modify the contents of your\n"
11302
"working tree. These modifications are programmatically generated, and so "
11303
"they\n"
11304
"may conflict with the current state of your working tree. "
11305
msgstr ""
11306
11307
#: en/help_topics/conflict-types.txt:8
11308
msgid ""
11309
"When conflicts are present in your working tree (as shown by ``bzr\n"
11310
"conflicts``), you should resolve them and then inform bzr that the "
11311
"conflicts\n"
11312
"have been resolved."
11313
msgstr ""
11314
11315
#: en/help_topics/conflict-types.txt:12
11316
msgid ""
11317
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11318
"should resolve them is not the one responsible for their occurrence, as is "
11319
"the\n"
11320
"case when merging other people's work or because some conflicts are "
11321
"presented\n"
11322
"in a way that is not easy to understand."
11323
msgstr ""
11324
11325
#: en/help_topics/conflict-types.txt:17
11326
msgid ""
11327
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11328
"conflict if and only if there's an actual conceptual conflict in the source\n"
11329
"tree. Because Bazaar doesn't understand the real meaning of the files "
11330
"being\n"
11331
"versioned, it can, when faced with ambiguities, fall short in either "
11332
"direction\n"
11333
"trying to resolve the conflict itself. Many kinds of changes can be "
11334
"combined\n"
11335
"programmatically, but sometimes only a human can determine the right thing "
11336
"to\n"
11337
"do."
11338
msgstr ""
11339
11340
#: en/help_topics/conflict-types.txt:25
11341
msgid ""
11342
"When Bazaar generates a conflict, it adds information into the working tree "
11343
"to\n"
11344
"present the conflicting versions, and it's up to you to find the correct\n"
11345
"resolution."
11346
msgstr ""
11347
11348
#: en/help_topics/conflict-types.txt:29
11349
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11350
msgstr ""
11351
11352
#: en/help_topics/conflict-types.txt:31
11353
msgid ""
11354
"1. Modify the working tree content so that the conflicted item is now in "
11355
"the\n"
11356
" state you want to keep, then"
11357
msgstr ""
11358
11359
#: en/help_topics/conflict-types.txt:34
11360
msgid ""
11361
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11362
" remaining generated information (``bzr resolve <item>``)."
11363
msgstr ""
11364
11365
#: en/help_topics/conflict-types.txt:37
11366
msgid ""
11367
"For most conflict types, there are some obvious ways to modify the working\n"
11368
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11369
"itself already made a choice, when possible."
11370
msgstr ""
11371
11372
#: en/help_topics/conflict-types.txt:41
11373
msgid ""
11374
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11375
"different ways to resolve the conflict."
11376
msgstr ""
11377
11378
#: en/help_topics/conflict-types.txt:44
11379
msgid ""
11380
"Each type of conflict is explained below, and the action which must be done "
11381
"to\n"
11382
"resolve the conflict is outlined."
11383
msgstr ""
11384
11385
#: en/help_topics/conflict-types.txt:47
11386
msgid ""
11387
"Various actions are available depending on the kind of conflict, for some "
11388
"of\n"
11389
"these actions, Bazaar can provide some help. In the end you should at least\n"
11390
"inform Bazaar that you're done with the conflict with::"
11391
msgstr ""
11392
11393
#: en/help_topics/conflict-types.txt:51
11394
msgid " ``bzr resolve FILE --action=done'"
11395
msgstr ""
11396
11397
#: en/help_topics/conflict-types.txt:53
11398
msgid ""
11399
"Note that this is the default action when a single file is involved so you "
11400
"can\n"
11401
"simply use::"
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:56
11405
msgid " ``bzr resolve FILE``"
11406
msgstr " «bzr resolve ARCHIVO»"
11407
11408
#: en/help_topics/conflict-types.txt:58
11409
msgid "See ``bzr help resolve`` for more details."
11410
msgstr "Vea «bzr help resolve» para tener más detalles."
11411
11412
#: en/help_topics/conflict-types.txt:60
11413
msgid ""
11414
"Text conflicts\n"
11415
"--------------"
11416
msgstr ""
11417
"Conflictos de texto\n"
11418
"------------------------------"
11419
11420
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11421
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11422
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11423
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11424
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11425
msgid "Typical message::"
11426
msgstr "Mensaje típico::"
11427
11428
#: en/help_topics/conflict-types.txt:65
11429
msgid " Text conflict in FILE"
11430
msgstr " Conflictos de texto en ARCHIVO"
11431
11432
#: en/help_topics/conflict-types.txt:67
11433
msgid ""
11434
"These are produced when a text merge cannot completely reconcile two sets "
11435
"of\n"
11436
"text changes. Bazaar will emit files for each version with the extensions\n"
11437
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11438
"tree,\n"
11439
"i.e. the tree that you are merging changes into. OTHER is the version that "
11440
"you\n"
11441
"are merging into the target. BASE is an older version that is used as a "
11442
"basis\n"
11443
"for comparison."
11444
msgstr ""
11445
11446
#: en/help_topics/conflict-types.txt:74
11447
msgid ""
11448
"In the main copy of the file, Bazaar will include all the changes that it\n"
11449
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11450
"\"herringbone\" markers like ``<<<<<<<``."
11451
msgstr ""
11452
11453
#: en/help_topics/conflict-types.txt:78
11454
msgid ""
11455
"Say the initial text is \"The project leader released it.\", and THIS "
11456
"modifies it\n"
11457
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11458
"leader\n"
11459
"released Bazaar.\" A conflict would look like this::"
11460
msgstr ""
11461
11462
#: en/help_topics/conflict-types.txt:82
11463
msgid ""
11464
" <<<<<<< TREE\n"
11465
" Martin Pool released it.\n"
11466
" =======\n"
11467
" The project leader released Bazaar.\n"
11468
" >>>>>>> MERGE-SOURCE"
11469
msgstr ""
11470
" <<<<<<< TREE\n"
11471
" Martin Pool released it.\n"
11472
" =======\n"
11473
" The project leader released Bazaar.\n"
11474
" >>>>>>> MERGE-SOURCE"
11475
11476
#: en/help_topics/conflict-types.txt:88
11477
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11478
msgstr "La resolución correcta debería ser «Martin Pool released Bazaar.»"
11479
11480
#: en/help_topics/conflict-types.txt:90
11481
msgid ""
11482
"You can handle text conflicts either by editing the main copy of the file,\n"
11483
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11484
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11485
"set of changes over the other (but see below when you encounter these\n"
11486
"cases). More often, the two sets of changes must be intelligently combined."
11487
msgstr ""
11488
11489
#: en/help_topics/conflict-types.txt:96
11490
msgid ""
11491
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11492
"you are done editing, the file should look like it never had a conflict, and "
11493
"be\n"
11494
"ready to commit."
11495
msgstr ""
11496
11497
#: en/help_topics/conflict-types.txt:100
11498
msgid ""
11499
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11500
"Bazaar will auto-detect which conflicts you have resolved."
11501
msgstr ""
11502
11503
#: en/help_topics/conflict-types.txt:103
11504
msgid ""
11505
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11506
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11507
"working tree."
11508
msgstr ""
11509
11510
#: en/help_topics/conflict-types.txt:107
11511
msgid ""
11512
"\n"
11513
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11514
"resolve`` with one of the following actions:"
11515
msgstr ""
11516
11517
#: en/help_topics/conflict-types.txt:111
11518
msgid ""
11519
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11520
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11521
msgstr ""
11522
11523
#: en/help_topics/conflict-types.txt:114
11524
msgid ""
11525
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11526
"modifications will be taken into account."
11527
msgstr ""
11528
11529
#: en/help_topics/conflict-types.txt:117
11530
msgid ""
11531
"Content conflicts\n"
11532
"-----------------"
11533
msgstr ""
11534
"Conflictos de contenido\n"
11535
"-------------------------------------"
11536
11537
#: en/help_topics/conflict-types.txt:122
11538
msgid " Contents conflict in FILE"
11539
msgstr " Conflictos de contenido en ARCHIVO"
11540
11541
#: en/help_topics/conflict-types.txt:124
11542
msgid ""
11543
"This conflict happens when there are conflicting changes in the working "
11544
"tree\n"
11545
"and the merge source, but the conflicted items are not text files. They "
11546
"may\n"
11547
"be binary files, or symlinks, or directories. It can even happen with "
11548
"files\n"
11549
"that are deleted on one side, and modified on the other."
11550
msgstr ""
11551
11552
#: en/help_topics/conflict-types.txt:129
11553
msgid ""
11554
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11555
"be\n"
11556
"regular files, symlinks or directories). But it will not include a \"main "
11557
"copy\"\n"
11558
"of the file with herringbone conflict markers. It will appear that the "
11559
"\"main\n"
11560
"copy\" has been renamed to THIS or OTHER."
11561
msgstr ""
11562
11563
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11564
msgid ""
11565
"To resolve that kind of conflict, you should rebuild FILE from either "
11566
"version\n"
11567
"or a combination of both."
11568
msgstr ""
11569
11570
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11571
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11572
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11573
#: en/help_topics/conflict-types.txt:361
11574
msgid "``bzr resolve`` recognizes the following actions:"
11575
msgstr "«bzr resolve» reconoce las siguientes acciones:"
11576
11577
#: en/help_topics/conflict-types.txt:139
11578
msgid ""
11579
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11580
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11581
"* ``--action=done`` will just mark the conflict as resolved."
11582
msgstr ""
11583
11584
#: en/help_topics/conflict-types.txt:143
11585
msgid ""
11586
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11587
"and\n"
11588
"``.OTHER`` files if they are still present in the working tree."
11589
msgstr ""
11590
11591
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11592
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11593
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11594
#: en/help_topics/conflict-types.txt:369
11595
msgid ""
11596
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11597
msgstr ""
11598
"Bazaar no puede detectar automáticamente cuando se han resuelto conflictos "
11599
"de esta clase."
11600
11601
#: en/help_topics/conflict-types.txt:148
11602
msgid ""
11603
"Tag conflicts\n"
11604
"-------------"
11605
msgstr ""
11606
"Conflicto de etiquetas\n"
11607
"-----------------------------------"
11608
11609
#: en/help_topics/conflict-types.txt:153
11610
msgid ""
11611
" Conflicting tags:\n"
11612
" version-0.1"
11613
msgstr ""
11614
11615
#: en/help_topics/conflict-types.txt:156
11616
msgid ""
11617
"When pulling from or pushing to another branch, Bazaar informs you about "
11618
"tags\n"
11619
"that conflict between the two branches; that is the same tag points to two\n"
11620
"different revisions. You need not resolve these conflicts, but subsequent\n"
11621
"uses of pull or push will result in the same message."
11622
msgstr ""
11623
11624
#: en/help_topics/conflict-types.txt:161
11625
msgid ""
11626
"To resolve the conflict, you must apply the correct tags to either the "
11627
"target\n"
11628
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11629
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11630
"target branch's tags match the source branch, then in the target branch do\n"
11631
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11632
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11633
"source\n"
11634
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11635
"favor of the target branch, you need to similarly use ``tag --force`` in "
11636
"the\n"
11637
"source branch. (Note that pulling or pushing using --overwrite will "
11638
"overwrite\n"
11639
"all tags as well.)"
11640
msgstr ""
11641
11642
#: en/help_topics/conflict-types.txt:172
11643
msgid ""
11644
"Duplicate paths\n"
11645
"---------------"
11646
msgstr ""
11647
"Rutas duplicadas\n"
11648
"--------------------------"
11649
11650
#: en/help_topics/conflict-types.txt:177
11651
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11652
msgstr ""
11653
11654
#: en/help_topics/conflict-types.txt:179
11655
msgid ""
11656
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11657
"already been used. The existing file will be renamed to \"FILE.moved\". "
11658
msgstr ""
11659
11660
#: en/help_topics/conflict-types.txt:187
11661
msgid ""
11662
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11663
"FILE``,\n"
11664
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11665
"* ``--action=done`` will just mark the conflict as resolved."
11666
msgstr ""
11667
11668
#: en/help_topics/conflict-types.txt:191
11669
msgid ""
11670
"Note that you must get rid of FILE.moved before using ``--action=done``."
11671
msgstr ""
11672
11673
#: en/help_topics/conflict-types.txt:195
11674
msgid ""
11675
"Unversioned parent\n"
11676
"------------------"
11677
msgstr ""
11678
"Padre sin versión\n"
11679
"--------------------------"
11680
11681
#: en/help_topics/conflict-types.txt:200
11682
msgid ""
11683
" Conflict because FILE is not versioned, but has versioned children."
11684
msgstr ""
11685
11686
#: en/help_topics/conflict-types.txt:202
11687
msgid ""
11688
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11689
"not\n"
11690
"versioned. This happens when the directory has been deleted in the target,\n"
11691
"but has a new child in the source, or vice versa. In this situation, "
11692
"Bazaar\n"
11693
"will version the parent directory as well. Resolving this issue depends\n"
11694
"very much on the particular scenario. You may wish to rename or delete "
11695
"either\n"
11696
"the file or the directory. When you are satisfied, you can run \"bzr "
11697
"resolve\n"
11698
"FILE\" to mark the conflict as resolved."
11699
msgstr ""
11700
11701
#: en/help_topics/conflict-types.txt:210
11702
msgid ""
11703
"Missing parent\n"
11704
"--------------"
11705
msgstr ""
11706
"Falta el padre\n"
11707
"---------------------"
11708
11709
#: en/help_topics/conflict-types.txt:215
11710
msgid " Conflict adding files to FILE. Created directory."
11711
msgstr ""
11712
11713
#: en/help_topics/conflict-types.txt:217
11714
msgid ""
11715
"This happens when a directory has been deleted in the target, but has new\n"
11716
"children in the source. This is similar to the \"unversioned parent\" "
11717
"conflict,\n"
11718
"except that the parent directory does not *exist*, instead of just being\n"
11719
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11720
"Resolving this issue depends very much on the particular scenario."
11721
msgstr ""
11722
11723
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11724
msgid ""
11725
"To resolve that kind of conflict, you should either remove or rename the\n"
11726
"children or the directory or a combination of both."
11727
msgstr ""
11728
11729
#: en/help_topics/conflict-types.txt:228
11730
msgid ""
11731
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11732
" children,\n"
11733
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11734
"children\n"
11735
" and restoring the directory,\n"
11736
"* ``--action=done`` will just mark the conflict as resolved."
11737
msgstr ""
11738
11739
#: en/help_topics/conflict-types.txt:236
11740
msgid ""
11741
"Deleting parent\n"
11742
"---------------"
11743
msgstr ""
11744
"Eliminando padre\n"
11745
"---------------------------"
11746
11747
#: en/help_topics/conflict-types.txt:241
11748
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11749
msgstr ""
11750
11751
#: en/help_topics/conflict-types.txt:243
11752
msgid ""
11753
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11754
"source, but has new children in the target (either because a directory\n"
11755
"deletion is merged or because the merge introduce new children). Bazaar\n"
11756
"will retain the directory. Resolving this issue depends very much on the\n"
11757
"particular scenario."
11758
msgstr ""
11759
11760
#: en/help_topics/conflict-types.txt:254
11761
msgid ""
11762
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11763
"directory,"
11764
msgstr ""
11765
11766
#: en/help_topics/conflict-types.txt:256
11767
msgid ""
11768
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11769
" children,"
11770
msgstr ""
11771
11772
#: en/help_topics/conflict-types.txt:259
11773
msgid "* ``--action=done`` will just mark the conflict as resolved."
11774
msgstr ""
11775
11776
#: en/help_topics/conflict-types.txt:261
11777
msgid ""
11778
"Note that when merging a directory deletion, if unversioned files are\n"
11779
"present, they become potential orphans has they don't have a directory\n"
11780
"parent anymore."
11781
msgstr ""
11782
11783
#: en/help_topics/conflict-types.txt:265
11784
msgid ""
11785
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11786
"setting the ``bzr.transform.orphan_policy`` configuration option."
11787
msgstr ""
11788
11789
#: en/help_topics/conflict-types.txt:268
11790
msgid "There are two possible values for this option:"
11791
msgstr "Hay dos posibles valores para esta opción:"
11792
11793
#: en/help_topics/conflict-types.txt:270
11794
msgid ""
11795
"* ``conflict`` (the default): will leave the orphans in place and\n"
11796
" generate a conflicts,"
11797
msgstr ""
11798
11799
#: en/help_topics/conflict-types.txt:273
11800
msgid ""
11801
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11802
"root\n"
11803
" of the working tree with names like ``<file>.~#~``."
11804
msgstr ""
11805
11806
#: en/help_topics/conflict-types.txt:278
11807
msgid ""
11808
"Path conflict\n"
11809
"-------------"
11810
msgstr ""
11811
"Conflicto de ruta\n"
11812
"--------------------------"
11813
11814
#: en/help_topics/conflict-types.txt:283
11815
msgid " Path conflict: PATH1 / PATH2"
11816
msgstr ""
11817
11818
#: en/help_topics/conflict-types.txt:285
11819
msgid ""
11820
"This happens when the source and target have each modified the name or "
11821
"parent\n"
11822
"directory of a file. Bazaar will use the path elements from the source."
11823
msgstr ""
11824
11825
#: en/help_topics/conflict-types.txt:288
11826
msgid ""
11827
"To resolve that kind of conflict, you just have to decide what name should "
11828
"be\n"
11829
"retained for the file involved."
11830
msgstr ""
11831
11832
#: en/help_topics/conflict-types.txt:293
11833
msgid ""
11834
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11835
" issuing ``bzr mv PATH2 PATH1``,\n"
11836
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11837
"``PATH2``,\n"
11838
"* ``--action=done`` will just mark the conflict as resolved."
11839
msgstr ""
11840
11841
#: en/help_topics/conflict-types.txt:300
11842
msgid ""
11843
"Parent loop\n"
11844
"-----------"
11845
msgstr ""
11846
11847
#: en/help_topics/conflict-types.txt:305
11848
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11849
msgstr ""
11850
11851
#: en/help_topics/conflict-types.txt:307
11852
msgid ""
11853
"This happens when the source and the target have each moved directories, so\n"
11854
"that, if the change could be applied, a directory would be contained by "
11855
"itself.\n"
11856
"For example::"
11857
msgstr ""
11858
11859
#: en/help_topics/conflict-types.txt:311
11860
msgid ""
11861
" $ bzr init\n"
11862
" $ bzr mkdir white\n"
11863
" $ bzr mkdir black\n"
11864
" $ bzr commit -m \"BASE\"\n"
11865
" $ bzr branch . ../other\n"
11866
" $ bzr mv white black\n"
11867
" $ bzr commit -m \"THIS\"\n"
11868
" $ bzr mv ../other/black ../other/white\n"
11869
" $ bzr commit ../other -m \"OTHER\"\n"
11870
" $ bzr merge ../other"
11871
msgstr ""
11872
" $ bzr init\n"
11873
" $ bzr mkdir white\n"
11874
" $ bzr mkdir black\n"
11875
" $ bzr commit -m \"BASE\"\n"
11876
" $ bzr branch . ../other\n"
11877
" $ bzr mv white black\n"
11878
" $ bzr commit -m \"THIS\"\n"
11879
" $ bzr mv ../other/black ../other/white\n"
11880
" $ bzr commit ../other -m \"OTHER\"\n"
11881
" $ bzr merge ../other"
11882
11883
#: en/help_topics/conflict-types.txt:322
11884
msgid ""
11885
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11886
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11887
"name should be retained for the directories involved."
11888
msgstr ""
11889
11890
#: en/help_topics/conflict-types.txt:328
11891
msgid ""
11892
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11893
"\n"
11894
" in ``black``,\n"
11895
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11896
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11897
"* ``--action=done`` will just mark the conflict as resolved."
11898
msgstr ""
11899
11900
#: en/help_topics/conflict-types.txt:336
11901
msgid ""
11902
"Non-directory parent\n"
11903
"--------------------"
11904
msgstr ""
11905
11906
#: en/help_topics/conflict-types.txt:341
11907
msgid ""
11908
" Conflict: foo.new is not a directory, but has files in it.\n"
11909
" Created directory."
11910
msgstr ""
11911
11912
#: en/help_topics/conflict-types.txt:344
11913
msgid ""
11914
"This happens when one side has added files to a directory, and the other "
11915
"side\n"
11916
"has changed the directory into a file or symlink. For example::"
11917
msgstr ""
11918
11919
#: en/help_topics/conflict-types.txt:347
11920
msgid ""
11921
" $ bzr init\n"
11922
" $ bzr mkdir foo\n"
11923
" $ bzr commit -m \"BASE\"\n"
11924
" $ bzr branch . ../other\n"
11925
" $ rmdir foo\n"
11926
" $ touch foo\n"
11927
" $ bzr commit -m \"THIS\"\n"
11928
" $ bzr mkdir ../other/foo/bar\n"
11929
" $ bzr commit ../other -m \"OTHER\"\n"
11930
" $ bzr merge ../other"
11931
msgstr ""
11932
" $ bzr init\n"
11933
" $ bzr mkdir foo\n"
11934
" $ bzr commit -m \"BASE\"\n"
11935
" $ bzr branch . ../other\n"
11936
" $ rmdir foo\n"
11937
" $ touch foo\n"
11938
" $ bzr commit -m \"THIS\"\n"
11939
" $ bzr mkdir ../other/foo/bar\n"
11940
" $ bzr commit ../other -m \"OTHER\"\n"
11941
" $ bzr merge ../other"
11942
11943
#: en/help_topics/conflict-types.txt:358
11944
msgid ""
11945
"To resolve that kind of conflict, you have to decide what name should be\n"
11946
"retained for the file, directory or symlink involved."
11947
msgstr ""
11948
11949
#: en/help_topics/conflict-types.txt:363
11950
msgid ""
11951
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11952
" ``bzr add foo``,\n"
11953
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11954
" ``bzr mv foo.new foo``,\n"
11955
"* ``--action=done`` will just mark the conflict as resolved."
11956
msgstr ""
11957
11958
#: en/help_topics/conflict-types.txt:371
11959
msgid ""
11960
"MalformedTransform\n"
11961
"------------------"
11962
msgstr ""
11963
11964
#: en/help_topics/conflict-types.txt:374
11965
msgid ""
11966
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11967
"exception. This means that Bazaar encountered a filesystem conflict that it "
11968
"was\n"
11969
"unable to resolve. This usually indicates a bug. Please let us know if "
11970
"you\n"
11971
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11972
msgstr ""
11973
11974
#: en/help_topics/content-filters.txt:1
11975
msgid ""
11976
"Content Filters\n"
11977
"==============="
11978
msgstr ""
11979
"Filtros de contenido\n"
11980
"==============="
11981
11982
#: en/help_topics/content-filters.txt:4
11983
msgid ""
11984
"Content formats\n"
11985
"---------------"
11986
msgstr ""
11987
"Formatos de contenido\n"
11988
"---------------"
11989
11990
#: en/help_topics/content-filters.txt:7
11991
msgid ""
11992
"Bazaar's content filtering allows you to store files in a different\n"
11993
"format from the copy in your working tree. This lets you, or your\n"
11994
"co-developers, use Windows development tools that expect CRLF files\n"
11995
"on projects that use other line-ending conventions. Among other things,\n"
11996
"content filters also let Unix developers more easily work on projects\n"
11997
"using Windows line-ending conventions, keyword expansion/compression,\n"
11998
"and trailing spaces on lines in text files to be implicitly stripped\n"
11999
"when committed."
12000
msgstr ""
12001
12002
#: en/help_topics/content-filters.txt:16
12003
msgid "To generalize, there are two content formats supported by Bazaar:"
12004
msgstr "Generalizando, hay dos formatos de contenido permitidos por Bazaar:"
12005
12006
#: en/help_topics/content-filters.txt:18
12007
msgid ""
12008
"* a canonical format - how files are stored internally\n"
12009
"* a convenience format - how files are created in a working tree."
12010
msgstr ""
12011
12012
#: en/help_topics/content-filters.txt:21
12013
msgid ""
12014
"\n"
12015
"Format conversion\n"
12016
"-----------------"
12017
msgstr ""
12018
"\n"
12019
"Conversión de formato\n"
12020
"------------------------------------"
12021
12022
#: en/help_topics/content-filters.txt:25
12023
msgid ""
12024
"The conversion between these formats is done by content filters.\n"
12025
"A content filter has two parts:"
12026
msgstr ""
12027
12028
#: en/help_topics/content-filters.txt:28
12029
msgid ""
12030
"* a read converter - converts from convenience to canonical format\n"
12031
"* a write converter - converts from canonical to convenience format."
12032
msgstr ""
12033
12034
#: en/help_topics/content-filters.txt:31
12035
msgid ""
12036
"Many of these converters will provide *round-trip* conversion,\n"
12037
"i.e. applying the read converter followed by the write converter\n"
12038
"gives back the original content. However, others may provide an\n"
12039
"asymmetric conversion. For example, a read converter might strip\n"
12040
"trailing whitespace off lines in source code while the matching\n"
12041
"write converter might pass content through unchanged."
12042
msgstr ""
12043
12044
#: en/help_topics/content-filters.txt:38
12045
msgid ""
12046
"\n"
12047
"Enabling content filters\n"
12048
"------------------------"
12049
msgstr ""
12050
"\n"
12051
"Activar filtros de contenido\n"
12052
"--------------------------------------------"
12053
12054
#: en/help_topics/content-filters.txt:42
12055
msgid ""
12056
"Content filters are typically provided by plugins, so the first step\n"
12057
"in using them is to install the relevant plugins and read their\n"
12058
"documentation. Some plugins may be very specific about which files\n"
12059
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
12060
"In other cases, the plugin may leave it in the user's hands to\n"
12061
"define which files are to be filtered. This is typically done\n"
12062
"using rule-based preferences. See ``bzr help rules`` for general\n"
12063
"information about defining these."
12064
msgstr ""
12065
12066
#: en/help_topics/content-filters.txt:51
12067
msgid ""
12068
"\n"
12069
"Impact on commands\n"
12070
"------------------"
12071
msgstr ""
12072
"\n"
12073
"Impacto en las órdenes\n"
12074
"------------------------------------"
12075
12076
#: en/help_topics/content-filters.txt:55
12077
msgid ""
12078
"Read converters are only applied to commands that read content from\n"
12079
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
12080
"will apply read converters to files in the working tree, then compare\n"
12081
"the results to the content last committed."
12082
msgstr ""
12083
12084
#: en/help_topics/content-filters.txt:60
12085
msgid ""
12086
"Write converters are only applied by commands that **create files in a\n"
12087
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
12088
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
12089
"respectively."
12090
msgstr ""
12091
12092
#: en/help_topics/content-filters.txt:65
12093
msgid ""
12094
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
12095
"comitting files. If this makes sense for a given plugin providing\n"
12096
"a content filter, the plugin can usually achieve this effect by using a\n"
12097
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
12098
"for more information on hooks."
12099
msgstr ""
12100
12101
#: en/help_topics/content-filters.txt:71
12102
msgid ""
12103
"\n"
12104
"Refreshing your working tree\n"
12105
"----------------------------"
12106
msgstr ""
12107
"\n"
12108
"Actualizar su árbol de trabajo\n"
12109
"----------------------------------------------"
12110
12111
#: en/help_topics/content-filters.txt:75
12112
msgid ""
12113
"For performance reasons, Bazaar caches the timestamps of files in\n"
12114
"a working tree, and assumes files are unchanged if their timestamps\n"
12115
"match the cached values. As a consequence, there are times when\n"
12116
"you may need to explicitly ask for content filtering to be reapplied\n"
12117
"in one or both directions, e.g. after installing or reconfiguring\n"
12118
"plugins providing it."
12119
msgstr ""
12120
12121
#: en/help_topics/content-filters.txt:82
12122
msgid "Here are some general guidelines for doing this:"
12123
msgstr "Aquí hay algunas directrices para hacer esto:"
12124
12125
#: en/help_topics/content-filters.txt:84
12126
msgid ""
12127
" * To reapply read converters, ``touch`` files, i.e. update their\n"
12128
" timestamp. Operations like ``bzr status`` should then reapply the\n"
12129
" relevant read converters and compare the end result with the\n"
12130
" canonical format."
12131
msgstr ""
12132
12133
#: en/help_topics/content-filters.txt:89
12134
msgid ""
12135
" * To reapply write converters, ensure there are no local changes,\n"
12136
" delete the relevant files and run ``bzr revert`` on those files."
12137
msgstr ""
12138
12139
#: en/help_topics/content-filters.txt:92
12140
msgid ""
12141
"Note: In the future, it is likely that additional options will be added\n"
12142
"to commands to make this refreshing process faster and safer.\n"
12143
msgstr ""
12144
12145
#: en/help_topics/current-formats.txt:1
12146
msgid "Current Storage Formats"
12147
msgstr "Formatos de almacenamiento actual"
12148
12149
#: en/help_topics/current-formats.txt:3
12150
msgid ""
12151
":2a:\n"
12152
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
12153
" compress storage. Provides rich roots which are a one-way\n"
12154
" transition."
12155
msgstr ""
12156
12157
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
12158
msgid ""
12159
"\n"
12160
"See :doc:`formats-help` for more about storage formats."
12161
msgstr ""
12162
12163
#: en/help_topics/debug-flags.txt:1
12164
msgid ""
12165
"Debug Flags\n"
12166
"==========="
12167
msgstr ""
12168
"Marcas de depuración\n"
12169
"================="
12170
12171
#: en/help_topics/debug-flags.txt:4
12172
msgid ""
12173
"These flags can be passed on the bzr command line or (without the ``-D``\n"
12174
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
12175
msgstr ""
12176
12177
#: en/help_topics/debug-flags.txt:7
12178
msgid ""
12179
"-Dauth Trace authentication sections used.\n"
12180
"-Dbytes Print out how many bytes were transferred\n"
12181
"-Ddirstate Trace dirstate activity (verbose!)\n"
12182
"-Derror Instead of normal error handling, always print a "
12183
"traceback\n"
12184
" on error.\n"
12185
"-Devil Capture call sites that do expensive or badly-scaling\n"
12186
" operations.\n"
12187
"-Dfetch Trace history copying between repositories.\n"
12188
"-Dfilters Emit information for debugging content filtering.\n"
12189
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
12190
"fetch.\n"
12191
"-Dgraph Trace graph traversal.\n"
12192
"-Dhashcache Log every time a working file is read to determine its "
12193
"hash.\n"
12194
"-Dhooks Trace hook execution.\n"
12195
"-Dhpss Trace smart protocol requests and responses.\n"
12196
"-Dhpssdetail More hpss details.\n"
12197
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
12198
"-Dhttp Trace http connections, requests and responses.\n"
12199
"-Dindex Trace major index operations.\n"
12200
"-Dknit Trace knit operations.\n"
12201
"-Dlock Trace when lockdir locks are taken or released.\n"
12202
"-Dnoretry If a connection is reset, fail immediately rather than\n"
12203
" retrying the request.\n"
12204
"-Dprogress Trace progress bar operations.\n"
12205
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
12206
"-Dmerge Emit information for debugging merges.\n"
12207
"-Dno_apport Don't use apport to report crashes.\n"
12208
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
12209
"-Dpack Emit information about pack operations.\n"
12210
"-Drelock Emit a message every time a branch or repository object "
12211
"is\n"
12212
" unlocked then relocked the same way.\n"
12213
"-Dsftp Trace SFTP internals.\n"
12214
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
12215
"expected\n"
12216
"-Dstream Trace fetch streams.\n"
12217
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
12218
"portable\n"
12219
" manner.\n"
12220
"-Dunlock Some errors during unlock are treated as warnings.\n"
12221
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
12222
"-DIDS_always Always use InterDifferingSerializer to fetch if "
12223
"appropriate\n"
12224
" for the format, even for non-local fetches.\n"
12225
msgstr ""
12226
12227
#: en/help_topics/diverged-branches.txt:1
12228
msgid ""
12229
"Diverged Branches\n"
12230
"================="
12231
msgstr ""
12232
"Ramas con divergencia\n"
12233
"=================="
12234
12235
#: en/help_topics/diverged-branches.txt:4
12236
msgid ""
12237
"When Bazaar tries to push one branch onto another, it requires that the\n"
12238
"destination branch must be ready to receive the source branch. If this "
12239
"isn't\n"
12240
"the case, then we say that the branches have ``diverged``. Branches are\n"
12241
"considered diverged if the destination branch's most recent commit is one "
12242
"that\n"
12243
"has not been merged (directly or indirectly) by the source branch. To "
12244
"recover\n"
12245
"from diverged branches, one must merge the missing revisions into the "
12246
"source\n"
12247
"branch."
12248
msgstr ""
12249
12250
#: en/help_topics/diverged-branches.txt:12
12251
msgid ""
12252
"This situation commonly arises when using a centralized workflow with local\n"
12253
"commits. If someone else has committed new work to the mainline since your\n"
12254
"last pull and you have local commits that have not yet been pushed to the\n"
12255
"mainline, then your local branch and the mainline have diverged."
12256
msgstr ""
12257
12258
#: en/help_topics/diverged-branches.txt:17
12259
msgid ""
12260
"Discovering What Has Diverged\n"
12261
"-----------------------------"
12262
msgstr ""
12263
12264
#: en/help_topics/diverged-branches.txt:20
12265
msgid ""
12266
"The ``bzr missing`` command is used to find out what revisions are in "
12267
"another\n"
12268
"branch that are not present in the current branch, and vice-versa. It shows "
12269
"a\n"
12270
"summary of which extra revisions exist in each branch. If you want to see "
12271
"the\n"
12272
"precise effects of those revisions, you can use ``bzr diff --"
12273
"old=other_branch``\n"
12274
"to show the differences between other_branch and your current branch."
12275
msgstr ""
12276
12277
#: en/help_topics/diverged-branches.txt:26
12278
msgid ""
12279
"A Solution\n"
12280
"----------"
12281
msgstr ""
12282
"Una solución\n"
12283
"------------"
12284
12285
#: en/help_topics/diverged-branches.txt:29
12286
msgid ""
12287
"The solution is to merge the revisions from the mainline into your local\n"
12288
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
12289
"mainline. This merge may result in conflicts if the other developer's "
12290
"changes\n"
12291
"overlap with your changes. These conflicts should be resolved before\n"
12292
"continuing. After any conflicts have been resolved, or even if there were "
12293
"no\n"
12294
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
12295
"to your local branch. This requirement gives you an opportunity to test "
12296
"the\n"
12297
"resulting working tree for correctness, since the merged revisions could "
12298
"have\n"
12299
"made arbitrary changes. After testing, you should commit the merge using\n"
12300
"``bzr commit``. This clears up the diverged branches situation. Your "
12301
"local\n"
12302
"branch can now be pushed to the mainline.\n"
12303
msgstr ""
12304
12305
#: en/help_topics/env-variables.txt:1
12306
msgid "Environment Variables"
12307
msgstr "Variables de entorno"
12308
12309
#: en/help_topics/env-variables.txt:3
12310
msgid ""
12311
"=================== "
12312
"===========================================================\n"
12313
"BZRPATH Path where bzr is to look for shell plugin external\n"
12314
" commands.\n"
12315
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12316
"EMAIL E-Mail address of the user.\n"
12317
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12318
"EDITOR Editor for editing commit messages.\n"
12319
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12320
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12321
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12322
"BZR_PLUGIN_PATH.\n"
12323
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12324
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12325
"and\n"
12326
" HOME.\n"
12327
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12328
"URLs).\n"
12329
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12330
"sshcorp,\n"
12331
" plink or lsh.\n"
12332
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12333
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12334
"BZR_COLUMNS Override implicit terminal width.\n"
12335
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12336
"(selftest)\n"
12337
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12338
"'text'.\n"
12339
"BZR_PDB Control whether to launch a debugger on error.\n"
12340
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12341
" breakin debugger.\n"
12342
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12343
"(instead\n"
12344
" of char-based).\n"
12345
"=================== "
12346
"===========================================================\n"
12347
msgstr ""
12348
12349
#: en/help_topics/eol.txt:1
12350
msgid ""
12351
"End of Line Conversion\n"
12352
"======================"
12353
msgstr ""
12354
"Conversión de fin de línea\n"
12355
"====================="
12356
12357
#: en/help_topics/eol.txt:4
12358
msgid ""
12359
"EOL conversion is provided as a content filter where Bazaar internally\n"
12360
"stores a canonical format but outputs a convenience format. See\n"
12361
"``bzr help content-filters`` for general information about using these."
12362
msgstr ""
12363
12364
#: en/help_topics/eol.txt:8
12365
msgid ""
12366
"Note: Content filtering is only supported in recently added formats,\n"
12367
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12368
"in a recent format. (Just setting the format on the repository\n"
12369
"is not enough.) If content filtering does not appear to be working, use\n"
12370
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
12371
"or later."
12372
msgstr ""
12373
12374
#: en/help_topics/eol.txt:15
12375
msgid ""
12376
"EOL conversion needs to be enabled for selected file patterns using\n"
12377
"rules. See ``bzr help rules`` for general information on defining rules.\n"
12378
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
12379
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
12380
"supported in a future verison of Bazaar."
12381
msgstr ""
12382
12383
#: en/help_topics/eol.txt:21
12384
msgid ""
12385
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12386
"(If a value is not set, ``exact`` is the default.)"
12387
msgstr ""
12388
12389
#: en/help_topics/eol.txt:24
12390
msgid ""
12391
" ========== ===================================== ======================\n"
12392
" Value Checkout end-of-lines as Commit end-of-lines as\n"
12393
" ========== ===================================== ======================\n"
12394
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12395
" ---------- ------------------------------------- ----------------------\n"
12396
" ``lf`` ``lf`` ``lf``\n"
12397
" ---------- ------------------------------------- ----------------------\n"
12398
" ``crlf`` ``crlf`` ``lf``\n"
12399
" ---------- ------------------------------------- ----------------------\n"
12400
" ``exact`` No conversion Exactly as in file\n"
12401
" ========== ===================================== ======================"
12402
msgstr ""
12403
12404
#: en/help_topics/eol.txt:36
12405
msgid ""
12406
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12407
"byte is detected in the file."
12408
msgstr ""
12409
12410
#: en/help_topics/eol.txt:39
12411
msgid ""
12412
"For users working on a cross-platform project, here is a suggested rule\n"
12413
"to use as a starting point::"
12414
msgstr ""
12415
12416
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12417
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12418
msgid ""
12419
" [name *]\n"
12420
" eol = native"
12421
msgstr ""
12422
12423
#: en/help_topics/eol.txt:45
12424
msgid ""
12425
"If you have binary files that do not contain a null byte though, be\n"
12426
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12427
"by giving more explicit patterns earlier in the rules file. For example::"
12428
msgstr ""
12429
12430
#: en/help_topics/eol.txt:49
12431
msgid ""
12432
" [name *.png]\n"
12433
" eol = exact"
12434
msgstr ""
12435
12436
#: en/help_topics/eol.txt:55
12437
msgid ""
12438
"If your working tree is on a network drive shared by users on different\n"
12439
"operating systems, you typically want to force certain conventions for\n"
12440
"certain files. In that way, if a file is created with the wrong line\n"
12441
"endings or line endings get mixed during editing, it gets committed\n"
12442
"correctly and gets checked out correctly. For example::"
12443
msgstr ""
12444
12445
#: en/help_topics/eol.txt:61
12446
msgid ""
12447
" [name *.bat]\n"
12448
" eol = crlf"
12449
msgstr ""
12450
12451
#: en/help_topics/eol.txt:64
12452
msgid ""
12453
" [name *.sh]\n"
12454
" eol = lf"
12455
msgstr ""
12456
12457
#: en/help_topics/eol.txt:70
12458
msgid ""
12459
"If you take the care to create files with their required endings, you can\n"
12460
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12461
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12462
"introducing mixed line endings will be corrected during commit for files\n"
12463
"with those settings."
12464
msgstr ""
12465
12466
#: en/help_topics/eol.txt:76
12467
msgid ""
12468
"If you have sample test data that deliberately has text files with mixed\n"
12469
"newline conventions, you can ask for those to be left alone like this::"
12470
msgstr ""
12471
12472
#: en/help_topics/eol.txt:79
12473
msgid ""
12474
" [name test_data/]\n"
12475
" eol = exact"
12476
msgstr ""
12477
12478
#: en/help_topics/eol.txt:85
12479
msgid ""
12480
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12481
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12482
"of content analysis to detect binary files for commands like ``diff``.\n"
12483
"In the future, a ``binary = true`` rule may be added but it is not\n"
12484
"supported yet.)"
12485
msgstr ""
12486
12487
#: en/help_topics/eol.txt:91
12488
msgid ""
12489
"If you have an existing repository with text files already stored using\n"
12490
"Windows newline conventions (``crlf``), then you may want to keep using "
12491
"that\n"
12492
"convention in the repository. Forcing certain files to this convention\n"
12493
"may also help users who do not have rules configured. To do this, set\n"
12494
"``eol`` to one of the values below."
12495
msgstr ""
12496
12497
#: en/help_topics/eol.txt:97
12498
msgid ""
12499
" ============================ ======================== "
12500
"======================\n"
12501
" Value Checkout end-of-lines as Commit end-of-lines "
12502
"as\n"
12503
" ============================ ======================== "
12504
"======================\n"
12505
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12506
" ``lf`` otherwise\n"
12507
" ---------------------------- ------------------------ ----------------------"
12508
"\n"
12509
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12510
" ---------------------------- ------------------------ ----------------------"
12511
"\n"
12512
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12513
" ============================ ======================== ======================"
12514
msgstr ""
12515
12516
#: en/help_topics/eol.txt:108
12517
msgid ""
12518
"For users working on an existing project that uses Windows newline\n"
12519
"conventions in their Bazaar repository, this rule is suggested as a\n"
12520
"starting point::"
12521
msgstr ""
12522
12523
#: en/help_topics/eol.txt:112
12524
msgid ""
12525
" [name *]\n"
12526
" eol = native-with-crlf-in-repo"
12527
msgstr ""
12528
12529
#: en/help_topics/eol.txt:115
12530
msgid ""
12531
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12532
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12533
"``crlf`` and ``exact``."
12534
msgstr ""
12535
12536
#: en/help_topics/eol.txt:119
12537
msgid ""
12538
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12539
"never reject files because a given line ending or mixed line endings\n"
12540
"are found. A precommit hook should be used if you wish to validate\n"
12541
"(and not just convert) content before committing.\n"
12542
msgstr ""
12543
12544
#: en/help_topics/hidden-commands.txt:1
12545
msgid ""
12546
"added List files added in working tree.\n"
12547
"ancestry List all revisions merged into this branch.\n"
12548
"assert-fail Test reporting of assertion failures\n"
12549
"bundle-info Output interesting stats about a bundle\n"
12550
"bundle-revisions Create a merge-directive for submitting changes.\n"
12551
"cat-revision Write out metadata for a revision.\n"
12552
"dump-btree Dump the contents of a btree index file to stdout.\n"
12553
"export-pot Export command helps and error messages in po format.\n"
12554
"file-id Print file_id of a particular file or directory.\n"
12555
"file-path Print path of file_ids to a file or directory.\n"
12556
"find-merge-base Find and print a base revision for merging two "
12557
"branches.\n"
12558
"hooks Show hooks.\n"
12559
"inventory Show inventory of the current working copy or a "
12560
"revision.\n"
12561
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12562
"lookup-revision Lookup the revision-id from a revision-number\n"
12563
"merge-directive Generate a merge directive for auto-merge tools.\n"
12564
"modified List files modified in working tree.\n"
12565
"re-sign Create a digital signature for an existing revision.\n"
12566
"reference list, view and set branch locations for nested trees.\n"
12567
"relpath Show path of a file relative to root\n"
12568
"repair-workingtree Reset the working tree state file.\n"
12569
"revision-history Display the list of revision ids on a branch.\n"
12570
"revision-info Show revision number and revision id for a given "
12571
"revision\n"
12572
" identifier.\n"
12573
"rocks Statement of optimism.\n"
12574
"selftest Run internal test suite.\n"
12575
"shell-complete Show appropriate completions for context.\n"
12576
"test-script Run a shell-like test from a file.\n"
12577
"touching-revisions Return revision-ids which affected a particular file.\n"
12578
"unknowns List unknown files.\n"
12579
"wait-until-signalled Test helper for\n"
12580
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12581
msgstr ""
12582
12583
#: en/help_topics/hooks.txt:1
12584
msgid ""
12585
"\n"
12586
"Hooks\n"
12587
"====="
12588
msgstr ""
12589
"\n"
12590
"Ganchos\n"
12591
"======="
12592
12593
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12594
msgid ""
12595
"Introduction\n"
12596
"------------"
12597
msgstr ""
12598
"Introducción\n"
12599
"------------"
12600
12601
#: en/help_topics/hooks.txt:8
12602
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12603
msgstr ""
12604
12605
#: en/help_topics/hooks.txt:10
12606
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12607
msgstr ""
12608
12609
#: en/help_topics/hooks.txt:12
12610
msgid ""
12611
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12612
msgstr ""
12613
12614
#: en/help_topics/hooks.txt:14
12615
msgid ""
12616
"The class that contains each hook is given before the hooks it supplies. "
12617
"For\n"
12618
"instance, BranchHooks as the class is the hooks class for\n"
12619
"`bzrlib.branch.Branch.hooks`."
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:18
12623
msgid ""
12624
"Each description also indicates whether the hook runs on the client (the\n"
12625
"machine where bzr was invoked) or the server (the machine addressed by\n"
12626
"the branch URL). These may be, but are not necessarily, the same machine."
12627
msgstr ""
12628
12629
#: en/help_topics/hooks.txt:22
12630
msgid ""
12631
"Plugins (including hooks) are run on the server if all of these is true:"
12632
msgstr ""
12633
12634
#: en/help_topics/hooks.txt:24
12635
msgid ""
12636
" * The connection is via a smart server (accessed with a URL starting with\n"
12637
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12638
"\"http://\"\n"
12639
" URL when a smart server is available via HTTP)."
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:28
12643
msgid ""
12644
" * The hook is either server specific or part of general infrastructure "
12645
"rather\n"
12646
" than client specific code (such as commit)."
12647
msgstr ""
12648
12649
#: en/help_topics/hooks.txt:31
12650
msgid ""
12651
"\n"
12652
"BranchHooks\n"
12653
"-----------"
12654
msgstr ""
12655
"\n"
12656
"BranchHooks\n"
12657
"-----------"
12658
12659
#: en/help_topics/hooks.txt:35
12660
msgid ""
12661
"automatic_tag_name\n"
12662
"~~~~~~~~~~~~~~~~~~"
12663
msgstr ""
12664
"automatic_tag_name\n"
12665
"~~~~~~~~~~~~~~~~~~"
12666
12667
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12668
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12669
msgid "Introduced in: 2.2"
12670
msgstr "Introducido en: 2.2"
12671
12672
#: en/help_topics/hooks.txt:40
12673
msgid ""
12674
"Called to determine an automatic tag name for a revision.\n"
12675
"automatic_tag_name is called with (branch, revision_id) and should\n"
12676
"return a tag name or None if no tag name could be determined. The\n"
12677
"first non-None tag name returned will be used."
12678
msgstr ""
12679
12680
#: en/help_topics/hooks.txt:45
12681
msgid ""
12682
"open\n"
12683
"~~~~"
12684
msgstr ""
12685
"open\n"
12686
"~~~~"
12687
12688
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12689
#: en/help_topics/hooks.txt:307
12690
msgid "Introduced in: 1.8"
12691
msgstr "Introducido en: 1.8"
12692
12693
#: en/help_topics/hooks.txt:50
12694
msgid ""
12695
"Called with the Branch object that has been opened after a branch is\n"
12696
"opened."
12697
msgstr ""
12698
12699
#: en/help_topics/hooks.txt:53
12700
msgid ""
12701
"post_branch_init\n"
12702
"~~~~~~~~~~~~~~~~"
12703
msgstr ""
12704
"post_branch_init\n"
12705
"~~~~~~~~~~~~~~~~"
12706
12707
#: en/help_topics/hooks.txt:58
12708
msgid ""
12709
"Called after new branch initialization completes. post_branch_init is\n"
12710
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12711
"branch and checkout (both heavyweight and lightweight) will all\n"
12712
"trigger this hook."
12713
msgstr ""
12714
12715
#: en/help_topics/hooks.txt:63
12716
msgid ""
12717
"post_change_branch_tip\n"
12718
"~~~~~~~~~~~~~~~~~~~~~~"
12719
msgstr ""
12720
"post_change_branch_tip\n"
12721
"~~~~~~~~~~~~~~~~~~~~~~"
12722
12723
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12724
msgid "Introduced in: 1.4"
12725
msgstr "Introducido en: 1.4"
12726
12727
#: en/help_topics/hooks.txt:68
12728
msgid ""
12729
"Called in bzr client and server after a change to the tip of a branch\n"
12730
"is made. post_change_branch_tip is called with a\n"
12731
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12732
"uncommit will all trigger this hook."
12733
msgstr ""
12734
12735
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12736
msgid ""
12737
"post_commit\n"
12738
"~~~~~~~~~~~"
12739
msgstr ""
12740
"post_commit\n"
12741
"~~~~~~~~~~~"
12742
12743
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12744
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12745
msgid "Introduced in: 0.15"
12746
msgstr "Introducido en: 0.15"
12747
12748
#: en/help_topics/hooks.txt:78
12749
msgid ""
12750
"Called in the bzr client after a commit has completed. post_commit is\n"
12751
"called with (local, master, old_revno, old_revid, new_revno,\n"
12752
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12753
"branch."
12754
msgstr ""
12755
12756
#: en/help_topics/hooks.txt:83
12757
msgid ""
12758
"post_pull\n"
12759
"~~~~~~~~~"
12760
msgstr ""
12761
"post_pull\n"
12762
"~~~~~~~~~"
12763
12764
#: en/help_topics/hooks.txt:88
12765
msgid ""
12766
"Called after a pull operation completes. post_pull is called with a\n"
12767
"bzrlib.branch.PullResult object and only runs in the bzr client."
12768
msgstr ""
12769
12770
#: en/help_topics/hooks.txt:91
12771
msgid ""
12772
"post_push\n"
12773
"~~~~~~~~~"
12774
msgstr ""
12775
"post_push\n"
12776
"~~~~~~~~~"
12777
12778
#: en/help_topics/hooks.txt:96
12779
msgid ""
12780
"Called after a push operation completes. post_push is called with a\n"
12781
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12782
msgstr ""
12783
12784
#: en/help_topics/hooks.txt:99
12785
msgid ""
12786
"post_switch\n"
12787
"~~~~~~~~~~~"
12788
msgstr ""
12789
"post_switch\n"
12790
"~~~~~~~~~~~"
12791
12792
#: en/help_topics/hooks.txt:104
12793
msgid ""
12794
"Called after a checkout switches branch. post_switch is called with a\n"
12795
"bzrlib.branch.SwitchHookParams."
12796
msgstr ""
12797
12798
#: en/help_topics/hooks.txt:107
12799
msgid ""
12800
"post_uncommit\n"
12801
"~~~~~~~~~~~~~"
12802
msgstr ""
12803
"post_uncommit\n"
12804
"~~~~~~~~~~~~~"
12805
12806
#: en/help_topics/hooks.txt:112
12807
msgid ""
12808
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12809
"called with (local, master, old_revno, old_revid, new_revno,\n"
12810
"new_revid) where local is the local branch or None, master is the\n"
12811
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12812
"of None."
12813
msgstr ""
12814
12815
#: en/help_topics/hooks.txt:118
12816
msgid ""
12817
"pre_change_branch_tip\n"
12818
"~~~~~~~~~~~~~~~~~~~~~"
12819
msgstr ""
12820
"pre_change_branch_tip\n"
12821
"~~~~~~~~~~~~~~~~~~~~~"
12822
12823
#: en/help_topics/hooks.txt:121
12824
msgid "Introduced in: 1.6"
12825
msgstr "Introducido en: 1.6"
12826
12827
#: en/help_topics/hooks.txt:123
12828
msgid ""
12829
"Called in bzr client and server before a change to the tip of a branch\n"
12830
"is made. pre_change_branch_tip is called with a\n"
12831
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12832
"uncommit will all trigger this hook."
12833
msgstr ""
12834
12835
#: en/help_topics/hooks.txt:128
12836
msgid ""
12837
"pre_commit\n"
12838
"~~~~~~~~~~"
12839
msgstr ""
12840
"pre_commit\n"
12841
"~~~~~~~~~~"
12842
12843
#: en/help_topics/hooks.txt:131
12844
msgid "Introduced in: 0.91"
12845
msgstr "Introducido en: 0.91"
12846
12847
#: en/help_topics/hooks.txt:133
12848
msgid ""
12849
"Called after a commit is calculated but before it is completed.\n"
12850
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12851
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12852
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12853
"TreeDelta object describing changes from the basis revision. hooks\n"
12854
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12855
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12856
"tree."
12857
msgstr ""
12858
12859
#: en/help_topics/hooks.txt:142
12860
msgid ""
12861
"transform_fallback_location\n"
12862
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12863
msgstr ""
12864
"transform_fallback_location\n"
12865
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12866
12867
#: en/help_topics/hooks.txt:145
12868
msgid "Introduced in: 1.9"
12869
msgstr "Introducido en: 1.9"
12870
12871
#: en/help_topics/hooks.txt:147
12872
msgid ""
12873
"Called when a stacked branch is activating its fallback locations.\n"
12874
"transform_fallback_location is called with (branch, url), and should\n"
12875
"return a new url. Returning the same url allows it to be used as-is,\n"
12876
"returning a different one can be used to cause the branch to stack on\n"
12877
"a closer copy of that fallback_location. Note that the branch cannot\n"
12878
"have history accessing methods called on it during this hook because\n"
12879
"the fallback locations have not been activated. When there are\n"
12880
"multiple hooks installed for transform_fallback_location, all are\n"
12881
"called with the url returned from the previous hook.The order is\n"
12882
"however undefined."
12883
msgstr ""
12884
12885
#: en/help_topics/hooks.txt:158
12886
msgid ""
12887
"CommandHooks\n"
12888
"------------"
12889
msgstr ""
12890
"CommandHooks\n"
12891
"------------"
12892
12893
#: en/help_topics/hooks.txt:161
12894
msgid ""
12895
"extend_command\n"
12896
"~~~~~~~~~~~~~~"
12897
msgstr ""
12898
"extend_command\n"
12899
"~~~~~~~~~~~~~~"
12900
12901
#: en/help_topics/hooks.txt:164
12902
msgid "Introduced in: 1.13"
12903
msgstr "Introducido en: 1.13"
12904
12905
#: en/help_topics/hooks.txt:166
12906
msgid ""
12907
"Called after creating a command object to allow modifications such as\n"
12908
"adding or removing options, docs etc. Called with the new\n"
12909
"bzrlib.commands.Command object."
12910
msgstr ""
12911
12912
#: en/help_topics/hooks.txt:170
12913
msgid ""
12914
"get_command\n"
12915
"~~~~~~~~~~~"
12916
msgstr ""
12917
"get_command\n"
12918
"~~~~~~~~~~~"
12919
12920
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12921
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12922
msgid "Introduced in: 1.17"
12923
msgstr "Introducido en: 1.17"
12924
12925
#: en/help_topics/hooks.txt:175
12926
msgid ""
12927
"Called when creating a single command. Called with (cmd_or_None,\n"
12928
"command_name). get_command should either return the cmd_or_None\n"
12929
"parameter, or a replacement Command object that should be used for the\n"
12930
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12931
"Many users will prefer to use bzrlib.commands.register_command or\n"
12932
"plugin_cmds.register_lazy."
12933
msgstr ""
12934
12935
#: en/help_topics/hooks.txt:182
12936
msgid ""
12937
"get_missing_command\n"
12938
"~~~~~~~~~~~~~~~~~~~"
12939
msgstr ""
12940
"get_missing_command\n"
12941
"~~~~~~~~~~~~~~~~~~~"
12942
12943
#: en/help_topics/hooks.txt:187
12944
msgid ""
12945
"Called when creating a single command if no command could be found.\n"
12946
"Called with (command_name). get_missing_command should either return\n"
12947
"None, or a Command object to be used for the command."
12948
msgstr ""
12949
12950
#: en/help_topics/hooks.txt:191
12951
msgid ""
12952
"list_commands\n"
12953
"~~~~~~~~~~~~~"
12954
msgstr ""
12955
"list_commands\n"
12956
"~~~~~~~~~~~~~"
12957
12958
#: en/help_topics/hooks.txt:196
12959
msgid ""
12960
"Called when enumerating commands. Called with a set of cmd_name\n"
12961
"strings for all the commands found so far. This set is safe to mutate\n"
12962
"- e.g. to remove a command. list_commands should return the updated\n"
12963
"set of command names."
12964
msgstr ""
12965
12966
#: en/help_topics/hooks.txt:201
12967
msgid ""
12968
"post_command\n"
12969
"~~~~~~~~~~~~"
12970
msgstr ""
12971
12972
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12973
msgid "Introduced in: 2.6"
12974
msgstr "Introducido en: 2.6"
12975
12976
#: en/help_topics/hooks.txt:206
12977
msgid "Called after executing a command. Called with the command object."
12978
msgstr ""
12979
12980
#: en/help_topics/hooks.txt:208
12981
msgid ""
12982
"pre_command\n"
12983
"~~~~~~~~~~~"
12984
msgstr ""
12985
12986
#: en/help_topics/hooks.txt:213
12987
msgid "Called prior to executing a command. Called with the command object."
12988
msgstr ""
12989
12990
#: en/help_topics/hooks.txt:215
12991
msgid ""
12992
"_ConfigHooks\n"
12993
"------------"
12994
msgstr ""
12995
"_ConfigHooks\n"
12996
"------------"
12997
12998
#: en/help_topics/hooks.txt:218
12999
msgid ""
13000
"get\n"
13001
"~~~"
13002
msgstr ""
13003
"get\n"
13004
"~~~"
13005
13006
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
13007
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
13008
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
13009
#: en/help_topics/hooks.txt:446
13010
msgid "Introduced in: 2.4"
13011
msgstr "Introducido en: 2.4"
13012
13013
#: en/help_topics/hooks.txt:223
13014
msgid ""
13015
"Invoked when a config option is read. The signature is (stack, name,\n"
13016
"value)."
13017
msgstr ""
13018
13019
#: en/help_topics/hooks.txt:226
13020
msgid ""
13021
"load\n"
13022
"~~~~"
13023
msgstr ""
13024
"load\n"
13025
"~~~~"
13026
13027
#: en/help_topics/hooks.txt:231
13028
msgid "Invoked when a config store is loaded. The signature is (store)."
13029
msgstr ""
13030
13031
#: en/help_topics/hooks.txt:233
13032
msgid ""
13033
"remove\n"
13034
"~~~~~~"
13035
msgstr ""
13036
"remove\n"
13037
"~~~~~~"
13038
13039
#: en/help_topics/hooks.txt:238
13040
msgid ""
13041
"Invoked when a config option is removed. The signature is (stack,\n"
13042
"name)."
13043
msgstr ""
13044
13045
#: en/help_topics/hooks.txt:241
13046
msgid ""
13047
"save\n"
13048
"~~~~"
13049
msgstr ""
13050
"save\n"
13051
"~~~~"
13052
13053
#: en/help_topics/hooks.txt:246
13054
msgid "Invoked when a config store is saved. The signature is (store)."
13055
msgstr ""
13056
13057
#: en/help_topics/hooks.txt:248
13058
msgid ""
13059
"set\n"
13060
"~~~"
13061
msgstr ""
13062
"set\n"
13063
"~~~"
13064
13065
#: en/help_topics/hooks.txt:253
13066
msgid ""
13067
"Invoked when a config option is set. The signature is (stack, name,\n"
13068
"value)."
13069
msgstr ""
13070
13071
#: en/help_topics/hooks.txt:256
13072
msgid ""
13073
"ControlDirHooks\n"
13074
"---------------"
13075
msgstr ""
13076
13077
#: en/help_topics/hooks.txt:259
13078
msgid ""
13079
"post_repo_init\n"
13080
"~~~~~~~~~~~~~~"
13081
msgstr ""
13082
"post_repo_init\n"
13083
"~~~~~~~~~~~~~~"
13084
13085
#: en/help_topics/hooks.txt:264
13086
msgid ""
13087
"Invoked after a repository has been initialized. post_repo_init is\n"
13088
"called with a bzrlib.controldir.RepoInitHookParams."
13089
msgstr ""
13090
13091
#: en/help_topics/hooks.txt:267
13092
msgid ""
13093
"pre_open\n"
13094
"~~~~~~~~"
13095
msgstr ""
13096
"pre_open\n"
13097
"~~~~~~~~"
13098
13099
#: en/help_topics/hooks.txt:270
13100
msgid "Introduced in: 1.14"
13101
msgstr "Introducido en: 1.14"
13102
13103
#: en/help_topics/hooks.txt:272
13104
msgid ""
13105
"Invoked before attempting to open a ControlDir with the transport that\n"
13106
"the open will use."
13107
msgstr ""
13108
13109
#: en/help_topics/hooks.txt:275
13110
msgid ""
13111
"InfoHooks\n"
13112
"---------"
13113
msgstr ""
13114
"InfoHooks\n"
13115
"---------"
13116
13117
#: en/help_topics/hooks.txt:278
13118
msgid ""
13119
"repository\n"
13120
"~~~~~~~~~~"
13121
msgstr ""
13122
"repository\n"
13123
"~~~~~~~~~~"
13124
13125
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
13126
#: en/help_topics/hooks.txt:524
13127
msgid "Introduced in: 1.15"
13128
msgstr "Introducido en: 1.15"
13129
13130
#: en/help_topics/hooks.txt:283
13131
msgid ""
13132
"Invoked when displaying the statistics for a repository. repository is\n"
13133
"called with a statistics dictionary as returned by the repository and\n"
13134
"a file-like object to write to."
13135
msgstr ""
13136
13137
#: en/help_topics/hooks.txt:287
13138
msgid ""
13139
"LockHooks\n"
13140
"---------"
13141
msgstr ""
13142
"LockHooks\n"
13143
"---------"
13144
13145
#: en/help_topics/hooks.txt:290
13146
msgid ""
13147
"lock_acquired\n"
13148
"~~~~~~~~~~~~~"
13149
msgstr ""
13150
"lock_acquired\n"
13151
"~~~~~~~~~~~~~"
13152
13153
#: en/help_topics/hooks.txt:295
13154
msgid ""
13155
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
13156
msgstr ""
13157
13158
#: en/help_topics/hooks.txt:297
13159
msgid ""
13160
"lock_broken\n"
13161
"~~~~~~~~~~~"
13162
msgstr ""
13163
"lock_broken\n"
13164
"~~~~~~~~~~~"
13165
13166
#: en/help_topics/hooks.txt:302
13167
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
13168
msgstr ""
13169
13170
#: en/help_topics/hooks.txt:304
13171
msgid ""
13172
"lock_released\n"
13173
"~~~~~~~~~~~~~"
13174
msgstr ""
13175
"lock_released\n"
13176
"~~~~~~~~~~~~~"
13177
13178
#: en/help_topics/hooks.txt:309
13179
msgid ""
13180
"Called with a bzrlib.lock.LockResult when a physical lock is released."
13181
msgstr ""
13182
13183
#: en/help_topics/hooks.txt:311
13184
msgid ""
13185
"MergeHooks\n"
13186
"----------"
13187
msgstr ""
13188
"MergeHooks\n"
13189
"----------"
13190
13191
#: en/help_topics/hooks.txt:314
13192
msgid ""
13193
"merge_file_content\n"
13194
"~~~~~~~~~~~~~~~~~~"
13195
msgstr ""
13196
"merge_file_content\n"
13197
"~~~~~~~~~~~~~~~~~~"
13198
13199
#: en/help_topics/hooks.txt:317
13200
msgid "Introduced in: 2.1"
13201
msgstr "Introducido en: 2.1"
13202
13203
#: en/help_topics/hooks.txt:319
13204
msgid ""
13205
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
13206
"object when starting a merge. Should return either None or a subclass\n"
13207
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
13208
"called per file that needs to be merged (including when one side has\n"
13209
"deleted the file and the other has changed it). See the\n"
13210
"AbstractPerFileMerger API docs for details on how it is used by merge."
13211
msgstr ""
13212
13213
#: en/help_topics/hooks.txt:326
13214
msgid ""
13215
"post_merge\n"
13216
"~~~~~~~~~~"
13217
msgstr ""
13218
13219
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
13220
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
13221
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
13222
msgid "Introduced in: 2.5"
13223
msgstr "Introducido en: 2.5"
13224
13225
#: en/help_topics/hooks.txt:331
13226
msgid ""
13227
"Called after a merge. Receives a Merger object as the single argument.\n"
13228
"The return value is ignored."
13229
msgstr ""
13230
13231
#: en/help_topics/hooks.txt:334
13232
msgid ""
13233
"pre_merge\n"
13234
"~~~~~~~~~"
13235
msgstr ""
13236
13237
#: en/help_topics/hooks.txt:339
13238
msgid ""
13239
"Called before a merge. Receives a Merger object as the single\n"
13240
"argument."
13241
msgstr ""
13242
13243
#: en/help_topics/hooks.txt:342
13244
msgid ""
13245
"MergeDirectiveHooks\n"
13246
"-------------------"
13247
msgstr ""
13248
"MergeDirectiveHooks\n"
13249
"-------------------"
13250
13251
#: en/help_topics/hooks.txt:345
13252
msgid ""
13253
"merge_request_body\n"
13254
"~~~~~~~~~~~~~~~~~~"
13255
msgstr ""
13256
"merge_request_body\n"
13257
"~~~~~~~~~~~~~~~~~~"
13258
13259
#: en/help_topics/hooks.txt:348
13260
msgid "Introduced in: 1.15.0"
13261
msgstr "Introducido en: 1.15.0"
13262
13263
#: en/help_topics/hooks.txt:350
13264
msgid ""
13265
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
13266
"request. Callbacks must return a body. If more than one callback is\n"
13267
"registered, the output of one callback is provided to the next."
13268
msgstr ""
13269
13270
#: en/help_topics/hooks.txt:354
13271
msgid ""
13272
"MessageEditorHooks\n"
13273
"------------------"
13274
msgstr ""
13275
"MessageEditorHooks\n"
13276
"------------------"
13277
13278
#: en/help_topics/hooks.txt:357
13279
msgid ""
13280
"commit_message_template\n"
13281
"~~~~~~~~~~~~~~~~~~~~~~~"
13282
msgstr ""
13283
"commit_message_template\n"
13284
"~~~~~~~~~~~~~~~~~~~~~~~"
13285
13286
#: en/help_topics/hooks.txt:360
13287
msgid "Introduced in: 1.10"
13288
msgstr "Introducido en: 1.10"
13289
13290
#: en/help_topics/hooks.txt:362
13291
msgid ""
13292
"Called when a commit message is being generated.\n"
13293
"commit_message_template is called with the bzrlib.commit.Commit object\n"
13294
"and the message that is known so far. commit_message_template must\n"
13295
"return a new message to use (which could be the same as it was given).\n"
13296
"When there are multiple hooks registered for commit_message_template,\n"
13297
"they are chained with the result from the first passed into the\n"
13298
"second, and so on."
13299
msgstr ""
13300
13301
#: en/help_topics/hooks.txt:370
13302
msgid ""
13303
"set_commit_message\n"
13304
"~~~~~~~~~~~~~~~~~~"
13305
msgstr ""
13306
"set_commit_message\n"
13307
"~~~~~~~~~~~~~~~~~~"
13308
13309
#: en/help_topics/hooks.txt:375
13310
msgid ""
13311
"Set a fixed commit message. set_commit_message is called with the\n"
13312
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
13313
"properties by editing commit.builder._revprops) and the message so\n"
13314
"far. set_commit_message must return the message to use or None if it\n"
13315
"should use the message editor as normal."
13316
msgstr ""
13317
13318
#: en/help_topics/hooks.txt:381
13319
msgid ""
13320
"MutableTreeHooks\n"
13321
"----------------"
13322
msgstr ""
13323
"MutableTreeHooks\n"
13324
"----------------"
13325
13326
#: en/help_topics/hooks.txt:384
13327
msgid ""
13328
"post_build_tree\n"
13329
"~~~~~~~~~~~~~~~"
13330
msgstr ""
13331
13332
#: en/help_topics/hooks.txt:389
13333
msgid ""
13334
"Called after a completely new tree is built. The hook is called with\n"
13335
"the tree as its only argument."
13336
msgstr ""
13337
13338
#: en/help_topics/hooks.txt:395
13339
msgid "Introduced in: 2.0"
13340
msgstr "Introducido en: 2.0"
13341
13342
#: en/help_topics/hooks.txt:397
13343
msgid ""
13344
"Called after a commit is performed on a tree. The hook is called with\n"
13345
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
13346
"commit was performed on is available via the mutable_tree attribute of\n"
13347
"that object."
13348
msgstr ""
13349
13350
#: en/help_topics/hooks.txt:402
13351
msgid ""
13352
"post_transform\n"
13353
"~~~~~~~~~~~~~~"
13354
msgstr ""
13355
13356
#: en/help_topics/hooks.txt:407
13357
msgid ""
13358
"Called after a tree transform has been performed on a tree. The hook\n"
13359
"is called with the tree that is being transformed and the transform."
13360
msgstr ""
13361
13362
#: en/help_topics/hooks.txt:410
13363
msgid ""
13364
"pre_transform\n"
13365
"~~~~~~~~~~~~~"
13366
msgstr ""
13367
13368
#: en/help_topics/hooks.txt:415
13369
msgid ""
13370
"Called before a tree transform on this tree. The hook is called with\n"
13371
"the tree that is being transformed and the transform."
13372
msgstr ""
13373
13374
#: en/help_topics/hooks.txt:418
13375
msgid ""
13376
"start_commit\n"
13377
"~~~~~~~~~~~~"
13378
msgstr ""
13379
"start_commit\n"
13380
"~~~~~~~~~~~~"
13381
13382
#: en/help_topics/hooks.txt:423
13383
msgid ""
13384
"Called before a commit is performed on a tree. The start commit hook\n"
13385
"is able to change the tree before the commit takes place. start_commit\n"
13386
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
13387
"being performed on."
13388
msgstr ""
13389
13390
#: en/help_topics/hooks.txt:428
13391
msgid ""
13392
"SmartClientHooks\n"
13393
"----------------"
13394
msgstr ""
13395
"SmartClientHooks\n"
13396
"----------------"
13397
13398
#: en/help_topics/hooks.txt:431
13399
msgid ""
13400
"call\n"
13401
"~~~~"
13402
msgstr ""
13403
"call\n"
13404
"~~~~"
13405
13406
#: en/help_topics/hooks.txt:434
13407
msgid "Introduced in: unknown"
13408
msgstr "Introducido en: deconocido"
13409
13410
#: en/help_topics/hooks.txt:436
13411
msgid ""
13412
"Called when the smart client is submitting a request to the smart\n"
13413
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13414
"Streaming request bodies, and responses, are not accessible."
13415
msgstr ""
13416
13417
#: en/help_topics/hooks.txt:440
13418
msgid ""
13419
"SmartServerHooks\n"
13420
"----------------"
13421
msgstr ""
13422
"SmartServerHooks\n"
13423
"----------------"
13424
13425
#: en/help_topics/hooks.txt:443
13426
msgid ""
13427
"server_exception\n"
13428
"~~~~~~~~~~~~~~~~"
13429
msgstr ""
13430
"server_exception\n"
13431
"~~~~~~~~~~~~~~~~"
13432
13433
#: en/help_topics/hooks.txt:448
13434
msgid ""
13435
"Called by the bzr server when an exception occurs. server_exception is\n"
13436
"called with the sys.exc_info() tuple return true for the hook if the\n"
13437
"exception has been handled, in which case the server will exit\n"
13438
"normally."
13439
msgstr ""
13440
13441
#: en/help_topics/hooks.txt:453
13442
msgid ""
13443
"server_started\n"
13444
"~~~~~~~~~~~~~~"
13445
msgstr ""
13446
"server_started\n"
13447
"~~~~~~~~~~~~~~"
13448
13449
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
13450
msgid "Introduced in: 0.16"
13451
msgstr "Introducido en: 0.16"
13452
13453
#: en/help_topics/hooks.txt:458
13454
msgid ""
13455
"Called by the bzr server when it starts serving a directory.\n"
13456
"server_started is called with (backing urls, public url), where\n"
13457
"backing_url is a list of URLs giving the server-specific directory\n"
13458
"locations, and public_url is the public URL for the directory being\n"
13459
"served."
13460
msgstr ""
13461
13462
#: en/help_topics/hooks.txt:464
13463
msgid ""
13464
"server_started_ex\n"
13465
"~~~~~~~~~~~~~~~~~"
13466
msgstr ""
13467
"server_started_ex\n"
13468
"~~~~~~~~~~~~~~~~~"
13469
13470
#: en/help_topics/hooks.txt:469
13471
msgid ""
13472
"Called by the bzr server when it starts serving a directory.\n"
13473
"server_started is called with (backing_urls, server_obj)."
13474
msgstr ""
13475
13476
#: en/help_topics/hooks.txt:472
13477
msgid ""
13478
"server_stopped\n"
13479
"~~~~~~~~~~~~~~"
13480
msgstr ""
13481
"server_stopped\n"
13482
"~~~~~~~~~~~~~~"
13483
13484
#: en/help_topics/hooks.txt:477
13485
msgid ""
13486
"Called by the bzr server when it stops serving a directory.\n"
13487
"server_stopped is called with the same parameters as the\n"
13488
"server_started hook: (backing_urls, public_url)."
13489
msgstr ""
13490
13491
#: en/help_topics/hooks.txt:481
13492
msgid ""
13493
"StatusHooks\n"
13494
"-----------"
13495
msgstr ""
13496
"StatusHooks\n"
13497
"-----------"
13498
13499
#: en/help_topics/hooks.txt:484
13500
msgid ""
13501
"post_status\n"
13502
"~~~~~~~~~~~"
13503
msgstr ""
13504
"post_status\n"
13505
"~~~~~~~~~~~"
13506
13507
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13508
msgid "Introduced in: 2.3"
13509
msgstr "Introducido en: 2.3"
13510
13511
#: en/help_topics/hooks.txt:489
13512
msgid ""
13513
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13514
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13515
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13516
"correspond to the command line options specified by the user for the\n"
13517
"status command. to_file is the output stream for writing."
13518
msgstr ""
13519
13520
#: en/help_topics/hooks.txt:495
13521
msgid ""
13522
"pre_status\n"
13523
"~~~~~~~~~~"
13524
msgstr ""
13525
"pre_status\n"
13526
"~~~~~~~~~~"
13527
13528
#: en/help_topics/hooks.txt:500
13529
msgid ""
13530
"Called with argument StatusHookParams before Bazaar displays the\n"
13531
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13532
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13533
"correspond to the command line options specified by the user for the\n"
13534
"status command. to_file is the output stream for writing."
13535
msgstr ""
13536
13537
#: en/help_topics/hooks.txt:506
13538
msgid ""
13539
"TransportHooks\n"
13540
"--------------"
13541
msgstr ""
13542
13543
#: en/help_topics/hooks.txt:509
13544
msgid ""
13545
"post_connect\n"
13546
"~~~~~~~~~~~~"
13547
msgstr ""
13548
13549
#: en/help_topics/hooks.txt:514
13550
msgid ""
13551
"Called after a new connection is established or a reconnect occurs.\n"
13552
"The sole argument passed is either the connected transport or smart\n"
13553
"medium instance."
13554
msgstr ""
13555
13556
#: en/help_topics/hooks.txt:518
13557
msgid ""
13558
"RioVersionInfoBuilderHooks\n"
13559
"--------------------------"
13560
msgstr ""
13561
"RioVersionInfoBuilderHooks\n"
13562
"--------------------------"
13563
13564
#: en/help_topics/hooks.txt:521
13565
msgid ""
13566
"revision\n"
13567
"~~~~~~~~"
13568
msgstr ""
13569
"revisión\n"
13570
"~~~~~~~~"
13571
13572
#: en/help_topics/hooks.txt:526
13573
msgid ""
13574
"Invoked when adding information about a revision to the RIO stanza\n"
13575
"that is printed. revision is called with a revision object and a RIO\n"
13576
"stanza.\n"
13577
msgstr ""
13578
13579
#: en/help_topics/location-alias.txt:1
13580
msgid ""
13581
"Location aliases\n"
13582
"================"
13583
msgstr ""
13584
"Alias de ubicación\n"
13585
"=============="
13586
13587
#: en/help_topics/location-alias.txt:4
13588
msgid ""
13589
"Bazaar defines several aliases for locations associated with a branch. "
13590
"These\n"
13591
"can be used with most commands that expect a location, such as `bzr push`."
13592
msgstr ""
13593
13594
#: en/help_topics/location-alias.txt:7
13595
msgid "The aliases are::"
13596
msgstr "Los alias son::"
13597
13598
#: en/help_topics/location-alias.txt:9
13599
msgid ""
13600
" :bound The branch this branch is bound to, for bound branches.\n"
13601
" :parent The parent of this branch.\n"
13602
" :public The public location of this branch.\n"
13603
" :push The saved location used for `bzr push` with no arguments.\n"
13604
" :submit The submit branch for this branch.\n"
13605
" :this This branch."
13606
msgstr ""
13607
13608
#: en/help_topics/location-alias.txt:16
13609
msgid "For example, to push to the parent location::"
13610
msgstr "Por ejemplo para impulsar la ubicación padre::"
13611
13612
#: en/help_topics/location-alias.txt:18
13613
msgid " bzr push :parent\n"
13614
msgstr ""
13615
13616
#: en/help_topics/log-formats.txt:1
13617
msgid ""
13618
"Log Formats\n"
13619
"==========="
13620
msgstr ""
13621
"Formatos de registro\n"
13622
"================"
13623
13624
#: en/help_topics/log-formats.txt:4
13625
msgid ""
13626
"A log format controls how information about each revision is displayed.\n"
13627
"The standard log formats are compared below::"
13628
msgstr ""
13629
13630
#: en/help_topics/log-formats.txt:7
13631
msgid ""
13632
" Feature long short line\n"
13633
" ---------------------- ------------- ------------ -------------------\n"
13634
" design goal detailed view concise view 1 revision per line\n"
13635
" committer name+email name only name only\n"
13636
" author name+email - -\n"
13637
" date-time format full date only date only\n"
13638
" commit message full full top line\n"
13639
" tags yes yes yes\n"
13640
" merges indicator - yes -\n"
13641
" status/delta optional optional -\n"
13642
" diff/patch optional optional -\n"
13643
" revision-id optional optional -\n"
13644
" branch nick yes - -\n"
13645
" foreign vcs properties yes yes -\n"
13646
" preferred levels all 1 1\n"
13647
" digital signature optional - -"
13648
msgstr ""
13649
13650
#: en/help_topics/log-formats.txt:24
13651
msgid ""
13652
"The default format is ``long``. To change this, define the ``log_format``\n"
13653
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13654
msgstr ""
13655
13656
#: en/help_topics/log-formats.txt:27
13657
msgid ""
13658
" [DEFAULT]\n"
13659
" log_format = short"
13660
msgstr ""
13661
13662
#: en/help_topics/log-formats.txt:30
13663
msgid ""
13664
"Alternatively, to change the log format used for a given query, use the\n"
13665
"--long, --short or --line options."
13666
msgstr ""
13667
13668
#: en/help_topics/log-formats.txt:33
13669
msgid ""
13670
"If one of the standard log formats does not meet your needs, additional\n"
13671
"formats can be provided by plugins.\n"
13672
msgstr ""
13673
13674
#: en/help_topics/other-formats.txt:1
13675
msgid "Other Storage Formats"
13676
msgstr "Otros formatos de almacenamiento"
13677
13678
#: en/help_topics/other-formats.txt:3
13679
msgid "Experimental formats are shown below."
13680
msgstr "Los formatos experimentales se muestran a continuación."
13681
13682
#: en/help_topics/other-formats.txt:5
13683
msgid ""
13684
":development-colo:\n"
13685
" (native) The 2a format with experimental support for colocated\n"
13686
" branches."
13687
msgstr ""
13688
13689
#: en/help_topics/other-formats.txt:9
13690
msgid ""
13691
"\n"
13692
"Deprecated formats are shown below."
13693
msgstr ""
13694
"\n"
13695
"Los formatos obsoletos se muestran a continuación."
13696
13697
#: en/help_topics/other-formats.txt:12
13698
msgid ""
13699
":pack-0.92:\n"
13700
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13701
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13702
" by bzr < 0.92."
13703
msgstr ""
13704
13705
#: en/help_topics/patterns.txt:1
13706
msgid ""
13707
"Patterns\n"
13708
"========"
13709
msgstr ""
13710
"Patrones\n"
13711
"========"
13712
13713
#: en/help_topics/patterns.txt:4
13714
msgid ""
13715
"Bazaar uses patterns to match files at various times. For example,\n"
13716
"the ``add`` command skips over files that match ignore patterns\n"
13717
"and preferences can be associated with files using rule patterns.\n"
13718
"The pattern syntax is described below."
13719
msgstr ""
13720
13721
#: en/help_topics/patterns.txt:9
13722
msgid ""
13723
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13724
"slash or is a regular expression, it is compared to the whole path\n"
13725
"from the branch root. Otherwise, it is compared to only the last\n"
13726
"component of the path. To match a file only in the root directory,\n"
13727
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13728
msgstr ""
13729
13730
#: en/help_topics/patterns.txt:15
13731
msgid "Patterns may include globbing wildcards such as::"
13732
msgstr "Los patrones pueden incluir comodines globales tales como::"
13733
13734
#: en/help_topics/patterns.txt:17
13735
msgid ""
13736
" ? - Matches any single character except '/'\n"
13737
" * - Matches 0 or more characters except '/'\n"
13738
" /**/ - Matches 0 or more directories in a path\n"
13739
" [a-z] - Matches a single character from within a group of characters"
13740
msgstr ""
13741
13742
#: en/help_topics/patterns.txt:22
13743
msgid ""
13744
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13745
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13746
"expression. Regular expression patterns may not include named or\n"
13747
"numbered groups."
13748
msgstr ""
13749
13750
#: en/help_topics/patterns.txt:27
13751
msgid ""
13752
"Case insensitive ignore patterns can be specified with regular expressions\n"
13753
"by using the ``i`` (for ignore case) flag in the pattern."
13754
msgstr ""
13755
13756
#: en/help_topics/patterns.txt:30
13757
msgid ""
13758
"For example, a case insensitive match for ``foo`` may be specified as::"
13759
msgstr ""
13760
13761
#: en/help_topics/patterns.txt:32
13762
msgid " RE:(?i)foo"
13763
msgstr ""
13764
13765
#: en/help_topics/patterns.txt:34
13766
msgid ""
13767
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13768
"matched by that pattern will not be ignored."
13769
msgstr ""
13770
13771
#: en/help_topics/patterns.txt:37
13772
msgid ""
13773
".. _Python regular expressions: http://docs.python.org/library/re.html"
13774
msgstr ""
13775
".. Expresiones regulares de _Python: http://docs.python.org/library/re.html"
13776
13777
#: en/help_topics/revisionspec.txt:1
13778
msgid "Revision Identifiers"
13779
msgstr "Identificadores de revisión"
13780
13781
#: en/help_topics/revisionspec.txt:3
13782
msgid ""
13783
"A revision identifier refers to a specific state of a branch's history. It\n"
13784
"can be expressed in several ways. It can begin with a keyword to\n"
13785
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13786
"'before:yesterday' and 'submit:'."
13787
msgstr ""
13788
13789
#: en/help_topics/revisionspec.txt:8
13790
msgid ""
13791
"Alternately, it can be given without a keyword, in which case it will be\n"
13792
"checked as a revision number, a tag, a revision id, a date specification, or "
13793
"a\n"
13794
"branch specification, in that order. For example, 'date:today' could be\n"
13795
"written as simply 'today', though if you have a tag called 'today' that "
13796
"will\n"
13797
"be found first."
13798
msgstr ""
13799
13800
#: en/help_topics/revisionspec.txt:14
13801
msgid ""
13802
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13803
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13804
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13805
"or\n"
13806
"spaces around the '..')."
13807
msgstr ""
13808
13809
#: en/help_topics/revisionspec.txt:19
13810
msgid ""
13811
"Ranges are interpreted differently by different commands. To the \"log\" "
13812
"command,\n"
13813
"a range is a sequence of log messages, but to the \"diff\" command, the "
13814
"range\n"
13815
"denotes a change between revisions (and not a sequence of changes). In\n"
13816
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13817
"consider it\n"
13818
"to be open-ended, that is, they include one end but not the other. For "
13819
"example:\n"
13820
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13821
"3649,\n"
13822
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13823
"and\n"
13824
"3649, but not 3647."
13825
msgstr ""
13826
13827
#: en/help_topics/revisionspec.txt:28
13828
msgid "The keywords used as revision selection methods are the following:"
13829
msgstr ""
13830
"Las palabras claves usadas como métodos de selección de revisión son las "
13831
"siguientes:"
13832
13833
#: en/help_topics/revisionspec.txt:30
13834
msgid ""
13835
":revid:\n"
13836
"\tSelects a revision using the revision id.\n"
13837
":submit:\n"
13838
"\tSelects a common ancestor with the submit branch.\n"
13839
":ancestor:\n"
13840
"\tSelects a common ancestor with a second branch.\n"
13841
":date:\n"
13842
"\tSelects a revision on the basis of a datestamp.\n"
13843
":branch:\n"
13844
"\tSelects the last revision of a specified branch.\n"
13845
":tag:\n"
13846
"\tSelects a revision identified by a tag name.\n"
13847
":revno:\n"
13848
"\tSelects a revision using a number.\n"
13849
":before:\n"
13850
"\tSelects the parent of the revision specified.\n"
13851
":annotate:\n"
13852
"\tSelect the revision that last modified the specified line.\n"
13853
":mainline:\n"
13854
"\tSelect mainline revision that merged the specified revision.\n"
13855
":last:\n"
13856
"\tSelects the nth revision from the end."
13857
msgstr ""
13858
13859
#: en/help_topics/revisionspec.txt:53
13860
msgid "In addition, plugins can provide other keywords."
13861
msgstr "Además, los complementos pueden proporcionar otras palabras clave."
13862
13863
#: en/help_topics/revisionspec.txt:55
13864
msgid "A detailed description of each keyword is given below."
13865
msgstr ""
13866
"A continuación se proporciona una detallada descripción de cada palabra "
13867
"clave."
13868
13869
#: en/help_topics/revisionspec.txt:57
13870
msgid ":revid:"
13871
msgstr ":revid:"
13872
13873
#: en/help_topics/revisionspec.txt:59
13874
msgid ""
13875
" Supply a specific revision id, that can be used to specify any\n"
13876
" revision id in the ancestry of the branch.\n"
13877
" Including merges, and pending merges.\n"
13878
" Examples::"
13879
msgstr ""
13880
13881
#: en/help_topics/revisionspec.txt:64
13882
msgid ""
13883
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13884
msgstr ""
13885
" revid:aaaa@bbbb-123456789 -> Selecciona la revisión «aaaa@bbbb-"
13886
"123456789»"
13887
13888
#: en/help_topics/revisionspec.txt:66
13889
msgid ":submit:"
13890
msgstr ":submit:"
13891
13892
#: en/help_topics/revisionspec.txt:68
13893
msgid ""
13894
" Diffing against this shows all the changes that were made in this "
13895
"branch,\n"
13896
" and is a good predictor of what merge will do. The submit branch is\n"
13897
" used by the bundle and merge directive commands. If no submit branch\n"
13898
" is specified, the parent branch is used instead."
13899
msgstr ""
13900
13901
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13902
msgid ""
13903
" The common ancestor is the last revision that existed in both\n"
13904
" branches. Usually this is the branch point, but it could also be\n"
13905
" a revision that was merged."
13906
msgstr ""
13907
13908
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13909
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13910
#: en/help_topics/revisionspec.txt:153
13911
msgid " Examples::"
13912
msgstr " Ejemplos::"
13913
13914
#: en/help_topics/revisionspec.txt:79
13915
msgid " $ bzr diff -r submit:"
13916
msgstr " $ bzr diff -r submit:"
13917
13918
#: en/help_topics/revisionspec.txt:81
13919
msgid ":ancestor:"
13920
msgstr ":ancestor:"
13921
13922
#: en/help_topics/revisionspec.txt:83
13923
msgid " Supply the path to a branch to select the common ancestor."
13924
msgstr ""
13925
13926
#: en/help_topics/revisionspec.txt:89
13927
msgid ""
13928
" This is frequently used with 'diff' to return all of the changes\n"
13929
" that your branch introduces, while excluding the changes that you\n"
13930
" have not merged from the remote branch."
13931
msgstr ""
13932
13933
#: en/help_topics/revisionspec.txt:95
13934
msgid ""
13935
" ancestor:/path/to/branch\n"
13936
" $ bzr diff -r ancestor:../../mainline/branch"
13937
msgstr ""
13938
13939
#: en/help_topics/revisionspec.txt:98
13940
msgid ":date:"
13941
msgstr ":date:"
13942
13943
#: en/help_topics/revisionspec.txt:100
13944
msgid ""
13945
" Supply a datestamp to select the first revision that matches the date.\n"
13946
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13947
" Matches the first entry after a given date (either at midnight or\n"
13948
" at a specified time)."
13949
msgstr ""
13950
13951
#: en/help_topics/revisionspec.txt:105
13952
msgid " One way to display all the changes since yesterday would be::"
13953
msgstr ""
13954
13955
#: en/help_topics/revisionspec.txt:107
13956
msgid " bzr log -r date:yesterday.."
13957
msgstr ""
13958
13959
#: en/help_topics/revisionspec.txt:111
13960
msgid ""
13961
" date:yesterday -> select the first revision since "
13962
"yesterday\n"
13963
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13964
" August 14th, 2006 at 5:10pm."
13965
msgstr ""
13966
13967
#: en/help_topics/revisionspec.txt:115
13968
msgid ":branch:"
13969
msgstr ":branch:"
13970
13971
#: en/help_topics/revisionspec.txt:117
13972
msgid " Supply the path to a branch to select its last revision."
13973
msgstr ""
13974
" Suministra la ruta a una rama para seleccionar su última revisión."
13975
13976
#: en/help_topics/revisionspec.txt:121
13977
msgid " branch:/path/to/branch"
13978
msgstr " branch:/ruta/a/rama"
13979
13980
#: en/help_topics/revisionspec.txt:123
13981
msgid ":tag:"
13982
msgstr ":tag:"
13983
13984
#: en/help_topics/revisionspec.txt:125
13985
msgid " Tags are stored in the branch and created by the 'tag' command."
13986
msgstr ""
13987
13988
#: en/help_topics/revisionspec.txt:127
13989
msgid ":revno:"
13990
msgstr ":revno:"
13991
13992
#: en/help_topics/revisionspec.txt:129
13993
msgid ""
13994
" Use an integer to specify a revision in the history of the branch.\n"
13995
" Optionally a branch can be specified. A negative number will count\n"
13996
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13997
" one). If the negative number is larger than the branch's history, the\n"
13998
" first revision is returned.\n"
13999
" Examples::"
14000
msgstr ""
14001
14002
#: en/help_topics/revisionspec.txt:136
14003
msgid ""
14004
" revno:1 -> return the first revision of this branch\n"
14005
" revno:3:/path/to/branch -> return the 3rd revision of\n"
14006
" the branch '/path/to/branch'\n"
14007
" revno:-1 -> The last revision in a branch.\n"
14008
" -2:http://other/branch -> The second to last revision in the\n"
14009
" remote branch.\n"
14010
" -1000000 -> Most likely the first revision, unless\n"
14011
" your history is very long."
14012
msgstr ""
14013
14014
#: en/help_topics/revisionspec.txt:145
14015
msgid ":before:"
14016
msgstr ":before:"
14017
14018
#: en/help_topics/revisionspec.txt:147
14019
msgid ""
14020
" Supply any revision spec to return the parent of that revision. This "
14021
"is\n"
14022
" mostly useful when inspecting revisions that are not in the revision "
14023
"history\n"
14024
" of a branch."
14025
msgstr ""
14026
14027
#: en/help_topics/revisionspec.txt:151
14028
msgid ""
14029
" It is an error to request the parent of the null revision (before:0)."
14030
msgstr ""
14031
14032
#: en/help_topics/revisionspec.txt:155
14033
msgid ""
14034
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
14035
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
14036
" aaaa@bbbb-1234567890\n"
14037
" bzr diff -r before:1913..1913\n"
14038
" -> Find the changes between revision 1913 and its parent "
14039
"(1912).\n"
14040
" (What changes did revision 1913 introduce).\n"
14041
" This is equivalent to: bzr diff -c 1913"
14042
msgstr ""
14043
14044
#: en/help_topics/revisionspec.txt:163
14045
msgid ":annotate:"
14046
msgstr ":annotate:"
14047
14048
#: en/help_topics/revisionspec.txt:165
14049
msgid ""
14050
" Select the revision that last modified the specified line. Line is\n"
14051
" specified as path:number. Path is a relative path to the file. "
14052
"Numbers\n"
14053
" start at 1, and are relative to the current version, not the last-\n"
14054
" committed version of the file."
14055
msgstr ""
14056
14057
#: en/help_topics/revisionspec.txt:170
14058
msgid ":mainline:"
14059
msgstr ":mainline:"
14060
14061
#: en/help_topics/revisionspec.txt:172
14062
msgid ""
14063
" Select the revision that merged the specified revision into mainline."
14064
msgstr ""
14065
14066
#: en/help_topics/revisionspec.txt:174
14067
msgid ":last:"
14068
msgstr ":last:"
14069
14070
#: en/help_topics/revisionspec.txt:176
14071
msgid ""
14072
" Supply a positive number to get the nth revision from the end.\n"
14073
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
14074
" Examples::"
14075
msgstr ""
14076
14077
#: en/help_topics/revisionspec.txt:180
14078
msgid ""
14079
" last:1 -> return the last revision\n"
14080
" last:3 -> return the revision 2 before the end.\n"
14081
msgstr ""
14082
" last:1 -> devuelve la última revisión\n"
14083
" last:3 -> devuelve la revisión 2 antes del final.\n"
14084
14085
#: en/help_topics/rules.txt:1
14086
msgid ""
14087
"Rules\n"
14088
"====="
14089
msgstr ""
14090
"Reglas\n"
14091
"======"
14092
14093
#: en/help_topics/rules.txt:7
14094
msgid ""
14095
"Rules are defined in ini file format where the sections are file glob\n"
14096
"patterns and the contents of each section are the preferences for files\n"
14097
"matching that pattern(s). For example::"
14098
msgstr ""
14099
14100
#: en/help_topics/rules.txt:11
14101
msgid ""
14102
" [name *.bat]\n"
14103
" eol = native"
14104
msgstr ""
14105
14106
#: en/help_topics/rules.txt:14
14107
msgid ""
14108
" [name *.html *.xml]\n"
14109
" keywords = xml_escape"
14110
msgstr ""
14111
" [name *.html *.xml]\n"
14112
" keywords = xml_escape"
14113
14114
#: en/help_topics/rules.txt:17
14115
msgid ""
14116
"Preferences like these are useful for commands and plugins wishing to\n"
14117
"provide custom behaviour for selected files. For more information on \n"
14118
"end of line conversion see :doc:`eol-help`.\n"
14119
"Keyword support is provided by the `keywords plugin\n"
14120
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
14121
msgstr ""
14122
14123
#: en/help_topics/rules.txt:23
14124
msgid ""
14125
"Files\n"
14126
"-----"
14127
msgstr ""
14128
"Archivos\n"
14129
"--------"
14130
14131
#: en/help_topics/rules.txt:26
14132
msgid ""
14133
"Default rules for all branches are defined in the optional file\n"
14134
"``BZR_HOME/rules``. "
14135
msgstr ""
14136
14137
#: en/help_topics/rules.txt:29
14138
msgid ""
14139
"Rule Patterns\n"
14140
"-------------"
14141
msgstr ""
14142
"Patrones de regla\n"
14143
"----------------------------"
14144
14145
#: en/help_topics/rules.txt:32
14146
msgid ""
14147
"Patterns are ordered and searching stops as soon as one matches.\n"
14148
"As a consequence, more explicit patterns should be placed towards\n"
14149
"the top of the file. Rule patterns use exactly the same conventions\n"
14150
"as ignore patterns. See :doc:`patterns-help` for details."
14151
msgstr ""
14152
14153
#: en/help_topics/rules.txt:37
14154
msgid ".. note::"
14155
msgstr ".. nota::"
14156
14157
#: en/help_topics/rules.txt:39
14158
msgid ""
14159
" Patterns containing square brackets or spaces should be\n"
14160
" surrounded in quotes to ensure they are correctly parsed.\n"
14161
msgstr ""
14162
14163
#: en/help_topics/topics.txt:1
14164
msgid ""
14165
"authentication Information on configuring authentication\n"
14166
"basic Basic commands\n"
14167
"branches Information on what a branch is\n"
14168
"bugs Bug tracker settings\n"
14169
"checkouts Information on what a checkout is\n"
14170
"commands Basic help for all commands\n"
14171
"configuration Details on the configuration settings available\n"
14172
"conflict-types Types of conflicts and what to do about them\n"
14173
"content-filters Conversion of content into/from working trees\n"
14174
"criss-cross Information on criss-cross merging\n"
14175
"current-formats Current storage formats\n"
14176
"debug-flags Options to show or record debug information\n"
14177
"diverged-branches How to fix diverged branches\n"
14178
"env-variables Environment variable names and values\n"
14179
"eol Information on end-of-line handling\n"
14180
"files Information on configuration and log files\n"
14181
"formats Information on choosing a storage format\n"
14182
"global-options Options that control how Bazaar runs\n"
14183
"hidden-commands All hidden commands\n"
14184
"hooks Points at which custom processing can be added\n"
14185
"launchpad Using Bazaar with Launchpad.net\n"
14186
"location-alias Aliases for remembered locations\n"
14187
"log-formats Details on the logging formats available\n"
14188
"other-formats Experimental and deprecated storage formats\n"
14189
"patterns Information on the pattern syntax\n"
14190
"repositories Basic information on shared repositories.\n"
14191
"revisionspec Explain how to use --revision\n"
14192
"rules Information on defining rule-based preferences\n"
14193
"standalone-trees Information on what a standalone tree is\n"
14194
"standard-options Options that can be used with any command\n"
14195
"status-flags Help on status flags\n"
14196
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
14197
"topics Topics list\n"
14198
"url-special-chars Special character handling in URLs\n"
14199
"urlspec Supported transport protocols\n"
14200
"working-trees Information on working trees\n"
14201
msgstr ""
14202
14203
#: en/help_topics/url-special-chars.txt:1
14204
msgid ""
14205
"Special character handling in URLs\n"
14206
"=================================="
14207
msgstr ""
14208
"Manejo de caracteres especiales en las URL\n"
14209
"=================================="
14210
14211
#: en/help_topics/url-special-chars.txt:4
14212
msgid "Bazaar allows locations to be specified in multiple ways, either:"
14213
msgstr ""
14214
"Bazar permite ubicaciones que se especifican en múltiples formas, ya sea:"
14215
14216
#: en/help_topics/url-special-chars.txt:6
14217
msgid " * Fully qualified URLs"
14218
msgstr " * URL altamente calificados"
14219
14220
#: en/help_topics/url-special-chars.txt:8
14221
msgid " * File system paths, relative or absolute"
14222
msgstr " * Rutas de sistemas de archivo, relativas o absolutas"
14223
14224
#: en/help_topics/url-special-chars.txt:10
14225
msgid ""
14226
"Internally bzr treats all locations as URLs. For any file system paths\n"
14227
"that are specified it will automatically determine the appropriate URL\n"
14228
"representation, and escape special characters where necessary."
14229
msgstr ""
14230
14231
#: en/help_topics/url-special-chars.txt:14
14232
msgid ""
14233
"There are a few characters which have special meaning in URLs and need "
14234
"careful\n"
14235
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
14236
"value in URLs. Any non-ASCII characters in a file path will automatically "
14237
"be\n"
14238
"urlencoded when the path is converted to a URL."
14239
msgstr ""
14240
14241
#: en/help_topics/url-special-chars.txt:19
14242
msgid ""
14243
"URLs represent non-ASCII characters in an encoding defined by the server, "
14244
"but\n"
14245
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
14246
"be\n"
14247
"generous in what it accepts as a URL and to print them in a way that\n"
14248
"will be readable."
14249
msgstr ""
14250
14251
#: en/help_topics/url-special-chars.txt:24
14252
msgid ""
14253
"For example, if you have a directory named '/tmp/%2False' these are all "
14254
"valid\n"
14255
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
14256
"slash)::"
14257
msgstr ""
14258
"Por ejemplo, si tiene un directorio llamado «/tmp/%2False» todas estas "
14259
"maneras son\n"
14260
"válidas para acceder al contenido (0x2F, o 47, es el código ASCII de la "
14261
"barra diagonal)::"
14262
14263
#: en/help_topics/url-special-chars.txt:27
14264
msgid ""
14265
" cd /tmp\n"
14266
" bzr log /tmp/%2False\n"
14267
" bzr log %2False\n"
14268
" bzr log file:///tmp/%252False\n"
14269
" bzr log file://localhost/tmp/%252False\n"
14270
" bzr log file:%252False"
14271
msgstr ""
14272
" cd /tmp\n"
14273
" bzr log /tmp/%2False\n"
14274
" bzr log %2False\n"
14275
" bzr log file:///tmp/%252False\n"
14276
" bzr log file://localhost/tmp/%252False\n"
14277
" bzr log file:%252False"
14278
14279
#: en/help_topics/url-special-chars.txt:34
14280
msgid "These are valid but do not refer to the same file::"
14281
msgstr "Estas son válidas pero no se refieren al mismo archivo::"
14282
14283
#: en/help_topics/url-special-chars.txt:36
14284
msgid ""
14285
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
14286
" bzr log %252False (refers to a file called /tmp/%252False)"
14287
msgstr ""
14288
" bzr log file:///tmp/%2Falso (se refiere al archivo llamado /tmp/\\/also)\n"
14289
" bzr log %252Falso (se refiere al archivo llamado /tmp/%252Falso)"
14290
14291
#: en/help_topics/url-special-chars.txt:39
14292
msgid ""
14293
"Comma also has special meaning in URLs, because it denotes `segment "
14294
"parameters`_"
14295
msgstr ""
14296
"La coma también tiene un significado especial en las URL, porque denota "
14297
"«parámetros de segmento»_"
14298
14299
#: en/help_topics/url-special-chars.txt:41
14300
msgid ""
14301
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
14302
msgstr ""
14303
"_ «parámetros de segmento»: http://www.ietf.org/rfc/rfc3986.txt (sección 3.3)"
14304
14305
#: en/help_topics/url-special-chars.txt:43
14306
msgid ""
14307
"Comma is also special in any file system paths that are specified. To use a "
14308
"literal\n"
14309
"comma in a file system path, specify a URL and URL encode the comma::"
14310
msgstr ""
14311
"La coma también es especial en todas las rutas de archivos de sistema que se "
14312
"especifican. Para utilizar una coma\n"
14313
"literal en una ruta de archivos de sistema, especifique un URL y codifique "
14314
"la coma en el URL::"
14315
14316
#: en/help_topics/url-special-chars.txt:46
14317
msgid ""
14318
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
14319
"\"branch\" set to \"bla\"\n"
14320
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
14321
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
14322
"\"branch\" set to \"bla\"\n"
14323
msgstr ""
14324
14325
#: en/help_topics/urlspec.txt:1
14326
msgid "URL Identifiers"
14327
msgstr "Identificadores de URL"
14328
14329
#: en/help_topics/urlspec.txt:3
14330
msgid "Supported URL prefixes::"
14331
msgstr "Prefijos de URL permitidos:"
14332
14333
#: en/help_topics/urlspec.txt:5
14334
msgid ""
14335
" aftp:// Access using active FTP.\n"
14336
" bzr:// Fast access using the Bazaar smart server.\n"
14337
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
14338
" file:// Access using the standard filesystem (default)\n"
14339
" ftp:// Access using passive FTP.\n"
14340
" http:// Read-only access of branches exported on the web.\n"
14341
" https:// Read-only access of branches exported on the web using "
14342
"SSL.\n"
14343
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
14344
msgstr ""
14345
14346
#: en/help_topics/urlspec.txt:14
14347
msgid "Supported modifiers::"
14348
msgstr "Modificadores permitidos:"
14349
14350
#: en/help_topics/urlspec.txt:16
14351
msgid " gio+ Access using any GIO supported protocols."
14352
msgstr " gio + Access utilizando cualquier protocolo GIO compatible."
14353
14354
#: en/help_topics/urlspec.txt:18
14355
msgid "Bazaar supports all of the standard parts within the URL::"
14356
msgstr "Bazaar permite todas las partes estándar con el URL::"
14357
14358
#: en/help_topics/urlspec.txt:20
14359
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
14360
msgstr " <protocolo>://[usuario[:contraseña]@]anfitrión[:puerto]/[ruta]"
14361
14362
#: en/help_topics/urlspec.txt:22
14363
msgid "allowing URLs such as::"
14364
msgstr "permitir URL tales como:"
14365
14366
#: en/help_topics/urlspec.txt:24
14367
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
14368
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
14369
14370
#: en/help_topics/urlspec.txt:26
14371
msgid ""
14372
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
14373
"with '~' as meaning that the rest of the path should be interpreted\n"
14374
"relative to the remote user's home directory. For example if the user\n"
14375
"``remote`` has a home directory of ``/home/remote`` on the server\n"
14376
"shell.example.com, then::"
14377
msgstr ""
14378
14379
#: en/help_topics/urlspec.txt:32
14380
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
14381
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
14382
14383
#: en/help_topics/urlspec.txt:34
14384
msgid "would refer to ``/home/remote/myproject/trunk``."
14385
msgstr "re refieren a «/home/remote/myproject/trunk»."
14386
14387
#: en/help_topics/urlspec.txt:36
14388
msgid ""
14389
"Many commands that accept URLs also accept location aliases too.\n"
14390
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
14391
msgstr ""
14392
"Muchas órdenes que aceptan URL también aceptan alias de ubicaciones.\n"
14393
"Vea :doc:`location-alias-help` y :doc:`url-special-chars-help`.\n"
14394
14395
#~ msgid "Unknown mail client: %(mail_client)s"
14396
#~ msgstr "Correo de cliente desconocido: %(mail_client)s"
14397
14398
#~ msgid ""
14399
#~ "set_rh\n"
14400
#~ "~~~~~~"
14401
#~ msgstr ""
14402
#~ "set_rh\n"
14403
#~ "~~~~~~"
14404
14405
#~ msgid "Revert files to a previous revision."
14406
#~ msgstr "Revierte los archivos a la revisión previa."
14407
14408
#~ msgid ""
14409
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
14410
#~ "delete them if they can easily be recovered using revert otherwise they\n"
14411
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
14412
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
14413
#~ "Bazaar but missing in your tree and stop tracking them for you."
14414
#~ msgstr ""
14415
#~ "Esto hace que Bazaar deje de revisar los cambios en los archivos "
14416
#~ "especificados.\n"
14417
#~ "Bazaar los borrará si estos pueden ser fácilmente recuperados usando "
14418
#~ "revertir\n"
14419
#~ "de otra manera se hará una copia (agregando la extensión .~#~). Si no se dan "
14420
#~ "\n"
14421
#~ "parámetros u opciones, Bazaar revisará los archivos que están siendo "
14422
#~ "revisados\n"
14423
#~ "por Bazaar pero que no están en su árbol y dejará de revisarlos para usted."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1