« back to all changes in this revision
Viewing changes to po/es.po
- browse files at revision 6091.1.5
- compare with another revision
- download diff
- download tarball
- view history from revision 6091.1.5
- Committer: Jelmer Vernooij
- Date: 2011-08-22 10:53:21 UTC
- mto: This revision was merged to the branch mainline in revision 6094.
- Revision ID: jelmer@samba.org-20110822105321-bxzxabfs6pl7lc43
Remove tags pointed at by uncommitted revisions.
- files added:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files renamed:
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/bzr_distutils.py => tools/build_mo.py
- files modified:
- Makefile
added
removed
po/es.po
1
# Spanish translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Spanish <es@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "omitiendo {0} (mayor que {1} de {2} bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Desapilando"
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Subido a la revisión %d."
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d etiqueta actualizada"
39
msgstr[1] "%d etiquetas actualizadas"
40
41
#: bzrlib/branch.py:3210
42
msgid "No new revisions or tags to push."
43
msgstr "No hay revisiones o etiquetas para subir."
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr "No hay revisiones para subir."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr "rama comprobada {0} formato {1}"
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "error encontrado: %s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorando archivos fuera de la vista. La vista es %s"
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr "Mostrar resumen de estado."
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
78
"agrupados por estado. Los estados posibles son:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"añadido\n"
86
" Versionado en la copia de trabajo pero no en la revisión anterior."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"eliminado\n"
95
" Versionado en la revisión anterior pero borrado o eliminado\n"
96
" en la copia de trabajo."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renombrado\n"
106
" La ruta de este archivo ha cambiado desde una revisión anterior;\n"
107
" el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
108
" directorio padre ha sido renombrado."
109
110
#: bzrlib/builtins.py:320
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modificado\n"
116
" El texto ha cambiado desde una revisión previa."
117
118
#: bzrlib/builtins.py:323
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"tipo cambiado\n"
124
" El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
125
126
#: bzrlib/builtins.py:326
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"desconocido\n"
132
" Ni se ha versionado ni se ha encontrado un patrón ignorado."
133
134
#: bzrlib/builtins.py:329
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Adicionalmente para directorios, vínculos simbólicos y archivos con el bit "
142
"de\n"
143
"ejecutable cambiado, Bazaar indica su tipo usando un carácter \n"
144
"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
145
"desactivadas usando la opción «--no-classify»."
146
147
#: bzrlib/builtins.py:334
148
msgid ""
149
"To see ignored files use 'bzr ignored'. For details on the\n"
150
"changes to file texts, use 'bzr diff'."
151
msgstr ""
152
"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
153
"cambios de textos en los archivos, use «bzr diff»."
154
155
#: bzrlib/builtins.py:337
156
msgid ""
157
"Note that --short or -S gives status flags for each item, similar\n"
158
"to Subversion's status command. To get output similar to svn -q,\n"
159
"use bzr status -SV."
160
msgstr ""
161
"Note que --short o -S devuelve indicadores de estado para cada elemento, de "
162
"forma\n"
163
"similar a la orden status de Subversion. Para obtener una salida similar a "
164
"svn -q\n"
165
" use bzr status -SV."
166
167
#: bzrlib/builtins.py:341
168
msgid ""
169
"If no arguments are specified, the status of the entire working\n"
170
"directory is shown. Otherwise, only the status of the specified\n"
171
"files or directories is reported. If a directory is given, status\n"
172
"is reported for everything inside that directory."
173
msgstr ""
174
"Si no se indican argumentos, se muestra el estado del directorio de\n"
175
"trabajo completo. De otra forma, solo se informa del estado de los\n"
176
"archivos o directorios indicados. Si se proporciona un directorio, se\n"
177
"informa del estado de todo lo contenido en ese directorio."
178
179
#: bzrlib/builtins.py:346
180
msgid ""
181
"Before merges are committed, the pending merge tip revisions are\n"
182
"shown. To see all pending merge revisions, use the -v option.\n"
183
"To skip the display of pending merge information altogether, use\n"
184
"the no-pending option or specify a file/directory."
185
msgstr ""
186
"Antes de que se confirmen las fusiones, se muestran las sugerencias de\n"
187
"fusión de las revisiones. Para ver todas las fusiones pendientes, use la "
188
"opción -v.\n"
189
"Para evitar que se muestre la información de fusiones pendientes del todo, "
190
"use\n"
191
"la opción no-pending o indique un archivo/directorio."
192
193
#: bzrlib/builtins.py:351
194
msgid ""
195
"To compare the working directory to a specific revision, pass a\n"
196
"single revision to the revision argument."
197
msgstr ""
198
"Para comparar el directorio de trabajo con una revisión concreta, pase una\n"
199
"única revisión como argumento a la revisión."
200
201
#: bzrlib/builtins.py:354
202
msgid ""
203
"To see which files have changed in a specific revision, or between\n"
204
"two revisions, pass a revision range to the revision argument.\n"
205
"This will produce the same results as calling 'bzr diff --summarize'."
206
msgstr ""
207
"Para ver que archivos han cambiado en una revisión concreta, o entre\n"
208
"dos revisiones, pase un rango de revisiones al argumento de la revisión.\n"
209
"Esto producirá los mismos resultados que llamar «bzr diff --summarize»."
210
211
#: bzrlib/builtins.py:363
212
msgid "Use short status indicators."
213
msgstr "Usar indicadores de estado cortos."
214
215
#: bzrlib/builtins.py:365
216
msgid "Only show versioned files."
217
msgstr "Solo mostrar archivos versionados."
218
219
#: bzrlib/builtins.py:367
220
msgid "Don't show pending merges."
221
msgstr "No mostrar fusiones pendientes."
222
223
#: bzrlib/builtins.py:370
224
msgid "Do not mark object type using indicator."
225
msgstr "No marcar tipo de objeto usando indicador."
226
227
#: bzrlib/builtins.py:385
228
msgid "bzr status --revision takes exactly one or two revision specifiers"
229
msgstr ""
230
"bzr status --revision toma exactamente uno o dos especificadores de revisión"
231
232
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
233
msgid "You can only supply one of revision_id or --revision"
234
msgstr "Puede suiministrar solo uno revision_id o --revision"
235
236
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
237
msgid "You must supply either --revision or a revision_id"
238
msgstr "Puede suiministrar ambos revision_id o --revision"
239
240
#: bzrlib/builtins.py:439
241
#, python-format
242
msgid "Repository %r does not support access to raw revision texts"
243
msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
244
245
#: bzrlib/builtins.py:450
246
msgid "The repository {0} contains no revision {1}."
247
msgstr "El repositorio {0} no contiene revisión {1}."
248
249
#: bzrlib/builtins.py:457
250
msgid "You cannot specify a NULL revision."
251
msgstr "No puede especificar una revisión NULL."
252
253
#: bzrlib/builtins.py:549
254
msgid "Remove the working tree from a given branch/checkout."
255
msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
256
257
#: bzrlib/builtins.py:551
258
msgid ""
259
"Since a lightweight checkout is little more than a working tree\n"
260
"this will refuse to run against one."
261
msgstr ""
262
"Dado que una extracción ligera es poco más que un árbol de trabajo\n"
263
"esto impedirá que se ejecute contra una."
264
265
#: bzrlib/builtins.py:554
266
msgid "To re-create the working tree, use \"bzr checkout\"."
267
msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
268
269
#: bzrlib/builtins.py:560
270
msgid ""
271
"Remove the working tree even if it has uncommitted or shelved changes."
272
msgstr ""
273
"Eliminar el árbol de trabajo incluso si tiene cambios no confirmados o "
274
"archivados."
275
276
#: bzrlib/builtins.py:574
277
msgid "No working tree to remove"
278
msgstr "No existe un árbol de trabajo para eliminar"
279
280
#: bzrlib/builtins.py:576
281
msgid "You cannot remove the working tree of a remote path"
282
msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
283
284
#: bzrlib/builtins.py:585
285
msgid "You cannot remove the working tree from a lightweight checkout"
286
msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
287
288
#: bzrlib/builtins.py:625
289
msgid ""
290
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
291
"instead. Use \"--force\" if you are sure you want to reset the working tree."
292
msgstr ""
293
"El árbol no parece estar corrupto. Probablemente quiera «bzr revert» en su "
294
"lugar. Use «--force» si está seguro de que quiere reiniciar el árbol de "
295
"trabajo."
296
297
#: bzrlib/builtins.py:636
298
msgid ""
299
", the header appears corrupt, try passing -r -1 to set the state to the last "
300
"commit"
301
msgstr ""
302
", la cabecera parece corrupta, intente pasando -r -1 para establecer el "
303
"estado del último envío"
304
305
#: bzrlib/builtins.py:640
306
msgid "failed to reset the tree state{0}"
307
msgstr "fallo al restablecer el estado{0} del árbol"
308
309
#: bzrlib/builtins.py:644
310
msgid "Show current revision number."
311
msgstr "Mostrar número de revisión actual."
312
313
#: bzrlib/builtins.py:646
314
msgid "This is equal to the number of revisions on this branch."
315
msgstr "Esto es igual al número de revisiones en esta rama."
316
317
#: bzrlib/builtins.py:659
318
msgid "--tree and --revision can not be used together"
319
msgstr "--tree y --revision no se pueden usar juntos"
320
321
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
322
msgid "Tags can only be placed on a single revision, not on a range"
323
msgstr ""
324
"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
325
326
#: bzrlib/builtins.py:700
327
msgid "Show revno of working tree."
328
msgstr "Mostrar número de revisión del árbol de trabajo."
329
330
#: bzrlib/builtins.py:748
331
msgid "Add specified files or directories."
332
msgstr "Añadir archivos especificados o directorios."
333
334
#: bzrlib/builtins.py:750
335
msgid ""
336
"In non-recursive mode, all the named items are added, regardless\n"
337
"of whether they were previously ignored. A warning is given if\n"
338
"any of the named files are already versioned."
339
msgstr ""
340
"En el modo no recursivo, todos los puntos mencionados se añaden, \n"
341
"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
342
"cualquiera de los archivos nombrados ya está versionado."
343
344
#: bzrlib/builtins.py:754
345
msgid ""
346
"In recursive mode (the default), files are treated the same way\n"
347
"but the behaviour for directories is different. Directories that\n"
348
"are already versioned do not give a warning. All directories,\n"
349
"whether already versioned or not, are searched for files or\n"
350
"subdirectories that are neither versioned or ignored, and these\n"
351
"are added. This search proceeds recursively into versioned\n"
352
"directories. If no names are given '.' is assumed."
353
msgstr ""
354
"En modo recursivo (predeterminado), los archivos se tratan de la misma "
355
"manera\n"
356
"pero el comportamiento para directorios es diferente. Los directorios que\n"
357
"ya han sido versionados no generan un aviso. Todos los directorios,\n"
358
"hayan sido versionados o no, son recorridos buscando archivos o\n"
359
"subdirectorios que no hayan sido versionados o ignorados, y estos\n"
360
"son añadidos. Esta búsqueda procede recursivamente por los directorios\n"
361
"versionados. SI no se indican nombres se asume «.»."
362
363
#: bzrlib/builtins.py:762
364
msgid ""
365
"A warning will be printed when nested trees are encountered,\n"
366
"unless they are explicitly ignored."
367
msgstr ""
368
369
#: bzrlib/builtins.py:765
370
msgid ""
371
"Therefore simply saying 'bzr add' will version all files that\n"
372
"are currently unknown."
373
msgstr ""
374
"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
375
"desconocidos actualmente."
376
377
#: bzrlib/builtins.py:768
378
msgid ""
379
"Adding a file whose parent directory is not versioned will\n"
380
"implicitly add the parent, and so on up to the root. This means\n"
381
"you should never need to explicitly add a directory, they'll just\n"
382
"get added when you add a file in the directory."
383
msgstr ""
384
"Al añadir un archivos cuyo padre no esté versionado añadirá\n"
385
"implícitamente al padre, y así sucesivamente hasta la raíz. Esto\n"
386
"significa que nunca necesitaría añadir explícitamente un directorio,\n"
387
"ya que serán añadidos cuando añada un archivo del directorio."
388
389
#: bzrlib/builtins.py:773
390
msgid ""
391
"--dry-run will show which files would be added, but not actually\n"
392
"add them."
393
msgstr ""
394
"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
395
"añade realmente."
396
397
#: bzrlib/builtins.py:776
398
msgid ""
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
"It looks up ids trying to find a matching parent directory with the\n"
401
"same filename, and then by pure path. This option is rarely needed\n"
402
"but can be useful when adding the same logical file into two\n"
403
"branches that will be merged later (without showing the two different\n"
404
"adds as a conflict). It is also useful when merging another project\n"
405
"into a subdirectory of this one."
406
msgstr ""
407
"--file-ids-from intentará usar el archivo de ids de la ruta proporcionada.\n"
408
"Busca ids intentado encontrar un directorio padre que coincida con el\n"
409
"mismo nombre de archivo, y luego por ruta pura. Esta opción raramente\n"
410
"se necesita pero puede ser útil al añadir el mismo archivo lógico en dos\n"
411
"ramas que se fusionarán posteriormente (sin mostrar las dos adiciones\n"
412
"diferentes como un conflicto). También es útil al fusionar otro proyecto\n"
413
"en un subdirectorio de éste."
414
415
#: bzrlib/builtins.py:784
416
msgid ""
417
"Any files matching patterns in the ignore list will not be added\n"
418
"unless they are explicitly mentioned."
419
msgstr ""
420
"Cualquier archivo que coincida con los patrones en la lista de ignorados no "
421
"se añadirá\n"
422
"salvo que se mencione explícitamente."
423
424
#: bzrlib/builtins.py:787
425
msgid ""
426
"In recursive mode, files larger than the configuration option \n"
427
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
428
"to file size."
429
msgstr ""
430
"En modo recursivo, los archivos mayores que la opción de configuración \n"
431
"add.maximum_file_size se omitirán. Los elementos nombrados nunca se "
432
"omitirán\n"
433
"por su tamaño."
434
435
#: bzrlib/builtins.py:794
436
msgid "Don't recursively add the contents of directories."
437
msgstr "No añade de manera recursiva los contenidos de los directorios."
438
439
#: bzrlib/builtins.py:800
440
msgid "Lookup file ids from this tree."
441
msgstr "Buscar id de archivos desde este árbol."
442
443
#: bzrlib/builtins.py:836
444
msgid "ignored {0} matching \"{1}\"\n"
445
msgstr "ignorado {0} coincidente «{1}»\n"
446
447
#: bzrlib/builtins.py:841
448
msgid "Create a new versioned directory."
449
msgstr "Crear un directorio versionado nuevo."
450
451
#: bzrlib/builtins.py:843
452
msgid "This is equivalent to creating the directory and then adding it."
453
msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
454
455
#: bzrlib/builtins.py:850
456
msgid "No error if existing, make parent directories as needed."
457
msgstr ""
458
459
#: bzrlib/builtins.py:884
460
#, python-format
461
msgid "added %s\n"
462
msgstr "añadido %s\n"
463
464
#: bzrlib/builtins.py:926
465
#, python-format
466
msgid "invalid kind %r specified"
467
msgstr "tipo inválido %r especificado"
468
469
#: bzrlib/builtins.py:963
470
msgid "Move or rename a file."
471
msgstr "Mover o renombrar un archivo."
472
473
#: bzrlib/builtins.py:965
474
msgid " bzr mv SOURCE... DESTINATION"
475
msgstr " bzr mv ORIGEN... DESTINO"
476
477
#: bzrlib/builtins.py:967
478
msgid ""
479
"If the last argument is a versioned directory, all the other names\n"
480
"are moved into it. Otherwise, there must be exactly two arguments\n"
481
"and the file is changed to a new name."
482
msgstr ""
483
"Si el último argumento es un directorio versionado, todos los demás nombres\n"
484
"se moverán a él. De otra forma, deben haber exactamente dos argumentos\n"
485
"y el archivo se cambia al nuevo nombre."
486
487
#: bzrlib/builtins.py:971
488
msgid ""
489
"If OLDNAME does not exist on the filesystem but is versioned and\n"
490
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
491
"assumes that the file has been manually moved and only updates\n"
492
"its internal inventory to reflect that change.\n"
493
"The same is valid when moving many SOURCE files to a DESTINATION."
494
msgstr ""
495
"Si NOMBREANTIGUO no existe en el sistema de archivos pero esta versionado y\n"
496
"NOMBRENUEVO existe en el sistema de archivos pero no está versionado, mv\n"
497
"asume que el archivo se ha movido manualmente y sólo actualiza su\n"
498
"inventario interno para reflejar ese cambio.\n"
499
"Lo mismo es válido cuando se mueven muchos archivos ORIGEN a un DESTINO."
500
501
#: bzrlib/builtins.py:977
502
msgid "Files cannot be moved between branches."
503
msgstr "Los archivos no se pueden mover entre ramas."
504
505
#: bzrlib/builtins.py:984
506
msgid ""
507
"Move only the bzr identifier of the file, because the file has already been "
508
"moved."
509
msgstr ""
510
"Mover solo el identificador bzr del archivo, porque el archivo ya ha sido "
511
"movido."
512
513
#: bzrlib/builtins.py:986
514
msgid "Automatically guess renames."
515
msgstr "Adivinar automáticamente rel renombrado."
516
517
#: bzrlib/builtins.py:987
518
msgid "Avoid making changes when guessing renames."
519
msgstr "Evitar hacer cambios cunado se adivina el renombrado."
520
521
#: bzrlib/builtins.py:996
522
msgid "--dry-run requires --auto."
523
msgstr "--dry-run requiere --auto."
524
525
#: bzrlib/builtins.py:1000
526
msgid "missing file argument"
527
msgstr "falta el argumento de archivo"
528
529
#: bzrlib/builtins.py:1004
530
msgid "can not move root of branch"
531
msgstr "no se puede mover la raíz de la rama"
532
533
#: bzrlib/builtins.py:1010
534
msgid "Only one path may be specified to --auto."
535
msgstr "Solo se puede especificar una ruta a --auto"
536
537
#: bzrlib/builtins.py:1013
538
msgid "--after cannot be specified with --auto."
539
msgstr "--after no se puede especificar con --auto."
540
541
#: bzrlib/builtins.py:1050
542
msgid "to mv multiple files the destination must be a versioned directory"
543
msgstr ""
544
"para hacer mv a múltiples archivos el destino debe ser un directorio "
545
"versionado"
546
547
#: bzrlib/builtins.py:1102
548
msgid "Turn this branch into a mirror of another branch."
549
msgstr "Cambiar esta rama a una réplica de otra rama."
550
551
#: bzrlib/builtins.py:1104
552
msgid ""
553
"By default, this command only works on branches that have not diverged.\n"
554
"Branches are considered diverged if the destination branch's most recent \n"
555
"commit is one that has not been merged (directly or indirectly) into the \n"
556
"parent."
557
msgstr ""
558
"Predeterminado, esta orden solo funciona en ramas que no han divergido.\n"
559
"Las ramas se consideran divergidas si la confirmación más reciente de la \n"
560
"rama destino es una que no ha sido fusionada (directa o indirectamente) \n"
561
"en el padre."
562
563
#: bzrlib/builtins.py:1109
564
msgid ""
565
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
566
"from one into the other. Once one branch has merged, the other should\n"
567
"be able to pull it again."
568
msgstr ""
569
"Si las ramas han divergido, puede usar «bzr merge» para integrar los "
570
"cambios\n"
571
"de una en la otra. Una vez que una rama se ha fusionado, la otra debería\n"
572
"ser capaz de extraer de nuevo."
573
574
#: bzrlib/builtins.py:1113
575
msgid ""
576
"If you want to replace your local changes and just want your branch to\n"
577
"match the remote one, use pull --overwrite. This will work even if the two\n"
578
"branches have diverged."
579
msgstr ""
580
"Si quiere reemplazar su cambios locales y solo quiere que su rama\n"
581
"coincida con la remota, use pull --overwrite. Esto funcionará incluso\n"
582
"si las dos ramas han divergido."
583
584
#: bzrlib/builtins.py:1117
585
msgid ""
586
"If there is no default location set, the first pull will set it (use\n"
587
"--no-remember to avoid setting it). After that, you can omit the\n"
588
"location to use the default. To change the default, use --remember. The\n"
589
"value will only be saved if the remote location can be accessed."
590
msgstr ""
591
"Si no hay ubicación predeterminada establecida, la primera extracción la \n"
592
"establecerá (use --no-remember para evitarlo). Después puede omitir la \n"
593
"ubicación para usar la predeterminada. Para cambiarla, use --remember. El\n"
594
"valor solo se guardará si la ubicación remota es accesible."
595
596
#: bzrlib/builtins.py:1122
597
msgid ""
598
"The --verbose option will display the revisions pulled using the log_format\n"
599
"configuration option. You can use a different format by overriding it with\n"
600
"-Olog_format=<other_format>."
601
msgstr ""
602
"La opción --verbose mostrará las revisiones extraídas usando la opción de\n"
603
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
604
"con -Olog_format=<otro_formato>."
605
606
#: bzrlib/builtins.py:1126
607
msgid ""
608
"Note: The location can be specified either in the form of a branch,\n"
609
"or in the form of a path to a file containing a merge directive generated\n"
610
"with bzr send."
611
msgstr ""
612
"Nota: la ubicación se puede indicar bien en forma de una rama,\n"
613
"o en forma de una ruta a un archivo conteniendo una directiva de\n"
614
"fusión generada con bzr send."
615
616
#: bzrlib/builtins.py:1134
617
msgid "Show logs of pulled revisions."
618
msgstr "Mostrar registros de revisiones extraídas."
619
620
#: bzrlib/builtins.py:1136
621
msgid ""
622
"Branch to pull into, rather than the one containing the working directory."
623
msgstr ""
624
"Rama en la que extraer, en lugar de la que contiene el directorio de trabajo."
625
626
#: bzrlib/builtins.py:1139
627
msgid ""
628
"Perform a local pull in a bound branch. Local pulls are not applied to the "
629
"master branch."
630
msgstr ""
631
"Efectuar una extracción local en una rama ligada. Las extracciones locales "
632
"no se aplican a la rama maestra."
633
634
#: bzrlib/builtins.py:1168
635
msgid "Need working tree for --show-base."
636
msgstr "Se necesita árbol de trabajo para --show-base."
637
638
#: bzrlib/builtins.py:1184
639
msgid "No pull location known or specified."
640
msgstr "Ubicación de extración no conocida ni indicada."
641
642
#: bzrlib/builtins.py:1190
643
#, python-format
644
msgid "Using saved parent location: %s\n"
645
msgstr "Usar ubicaciones padre guardadas: %s\n"
646
647
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
648
msgid "Cannot use -r with merge directives or bundles"
649
msgstr "No se puede usar -r con directivas de fusión o paquetes"
650
651
#: bzrlib/builtins.py:1238
652
msgid "Update a mirror of this branch."
653
msgstr "Actualizar una réplica de esta rama."
654
655
#: bzrlib/builtins.py:1240
656
msgid ""
657
"The target branch will not have its working tree populated because this\n"
658
"is both expensive, and is not supported on remote file systems."
659
msgstr ""
660
"El árbol de trabajo de la rama destino no se rellenará porque esto\n"
661
"es tanto costoso como no soportado por sistemas de archivos remotos."
662
663
#: bzrlib/builtins.py:1243
664
msgid ""
665
"Some smart servers or protocols *may* put the working tree in place in\n"
666
"the future."
667
msgstr ""
668
"Algunos servidores inteligentes o protocolos *pueden* poner el árbol de "
669
"trabajo\n"
670
"en su lugar en el futuro."
671
672
#: bzrlib/builtins.py:1246
673
msgid ""
674
"This command only works on branches that have not diverged. Branches are\n"
675
"considered diverged if the destination branch's most recent commit is one\n"
676
"that has not been merged (directly or indirectly) by the source branch."
677
msgstr ""
678
"Esta orden solo funciona en ramas que no han divergido. Las ramas se\n"
679
"consideran divergidas si la confirmación más reciente de la rama destino es\n"
680
"una que no ha sido fusionada (directa o indirectamente) por la rama origen."
681
682
#: bzrlib/builtins.py:1250
683
msgid ""
684
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
685
"the other branch completely, discarding its unmerged changes."
686
msgstr ""
687
"Si las ramas tienen divergencias, puede usar «bzr push --overwrite» para "
688
"reemplazar\n"
689
"la otra rama completamente, descartando sus cambios no fusionados."
690
691
#: bzrlib/builtins.py:1253
692
msgid ""
693
"If you want to ensure you have the different changes in the other branch,\n"
694
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
695
"After that you will be able to do a push without '--overwrite'."
696
msgstr ""
697
"Si quiere asegurarse de que tiene los distintos cambios de la otra rama,\n"
698
"haga una fusión (vea bzr help merge) desde la otra rama y confirmela.\n"
699
"Después eso será capaz de hacer una inserción sin «--overwrite»."
700
701
#: bzrlib/builtins.py:1257
702
msgid ""
703
"If there is no default push location set, the first push will set it (use\n"
704
"--no-remember to avoid setting it). After that, you can omit the\n"
705
"location to use the default. To change the default, use --remember. The\n"
706
"value will only be saved if the remote location can be accessed."
707
msgstr ""
708
709
#: bzrlib/builtins.py:1262
710
msgid ""
711
"The --verbose option will display the revisions pushed using the log_format\n"
712
"configuration option. You can use a different format by overriding it with\n"
713
"-Olog_format=<other_format>."
714
msgstr ""
715
"La opción --verbose mostrará las revisiones insertadas usando la opción de\n"
716
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
717
"con -Olog_format=<otro_formato>."
718
719
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
720
msgid ""
721
"Branch to push from, rather than the one containing the working directory."
722
msgstr ""
723
"Rama desde la que impulsar en vez de la que contiene el directorio de "
724
"trabajo."
725
726
#: bzrlib/builtins.py:1276
727
msgid ""
728
"By default push will fail if the target directory exists, but does not "
729
"already have a control directory. This flag will allow push to proceed."
730
msgstr ""
731
"Por defecto «push» fallará si el directorio destino existe, pero no tiene "
732
"todavía un directorio de control. Este marcador permitirá a «push» proceder."
733
734
#: bzrlib/builtins.py:1281
735
msgid ""
736
"Create a stacked branch that references the public location of the parent "
737
"branch."
738
msgstr ""
739
"Crear una rama apilada que referencia a la ubicación pública de la rama "
740
"padre."
741
742
#: bzrlib/builtins.py:1284
743
msgid ""
744
"Create a stacked branch that refers to another branch for the commit "
745
"history. Only the work not present in the referenced branch is included in "
746
"the branch created."
747
msgstr ""
748
"Crear una rama apilada que se refiera a otra para historial de "
749
"confirmaciones. Solo el trabajo no presente en la rama referenciada se "
750
"incluye en la rama creada."
751
752
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
753
msgid ""
754
"Refuse to push if there are uncommitted changes in the working tree, --no-"
755
"strict disables the check."
756
msgstr ""
757
"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
758
"strict desactiva la comprobación."
759
760
#: bzrlib/builtins.py:1292
761
msgid "Don't populate the working tree, even for protocols that support it."
762
msgstr ""
763
"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
764
765
#: bzrlib/builtins.py:1336
766
msgid "Could not determine branch to refer to."
767
msgstr "No se puede determinar la rama a la que referirse."
768
769
#: bzrlib/builtins.py:1345
770
#, python-format
771
msgid ""
772
"No push location known or specified. To push to the parent branch (at %s), "
773
"use 'bzr push :parent'."
774
msgstr ""
775
"Ubicación de inserción no conocida ni indicada. Para insertar en la rama "
776
"padre (en %s), use «bzr push :parent»."
777
778
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
779
msgid "No push location known or specified."
780
msgstr "No hay una ubicación para impulsar conocida o especificada."
781
782
#: bzrlib/builtins.py:1355
783
#, python-format
784
msgid "Using saved push location: %s"
785
msgstr "Usar la ubicación para impulsar guardada: %s"
786
787
#: bzrlib/builtins.py:1365
788
msgid "Create a new branch that is a copy of an existing branch."
789
msgstr "Crea una nueva rama que es una copia de la rama existente."
790
791
#: bzrlib/builtins.py:1367
792
msgid ""
793
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
794
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
795
"./bar.\n"
796
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
797
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
798
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
799
"create ./foo-bar."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1374
803
msgid ""
804
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
"parameter, as in \"branch foo/bar -r 5\"."
806
msgstr ""
807
"Para conseguir la rama de una revisión particular, proporcione el parámetro -"
808
"-revision\n"
809
"como en «branch foo/bar -r 5»."
810
811
#: bzrlib/builtins.py:1377
812
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
813
msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
814
815
#: bzrlib/builtins.py:1387
816
msgid "Create a branch without a working-tree."
817
msgstr "Crear una rama sin directorio de trabajo."
818
819
#: bzrlib/builtins.py:1389
820
msgid "Switch the checkout in the current directory to the new branch."
821
msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
822
823
#: bzrlib/builtins.py:1392
824
msgid ""
825
"Create a stacked branch referring to the source branch. The new branch will "
826
"depend on the availability of the source branch for all operations."
827
msgstr ""
828
"Crear una rama apilada refiriéndose a la rama origen. La nueva rama "
829
"dependerá de la disponibilidad de la rama fuente para todas las operaciones."
830
831
#: bzrlib/builtins.py:1396
832
msgid "Do not use a shared repository, even if available."
833
msgstr "No usar un repositorio compartido, incluso si está disponible."
834
835
#: bzrlib/builtins.py:1398
836
msgid ""
837
"By default branch will fail if the target directory exists, but does not "
838
"already have a control directory. This flag will allow branch to proceed."
839
msgstr ""
840
"Por defecto «branch» fallará si el directorio destino existe, pero no tiene "
841
"todavía un directorio de control. Este marcador permitirá a «branch» "
842
"proceder."
843
844
#: bzrlib/builtins.py:1403
845
msgid "Bind new branch to from location."
846
msgstr "Vincular una rama nueva desde la ubicación."
847
848
#: bzrlib/builtins.py:1450
849
#, python-format
850
msgid "Target directory \"%s\" already exists."
851
msgstr "El directorio objetivo «%s» ya existe."
852
853
#: bzrlib/builtins.py:1462
854
#, python-format
855
msgid "Parent of \"%s\" does not exist."
856
msgstr "El padre de «%s» no existe."
857
858
#: bzrlib/builtins.py:1481
859
msgid "The branch {0} has no revision {1}."
860
msgstr "La rama {0} no tiene revisión {1}."
861
862
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
863
#, python-format
864
msgid "Created new stacked branch referring to %s."
865
msgstr "Creada rama apilada nueva referida a %s."
866
867
#: bzrlib/builtins.py:1500
868
#, python-format
869
msgid "Branched %d revision."
870
msgid_plural "Branched %d revisions."
871
msgstr[0] "%d revisión enramada"
872
msgstr[1] "%d revisiones enramadas"
873
874
#: bzrlib/builtins.py:1505
875
#, python-format
876
msgid "New branch bound to %s"
877
msgstr "Nueva rama unida a %s"
878
879
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
880
#, python-format
881
msgid "Switched to branch: %s"
882
msgstr "Cambiado a la rama: %s"
883
884
#: bzrlib/builtins.py:1515
885
msgid "List the branches available at the current location."
886
msgstr "Lista las ramas disponibles en la ubicación actual."
887
888
#: bzrlib/builtins.py:1517
889
msgid ""
890
"This command will print the names of all the branches at the current\n"
891
"location."
892
msgstr ""
893
"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
894
"actual."
895
896
#: bzrlib/builtins.py:1524
897
msgid ""
898
"Recursively scan for branches rather than just looking in the specified "
899
"location."
900
msgstr ""
901
"Buscar recursivamente en las ramas en lugar de mirar solo en la ubicación "
902
"indicada."
903
904
#: bzrlib/builtins.py:1554
905
msgid "(default)"
906
msgstr "(predeterminado)"
907
908
#: bzrlib/builtins.py:1566
909
msgid "Create a new checkout of an existing branch."
910
msgstr "Crea una nueva comprobación de una rama existente."
911
912
#: bzrlib/builtins.py:1568
913
msgid ""
914
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
915
"for\n"
916
"the branch found in '.'. This is useful if you have removed the working "
917
"tree\n"
918
"or if it was never created - i.e. if you pushed the branch to its current\n"
919
"location using SFTP."
920
msgstr ""
921
922
#: bzrlib/builtins.py:1573
923
msgid ""
924
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
925
"will\n"
926
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
927
"./bar.\n"
928
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
929
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
930
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
931
"create ./foo-bar."
932
msgstr ""
933
934
#: bzrlib/builtins.py:1580
935
msgid ""
936
"To retrieve the branch as of a particular revision, supply the --revision\n"
937
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
938
"immediately\n"
939
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
940
"old\n"
941
"code.)"
942
msgstr ""
943
"Para recuperar la rama de una revisión particular, proporcione el parámetro\n"
944
"--revision, como en «checkout foo/bar -r 5». Note que esto estará "
945
"inmediatamente\n"
946
"desfasado [por lo que no puede confirmar] pero aún así puede ser útil (por \n"
947
"ejemplo, para examinar código antiguo)."
948
949
#: bzrlib/builtins.py:1590
950
msgid ""
951
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
952
"the branch for every operation. Normal checkouts can perform common "
953
"operations like diff and status without such access, and also support local "
954
"commits."
955
msgstr ""
956
"Realizar una extracción ligera. Las extracciones ligeras depende del acceso "
957
"a la rama para cada operación. Las extracciones normales pueden realizar "
958
"operaciones habituales como diff y status sin este acceso, así como permitir "
959
"confirmaciones locales."
960
961
#: bzrlib/builtins.py:1597
962
msgid "Get file contents from this tree."
963
msgstr "Conseguir contenidos de archivo desde este árbol."
964
965
#: bzrlib/builtins.py:1599
966
msgid "Hard-link working tree files where possible."
967
msgstr ""
968
"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
969
970
#: bzrlib/builtins.py:1640
971
msgid ""
972
"Show list of renamed files.\n"
973
" "
974
msgstr ""
975
"Mostrar la lista de archivos renombrados\n"
976
" "
977
978
#: bzrlib/builtins.py:1670
979
msgid "Update a working tree to a new revision."
980
msgstr "Actualiza un árbol de trabajo a una revisión nueva."
981
982
#: bzrlib/builtins.py:1672
983
msgid ""
984
"This will perform a merge of the destination revision (the tip of the\n"
985
"branch, or the specified revision) into the working tree, and then make\n"
986
"that revision the basis revision for the working tree. "
987
msgstr ""
988
"Efectuará una fusión de la revisión de destino (el extremo de la\n"
989
"rama, o la revisión indicada) en el árbol de trabajo, y hará esa\n"
990
"revisión la revisión base del árbol de trabajo. "
991
992
#: bzrlib/builtins.py:1676
993
msgid ""
994
"You can use this to visit an older revision, or to update a working tree\n"
995
"that is out of date from its branch."
996
msgstr ""
997
"Puede usar esto para visitar una revisión antigua, o para actualizar un "
998
"árbol de trabajo\n"
999
"que esté desactualizado de su rama."
1000
1001
#: bzrlib/builtins.py:1679
1002
msgid ""
1003
"If there are any uncommitted changes in the tree, they will be carried\n"
1004
"across and remain as uncommitted changes after the update. To discard\n"
1005
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1006
"with the changes brought in by the change in basis revision."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1684
1010
msgid ""
1011
"If the tree's branch is bound to a master branch, bzr will also update\n"
1012
"the branch from the master."
1013
msgstr ""
1014
"Si la rama del árbol esta atada a una rama superior, bzr también "
1015
"actualizará\n"
1016
"la rama de la superior."
1017
1018
#: bzrlib/builtins.py:1687
1019
msgid ""
1020
"You cannot update just a single file or directory, because each Bazaar\n"
1021
"working tree has just a single basis revision. If you want to restore a\n"
1022
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1023
"update'. If you want to restore a file to its state in a previous\n"
1024
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1025
"out the old content of that file to a new location."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1694
1029
msgid ""
1030
"The 'dir' argument, if given, must be the location of the root of a\n"
1031
"working tree to update. By default, the working tree that contains the \n"
1032
"current working directory is used."
1033
msgstr ""
1034
1035
#: bzrlib/builtins.py:1710
1036
msgid "bzr update --revision takes exactly one revision"
1037
msgstr "bzr update --revision toma exactamente una revisión"
1038
1039
#: bzrlib/builtins.py:1718
1040
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1041
msgstr ""
1042
"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
1043
1044
#: bzrlib/builtins.py:1749
1045
msgid "Tree is up to date at revision {0} of branch {1}"
1046
msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
1047
1048
#: bzrlib/builtins.py:1765
1049
#, python-format
1050
msgid ""
1051
"branch has no revision %s\n"
1052
"bzr update --revision only works for a revision in the branch history"
1053
msgstr ""
1054
"la rama no tiene revisión %s\n"
1055
"bzr update --revision solo funciona para una revisión en el histórico de la "
1056
"rama"
1057
1058
#: bzrlib/builtins.py:1771
1059
msgid "Updated to revision {0} of branch {1}"
1060
msgstr "Actualizado a la revisión {0} de la rama {1}"
1061
1062
#: bzrlib/builtins.py:1775
1063
msgid ""
1064
"Your local commits will now show as pending merges with 'bzr status', and "
1065
"can be committed with 'bzr commit'."
1066
msgstr ""
1067
"Sus confirmaciones locales serán ahora mostradas como fusiones pendientes "
1068
"con «bzr status», y pueden ser confirmadas con «bzr commit»."
1069
1070
#: bzrlib/builtins.py:1784
1071
msgid "Show information about a working tree, branch or repository."
1072
msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
1073
1074
#: bzrlib/builtins.py:1786
1075
msgid ""
1076
"This command will show all known locations and formats associated to the\n"
1077
"tree, branch or repository."
1078
msgstr ""
1079
"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
1080
"árbol, rama o repositorio."
1081
1082
#: bzrlib/builtins.py:1789
1083
msgid ""
1084
"In verbose mode, statistical information is included with each report.\n"
1085
"To see extended statistic information, use a verbosity level of 2 or\n"
1086
"higher by specifying the verbose option multiple times, e.g. -vv."
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:1793
1090
msgid "Branches and working trees will also report any missing revisions."
1091
msgstr ""
1092
"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
1093
"que falte."
1094
1095
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1096
#: bzrlib/builtins.py:6442
1097
msgid ":Examples:"
1098
msgstr ":Ejemplos:"
1099
1100
#: bzrlib/builtins.py:1797
1101
msgid " Display information on the format and related locations:"
1102
msgstr " Muestra información en el formato y ubicaciones relacionadas:"
1103
1104
#: bzrlib/builtins.py:1799
1105
msgid " bzr info"
1106
msgstr " información bzr"
1107
1108
#: bzrlib/builtins.py:1801
1109
msgid ""
1110
" Display the above together with extended format information and\n"
1111
" basic statistics (like the number of files in the working tree and\n"
1112
" number of revisions in the branch and repository):"
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:1805
1116
msgid " bzr info -v"
1117
msgstr " bzr info -v"
1118
1119
#: bzrlib/builtins.py:1807
1120
msgid " Display the above together with number of committers to the branch:"
1121
msgstr " Mostrar lo anterior junto con el número de aplicadores de la rama:"
1122
1123
#: bzrlib/builtins.py:1809
1124
msgid " bzr info -vv"
1125
msgstr " bzr info -vv"
1126
1127
#: bzrlib/builtins.py:1828
1128
msgid "Remove files or directories."
1129
msgstr "Elimina archivos o directorios."
1130
1131
#: bzrlib/builtins.py:1830
1132
msgid ""
1133
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1134
"delete them if they can easily be recovered using revert otherwise they\n"
1135
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1136
"parameters are given Bazaar will scan for files that are being tracked by\n"
1137
"Bazaar but missing in your tree and stop tracking them for you."
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:1838
1141
msgid "Only remove files that have never been committed."
1142
msgstr "Eliminar solo los archivos que nunca se han aplicado."
1143
1144
#: bzrlib/builtins.py:1840
1145
msgid "The file deletion mode to be used."
1146
msgstr "El modo de borrado de archivo a usar."
1147
1148
#: bzrlib/builtins.py:1841
1149
msgid "Deletion Strategy"
1150
msgstr "Estrategia de borrado"
1151
1152
#: bzrlib/builtins.py:1842
1153
msgid "Backup changed files (default)."
1154
msgstr "Copiar archivos modificados (predeterminado)."
1155
1156
#: bzrlib/builtins.py:1843
1157
msgid "Delete from bzr but leave the working copy."
1158
msgstr "Borrar de bzr pero dejar la copia de trabajo."
1159
1160
#: bzrlib/builtins.py:1844
1161
msgid "Don't backup changed files."
1162
msgstr "No copiar los archivos modificados."
1163
1164
#: bzrlib/builtins.py:1845
1165
msgid ""
1166
"Delete all the specified files, even if they can not be recovered and even "
1167
"if they are non-empty directories. (deprecated, use no-backup)"
1168
msgstr ""
1169
"Borrar todos los archivos indicados, incluso si no pueden ser recuperados y "
1170
"aunque existan directorios no vacíos (obsoleto, use no-backup)."
1171
1172
#: bzrlib/builtins.py:1854
1173
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1174
msgstr ""
1175
"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
1176
1177
#: bzrlib/builtins.py:1871
1178
msgid "No matching files."
1179
msgstr "No hay archivos coincidentes."
1180
1181
#: bzrlib/builtins.py:1932
1182
msgid "Reconcile bzr metadata in a branch."
1183
msgstr "Reconcilia metadatos bzr en una rama."
1184
1185
#: bzrlib/builtins.py:1934
1186
msgid ""
1187
"This can correct data mismatches that may have been caused by\n"
1188
"previous ghost operations or bzr upgrades. You should only\n"
1189
"need to run this command if 'bzr check' or a bzr developer\n"
1190
"advises you to run it."
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:1939
1194
msgid ""
1195
"If a second branch is provided, cross-branch reconciliation is\n"
1196
"also attempted, which will check that data like the tree root\n"
1197
"id which was not present in very early bzr versions is represented\n"
1198
"correctly in both branches."
1199
msgstr ""
1200
1201
#: bzrlib/builtins.py:1944
1202
msgid ""
1203
"At the same time it is run it may recompress data resulting in\n"
1204
"a potential saving in disk space or performance gain."
1205
msgstr ""
1206
"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
1207
"un ahorro potencial de espacio en disco o aumento el rendimiento."
1208
1209
#: bzrlib/builtins.py:1947
1210
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1211
msgstr ""
1212
"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
1213
"o sftp."
1214
1215
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1216
msgid ""
1217
"Format for the bzr 2.0 series.\n"
1218
"Uses group-compress storage.\n"
1219
"Provides rich roots which are a one-way transition.\n"
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1223
msgid ""
1224
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1225
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1229
msgid "The 2a format with experimental support for colocated branches.\n"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2015
1233
msgid "Make a directory into a versioned branch."
1234
msgstr "Hacer un directorio en una rama versionada."
1235
1236
#: bzrlib/builtins.py:2017
1237
msgid ""
1238
"Use this to create an empty branch, or before importing an\n"
1239
"existing project."
1240
msgstr ""
1241
"Use esto para crear una rama nueva o antes de importar un\n"
1242
"proyecto existente."
1243
1244
#: bzrlib/builtins.py:2020
1245
msgid ""
1246
"If there is a repository in a parent directory of the location, then\n"
1247
"the history of the branch will be stored in the repository. Otherwise\n"
1248
"init creates a standalone branch which carries its own history\n"
1249
"in the .bzr directory."
1250
msgstr ""
1251
"SI hay un repositorio en un directorio padre de la ubicación, el\n"
1252
"historial de la rama se almacenará en el repositorio. En otro caso\n"
1253
"init crea una rama independiente que lleva su propio historial \n"
1254
"en el directorio .bzr."
1255
1256
#: bzrlib/builtins.py:2025
1257
msgid ""
1258
"If there is already a branch at the location but it has no working tree,\n"
1259
"the tree can be populated with 'bzr checkout'."
1260
msgstr ""
1261
"Si existe ya una rama en la ubicación, pero no tiene árbol de trabajo,\n"
1262
"se puede poblar el árbol con «bzr checkout»."
1263
1264
#: bzrlib/builtins.py:2028
1265
msgid "Recipe for importing a tree of files::"
1266
msgstr "Recipiente para importar un árbol de archivos:"
1267
1268
#: bzrlib/builtins.py:2030
1269
msgid ""
1270
" cd ~/project\n"
1271
" bzr init\n"
1272
" bzr add .\n"
1273
" bzr status\n"
1274
" bzr commit -m \"imported project\""
1275
msgstr ""
1276
" cd ~/project\n"
1277
" bzr init\n"
1278
" bzr add .\n"
1279
" bzr status\n"
1280
" bzr commit -m «proyecto importado»"
1281
1282
#: bzrlib/builtins.py:2041
1283
msgid ""
1284
"Create the path leading up to the branch if it does not already exist."
1285
msgstr "Crea la ruta que conduce a la rama si no existe ya."
1286
1287
#: bzrlib/builtins.py:2044
1288
msgid "Specify a format for this branch. See \"help formats\"."
1289
msgstr "Especificar un formato para esta rama. Vea «help formats»"
1290
1291
#: bzrlib/builtins.py:2052
1292
msgid ""
1293
"Never change revnos or the existing log. Append revisions to it only."
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2055
1297
msgid "Create a branch without a working tree."
1298
msgstr "Crea una rama sin árbol de trabajo."
1299
1300
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1301
#, python-format
1302
msgid ""
1303
"Parent directory of %s does not exist.\n"
1304
"You may supply --create-prefix to create all leading parent directories."
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2109
1308
msgid ""
1309
"This branch format cannot be set to append-revisions-only. Try --default."
1310
msgstr ""
1311
"Este formato de rama no se puede establecer como append-revisions-only. "
1312
"Intente --default."
1313
1314
#: bzrlib/builtins.py:2120
1315
msgid "Created a {0} (format: {1})\n"
1316
msgstr "Creado un {0} (formaot: {1})\n"
1317
1318
#: bzrlib/builtins.py:2129
1319
#, python-format
1320
msgid "Using shared repository: %s\n"
1321
msgstr "Usando el repositorio compartido: %s\n"
1322
1323
#: bzrlib/builtins.py:2133
1324
msgid "Create a shared repository for branches to share storage space."
1325
msgstr ""
1326
"Crea un repositorio compartido para ramas para compartir el espacio de "
1327
"almacenamiento."
1328
1329
#: bzrlib/builtins.py:2135
1330
msgid ""
1331
"New branches created under the repository directory will store their\n"
1332
"revisions in the repository, not in the branch directory. For branches\n"
1333
"with shared history, this reduces the amount of storage needed and \n"
1334
"speeds up the creation of new branches."
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2140
1338
msgid ""
1339
"If the --no-trees option is given then the branches in the repository\n"
1340
"will not have working trees by default. They will still exist as \n"
1341
"directories on disk, but they will not have separate copies of the \n"
1342
"files at a certain revision. This can be useful for repositories that\n"
1343
"store branches which are interacted with through checkouts or remote\n"
1344
"branches, such as on a server."
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2147
1348
msgid ""
1349
":Examples:\n"
1350
" Create a shared repository holding just branches::"
1351
msgstr ""
1352
":Ejemplos:\n"
1353
" Crear un repositorio compartido manteniendo solo las ramas::"
1354
1355
#: bzrlib/builtins.py:2150
1356
msgid ""
1357
" bzr init-repo --no-trees repo\n"
1358
" bzr init repo/trunk"
1359
msgstr ""
1360
" bzr init-repo --no-trees repo\n"
1361
" bzr init repo/trunk"
1362
1363
#: bzrlib/builtins.py:2153
1364
msgid " Make a lightweight checkout elsewhere::"
1365
msgstr " Hace una comprobación ligera en cualquier sitio::"
1366
1367
#: bzrlib/builtins.py:2155
1368
msgid ""
1369
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1370
" cd trunk-checkout\n"
1371
" (add files here)"
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2163
1375
msgid ""
1376
"Specify a format for this repository. See \"bzr help formats\" for details."
1377
msgstr ""
1378
"Especificar un formato para este repositorio, Vea «bzr help formats» para "
1379
"tener más detalles."
1380
1381
#: bzrlib/builtins.py:2167
1382
msgid "Repository format"
1383
msgstr "Formato de repositorio"
1384
1385
#: bzrlib/builtins.py:2169
1386
msgid "Branches in the repository will default to not having a working tree."
1387
msgstr ""
1388
"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
1389
"trabajo."
1390
1391
#: bzrlib/builtins.py:2195
1392
msgid "Show differences in the working tree, between revisions or branches."
1393
msgstr ""
1394
"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
1395
1396
#: bzrlib/builtins.py:2197
1397
msgid ""
1398
"If no arguments are given, all changes for the current tree are listed.\n"
1399
"If files are given, only the changes in those files are listed.\n"
1400
"Remote and multiple branches can be compared by using the --old and\n"
1401
"--new options. If not provided, the default for both is derived from\n"
1402
"the first argument, if any, or the current tree if no arguments are\n"
1403
"given."
1404
msgstr ""
1405
1406
#: bzrlib/builtins.py:2204
1407
msgid ""
1408
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1409
"produces patches suitable for \"patch -p1\"."
1410
msgstr ""
1411
"«bzr diff -p1» es equivalente a «bzr diff --prefix old/:new/», y\n"
1412
"produce parches adecuados para «patch -p1»."
1413
1414
#: bzrlib/builtins.py:2207
1415
msgid ""
1416
"Note that when using the -r argument with a range of revisions, the\n"
1417
"differences are computed between the two specified revisions. That\n"
1418
"is, the command does not show the changes introduced by the first \n"
1419
"revision in the range. This differs from the interpretation of \n"
1420
"revision ranges used by \"bzr log\" which includes the first revision\n"
1421
"in the range."
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2214
1425
msgid ""
1426
":Exit values:\n"
1427
" 1 - changed\n"
1428
" 2 - unrepresentable changes\n"
1429
" 3 - error\n"
1430
" 0 - no change"
1431
msgstr ""
1432
":Valores de salida:\n"
1433
" 1 - cambiado\n"
1434
" 2 - cambios no representables\n"
1435
" 3 - error\n"
1436
" 0 - sin cambios"
1437
1438
#: bzrlib/builtins.py:2220
1439
msgid ""
1440
":Examples:\n"
1441
" Shows the difference in the working tree versus the last commit::"
1442
msgstr ""
1443
":Ejemplos:\n"
1444
" Muestra las diferencias en el árbol de trabajo contra la última "
1445
"aplicación::"
1446
1447
#: bzrlib/builtins.py:2223
1448
msgid " bzr diff"
1449
msgstr " bzr diff"
1450
1451
#: bzrlib/builtins.py:2225
1452
msgid " Difference between the working tree and revision 1::"
1453
msgstr " Diferencia entre el árbol de trabajo y la revisión 1::"
1454
1455
#: bzrlib/builtins.py:2227
1456
msgid " bzr diff -r1"
1457
msgstr " bzr diff -r1"
1458
1459
#: bzrlib/builtins.py:2229
1460
msgid " Difference between revision 3 and revision 1::"
1461
msgstr " Diferencia entre revisión 3 y revisión 1::"
1462
1463
#: bzrlib/builtins.py:2231
1464
msgid " bzr diff -r1..3"
1465
msgstr " bzr diff -r1..3"
1466
1467
#: bzrlib/builtins.py:2233
1468
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1469
msgstr " Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
1470
1471
#: bzrlib/builtins.py:2235
1472
msgid " bzr diff -r1..3 xxx"
1473
msgstr " bzr diff -r1..3 xxx"
1474
1475
#: bzrlib/builtins.py:2237
1476
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1477
msgstr ""
1478
" Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
1479
1480
#: bzrlib/builtins.py:2239
1481
msgid " bzr diff -c2"
1482
msgstr " bzr diff -c2"
1483
1484
#: bzrlib/builtins.py:2241
1485
msgid ""
1486
" To see the changes introduced by revision X::\n"
1487
" \n"
1488
" bzr diff -cX"
1489
msgstr ""
1490
" Para ver los cambios introducidos por la revisión X::\n"
1491
" \n"
1492
" bzr diff -cX"
1493
1494
#: bzrlib/builtins.py:2245
1495
msgid ""
1496
" Note that in the case of a merge, the -c option shows the changes\n"
1497
" compared to the left hand parent. To see the changes against\n"
1498
" another parent, use::"
1499
msgstr ""
1500
1501
#: bzrlib/builtins.py:2249
1502
msgid " bzr diff -r<chosen_parent>..X"
1503
msgstr " bzr diff -r<padre_elegido>..X"
1504
1505
#: bzrlib/builtins.py:2251
1506
msgid ""
1507
" The changes between the current revision and the previous revision\n"
1508
" (equivalent to -c-1 and -r-2..-1)"
1509
msgstr ""
1510
" Los cambios entre la versión actual y la previa\n"
1511
" (equivalente a -c-1 y -r-2..-1)"
1512
1513
#: bzrlib/builtins.py:2254
1514
msgid " bzr diff -r-2.."
1515
msgstr " bzr diff -r-2.."
1516
1517
#: bzrlib/builtins.py:2256
1518
msgid " Show just the differences for file NEWS::"
1519
msgstr " Solo muestra las diferencias para el archivo NEWS::"
1520
1521
#: bzrlib/builtins.py:2258
1522
msgid " bzr diff NEWS"
1523
msgstr " bzr diff NEWS"
1524
1525
#: bzrlib/builtins.py:2260
1526
msgid " Show the differences in working tree xxx for file NEWS::"
1527
msgstr ""
1528
" Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
1529
1530
#: bzrlib/builtins.py:2262
1531
msgid " bzr diff xxx/NEWS"
1532
msgstr " bzr diff xxx/NEWS"
1533
1534
#: bzrlib/builtins.py:2264
1535
msgid " Show the differences from branch xxx to this working tree:"
1536
msgstr ""
1537
" Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
1538
1539
#: bzrlib/builtins.py:2266
1540
msgid " bzr diff --old xxx"
1541
msgstr " bzr diff --old xxx"
1542
1543
#: bzrlib/builtins.py:2268
1544
msgid " Show the differences between two branches for file NEWS::"
1545
msgstr " Muestra las diferencias entre dos ramas para el archivo NEWS:"
1546
1547
#: bzrlib/builtins.py:2270
1548
msgid " bzr diff --old xxx --new yyy NEWS"
1549
msgstr " bzr diff --old xxx --new yyy NEWS"
1550
1551
#: bzrlib/builtins.py:2272
1552
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1553
msgstr ""
1554
" Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
1555
1556
#: bzrlib/builtins.py:2274
1557
msgid ""
1558
" bzr diff --prefix old/:new/\n"
1559
" \n"
1560
" Show the differences using a custom diff program with options::\n"
1561
" \n"
1562
" bzr diff --using /usr/bin/diff --diff-options -wu"
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2284
1566
msgid "Pass these options to the external diff program."
1567
msgstr "Pasa esta opciones para el programa diff externo."
1568
1569
#: bzrlib/builtins.py:2287
1570
msgid ""
1571
"Set prefixes added to old and new filenames, as two values separated by a "
1572
"colon. (eg \"old/:new/\")."
1573
msgstr ""
1574
1575
#: bzrlib/builtins.py:2290
1576
msgid "Branch/tree to compare from."
1577
msgstr "Rama/árbol desde donde comparar."
1578
1579
#: bzrlib/builtins.py:2294
1580
msgid "Branch/tree to compare to."
1581
msgstr "Rama/árbol a la que comparar."
1582
1583
#: bzrlib/builtins.py:2300
1584
msgid "Use this command to compare files."
1585
msgstr "Use esta orden para comparar archivos."
1586
1587
#: bzrlib/builtins.py:2305
1588
msgid "Diff format to use."
1589
msgstr "Formato diff a usar."
1590
1591
#: bzrlib/builtins.py:2307
1592
msgid "Diff format"
1593
msgstr "Formato diff"
1594
1595
#: bzrlib/builtins.py:2329
1596
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1597
msgstr ""
1598
"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
1599
1600
#: bzrlib/builtins.py:2333
1601
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1602
msgstr ""
1603
"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
1604
1605
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1606
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1607
msgid "{0} and {1} are mutually exclusive"
1608
msgstr "{0} y {1} se excluyen mutuamente"
1609
1610
#: bzrlib/builtins.py:2358
1611
msgid ""
1612
"List files deleted in the working tree.\n"
1613
" "
1614
msgstr ""
1615
"Lista archivos eliminados en el árbol de trabajo.\n"
1616
" "
1617
1618
#: bzrlib/builtins.py:2436
1619
msgid "Show the tree root directory."
1620
msgstr "Muestra el directorio raíz del árbol."
1621
1622
#: bzrlib/builtins.py:2438
1623
msgid ""
1624
"The root is the nearest enclosing directory with a .bzr control\n"
1625
"directory."
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2453
1629
msgid "The limit argument must be an integer."
1630
msgstr "El argumento límite debe ser un entero."
1631
1632
#: bzrlib/builtins.py:2461
1633
msgid "The levels argument must be an integer."
1634
msgstr "Los argumentos de niveles deben ser un entero."
1635
1636
#: bzrlib/builtins.py:2466
1637
msgid "Show historical log for a branch or subset of a branch."
1638
msgstr ""
1639
"Muestra el registro histórico de una rama o un subconjunto de una rama."
1640
1641
#: bzrlib/builtins.py:2468
1642
msgid ""
1643
"log is bzr's default tool for exploring the history of a branch.\n"
1644
"The branch to use is taken from the first parameter. If no parameters\n"
1645
"are given, the branch containing the working directory is logged.\n"
1646
"Here are some simple examples::"
1647
msgstr ""
1648
1649
#: bzrlib/builtins.py:2473
1650
msgid ""
1651
" bzr log log the current branch\n"
1652
" bzr log foo.py log a file in its branch\n"
1653
" bzr log http://server/branch log a branch on a server"
1654
msgstr ""
1655
" bzr log registra la rama actual\n"
1656
" bzr log foo.py registra un archivo en esta rama\n"
1657
" bzr log http://servidor/rama registra una rama en un servidor"
1658
1659
#: bzrlib/builtins.py:2477
1660
msgid ""
1661
"The filtering, ordering and information shown for each revision can\n"
1662
"be controlled as explained below. By default, all revisions are\n"
1663
"shown sorted (topologically) so that newer revisions appear before\n"
1664
"older ones and descendants always appear before ancestors. If displayed,\n"
1665
"merged revisions are shown indented under the revision in which they\n"
1666
"were merged."
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2484
1670
msgid ":Output control:"
1671
msgstr ":Control de saliuda:"
1672
1673
#: bzrlib/builtins.py:2486
1674
msgid ""
1675
" The log format controls how information about each revision is\n"
1676
" displayed. The standard log formats are called ``long``, ``short``\n"
1677
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1678
" for more details on log formats."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2491
1682
msgid ""
1683
" The following options can be used to control what information is\n"
1684
" displayed::"
1685
msgstr ""
1686
" Las siguientes opciones se pueden usar para controlar qué información\n"
1687
" se muestra::"
1688
1689
#: bzrlib/builtins.py:2494
1690
msgid ""
1691
" -l N display a maximum of N revisions\n"
1692
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1693
" -v display a status summary (delta) for each revision\n"
1694
" -p display a diff (patch) for each revision\n"
1695
" --show-ids display revision-ids (and file-ids), not just revnos"
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2500
1699
msgid ""
1700
" Note that the default number of levels to display is a function of the\n"
1701
" log format. If the -n option is not used, the standard log formats show\n"
1702
" just the top level (mainline)."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2504
1706
msgid ""
1707
" Status summaries are shown using status flags like A, M, etc. To see\n"
1708
" the changes explained using words like ``added`` and ``modified``\n"
1709
" instead, use the -vv option."
1710
msgstr ""
1711
1712
#: bzrlib/builtins.py:2508
1713
msgid ":Ordering control:"
1714
msgstr ":Control de ordenación:"
1715
1716
#: bzrlib/builtins.py:2510
1717
msgid ""
1718
" To display revisions from oldest to newest, use the --forward option.\n"
1719
" In most cases, using this option will have little impact on the total\n"
1720
" time taken to produce a log, though --forward does not incrementally\n"
1721
" display revisions like --reverse does when it can."
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2515
1725
msgid ":Revision filtering:"
1726
msgstr ":Filtrado de revisión:"
1727
1728
#: bzrlib/builtins.py:2517
1729
msgid ""
1730
" The -r option can be used to specify what revision or range of revisions\n"
1731
" to filter against. The various forms are shown below::"
1732
msgstr ""
1733
1734
#: bzrlib/builtins.py:2520
1735
msgid ""
1736
" -rX display revision X\n"
1737
" -rX.. display revision X and later\n"
1738
" -r..Y display up to and including revision Y\n"
1739
" -rX..Y display from X to Y inclusive"
1740
msgstr ""
1741
" -rX muestra revisión X\n"
1742
" -rX.. muestra revisión X y posterior\n"
1743
" -r..Y muestra hasta la revisión Y inclusive\n"
1744
" -rX..Y muestra desde X a Y inclusive"
1745
1746
#: bzrlib/builtins.py:2525
1747
msgid ""
1748
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1749
" Some common examples are given below::"
1750
msgstr ""
1751
" Vea «bzr help revisionspec» para tener más detalles sobre como especificar "
1752
"X e Y.\n"
1753
" Más abajo se listan algunos ejemplos::"
1754
1755
#: bzrlib/builtins.py:2528
1756
msgid ""
1757
" -r-1 show just the tip\n"
1758
" -r-10.. show the last 10 mainline revisions\n"
1759
" -rsubmit:.. show what's new on this branch\n"
1760
" -rancestor:path.. show changes since the common ancestor of this\n"
1761
" branch and the one at location path\n"
1762
" -rdate:yesterday.. show changes since yesterday"
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2535
1766
msgid ""
1767
" When logging a range of revisions using -rX..Y, log starts at\n"
1768
" revision Y and searches back in history through the primary\n"
1769
" (\"left-hand\") parents until it finds X. When logging just the\n"
1770
" top level (using -n1), an error is reported if X is not found\n"
1771
" along the way. If multi-level logging is used (-n0), X may be\n"
1772
" a nested merge revision and the log will be truncated accordingly."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2542
1776
msgid ":Path filtering:"
1777
msgstr ":Filtrado de ruta:"
1778
1779
#: bzrlib/builtins.py:2544
1780
msgid ""
1781
" If parameters are given and the first one is not a branch, the log\n"
1782
" will be filtered to show only those revisions that changed the\n"
1783
" nominated files or directories."
1784
msgstr ""
1785
" Si se dan los parámetros y el primero no es una rama, el registro\n"
1786
" se filtrará para mostrar solo las revisiones que cambiaron los\n"
1787
" archivos o directorios nominados."
1788
1789
#: bzrlib/builtins.py:2548
1790
msgid ""
1791
" Filenames are interpreted within their historical context. To log a\n"
1792
" deleted file, specify a revision range so that the file existed at\n"
1793
" the end or start of the range."
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:2552
1797
msgid ""
1798
" Historical context is also important when interpreting pathnames of\n"
1799
" renamed files/directories. Consider the following example:"
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2555
1803
msgid ""
1804
" * revision 1: add tutorial.txt\n"
1805
" * revision 2: modify tutorial.txt\n"
1806
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1807
msgstr ""
1808
" * revisión 1: añadir tutorial.txt\n"
1809
" * revisión 2: modificar tutorial.txt\n"
1810
" * revisión 3: renombrar tutorial.txt a guide.txt; añadir tutorial.txt"
1811
1812
#: bzrlib/builtins.py:2559
1813
msgid " In this case:"
1814
msgstr " en este caso:"
1815
1816
#: bzrlib/builtins.py:2561
1817
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1818
msgstr ""
1819
" * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
1820
1821
#: bzrlib/builtins.py:2563
1822
msgid ""
1823
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1824
msgstr ""
1825
" * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
1826
"revisión 3"
1827
1828
#: bzrlib/builtins.py:2565
1829
msgid ""
1830
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1831
" the original file in revision 2."
1832
msgstr ""
1833
" * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
1834
" archivo original en la revisión 2."
1835
1836
#: bzrlib/builtins.py:2568
1837
msgid ""
1838
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1839
" was no file called guide.txt in revision 2."
1840
msgstr ""
1841
1842
#: bzrlib/builtins.py:2571
1843
msgid ""
1844
" Renames are always followed by log. By design, there is no need to\n"
1845
" explicitly ask for this (and no way to stop logging a file back\n"
1846
" until it was last renamed)."
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:2575
1850
msgid ":Other filtering:"
1851
msgstr ":Otro filtrado:"
1852
1853
#: bzrlib/builtins.py:2577
1854
msgid ""
1855
" The --match option can be used for finding revisions that match a\n"
1856
" regular expression in a commit message, committer, author or bug.\n"
1857
" Specifying the option several times will match any of the supplied\n"
1858
" expressions. --match-author, --match-bugs, --match-committer and\n"
1859
" --match-message can be used to only match a specific field."
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:2583
1863
msgid ":Tips & tricks:"
1864
msgstr ":Trucos y consejos:"
1865
1866
#: bzrlib/builtins.py:2585
1867
msgid ""
1868
" GUI tools and IDEs are often better at exploring history than command\n"
1869
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1870
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1871
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1872
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:2591
1876
msgid ""
1877
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1878
msgstr ""
1879
1880
#: bzrlib/builtins.py:2593
1881
msgid ""
1882
" [ALIASES]\n"
1883
" tip = log -r-1\n"
1884
" top = log -l10 --line\n"
1885
" show = log -v -p"
1886
msgstr ""
1887
" [ALIAS]\n"
1888
" tip = log -r-1\n"
1889
" top = log -l10 --line\n"
1890
" show = log -v -p"
1891
1892
#: bzrlib/builtins.py:2598
1893
msgid ""
1894
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1895
" will show the last 10 mainline revisions. To see the details of a\n"
1896
" particular revision X, ``bzr show -rX``."
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:2602
1900
msgid ""
1901
" If you are interested in looking deeper into a particular merge X,\n"
1902
" use ``bzr log -n0 -rX``."
1903
msgstr ""
1904
" Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
1905
" use «bzr log -n0 -rX»."
1906
1907
#: bzrlib/builtins.py:2605
1908
msgid ""
1909
" ``bzr log -v`` on a branch with lots of history is currently\n"
1910
" very slow. A fix for this issue is currently under development.\n"
1911
" With or without that fix, it is recommended that a revision range\n"
1912
" be given when using the -v option."
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:2610
1916
msgid ""
1917
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1918
" used to find revisions matching user names, commit messages, etc.\n"
1919
" Among other features, this plugin can find all revisions containing\n"
1920
" a list of words but not others."
1921
msgstr ""
1922
1923
#: bzrlib/builtins.py:2615
1924
msgid ""
1925
" When exploring non-mainline history on large projects with deep\n"
1926
" history, the performance of log can be greatly improved by installing\n"
1927
" the historycache plugin. This plugin buffers historical information\n"
1928
" trading disk space for faster speed."
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:2624
1932
msgid "Show from oldest to newest."
1933
msgstr "Muestra desde el más antiguo al más moderno."
1934
1935
#: bzrlib/builtins.py:2627
1936
msgid "Show files changed in each revision."
1937
msgstr "Muestra los archivos cambiados en cada revisión."
1938
1939
#: bzrlib/builtins.py:2633
1940
msgid "Show just the specified revision. See also \"help revisionspec\"."
1941
msgstr ""
1942
"Muestra solo la revisión especificada. Vea también «help revisionspec»."
1943
1944
#: bzrlib/builtins.py:2637
1945
msgid "What names to list as authors - first, all or committer."
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:2638
1949
msgid "Authors"
1950
msgstr "Autores"
1951
1952
#: bzrlib/builtins.py:2643
1953
msgid "Number of levels to display - 0 for all, 1 for flat."
1954
msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
1955
1956
#: bzrlib/builtins.py:2653
1957
msgid "Limit the output to the first N revisions."
1958
msgstr "Límite de salida para las primeras N revisiones."
1959
1960
#: bzrlib/builtins.py:2658
1961
msgid "Show changes made in each revision as a patch."
1962
msgstr "Mostrar cambios realizados en cada revisión como un parche."
1963
1964
#: bzrlib/builtins.py:2660
1965
msgid "Show merged revisions like --levels 0 does."
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:2664
1969
msgid "Do not report commits with more than one parent."
1970
msgstr "No informar de ejecuciones con más de un padre."
1971
1972
#: bzrlib/builtins.py:2666
1973
msgid ""
1974
"Display only the revisions that are not part of both ancestries (require -"
1975
"rX..Y)."
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:2670
1979
msgid "Show digital signature validity."
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:2673
1983
msgid "Show revisions whose properties match this expression."
1984
msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
1985
1986
#: bzrlib/builtins.py:2677
1987
msgid "Show revisions whose message matches this expression."
1988
msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
1989
1990
#: bzrlib/builtins.py:2681
1991
msgid "Show revisions whose committer matches this expression."
1992
msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
1993
1994
#: bzrlib/builtins.py:2685
1995
msgid "Show revisions whose authors match this expression."
1996
msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
1997
1998
#: bzrlib/builtins.py:2689
1999
msgid "Show revisions whose bugs match this expression."
2000
msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
2001
2002
#: bzrlib/builtins.py:2743
2003
msgid "--exclude-common-ancestry requires -r with two revisions"
2004
msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
2005
2006
#: bzrlib/builtins.py:2771
2007
#, python-format
2008
msgid "Path unknown at end or start of revision range: %s"
2009
msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
2010
2011
#: bzrlib/builtins.py:2888
2012
#, python-format
2013
msgid "bzr %s doesn't accept two revisions in different branches."
2014
msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
2015
2016
#: bzrlib/builtins.py:2904
2017
#, python-format
2018
msgid "bzr %s --revision takes one or two values."
2019
msgstr "bzr %s --revision toma uno o dos valores."
2020
2021
#: bzrlib/builtins.py:2949
2022
msgid ""
2023
"List files in a tree.\n"
2024
" "
2025
msgstr ""
2026
"Lista archivos en un árbol\n"
2027
" "
2028
2029
#: bzrlib/builtins.py:2958
2030
msgid "Recurse into subdirectories."
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:2960
2034
msgid "Print paths relative to the root of the branch."
2035
msgstr "Imprime rutas relativas a la raíz de la rama."
2036
2037
#: bzrlib/builtins.py:2962
2038
msgid "Print unknown files."
2039
msgstr "Imprimir archivos desconocidos."
2040
2041
#: bzrlib/builtins.py:2963
2042
msgid "Print versioned files."
2043
msgstr "Imprimir archivos versionados."
2044
2045
#: bzrlib/builtins.py:2966
2046
msgid "Print ignored files."
2047
msgstr "Imprimir archivos ignorados."
2048
2049
#: bzrlib/builtins.py:2968
2050
msgid "List entries of a particular kind: file, directory, symlink."
2051
msgstr ""
2052
"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
2053
2054
#: bzrlib/builtins.py:2981
2055
msgid "invalid kind specified"
2056
msgstr "tivo inválido especificado"
2057
2058
#: bzrlib/builtins.py:2984
2059
msgid "Cannot set both --verbose and --null"
2060
msgstr "No se pueden establecer ambos --verbose y --null"
2061
2062
#: bzrlib/builtins.py:2993
2063
msgid "cannot specify both --from-root and PATH"
2064
msgstr "No se pueden establecer ambos --from-root y PATH"
2065
2066
#: bzrlib/builtins.py:3080
2067
msgid "Ignore specified files or patterns."
2068
msgstr "Ignorar archivos o patrones especificados."
2069
2070
#: bzrlib/builtins.py:3082
2071
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2072
msgstr ""
2073
"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
2074
2075
#: bzrlib/builtins.py:3084
2076
msgid ""
2077
"If a .bzrignore file does not exist, the ignore command\n"
2078
"will create one and add the specified files or patterns to the newly\n"
2079
"created file. The ignore command will also automatically add the \n"
2080
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2081
"the use of the ignore command will require an explicit add command."
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3090
2085
msgid ""
2086
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2087
"After adding, editing or deleting that file either indirectly by\n"
2088
"using this command or directly by using an editor, be sure to commit\n"
2089
"it."
2090
msgstr ""
2091
"Para eliminar los patrones de la lista de ignorados, edite el archivo "
2092
".bzrignore.\n"
2093
"Después de añadir, editar o borrar el archivo o bien indirectamente por\n"
2094
"el uso de esta orden, o directamente mediante un editor, asegúrese de "
2095
"ejecutarlo."
2096
2097
#: bzrlib/builtins.py:3095
2098
msgid ""
2099
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2100
"the global ignore file can be found in the application data directory as\n"
2101
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2102
"Global ignores are not touched by this command. The global ignore file\n"
2103
"can be edited directly using an editor."
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:3101
2107
msgid ""
2108
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2109
"precedence over regular ignores. Such exceptions are used to specify\n"
2110
"files that should be versioned which would otherwise be ignored."
2111
msgstr ""
2112
2113
#: bzrlib/builtins.py:3105
2114
msgid ""
2115
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2116
"precedence over the '!' exception patterns."
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3108
2120
msgid ""
2121
":Notes: \n"
2122
" \n"
2123
"* Ignore patterns containing shell wildcards must be quoted from\n"
2124
" the shell on Unix."
2125
msgstr ""
2126
2127
#: bzrlib/builtins.py:3113
2128
msgid ""
2129
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2130
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3116
2134
msgid ""
2135
":Examples:\n"
2136
" Ignore the top level Makefile::"
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3119
2140
msgid " bzr ignore ./Makefile"
2141
msgstr " bzr ignore ./Makefile"
2142
2143
#: bzrlib/builtins.py:3121
2144
msgid " Ignore .class files in all directories...::"
2145
msgstr " Ignorar archivos .class en todos los directorios...::"
2146
2147
#: bzrlib/builtins.py:3123
2148
msgid " bzr ignore \"*.class\""
2149
msgstr " bzr ignore \"*.class\""
2150
2151
#: bzrlib/builtins.py:3125
2152
msgid " ...but do not ignore \"special.class\"::"
2153
msgstr " ...pero no ignora «special.class»::"
2154
2155
#: bzrlib/builtins.py:3127
2156
msgid " bzr ignore \"!special.class\""
2157
msgstr " bzr ignore «!special.class»"
2158
2159
#: bzrlib/builtins.py:3129
2160
msgid " Ignore files whose name begins with the \"#\" character::"
2161
msgstr " Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
2162
2163
#: bzrlib/builtins.py:3131
2164
msgid " bzr ignore \"RE:^#\""
2165
msgstr " bzr ignore \"RE:^#\""
2166
2167
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2168
msgid " Ignore .o files under the lib directory::"
2169
msgstr " Ignorar archivos .o bajo el directorio lib::"
2170
2171
#: bzrlib/builtins.py:3135
2172
msgid " bzr ignore \"lib/**/*.o\""
2173
msgstr " bzr ignore \"lib/**/*.o\""
2174
2175
#: bzrlib/builtins.py:3139
2176
msgid " bzr ignore \"RE:lib/.*\\.o\""
2177
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2178
2179
#: bzrlib/builtins.py:3141
2180
msgid " Ignore everything but the \"debian\" toplevel directory::"
2181
msgstr ""
2182
" Ignorar todo excepto el directorio de nivel superior de «debian»::"
2183
2184
#: bzrlib/builtins.py:3143
2185
msgid ""
2186
" bzr ignore \"RE:(?!debian/).*\"\n"
2187
" \n"
2188
" Ignore everything except the \"local\" toplevel directory,\n"
2189
" but always ignore autosave files ending in ~, even under local/::\n"
2190
" \n"
2191
" bzr ignore \"*\"\n"
2192
" bzr ignore \"!./local\"\n"
2193
" bzr ignore \"!!*~\""
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3157
2197
msgid "Display the default ignore rules that bzr uses."
2198
msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
2199
2200
#: bzrlib/builtins.py:3169
2201
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2202
msgstr ""
2203
2204
#: bzrlib/builtins.py:3180
2205
#, python-format
2206
msgid "Invalid ignore pattern found. %s"
2207
msgid_plural "Invalid ignore patterns found. %s"
2208
msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
2209
msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
2210
2211
#: bzrlib/builtins.py:3189
2212
msgid "NAME_PATTERN should not be an absolute path"
2213
msgstr "NAME_PATTERN no debe ser una ruta absoluta"
2214
2215
#: bzrlib/builtins.py:3202
2216
#, python-format
2217
msgid ""
2218
"Warning: the following files are version controlled and match your ignore "
2219
"pattern:\n"
2220
"%s\n"
2221
"These files will continue to be version controlled unless you 'bzr remove' "
2222
"them.\n"
2223
msgstr ""
2224
2225
#: bzrlib/builtins.py:3209
2226
msgid "List ignored files and the patterns that matched them."
2227
msgstr "Lista todos los archivos ignorados y patrones que conciden."
2228
2229
#: bzrlib/builtins.py:3211
2230
msgid ""
2231
"List all the ignored files and the ignore pattern that caused the file to\n"
2232
"be ignored."
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3214
2236
msgid "Alternatively, to list just the files::"
2237
msgstr "Alternativamente, lista solo los archivos:"
2238
2239
#: bzrlib/builtins.py:3216
2240
msgid " bzr ls --ignored"
2241
msgstr " bzr ls --ignored"
2242
2243
#: bzrlib/builtins.py:3250
2244
#, python-format
2245
msgid "not a valid revision-number: %r"
2246
msgstr "no es un número de revisión válido: %r"
2247
2248
#: bzrlib/builtins.py:3257
2249
msgid ""
2250
"Export current or past revision to a destination directory or archive."
2251
msgstr ""
2252
"Exporta la revisión actual o pasada a un directorio de destino o un "
2253
"archivador."
2254
2255
#: bzrlib/builtins.py:3259
2256
msgid "If no revision is specified this exports the last committed revision."
2257
msgstr "Si no se especifica revisión, exporta la última revisión ejecutada."
2258
2259
#: bzrlib/builtins.py:3261
2260
msgid ""
2261
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2262
"given, try to find the format with the extension. If no extension\n"
2263
"is found exports to a directory (equivalent to --format=dir)."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3265
2267
msgid ""
2268
"If root is supplied, it will be used as the root directory inside\n"
2269
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2270
"to the exported filename. The root option has no effect for 'dir' format."
2271
msgstr ""
2272
2273
#: bzrlib/builtins.py:3269
2274
msgid ""
2275
"If branch is omitted then the branch containing the current working\n"
2276
"directory will be used."
2277
msgstr ""
2278
"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
2279
"de trabajo actual."
2280
2281
#: bzrlib/builtins.py:3272
2282
msgid ""
2283
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2284
msgstr ""
2285
"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
2286
2287
#: bzrlib/builtins.py:3274
2288
msgid ""
2289
" ================= =========================\n"
2290
" Supported formats Autodetected by extension\n"
2291
" ================= =========================\n"
2292
" dir (none)\n"
2293
" tar .tar\n"
2294
" tbz2 .tar.bz2, .tbz2\n"
2295
" tgz .tar.gz, .tgz\n"
2296
" zip .zip\n"
2297
" ================= ========================="
2298
msgstr ""
2299
" ================= ===================================\n"
2300
" Formatos permitidos Detectados automáticamente por extensión\n"
2301
" ================= ===================================\n"
2302
" dir (ninguno)\n"
2303
" tar .tar\n"
2304
" tbz2 .tar.bz2, .tbz2\n"
2305
" tgz .tar.gz, .tgz\n"
2306
" zip .zip\n"
2307
" ================= ==================================="
2308
2309
#: bzrlib/builtins.py:3288
2310
msgid "Type of file to export to."
2311
msgstr "Tipo de archivo para exportar."
2312
2313
#: bzrlib/builtins.py:3291
2314
msgid "Apply content filters to export the convenient form."
2315
msgstr ""
2316
"Aplicar los filtros de contenido para exportar el formulario conveniente."
2317
2318
#: bzrlib/builtins.py:3295
2319
msgid "Name of the root directory inside the exported file."
2320
msgstr "Nombre del directorio raíz dentro del archivo exportado."
2321
2322
#: bzrlib/builtins.py:3297
2323
msgid ""
2324
"Set modification time of files to that of the last revision in which it was "
2325
"changed."
2326
msgstr ""
2327
"Establecer la fecha de modificación de los archivos a la de la última "
2328
"revisión en la que se cambió."
2329
2330
#: bzrlib/builtins.py:3300
2331
msgid ""
2332
"Export the working tree contents rather than that of the last revision."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3319
2336
msgid "--uncommitted requires a working tree"
2337
msgstr ""
2338
2339
#: bzrlib/builtins.py:3328
2340
#, python-format
2341
msgid "Unsupported export format: %s"
2342
msgstr "Formato de exportación no permitido: %s"
2343
2344
#: bzrlib/builtins.py:3332
2345
msgid ""
2346
"Write the contents of a file as of a given revision to standard output."
2347
msgstr ""
2348
"Escribir los contenidos de un archivo como una revisión dada a la salida "
2349
"estándar."
2350
2351
#: bzrlib/builtins.py:3334
2352
msgid "If no revision is nominated, the last revision is used."
2353
msgstr "SI no hay una revisión nominada, se usa la última revisión."
2354
2355
#: bzrlib/builtins.py:3336
2356
msgid ""
2357
"Note: Take care to redirect standard output when using this command on a\n"
2358
"binary file."
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3342
2362
msgid "The path name in the old tree."
2363
msgstr "La ruta en el árbol antiguo."
2364
2365
#: bzrlib/builtins.py:3343
2366
msgid "Apply content filters to display the convenience form."
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3354
2370
msgid "bzr cat --revision takes exactly one revision specifier"
2371
msgstr "bzr cat --revision toma específicamente un especificador de revisión"
2372
2373
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2374
msgid "{0!r} is not present in revision {1}"
2375
msgstr "{0!r} no está presente en la revisión {1}"
2376
2377
#: bzrlib/builtins.py:3414
2378
msgid "Commit changes into a new revision."
2379
msgstr "Ejecutar cambios en una revisión nueva."
2380
2381
#: bzrlib/builtins.py:3416
2382
msgid ""
2383
"An explanatory message needs to be given for each commit. This is\n"
2384
"often done by using the --message option (getting the message from the\n"
2385
"command line) or by using the --file option (getting the message from\n"
2386
"a file). If neither of these options is given, an editor is opened for\n"
2387
"the user to enter the message. To see the changed files in the\n"
2388
"boilerplate text loaded into the editor, use the --show-diff option."
2389
msgstr ""
2390
2391
#: bzrlib/builtins.py:3423
2392
msgid ""
2393
"By default, the entire tree is committed and the person doing the\n"
2394
"commit is assumed to be the author. These defaults can be overridden\n"
2395
"as explained below."
2396
msgstr ""
2397
2398
#: bzrlib/builtins.py:3427
2399
msgid ":Selective commits:"
2400
msgstr ""
2401
2402
#: bzrlib/builtins.py:3429
2403
msgid ""
2404
" If selected files are specified, only changes to those files are\n"
2405
" committed. If a directory is specified then the directory and\n"
2406
" everything within it is committed."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3433
2410
msgid ""
2411
" When excludes are given, they take precedence over selected files.\n"
2412
" For example, to commit only changes within foo, but not changes\n"
2413
" within foo/bar::"
2414
msgstr ""
2415
2416
#: bzrlib/builtins.py:3437
2417
msgid " bzr commit foo -x foo/bar"
2418
msgstr " bzr commit foo -x foo/bar"
2419
2420
#: bzrlib/builtins.py:3439
2421
msgid " A selective commit after a merge is not yet supported."
2422
msgstr " No está permitida una ejecución selectiva después de una fusión."
2423
2424
#: bzrlib/builtins.py:3441
2425
msgid ":Custom authors:"
2426
msgstr ":Autores personalizados:"
2427
2428
#: bzrlib/builtins.py:3443
2429
msgid ""
2430
" If the author of the change is not the same person as the committer,\n"
2431
" you can specify the author's name using the --author option. The\n"
2432
" name should be in the same format as a committer-id, e.g.\n"
2433
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2434
" the change you can specify the option multiple times, once for each\n"
2435
" author."
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3450
2439
msgid ":Checks:"
2440
msgstr ":Comprobaciones:"
2441
2442
#: bzrlib/builtins.py:3452
2443
msgid ""
2444
" A common mistake is to forget to add a new file or directory before\n"
2445
" running the commit command. The --strict option checks for unknown\n"
2446
" files and aborts the commit if any are found. More advanced pre-commit\n"
2447
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2448
" for details."
2449
msgstr ""
2450
2451
#: bzrlib/builtins.py:3458
2452
msgid ":Things to note:"
2453
msgstr ":Cosas a tener en cuenta:"
2454
2455
#: bzrlib/builtins.py:3460
2456
msgid ""
2457
" If you accidentially commit the wrong changes or make a spelling\n"
2458
" mistake in the commit message say, you can use the uncommit command\n"
2459
" to undo it. See ``bzr help uncommit`` for details."
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3464
2463
msgid ""
2464
" Hooks can also be configured to run after a commit. This allows you\n"
2465
" to trigger updates to external systems like bug trackers. The --fixes\n"
2466
" option can be used to record the association between a revision and\n"
2467
" one or more bugs. See ``bzr help bugs`` for details."
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3474
2471
msgid "Do not consider changes made to a given path."
2472
msgstr "No considerar los cambios realizados en una ruta dada."
2473
2474
#: bzrlib/builtins.py:3477
2475
msgid "Description of the new revision."
2476
msgstr "Descripción de la revisión nueva."
2477
2478
#: bzrlib/builtins.py:3480
2479
msgid "Commit even if nothing has changed."
2480
msgstr "Ejecutar incluso si no ha cambiado nada."
2481
2482
#: bzrlib/builtins.py:3484
2483
msgid "Take commit message from this file."
2484
msgstr "Tomar el mensaje de ejecución desde este archivo."
2485
2486
#: bzrlib/builtins.py:3486
2487
msgid "Refuse to commit if there are unknown files in the working tree."
2488
msgstr ""
2489
"Rechazar la ejecución si hay archivos desconocidos en el árbol de trabajo."
2490
2491
#: bzrlib/builtins.py:3489
2492
msgid ""
2493
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2494
"08:00:00 +0100'."
2495
msgstr ""
2496
"Establecer manualmente la hora de ejecución usando un formato de fecha de "
2497
"ejecución, por ejemplo «2009-10-10 08:00:00 +0100»."
2498
2499
#: bzrlib/builtins.py:3492
2500
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2501
msgstr ""
2502
"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
2503
2504
#: bzrlib/builtins.py:3495
2505
msgid "Set the author's name, if it's different from the committer."
2506
msgstr ""
2507
"Establecer el nombre del autor, si este es diferente al del ejecutor."
2508
2509
#: bzrlib/builtins.py:3498
2510
msgid ""
2511
"Perform a local commit in a bound branch. Local commits are not pushed to "
2512
"the master branch until a normal commit is performed."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3504
2516
msgid ""
2517
"When no message is supplied, show the diff along with the status summary in "
2518
"the message editor."
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3507
2522
msgid ""
2523
"When committing to a foreign version control system do not push data that "
2524
"can not be natively represented."
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3525
2528
#, python-format
2529
msgid ""
2530
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2531
"default bug tracker using the `bugtracker` option.\n"
2532
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:3534
2536
#, python-format
2537
msgid ""
2538
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2539
"for more information on this feature.\n"
2540
"Commit refused."
2541
msgstr ""
2542
2543
#: bzrlib/builtins.py:3543
2544
#, python-format
2545
msgid "Unrecognized bug %s. Commit refused."
2546
msgstr "Error no reconocido %s. Ejecución rechazada."
2547
2548
#: bzrlib/builtins.py:3546
2549
#, python-format
2550
msgid ""
2551
"%s\n"
2552
"Commit refused."
2553
msgstr ""
2554
"%s\n"
2555
"Ejecución rechazada."
2556
2557
#: bzrlib/builtins.py:3570
2558
msgid "Could not parse --commit-time: "
2559
msgstr "No se puede analizar --commit-time: "
2560
2561
#: bzrlib/builtins.py:3610
2562
msgid "please specify either --message or --file"
2563
msgstr "especifique uno --message o --file"
2564
2565
#: bzrlib/builtins.py:3639
2566
msgid "please specify a commit message with either --message or --file"
2567
msgstr "especifique un mensaje de ejecución con --message o --file"
2568
2569
#: bzrlib/builtins.py:3642
2570
msgid ""
2571
"Empty commit message specified. Please specify a commit message with either -"
2572
"-message or --file or leave a blank message with --message \"\"."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:3662
2576
msgid ""
2577
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2578
"-unchanged to force an empty commit."
2579
msgstr ""
2580
"No hay cambios que ejecutar. «bzr add» los archivos que quiera ejecutar o "
2581
"use --unchanged para forzar una ejecución vacía."
2582
2583
#: bzrlib/builtins.py:3666
2584
msgid ""
2585
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2586
"resolve FILE\" to resolve."
2587
msgstr ""
2588
"Conflictos detectados en el árbol de trabajo. Use «bzr conflicts» para "
2589
"listar, «bzr resolve ARCHIVO»\" para resolver."
2590
2591
#: bzrlib/builtins.py:3670
2592
msgid "Commit refused because there are unknown files in the working tree."
2593
msgstr ""
2594
"Ejecución rechazada porque hay archivos desconocidos en el árbol de trabajo."
2595
2596
#: bzrlib/builtins.py:3673
2597
msgid ""
2598
"\n"
2599
"To commit to master branch, run update and then commit.\n"
2600
"You can also pass --local to commit to continue working disconnected."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:3681
2604
msgid ""
2605
"Validate working tree structure, branch consistency and repository history."
2606
msgstr ""
2607
"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
2608
"historial del repositorio."
2609
2610
#: bzrlib/builtins.py:3683
2611
msgid ""
2612
"This command checks various invariants about branch and repository storage\n"
2613
"to detect data corruption or bzr bugs."
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:3686
2617
msgid ""
2618
"The working tree and branch checks will only give output if a problem is\n"
2619
"detected. The output fields of the repository check are:"
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:3689
2623
msgid ""
2624
"revisions\n"
2625
" This is just the number of revisions checked. It doesn't\n"
2626
" indicate a problem."
2627
msgstr ""
2628
"revisions\n"
2629
" Esto es solo el número de revisiones comprobadas, No\n"
2630
" indica un problema."
2631
2632
#: bzrlib/builtins.py:3693
2633
msgid ""
2634
"versionedfiles\n"
2635
" This is just the number of versionedfiles checked. It\n"
2636
" doesn't indicate a problem."
2637
msgstr ""
2638
"versionedfiles\n"
2639
" Esto es solo el número de archivos versionados comprobados.. No\n"
2640
" indica un problema."
2641
2642
#: bzrlib/builtins.py:3697
2643
msgid ""
2644
"unreferenced ancestors\n"
2645
" Texts that are ancestors of other texts, but\n"
2646
" are not properly referenced by the revision ancestry. This is a\n"
2647
" subtle problem that Bazaar can work around."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:3702
2651
msgid ""
2652
"unique file texts\n"
2653
" This is the total number of unique file contents\n"
2654
" seen in the checked revisions. It does not indicate a problem."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:3706
2658
msgid ""
2659
"repeated file texts\n"
2660
" This is the total number of repeated texts seen\n"
2661
" in the checked revisions. Texts can be repeated when their file\n"
2662
" entries are modified, but the file contents are not. It does not\n"
2663
" indicate a problem."
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:3712
2667
msgid ""
2668
"If no restrictions are specified, all Bazaar data that is found at the "
2669
"given\n"
2670
"location will be checked."
2671
msgstr ""
2672
2673
#: bzrlib/builtins.py:3717
2674
msgid " Check the tree and branch at 'foo'::"
2675
msgstr " Comprueba el árbol y la rama en «foo»::"
2676
2677
#: bzrlib/builtins.py:3719
2678
msgid " bzr check --tree --branch foo"
2679
msgstr " bzr check --tree --branch foo"
2680
2681
#: bzrlib/builtins.py:3721
2682
msgid " Check only the repository at 'bar'::"
2683
msgstr " Comprueba solo el repositorio en «bar»::"
2684
2685
#: bzrlib/builtins.py:3723
2686
msgid " bzr check --repo bar"
2687
msgstr " bzr check --repo bar"
2688
2689
#: bzrlib/builtins.py:3725
2690
msgid " Check everything at 'baz'::"
2691
msgstr " Comprueba todo en «baz»::"
2692
2693
#: bzrlib/builtins.py:3727
2694
msgid " bzr check baz"
2695
msgstr " bzr check baz"
2696
2697
#: bzrlib/builtins.py:3733
2698
msgid "Check the branch related to the current directory."
2699
msgstr "Comprueba la rama relacionada con el directorio actual."
2700
2701
#: bzrlib/builtins.py:3735
2702
msgid "Check the repository related to the current directory."
2703
msgstr "Comprueba el repositorio relacionado con el directorio actual."
2704
2705
#: bzrlib/builtins.py:3737
2706
msgid "Check the working tree related to the current directory."
2707
msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
2708
2709
#: bzrlib/builtins.py:3751
2710
msgid "Upgrade a repository, branch or working tree to a newer format."
2711
msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
2712
2713
#: bzrlib/builtins.py:3753
2714
msgid ""
2715
"When the default format has changed after a major new release of\n"
2716
"Bazaar, you may be informed during certain operations that you\n"
2717
"should upgrade. Upgrading to a newer format may improve performance\n"
2718
"or make new features available. It may however limit interoperability\n"
2719
"with older repositories or with older versions of Bazaar."
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:3759
2723
msgid ""
2724
"If you wish to upgrade to a particular format rather than the\n"
2725
"current default, that can be specified using the --format option.\n"
2726
"As a consequence, you can use the upgrade command this way to\n"
2727
"\"downgrade\" to an earlier format, though some conversions are\n"
2728
"a one way process (e.g. changing from the 1.x default to the\n"
2729
"2.x default) so downgrading is not always possible."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:3766
2733
msgid ""
2734
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2735
"process (where # is a number). By default, this is left there on\n"
2736
"completion. If the conversion fails, delete the new .bzr directory\n"
2737
"and rename this one back in its place. Use the --clean option to ask\n"
2738
"for the backup.bzr directory to be removed on successful conversion.\n"
2739
"Alternatively, you can delete it by hand if everything looks good\n"
2740
"afterwards."
2741
msgstr ""
2742
2743
#: bzrlib/builtins.py:3774
2744
msgid ""
2745
"If the location given is a shared repository, dependent branches\n"
2746
"are also converted provided the repository converts successfully.\n"
2747
"If the conversion of a branch fails, remaining branches are still\n"
2748
"tried."
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:3779
2752
msgid ""
2753
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2754
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2755
msgstr ""
2756
"Para tener más información sobre actualizaciones, vea la Guía de "
2757
"actualización de Bazaar,\n"
2758
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2759
2760
#: bzrlib/builtins.py:3787
2761
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2762
msgstr ""
2763
"Actualizar a un formato específico. Vea «bzr help formats» para tener más "
2764
"detalles."
2765
2766
#: bzrlib/builtins.py:3791
2767
msgid "Branch format"
2768
msgstr "Formato de la rama"
2769
2770
#: bzrlib/builtins.py:3793
2771
msgid "Remove the backup.bzr directory if successful."
2772
msgstr "Elimina el directorio backup.bzr si tiene éxito."
2773
2774
#: bzrlib/builtins.py:3795
2775
msgid "Show what would be done, but don't actually do anything."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:3810
2779
msgid "Show or set bzr user id."
2780
msgstr "Muestra o establece la id de usuario bzr."
2781
2782
#: bzrlib/builtins.py:3812
2783
msgid ""
2784
":Examples:\n"
2785
" Show the email of the current user::"
2786
msgstr ""
2787
":Ejemplos:\n"
2788
" Muestra el correo del usuario actual::"
2789
2790
#: bzrlib/builtins.py:3815
2791
msgid " bzr whoami --email"
2792
msgstr " bzr whoami --email"
2793
2794
#: bzrlib/builtins.py:3817
2795
msgid " Set the current user::"
2796
msgstr " Establece el usuario actual::"
2797
2798
#: bzrlib/builtins.py:3819
2799
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2800
msgstr " bzr whoami «Frank Chu <fchu@example.com>»"
2801
2802
#: bzrlib/builtins.py:3823
2803
msgid "Display email address only."
2804
msgstr "Muestra solo la dirección de correo."
2805
2806
#: bzrlib/builtins.py:3825
2807
msgid "Set identity for the current branch instead of globally."
2808
msgstr "Establece la identidad de la rama actual en lugar de globalmente."
2809
2810
#: bzrlib/builtins.py:3851
2811
msgid "--email can only be used to display existing identity"
2812
msgstr "--email solo se puede usar para mostrar la identidad del directorio"
2813
2814
#: bzrlib/builtins.py:3873
2815
msgid "Print or set the branch nickname."
2816
msgstr "Muestra o establece el apodo de la rama."
2817
2818
#: bzrlib/builtins.py:3875
2819
msgid ""
2820
"If unset, the tree root directory name is used as the nickname.\n"
2821
"To print the current nickname, execute with no argument."
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:3878
2825
msgid ""
2826
"Bound branches use the nickname of its master branch unless it is set\n"
2827
"locally."
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:3898
2831
msgid "Set/unset and display aliases."
2832
msgstr "Establece/desestablece y muestra alias."
2833
2834
#: bzrlib/builtins.py:3900
2835
msgid ""
2836
":Examples:\n"
2837
" Show the current aliases::"
2838
msgstr ""
2839
":Ejemplos:\n"
2840
" Muestra los alias actuales::"
2841
2842
#: bzrlib/builtins.py:3903
2843
msgid " bzr alias"
2844
msgstr " bzr alias"
2845
2846
#: bzrlib/builtins.py:3905
2847
msgid " Show the alias specified for 'll'::"
2848
msgstr " Muestra los alias especificados por «ll»::"
2849
2850
#: bzrlib/builtins.py:3907
2851
msgid " bzr alias ll"
2852
msgstr " bzr alias ll"
2853
2854
#: bzrlib/builtins.py:3909
2855
msgid " Set an alias for 'll'::"
2856
msgstr " Establece un alias para «ll»::"
2857
2858
#: bzrlib/builtins.py:3911
2859
msgid " bzr alias ll=\"log --line -r-10..-1\""
2860
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2861
2862
#: bzrlib/builtins.py:3913
2863
msgid " To remove an alias for 'll'::"
2864
msgstr " Para eliminar un alias de «ll»::"
2865
2866
#: bzrlib/builtins.py:3915
2867
msgid " bzr alias --remove ll"
2868
msgstr " bzr alias --remove ll"
2869
2870
#: bzrlib/builtins.py:3920
2871
msgid "Remove the alias."
2872
msgstr "Elimina los alias."
2873
2874
#: bzrlib/builtins.py:3938
2875
msgid "bzr alias --remove expects an alias to remove."
2876
msgstr ""
2877
2878
#: bzrlib/builtins.py:4119
2879
msgid ""
2880
"subunit not available. subunit needs to be installed to use --subunit."
2881
msgstr ""
2882
2883
#: bzrlib/builtins.py:4136
2884
msgid ""
2885
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2886
msgstr ""
2887
"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
2888
2889
#: bzrlib/builtins.py:4183
2890
msgid "Show version of bzr."
2891
msgstr "Muestra la versión de bzr."
2892
2893
#: bzrlib/builtins.py:4187
2894
msgid "Print just the version number."
2895
msgstr "Solamente imprime el número de versión."
2896
2897
#: bzrlib/builtins.py:4206
2898
msgid "It sure does!\n"
2899
msgstr "¡Seguro que si!\n"
2900
2901
#: bzrlib/builtins.py:4230
2902
#, python-format
2903
msgid "merge base is revision %s\n"
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4234
2907
msgid "Perform a three-way merge."
2908
msgstr "Realiza una fusión de tres vías."
2909
2910
#: bzrlib/builtins.py:4236
2911
msgid ""
2912
"The source of the merge can be specified either in the form of a branch,\n"
2913
"or in the form of a path to a file containing a merge directive generated\n"
2914
"with bzr send. If neither is specified, the default is the upstream branch\n"
2915
"or the branch most recently merged using --remember. The source of the\n"
2916
"merge may also be specified in the form of a path to a file in another\n"
2917
"branch: in this case, only the modifications to that file are merged into\n"
2918
"the current working tree."
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4244
2922
msgid ""
2923
"When merging from a branch, by default bzr will try to merge in all new\n"
2924
"work from the other branch, automatically determining an appropriate base\n"
2925
"revision. If this fails, you may need to give an explicit base."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4248
2929
msgid ""
2930
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2931
"try to merge in all new work up to and including revision OTHER."
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4251
2935
msgid ""
2936
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2937
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2938
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2939
"not already contain revision BASE, such a merge is commonly referred to as\n"
2940
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2941
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2942
"changes from the other branch is not stored in the commit."
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4259
2946
msgid "Revision numbers are always relative to the source branch."
2947
msgstr ""
2948
"Los números de revisión están siempre relacionados con la rama origen."
2949
2950
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2951
msgid ""
2952
"Merge will do its best to combine the changes in two branches, but there\n"
2953
"are some kinds of problems only a human can fix. When it encounters those,\n"
2954
"it will mark a conflict. A conflict means that you need to fix something,\n"
2955
"before you can commit."
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:4266
2959
msgid ""
2960
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2961
msgstr ""
2962
"Use bzr resolve cuando tenga un problema arreglado. Vea también bzr "
2963
"conflicts."
2964
2965
#: bzrlib/builtins.py:4268
2966
msgid ""
2967
"If there is no default branch set, the first merge will set it (use\n"
2968
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2969
"to use the default. To change the default, use --remember. The value will\n"
2970
"only be saved if the remote location can be accessed."
2971
msgstr ""
2972
2973
#: bzrlib/builtins.py:4273
2974
msgid ""
2975
"The results of the merge are placed into the destination working\n"
2976
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2977
"committed to record the result of the merge."
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4277
2981
msgid ""
2982
"merge refuses to run if there are any uncommitted changes, unless\n"
2983
"--force is given. If --force is given, then the changes from the source \n"
2984
"will be merged with the current working tree, including any uncommitted\n"
2985
"changes in the tree. The --force option can also be used to create a\n"
2986
"merge revision which has more than two parents."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4283
2990
msgid ""
2991
"If one would like to merge changes from the working tree of the other\n"
2992
"branch without merging any committed revisions, the --uncommitted option\n"
2993
"can be given."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4287
2997
msgid ""
2998
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2999
"you to apply each diff hunk and file change, similar to \"shelve\"."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4290
3003
msgid ""
3004
":Examples:\n"
3005
" To merge all new revisions from bzr.dev::"
3006
msgstr ""
3007
":Ejemplos:\n"
3008
" Para fusionar todas las revisiones nuevas de bzr.dev::"
3009
3010
#: bzrlib/builtins.py:4293
3011
msgid " bzr merge ../bzr.dev"
3012
msgstr " bzr merge ../bzr.dev"
3013
3014
#: bzrlib/builtins.py:4295
3015
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3016
msgstr " Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
3017
3018
#: bzrlib/builtins.py:4297
3019
msgid " bzr merge -r 82 ../bzr.dev"
3020
msgstr " bzr merge -r 82 ../bzr.dev"
3021
3022
#: bzrlib/builtins.py:4299
3023
msgid " To merge the changes introduced by 82, without previous changes::"
3024
msgstr ""
3025
" Para fusionar los cambios introducidos por 82, sin cambios previos::"
3026
3027
#: bzrlib/builtins.py:4301
3028
msgid " bzr merge -r 81..82 ../bzr.dev"
3029
msgstr " bzr merge -r 81..82 ../bzr.dev"
3030
3031
#: bzrlib/builtins.py:4303
3032
msgid " To apply a merge directive contained in /tmp/merge::"
3033
msgstr " Para aplicar una directiva de fusión contenida en /tmp/merge::"
3034
3035
#: bzrlib/builtins.py:4305
3036
msgid " bzr merge /tmp/merge"
3037
msgstr " bzr merge /tmp/merge"
3038
3039
#: bzrlib/builtins.py:4307
3040
msgid ""
3041
" To create a merge revision with three parents from two branches\n"
3042
" feature1a and feature1b:"
3043
msgstr ""
3044
3045
#: bzrlib/builtins.py:4310
3046
msgid ""
3047
" bzr merge ../feature1a\n"
3048
" bzr merge ../feature1b --force\n"
3049
" bzr commit -m 'revision with three parents'"
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:4322
3053
msgid "Merge even if the destination tree has uncommitted changes."
3054
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin ejecutar."
3055
3056
#: bzrlib/builtins.py:4328
3057
msgid ""
3058
"Apply uncommitted changes from a working copy, instead of branch changes."
3059
msgstr ""
3060
"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
3061
"de rama."
3062
3063
#: bzrlib/builtins.py:4330
3064
msgid ""
3065
"If the destination is already completely merged into the source, pull from "
3066
"the source rather than merging. When this happens, you do not need to "
3067
"commit the result."
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:4335
3071
msgid ""
3072
"Branch to merge into, rather than the one containing the working directory."
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:4337
3076
msgid "Instead of merging, show a diff of the merge."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:4339
3080
msgid "Select changes interactively."
3081
msgstr "Seleccionar cambios de manera interactiva."
3082
3083
#: bzrlib/builtins.py:4361
3084
msgid ""
3085
"Merging into empty branches not currently supported, "
3086
"https://bugs.launchpad.net/bzr/+bug/308562"
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:4388
3090
msgid "Cannot use --uncommitted with bundles or merge directives."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:4399
3094
msgid "Cannot use --uncommitted and --revision at the same time."
3095
msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
3096
3097
#: bzrlib/builtins.py:4419
3098
msgid "merger: "
3099
msgstr "fusión: "
3100
3101
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3102
msgid "Nothing to do."
3103
msgstr "Nada que hacer."
3104
3105
#: bzrlib/builtins.py:4425
3106
msgid "Cannot pull individual files"
3107
msgstr "No se puede tirar de archivos individuales"
3108
3109
#: bzrlib/builtins.py:4433
3110
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3111
msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
3112
3113
#: bzrlib/builtins.py:4491
3114
#, python-format
3115
msgid "Show-base is not supported for this merge type. %s"
3116
msgstr "Show-base no está permitido en este tipo de fusión. %s"
3117
3118
#: bzrlib/builtins.py:4500
3119
#, python-format
3120
msgid "Conflict reduction is not supported for merge type %s."
3121
msgstr ""
3122
"La reducción de conflicot no está permitida para el tipo de fusión %s."
3123
3124
#: bzrlib/builtins.py:4504
3125
msgid "Cannot do conflict reduction and show base."
3126
msgstr ""
3127
3128
#: bzrlib/builtins.py:4615
3129
msgid "No location specified or remembered"
3130
msgstr "No hay ubicación especificada o recordada"
3131
3132
#: bzrlib/builtins.py:4617
3133
msgid "{0} remembered {1} location {2}"
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:4623
3137
msgid "Redo a merge."
3138
msgstr "Rehacer una fusión."
3139
3140
#: bzrlib/builtins.py:4625
3141
msgid ""
3142
"Use this if you want to try a different merge technique while resolving\n"
3143
"conflicts. Some merge techniques are better than others, and remerge\n"
3144
"lets you try different ones on different files."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:4629
3148
msgid ""
3149
"The options for remerge have the same meaning and defaults as the ones for\n"
3150
"merge. The difference is that remerge can (only) be run when there is a\n"
3151
"pending merge, and it lets you specify particular files."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:4633
3155
msgid ""
3156
":Examples:\n"
3157
" Re-do the merge of all conflicted files, and show the base text in\n"
3158
" conflict regions, in addition to the usual THIS and OTHER texts::"
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:4637
3162
msgid " bzr remerge --show-base"
3163
msgstr " bzr remerge --show-base"
3164
3165
#: bzrlib/builtins.py:4639
3166
msgid ""
3167
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3168
" additional processing to reduce the size of conflict regions::"
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:4642
3172
msgid " bzr remerge --merge-type weave --reprocess foobar"
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:4649
3176
msgid "Show base revision text in conflicts."
3177
msgstr "Mostrar el texto de revisión base en los conflictos."
3178
3179
#: bzrlib/builtins.py:4661
3180
msgid ""
3181
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3182
"merges."
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:4717
3186
msgid "Revert files to a previous revision."
3187
msgstr "Revierte los archivos a la revisión previa."
3188
3189
#: bzrlib/builtins.py:4719
3190
msgid ""
3191
"Giving a list of files will revert only those files. Otherwise, all files\n"
3192
"will be reverted. If the revision is not specified with '--revision', the\n"
3193
"last committed revision is used."
3194
msgstr ""
3195
3196
#: bzrlib/builtins.py:4723
3197
msgid ""
3198
"To remove only some changes, without reverting to a prior version, use\n"
3199
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3200
"will remove the changes introduced by the second last commit (-2), without\n"
3201
"affecting the changes introduced by the last commit (-1). To remove\n"
3202
"certain changes on a hunk-by-hunk basis, see the shelve command."
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:4729
3206
msgid ""
3207
"By default, any files that have been manually changed will be backed up\n"
3208
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3209
"'.~#~' appended to their name, where # is a number."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:4733
3213
msgid ""
3214
"When you provide files, you can use their current pathname or the pathname\n"
3215
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3216
"name. If you name a directory, all the contents of that directory will be\n"
3217
"reverted."
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:4738
3221
msgid ""
3222
"If you have newly added files since the target revision, they will be\n"
3223
"removed. If the files to be removed have been changed, backups will be\n"
3224
"created as above. Directories containing unknown files will not be\n"
3225
"deleted."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:4743
3229
msgid ""
3230
"The working tree contains a list of revisions that have been merged but\n"
3231
"not yet committed. These revisions will be included as additional parents\n"
3232
"of the next commit. Normally, using revert clears that list as well as\n"
3233
"reverting the files. If any files are specified, revert leaves the list\n"
3234
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3235
".`` in the tree root to revert all files but keep the recorded merges,\n"
3236
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3237
"reverting any files."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:4752
3241
msgid ""
3242
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3243
"changes from a branch in a single revision. To do this, perform the merge\n"
3244
"as desired. Then doing revert with the \"--forget-merges\" option will "
3245
"keep\n"
3246
"the content of the tree as it was, but it will clear the list of pending\n"
3247
"merges. The next commit will then contain all of the changes that are\n"
3248
"present in the other branch, but without any other parent revisions.\n"
3249
"Because this technique forgets where these changes originated, it may\n"
3250
"cause additional conflicts on later merges involving the same source and\n"
3251
"target branches."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:4766
3255
msgid "Do not save backups of reverted files."
3256
msgstr "No guardar respaldos de los archivos revertidos"
3257
3258
#: bzrlib/builtins.py:4768
3259
msgid "Remove pending merge marker, without changing any files."
3260
msgstr ""
3261
"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
3262
3263
#: bzrlib/builtins.py:4799
3264
msgid ""
3265
"Show help on a command or other topic.\n"
3266
" "
3267
msgstr ""
3268
"Muestra ayuda en una orden u otro tema.\n"
3269
" "
3270
3271
#: bzrlib/builtins.py:4804
3272
msgid "Show help on all commands."
3273
msgstr "Muestra ayuda en todas las órdenes"
3274
3275
#: bzrlib/builtins.py:4833
3276
msgid "Show unmerged/unpulled revisions between two branches."
3277
msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
3278
3279
#: bzrlib/builtins.py:4835
3280
msgid "OTHER_BRANCH may be local or remote."
3281
msgstr "OTHER_BRANCH puede ser local o remoto."
3282
3283
#: bzrlib/builtins.py:4837
3284
msgid ""
3285
"To filter on a range of revisions, you can use the command -r begin..end\n"
3286
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3287
"also valid.\n"
3288
" \n"
3289
":Exit values:\n"
3290
" 1 - some missing revisions\n"
3291
" 0 - no missing revisions"
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:4847
3295
msgid ""
3296
" Determine the missing revisions between this and the branch at the\n"
3297
" remembered pull location::"
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:4850
3301
msgid " bzr missing"
3302
msgstr " bzr missing"
3303
3304
#: bzrlib/builtins.py:4852
3305
msgid " Determine the missing revisions between this and another branch::"
3306
msgstr " Determina las revisiones perdidas entre esta y otra rama::"
3307
3308
#: bzrlib/builtins.py:4854
3309
msgid " bzr missing http://server/branch"
3310
msgstr " bzr missing http://server/branch"
3311
3312
#: bzrlib/builtins.py:4856
3313
msgid ""
3314
" Determine the missing revisions up to a specific revision on the other\n"
3315
" branch::"
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:4859
3319
msgid " bzr missing -r ..-10"
3320
msgstr " bzr missing -r ..-10"
3321
3322
#: bzrlib/builtins.py:4861
3323
msgid ""
3324
" Determine the missing revisions up to a specific revision on this\n"
3325
" branch::"
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:4864
3329
msgid " bzr missing --my-revision ..-10"
3330
msgstr " bzr missing --my-revision ..-10"
3331
3332
#: bzrlib/builtins.py:4871
3333
msgid "Reverse the order of revisions."
3334
msgstr "Revierte el orden de las revisiones."
3335
3336
#: bzrlib/builtins.py:4873
3337
msgid "Display changes in the local branch only."
3338
msgstr "Muestra cambios solo en la rama local."
3339
3340
#: bzrlib/builtins.py:4874
3341
msgid "Same as --mine-only."
3342
msgstr "Lo mismo que --mine-only."
3343
3344
#: bzrlib/builtins.py:4876
3345
msgid "Display changes in the remote branch only."
3346
msgstr "Muestra cambios solo en la rama remota."
3347
3348
#: bzrlib/builtins.py:4877
3349
msgid "Same as --theirs-only."
3350
msgstr "Lo mismo que --theirs-only."
3351
3352
#: bzrlib/builtins.py:4882
3353
msgid ""
3354
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3355
"details."
3356
msgstr ""
3357
"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
3358
"tener más detalles."
3359
3360
#: bzrlib/builtins.py:4886
3361
msgid ""
3362
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3363
"details."
3364
msgstr ""
3365
"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
3366
"para tener más detalles."
3367
3368
#: bzrlib/builtins.py:4889
3369
msgid "Show all revisions in addition to the mainline ones."
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:4943
3373
msgid "No peer location known or specified."
3374
msgstr "No hay ubicación del par conocida o especificada."
3375
3376
#: bzrlib/builtins.py:4947
3377
msgid "Using saved parent location: {0}\n"
3378
msgstr "Usar ubicación padre guardada: {0}\n"
3379
3380
#: bzrlib/builtins.py:4980
3381
#, python-format
3382
msgid "You have %d extra revision:\n"
3383
msgid_plural "You have %d extra revisions:\n"
3384
msgstr[0] "Tiene %d revisión extra:\n"
3385
msgstr[1] "Tiene %d revisiones extra:\n"
3386
3387
#: bzrlib/builtins.py:4996
3388
#, python-format
3389
msgid "You are missing %d revision:\n"
3390
msgid_plural "You are missing %d revisions:\n"
3391
msgstr[0] "Tiene %d revisión perdida:\n"
3392
msgstr[1] "Tiene %d revisiones perdidas:\n"
3393
3394
#: bzrlib/builtins.py:5008
3395
msgid "This branch has no new revisions.\n"
3396
msgstr "Esta rama no tiene revisiones.\n"
3397
3398
#: bzrlib/builtins.py:5011
3399
msgid "Other branch has no new revisions.\n"
3400
msgstr "Otra rama no tiene revisiones nuevas.\n"
3401
3402
#: bzrlib/builtins.py:5016
3403
msgid "Branches are up to date.\n"
3404
msgstr "La rama está actualizada:\n"
3405
3406
#: bzrlib/builtins.py:5027
3407
msgid "Compress the data within a repository."
3408
msgstr "Comprime los datos en un repositorio."
3409
3410
#: bzrlib/builtins.py:5029
3411
msgid ""
3412
"This operation compresses the data within a bazaar repository. As\n"
3413
"bazaar supports automatic packing of repository, this operation is\n"
3414
"normally not required to be done manually."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5033
3418
msgid ""
3419
"During the pack operation, bazaar takes a backup of existing repository\n"
3420
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3421
"automatically when it is safe to do so. To save disk space by removing\n"
3422
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3423
"used."
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:5039
3427
msgid ""
3428
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3429
"during or immediately after repacking, you may be left with a state\n"
3430
"where the deletion has been written to disk but the new packs have not\n"
3431
"been. In this case the repository may be unusable."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5048
3435
msgid "Delete obsolete packs to save disk space."
3436
msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
3437
3438
#: bzrlib/builtins.py:5062
3439
msgid "List the installed plugins."
3440
msgstr "Lista los complementos instalados."
3441
3442
#: bzrlib/builtins.py:5064
3443
msgid ""
3444
"This command displays the list of installed plugins including\n"
3445
"version of plugin and a short description of each."
3446
msgstr ""
3447
"Esta orden muestra la lista de complementos instalados incluyendo\n"
3448
"versión del complemento y una breve descripción de cada uno."
3449
3450
#: bzrlib/builtins.py:5067
3451
msgid "--verbose shows the path where each plugin is located."
3452
msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
3453
3454
#: bzrlib/builtins.py:5069
3455
msgid ""
3456
"A plugin is an external component for Bazaar that extends the\n"
3457
"revision control system, by adding or replacing code in Bazaar.\n"
3458
"Plugins can do a variety of things, including overriding commands,\n"
3459
"adding new commands, providing additional network transports and\n"
3460
"customizing log output."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:5075
3464
msgid ""
3465
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3466
"for further information on plugins including where to find them and how to\n"
3467
"install them. Instructions are also provided there on how to write new\n"
3468
"plugins using the Python programming language."
3469
msgstr ""
3470
3471
#: bzrlib/builtins.py:5091
3472
msgid "Show testament (signing-form) of a revision."
3473
msgstr ""
3474
3475
#: bzrlib/builtins.py:5094
3476
msgid "Produce long-format testament."
3477
msgstr "Produce testamento en formato largo."
3478
3479
#: bzrlib/builtins.py:5096
3480
msgid "Produce a strict-format testament."
3481
msgstr "Produce testamento en formato estricto."
3482
3483
#: bzrlib/builtins.py:5122
3484
msgid "Show the origin of each line in a file."
3485
msgstr "Muestra el origen de cada línea en un archivo"
3486
3487
#: bzrlib/builtins.py:5124
3488
msgid ""
3489
"This prints out the given file with an annotation on the left side\n"
3490
"indicating which revision, author and date introduced the change."
3491
msgstr ""
3492
3493
#: bzrlib/builtins.py:5127
3494
msgid ""
3495
"If the origin is the same for a run of consecutive lines, it is\n"
3496
"shown only at the top, unless the --all option is given."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:5135
3500
msgid "Show annotations on all lines."
3501
msgstr "Muestra anotaciones en todas las líneas."
3502
3503
#: bzrlib/builtins.py:5136
3504
msgid "Show commit date in annotations."
3505
msgstr "Muestra la fecha de ejecución en anotaciones."
3506
3507
#: bzrlib/builtins.py:5223
3508
msgid "Cannot sign a range of non-revision-history revisions"
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5235
3512
msgid "Please supply either one revision, or a range."
3513
msgstr "Proporcione una revisión o un rango."
3514
3515
#: bzrlib/builtins.py:5239
3516
msgid ""
3517
"Convert the current branch into a checkout of the supplied branch.\n"
3518
"If no branch is supplied, rebind to the last bound location."
3519
msgstr ""
3520
3521
#: bzrlib/builtins.py:5242
3522
msgid ""
3523
"Once converted into a checkout, commits must succeed on the master branch\n"
3524
"before they will be applied to the local branch."
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5245
3528
msgid ""
3529
"Bound branches use the nickname of its master branch unless it is set\n"
3530
"locally, in which case binding will update the local nickname to be\n"
3531
"that of the master."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5260
3535
msgid "No location supplied. This format does not remember old locations."
3536
msgstr ""
3537
"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
3538
3539
#: bzrlib/builtins.py:5265
3540
msgid "Branch is already bound"
3541
msgstr "La rama ya está asociada"
3542
3543
#: bzrlib/builtins.py:5267
3544
msgid "No location supplied and no previous location known"
3545
msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
3546
3547
#: bzrlib/builtins.py:5273
3548
msgid "These branches have diverged. Try merging, and then bind again."
3549
msgstr ""
3550
"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
3551
3552
#: bzrlib/builtins.py:5280
3553
msgid "Convert the current checkout into a regular branch."
3554
msgstr "Convertir la comprobación actual en una rama regular."
3555
3556
#: bzrlib/builtins.py:5282
3557
msgid ""
3558
"After unbinding, the local branch is considered independent and subsequent\n"
3559
"commits will be local only."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5293
3563
msgid "Local branch is not bound"
3564
msgstr "La rama local no está vinculada"
3565
3566
#: bzrlib/builtins.py:5297
3567
msgid "Remove the last committed revision."
3568
msgstr "Elimina la última revisión ejecutada."
3569
3570
#: bzrlib/builtins.py:5299
3571
msgid ""
3572
"--verbose will print out what is being removed.\n"
3573
"--dry-run will go through all the motions, but not actually\n"
3574
"remove anything."
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5303
3578
msgid ""
3579
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3580
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3581
"branch at revision 15."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5307
3585
msgid ""
3586
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3587
"it may make is to restore any pending merges that were present before\n"
3588
"the commit."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5318
3592
msgid "Don't actually make changes."
3593
msgstr "En relaidad no hace cambios."
3594
3595
#: bzrlib/builtins.py:5319
3596
msgid "Say yes to all questions."
3597
msgstr "Decir sí a todas las preguntas."
3598
3599
#: bzrlib/builtins.py:5321
3600
msgid "Keep tags that point to removed revisions."
3601
msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
3602
3603
#: bzrlib/builtins.py:5323
3604
msgid "Only remove the commits from the local branch when in a checkout."
3605
msgstr ""
3606
"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
3607
3608
#: bzrlib/builtins.py:5372
3609
msgid "No revisions to uncommit.\n"
3610
msgstr "No hay revisiones para desejecutar.\n"
3611
3612
#: bzrlib/builtins.py:5387
3613
msgid "Dry-run, pretending to remove the above revisions.\n"
3614
msgstr ""
3615
3616
#: bzrlib/builtins.py:5390
3617
msgid "The above revision(s) will be removed.\n"
3618
msgstr "Las revisiones de arriba se eliminarán.\n"
3619
3620
#: bzrlib/builtins.py:5394
3621
msgid "Uncommit these revisions"
3622
msgstr "Desejecutar estas revisiones"
3623
3624
#: bzrlib/builtins.py:5397
3625
msgid "Canceled\n"
3626
msgstr "Cancelado\n"
3627
3628
#: bzrlib/builtins.py:5404
3629
#, python-format
3630
msgid ""
3631
"You can restore the old tip by running:\n"
3632
" bzr pull . -r revid:%s\n"
3633
msgstr ""
3634
"Puede restaurar el consejo antiguo ejecutando:\n"
3635
" bzr pull . -r revid:%s\n"
3636
3637
#: bzrlib/builtins.py:5409
3638
msgid "Break a dead lock."
3639
msgstr "Romper un bloqueo."
3640
3641
#: bzrlib/builtins.py:5411
3642
msgid ""
3643
"This command breaks a lock on a repository, branch, working directory or\n"
3644
"config file."
3645
msgstr ""
3646
"Esta orden rompe un bloqueo en un repositorio, rama, directorio de trabajo "
3647
"o\n"
3648
"archivo de configuración."
3649
3650
#: bzrlib/builtins.py:5414
3651
msgid ""
3652
"CAUTION: Locks should only be broken when you are sure that the process\n"
3653
"holding the lock has been stopped."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5417
3657
msgid ""
3658
"You can get information on what locks are open via the 'bzr info\n"
3659
"[location]' command."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5420
3663
msgid ""
3664
":Examples:\n"
3665
" bzr break-lock\n"
3666
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3667
" bzr break-lock --conf ~/.bazaar"
3668
msgstr ""
3669
":Ejemplos:\n"
3670
" bzr break-lock\n"
3671
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3672
" bzr break-lock --conf ~/.bazaar"
3673
3674
#: bzrlib/builtins.py:5429
3675
msgid "LOCATION is the directory where the config lock is."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5431
3679
msgid "Do not ask for confirmation before breaking the lock."
3680
msgstr "No pedir confirmación antes de romper el bloqueo."
3681
3682
#: bzrlib/builtins.py:5466
3683
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5467
3687
msgid "Run the bzr server."
3688
msgstr "Ejecutar el servidor bzr."
3689
3690
#: bzrlib/builtins.py:5473
3691
msgid "Serve on stdin/out for use from inetd or sshd."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5474
3695
msgid "protocol"
3696
msgstr "protocolo"
3697
3698
#: bzrlib/builtins.py:5475
3699
msgid "Protocol to serve."
3700
msgstr "Protocolo a servir."
3701
3702
#: bzrlib/builtins.py:5479
3703
msgid ""
3704
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3705
"Passing 0 as the port number will result in a dynamically allocated port. "
3706
"The default port depends on the protocol."
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:5485
3710
msgid "Serve contents of this directory."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5487
3714
msgid ""
3715
"By default the server is a readonly server. Supplying --allow-writes "
3716
"enables write access to the contents of the served directory and below. "
3717
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3718
"of external authentication is arranged supplying this option leads to global "
3719
"uncontrolled write access to your file system."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:5496
3723
msgid "Override the default idle client timeout (5min)."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:5546
3727
msgid "Combine a tree into its containing tree."
3728
msgstr "Combina un árbol en su árbol contenedor."
3729
3730
#: bzrlib/builtins.py:5548
3731
msgid "This command requires the target tree to be in a rich-root format."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:5550
3735
msgid ""
3736
"The TREE argument should be an independent tree, inside another tree, but\n"
3737
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3738
"running \"bzr branch\" with the target inside a tree.)"
3739
msgstr ""
3740
3741
#: bzrlib/builtins.py:5554
3742
msgid ""
3743
"The result is a combined tree, with the subtree no longer an independent\n"
3744
"part. This is marked as a merge of the subtree into the containing tree,\n"
3745
"and all history is preserved."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:5572
3749
#, python-format
3750
msgid ""
3751
"Can't join trees because %s doesn't support rich root data.\n"
3752
"You can use bzr upgrade on the repository."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3756
msgid "Cannot join {0}. {1}"
3757
msgstr "No se puede unir {0}. {1}"
3758
3759
#: bzrlib/builtins.py:5592
3760
msgid "Split a subdirectory of a tree into a separate tree."
3761
msgstr "Divide un subdirectorio de un árbol en un árbol separado."
3762
3763
#: bzrlib/builtins.py:5594
3764
msgid ""
3765
"This command will produce a target tree in a format that supports\n"
3766
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3767
"converted into earlier formats like 'dirstate-tags'."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:5598
3771
msgid ""
3772
"The TREE argument should be a subdirectory of a working tree. That\n"
3773
"subdirectory will be converted into an independent tree, with its own\n"
3774
"branch. Commits in the top-level tree will not apply to the new subtree."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:5678
3778
msgid "No submit branch specified or known"
3779
msgstr "No se ha enviado una rama especificada o conocida"
3780
3781
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3782
msgid "No public branch specified or known"
3783
msgstr "No hay una rama especificada o conocida pública"
3784
3785
#: bzrlib/builtins.py:5691
3786
msgid "bzr merge-directive takes at most two one revision identifiers"
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:5700
3790
msgid "No revisions to bundle."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:5719
3794
msgid "Mail or create a merge-directive for submitting changes."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:5721
3798
msgid "A merge directive provides many things needed for requesting merges:"
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:5723
3802
msgid "* A machine-readable description of the merge to perform"
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:5725
3806
msgid "* An optional patch that is a preview of the changes requested"
3807
msgstr ""
3808
"* Una ruta opcional que es una vista previa de los cambios requeridos"
3809
3810
#: bzrlib/builtins.py:5727
3811
msgid ""
3812
"* An optional bundle of revision data, so that the changes can be applied\n"
3813
" directly from the merge directive, without retrieving data from a\n"
3814
" branch."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:5731
3818
msgid ""
3819
"`bzr send` creates a compact data set that, when applied using bzr\n"
3820
"merge, has the same effect as merging from the source branch. "
3821
msgstr ""
3822
3823
#: bzrlib/builtins.py:5734
3824
msgid ""
3825
"By default the merge directive is self-contained and can be applied to any\n"
3826
"branch containing submit_branch in its ancestory without needing access to\n"
3827
"the source branch."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:5738
3831
msgid ""
3832
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3833
"revisions, but only a structured request to merge from the\n"
3834
"public_location. In that case the public_branch is needed and it must be\n"
3835
"up-to-date and accessible to the recipient. The public_branch is always\n"
3836
"included if known, so that people can check it later."
3837
msgstr ""
3838
3839
#: bzrlib/builtins.py:5744
3840
msgid ""
3841
"The submit branch defaults to the parent of the source branch, but can be\n"
3842
"overridden. Both submit branch and public branch will be remembered in\n"
3843
"branch.conf the first time they are used for a particular branch. The\n"
3844
"source branch defaults to that containing the working directory, but can\n"
3845
"be changed using --from."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:5750
3849
msgid ""
3850
"Both the submit branch and the public branch follow the usual behavior with\n"
3851
"respect to --remember: If there is no default location set, the first send\n"
3852
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3853
"omit the location to use the default. To change the default, use\n"
3854
"--remember. The value will only be saved if the location can be accessed."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:5756
3858
msgid ""
3859
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3860
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3861
"If a public location is known for the submit_branch, that location is used\n"
3862
"in the merge directive."
3863
msgstr ""
3864
3865
#: bzrlib/builtins.py:5761
3866
msgid ""
3867
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3868
"given, in which case it is sent to a file."
3869
msgstr ""
3870
3871
#: bzrlib/builtins.py:5764
3872
msgid ""
3873
"Mail is sent using your preferred mail program. This should be transparent\n"
3874
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3875
"If the preferred client can't be found (or used), your editor will be used."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:5768
3879
msgid ""
3880
"To use a specific mail program, set the mail_client configuration option.\n"
3881
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3882
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3883
"(MacOS X's\n"
3884
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3885
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3886
"add\n"
3887
"supported clients."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:5775
3891
msgid ""
3892
"If mail is being sent, a to address is required. This can be supplied\n"
3893
"either on the commandline, by setting the submit_to configuration\n"
3894
"option in the branch itself or the child_submit_to configuration option\n"
3895
"in the submit branch."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:5780
3899
msgid ""
3900
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3901
"and\n"
3902
"merge directive format 2. It is significantly faster and smaller than\n"
3903
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3904
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3905
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:5786
3909
msgid ""
3910
"The merge directives created by bzr send may be applied using bzr merge or\n"
3911
"bzr pull by specifying a file containing a merge directive as the location."
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:5789
3915
msgid ""
3916
"bzr send makes extensive use of public locations to map local locations "
3917
"into\n"
3918
"URLs that can be used by other people. See `bzr help configuration` to\n"
3919
"set them, and use `bzr info` to display them."
3920
msgstr ""
3921
3922
#: bzrlib/builtins.py:5813
3923
msgid "Write merge directive to this file or directory; use - for stdout."
3924
msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
3925
3926
#: bzrlib/builtins.py:5817
3927
msgid ""
3928
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3929
"strict disables the check."
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:5819
3933
msgid "Mail the request to this address."
3934
msgstr "Enviar por correo la petición a esta dirección"
3935
3936
#: bzrlib/builtins.py:5823
3937
msgid "Body for the email."
3938
msgstr "Cuerpo para el correo."
3939
3940
#: bzrlib/builtins.py:5876
3941
msgid "Do not include a bundle in the merge directive."
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:5877
3945
msgid "Do not include a preview patch in the merge directive."
3946
msgstr "No incluir una ruta de vista previa en la directiva de fusión."
3947
3948
#: bzrlib/builtins.py:5880
3949
msgid "Remember submit and public branch."
3950
msgstr "Recordar el envío y la rama pública."
3951
3952
#: bzrlib/builtins.py:5882
3953
msgid ""
3954
"Branch to generate the submission from, rather than the one containing the "
3955
"working directory."
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3959
msgid "format"
3960
msgstr "formato"
3961
3962
#: bzrlib/builtins.py:5893
3963
msgid "Use the specified output format."
3964
msgstr "Usar el formato de salida especificado."
3965
3966
#: bzrlib/builtins.py:5915
3967
msgid "Create, remove or modify a tag naming a revision."
3968
msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
3969
3970
#: bzrlib/builtins.py:5917
3971
msgid ""
3972
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3973
"(--revision) option can be given -rtag:X, where X is any previously\n"
3974
"created tag."
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:5921
3978
msgid ""
3979
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3980
"along when you branch, push, pull or merge."
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:5924
3984
msgid ""
3985
"It is an error to give a tag name that already exists unless you pass\n"
3986
"--force, in which case the tag is moved to point to the new revision."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:5927
3990
msgid ""
3991
"To rename a tag (change the name but keep it on the same revsion), run "
3992
"``bzr\n"
3993
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:5930
3997
msgid ""
3998
"If no tag name is specified it will be determined through the \n"
3999
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4000
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4001
"details."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:5940
4005
msgid "Delete this tag rather than placing it."
4006
msgstr "Eliminar esta etiqueta en lugar de colocarla."
4007
4008
#: bzrlib/builtins.py:5943
4009
msgid "Branch in which to place the tag."
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:5945
4013
msgid "Replace existing tags."
4014
msgstr "Reemplazar las etiquetas existentes."
4015
4016
#: bzrlib/builtins.py:5960
4017
msgid "No tag specified to delete."
4018
msgstr "No hay etiquetas especificadas para eliminar."
4019
4020
#: bzrlib/builtins.py:5962
4021
#, python-format
4022
msgid "Deleted tag %s."
4023
msgstr "Etiqueta%s eliminada."
4024
4025
#: bzrlib/builtins.py:5976
4026
msgid "Please specify a tag name."
4027
msgstr "Especifique un nombre de etiqueta."
4028
4029
#: bzrlib/builtins.py:5984
4030
#, python-format
4031
msgid "Tag %s already exists for that revision."
4032
msgstr "La etiqueta %s existe para esta revisión."
4033
4034
#: bzrlib/builtins.py:5988
4035
#, python-format
4036
msgid "Created tag %s."
4037
msgstr "Etiqueta %s creada."
4038
4039
#: bzrlib/builtins.py:5990
4040
#, python-format
4041
msgid "Updated tag %s."
4042
msgstr "Etiqueta actualizada %s."
4043
4044
#: bzrlib/builtins.py:5994
4045
msgid "List tags."
4046
msgstr "Listar etiquetas."
4047
4048
#: bzrlib/builtins.py:5996
4049
msgid ""
4050
"This command shows a table of tag names and the revisions they reference."
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6002
4054
msgid "Branch whose tags should be displayed."
4055
msgstr "Rama cuyas etiquetas se deben mostrar."
4056
4057
#: bzrlib/builtins.py:6004
4058
msgid "Sort tags by different criteria."
4059
msgstr "Ordenar etiquetas con diferentes criterios."
4060
4061
#: bzrlib/builtins.py:6004
4062
msgid "Sorting"
4063
msgstr "Ordenación"
4064
4065
#: bzrlib/builtins.py:6073
4066
msgid "Reconfigure the type of a bzr directory."
4067
msgstr "Reconfigura el tipo de un directorio bzr."
4068
4069
#: bzrlib/builtins.py:6075
4070
msgid "A target configuration must be specified."
4071
msgstr "Se debe especificar una configuración objetivo."
4072
4073
#: bzrlib/builtins.py:6077
4074
msgid ""
4075
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4076
"The order of preference is\n"
4077
"1. For a lightweight checkout, the current bound location.\n"
4078
"2. For branches that used to be checkouts, the previously-bound location.\n"
4079
"3. The push location.\n"
4080
"4. The parent location.\n"
4081
"If none of these is available, --bind-to must be specified."
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6091
4085
msgid "Tree type"
4086
msgstr "Tipo de árbol"
4087
4088
#: bzrlib/builtins.py:6092
4089
msgid "The relation between branch and tree."
4090
msgstr "La relación entre rama y árbol."
4091
4092
#: bzrlib/builtins.py:6094
4093
msgid "Reconfigure to be an unbound branch with no working tree."
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6095
4097
msgid "Reconfigure to be an unbound branch with a working tree."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6096
4101
msgid "Reconfigure to be a bound branch with a working tree."
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6097
4105
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6102
4109
msgid "Repository type"
4110
msgstr "Tipo de repositorio"
4111
4112
#: bzrlib/builtins.py:6103
4113
msgid "Location fo the repository."
4114
msgstr "Ubicación en el repositorio."
4115
4116
#: bzrlib/builtins.py:6105
4117
msgid ""
4118
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4119
msgstr ""
4120
4121
#: bzrlib/builtins.py:6107
4122
msgid "Reconfigure to use a shared repository."
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6111
4126
msgid "Trees in Repository"
4127
msgstr "Árboles en el repositorio"
4128
4129
#: bzrlib/builtins.py:6112
4130
msgid "Whether new branches in the repository have trees."
4131
msgstr "Si las ramas nuevas en el repositorio tienen árboles."
4132
4133
#: bzrlib/builtins.py:6114
4134
msgid ""
4135
"Reconfigure repository to create working trees on branches by default."
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6116
4139
msgid ""
4140
"Reconfigure repository to not create working trees on branches by default."
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6119
4144
msgid "Branch to bind checkout to."
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6121
4148
msgid "Perform reconfiguration even if local changes will be lost."
4149
msgstr ""
4150
"Realizar reconfiguración incluso si se han perdido los cambios locales."
4151
4152
#: bzrlib/builtins.py:6124
4153
msgid "Reconfigure a branch to be stacked on another branch."
4154
msgstr "Reconfigurar una rama para apilarla en otra rama."
4155
4156
#: bzrlib/builtins.py:6128
4157
msgid ""
4158
"Reconfigure a branch to be unstacked. This may require copying substantial "
4159
"data into it."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6138
4163
msgid "Can't use both --stacked-on and --unstacked"
4164
msgstr "No se pueden usar ambos --stacked-on y --unstacked"
4165
4166
#: bzrlib/builtins.py:6152
4167
msgid "No target configuration specified"
4168
msgstr "No se ha especificado una configuración objetivo"
4169
4170
#: bzrlib/builtins.py:6187
4171
msgid "Set the branch of a checkout and update."
4172
msgstr "Establezca la rama de una comprobación y actualización."
4173
4174
#: bzrlib/builtins.py:6189
4175
msgid ""
4176
"For lightweight checkouts, this changes the branch being referenced.\n"
4177
"For heavyweight checkouts, this checks that there are no local commits\n"
4178
"versus the current bound branch, then it makes the local branch a mirror\n"
4179
"of the new location and binds to it."
4180
msgstr ""
4181
4182
#: bzrlib/builtins.py:6194
4183
msgid ""
4184
"In both cases, the working tree is updated and uncommitted changes\n"
4185
"are merged. The user can commit or revert these as they desire."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6197
4189
msgid "Pending merges need to be committed or reverted before using switch."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6199
4193
msgid ""
4194
"The path to the branch to switch to can be specified relative to the parent\n"
4195
"directory of the current branch. For example, if you are currently in a\n"
4196
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4197
"/path/to/newbranch."
4198
msgstr ""
4199
4200
#: bzrlib/builtins.py:6204
4201
msgid ""
4202
"Bound branches use the nickname of its master branch unless it is set\n"
4203
"locally, in which case switching will update the local nickname to be\n"
4204
"that of the master."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6212
4208
msgid "Switch even if local commits will be lost."
4209
msgstr "Cambiar incluso si las ejecuciones se han perdido."
4210
4211
#: bzrlib/builtins.py:6215
4212
msgid "Create the target branch from this one before switching to it."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6229
4216
msgid "You must supply either a revision or a location"
4217
msgstr "Debe especificar una revisión o una ubicación"
4218
4219
#: bzrlib/builtins.py:6242
4220
msgid "cannot create branch without source branch"
4221
msgstr "no se puede crear una rama sin rama origen"
4222
4223
#: bzrlib/builtins.py:6262
4224
msgid "Manage filtered views."
4225
msgstr "Gestionar vistas filtradas."
4226
4227
#: bzrlib/builtins.py:6264
4228
msgid ""
4229
"Views provide a mask over the tree so that users can focus on\n"
4230
"a subset of a tree when doing their work. After creating a view,\n"
4231
"commands that support a list of files - status, diff, commit, etc -\n"
4232
"effectively have that list of files implicitly given each time.\n"
4233
"An explicit list of files can still be given but those files\n"
4234
"must be within the current view."
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6271
4238
msgid ""
4239
"In most cases, a view has a short life-span: it is created to make\n"
4240
"a selected change and is deleted once that change is committed.\n"
4241
"At other times, you may wish to create one or more named views\n"
4242
"and switch between them."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6276
4246
msgid ""
4247
"To disable the current view without deleting it, you can switch to\n"
4248
"the pseudo view called ``off``. This can be useful when you need\n"
4249
"to see the whole tree for an operation or two (e.g. merge) but\n"
4250
"want to switch back to your view after that."
4251
msgstr ""
4252
4253
#: bzrlib/builtins.py:6281
4254
msgid ""
4255
":Examples:\n"
4256
" To define the current view::"
4257
msgstr ""
4258
":Ejemplos:\n"
4259
" Para definir la vista actual::"
4260
4261
#: bzrlib/builtins.py:6284
4262
msgid " bzr view file1 dir1 ..."
4263
msgstr " bzr view file1 dir1 ..."
4264
4265
#: bzrlib/builtins.py:6286
4266
msgid " To list the current view::"
4267
msgstr " Para listar la vista actual::"
4268
4269
#: bzrlib/builtins.py:6288
4270
msgid " bzr view"
4271
msgstr " vista bzr"
4272
4273
#: bzrlib/builtins.py:6290
4274
msgid " To delete the current view::"
4275
msgstr " Para eliminar la vista actual::"
4276
4277
#: bzrlib/builtins.py:6292
4278
msgid " bzr view --delete"
4279
msgstr " bzr view --delete"
4280
4281
#: bzrlib/builtins.py:6294
4282
msgid " To disable the current view without deleting it::"
4283
msgstr " Para desactivar la vista actual sin eliminarla::"
4284
4285
#: bzrlib/builtins.py:6296
4286
msgid " bzr view --switch off"
4287
msgstr " bzr view --switch off"
4288
4289
#: bzrlib/builtins.py:6298
4290
msgid " To define a named view and switch to it::"
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6300
4294
msgid " bzr view --name view-name file1 dir1 ..."
4295
msgstr " bzr view --name view-name file1 dir1 ..."
4296
4297
#: bzrlib/builtins.py:6302
4298
msgid " To list a named view::"
4299
msgstr " Para lista la vista nombrada::"
4300
4301
#: bzrlib/builtins.py:6304
4302
msgid " bzr view --name view-name"
4303
msgstr " bzr view --name view-name"
4304
4305
#: bzrlib/builtins.py:6306
4306
msgid " To delete a named view::"
4307
msgstr " Para eliminar una vista nombrada::"
4308
4309
#: bzrlib/builtins.py:6308
4310
msgid " bzr view --name view-name --delete"
4311
msgstr " bzr view --name view-name --delete"
4312
4313
#: bzrlib/builtins.py:6310
4314
msgid " To switch to a named view::"
4315
msgstr " Para cambiar a una vista nombrada::"
4316
4317
#: bzrlib/builtins.py:6312
4318
msgid " bzr view --switch view-name"
4319
msgstr " bzr view --switch view-name"
4320
4321
#: bzrlib/builtins.py:6314
4322
msgid " To list all views defined::"
4323
msgstr " Para listar todas las vistas definidas::"
4324
4325
#: bzrlib/builtins.py:6316
4326
msgid " bzr view --all"
4327
msgstr " bzr view --all"
4328
4329
#: bzrlib/builtins.py:6318
4330
msgid " To delete all views::"
4331
msgstr " Para eliminar todas las vistas::"
4332
4333
#: bzrlib/builtins.py:6320
4334
msgid " bzr view --delete --all"
4335
msgstr " bzr view --delete --all"
4336
4337
#: bzrlib/builtins.py:6327
4338
msgid "Apply list or delete action to all views."
4339
msgstr ""
4340
4341
#: bzrlib/builtins.py:6330
4342
msgid "Delete the view."
4343
msgstr "Eliminar la vista."
4344
4345
#: bzrlib/builtins.py:6333
4346
msgid "Name of the view to define, list or delete."
4347
msgstr "Nombre de la vista a definir, listar o eliminar."
4348
4349
#: bzrlib/builtins.py:6337
4350
msgid "Name of the view to switch to."
4351
msgstr "Nombre de la vista a la que cambiar."
4352
4353
#: bzrlib/builtins.py:6356
4354
msgid "Both --delete and a file list specified"
4355
msgstr ""
4356
4357
#: bzrlib/builtins.py:6359
4358
msgid "Both --delete and --switch specified"
4359
msgstr "Ambos --delete y --switch especificados"
4360
4361
#: bzrlib/builtins.py:6362
4362
msgid "Deleted all views.\n"
4363
msgstr "Eliminar todas las vistas.\n"
4364
4365
#: bzrlib/builtins.py:6364
4366
msgid "No current view to delete"
4367
msgstr "No hay vista para eliminar"
4368
4369
#: bzrlib/builtins.py:6367
4370
#, python-format
4371
msgid "Deleted '%s' view.\n"
4372
msgstr "Vista «%s» eliminada.\n"
4373
4374
#: bzrlib/builtins.py:6371
4375
msgid "Both --switch and a file list specified"
4376
msgstr ""
4377
4378
#: bzrlib/builtins.py:6374
4379
msgid "Both --switch and --all specified"
4380
msgstr "Ambos --switch y --all especificados"
4381
4382
#: bzrlib/builtins.py:6377
4383
msgid "No current view to disable"
4384
msgstr "No hay vista actual que desactivar"
4385
4386
#: bzrlib/builtins.py:6379
4387
#, python-format
4388
msgid "Disabled '%s' view.\n"
4389
msgstr "Vista «%s» desactivada.\n"
4390
4391
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4392
msgid "Using '{0}' view: {1}\n"
4393
msgstr "Usar «{0}» vista: {1}\n"
4394
4395
#: bzrlib/builtins.py:6386
4396
msgid "Views defined:\n"
4397
msgstr "Vistas definidas:\n"
4398
4399
#: bzrlib/builtins.py:6395
4400
msgid "No views defined.\n"
4401
msgstr "No hay vista definida.\n"
4402
4403
#: bzrlib/builtins.py:6402
4404
msgid "Cannot change the 'off' pseudo view"
4405
msgstr ""
4406
4407
#: bzrlib/builtins.py:6410
4408
msgid "No current view.\n"
4409
msgstr "No hay vista actual.\n"
4410
4411
#: bzrlib/builtins.py:6413
4412
msgid "'{0}' view is: {1}\n"
4413
msgstr "«{0}» vista es: {1}\n"
4414
4415
#: bzrlib/builtins.py:6433
4416
msgid " <no hooks installed>\n"
4417
msgstr ""
4418
4419
#: bzrlib/builtins.py:6437
4420
msgid "Remove a branch."
4421
msgstr "Eliminar una rama."
4422
4423
#: bzrlib/builtins.py:6439
4424
msgid ""
4425
"This will remove the branch from the specified location but \n"
4426
"will keep any working tree or repository in place."
4427
msgstr ""
4428
4429
#: bzrlib/builtins.py:6444
4430
msgid " Remove the branch at repo/trunk::"
4431
msgstr " Eliminar la rama en repo/trunk::"
4432
4433
#: bzrlib/builtins.py:6446
4434
msgid " bzr remove-branch repo/trunk"
4435
msgstr " bzr remove-branch repo/trunk"
4436
4437
#: bzrlib/builtins.py:6461
4438
msgid "Plaintext diff output."
4439
msgstr ""
4440
4441
#: bzrlib/builtins.py:6462
4442
msgid "Temporarily set aside some changes from the current tree."
4443
msgstr ""
4444
4445
#: bzrlib/builtins.py:6464
4446
msgid ""
4447
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4448
"ie. out of the way, until a later time when you can bring them back from\n"
4449
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4450
"your working tree, and so they aren't propagated along with your branch nor\n"
4451
"will they survive its deletion."
4452
msgstr ""
4453
4454
#: bzrlib/builtins.py:6470
4455
msgid "If shelve --list is specified, previously-shelved changes are listed."
4456
msgstr ""
4457
4458
#: bzrlib/builtins.py:6472
4459
msgid ""
4460
"Shelve is intended to help separate several sets of changes that have\n"
4461
"been inappropriately mingled. If you just want to get rid of all changes\n"
4462
"and you don't need to restore them later, use revert. If you want to\n"
4463
"shelve all text changes at once, use shelve --all."
4464
msgstr ""
4465
4466
#: bzrlib/builtins.py:6477
4467
msgid ""
4468
"If filenames are specified, only the changes to those files will be\n"
4469
"shelved. Other files will be left untouched."
4470
msgstr ""
4471
4472
#: bzrlib/builtins.py:6480
4473
msgid ""
4474
"If a revision is specified, changes since that revision will be shelved."
4475
msgstr ""
4476
"Si se especifica una revisión, los cambios realizados desde esta revisión "
4477
"serán archivados."
4478
4479
#: bzrlib/builtins.py:6482
4480
msgid ""
4481
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4482
"restore the most recently shelved changes."
4483
msgstr ""
4484
4485
#: bzrlib/builtins.py:6485
4486
msgid ""
4487
"For complicated changes, it is possible to edit the changes in a separate\n"
4488
"editor program to decide what the file remaining in the working copy\n"
4489
"should look like. To do this, add the configuration option"
4490
msgstr ""
4491
4492
#: bzrlib/builtins.py:6489
4493
msgid " change_editor = PROGRAM @new_path @old_path"
4494
msgstr ""
4495
4496
#: bzrlib/builtins.py:6491
4497
msgid ""
4498
"where @new_path is replaced with the path of the new version of the \n"
4499
"file and @old_path is replaced with the path of the old version of \n"
4500
"the file. The PROGRAM should save the new file with the desired \n"
4501
"contents of the file in the working tree.\n"
4502
" "
4503
msgstr ""
4504
4505
#: bzrlib/builtins.py:6503
4506
msgid "Shelve all changes."
4507
msgstr "Guardar todos los cambios."
4508
4509
#: bzrlib/builtins.py:6505
4510
msgid "Method to use for writing diffs."
4511
msgstr "Método a usar para escribir diferencias."
4512
4513
#: bzrlib/builtins.py:6505
4514
msgid "writer"
4515
msgstr "escritor"
4516
4517
#: bzrlib/builtins.py:6509
4518
msgid "List shelved changes."
4519
msgstr "Listar cambios guardados."
4520
4521
#: bzrlib/builtins.py:6511
4522
msgid "Destroy removed changes instead of shelving them."
4523
msgstr "Destruir cambios eliminados en vez de guardarlos."
4524
4525
#: bzrlib/builtins.py:6540
4526
msgid "No shelved changes."
4527
msgstr "No ha cambios guardados."
4528
4529
#: bzrlib/builtins.py:6551
4530
msgid "Restore shelved changes."
4531
msgstr "Restaurar cambios guardados."
4532
4533
#: bzrlib/builtins.py:6553
4534
msgid ""
4535
"By default, the most recently shelved changes are restored. However if you\n"
4536
"specify a shelf by id those changes will be restored instead. This works\n"
4537
"best when the changes don't depend on each other."
4538
msgstr ""
4539
4540
#: bzrlib/builtins.py:6562
4541
msgid "The action to perform."
4542
msgstr "La acción a realizar."
4543
4544
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4545
msgid "action"
4546
msgstr "acción"
4547
4548
#: bzrlib/builtins.py:6564
4549
msgid "Apply changes and remove from the shelf."
4550
msgstr ""
4551
4552
#: bzrlib/builtins.py:6565
4553
msgid "Show changes, but do not apply or remove them."
4554
msgstr ""
4555
4556
#: bzrlib/builtins.py:6566
4557
msgid ""
4558
"Instead of unshelving the changes, show the diff that would result from "
4559
"unshelving."
4560
msgstr ""
4561
4562
#: bzrlib/builtins.py:6568
4563
msgid "Delete changes without applying them."
4564
msgstr ""
4565
4566
#: bzrlib/builtins.py:6569
4567
msgid "Apply changes but don't delete them."
4568
msgstr ""
4569
4570
#: bzrlib/builtins.py:6584
4571
msgid "Remove unwanted files from working tree."
4572
msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
4573
4574
#: bzrlib/builtins.py:6586
4575
msgid ""
4576
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4577
"files are never deleted."
4578
msgstr ""
4579
4580
#: bzrlib/builtins.py:6589
4581
msgid ""
4582
"Another class is 'detritus', which includes files emitted by bzr during\n"
4583
"normal operations and selftests. (The value of these files decreases with\n"
4584
"time.)"
4585
msgstr ""
4586
4587
#: bzrlib/builtins.py:6593
4588
msgid ""
4589
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4590
"flags are respected, and may be combined."
4591
msgstr ""
4592
4593
#: bzrlib/builtins.py:6596
4594
msgid "To check what clean-tree will do, use --dry-run."
4595
msgstr ""
4596
4597
#: bzrlib/builtins.py:6599
4598
msgid "Delete all ignored files."
4599
msgstr "Eliminar todos los archivos ignorados."
4600
4601
#: bzrlib/builtins.py:6600
4602
msgid ""
4603
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4604
msgstr ""
4605
4606
#: bzrlib/builtins.py:6603
4607
msgid "Delete files unknown to bzr (default)."
4608
msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
4609
4610
#: bzrlib/builtins.py:6604
4611
msgid "Show files to delete instead of deleting them."
4612
msgstr "Mostrar archivos a eliminar en vez de eliminarles."
4613
4614
#: bzrlib/builtins.py:6606
4615
msgid "Do not prompt before deleting."
4616
msgstr "No preguntar antes de eliminar."
4617
4618
#: bzrlib/bundle/__init__.py:59
4619
msgid "A directory cannot be a bundle"
4620
msgstr ""
4621
4622
#: bzrlib/bundle/apply_bundle.py:40
4623
msgid "Install revisions"
4624
msgstr ""
4625
4626
#: bzrlib/bundle/commands.py:64
4627
msgid "--verbose requires a merge directive"
4628
msgstr ""
4629
4630
#: bzrlib/bundle/commands.py:67
4631
msgid "Bundle format not supported"
4632
msgstr ""
4633
4634
#: bzrlib/bundle/commands.py:77
4635
msgid "Records\n"
4636
msgstr ""
4637
4638
#: bzrlib/bundle/commands.py:81
4639
msgid "{0}: {1} ({2} multiparent)\n"
4640
msgstr ""
4641
4642
#: bzrlib/bundle/commands.py:83
4643
#, python-format
4644
msgid "unique files: %d\n"
4645
msgstr ""
4646
4647
#: bzrlib/bundle/commands.py:92
4648
msgid "Revisions\n"
4649
msgstr ""
4650
4651
#: bzrlib/bundle/commands.py:93
4652
#, python-format
4653
msgid "nicks: %s\n"
4654
msgstr ""
4655
4656
#: bzrlib/bundle/commands.py:95
4657
#, python-format
4658
msgid ""
4659
"committers: \n"
4660
"%s\n"
4661
msgstr ""
4662
4663
#: bzrlib/bundle/commands.py:103
4664
msgid "Decoded contents\n"
4665
msgstr ""
4666
4667
#: bzrlib/bundle/serializer/v4.py:327
4668
#, python-format
4669
msgid "Bundling %d revision."
4670
msgid_plural "Bundling %d revisions."
4671
msgstr[0] ""
4672
msgstr[1] ""
4673
4674
#: bzrlib/bzrdir.py:490
4675
msgid ""
4676
"making backup of {0}\n"
4677
" to {1}"
4678
msgstr ""
4679
"haciendo respaldo de {0}\n"
4680
" a {1}"
4681
4682
#: bzrlib/bzrdir.py:513
4683
msgid "renamed {0} to {1}"
4684
msgstr "renombrado {0} a {1}"
4685
4686
#: bzrlib/bzrdir.py:1652
4687
#, python-format
4688
msgid ""
4689
"Source repository format does not support stacking, using format:\n"
4690
" %s"
4691
msgstr ""
4692
4693
#: bzrlib/bzrdir.py:1672
4694
#, python-format
4695
msgid ""
4696
"Source branch format does not support stacking, using format:\n"
4697
" %s"
4698
msgstr ""
4699
4700
#: bzrlib/bzrdir.py:1818
4701
msgid "starting repository conversion"
4702
msgstr "iniciar conversión de repositorio"
4703
4704
#: bzrlib/bzrdir.py:2039
4705
msgid "Using default stacking branch {0} at {1}"
4706
msgstr ""
4707
4708
#: bzrlib/check.py:108
4709
msgid "check"
4710
msgstr "marcar"
4711
4712
#: bzrlib/check.py:110
4713
msgid "checking revisions"
4714
msgstr "marcar revisiones"
4715
4716
#: bzrlib/check.py:112
4717
msgid "checking commit contents"
4718
msgstr ""
4719
4720
#: bzrlib/check.py:114
4721
msgid "checking file graphs"
4722
msgstr ""
4723
4724
#: bzrlib/check.py:118
4725
msgid "checking branches and trees"
4726
msgstr ""
4727
4728
#: bzrlib/check.py:205
4729
msgid "checked repository {0} format {1}"
4730
msgstr ""
4731
4732
#: bzrlib/check.py:208
4733
#, python-format
4734
msgid "%6d revisions"
4735
msgstr "%6d revisiones"
4736
4737
#: bzrlib/check.py:209
4738
#, python-format
4739
msgid "%6d file-ids"
4740
msgstr ""
4741
4742
#: bzrlib/check.py:211
4743
#, python-format
4744
msgid "%6d unreferenced text versions"
4745
msgstr "%6d versiones de texto no referenciadas"
4746
4747
#: bzrlib/check.py:215
4748
msgid "unreferenced version: {{{0}}} in {1}"
4749
msgstr "versión no referenciada: {{{0}}} en {1}"
4750
4751
#: bzrlib/check.py:218
4752
#, python-format
4753
msgid "%6d revisions are missing inventory_sha1"
4754
msgstr ""
4755
4756
#: bzrlib/check.py:221
4757
#, python-format
4758
msgid "%6d revisions are mentioned but not present"
4759
msgstr ""
4760
4761
#: bzrlib/check.py:224
4762
#, python-format
4763
msgid "%6d ghost revisions"
4764
msgstr ""
4765
4766
#: bzrlib/check.py:229
4767
#, python-format
4768
msgid "%6d revisions missing parents in ancestry"
4769
msgstr ""
4770
4771
#: bzrlib/check.py:233
4772
#, python-format
4773
msgid " %s should be in the ancestry for:"
4774
msgstr ""
4775
4776
#: bzrlib/check.py:237
4777
#, python-format
4778
msgid "%6d inconsistent parents"
4779
msgstr "%6d padres inconsistentes"
4780
4781
#: bzrlib/check.py:241
4782
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4783
msgstr ""
4784
4785
#: bzrlib/check.py:247
4786
#, python-format
4787
msgid "%6d revisions have incorrect parents in the revision index"
4788
msgstr ""
4789
4790
#: bzrlib/check.py:253
4791
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4792
msgstr ""
4793
4794
#: bzrlib/check.py:267
4795
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4796
msgstr ""
4797
4798
#: bzrlib/check.py:296
4799
msgid ""
4800
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4801
"{{{4}}}"
4802
msgstr ""
4803
4804
#: bzrlib/check.py:354
4805
#, python-format
4806
msgid "Checking branch at '%s'."
4807
msgstr "Comprobando rama en «%s»."
4808
4809
#: bzrlib/check.py:374
4810
#, python-format
4811
msgid "Checking working tree at '%s'."
4812
msgstr "Comprobando árbol de trabajo en «%s»."
4813
4814
#: bzrlib/check.py:427 bzrlib/check.py:441
4815
msgid "No branch found at specified location."
4816
msgstr "No se ha encontrado rama en la ubicación especificada."
4817
4818
#: bzrlib/check.py:429 bzrlib/check.py:439
4819
msgid "No working tree found at specified location."
4820
msgstr "No se ha encontrado árbol de trabajo en la ubicación especificada."
4821
4822
#: bzrlib/check.py:432
4823
#, python-format
4824
msgid "Checking repository at '%s'."
4825
msgstr "Comprobando repositorio en «%s»."
4826
4827
#: bzrlib/check.py:443
4828
msgid "No repository found at specified location."
4829
msgstr "No se ha encontrado repositorio en la ubicación especificada."
4830
4831
#: bzrlib/clean_tree.py:63
4832
msgid "Nothing to delete."
4833
msgstr "Nada que eliminar."
4834
4835
#: bzrlib/clean_tree.py:68
4836
msgid "Are you sure you wish to delete these"
4837
msgstr ""
4838
4839
#: bzrlib/clean_tree.py:70
4840
msgid "Canceled"
4841
msgstr ""
4842
4843
#: bzrlib/clean_tree.py:107
4844
#, python-format
4845
msgid "unable to remove %s"
4846
msgstr "imposible eliminar %s"
4847
4848
#: bzrlib/clean_tree.py:111
4849
msgid "deleting paths:"
4850
msgstr "eliminar rutas:"
4851
4852
#: bzrlib/clean_tree.py:125
4853
msgid "unable to remove \"{0}\": {1}."
4854
msgstr "imposible eliminar «{0}»: {1}."
4855
4856
#: bzrlib/clean_tree.py:130
4857
msgid "No files deleted."
4858
msgstr "No hay archivos eliminados."
4859
4860
#: bzrlib/cmd_version_info.py:47
4861
msgid "No known version info format {0}. Supported types are: {1}"
4862
msgstr ""
4863
4864
#: bzrlib/cmd_version_info.py:52
4865
msgid "Version info in Custom template-based format."
4866
msgstr ""
4867
4868
#: bzrlib/cmd_version_info.py:52
4869
msgid "Version info in Python format."
4870
msgstr ""
4871
4872
#: bzrlib/cmd_version_info.py:52
4873
msgid "Version info in RIO (simple text) format (default)."
4874
msgstr ""
4875
4876
#: bzrlib/cmd_version_info.py:53
4877
msgid "Show version information about this tree."
4878
msgstr "Mostrar la información de la versión acerca de este árbol."
4879
4880
#: bzrlib/cmd_version_info.py:55
4881
msgid ""
4882
"You can use this command to add information about version into\n"
4883
"source code of an application. The output can be in one of the\n"
4884
"supported formats or in a custom format based on a template."
4885
msgstr ""
4886
4887
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4888
#: en/help_topics/configuration.txt:710
4889
msgid "For example::"
4890
msgstr "Por ejemplo::"
4891
4892
#: bzrlib/cmd_version_info.py:61
4893
msgid ""
4894
" bzr version-info --custom \\\n"
4895
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4896
msgstr ""
4897
4898
#: bzrlib/cmd_version_info.py:64
4899
msgid ""
4900
"will produce a C header file with formatted string containing the\n"
4901
"current revision number. Other supported variables in templates are:"
4902
msgstr ""
4903
4904
#: bzrlib/cmd_version_info.py:67
4905
msgid ""
4906
" * {date} - date of the last revision\n"
4907
" * {build_date} - current date\n"
4908
" * {revno} - revision number\n"
4909
" * {revision_id} - revision id\n"
4910
" * {branch_nick} - branch nickname\n"
4911
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4912
" otherwise 1"
4913
msgstr ""
4914
4915
#: bzrlib/cmd_version_info.py:77
4916
msgid "Select the output format."
4917
msgstr "Seleccionar el formato de salida."
4918
4919
#: bzrlib/cmd_version_info.py:81
4920
msgid "Include all possible information."
4921
msgstr "Incluir toda la información posible."
4922
4923
#: bzrlib/cmd_version_info.py:82
4924
msgid "Check if tree is clean."
4925
msgstr "Comprobar si el árbol está limpio."
4926
4927
#: bzrlib/cmd_version_info.py:84
4928
msgid "Include the revision-history."
4929
msgstr ""
4930
4931
#: bzrlib/cmd_version_info.py:86
4932
msgid "Include the last revision for each file."
4933
msgstr ""
4934
4935
#: bzrlib/cmd_version_info.py:87
4936
msgid "Template for the output."
4937
msgstr "Plantilla para la salida."
4938
4939
#: bzrlib/cmd_version_info.py:101
4940
msgid "bzr version-info --revision takes exactly one revision specifier"
4941
msgstr ""
4942
4943
#: bzrlib/commands.py:229
4944
#, python-format
4945
msgid "unknown command \"%s\""
4946
msgstr "orden «%s» desconocida"
4947
4948
#: bzrlib/commands.py:476
4949
msgid "No help for this command."
4950
msgstr "No hay ayuda para esta orden."
4951
4952
#: bzrlib/commands.py:489
4953
#, python-format
4954
msgid ":Purpose: %s\n"
4955
msgstr ":Propósito: %s\n"
4956
4957
#: bzrlib/commands.py:491
4958
#, python-format
4959
msgid ""
4960
":Usage:\n"
4961
"%s\n"
4962
msgstr ""
4963
":Uso:\n"
4964
"%s\n"
4965
4966
#: bzrlib/commands.py:493
4967
#, python-format
4968
msgid ":Usage: %s\n"
4969
msgstr ":Uso: %s\n"
4970
4971
#: bzrlib/commands.py:512
4972
#, python-format
4973
msgid ":Options:%s"
4974
msgstr ":Opciones:%s"
4975
4976
#: bzrlib/commands.py:523
4977
#, python-format
4978
msgid ""
4979
":Description:\n"
4980
" %s\n"
4981
"\n"
4982
msgstr ""
4983
":Descripción:\n"
4984
" %s\n"
4985
"\n"
4986
4987
#: bzrlib/commands.py:533
4988
#, python-format
4989
msgid ""
4990
"See bzr help %s for more details and examples.\n"
4991
"\n"
4992
msgstr ""
4993
4994
#: bzrlib/commands.py:538
4995
msgid ":Aliases: "
4996
msgstr ":Alias: "
4997
4998
#: bzrlib/commands.py:542
4999
#, python-format
5000
msgid ":From: plugin \"%s\"\n"
5001
msgstr ":Desde: complemento «%s»\n"
5002
5003
#: bzrlib/commands.py:554
5004
msgid ":doc:`{0} <{1}-help>`"
5005
msgstr ":doc:`{0} <{1}-help>`"
5006
5007
#: bzrlib/commands.py:558
5008
#, python-format
5009
msgid ":See also: %s"
5010
msgstr ":Vea también: %s"
5011
5012
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5013
msgid "Only ASCII permitted in option names"
5014
msgstr "Solo se permiten nombres de opción en ASCII"
5015
5016
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5017
msgid "command {0!r} needs one or more {1}"
5018
msgstr "la orden {0!r} necesita una o más {1}"
5019
5020
#: bzrlib/commands.py:858
5021
msgid "command {0!r} requires argument {1}"
5022
msgstr "la orden {0!r} necesita un argumento {1}"
5023
5024
#: bzrlib/commands.py:865
5025
msgid "extra argument to command {0}: {1}"
5026
msgstr ""
5027
5028
#: bzrlib/commands.py:962
5029
#, python-format
5030
msgid "Profile data written to \"%s\"."
5031
msgstr "Datos de perfil escritos en «%s»"
5032
5033
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5034
msgid "added"
5035
msgstr "añadido"
5036
5037
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5038
msgid "modified"
5039
msgstr "modificado"
5040
5041
#: bzrlib/commit.py:131
5042
#, python-format
5043
msgid "Committing%s"
5044
msgstr ""
5045
5046
#: bzrlib/commit.py:134
5047
#, python-format
5048
msgid "Committed revision %d."
5049
msgstr ""
5050
5051
#: bzrlib/commit.py:143
5052
#, python-format
5053
msgid "deleted %s"
5054
msgstr "eliminado %s"
5055
5056
#: bzrlib/commit.py:146
5057
#, python-format
5058
msgid "missing %s"
5059
msgstr "falta %s"
5060
5061
#: bzrlib/commit.py:511
5062
msgid ""
5063
"Conflicting tags in bound branch:\n"
5064
"{0}"
5065
msgstr ""
5066
5067
#: bzrlib/commit.py:742
5068
msgid "renamed"
5069
msgstr "renombrado"
5070
5071
#: bzrlib/commit.py:977
5072
msgid "unchanged"
5073
msgstr "sin cambios"
5074
5075
#: bzrlib/commit.py:999
5076
msgid "{0} [{1}] - Stage"
5077
msgstr ""
5078
5079
#: bzrlib/commit.py:1002
5080
#, python-format
5081
msgid "%s - Stage"
5082
msgstr ""
5083
5084
#: bzrlib/commit_signature_commands.py:36
5085
msgid "Sign all commits by a given committer."
5086
msgstr ""
5087
5088
#: bzrlib/commit_signature_commands.py:38
5089
msgid ""
5090
"If location is not specified the local tree is used.\n"
5091
"If committer is not specified the default committer is used."
5092
msgstr ""
5093
5094
#: bzrlib/commit_signature_commands.py:41
5095
msgid "This does not sign commits that already have signatures."
5096
msgstr ""
5097
5098
#: bzrlib/commit_signature_commands.py:49
5099
msgid ""
5100
"Don't actually sign anything, just print the revisions that would be signed."
5101
msgstr ""
5102
5103
#: bzrlib/commit_signature_commands.py:103
5104
msgid "Verify all commit signatures."
5105
msgstr "Verificar todas las firmas de ejecución."
5106
5107
#: bzrlib/commit_signature_commands.py:105
5108
msgid ""
5109
"Verifies that all commits in the branch are signed by known GnuPG keys."
5110
msgstr ""
5111
5112
#: bzrlib/commit_signature_commands.py:110
5113
msgid ""
5114
"Comma separated list of GPG key patterns which are acceptable for "
5115
"verification."
5116
msgstr ""
5117
5118
#: bzrlib/commit_signature_commands.py:147
5119
msgid "Cannot verify a range of non-revision-history revisions"
5120
msgstr ""
5121
5122
#: bzrlib/commit_signature_commands.py:168
5123
msgid "All commits signed with verifiable keys"
5124
msgstr ""
5125
5126
#: bzrlib/config.py:475
5127
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5128
msgstr ""
5129
5130
#: bzrlib/config.py:2485
5131
msgid "{0} is not an SI unit."
5132
msgstr ""
5133
5134
#: bzrlib/config.py:2949
5135
msgid ""
5136
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5137
"will be saved."
5138
msgstr ""
5139
5140
#: bzrlib/config.py:3093
5141
#, python-format
5142
msgid "Invalid '%s', should be of the form 'name=value'"
5143
msgstr ""
5144
5145
#: bzrlib/config.py:3962
5146
msgid "Display, set or remove a configuration option."
5147
msgstr ""
5148
5149
#: bzrlib/config.py:3964
5150
msgid "Display the active value for a given option."
5151
msgstr ""
5152
5153
#: bzrlib/config.py:3966
5154
msgid ""
5155
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5156
"matching options are displayed mentioning their scope. The active value\n"
5157
"that bzr will take into account is the first one displayed for each option."
5158
msgstr ""
5159
5160
#: bzrlib/config.py:3970
5161
msgid "If no NAME is given, --all .* is implied."
5162
msgstr ""
5163
5164
#: bzrlib/config.py:3972
5165
msgid ""
5166
"Setting a value is achieved by using name=value without spaces. The value\n"
5167
"is set in the most relevant scope and can be checked by displaying the\n"
5168
"option again."
5169
msgstr ""
5170
5171
#: bzrlib/config.py:3984
5172
msgid "Reduce the scope to the specified configuration file."
5173
msgstr ""
5174
5175
#: bzrlib/config.py:3988
5176
msgid "Display all the defined values for the matching options."
5177
msgstr ""
5178
5179
#: bzrlib/config.py:3990
5180
msgid "Remove the option from the configuration file."
5181
msgstr ""
5182
5183
#: bzrlib/conflicts.py:50
5184
msgid "List files with conflicts."
5185
msgstr ""
5186
5187
#: bzrlib/conflicts.py:57
5188
msgid ""
5189
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5190
"is supplied, the pathnames of files with text conflicts are listed,\n"
5191
"instead. (This is useful for editing all files with text conflicts.)"
5192
msgstr ""
5193
5194
#: bzrlib/conflicts.py:61
5195
msgid "Use bzr resolve when you have fixed a problem."
5196
msgstr ""
5197
5198
#: bzrlib/conflicts.py:66
5199
msgid "List paths of files with text conflicts."
5200
msgstr ""
5201
5202
#: bzrlib/conflicts.py:85
5203
msgid "Marks the conflict as resolved."
5204
msgstr ""
5205
5206
#: bzrlib/conflicts.py:88
5207
msgid "Resolve the conflict preserving the version in the working tree."
5208
msgstr ""
5209
5210
#: bzrlib/conflicts.py:91
5211
msgid "Resolve the conflict taking the merged version into account."
5212
msgstr ""
5213
5214
#: bzrlib/conflicts.py:98
5215
msgid "How to resolve the conflict."
5216
msgstr ""
5217
5218
#: bzrlib/conflicts.py:104
5219
msgid "Mark a conflict as resolved."
5220
msgstr ""
5221
5222
#: bzrlib/conflicts.py:111
5223
msgid ""
5224
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5225
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5226
"as\n"
5227
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5228
msgstr ""
5229
5230
#: bzrlib/conflicts.py:119
5231
msgid "Resolve all conflicts in this tree."
5232
msgstr "Resolver todos los conflictos es este árbol."
5233
5234
#: bzrlib/conflicts.py:126
5235
msgid "If --all is specified, no FILE may be provided"
5236
msgstr ""
5237
5238
#: bzrlib/conflicts.py:151
5239
#, python-format
5240
msgid "%d conflict auto-resolved."
5241
msgid_plural "%d conflicts auto-resolved."
5242
msgstr[0] ""
5243
msgstr[1] ""
5244
5245
#: bzrlib/conflicts.py:154
5246
msgid "Remaining conflicts:"
5247
msgstr "Mantener conflictos:"
5248
5249
#: bzrlib/conflicts.py:159
5250
msgid "All conflicts resolved."
5251
msgstr "Todos los conflictos resueltos."
5252
5253
#: bzrlib/conflicts.py:168
5254
msgid "{0} conflict resolved, {1} remaining"
5255
msgid_plural "{0} conflicts resolved, {1} remaining"
5256
msgstr[0] ""
5257
msgstr[1] ""
5258
5259
#: bzrlib/controldir.py:710
5260
msgid "{0} is{1} redirected to {2}"
5261
msgstr "{0} es{1} redirigido a {2}"
5262
5263
#: bzrlib/diff.py:399
5264
#, python-format
5265
msgid "*** Ignoring files outside view. View is %s"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:157
5269
msgid "The tree builder is already building a tree."
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:178
5273
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5274
msgstr ""
5275
5276
#: bzrlib/errors.py:197
5277
msgid ""
5278
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5279
"versions \"%(minimum)s\" to \"%(current)s\"."
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:209
5283
msgid "The transport '%(transport)s' is only accessible within this process."
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:227
5287
msgid "Invalid revision number %(revno)s"
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:236
5291
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:247
5295
msgid "Reserved revision-id {%(revision_id)s}"
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:261
5299
msgid "There is no public branch set for \"%(branch_url)s\"."
5300
msgstr ""
5301
5302
#: bzrlib/errors.py:271
5303
msgid ""
5304
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5305
"obtain a list of topics."
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:280
5309
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:290
5313
msgid ""
5314
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5315
msgstr ""
5316
5317
#: bzrlib/errors.py:299
5318
msgid "The branch '%(branch)s' is not stacked."
5319
msgstr ""
5320
5321
#: bzrlib/errors.py:313
5322
msgid "No WorkingTree exists for \"%(base)s\"."
5323
msgstr ""
5324
5325
#: bzrlib/errors.py:322
5326
msgid "Not currently building a tree."
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:327
5330
msgid "%(url)s is not a local path."
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:355
5334
msgid "%(not_locked)r is not write locked but needs to be."
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:363
5338
msgid "Error in command line options"
5339
msgstr "Error en las opciones de la línea de órdenes"
5340
5341
#: bzrlib/errors.py:368
5342
msgid "%(value)s is not an index of type %(_type)s."
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:378
5346
msgid "Error in data for index %(value)s."
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:387
5350
msgid "The key '%(key)s' is already in index '%(index)s'."
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:397
5354
msgid "The key '%(key)s' is not a valid key."
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:406
5358
msgid "Could not parse options for index %(value)s."
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:415
5362
msgid "The value '%(value)s' is not a valid value."
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:424
5366
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:443
5370
msgid "Generic path error: %(path)r%(extra)s)"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:456
5374
msgid "No such file: %(path)r%(extra)s"
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:461
5378
msgid "File exists: %(path)r%(extra)s"
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:467
5382
msgid ""
5383
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5384
"after to tell bzr about a rename that has already happened)%(extra)s"
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:483
5388
msgid "\"%(path)s\" is not a directory %(extra)s"
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:488
5392
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:493
5396
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:498
5400
msgid "Hard-linking \"%(path)s\" is not supported"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:513
5404
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:518
5408
msgid "Permission denied: \"%(path)s\"%(extra)s"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:523
5412
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5413
msgstr ""
5414
5415
#: bzrlib/errors.py:528
5416
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:539
5420
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:561
5424
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:571
5428
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:579
5432
msgid ""
5433
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5434
"upgrade the branch to permit branch stacking."
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:590
5438
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:600
5442
msgid ""
5443
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5444
"need to upgrade the repository to permit branch stacking."
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:611
5448
msgid "Error reading from %(path)r."
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:630
5452
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:646
5456
msgid "Path \"%(path)s\" is not unicode normalized"
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:654
5460
msgid "Not a branch: \"%(path)s\"%(detail)s."
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:696
5464
msgid "No submit branch available for branch \"%(path)s\""
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:705
5468
msgid "A control directory already exists: \"%(path)s\"."
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:710
5472
msgid "Already a branch: \"%(path)s\"."
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:715
5476
msgid "Parent branch already exists: \"%(path)s\"."
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:721
5480
msgid ""
5481
"Directory contains a branch, but no working tree (use bzr checkout if you "
5482
"wish to build a working tree): \"%(path)s\""
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:726
5486
msgid ""
5487
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:736
5491
msgid ""
5492
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:746
5496
msgid "No repository present: \"%(path)s\""
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:753
5500
msgid ""
5501
"Unsupported branch format: %(format)s\n"
5502
"Please run 'bzr upgrade'"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:759
5506
msgid "Unknown %(kind)s format: %(format)r"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:768
5510
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:778
5514
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:793
5518
msgid ""
5519
"%(target)s\n"
5520
"is not compatible with\n"
5521
"%(source)s\n"
5522
"%(details)s"
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:809
5526
msgid "Revision is not compatible with %(repo_format)s"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:819
5530
msgid "%(context_info)s%(path)s is already versioned."
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:840
5534
msgid "%(context_info)s%(path)s is not versioned."
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:861
5538
msgid "Path(s) are not versioned: %(paths_as_string)s"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:872
5542
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:891
5546
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:899
5550
msgid ""
5551
"Filename %(filename)r is not valid in your current filesystem encoding "
5552
"%(fs_encoding)s"
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:910
5556
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5557
msgstr ""
5558
5559
#: bzrlib/errors.py:928
5560
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:967
5564
msgid "Cannot lock %(lock)s: %(why)s"
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:977
5568
msgid ""
5569
"A transaction related operation was attempted after the transaction finished."
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:1004
5573
msgid "Cannot lock: transport is read only: %(transport)s"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:1012
5577
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:1023
5581
msgid ""
5582
"Lock was broken while still open: %(lock)s - check storage consistency!"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:1034
5586
msgid ""
5587
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5588
"%(holder)r, wanted to break %(target)r"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:1046
5592
msgid ""
5593
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5594
"Use 'bzr break-lock' to clear it"
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:1059
5598
msgid "Lock not held: %(lock)s"
5599
msgstr ""
5600
5601
#: bzrlib/errors.py:1088
5602
msgid "No changes to commit"
5603
msgstr "No hay cambios que ejecutar."
5604
5605
#: bzrlib/errors.py:1093
5606
msgid ""
5607
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:1103
5611
msgid ""
5612
"Excluding paths during commit is not supported by repository at "
5613
"%(repository)r."
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:1112
5617
msgid ""
5618
"The specified commit message contains characters unsupported by the current "
5619
"encoding."
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:1118
5623
msgid "Upgrade URL cannot work with readonly URLs."
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:1123
5627
msgid "The branch format %(format)s is already at the most recent format."
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:1146
5631
msgid "Option --change does not accept revision ranges"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:1151
5635
msgid "No namespace registered for string: %(spec)r"
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:1170
5639
msgid ""
5640
"Requested revision: '%(spec)s' does not exist in branch: "
5641
"%(branch_url)s%(extra)s"
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:1184
5645
msgid ""
5646
"Operation denied because it would change the main history, which is not "
5647
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:1195
5651
msgid ""
5652
"These branches have diverged. Use the missing command to see how.\n"
5653
"Use the merge command to reconcile them."
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:1215
5657
msgid ""
5658
"Branches have no common ancestor, and no merge base revision was specified."
5659
msgstr ""
5660
5661
#: bzrlib/errors.py:1221
5662
msgid ""
5663
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:1227
5667
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:1236
5671
msgid ""
5672
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:1245
5676
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:1254
5680
msgid "Branch %(branch)s has no commits."
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:1272
5684
msgid ""
5685
"Bound branch %(branch)s is out of date with master branch "
5686
"%(master)s.%(extra_help)s"
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:1284
5690
msgid ""
5691
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5692
"bound to %(remote)s."
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:1296
5696
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:1305
5700
msgid ""
5701
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5702
"%(error)s"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:1317
5706
msgid "Error in processing weave: %(msg)s"
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:1326
5710
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:1337
5714
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:1347
5718
msgid "Weave invariant violated: %(what)s"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:1356
5722
msgid "Parents are mismatched between two revisions. %(msg)s"
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:1378
5726
msgid ""
5727
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5728
"%(weave_b)s"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:1390
5732
msgid "Versioned file error"
5733
msgstr "Error en el archivo versiondao"
5734
5735
#: bzrlib/errors.py:1395
5736
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:1405
5740
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:1415
5744
msgid "Text did not match its checksum: %(msg)s"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:1541
5748
msgid "Export format %(format)r not supported"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:1550
5752
msgid "Transport error: %(msg)s %(orig_error)s"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:1576
5756
msgid "Generic bzr smart protocol error: %(details)s"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:1584
5760
msgid "Received bad protocol version marker: %(marker)r"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:1616
5764
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:1621
5768
msgid "Connection error: %(msg)s %(orig_error)s"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:1626
5772
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:1647
5776
msgid "Connection closed: %(msg)s %(orig_error)s"
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:1652
5780
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:1657
5784
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:1667
5788
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:1682
5792
msgid "Certificate error: %(error)s"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:1690
5796
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:1704
5800
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:1712
5804
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:1721
5808
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:1735
5812
msgid "Too many redirections"
5813
msgstr "Demasiadas redirecciones"
5814
5815
#: bzrlib/errors.py:1740
5816
msgid "Working tree has conflicts."
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:1744
5820
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:1753
5824
msgid ""
5825
"Error(s) parsing config file %(filename)s:\n"
5826
"%(errors)s"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:1763
5830
msgid ""
5831
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5832
"See ``bzr help %(name)s``"
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:1773
5836
msgid "%(username)r does not seem to contain a reasonable email address"
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:1782
5840
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:1790
5844
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:1798
5848
msgid "Unable to import library \"%(library)s\": %(error)s"
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:1806
5852
msgid "python-gpgme is not installed, it is needed to verify signatures"
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:1814
5856
msgid ""
5857
"The working tree for %(basedir)s has changed since the last commit, but "
5858
"weave merge requires that it be unchanged"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:1824
5862
msgid ""
5863
"Can't reprocess and show base, because reprocessing obscures the "
5864
"relationship of conflicting lines to the base"
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:1830
5868
msgid "Cycle in graph %(graph)r"
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:1858
5872
msgid "File %(filename)s is not conflicted."
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:1880
5876
msgid "No bundle was found in \"%(filename)s\"."
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:1889
5880
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:1899
5884
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:1912
5888
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:1922
5892
msgid "Key %(key)s is already present in map"
5893
msgstr ""
5894
5895
#: bzrlib/errors.py:1927
5896
msgid "The prefix %(prefix)s is in the help search path twice."
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:1937
5900
msgid ""
5901
"No final name for trans_id %(trans_id)r\n"
5902
"file-id: %(file_id)r\n"
5903
"root trans-id: %(root_trans_id)r\n"
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:1969
5907
msgid "Attempt to reuse a transform that has already been applied."
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:1974
5911
msgid "Moving the root directory is not supported at this time"
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:1979
5915
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:1990
5919
msgid ""
5920
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2026
5924
msgid ""
5925
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2056
5929
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2064
5933
msgid "Nothing to merge."
5934
msgstr "Nada a fusionar."
5935
5936
#: bzrlib/errors.py:2069
5937
msgid "Format %(format)s cannot be initialised by this version of bzr."
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2078
5941
msgid ""
5942
"Cannot convert from format %(from_format)s to format %(format)s. "
5943
"%(problem)s"
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2090
5947
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2098
5951
msgid "%(exe_name)s could not be found on this machine"
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2106
5955
msgid "Diff is not installed on this machine: %(msg)s"
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2114
5959
msgid "Diff3 is not installed on this machine."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2120
5963
msgid "The content being inserted is already present."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2125
5967
msgid ""
5968
"This tree contains left-over files from a failed operation.\n"
5969
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5970
"to\n"
5971
" keep, and delete it when you are done."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2136
5975
msgid ""
5976
"This tree contains left-over files from a failed operation.\n"
5977
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5978
" wish to keep, and delete it when you are done."
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2146
5982
msgid ""
5983
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5984
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5985
"to\n"
5986
" keep, and delete it when you are done."
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:2157
5990
msgid ""
5991
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5992
"examine %(pending_deletion)s to see if it contains any files you wish to "
5993
"keep, and delete it when you are done."
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2167
5997
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2181
6001
msgid ""
6002
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:2194
6006
msgid "Error in merge modified format"
6007
msgstr "Error en el formato modificado de fusión"
6008
6009
#: bzrlib/errors.py:2199
6010
msgid "Format error in conflict listings"
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:2203
6014
msgid ""
6015
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6016
"Error: %(description)s"
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:2214
6020
msgid ""
6021
"An error has been detected in the repository %(repo_path)s.\n"
6022
"Please run bzr reconcile on this repository."
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:2225
6026
msgid ""
6027
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6028
"reason: %(reason)s"
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:2238
6032
msgid ""
6033
"An inconsistent delta was supplied: %(delta)r\n"
6034
"reason: %(reason)s"
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:2250
6038
msgid "To use this feature you must upgrade your branch at %(path)s."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:2259
6042
msgid "To use this feature you must upgrade your repository at %(path)s."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:2264
6046
msgid ""
6047
"To use this feature you must upgrade your branch at %(path)s to a format "
6048
"which supports rich roots."
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:2270
6052
msgid "Cannot perform local-only commits on unbound branches."
6053
msgstr ""
6054
6055
#: bzrlib/errors.py:2275
6056
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:2296
6060
msgid "Ghost tags not supported by format %(format)r."
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:2304
6064
msgid "File is binary but should be text."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:2309
6068
msgid "The path %(path)s is not permitted on this platform"
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:2318
6072
msgid ""
6073
"Testament did not match expected value.\n"
6074
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6075
" {%(measured)s}"
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:2330
6079
msgid "Not a bzr revision-bundle: %(text)r"
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:2339
6083
msgid "Bad bzr revision-bundle: %(text)r"
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:2348
6087
msgid "Malformed bzr revision-bundle header: %(text)r"
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:2353
6091
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:2358
6095
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:2363
6099
msgid "End of line marker was not \\n in bzr revision-bundle"
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:2373
6103
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:2383
6107
msgid "Root class for inventory serialization errors"
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:2387
6111
msgid ""
6112
"The inventory was not in the expected format:\n"
6113
" %(msg)s"
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:2396
6117
msgid "This operation requires rich root data storage"
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:2409
6121
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:2418
6125
msgid ""
6126
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6127
"variable."
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:2425
6131
msgid ""
6132
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6133
"ghost at {%(ghost_revision_id)s}"
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:2435
6137
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6138
msgstr ""
6139
6140
#: bzrlib/errors.py:2486
6141
msgid ""
6142
"A merge directive must provide either a bundle or a public branch location."
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:2493
6146
msgid "Bad merge directive payload %(start)r"
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:2503
6150
msgid "Preview patch does not match requested changes."
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:2509
6154
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:2519
6158
msgid ""
6159
"Your branch does not have all of the revisions required in order to merge "
6160
"this merge directive and the target location specified in the merge "
6161
"directive is not a branch: %(location)s."
6162
msgstr ""
6163
6164
#: bzrlib/errors.py:2531
6165
msgid "Unsupported entry kind %(kind)s"
6166
msgstr ""
6167
6168
#: bzrlib/errors.py:2539
6169
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:2549
6173
msgid "Subsume target %(other_tree)s needs to be upgraded."
6174
msgstr ""
6175
6176
#: bzrlib/errors.py:2568
6177
msgid "No such tag: %(tag_name)s"
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:2576
6181
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6182
msgstr ""
6183
6184
#: bzrlib/errors.py:2585
6185
msgid "Tag %(tag_name)s already exists."
6186
msgstr ""
6187
6188
#: bzrlib/errors.py:2593
6189
msgid ""
6190
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6191
"bugs\" for more information on this feature."
6192
msgstr ""
6193
6194
#: bzrlib/errors.py:2603
6195
msgid ""
6196
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6197
msgstr ""
6198
6199
#: bzrlib/errors.py:2613
6200
msgid ""
6201
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6202
msgstr ""
6203
6204
#: bzrlib/errors.py:2623
6205
msgid "Invalid line in bugs property: '%(line)s'"
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:2631
6209
msgid "Invalid bug status: '%(status)s'"
6210
msgstr ""
6211
6212
#: bzrlib/errors.py:2639
6213
msgid "Could not understand response from smart server: %(response_tuple)r"
6214
msgstr ""
6215
6216
#: bzrlib/errors.py:2678
6217
msgid "Server sent an unexpected error: %(error_tuple)r"
6218
msgstr "El servidor envió un error inesperado: %(error_tuple)r"
6219
6220
#: bzrlib/errors.py:2697
6221
msgid "Unrecognised container format: %(container_format)r"
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:2705
6225
msgid "Unexpected end of container stream"
6226
msgstr "Final inesperado del flujo del contenedor"
6227
6228
#: bzrlib/errors.py:2710
6229
msgid "Unknown record type: %(record_type)r"
6230
msgstr "Tipo de registro inesperado: %(record_type)r"
6231
6232
#: bzrlib/errors.py:2718
6233
msgid "Invalid record: %(reason)s"
6234
msgstr "Registro inesperado: %(reason)s"
6235
6236
#: bzrlib/errors.py:2726
6237
msgid "Container has data after end marker: %(excess)r"
6238
msgstr ""
6239
6240
#: bzrlib/errors.py:2734
6241
msgid "Container has multiple records with the same name: %(name)s"
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:2747
6245
msgid "Corrupt or incompatible data stream: %(reason)s"
6246
msgstr ""
6247
6248
#: bzrlib/errors.py:2755
6249
msgid "SMTP error: %(error)s"
6250
msgstr "Error SMTP: %(error)s"
6251
6252
#: bzrlib/errors.py:2763
6253
msgid "No message supplied."
6254
msgstr "No se ha proporcionado mensaje."
6255
6256
#: bzrlib/errors.py:2768
6257
msgid "No mail-to address (--mail-to) or output (-o) specified."
6258
msgstr ""
6259
"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
6260
"o)."
6261
6262
#: bzrlib/errors.py:2773
6263
msgid "Unknown mail client: %(mail_client)s"
6264
msgstr "Correo de cliente desconocido: %(mail_client)s"
6265
6266
#: bzrlib/errors.py:2781
6267
msgid ""
6268
"Unable to find mail client with the following names: "
6269
"%(mail_command_list_string)s"
6270
msgstr ""
6271
6272
#: bzrlib/errors.py:2791
6273
msgid "SMTP connection to %(host)s refused"
6274
msgstr "Las conexiones SMTP a %(host)s se han rechazado"
6275
6276
#: bzrlib/errors.py:2800
6277
msgid "Please specify smtp_server. No server at default %(host)s."
6278
msgstr ""
6279
6280
#: bzrlib/errors.py:2814
6281
msgid ""
6282
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6283
"reconfigure."
6284
msgstr ""
6285
6286
#: bzrlib/errors.py:2826
6287
msgid "'%(display_url)s' is already a branch."
6288
msgstr "«%(display_url)s» ya es una la rama."
6289
6290
#: bzrlib/errors.py:2831
6291
msgid "'%(display_url)s' is already a tree."
6292
msgstr "«%(display_url)s» ya es un árbol."
6293
6294
#: bzrlib/errors.py:2836
6295
msgid "'%(display_url)s' is already a checkout."
6296
msgstr "«%(display_url)s» ya es una comprobación."
6297
6298
#: bzrlib/errors.py:2841
6299
msgid "'%(display_url)s' is already a lightweight checkout."
6300
msgstr "«%(display_url)s» ya es una comprobación ligera."
6301
6302
#: bzrlib/errors.py:2846
6303
msgid "'%(display_url)s' is already using a shared repository."
6304
msgstr "«%(display_url)s» ya está usando un repositorio compartido."
6305
6306
#: bzrlib/errors.py:2851
6307
msgid "'%(display_url)s' is already standalone."
6308
msgstr "«%(display_url)s» ya es autónomo."
6309
6310
#: bzrlib/errors.py:2856
6311
msgid "Shared repository '%(display_url)s' already creates working trees."
6312
msgstr ""
6313
6314
#: bzrlib/errors.py:2862
6315
msgid ""
6316
"Shared repository '%(display_url)s' already doesn't create working trees."
6317
msgstr ""
6318
6319
#: bzrlib/errors.py:2868
6320
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:2873
6324
msgid "No location could be found to bind to at %(display_url)s."
6325
msgstr "No se encontró ubicación a donde vincular %(display_url)s."
6326
6327
#: bzrlib/errors.py:2878
6328
msgid ""
6329
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6330
"status).%(more)s"
6331
msgstr ""
6332
6333
#: bzrlib/errors.py:2897
6334
msgid ""
6335
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6336
"list).%(more)s"
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:2903
6340
msgid "Variable {%(name)s} is not available."
6341
msgstr "La variable {%(name)s} no está disponible."
6342
6343
#: bzrlib/errors.py:2911
6344
msgid "No template specified."
6345
msgstr "No se ha especificado una plantilla."
6346
6347
#: bzrlib/errors.py:2916
6348
msgid "Unable to create symlink %(path_str)son this platform"
6349
msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
6350
6351
#: bzrlib/errors.py:2931
6352
msgid ""
6353
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6354
"\"original\", \"local\"."
6355
msgstr ""
6356
"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
6357
"«original», «local»."
6358
6359
#: bzrlib/errors.py:2965
6360
msgid ""
6361
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6362
msgstr ""
6363
6364
#: bzrlib/errors.py:2977
6365
msgid "The \"%(config_id)s\" configuration does not exist."
6366
msgstr ""
6367
6368
#: bzrlib/errors.py:2985
6369
msgid "The \"%(option_name)s\" configuration option does not exist."
6370
msgstr ""
6371
6372
#: bzrlib/errors.py:2993
6373
msgid "The alias \"%(alias_name)s\" does not exist."
6374
msgstr ""
6375
6376
#: bzrlib/errors.py:3007
6377
msgid "\"%(alias_name)s\" is not a valid location alias."
6378
msgstr ""
6379
6380
#: bzrlib/errors.py:3015
6381
msgid "No %(alias_name)s location assigned."
6382
msgstr ""
6383
6384
#: bzrlib/errors.py:3023
6385
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6386
msgstr ""
6387
6388
#: bzrlib/errors.py:3033
6389
msgid "Unknown rules detected: %(unknowns_str)s."
6390
msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
6391
6392
#: bzrlib/errors.py:3044
6393
msgid "Tip change rejected: %(msg)s"
6394
msgstr ""
6395
6396
#: bzrlib/errors.py:3052
6397
msgid "Shelf corrupt."
6398
msgstr ""
6399
6400
#: bzrlib/errors.py:3057
6401
msgid "Corruption while decompressing repository file%(orig_error)s"
6402
msgstr ""
6403
6404
#: bzrlib/errors.py:3069
6405
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6406
msgstr ""
6407
6408
#: bzrlib/errors.py:3077
6409
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6410
msgstr ""
6411
6412
#: bzrlib/errors.py:3085
6413
msgid ""
6414
"An attempt to access a url outside the server jail was made: '%(url)s'."
6415
msgstr ""
6416
6417
#: bzrlib/errors.py:3093
6418
msgid "The user aborted the operation."
6419
msgstr "El usuario abortó la operación."
6420
6421
#: bzrlib/errors.py:3098
6422
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6423
msgstr ""
6424
6425
#: bzrlib/errors.py:3108
6426
msgid "No such view: %(view_name)s."
6427
msgstr ""
6428
6429
#: bzrlib/errors.py:3118
6430
msgid ""
6431
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6432
"to a later format."
6433
msgstr ""
6434
6435
#: bzrlib/errors.py:3127
6436
msgid ""
6437
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6438
msgstr ""
6439
6440
#: bzrlib/errors.py:3194
6441
msgid "%(bzrdir)r does not support co-located branches."
6442
msgstr ""
6443
6444
#: bzrlib/errors.py:3200
6445
msgid ""
6446
"Unable to determine your name.\n"
6447
"Please, set your name with the 'whoami' command.\n"
6448
"E.g. bzr whoami \"Your Name <name@example.com>\""
6449
msgstr ""
6450
6451
#: bzrlib/errors.py:3209
6452
msgid "Invalid pattern(s) found. %(msg)s"
6453
msgstr "Se encontró un patrón inválido. %(msg)s"
6454
6455
#: bzrlib/errors.py:3217
6456
msgid ""
6457
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6458
"unbind` to fix."
6459
msgstr ""
6460
6461
#: bzrlib/errors.py:3228
6462
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6463
msgstr ""
6464
6465
#: bzrlib/errors.py:3237
6466
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6467
msgstr ""
6468
6469
#: bzrlib/errors.py:3246
6470
msgid ""
6471
"No compatible object available for operations from %(source)r to %(target)r."
6472
msgstr ""
6473
6474
#: bzrlib/errors.py:3256
6475
msgid ""
6476
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6477
"%(arguments)s."
6478
msgstr ""
6479
6480
#: bzrlib/errors.py:3266
6481
msgid ""
6482
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6483
"format %(format)r"
6484
msgstr ""
6485
6486
#: bzrlib/errors.py:3278
6487
msgid ""
6488
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6489
"plugin."
6490
msgstr ""
6491
6492
#: bzrlib/errors.py:3291
6493
msgid "Binary files section encountered."
6494
msgstr ""
6495
6496
#: bzrlib/errors.py:3299
6497
msgid ""
6498
"Malformed patch header. %(desc)s\n"
6499
"%(line)r"
6500
msgstr ""
6501
6502
#: bzrlib/errors.py:3308
6503
msgid ""
6504
"Malformed hunk header. %(desc)s\n"
6505
"%(line)r"
6506
msgstr ""
6507
6508
#: bzrlib/errors.py:3317
6509
msgid ""
6510
"Malformed line. %(desc)s\n"
6511
"%(line)r"
6512
msgstr ""
6513
6514
#: bzrlib/errors.py:3327
6515
msgid ""
6516
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6517
"but patch says it should be \"%(patch_line)s\""
6518
msgstr ""
6519
6520
#: bzrlib/errors.py:3338
6521
msgid "The feature %(feature)s has already been registered."
6522
msgstr ""
6523
6524
#: bzrlib/export_pot.py:252
6525
#, python-format
6526
msgid "Exporting messages from builtin command: %s"
6527
msgstr ""
6528
6529
#: bzrlib/export_pot.py:271
6530
msgid "Exporting messages from plugin command: {0} in {1}"
6531
msgstr ""
6532
6533
#: bzrlib/export_pot.py:292
6534
#, python-format
6535
msgid "Exporting message from error: %s"
6536
msgstr "Exportando mensaje del error: %s"
6537
6538
#: bzrlib/fetch.py:98
6539
msgid "Finding revisions"
6540
msgstr "Buscando revisiones"
6541
6542
#: bzrlib/fetch.py:103
6543
msgid "Fetching revisions"
6544
msgstr "Obteniendo revisiones"
6545
6546
#: bzrlib/foreign.py:262
6547
msgid "Push into a different VCS without any custom bzr metadata."
6548
msgstr ""
6549
6550
#: bzrlib/foreign.py:264
6551
msgid ""
6552
"This will afterwards rebase the local branch on the remote\n"
6553
"branch unless the --no-rebase option is used, in which case \n"
6554
"the two branches will be out of sync after the push. "
6555
msgstr ""
6556
6557
#: bzrlib/foreign.py:277
6558
msgid "Do not rebase after push."
6559
msgstr ""
6560
6561
#: bzrlib/foreign.py:311
6562
#, python-format
6563
msgid "Using saved location: %s\n"
6564
msgstr "Usando las ubicaciones guardadas: %s\n"
6565
6566
#: bzrlib/foreign.py:321
6567
msgid ""
6568
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6569
"regular push."
6570
msgstr ""
6571
6572
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6573
msgid "{0} commits with valid signatures"
6574
msgstr "{0} ejecuciones con firmas válidas"
6575
6576
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6577
msgid "{0} commit with unknown key"
6578
msgid_plural "{0} commits with unknown keys"
6579
msgstr[0] "{0} ejecución con clave desconocida"
6580
msgstr[1] "{0} ejecuciones con claves desconocidas"
6581
6582
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6583
msgid "{0} commit not valid"
6584
msgid_plural "{0} commits not valid"
6585
msgstr[0] "{0} ejecución inválida"
6586
msgstr[1] "{0} ejecuciones inválidas"
6587
6588
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6589
msgid "{0} commit not signed"
6590
msgid_plural "{0} commits not signed"
6591
msgstr[0] "{0} ejecución no firmada"
6592
msgstr[1] "{0} ejecuciones no firmadas"
6593
6594
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6595
msgid "{0} commit with key now expired"
6596
msgid_plural "{0} commits with key now expired"
6597
msgstr[0] ""
6598
msgstr[1] ""
6599
6600
#: bzrlib/gpg.py:343
6601
msgid "No GnuPG key results for pattern: {0}"
6602
msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
6603
6604
#: bzrlib/gpg.py:386
6605
msgid "{0} signed {1} commit"
6606
msgid_plural "{0} signed {1} commits"
6607
msgstr[0] ""
6608
msgstr[1] ""
6609
6610
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6611
msgid "{0} commit by author {1}"
6612
msgid_plural "{0} commits by author {1}"
6613
msgstr[0] ""
6614
msgstr[1] ""
6615
6616
#: bzrlib/gpg.py:433
6617
msgid "Unknown key {0} signed {1} commit"
6618
msgid_plural "Unknown key {0} signed {1} commits"
6619
msgstr[0] ""
6620
msgstr[1] ""
6621
6622
#: bzrlib/gpg.py:452
6623
msgid "{0} commit by author {1} with key {2} now expired"
6624
msgid_plural "{0} commits by author {1} with key {2} now expired"
6625
msgstr[0] ""
6626
msgstr[1] ""
6627
6628
#: bzrlib/groupcompress.py:1739
6629
#, python-format
6630
msgid "Insert claimed random_id=True, but then inserted %r two times"
6631
msgstr ""
6632
6633
#: bzrlib/hooks.py:331
6634
#, python-format
6635
msgid "Introduced in: %s"
6636
msgstr ""
6637
6638
#: bzrlib/hooks.py:334
6639
#, python-format
6640
msgid "Deprecated in: %s"
6641
msgstr ""
6642
6643
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6644
msgid "Walking content"
6645
msgstr ""
6646
6647
#: bzrlib/knit.py:3330
6648
msgid "annotating"
6649
msgstr "anotar"
6650
6651
#: bzrlib/lock.py:548
6652
msgid "{0!r} was {1} locked again"
6653
msgstr ""
6654
6655
#: bzrlib/lockdir.py:321
6656
#, python-format
6657
msgid "error removing pending lock: %s"
6658
msgstr ""
6659
6660
#: bzrlib/lockdir.py:616
6661
msgid "Unable to obtain"
6662
msgstr ""
6663
6664
#: bzrlib/lockdir.py:618
6665
msgid "Lock owner changed for"
6666
msgstr ""
6667
6668
#: bzrlib/lockdir.py:620
6669
msgid "{0} lock {1} {2}."
6670
msgstr ""
6671
6672
#: bzrlib/lockdir.py:627
6673
#, python-format
6674
msgid "Will continue to try until %s, unless you press Ctrl-C."
6675
msgstr ""
6676
6677
#: bzrlib/lockdir.py:629
6678
msgid "See \"bzr help break-lock\" for more."
6679
msgstr ""
6680
6681
#: bzrlib/lockdir.py:739
6682
#, python-format
6683
msgid ""
6684
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6685
msgstr ""
6686
6687
#: bzrlib/log.py:572
6688
msgid "--exclude-common-ancestry requires two different revisions"
6689
msgstr "--exclude-common-ancestry requiere dos revisiones diferentes"
6690
6691
#: bzrlib/log.py:574
6692
#, python-format
6693
msgid "invalid direction %r"
6694
msgstr "dirección %r inválida"
6695
6696
#: bzrlib/log.py:662
6697
msgid "Start revision not found in history of end revision."
6698
msgstr ""
6699
6700
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6701
msgid "Logging revision 0 is invalid."
6702
msgstr ""
6703
6704
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6705
msgid "Start revision must be older than the end revision."
6706
msgstr "El inicio de la revisión debe ser anterior al final."
6707
6708
#: bzrlib/log.py:1827
6709
#, python-format
6710
msgid "unknown log formatter: %r"
6711
msgstr ""
6712
6713
#: bzrlib/log.py:2123
6714
msgid "fixes bug"
6715
msgid_plural "fixes bugs"
6716
msgstr[0] "error areglado"
6717
msgstr[1] "errores arreglados"
6718
6719
#: bzrlib/merge.py:689
6720
msgid "All changes applied successfully."
6721
msgstr "Cambios aplicados con éxito."
6722
6723
#: bzrlib/merge.py:691
6724
#, python-format
6725
msgid "%d conflicts encountered."
6726
msgstr "%d conflictos encontrados."
6727
6728
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6729
msgid "Preparing file merge"
6730
msgstr ""
6731
6732
#: bzrlib/multiparent.py:426
6733
msgid "Importing revisions"
6734
msgstr "Importar revisiones"
6735
6736
#: bzrlib/option.py:526
6737
msgid "Show help message."
6738
msgstr "Mostrar mensaje de ayuda."
6739
6740
#: bzrlib/option.py:528
6741
msgid "Only display errors and warnings."
6742
msgstr "Mostrar solo errores y avisos."
6743
6744
#: bzrlib/option.py:531
6745
msgid "Show usage message and options."
6746
msgstr "Mostrar mensaje de uso y opciones."
6747
6748
#: bzrlib/option.py:533
6749
msgid "Display more information."
6750
msgstr "Mostrar más información."
6751
6752
#: bzrlib/option.py:541
6753
msgid ""
6754
"Select changes introduced by the specified revision. See also \"help "
6755
"revisionspec\"."
6756
msgstr ""
6757
6758
#: bzrlib/option.py:543
6759
msgid "Branch to operate on, instead of working directory."
6760
msgstr ""
6761
6762
#: bzrlib/option.py:545
6763
msgid "Detailed log format."
6764
msgstr ""
6765
6766
#: bzrlib/option.py:545
6767
msgid "Format used by GNU ChangeLog files."
6768
msgstr ""
6769
6770
#: bzrlib/option.py:545
6771
msgid "Log format with one line per revision."
6772
msgstr ""
6773
6774
#: bzrlib/option.py:545
6775
msgid "Moderately short log format."
6776
msgstr ""
6777
6778
#: bzrlib/option.py:545
6779
msgid "Use specified log format."
6780
msgstr "Usar el formato de registro especificado."
6781
6782
#: bzrlib/option.py:547
6783
msgid "Log format"
6784
msgstr "Formato de registro"
6785
6786
#: bzrlib/option.py:549
6787
msgid "LCA-newness merge."
6788
msgstr ""
6789
6790
#: bzrlib/option.py:549
6791
msgid "Merge using external diff3."
6792
msgstr ""
6793
6794
#: bzrlib/option.py:549
6795
msgid "Native diff3-style merge."
6796
msgstr ""
6797
6798
#: bzrlib/option.py:549
6799
msgid "Select a particular merge algorithm."
6800
msgstr "Seleccionar un algoritmo de fusión particular."
6801
6802
#: bzrlib/option.py:549
6803
msgid "Weave-based merge."
6804
msgstr ""
6805
6806
#: bzrlib/option.py:551
6807
msgid "Merge algorithm"
6808
msgstr "Algoritmo de fusión"
6809
6810
#: bzrlib/option.py:554
6811
msgid "Message string."
6812
msgstr "Cadena de mensaje."
6813
6814
#: bzrlib/option.py:556
6815
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6816
msgstr ""
6817
6818
#: bzrlib/option.py:558
6819
msgid "Ignore differences between branches and overwrite unconditionally."
6820
msgstr ""
6821
6822
#: bzrlib/option.py:560
6823
msgid "Remember the specified location as a default."
6824
msgstr "Recordar la ubicación especificada como predeterminada."
6825
6826
#: bzrlib/option.py:562
6827
msgid "Reprocess to reduce spurious conflicts."
6828
msgstr "Reprocesar para reducir los conflictos espurios."
6829
6830
#: bzrlib/option.py:566
6831
msgid "See \"help revisionspec\" for details."
6832
msgstr "Consulte «help revisionspec» para obtener más detalles."
6833
6834
#: bzrlib/option.py:568
6835
msgid "Show internal object ids."
6836
msgstr "Mostrar las id de los objetos internos."
6837
6838
#: bzrlib/option.py:571
6839
msgid "Display timezone as local, original, or utc."
6840
msgstr ""
6841
6842
#: bzrlib/osutils.py:100
6843
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6844
msgstr ""
6845
6846
#: bzrlib/osutils.py:220
6847
msgid "lstat/stat of ({0!r}): {1!r}"
6848
msgstr "lstat/stat de ({0!r}): {1!r}"
6849
6850
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6851
#, python-format
6852
msgid "sorry, %r not allowed in path"
6853
msgstr ""
6854
6855
#: bzrlib/osutils.py:1237
6856
#, python-format
6857
msgid "%r is too short to calculate a relative path"
6858
msgstr ""
6859
6860
#: bzrlib/plugin.py:143
6861
#, python-format
6862
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6863
msgstr ""
6864
6865
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6866
msgid "Enable completions for the selected plugin (default: all plugins)"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6870
msgid "Generate a shell function for bash command line completion."
6871
msgstr ""
6872
6873
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6874
msgid ""
6875
"This command generates a shell function which can be used by bash to\n"
6876
"automatically complete the currently typed command when the user presses\n"
6877
"the completion key (usually tab)."
6878
msgstr ""
6879
6880
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6881
msgid ""
6882
"Commonly used like this:\n"
6883
" eval \"`bzr bash-completion`\""
6884
msgstr ""
6885
6886
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6887
msgid "Name of the generated function (default: _bzr)"
6888
msgstr "Nombre de la función generada (predeterminado: _bzr)"
6889
6890
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6891
msgid "Generate only the shell function, don't enable it"
6892
msgstr ""
6893
6894
#: bzrlib/plugins/launchpad/__init__.py:81
6895
msgid "Register a branch with launchpad.net."
6896
msgstr "Registrar una rama con launchpad.net."
6897
6898
#: bzrlib/plugins/launchpad/__init__.py:83
6899
msgid ""
6900
"This command lists a bzr branch in the directory of branches on\n"
6901
"launchpad.net. Registration allows the branch to be associated with\n"
6902
"bugs or specifications."
6903
msgstr ""
6904
6905
#: bzrlib/plugins/launchpad/__init__.py:87
6906
msgid ""
6907
"Before using this command you must register the project to which the\n"
6908
"branch belongs, and create an account for yourself on launchpad.net."
6909
msgstr ""
6910
6911
#: bzrlib/plugins/launchpad/__init__.py:90
6912
msgid ""
6913
"arguments:\n"
6914
" public_url: The publicly visible url for the branch to register.\n"
6915
" This must be an http or https url (which Launchpad can read\n"
6916
" from to access the branch). Local file urls, SFTP urls, and\n"
6917
" bzr+ssh urls will not work.\n"
6918
" If no public_url is provided, bzr will use the configured\n"
6919
" public_url if there is one for the current branch, and\n"
6920
" otherwise error."
6921
msgstr ""
6922
6923
#: bzrlib/plugins/launchpad/__init__.py:99
6924
msgid ""
6925
"example:\n"
6926
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6927
" --project fooproject"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/launchpad/__init__.py:106
6931
msgid "Launchpad project short name to associate with the branch."
6932
msgstr "Nombre corto del proyecto de Launchpad para asociar con la rama."
6933
6934
#: bzrlib/plugins/launchpad/__init__.py:113
6935
msgid ""
6936
"Short name for the branch; by default taken from the last component of the "
6937
"url."
6938
msgstr ""
6939
6940
#: bzrlib/plugins/launchpad/__init__.py:117
6941
msgid "One-sentence description of the branch."
6942
msgstr ""
6943
6944
#: bzrlib/plugins/launchpad/__init__.py:120
6945
msgid "Longer description of the purpose or contents of the branch."
6946
msgstr ""
6947
6948
#: bzrlib/plugins/launchpad/__init__.py:123
6949
msgid "Branch author's email address, if not yourself."
6950
msgstr ""
6951
6952
#: bzrlib/plugins/launchpad/__init__.py:126
6953
msgid "The bug this branch fixes."
6954
msgstr "El error que arregla esta rama."
6955
6956
#: bzrlib/plugins/launchpad/__init__.py:129
6957
msgid "Prepare the request but don't actually send it."
6958
msgstr ""
6959
6960
#: bzrlib/plugins/launchpad/__init__.py:151
6961
msgid ""
6962
"register-branch requires a public branch url - see bzr help register-branch."
6963
msgstr ""
6964
6965
#: bzrlib/plugins/launchpad/__init__.py:159
6966
msgid "--product is deprecated; please use --project."
6967
msgstr ""
6968
6969
#: bzrlib/plugins/launchpad/__init__.py:191
6970
msgid "Open a Launchpad branch page in your web browser."
6971
msgstr "Abrir una página de rama de Launchpad en su navegador web."
6972
6973
#: bzrlib/plugins/launchpad/__init__.py:196
6974
msgid "Do not actually open the browser. Just say the URL we would use."
6975
msgstr ""
6976
6977
#: bzrlib/plugins/launchpad/__init__.py:231
6978
#, python-format
6979
msgid "Opening %s in web browser"
6980
msgstr ""
6981
6982
#: bzrlib/plugins/launchpad/__init__.py:241
6983
msgid "Show or set the Launchpad user ID."
6984
msgstr "Mostrar o establecer el ID de usuario de Launchpad."
6985
6986
#: bzrlib/plugins/launchpad/__init__.py:243
6987
msgid ""
6988
"When communicating with Launchpad, some commands need to know your\n"
6989
"Launchpad user ID. This command can be used to set or show the\n"
6990
"user ID that Bazaar will use for such communication."
6991
msgstr ""
6992
6993
#: bzrlib/plugins/launchpad/__init__.py:247
6994
msgid ""
6995
":Examples:\n"
6996
" Show the Launchpad ID of the current user::"
6997
msgstr ""
6998
6999
#: bzrlib/plugins/launchpad/__init__.py:250
7000
msgid " bzr launchpad-login"
7001
msgstr " bzr launchpad-login"
7002
7003
#: bzrlib/plugins/launchpad/__init__.py:252
7004
msgid " Set the Launchpad ID of the current user to 'bob'::"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/launchpad/__init__.py:254
7008
msgid " bzr launchpad-login bob"
7009
msgstr " bzr launchpad-login bob"
7010
7011
#: bzrlib/plugins/launchpad/__init__.py:261
7012
msgid "Don't check that the user name is valid."
7013
msgstr "No comprueba que el nombre de usuario sea válido."
7014
7015
#: bzrlib/plugins/launchpad/__init__.py:276
7016
#: bzrlib/plugins/launchpad/__init__.py:287
7017
msgid "Launchpad user ID exists and has SSH keys.\n"
7018
msgstr ""
7019
7020
#: bzrlib/plugins/launchpad/__init__.py:279
7021
msgid "No Launchpad user ID configured.\n"
7022
msgstr ""
7023
7024
#: bzrlib/plugins/launchpad/__init__.py:290
7025
#, python-format
7026
msgid "Launchpad user ID set to '%s'.\n"
7027
msgstr ""
7028
7029
#: bzrlib/plugins/launchpad/__init__.py:298
7030
msgid "Ask Launchpad to mirror a branch now."
7031
msgstr ""
7032
7033
#: bzrlib/plugins/launchpad/__init__.py:318
7034
msgid "Propose merging a branch on Launchpad."
7035
msgstr ""
7036
7037
#: bzrlib/plugins/launchpad/__init__.py:320
7038
msgid ""
7039
"This will open your usual editor to provide the initial comment. When it\n"
7040
"has created the proposal, it will open it in your default web browser."
7041
msgstr ""
7042
7043
#: bzrlib/plugins/launchpad/__init__.py:323
7044
msgid ""
7045
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7046
"is not supplied, the remembered submit branch will be used. If no submit\n"
7047
"branch is remembered, the development focus will be used."
7048
msgstr ""
7049
7050
#: bzrlib/plugins/launchpad/__init__.py:327
7051
msgid ""
7052
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7053
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7054
"The parameter the launchpad account name of the desired reviewer. This\n"
7055
"may optionally be followed by '=' and the review type. For example:"
7056
msgstr ""
7057
7058
#: bzrlib/plugins/launchpad/__init__.py:332
7059
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7060
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
7061
7062
#: bzrlib/plugins/launchpad/__init__.py:334
7063
msgid ""
7064
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7065
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7066
msgstr ""
7067
7068
#: bzrlib/plugins/launchpad/__init__.py:339
7069
msgid "Propose the merge on staging."
7070
msgstr ""
7071
7072
#: bzrlib/plugins/launchpad/__init__.py:341
7073
msgid "Commit message."
7074
msgstr "Mensaje de ejecución."
7075
7076
#: bzrlib/plugins/launchpad/__init__.py:343
7077
msgid "Mark the proposal as approved immediately."
7078
msgstr "Marcar el propuesto como aprobado inmediatamente."
7079
7080
#: bzrlib/plugins/launchpad/__init__.py:345
7081
msgid "Requested reviewer and optional type."
7082
msgstr "Revisor solicitado y tipo opcional."
7083
7084
#: bzrlib/plugins/launchpad/__init__.py:382
7085
msgid "Find the proposal to merge this revision."
7086
msgstr "Buscar el propuesto para fusionar esta revisión."
7087
7088
#: bzrlib/plugins/launchpad/__init__.py:384
7089
msgid ""
7090
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7091
"This works only if the selected branch was the merge proposal target, and\n"
7092
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7093
"are opened in a web browser."
7094
msgstr ""
7095
7096
#: bzrlib/plugins/launchpad/__init__.py:389
7097
msgid ""
7098
"Any revision involved in the merge may be specified-- the revision in\n"
7099
"which the merge was performed, or one of the revisions that was merged."
7100
msgstr ""
7101
7102
#: bzrlib/plugins/launchpad/__init__.py:392
7103
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7104
msgstr ""
7105
7106
#: bzrlib/plugins/launchpad/__init__.py:394
7107
msgid " bzr lp-find-proposal -r annotate:README:1"
7108
msgstr " bzr lp-find-proposal -r annotate:README:1"
7109
7110
#: bzrlib/plugins/launchpad/__init__.py:409
7111
msgid "No review found."
7112
msgstr ""
7113
7114
#: bzrlib/plugins/launchpad/__init__.py:410
7115
#, python-format
7116
msgid "%d proposals(s) found."
7117
msgstr ""
7118
7119
#: bzrlib/plugins/launchpad/__init__.py:420
7120
msgid "Finding revision-id"
7121
msgstr ""
7122
7123
#: bzrlib/plugins/launchpad/__init__.py:427
7124
msgid "Finding merge"
7125
msgstr ""
7126
7127
#: bzrlib/plugins/launchpad/__init__.py:432
7128
msgid "Finding revno"
7129
msgstr ""
7130
7131
#: bzrlib/plugins/launchpad/__init__.py:437
7132
msgid "Finding Launchpad branch"
7133
msgstr ""
7134
7135
#: bzrlib/plugins/launchpad/__init__.py:440
7136
msgid "Finding proposals"
7137
msgstr ""
7138
7139
#: bzrlib/plugins/launchpad/account.py:66
7140
msgid "Setting ssh/sftp usernames for launchpad.net."
7141
msgstr ""
7142
7143
#: bzrlib/plugins/launchpad/lp_api.py:241
7144
#: bzrlib/plugins/launchpad/lp_api.py:246
7145
#, python-format
7146
msgid "%s is not registered on Launchpad"
7147
msgstr ""
7148
7149
#: bzrlib/plugins/launchpad/lp_api.py:256
7150
#, python-format
7151
msgid "%s has no development focus."
7152
msgstr ""
7153
7154
#: bzrlib/plugins/launchpad/lp_api.py:261
7155
#, python-format
7156
msgid "development focus %s has no branch."
7157
msgstr ""
7158
7159
#: bzrlib/plugins/launchpad/lp_api.py:266
7160
#, python-format
7161
msgid "source package %s has no branch."
7162
msgstr ""
7163
7164
#: bzrlib/plugins/launchpad/lp_api.py:270
7165
#, python-format
7166
msgid "%s has no associated product or source package."
7167
msgstr ""
7168
7169
#: bzrlib/plugins/launchpad/lp_api.py:282
7170
#, python-format
7171
msgid "%s is already up-to-date."
7172
msgstr ""
7173
7174
#: bzrlib/plugins/launchpad/lp_api.py:289
7175
#, python-format
7176
msgid "Pushing to %s"
7177
msgstr ""
7178
7179
#: bzrlib/plugins/launchpad/lp_directory.py:170
7180
msgid ""
7181
"resolution for {0}\n"
7182
" local: {1}\n"
7183
" remote: {2}"
7184
msgstr ""
7185
7186
#: bzrlib/plugins/launchpad/lp_propose.py:149
7187
#, python-format
7188
msgid "There is already a branch merge proposal: %s"
7189
msgstr ""
7190
7191
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7192
msgid "pb parameter to convert() is deprecated"
7193
msgstr ""
7194
7195
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7196
msgid "starting upgrade from format 4 to 5"
7197
msgstr ""
7198
7199
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7200
msgid "note: upgrade may be faster if all store files are ungzipped first"
7201
msgstr ""
7202
7203
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7204
msgid "converting revision"
7205
msgstr ""
7206
7207
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7208
msgid "upgraded to weaves:"
7209
msgstr ""
7210
7211
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7212
#, python-format
7213
msgid "%6d revisions and inventories"
7214
msgstr ""
7215
7216
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7217
#, python-format
7218
msgid "%6d revisions not present"
7219
msgstr ""
7220
7221
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7222
#, python-format
7223
msgid "%6d texts"
7224
msgstr ""
7225
7226
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7227
msgid "writing weave"
7228
msgstr ""
7229
7230
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7231
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7232
msgid "inventory"
7233
msgstr ""
7234
7235
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7236
msgid "write revision"
7237
msgstr ""
7238
7239
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7240
msgid "loading revision"
7241
msgstr ""
7242
7243
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7244
#, python-format
7245
msgid "revision {%s} not present in branch; will be converted as a ghost"
7246
msgstr ""
7247
7248
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7249
msgid "starting upgrade from format 5 to 6"
7250
msgstr ""
7251
7252
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7253
#, python-format
7254
msgid "adding prefixes to %s"
7255
msgstr ""
7256
7257
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7258
msgid "starting upgrade from format 6 to metadir"
7259
msgstr ""
7260
7261
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7262
msgid "Removing ancestry.weave"
7263
msgstr ""
7264
7265
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7266
msgid "Finding branch files"
7267
msgstr ""
7268
7269
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7270
msgid "Upgrading repository"
7271
msgstr ""
7272
7273
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7274
msgid "Upgrading branch"
7275
msgstr ""
7276
7277
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7278
msgid "No working tree."
7279
msgstr ""
7280
7281
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7282
msgid "Upgrading working tree"
7283
msgstr ""
7284
7285
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7286
#, python-format
7287
msgid "Make %s lock"
7288
msgstr ""
7289
7290
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7291
#, python-format
7292
msgid "Moving %s"
7293
msgstr ""
7294
7295
#: bzrlib/push.py:56
7296
msgid "Created new branch."
7297
msgstr "Rama nueva creada."
7298
7299
#: bzrlib/push.py:97
7300
#, python-format
7301
msgid ""
7302
"Target directory %s already contains a .bzr directory, but it is not valid."
7303
msgstr ""
7304
7305
#: bzrlib/push.py:101
7306
#, python-format
7307
msgid ""
7308
"Target directory %s already exists, but does not have a .bzr directory. "
7309
"Supply --use-existing-dir to push there anyway."
7310
msgstr ""
7311
7312
#: bzrlib/push.py:122
7313
#, python-format
7314
msgid "Too many redirections trying to make %s."
7315
msgstr ""
7316
7317
#: bzrlib/push.py:147
7318
msgid ""
7319
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7320
"information."
7321
msgstr ""
7322
7323
#: bzrlib/push.py:151
7324
#, python-format
7325
msgid ""
7326
"It is not possible to losslessly push to %s. You may want to use dpush "
7327
"instead."
7328
msgstr ""
7329
7330
#: bzrlib/push.py:157
7331
#, python-format
7332
msgid ""
7333
"At %s you have a valid .bzr control directory, but not a branch or "
7334
"repository. This is an unsupported configuration. Please move the target "
7335
"directory out of the way and try again."
7336
msgstr ""
7337
7338
#: bzrlib/reconcile.py:97
7339
#, python-format
7340
msgid "Reconciling branch %s"
7341
msgstr "Reconciliando rama %s"
7342
7343
#: bzrlib/reconcile.py:103
7344
#, python-format
7345
msgid "Reconciling repository %s"
7346
msgstr "Reconciliando repositorio %s"
7347
7348
#: bzrlib/reconcile.py:105
7349
msgid "Reconciling repository"
7350
msgstr "Reconciliando repositorio"
7351
7352
#: bzrlib/reconcile.py:111
7353
#, python-format
7354
msgid "%s cannot canonicalize CHKs."
7355
msgstr ""
7356
7357
#: bzrlib/reconcile.py:119
7358
msgid "Reconcile aborted: revision index has inconsistent parents."
7359
msgstr ""
7360
7361
#: bzrlib/reconcile.py:121
7362
msgid "Run \"bzr check\" for more details."
7363
msgstr ""
7364
7365
#: bzrlib/reconcile.py:123
7366
msgid "Reconciliation complete."
7367
msgstr "Reconciliación completa."
7368
7369
#: bzrlib/reconcile.py:166
7370
msgid "Fixing last revision info {0} => {1}"
7371
msgstr ""
7372
7373
#: bzrlib/reconcile.py:173
7374
msgid "revision_history ok."
7375
msgstr ""
7376
7377
#: bzrlib/reconcile.py:234
7378
msgid "Reading inventory data"
7379
msgstr "Leyendo los datos de inventario"
7380
7381
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7382
msgid "Inventory ok."
7383
msgstr ""
7384
7385
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7386
msgid "Backing up inventory"
7387
msgstr "Respaldando inventario"
7388
7389
#: bzrlib/reconcile.py:258
7390
msgid "Backup inventory created."
7391
msgstr ""
7392
7393
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7394
msgid "Writing weave"
7395
msgstr ""
7396
7397
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7398
msgid "Inventory regenerated."
7399
msgstr "Inventario regenerado."
7400
7401
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7402
msgid "Reading indexes"
7403
msgstr "Leyendo índices"
7404
7405
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7406
msgid "Checking unused inventories"
7407
msgstr ""
7408
7409
#: bzrlib/reconcile.py:388
7410
msgid "Backup Inventory created"
7411
msgstr ""
7412
7413
#: bzrlib/reconcile.py:446
7414
msgid "Fixing text parents"
7415
msgstr ""
7416
7417
#: bzrlib/reconfigure.py:54
7418
msgid "{0} is now stacked on {1}\n"
7419
msgstr "{0} está ahora apilado en {1}\n"
7420
7421
#: bzrlib/reconfigure.py:69
7422
#, python-format
7423
msgid "%s is now not stacked\n"
7424
msgstr ""
7425
7426
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7427
#, python-format
7428
msgid "bzr: ERROR (ignored): %s"
7429
msgstr "bzr: ERROR (ignorado): %s"
7430
7431
#: bzrlib/remote.py:2541
7432
msgid "Copying repository content as tarball..."
7433
msgstr ""
7434
7435
#: bzrlib/rename_map.py:69
7436
msgid "Calculating hashes"
7437
msgstr "Calculando hashes"
7438
7439
#: bzrlib/rename_map.py:107
7440
msgid "Determining hash hits"
7441
msgstr ""
7442
7443
#: bzrlib/rename_map.py:242
7444
msgid "{0} => {1}"
7445
msgstr "{0} => {1}"
7446
7447
#: bzrlib/repository.py:1787
7448
msgid "Moving repository to repository.backup"
7449
msgstr ""
7450
7451
#: bzrlib/repository.py:1794
7452
msgid "Creating new repository"
7453
msgstr "Creando repositorio nuevo"
7454
7455
#: bzrlib/repository.py:1799
7456
msgid "Copying content"
7457
msgstr "Copiar contenido"
7458
7459
#: bzrlib/repository.py:1803
7460
msgid "Deleting old repository content"
7461
msgstr ""
7462
7463
#: bzrlib/repository.py:1805
7464
msgid "repository converted"
7465
msgstr "repositorio convertido"
7466
7467
#: bzrlib/revisionspec.py:903
7468
msgid "Using {0} {1}"
7469
msgstr "Usando {0} {1}"
7470
7471
#: bzrlib/send.py:58
7472
#, python-format
7473
msgid "Mail client \"%s\" does not support specifying body"
7474
msgstr ""
7475
7476
#: bzrlib/send.py:62
7477
msgid "--remember requires a branch to be specified."
7478
msgstr ""
7479
7480
#: bzrlib/send.py:77
7481
msgid "No submit branch known or specified"
7482
msgstr ""
7483
7484
#: bzrlib/send.py:80
7485
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7486
msgstr ""
7487
7488
#: bzrlib/send.py:98
7489
#, python-format
7490
msgid "No such send format '%s'."
7491
msgstr ""
7492
7493
#: bzrlib/send.py:114
7494
msgid "bzr send takes at most two one revision identifiers"
7495
msgstr ""
7496
7497
#: bzrlib/send.py:127
7498
msgid "No revisions to submit."
7499
msgstr "No hay revisiones para enviar."
7500
7501
#: bzrlib/send.py:139
7502
msgid ""
7503
"- not supported for merge directives that use more than one output file."
7504
msgstr ""
7505
7506
#: bzrlib/send.py:185
7507
msgid "Format 0.9 does not permit bundle with no patch"
7508
msgstr ""
7509
7510
#: bzrlib/shelf_ui.py:46
7511
#, python-format
7512
msgid "Shelve adding file \"%(path)s\"?"
7513
msgstr ""
7514
7515
#: bzrlib/shelf_ui.py:47
7516
msgid "Shelve binary changes?"
7517
msgstr ""
7518
7519
#: bzrlib/shelf_ui.py:48
7520
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7521
msgstr ""
7522
7523
#: bzrlib/shelf_ui.py:50
7524
#, python-format
7525
msgid "Shelve removing file \"%(path)s\"?"
7526
msgstr ""
7527
7528
#: bzrlib/shelf_ui.py:51
7529
#, python-format
7530
msgid "Shelve %d change(s)?"
7531
msgstr ""
7532
7533
#: bzrlib/shelf_ui.py:52
7534
msgid "Shelve?"
7535
msgstr "¿Arrinconar?"
7536
7537
#: bzrlib/shelf_ui.py:53
7538
#, python-format
7539
msgid ""
7540
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7541
msgstr ""
7542
7543
#: bzrlib/shelf_ui.py:55
7544
#, python-format
7545
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7546
msgstr ""
7547
7548
#: bzrlib/shelf_ui.py:70
7549
#, python-format
7550
msgid "Changes shelved with id \"%d\"."
7551
msgstr ""
7552
7553
#: bzrlib/shelf_ui.py:74
7554
msgid "Selected changes destroyed."
7555
msgstr "Cambios seleccionados destruidos."
7556
7557
#: bzrlib/shelf_ui.py:78
7558
msgid "Selected changes:"
7559
msgstr "Cambios seleccionados:"
7560
7561
#: bzrlib/shelf_ui.py:98
7562
#, python-format
7563
msgid "Delete file \"%(path)s\"?"
7564
msgstr "¿Eliminar archivo «%(path)s»?"
7565
7566
#: bzrlib/shelf_ui.py:99
7567
msgid "Apply binary changes?"
7568
msgstr "¿Aplicar cambios binarios?"
7569
7570
#: bzrlib/shelf_ui.py:100
7571
#, python-format
7572
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7573
msgstr ""
7574
7575
#: bzrlib/shelf_ui.py:102
7576
#, python-format
7577
msgid "Add file \"%(path)s\"?"
7578
msgstr "¿Añadir archivo «%(path)s»?"
7579
7580
#: bzrlib/shelf_ui.py:103
7581
#, python-format
7582
msgid "Apply %d change(s)?"
7583
msgstr "¿Aplicar %d cambio(s)?"
7584
7585
#: bzrlib/shelf_ui.py:104
7586
msgid "Apply change?"
7587
msgstr "¿Aplicar cambio?"
7588
7589
#: bzrlib/shelf_ui.py:105
7590
#, python-format
7591
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7592
msgstr ""
7593
7594
#: bzrlib/shelf_ui.py:107
7595
#, python-format
7596
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7597
msgstr ""
7598
7599
#: bzrlib/shelf_ui.py:402
7600
msgid "No changes are shelved."
7601
msgstr "No se han arrinconado cambios."
7602
7603
#: bzrlib/shelf_ui.py:460
7604
#, python-format
7605
msgid "Using changes with id \"%d\"."
7606
msgstr ""
7607
7608
#: bzrlib/shelf_ui.py:464
7609
#, python-format
7610
msgid "Message: %s"
7611
msgstr "Mensaje: %s"
7612
7613
#: bzrlib/shelf_ui.py:476
7614
#, python-format
7615
msgid "Deleted changes with id \"%d\"."
7616
msgstr ""
7617
7618
#: bzrlib/smart/medium.py:714
7619
msgid "HPSS calls: {0} ({1} vfs) {2}"
7620
msgstr ""
7621
7622
#: bzrlib/smart/server.py:169
7623
msgid "Requested to stop gracefully"
7624
msgstr ""
7625
7626
#: bzrlib/smart/server.py:179
7627
#, python-format
7628
msgid "Waiting for %d client(s) to finish"
7629
msgstr ""
7630
7631
#: bzrlib/smart/server.py:185
7632
#, python-format
7633
msgid "Still waiting for %d client(s) to finish"
7634
msgstr ""
7635
7636
#: bzrlib/smart/server.py:219
7637
#, python-format
7638
msgid "listening socket error: %s"
7639
msgstr ""
7640
7641
#: bzrlib/smart/server.py:452
7642
#, python-format
7643
msgid "listening on port: %s"
7644
msgstr ""
7645
7646
#: bzrlib/switch.py:73
7647
msgid "Pending merges must be committed or reverted before using switch."
7648
msgstr ""
7649
7650
#: bzrlib/switch.py:100
7651
msgid ""
7652
"Cannot switch as local commits found in the checkout. Commit these to the "
7653
"bound branch or use --force to throw them away."
7654
msgstr ""
7655
7656
#: bzrlib/switch.py:105
7657
#, python-format
7658
msgid ""
7659
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7660
"anyway, use --force."
7661
msgstr ""
7662
7663
#: bzrlib/switch.py:125
7664
msgid "Cannot switch a branch, only a checkout."
7665
msgstr ""
7666
7667
#: bzrlib/switch.py:163
7668
#, python-format
7669
msgid "Tree is up to date at revision %d."
7670
msgstr ""
7671
7672
#: bzrlib/switch.py:169
7673
#, python-format
7674
msgid "Updated to revision %d."
7675
msgstr ""
7676
7677
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7678
msgid "Apply phase"
7679
msgstr "Aplicar fase"
7680
7681
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7682
msgid "removing file"
7683
msgstr "eliminar archivo"
7684
7685
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7686
msgid "adding file"
7687
msgstr "añadiendo archivo"
7688
7689
#: bzrlib/transform.py:2591
7690
msgid "Building tree"
7691
msgstr "Construyendo árbol"
7692
7693
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7694
msgid "Adding file contents"
7695
msgstr "Añadiendo contenidos de archivo"
7696
7697
#: bzrlib/transform.py:3028
7698
msgid "Resolution pass"
7699
msgstr ""
7700
7701
#: bzrlib/transport/ftp/_gssapi.py:88
7702
#, python-format
7703
msgid "Authenticated as %s"
7704
msgstr ""
7705
7706
#: bzrlib/tree.py:634
7707
msgid "*** {0} content-filter: {1} => {2!r}"
7708
msgstr ""
7709
7710
#: bzrlib/upgrade.py:77
7711
#, python-format
7712
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7713
msgstr ""
7714
7715
#: bzrlib/upgrade.py:100
7716
#, python-format
7717
msgid "cannot upgrade from bzrdir format %s"
7718
msgstr ""
7719
7720
#: bzrlib/upgrade.py:103
7721
#, python-format
7722
msgid "starting upgrade of %s"
7723
msgstr ""
7724
7725
#: bzrlib/upgrade.py:110
7726
msgid "finished"
7727
msgstr ""
7728
7729
#: bzrlib/upgrade.py:120
7730
msgid "Deleting backup.bzr"
7731
msgstr ""
7732
7733
#: bzrlib/upgrade.py:151
7734
msgid ""
7735
"\n"
7736
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7737
msgstr ""
7738
7739
#: bzrlib/upgrade.py:208
7740
#, python-format
7741
msgid "Found %d dependent branches - upgrading ..."
7742
msgstr ""
7743
7744
#: bzrlib/upgrade.py:276
7745
msgid "Upgrading bzrdirs"
7746
msgstr "Actualizando bzrdirs"
7747
7748
#: bzrlib/upgrade.py:282
7749
#, python-format
7750
msgid "Upgrading %s"
7751
msgstr "Actualizando %s"
7752
7753
#: bzrlib/upgrade.py:283
7754
msgid "Upgrading {0} {1} ..."
7755
msgstr "Actualizando {0} {1} ..."
7756
7757
#: bzrlib/upgrade.py:301
7758
msgid "Removing backup ..."
7759
msgstr ""
7760
7761
#: bzrlib/upgrade.py:305
7762
msgid "failed to clean-up {0}: {1}"
7763
msgstr ""
7764
7765
#: bzrlib/vf_repository.py:1090
7766
msgid "inventories"
7767
msgstr ""
7768
7769
#: bzrlib/vf_repository.py:1116
7770
msgid "texts"
7771
msgstr "textos"
7772
7773
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7774
msgid "Calculating text parents"
7775
msgstr ""
7776
7777
#: bzrlib/vf_repository.py:1706
7778
msgid "Fetch texts"
7779
msgstr ""
7780
7781
#: bzrlib/vf_repository.py:2535
7782
msgid "loading text store"
7783
msgstr ""
7784
7785
#: bzrlib/vf_repository.py:2541
7786
msgid "checking text graph"
7787
msgstr ""
7788
7789
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7790
#: bzrlib/vf_repository.py:3124
7791
msgid "Transferring revisions"
7792
msgstr ""
7793
7794
#: bzrlib/win32utils.py:146
7795
msgid "Failed to GetProcessMemoryInfo()"
7796
msgstr ""
7797
7798
#: bzrlib/win32utils.py:167
7799
msgid "Cannot debug memory on win32 without ctypes or win32process"
7800
msgstr ""
7801
7802
#: bzrlib/win32utils.py:172
7803
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7804
msgstr ""
7805
7806
#: bzrlib/win32utils.py:180
7807
#, python-format
7808
msgid "WorkingSize %8d KiB"
7809
msgstr ""
7810
7811
#: bzrlib/win32utils.py:181
7812
#, python-format
7813
msgid "PeakWorking %8d KiB"
7814
msgstr ""
7815
7816
#: bzrlib/win32utils.py:182
7817
#, python-format
7818
msgid "PagefileUsage %8d KiB"
7819
msgstr ""
7820
7821
#: bzrlib/win32utils.py:183
7822
#, python-format
7823
msgid "PeakPagefileUsage %8d KiB"
7824
msgstr ""
7825
7826
#: bzrlib/win32utils.py:185
7827
#, python-format
7828
msgid "PrivateUsage %8d KiB"
7829
msgstr ""
7830
7831
#: bzrlib/win32utils.py:186
7832
#, python-format
7833
msgid "PageFaultCount %8d"
7834
msgstr ""
7835
7836
#: bzrlib/workingtree.py:1478
7837
msgid "Rerun update after fixing the conflicts."
7838
msgstr ""
7839
7840
#: dummy/help_topics/authentication/summary.txt:1
7841
msgid "Information on configuring authentication"
7842
msgstr ""
7843
7844
#: dummy/help_topics/basic/detail.txt:1
7845
msgid ""
7846
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7847
"http://bazaar.canonical.com/"
7848
msgstr ""
7849
7850
#: dummy/help_topics/basic/detail.txt:4
7851
msgid ""
7852
"Basic commands:\n"
7853
" bzr init makes this directory a versioned branch\n"
7854
" bzr branch make a copy of another branch"
7855
msgstr ""
7856
7857
#: dummy/help_topics/basic/detail.txt:8
7858
msgid ""
7859
" bzr add make files or directories versioned\n"
7860
" bzr ignore ignore a file or pattern\n"
7861
" bzr mv move or rename a versioned file"
7862
msgstr ""
7863
7864
#: dummy/help_topics/basic/detail.txt:12
7865
msgid ""
7866
" bzr status summarize changes in working copy\n"
7867
" bzr diff show detailed diffs"
7868
msgstr ""
7869
7870
#: dummy/help_topics/basic/detail.txt:15
7871
msgid ""
7872
" bzr merge pull in changes from another branch\n"
7873
" bzr commit save some or all changes\n"
7874
" bzr send send changes via email"
7875
msgstr ""
7876
7877
#: dummy/help_topics/basic/detail.txt:19
7878
msgid ""
7879
" bzr log show history of changes\n"
7880
" bzr check validate storage"
7881
msgstr ""
7882
" bzr log muestra el historial de cambios\n"
7883
" bzr check valida el almacenamiento"
7884
7885
#: dummy/help_topics/basic/detail.txt:22
7886
msgid ""
7887
" bzr help init more help on e.g. init command\n"
7888
" bzr help commands list all commands\n"
7889
" bzr help topics list all help topics\n"
7890
msgstr ""
7891
7892
#: dummy/help_topics/basic/summary.txt:1
7893
msgid "Basic commands"
7894
msgstr "Órdenes básicas"
7895
7896
#: dummy/help_topics/branches/detail.txt:1
7897
msgid "Branches"
7898
msgstr "Ramas"
7899
7900
#: dummy/help_topics/branches/detail.txt:3
7901
msgid ""
7902
"A branch consists of the state of a project, including all of its\n"
7903
"history. All branches have a repository associated (which is where the\n"
7904
"branch history is stored), but multiple branches may share the same\n"
7905
"repository (a shared repository). Branches can be copied and merged."
7906
msgstr ""
7907
7908
#: dummy/help_topics/branches/detail.txt:8
7909
msgid ""
7910
"In addition, one branch may be bound to another one. Binding to another\n"
7911
"branch indicates that commits which happen in this branch must also \n"
7912
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7913
"commits when the two branches are out of date. In order for a commit \n"
7914
"to succeed, it may be necessary to update the current branch using \n"
7915
"``bzr update``."
7916
msgstr ""
7917
7918
#: dummy/help_topics/branches/detail.txt:15
7919
#: dummy/help_topics/checkouts/detail.txt:66
7920
#: dummy/help_topics/repositories/detail.txt:36
7921
msgid "Related commands::"
7922
msgstr "Órdenes relacionadas"
7923
7924
#: dummy/help_topics/branches/detail.txt:17
7925
msgid ""
7926
" init Change a directory into a versioned branch.\n"
7927
" branch Create a new branch that is a copy of an existing branch.\n"
7928
" merge Perform a three-way merge.\n"
7929
" bind Bind a branch to another one.\n"
7930
msgstr ""
7931
7932
#: dummy/help_topics/branches/summary.txt:1
7933
msgid "Information on what a branch is"
7934
msgstr ""
7935
7936
#: dummy/help_topics/bugs/summary.txt:1
7937
msgid "Bug tracker settings"
7938
msgstr "Configuración del seguimiento de errores"
7939
7940
#: dummy/help_topics/checkouts/detail.txt:1
7941
msgid "Checkouts"
7942
msgstr "Comrpobaciones"
7943
7944
#: dummy/help_topics/checkouts/detail.txt:3
7945
msgid ""
7946
"Checkouts are source trees that are connected to a branch, so that when\n"
7947
"you commit in the source tree, the commit goes into that branch. They\n"
7948
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7949
"Bazaar's decentralized features until you want them. Using checkouts\n"
7950
"with shared repositories is very similar to working with SVN or CVS, but\n"
7951
"doesn't have the same restrictions. And using checkouts still allows\n"
7952
"others working on the project to use whatever workflow they like."
7953
msgstr ""
7954
7955
#: dummy/help_topics/checkouts/detail.txt:11
7956
msgid ""
7957
"A checkout is created with the bzr checkout command (see \"help "
7958
"checkout\").\n"
7959
"You pass it a reference to another branch, and it will create a local copy\n"
7960
"for you that still contains a reference to the branch you created the\n"
7961
"checkout from (the master branch). Then if you make any commits they will "
7962
"be\n"
7963
"made on the other branch first. This creates an instant mirror of your work, "
7964
"or\n"
7965
"facilitates lockstep development, where each developer is working together,\n"
7966
"continuously integrating the changes of others."
7967
msgstr ""
7968
7969
#: dummy/help_topics/checkouts/detail.txt:19
7970
msgid ""
7971
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7972
"you have the full history locally. As you have a first class branch you "
7973
"can\n"
7974
"also commit locally if you want, for instance due to the temporary loss af "
7975
"a\n"
7976
"network connection. Use the --local option to commit to do this. All the "
7977
"local\n"
7978
"commits will then be made on the master branch the next time you do a non-"
7979
"local\n"
7980
"commit."
7981
msgstr ""
7982
7983
#: dummy/help_topics/checkouts/detail.txt:26
7984
msgid ""
7985
"If you are using a checkout from a shared branch you will periodically want "
7986
"to\n"
7987
"pull in all the changes made by others. This is done using the \"update\"\n"
7988
"command. The changes need to be applied before any non-local commit, but\n"
7989
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7990
"command when needed."
7991
msgstr ""
7992
7993
#: dummy/help_topics/checkouts/detail.txt:32
7994
msgid ""
7995
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7996
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7997
"SVN checkout in that it is not a first class branch, it mainly consists of "
7998
"the\n"
7999
"working tree. This means that any history operations must query the master\n"
8000
"branch, which could be slow if a network connection is involved. Also, as "
8001
"you\n"
8002
"don't have a local branch, then you cannot commit locally."
8003
msgstr ""
8004
8005
#: dummy/help_topics/checkouts/detail.txt:39
8006
msgid ""
8007
"Lightweight checkouts work best when you have fast reliable access to the\n"
8008
"master branch. This means that if the master branch is on the same disk or "
8009
"LAN\n"
8010
"a lightweight checkout will be faster than a heavyweight one for any "
8011
"commands\n"
8012
"that modify the revision history (as only one copy of the branch needs to\n"
8013
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8014
"that uses the history but does not change it, but if the master branch is "
8015
"on\n"
8016
"the same disk then there won't be a noticeable difference."
8017
msgstr ""
8018
8019
#: dummy/help_topics/checkouts/detail.txt:47
8020
msgid ""
8021
"Another possible use for a checkout is to use it with a treeless repository\n"
8022
"containing your branches, where you maintain only one working tree by\n"
8023
"switching the master branch that the checkout points to when you want to\n"
8024
"work on a different branch."
8025
msgstr ""
8026
8027
#: dummy/help_topics/checkouts/detail.txt:52
8028
msgid ""
8029
"Obviously to commit on a checkout you need to be able to write to the "
8030
"master\n"
8031
"branch. This means that the master branch must be accessible over a "
8032
"writeable\n"
8033
"protocol , such as sftp://, and that you have write permissions at the "
8034
"other\n"
8035
"end. Checkouts also work on the local file system, so that all that matters "
8036
"is\n"
8037
"file permissions."
8038
msgstr ""
8039
8040
#: dummy/help_topics/checkouts/detail.txt:58
8041
msgid ""
8042
"You can change the master of a checkout by using the \"switch\" command "
8043
"(see\n"
8044
"\"help switch\"). This will change the location that the commits are sent "
8045
"to.\n"
8046
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8047
"checkout. If you would like to convert your heavy checkout into a normal\n"
8048
"branch so that every commit is local, you can use the \"unbind\" command. To "
8049
"see\n"
8050
"whether or not a branch is bound or not you can use the \"info\" command. If "
8051
"the\n"
8052
"branch is bound it will tell you the location of the bound branch."
8053
msgstr ""
8054
8055
#: dummy/help_topics/checkouts/detail.txt:68
8056
msgid ""
8057
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8058
" checkout\n"
8059
" update Pull any changes in the master branch in to your checkout\n"
8060
" commit Make a commit that is sent to the master branch. If you have\n"
8061
" a heavy checkout then the --local option will commit to the\n"
8062
" checkout without sending the commit to the master\n"
8063
" switch Change the master branch that the commits in the checkout "
8064
"will\n"
8065
" be sent to\n"
8066
" bind Turn a standalone branch into a heavy checkout so that any\n"
8067
" commits will be sent to the master branch\n"
8068
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8069
" commits are only made locally\n"
8070
" info Displays whether a branch is bound or unbound. If the branch "
8071
"is\n"
8072
" bound, then it will also display the location of the bound "
8073
"branch\n"
8074
msgstr ""
8075
8076
#: dummy/help_topics/checkouts/summary.txt:1
8077
msgid "Information on what a checkout is"
8078
msgstr "información sobre lo que es una comprobación"
8079
8080
#: dummy/help_topics/commands/summary.txt:1
8081
msgid "Basic help for all commands"
8082
msgstr "Ayuda básica para todas las órdenes"
8083
8084
#: dummy/help_topics/configuration/summary.txt:1
8085
msgid "Details on the configuration settings available"
8086
msgstr "Detalles de las configuraciones disponibles"
8087
8088
#: dummy/help_topics/conflict-types/summary.txt:1
8089
msgid "Types of conflicts and what to do about them"
8090
msgstr "Tipos de conflicto y qué hacer con ellos"
8091
8092
#: dummy/help_topics/content-filters/summary.txt:1
8093
msgid "Conversion of content into/from working trees"
8094
msgstr ""
8095
8096
#: dummy/help_topics/criss-cross/detail.txt:1
8097
msgid "Criss-Cross"
8098
msgstr ""
8099
8100
#: dummy/help_topics/criss-cross/detail.txt:3
8101
msgid ""
8102
"A criss-cross in the branch history can cause the default merge technique\n"
8103
"to emit more conflicts than would normally be expected."
8104
msgstr ""
8105
8106
#: dummy/help_topics/criss-cross/detail.txt:6
8107
msgid ""
8108
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8109
"give\n"
8110
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8111
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8112
msgstr ""
8113
8114
#: dummy/help_topics/criss-cross/detail.txt:10
8115
msgid ""
8116
"Criss-crosses occur in a branch's history if two branches merge the same "
8117
"thing\n"
8118
"and then merge one another, or if two branches merge one another at the "
8119
"same\n"
8120
"time. They can be avoided by having each branch only merge from or into a\n"
8121
"designated central branch (a \"star topology\")."
8122
msgstr ""
8123
8124
#: dummy/help_topics/criss-cross/detail.txt:15
8125
msgid ""
8126
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8127
"default\n"
8128
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8129
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8130
"differences between THIS and OTHER are due to one side adding lines, or\n"
8131
"from another side removing lines."
8132
msgstr ""
8133
8134
#: dummy/help_topics/criss-cross/detail.txt:21
8135
msgid ""
8136
"Criss-crosses mean there is no good choice for a base. Selecting the "
8137
"recent\n"
8138
"merge points could cause one side's changes to be silently discarded.\n"
8139
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8140
"are emitted."
8141
msgstr ""
8142
8143
#: dummy/help_topics/criss-cross/detail.txt:26
8144
msgid ""
8145
"The ``weave`` merge type is not affected by this problem because it uses\n"
8146
"line-origin detection instead of a basis revision to determine the cause of\n"
8147
"differences.\n"
8148
msgstr ""
8149
8150
#: dummy/help_topics/criss-cross/summary.txt:1
8151
msgid "Information on criss-cross merging"
8152
msgstr ""
8153
8154
#: dummy/help_topics/current-formats/summary.txt:1
8155
msgid "Current storage formats"
8156
msgstr ""
8157
8158
#: dummy/help_topics/debug-flags/summary.txt:1
8159
msgid "Options to show or record debug information"
8160
msgstr "Opciones para mostrar o grabar información de depuración"
8161
8162
#: dummy/help_topics/diverged-branches/summary.txt:1
8163
msgid "How to fix diverged branches"
8164
msgstr ""
8165
8166
#: dummy/help_topics/env-variables/detail.txt:1
8167
msgid "Environment Variables"
8168
msgstr "Variables de entorno"
8169
8170
#: dummy/help_topics/env-variables/detail.txt:3
8171
msgid ""
8172
"=================== "
8173
"===========================================================\n"
8174
"BZRPATH Path where bzr is to look for shell plugin external\n"
8175
" commands.\n"
8176
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8177
"EMAIL E-Mail address of the user.\n"
8178
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8179
"EDITOR Editor for editing commit messages.\n"
8180
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8181
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8182
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8183
"BZR_PLUGIN_PATH.\n"
8184
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8185
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8186
"and\n"
8187
" HOME.\n"
8188
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8189
"URLs).\n"
8190
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8191
"sshcorp,\n"
8192
" plink or lsh.\n"
8193
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8194
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8195
"BZR_COLUMNS Override implicit terminal width.\n"
8196
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8197
"(selftest)\n"
8198
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8199
"'text'.\n"
8200
"BZR_PDB Control whether to launch a debugger on error.\n"
8201
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8202
" breakin debugger.\n"
8203
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8204
"(instead\n"
8205
" of char-based).\n"
8206
"=================== "
8207
"===========================================================\n"
8208
msgstr ""
8209
8210
#: dummy/help_topics/env-variables/summary.txt:1
8211
msgid "Environment variable names and values"
8212
msgstr "Nombres y valores de variables de entorno"
8213
8214
#: dummy/help_topics/eol/summary.txt:1
8215
msgid "Information on end-of-line handling"
8216
msgstr ""
8217
8218
#: dummy/help_topics/files/detail.txt:1
8219
msgid "Files"
8220
msgstr "Archivos"
8221
8222
#: dummy/help_topics/files/detail.txt:3
8223
msgid ""
8224
":On Unix: ~/.bazaar/bazaar.conf\n"
8225
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8226
"bazaar\\\\2.0\\\\bazaar.conf"
8227
msgstr ""
8228
8229
#: dummy/help_topics/files/detail.txt:6
8230
msgid ""
8231
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8232
"used to define general configuration that will be applied everywhere.\n"
8233
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8234
"commonly used options."
8235
msgstr ""
8236
8237
#: dummy/help_topics/files/detail.txt:11
8238
msgid "A typical config file might look something like::"
8239
msgstr ""
8240
8241
#: dummy/help_topics/files/detail.txt:13
8242
msgid ""
8243
" [DEFAULT]\n"
8244
" email=John Doe <jdoe@isp.com>"
8245
msgstr ""
8246
8247
#: dummy/help_topics/files/detail.txt:16
8248
msgid ""
8249
" [ALIASES]\n"
8250
" commit = commit --strict\n"
8251
" log10 = log --short -r -10..-1\n"
8252
msgstr ""
8253
" [ALIASES]\n"
8254
" commit = commit --strict\n"
8255
" log10 = log --short -r -10..-1\n"
8256
8257
#: dummy/help_topics/files/summary.txt:1
8258
msgid "Information on configuration and log files"
8259
msgstr "Información sobre configuración y archivos de registro"
8260
8261
#: dummy/help_topics/formats/detail.txt:1
8262
msgid "Storage Formats"
8263
msgstr "Formatos de almacenamiento"
8264
8265
#: dummy/help_topics/formats/detail.txt:3
8266
msgid ""
8267
"To ensure that older clients do not access data incorrectly,\n"
8268
"Bazaar's policy is to introduce a new storage format whenever\n"
8269
"new features requiring new metadata are added. New storage\n"
8270
"formats may also be introduced to improve performance and\n"
8271
"scalability."
8272
msgstr ""
8273
8274
#: dummy/help_topics/formats/detail.txt:9
8275
msgid ""
8276
"The newest format, 2a, is highly recommended. If your\n"
8277
"project is not using 2a, then you should suggest to the\n"
8278
"project owner to upgrade."
8279
msgstr ""
8280
8281
#: dummy/help_topics/formats/detail.txt:13
8282
msgid ""
8283
"\n"
8284
".. note::"
8285
msgstr ""
8286
"\n"
8287
".. nota::"
8288
8289
#: dummy/help_topics/formats/detail.txt:16
8290
msgid ""
8291
" Some of the older formats have two variants:\n"
8292
" a plain one and a rich-root one. The latter include an additional\n"
8293
" field about the root of the tree. There is no performance cost\n"
8294
" for using a rich-root format but you cannot easily merge changes\n"
8295
" from a rich-root format into a plain format. As a consequence,\n"
8296
" moving a project to a rich-root format takes some co-ordination\n"
8297
" in that all contributors need to upgrade their repositories\n"
8298
" around the same time. 2a and all future formats will be\n"
8299
" implicitly rich-root."
8300
msgstr ""
8301
8302
#: dummy/help_topics/formats/detail.txt:26
8303
msgid ""
8304
"See :doc:`current-formats-help` for the complete list of\n"
8305
"currently supported formats. See :doc:`other-formats-help` for\n"
8306
"descriptions of any available experimental and deprecated formats.\n"
8307
msgstr ""
8308
8309
#: dummy/help_topics/formats/summary.txt:1
8310
msgid "Information on choosing a storage format"
8311
msgstr "Información para escoger un formato de almacenamiento"
8312
8313
#: dummy/help_topics/global-options/detail.txt:1
8314
msgid "Global Options"
8315
msgstr "Opciones globales"
8316
8317
#: dummy/help_topics/global-options/detail.txt:3
8318
msgid ""
8319
"These options may be used with any command, and may appear in front of any\n"
8320
"command. (e.g. ``bzr --profile help``)."
8321
msgstr ""
8322
8323
#: dummy/help_topics/global-options/detail.txt:6
8324
msgid ""
8325
"--version Print the version number. Must be supplied before the "
8326
"command.\n"
8327
"--no-aliases Do not process command aliases when running this command.\n"
8328
"--builtin Use the built-in version of a command, not the plugin "
8329
"version.\n"
8330
" This does not suppress other plugin effects.\n"
8331
"--no-plugins Do not process any plugins.\n"
8332
"--no-l10n Do not translate messages.\n"
8333
"--concurrency Number of processes that can be run concurrently (selftest)."
8334
msgstr ""
8335
8336
#: dummy/help_topics/global-options/detail.txt:14
8337
msgid ""
8338
"--profile Profile execution using the hotshot profiler.\n"
8339
"--lsprof Profile execution using the lsprof profiler.\n"
8340
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8341
" results to a specified file. If the filename ends with "
8342
"\".txt\",\n"
8343
" text format will be used. If the filename either starts "
8344
"with\n"
8345
" \"callgrind.out\" or end with \".callgrind\", the output will "
8346
"be\n"
8347
" formatted for use with KCacheGrind. Otherwise, the output\n"
8348
" will be a pickle.\n"
8349
"--coverage Generate line coverage report in the specified directory."
8350
msgstr ""
8351
8352
#: dummy/help_topics/global-options/detail.txt:24
8353
msgid ""
8354
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8355
"for\n"
8356
" the duration of the command. This can be used multiple times "
8357
"if\n"
8358
" several options need to be overridden."
8359
msgstr ""
8360
8361
#: dummy/help_topics/global-options/detail.txt:28
8362
msgid ""
8363
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8364
"information on profiling."
8365
msgstr ""
8366
"Visite http://doc.bazaar.canonical.com/developers/profiling.html para tener\n"
8367
"más información del perfilado."
8368
8369
#: dummy/help_topics/global-options/detail.txt:31
8370
msgid ""
8371
"A number of debug flags are also available to assist troubleshooting and\n"
8372
"development. See :doc:`debug-flags-help`.\n"
8373
msgstr ""
8374
8375
#: dummy/help_topics/global-options/summary.txt:1
8376
msgid "Options that control how Bazaar runs"
8377
msgstr "Opciones que controlan como se ejecuta Bazaar"
8378
8379
#: dummy/help_topics/hidden-commands/summary.txt:1
8380
msgid "All hidden commands"
8381
msgstr "Todas las órdenes ocultas"
8382
8383
#: dummy/help_topics/hooks/summary.txt:1
8384
msgid "Points at which custom processing can be added"
8385
msgstr ""
8386
8387
#: dummy/help_topics/launchpad/detail.txt:1
8388
msgid "Integration with Launchpad.net"
8389
msgstr "Integración con Launchpad.net"
8390
8391
#: dummy/help_topics/launchpad/detail.txt:3
8392
msgid ""
8393
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8394
"specification tracking."
8395
msgstr ""
8396
8397
#: dummy/help_topics/launchpad/detail.txt:6
8398
msgid ""
8399
"The bzr client (through the plugin called 'launchpad') has special\n"
8400
"features to communicate with Launchpad:"
8401
msgstr ""
8402
8403
#: dummy/help_topics/launchpad/detail.txt:9
8404
msgid ""
8405
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8406
"This\n"
8407
" is then used by the 'lp:' transport to download your branches using\n"
8408
" bzr+ssh://."
8409
msgstr ""
8410
8411
#: dummy/help_topics/launchpad/detail.txt:13
8412
msgid ""
8413
" * The 'lp:' transport uses Launchpad as a directory service: for "
8414
"example\n"
8415
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8416
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8417
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8418
msgstr ""
8419
8420
#: dummy/help_topics/launchpad/detail.txt:18
8421
msgid ""
8422
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8423
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8424
"lp:12345'\n"
8425
" will record a revision property that marks that revision as fixing\n"
8426
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8427
" automatically be linked to the bug report."
8428
msgstr ""
8429
8430
#: dummy/help_topics/launchpad/detail.txt:24
8431
msgid ""
8432
" * The register-branch command tells Launchpad about the url of a\n"
8433
" public branch. Launchpad will then mirror the branch, display\n"
8434
" its contents and allow it to be attached to bugs and other\n"
8435
" objects."
8436
msgstr ""
8437
8438
#: dummy/help_topics/launchpad/detail.txt:29
8439
msgid "For more information see http://help.launchpad.net/\n"
8440
msgstr ""
8441
8442
#: dummy/help_topics/launchpad/summary.txt:1
8443
msgid "Using Bazaar with Launchpad.net"
8444
msgstr "Usar Bazaar con Launchpad.net"
8445
8446
#: dummy/help_topics/location-alias/summary.txt:1
8447
msgid "Aliases for remembered locations"
8448
msgstr "Alias para recordar ubicaciones"
8449
8450
#: dummy/help_topics/log-formats/summary.txt:1
8451
msgid "Details on the logging formats available"
8452
msgstr "Detalles sobre los formatos de acceso disponibles"
8453
8454
#: dummy/help_topics/other-formats/summary.txt:1
8455
msgid "Experimental and deprecated storage formats"
8456
msgstr "Formatos de almacenamiento experimentales y obsoletos"
8457
8458
#: dummy/help_topics/patterns/summary.txt:1
8459
msgid "Information on the pattern syntax"
8460
msgstr "Información de la sintaxis de patrones"
8461
8462
#: dummy/help_topics/repositories/detail.txt:1
8463
msgid "Repositories"
8464
msgstr "Repositorios"
8465
8466
#: dummy/help_topics/repositories/detail.txt:3
8467
msgid ""
8468
"Repositories in Bazaar are where committed information is stored. There is\n"
8469
"a repository associated with every branch."
8470
msgstr ""
8471
8472
#: dummy/help_topics/repositories/detail.txt:6
8473
msgid ""
8474
"Repositories are a form of database. Bzr will usually maintain this for\n"
8475
"good performance automatically, but in some situations (e.g. when doing\n"
8476
"very many commits in a short time period) you may want to ask bzr to\n"
8477
"optimise the database indices. This can be done by the 'bzr pack' command."
8478
msgstr ""
8479
8480
#: dummy/help_topics/repositories/detail.txt:11
8481
msgid ""
8482
"By default just running 'bzr init' will create a repository within the new\n"
8483
"branch but it is possible to create a shared repository which allows "
8484
"multiple\n"
8485
"branches to share their information in the same location. When a new branch "
8486
"is\n"
8487
"created it will first look to see if there is a containing shared repository "
8488
"it\n"
8489
"can use."
8490
msgstr ""
8491
8492
#: dummy/help_topics/repositories/detail.txt:17
8493
msgid ""
8494
"When two branches of the same project share a repository, there is\n"
8495
"generally a large space saving. For some operations (e.g. branching\n"
8496
"within the repository) this translates in to a large time saving."
8497
msgstr ""
8498
8499
#: dummy/help_topics/repositories/detail.txt:21
8500
msgid ""
8501
"To create a shared repository use the init-repository command (or the alias\n"
8502
"init-repo). This command takes the location of the repository to create. "
8503
"This\n"
8504
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8505
"which contains a shared repository. Any new branches that are created in "
8506
"this\n"
8507
"directory will then use it for storage."
8508
msgstr ""
8509
8510
#: dummy/help_topics/repositories/detail.txt:27
8511
msgid ""
8512
"It is a good idea to create a repository whenever you might create more\n"
8513
"than one branch of a project. This is true for both working areas where you\n"
8514
"are doing the development, and any server areas that you use for hosting\n"
8515
"projects. In the latter case, it is common to want branches without working\n"
8516
"trees. Since the files in the branch will not be edited directly there is "
8517
"no\n"
8518
"need to use up disk space for a working tree. To create a repository in "
8519
"which\n"
8520
"the branches will not have working trees pass the '--no-trees' option to\n"
8521
"'init-repository'."
8522
msgstr ""
8523
8524
#: dummy/help_topics/repositories/detail.txt:38
8525
msgid ""
8526
" init-repository Create a shared repository. Use --no-trees to create "
8527
"one\n"
8528
" in which new branches won't get a working tree.\n"
8529
msgstr ""
8530
8531
#: dummy/help_topics/repositories/summary.txt:1
8532
msgid "Basic information on shared repositories."
8533
msgstr "Información básica de los repositorios compartidos."
8534
8535
#: dummy/help_topics/revisionspec/summary.txt:1
8536
msgid "Explain how to use --revision"
8537
msgstr "Explicar cómo se usa --revision"
8538
8539
#: dummy/help_topics/rules/summary.txt:1
8540
msgid "Information on defining rule-based preferences"
8541
msgstr ""
8542
8543
#: dummy/help_topics/standalone-trees/detail.txt:1
8544
msgid "Standalone Trees"
8545
msgstr "Áboles autónomos"
8546
8547
#: dummy/help_topics/standalone-trees/detail.txt:3
8548
msgid ""
8549
"A standalone tree is a working tree with an associated repository. It\n"
8550
"is an independently usable branch, with no dependencies on any other.\n"
8551
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8552
"an existing project under version control."
8553
msgstr ""
8554
8555
#: dummy/help_topics/standalone-trees/detail.txt:8
8556
msgid "Related Commands::"
8557
msgstr "Órdenes relacionadas::"
8558
8559
#: dummy/help_topics/standalone-trees/detail.txt:10
8560
msgid " init Make a directory into a versioned branch.\n"
8561
msgstr ""
8562
8563
#: dummy/help_topics/standalone-trees/summary.txt:1
8564
msgid "Information on what a standalone tree is"
8565
msgstr "Información sobre lo que es un árbol autónomo"
8566
8567
#: dummy/help_topics/standard-options/detail.txt:1
8568
msgid "Standard Options"
8569
msgstr "Opciones estándar"
8570
8571
#: dummy/help_topics/standard-options/detail.txt:3
8572
msgid "Standard options are legal for all commands."
8573
msgstr "Las opciones estándar son legales para todas las órdenes."
8574
8575
#: dummy/help_topics/standard-options/detail.txt:5
8576
msgid ""
8577
"--help, -h Show help message.\n"
8578
"--verbose, -v Display more information.\n"
8579
"--quiet, -q Only display errors and warnings."
8580
msgstr ""
8581
8582
#: dummy/help_topics/standard-options/detail.txt:9
8583
msgid "Unlike global options, standard options can be used in aliases.\n"
8584
msgstr ""
8585
8586
#: dummy/help_topics/standard-options/summary.txt:1
8587
msgid "Options that can be used with any command"
8588
msgstr "Opciones que se pueden usar con cualquier orden"
8589
8590
#: dummy/help_topics/status-flags/detail.txt:1
8591
msgid "Status Flags"
8592
msgstr "Marcas de estado"
8593
8594
#: dummy/help_topics/status-flags/detail.txt:3
8595
msgid ""
8596
"Status flags are used to summarise changes to the working tree in a concise\n"
8597
"manner. They are in the form::"
8598
msgstr ""
8599
8600
#: dummy/help_topics/status-flags/detail.txt:6
8601
msgid " xxx <filename>"
8602
msgstr " xxx <nombre de archivo>"
8603
8604
#: dummy/help_topics/status-flags/detail.txt:8
8605
msgid "where the columns' meanings are as follows."
8606
msgstr "donde los significados de las columnas son los siguientes"
8607
8608
#: dummy/help_topics/status-flags/detail.txt:10
8609
msgid "Column 1 - versioning/renames::"
8610
msgstr ""
8611
8612
#: dummy/help_topics/status-flags/detail.txt:12
8613
msgid ""
8614
" + File versioned\n"
8615
" - File unversioned\n"
8616
" R File renamed\n"
8617
" ? File unknown\n"
8618
" X File nonexistent (and unknown to bzr)\n"
8619
" C File has conflicts\n"
8620
" P Entry for a pending merge (not a file)"
8621
msgstr ""
8622
8623
#: dummy/help_topics/status-flags/detail.txt:20
8624
msgid "Column 2 - contents::"
8625
msgstr "Columna 2 - contenidos::"
8626
8627
#: dummy/help_topics/status-flags/detail.txt:22
8628
msgid ""
8629
" N File created\n"
8630
" D File deleted\n"
8631
" K File kind changed\n"
8632
" M File modified"
8633
msgstr ""
8634
8635
#: dummy/help_topics/status-flags/detail.txt:27
8636
msgid "Column 3 - execute::"
8637
msgstr ""
8638
8639
#: dummy/help_topics/status-flags/detail.txt:29
8640
msgid " * The execute bit was changed\n"
8641
msgstr ""
8642
8643
#: dummy/help_topics/status-flags/summary.txt:1
8644
msgid "Help on status flags"
8645
msgstr "Ayuda sobre marcas de estado"
8646
8647
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8648
msgid "Branches Out of Sync"
8649
msgstr "Ramas sin sincronización"
8650
8651
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8652
msgid ""
8653
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8654
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8655
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8656
"have the same last revision as the new reference branch for the lightweight\n"
8657
"checkout, data could be lost, so Bazaar refuses."
8658
msgstr ""
8659
8660
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8661
msgid "How you deal with this depends on *why* the branches are out of sync."
8662
msgstr ""
8663
8664
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8665
msgid ""
8666
"If you have a checkout and have done local commits, you can get back in "
8667
"sync\n"
8668
"by running \"bzr update\" (and possibly \"bzr commit\")."
8669
msgstr ""
8670
8671
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8672
msgid ""
8673
"If you have a branch and the remote branch is out-of-date, you can push\n"
8674
"the local changes using \"bzr push\". If the local branch is out of date, "
8675
"you\n"
8676
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8677
"commit\n"
8678
"and then push your changes. If you decide that some of the changes aren't\n"
8679
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8680
msgstr ""
8681
8682
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8683
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8684
msgstr ""
8685
8686
#: dummy/help_topics/topics/summary.txt:1
8687
msgid "Topics list"
8688
msgstr "Lista de temas"
8689
8690
#: dummy/help_topics/url-special-chars/summary.txt:1
8691
msgid "Special character handling in URLs"
8692
msgstr ""
8693
8694
#: dummy/help_topics/urlspec/summary.txt:1
8695
msgid "Supported transport protocols"
8696
msgstr "Protocolos de transporte permitidos"
8697
8698
#: dummy/help_topics/working-trees/detail.txt:1
8699
msgid "Working Trees"
8700
msgstr "Árboles de trabajo"
8701
8702
#: dummy/help_topics/working-trees/detail.txt:3
8703
msgid ""
8704
"A working tree is the contents of a branch placed on disk so that you can\n"
8705
"see the files and edit them. The working tree is where you make changes to "
8706
"a\n"
8707
"branch, and when you commit the current state of the working tree is the\n"
8708
"snapshot that is recorded in the commit."
8709
msgstr ""
8710
8711
#: dummy/help_topics/working-trees/detail.txt:8
8712
msgid ""
8713
"When you push a branch to a remote system, a working tree will not be\n"
8714
"created. If one is already present the files will not be updated. The\n"
8715
"branch information will be updated and the working tree will be marked\n"
8716
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8717
"may be uncommitted changes or the update may cause content conflicts that "
8718
"are\n"
8719
"difficult to deal with remotely."
8720
msgstr ""
8721
8722
#: dummy/help_topics/working-trees/detail.txt:15
8723
msgid ""
8724
"If you have a branch with no working tree you can use the 'checkout' "
8725
"command\n"
8726
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8727
"will\n"
8728
"create the working tree. If the branch is updated remotely, you can update "
8729
"the\n"
8730
"working tree by running 'bzr update' in that directory."
8731
msgstr ""
8732
8733
#: dummy/help_topics/working-trees/detail.txt:20
8734
msgid ""
8735
"If you have a branch with a working tree that you do not want the 'remove-"
8736
"tree'\n"
8737
"command will remove the tree if it is safe. This can be done to avoid the\n"
8738
"warning about the remote working tree not being updated when pushing to the\n"
8739
"branch. It can also be useful when working with a '--no-trees' repository\n"
8740
"(see 'bzr help repositories')."
8741
msgstr ""
8742
8743
#: dummy/help_topics/working-trees/detail.txt:26
8744
msgid ""
8745
"If you want to have a working tree on a remote machine that you push to you\n"
8746
"can either run 'bzr update' in the remote branch after each push, or use "
8747
"some\n"
8748
"other method to update the tree during the push. There is an 'rspush' "
8749
"plugin\n"
8750
"that will update the working tree using rsync as well as doing a push. "
8751
"There\n"
8752
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8753
"SSH\n"
8754
"after each push."
8755
msgstr ""
8756
8757
#: dummy/help_topics/working-trees/detail.txt:33
8758
msgid "Useful commands::"
8759
msgstr "Órdenes útiles::"
8760
8761
#: dummy/help_topics/working-trees/detail.txt:35
8762
msgid ""
8763
" checkout Create a working tree when a branch does not have one.\n"
8764
" remove-tree Removes the working tree from a branch when it is safe to do "
8765
"so.\n"
8766
" update When a working tree is out of sync with its associated "
8767
"branch\n"
8768
" this will update the tree to match the branch.\n"
8769
msgstr ""
8770
8771
#: dummy/help_topics/working-trees/summary.txt:1
8772
msgid "Information on working trees"
8773
msgstr "Información en árboles de trabajo"
8774
8775
#: en/help_topics/authentication.txt:1
8776
msgid ""
8777
"Authentication Settings\n"
8778
"======================="
8779
msgstr ""
8780
"Configuración de la autenticación\n"
8781
"==========================="
8782
8783
#: en/help_topics/authentication.txt:4
8784
msgid ""
8785
"\n"
8786
"Intent\n"
8787
"------"
8788
msgstr ""
8789
"\n"
8790
"Intento\n"
8791
"-----------"
8792
8793
#: en/help_topics/authentication.txt:8
8794
msgid ""
8795
"Many different authentication policies can be described in the\n"
8796
"``authentication.conf`` file but a particular user should need only a few\n"
8797
"definitions to cover his needs without having to specify a user and a "
8798
"password\n"
8799
"for every branch he uses."
8800
msgstr ""
8801
8802
#: en/help_topics/authentication.txt:13
8803
msgid ""
8804
"The definitions found in this file are used to find the credentials to use "
8805
"for\n"
8806
"a given url. The same credentials can generally be used for as many branches "
8807
"as\n"
8808
"possible by grouping their declaration around the remote servers that need\n"
8809
"them. It's even possible to declare credentials that will be used by "
8810
"different\n"
8811
"servers."
8812
msgstr ""
8813
8814
#: en/help_topics/authentication.txt:19
8815
msgid ""
8816
"The intent is to make this file as small as possible to minimize maintenance."
8817
msgstr ""
8818
"El intento es hacer este archivo tan pequeño como sea posible para minimizar "
8819
"el mantenimiento."
8820
8821
#: en/help_topics/authentication.txt:21
8822
msgid ""
8823
"Once the relevant credentials are declared in this file you may use branch "
8824
"urls\n"
8825
"without embedding passwords (security hazard) or even users (enabling "
8826
"sharing\n"
8827
"of your urls with others)."
8828
msgstr ""
8829
8830
#: en/help_topics/authentication.txt:25
8831
msgid "Instead of using::"
8832
msgstr "en vez de usar::"
8833
8834
#: en/help_topics/authentication.txt:27
8835
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8836
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8837
8838
#: en/help_topics/authentication.txt:29
8839
msgid "you simply use::"
8840
msgstr "simplemente use::"
8841
8842
#: en/help_topics/authentication.txt:31
8843
msgid " bzr branch ftp://host.com/path/to/my/branch"
8844
msgstr " bzr branch ftp://host.com/path/to/my/branch"
8845
8846
#: en/help_topics/authentication.txt:33
8847
msgid ""
8848
"provided you have created the following ``authentication.conf`` file::"
8849
msgstr ""
8850
8851
#: en/help_topics/authentication.txt:35
8852
msgid ""
8853
" [myprojects]\n"
8854
" scheme=ftp\n"
8855
" host=host.com\n"
8856
" user=joe\n"
8857
" password=secret\n"
8858
" "
8859
msgstr ""
8860
" [misproyectos]\n"
8861
" scheme=ftp\n"
8862
" host=host.com\n"
8863
" user=juan\n"
8864
" password=secreta\n"
8865
" "
8866
8867
#: en/help_topics/authentication.txt:42
8868
msgid ""
8869
"Authentication definitions\n"
8870
"--------------------------"
8871
msgstr ""
8872
"Definiciones de autenticación\n"
8873
"--------------------------"
8874
8875
#: en/help_topics/authentication.txt:45
8876
msgid ""
8877
"There are two kinds of authentication used by the various schemes supported "
8878
"by\n"
8879
"bzr:"
8880
msgstr ""
8881
8882
#: en/help_topics/authentication.txt:48
8883
msgid "1. user and password"
8884
msgstr "1. usuario y contraseña"
8885
8886
#: en/help_topics/authentication.txt:50
8887
msgid ""
8888
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8889
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8890
"ssh agents are a better, more secure solution. So we have chosen to not "
8891
"provide\n"
8892
"our own less secure method."
8893
msgstr ""
8894
8895
#: en/help_topics/authentication.txt:55
8896
msgid "2. user, realm and password"
8897
msgstr "2. usuario, reino y contraseña"
8898
8899
#: en/help_topics/authentication.txt:57
8900
msgid ""
8901
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8902
"against a host. But, by using ``.htaccess`` files, for example, it is "
8903
"possible\n"
8904
"to define several (``user, realm, password``) for a given ``host``. So what "
8905
"is\n"
8906
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8907
"is\n"
8908
"not taken into account in the definitions, but will displayed if bzr "
8909
"prompts\n"
8910
"you for a password."
8911
msgstr ""
8912
8913
#: en/help_topics/authentication.txt:64
8914
msgid ""
8915
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8916
"specifying the appropriate port."
8917
msgstr ""
8918
8919
#: en/help_topics/authentication.txt:67
8920
msgid ""
8921
"To take all schemes into account, the password will be deduced from a set "
8922
"of\n"
8923
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8924
"``user``,\n"
8925
"``password``)."
8926
msgstr ""
8927
8928
#: en/help_topics/authentication.txt:71
8929
msgid ""
8930
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8931
"used\n"
8932
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8933
"``ssh``\n"
8934
" should be used instead since this is the real scheme regarding\n"
8935
" authentication,"
8936
msgstr ""
8937
8938
#: en/help_topics/authentication.txt:76
8939
msgid " * ``host``: can be empty (to act as a default for any host),"
8940
msgstr ""
8941
8942
#: en/help_topics/authentication.txt:78
8943
msgid ""
8944
" * ``port`` can be empty (useful when an host provides several servers for "
8945
"the\n"
8946
" same scheme), only numerical values are allowed, this should be used "
8947
"only\n"
8948
" when the server uses a port different than the scheme standard port,"
8949
msgstr ""
8950
8951
#: en/help_topics/authentication.txt:82
8952
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8953
msgstr ""
8954
8955
#: en/help_topics/authentication.txt:84
8956
msgid ""
8957
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8958
" ``getpass.get_user()``),"
8959
msgstr ""
8960
8961
#: en/help_topics/authentication.txt:87
8962
msgid ""
8963
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8964
" password."
8965
msgstr ""
8966
8967
#: en/help_topics/authentication.txt:90
8968
msgid ""
8969
"Multiple definitions can be provided and, for a given URL, bzr will select "
8970
"a\n"
8971
"(``user`` [, ``password``]) based on the following rules :"
8972
msgstr ""
8973
8974
#: en/help_topics/authentication.txt:93
8975
msgid " 1. the first match wins,"
8976
msgstr " 1. la primera coincidencia gana,"
8977
8978
#: en/help_topics/authentication.txt:95
8979
msgid " 2. empty fields match everything,"
8980
msgstr " 2. los campos vacíos coinciden siempre,"
8981
8982
#: en/help_topics/authentication.txt:97
8983
msgid ""
8984
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8985
msgstr ""
8986
" 3. «scheme» coincide incluso si los decoradores se han usado en el URL "
8987
"solicitado,"
8988
8989
#: en/help_topics/authentication.txt:99
8990
msgid ""
8991
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8992
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8993
"``projectbzr.sf.net``\n"
8994
" will not match ``bzr.sf.net``)."
8995
msgstr ""
8996
8997
#: en/help_topics/authentication.txt:103
8998
msgid ""
8999
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9000
msgstr ""
9001
9002
#: en/help_topics/authentication.txt:105
9003
msgid ""
9004
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9005
"above,\n"
9006
" empty paths will match any provided path)."
9007
msgstr ""
9008
9009
#: en/help_topics/authentication.txt:110
9010
msgid ""
9011
"File format\n"
9012
"-----------"
9013
msgstr ""
9014
"Formato de archivo\n"
9015
"------------------"
9016
9017
#: en/help_topics/authentication.txt:113
9018
msgid ""
9019
"The general rules for :doc:`configuration files <configuration-help>`\n"
9020
"apply except for the variable policies."
9021
msgstr ""
9022
9023
#: en/help_topics/authentication.txt:116
9024
msgid "Each section describes an authentication definition."
9025
msgstr "Cada sección describe una definición de autenticación."
9026
9027
#: en/help_topics/authentication.txt:118
9028
msgid ""
9029
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9030
"reserved\n"
9031
"and should appear as the *last* section."
9032
msgstr ""
9033
9034
#: en/help_topics/authentication.txt:121
9035
msgid "Each section should define:"
9036
msgstr "Cada sección debe definir:"
9037
9038
#: en/help_topics/authentication.txt:123
9039
msgid "* ``user``: the login to be used,"
9040
msgstr "* «user»: el acceso a usar,"
9041
9042
#: en/help_topics/authentication.txt:125
9043
msgid "Each section could define:"
9044
msgstr "Cada sección puede definir:"
9045
9046
#: en/help_topics/authentication.txt:127
9047
msgid "* ``host``: the remote server,"
9048
msgstr "* «host»: el servidor remoto,"
9049
9050
#: en/help_topics/authentication.txt:129
9051
msgid "* ``port``: the port the server is listening,"
9052
msgstr "* «port»: el puerto en el que escucha el servidor,"
9053
9054
#: en/help_topics/authentication.txt:131
9055
msgid "* ``path``: the branch location,"
9056
msgstr "* «path»: la ubicación de la rama,"
9057
9058
#: en/help_topics/authentication.txt:133
9059
msgid "* ``password``: the password."
9060
msgstr "* «password»: la contraseña."
9061
9062
#: en/help_topics/authentication.txt:135
9063
msgid ""
9064
"\n"
9065
"Examples\n"
9066
"--------"
9067
msgstr ""
9068
"\n"
9069
"Ejemplos\n"
9070
"--------"
9071
9072
#: en/help_topics/authentication.txt:139
9073
msgid ""
9074
"\n"
9075
"Personal projects hosted outside\n"
9076
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9077
msgstr ""
9078
9079
#: en/help_topics/authentication.txt:143
9080
msgid ""
9081
"All connections are done with the same ``user`` (the remote one for which "
9082
"the\n"
9083
"default bzr one is not appropriate) and the password is always prompted "
9084
"with\n"
9085
"some exceptions::"
9086
msgstr ""
9087
9088
#: en/help_topics/authentication.txt:147
9089
msgid ""
9090
" # Pet projects on hobby.net\n"
9091
" [hobby]\n"
9092
" host=r.hobby.net\n"
9093
" user=jim\n"
9094
" password=obvious1234\n"
9095
" \n"
9096
" # Home server\n"
9097
" [home]\n"
9098
" scheme=https\n"
9099
" host=home.net\n"
9100
" user=joe\n"
9101
" password=1essobV10us\n"
9102
" \n"
9103
" [DEFAULT]\n"
9104
" # Our local user is barbaz, on all remote sites we're known as "
9105
"foobar\n"
9106
" user=foobar"
9107
msgstr ""
9108
" # Proyecto de mascotas para hobby.net\n"
9109
" [hobby]\n"
9110
" host=r.hobby.net\n"
9111
" user=jaime\n"
9112
" password=obvia1234\n"
9113
" \n"
9114
" # Home server\n"
9115
" [home]\n"
9116
" scheme=https\n"
9117
" host=home.net\n"
9118
" user=juan\n"
9119
" password=1essobV10us\n"
9120
" \n"
9121
" [DEFAULT]\n"
9122
" # Nuestro usuario local es barbaz, en todos los sitios remotos se "
9123
"conoce como foobar\n"
9124
" user=foobar"
9125
9126
#: en/help_topics/authentication.txt:164
9127
msgid ""
9128
"\n"
9129
"Source hosting provider\n"
9130
"~~~~~~~~~~~~~~~~~~~~~~~"
9131
msgstr ""
9132
"\n"
9133
"Proveedor del albergue de origen\n"
9134
"~~~~~~~~~~~~~~~~~~~~~~~~~~"
9135
9136
#: en/help_topics/authentication.txt:168
9137
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9138
msgstr ""
9139
"En el dominio shp.net (ficticio) cada proyecto tiene su propio sitio::"
9140
9141
#: en/help_topics/authentication.txt:170
9142
msgid ""
9143
" [shpnet domain]\n"
9144
" # we use sftp, but ssh is the scheme used for authentication\n"
9145
" scheme=ssh\n"
9146
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9147
" host=.shp.net\n"
9148
" user=joe\n"
9149
" # bzr don't support supplying a password for sftp,\n"
9150
" # consider using an ssh agent if you don't want to supply\n"
9151
" # a password interactively. (pageant, ssh-agent, etc)"
9152
msgstr ""
9153
9154
#: en/help_topics/authentication.txt:180
9155
msgid ""
9156
"HTTPS, SFTP servers and their proxy\n"
9157
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9158
msgstr ""
9159
"HTTPS, servidores SFTP y su proxy\n"
9160
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9161
9162
#: en/help_topics/authentication.txt:183
9163
msgid ""
9164
"At company.com, the server hosting release and integration branches is "
9165
"behind a\n"
9166
"proxy, and the two branches use different authentication policies::"
9167
msgstr ""
9168
9169
#: en/help_topics/authentication.txt:186
9170
msgid ""
9171
" [reference code]\n"
9172
" scheme=https\n"
9173
" host=dev.company.com\n"
9174
" path=/dev\n"
9175
" user=user1\n"
9176
" password=pass1"
9177
msgstr ""
9178
" [reference code]\n"
9179
" scheme=https\n"
9180
" host=dev.company.com\n"
9181
" path=/dev\n"
9182
" user=user1\n"
9183
" password=pass1"
9184
9185
#: en/help_topics/authentication.txt:193
9186
msgid ""
9187
" # development branches on dev server\n"
9188
" [dev]\n"
9189
" scheme=ssh # bzr+ssh and sftp are available here\n"
9190
" host=dev.company.com\n"
9191
" path=/dev/integration\n"
9192
" user=user2\n"
9193
" \n"
9194
" # proxy\n"
9195
" [proxy]\n"
9196
" scheme=http\n"
9197
" host=proxy.company.com\n"
9198
" port=3128\n"
9199
" user=proxyuser1\n"
9200
" password=proxypass1"
9201
msgstr ""
9202
9203
#: en/help_topics/authentication.txt:208
9204
msgid ""
9205
"\n"
9206
"Planned enhancements\n"
9207
"--------------------"
9208
msgstr ""
9209
"\n"
9210
"Mejoras planificadas\n"
9211
"--------------------"
9212
9213
#: en/help_topics/authentication.txt:212
9214
msgid ""
9215
"The following are not yet implemented but planned as parts of a work in\n"
9216
"progress:"
9217
msgstr ""
9218
9219
#: en/help_topics/authentication.txt:215
9220
msgid "* add a ``password_encoding`` field allowing:"
9221
msgstr ""
9222
9223
#: en/help_topics/authentication.txt:217
9224
msgid ""
9225
" - storing the passwords in various obfuscating encodings (base64 for one),"
9226
msgstr ""
9227
9228
#: en/help_topics/authentication.txt:219
9229
msgid " - delegate password storage to plugins (.netrc for example)."
9230
msgstr ""
9231
9232
#: en/help_topics/authentication.txt:221
9233
msgid ""
9234
"* update the credentials when the user is prompted for user or password,"
9235
msgstr ""
9236
9237
#: en/help_topics/authentication.txt:223
9238
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9239
msgstr "* añadri un campo «verify_certificates» para «HTTPS»."
9240
9241
#: en/help_topics/authentication.txt:225
9242
msgid ""
9243
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9244
"but\n"
9245
"ignored in the actual implementation.\n"
9246
msgstr ""
9247
9248
#: en/help_topics/bugs.txt:1
9249
msgid "Bug Tracker Settings"
9250
msgstr "Configuración del seguimiento de errores"
9251
9252
#: en/help_topics/bugs.txt:3
9253
msgid ""
9254
"When making a commit, metadata about bugs fixed by that change can be\n"
9255
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9256
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9257
"(The only ``status`` value currently supported is ``fixed.``)"
9258
msgstr ""
9259
9260
#: en/help_topics/bugs.txt:8
9261
msgid ""
9262
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9263
"identifier\n"
9264
"rather than a full URL. This looks like::"
9265
msgstr ""
9266
9267
#: en/help_topics/bugs.txt:11
9268
msgid " bzr commit --fixes <tracker>:<id>"
9269
msgstr " bzr commit --fixes <tracker>:<id>"
9270
9271
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9272
msgid "or::"
9273
msgstr "o::"
9274
9275
#: en/help_topics/bugs.txt:15
9276
msgid " bzr commit --fixes <id>"
9277
msgstr " bzr commit --fixes <id>"
9278
9279
#: en/help_topics/bugs.txt:17
9280
msgid ""
9281
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9282
"the\n"
9283
"identifier for that bug within the bugtracker, usually the bug number.\n"
9284
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9285
"or global configuration is used."
9286
msgstr ""
9287
9288
#: en/help_topics/bugs.txt:22
9289
msgid ""
9290
"Bazaar knows about a few bug trackers that have many users. If\n"
9291
"you use one of these bug trackers then there is no setup required to\n"
9292
"use this feature, you just need to know the tracker identifier to use.\n"
9293
"These are the bugtrackers that are built in:"
9294
msgstr ""
9295
9296
#: en/help_topics/bugs.txt:27
9297
msgid ""
9298
" ============================ ============ ============\n"
9299
" URL Abbreviation Example\n"
9300
" ============================ ============ ============\n"
9301
" https://bugs.launchpad.net/ lp lp:12345\n"
9302
" http://bugs.debian.org/ deb deb:12345\n"
9303
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9304
" ============================ ============ ============"
9305
msgstr ""
9306
" ============================ ============ ============\n"
9307
" URL Ejemplo de abreviatura\n"
9308
" ============================ ============ ============\n"
9309
" https://bugs.launchpad.net/ lp lp:12345\n"
9310
" http://bugs.debian.org/ deb deb:12345\n"
9311
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9312
" ============================ ============ ============"
9313
9314
#: en/help_topics/bugs.txt:35
9315
msgid ""
9316
"For the bug trackers not listed above configuration is required.\n"
9317
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9318
"is built in, along with a template mechanism for other bugtrackers with\n"
9319
"simple URL schemes. If your bug tracker can't be described by one\n"
9320
"of the schemes described below then you can write a plugin to support\n"
9321
"it."
9322
msgstr ""
9323
9324
#: en/help_topics/bugs.txt:42
9325
msgid ""
9326
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9327
"variable which contains the base URL of the bug tracker. These options\n"
9328
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9329
"configuration section in ``locations.conf``. You can set up these values\n"
9330
"for each of the projects you work on."
9331
msgstr ""
9332
9333
#: en/help_topics/bugs.txt:48
9334
msgid ""
9335
"Note: As you provide a short name for each tracker, you can specify one or\n"
9336
"more bugs in one or more trackers at commit time if you wish."
9337
msgstr ""
9338
9339
#: en/help_topics/bugs.txt:51
9340
msgid ""
9341
"Launchpad\n"
9342
"---------"
9343
msgstr ""
9344
"Launchpad\n"
9345
"---------"
9346
9347
#: en/help_topics/bugs.txt:54
9348
msgid ""
9349
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9350
msgstr ""
9351
"Use «bzr commit --fixes lp:2»» para grabar que esta ejecución arregla el "
9352
"error 2."
9353
9354
#: en/help_topics/bugs.txt:56
9355
msgid ""
9356
"bugzilla_<tracker>_url\n"
9357
"----------------------"
9358
msgstr ""
9359
"bugzilla_<tracker>_url\n"
9360
"----------------------"
9361
9362
#: en/help_topics/bugs.txt:59
9363
msgid ""
9364
"If present, the location of the Bugzilla bug tracker referred to by\n"
9365
"<tracker>. This option can then be used together with ``bzr commit\n"
9366
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9367
"example::"
9368
msgstr ""
9369
9370
#: en/help_topics/bugs.txt:64
9371
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9372
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9373
9374
#: en/help_topics/bugs.txt:66
9375
msgid ""
9376
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9377
"fixed."
9378
msgstr ""
9379
9380
#: en/help_topics/bugs.txt:69
9381
msgid ""
9382
"trac_<tracker>_url\n"
9383
"------------------"
9384
msgstr ""
9385
"trac_<tracker>_url\n"
9386
"------------------"
9387
9388
#: en/help_topics/bugs.txt:72
9389
msgid ""
9390
"If present, the location of the Trac instance referred to by\n"
9391
"<tracker>. This option can then be used together with ``bzr commit\n"
9392
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9393
"example::"
9394
msgstr ""
9395
9396
#: en/help_topics/bugs.txt:77
9397
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9398
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9399
9400
#: en/help_topics/bugs.txt:79
9401
msgid ""
9402
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9403
"as\n"
9404
"fixed."
9405
msgstr ""
9406
9407
#: en/help_topics/bugs.txt:82
9408
msgid ""
9409
"bugtracker_<tracker>_url\n"
9410
"------------------------"
9411
msgstr ""
9412
"bugtracker_<tracker>_url\n"
9413
"------------------------"
9414
9415
#: en/help_topics/bugs.txt:85
9416
msgid ""
9417
"If present, the location of a generic bug tracker instance referred to by\n"
9418
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9419
"which will be replaced by a specific bug ID. This option can then be used\n"
9420
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9421
"fixed by that commit. For example::"
9422
msgstr ""
9423
9424
#: en/help_topics/bugs.txt:91
9425
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9426
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
9427
9428
#: en/help_topics/bugs.txt:93
9429
msgid ""
9430
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9431
"Roundup bug tracker as fixed, or::"
9432
msgstr ""
9433
9434
#: en/help_topics/bugs.txt:96
9435
msgid ""
9436
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9437
msgstr ""
9438
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9439
9440
#: en/help_topics/bugs.txt:98
9441
msgid ""
9442
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9443
"RT bug tracker as fixed, or::"
9444
msgstr ""
9445
9446
#: en/help_topics/bugs.txt:101
9447
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9448
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9449
9450
#: en/help_topics/bugs.txt:103
9451
msgid ""
9452
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9453
"1234\n"
9454
"in Hudson's JIRA bug tracker as fixed.\n"
9455
msgstr ""
9456
9457
#: en/help_topics/commands.txt:1
9458
msgid ""
9459
"add Add specified files or directories.\n"
9460
"alias Set/unset and display aliases.\n"
9461
"annotate Show the origin of each line in a file.\n"
9462
"bash-completion Generate a shell function for bash command line "
9463
"completion.\n"
9464
" [bash_completion]\n"
9465
"bind Convert the current branch into a checkout of the "
9466
"supplied\n"
9467
" branch.\n"
9468
"branch Create a new branch that is a copy of an existing branch.\n"
9469
"branches List the branches available at the current location.\n"
9470
"break-lock Break a dead lock.\n"
9471
"cat Write the contents of a file as of a given revision to\n"
9472
" standard output.\n"
9473
"check Validate working tree structure, branch consistency and\n"
9474
" repository history.\n"
9475
"checkout Create a new checkout of an existing branch.\n"
9476
"clean-tree Remove unwanted files from working tree.\n"
9477
"commit Commit changes into a new revision.\n"
9478
"config Display, set or remove a configuration option.\n"
9479
"conflicts List files with conflicts.\n"
9480
"deleted List files deleted in the working tree.\n"
9481
"diff Show differences in the working tree, between revisions "
9482
"or\n"
9483
" branches.\n"
9484
"dpush Push into a different VCS without any custom bzr "
9485
"metadata.\n"
9486
"export Export current or past revision to a destination directory "
9487
"or\n"
9488
" archive.\n"
9489
"help Show help on a command or other topic.\n"
9490
"ignore Ignore specified files or patterns.\n"
9491
"ignored List ignored files and the patterns that matched them.\n"
9492
"info Show information about a working tree, branch or "
9493
"repository.\n"
9494
"init Make a directory into a versioned branch.\n"
9495
"init-repository Create a shared repository for branches to share storage\n"
9496
" space.\n"
9497
"join Combine a tree into its containing tree.\n"
9498
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9499
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9500
"launchpad-open Open a Launchpad branch page in your web browser. "
9501
"[launchpad]\n"
9502
"log Show historical log for a branch or subset of a branch.\n"
9503
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9504
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9505
"ls List files in a tree.\n"
9506
"merge Perform a three-way merge.\n"
9507
"missing Show unmerged/unpulled revisions between two branches.\n"
9508
"mkdir Create a new versioned directory.\n"
9509
"mv Move or rename a file.\n"
9510
"nick Print or set the branch nickname.\n"
9511
"pack Compress the data within a repository.\n"
9512
"plugins List the installed plugins.\n"
9513
"pull Turn this branch into a mirror of another branch.\n"
9514
"push Update a mirror of this branch.\n"
9515
"reconcile Reconcile bzr metadata in a branch.\n"
9516
"reconfigure Reconfigure the type of a bzr directory.\n"
9517
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9518
"remerge Redo a merge.\n"
9519
"remove Remove files or directories.\n"
9520
"remove-branch Remove a branch.\n"
9521
"remove-tree Remove the working tree from a given branch/checkout.\n"
9522
"renames Show list of renamed files.\n"
9523
"resolve Mark a conflict as resolved.\n"
9524
"revert Revert files to a previous revision.\n"
9525
"revno Show current revision number.\n"
9526
"root Show the tree root directory.\n"
9527
"send Mail or create a merge-directive for submitting changes.\n"
9528
"serve Run the bzr server.\n"
9529
"shelve Temporarily set aside some changes from the current tree.\n"
9530
"sign-my-commits Sign all commits by a given committer.\n"
9531
"split Split a subdirectory of a tree into a separate tree.\n"
9532
"status Display status summary.\n"
9533
"switch Set the branch of a checkout and update.\n"
9534
"tag Create, remove or modify a tag naming a revision.\n"
9535
"tags List tags.\n"
9536
"testament Show testament (signing-form) of a revision.\n"
9537
"unbind Convert the current checkout into a regular branch.\n"
9538
"uncommit Remove the last committed revision.\n"
9539
"unshelve Restore shelved changes.\n"
9540
"update Update a working tree to a new revision.\n"
9541
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9542
" format.\n"
9543
"verify-signatures Verify all commit signatures.\n"
9544
"version Show version of bzr.\n"
9545
"version-info Show version information about this tree.\n"
9546
"view Manage filtered views.\n"
9547
"whoami Show or set bzr user id.\n"
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:1
9551
msgid ""
9552
"Configuration Settings\n"
9553
"======================="
9554
msgstr ""
9555
"Configuración\n"
9556
"============="
9557
9558
#: en/help_topics/configuration.txt:4
9559
msgid ""
9560
"Environment settings\n"
9561
"---------------------"
9562
msgstr ""
9563
"Configuración de entrono\n"
9564
"---------------------"
9565
9566
#: en/help_topics/configuration.txt:7
9567
msgid ""
9568
"While most configuration is handled by configuration files, some options\n"
9569
"which may be semi-permanent can also be controlled through the environment."
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:10
9573
msgid ""
9574
"BZR_EMAIL\n"
9575
"~~~~~~~~~"
9576
msgstr ""
9577
"BZR_EMAIL\n"
9578
"~~~~~~~~~"
9579
9580
#: en/help_topics/configuration.txt:13
9581
msgid "Override the email id used by Bazaar. Typical format::"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:15
9585
msgid " \"John Doe <jdoe@example.com>\""
9586
msgstr " \"Juan Dado <jdado@ejemplo.com>\""
9587
9588
#: en/help_topics/configuration.txt:17
9589
msgid "See also the ``email`` configuration option."
9590
msgstr "Vea también las opciones de configuración de «email»"
9591
9592
#: en/help_topics/configuration.txt:19
9593
msgid ""
9594
"BZR_PROGRESS_BAR\n"
9595
"~~~~~~~~~~~~~~~~"
9596
msgstr ""
9597
"BZR_PROGRESS_BAR\n"
9598
"~~~~~~~~~~~~~~~~"
9599
9600
#: en/help_topics/configuration.txt:22
9601
msgid ""
9602
"Override the progress display. Possible values are \"none\" or \"text\". "
9603
"If\n"
9604
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9605
"draws\n"
9606
"the ordinary command line progress bar."
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:26
9610
msgid ""
9611
"BZR_SIGQUIT_PDB\n"
9612
"~~~~~~~~~~~~~~~"
9613
msgstr ""
9614
"BZR_SIGQUIT_PDB\n"
9615
"~~~~~~~~~~~~~~~"
9616
9617
#: en/help_topics/configuration.txt:29
9618
msgid ""
9619
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:31
9623
msgid ""
9624
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9625
"* 1 = Invoke breakin debugger (default)"
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:34
9629
msgid ""
9630
"BZR_HOME\n"
9631
"~~~~~~~~"
9632
msgstr ""
9633
"BZR_HOME\n"
9634
"~~~~~~~~"
9635
9636
#: en/help_topics/configuration.txt:37
9637
msgid "Override the home directory used by Bazaar."
9638
msgstr "Sobrescribe el directorio de inicio usado por Bazaar."
9639
9640
#: en/help_topics/configuration.txt:39
9641
msgid ""
9642
"BZR_SSH\n"
9643
"~~~~~~~"
9644
msgstr ""
9645
"BZR_SSH\n"
9646
"~~~~~~~"
9647
9648
#: en/help_topics/configuration.txt:42
9649
msgid "Select a different SSH implementation."
9650
msgstr "Seleccione una implementación SSH diferente."
9651
9652
#: en/help_topics/configuration.txt:44
9653
msgid ""
9654
"BZR_PDB\n"
9655
"~~~~~~~"
9656
msgstr ""
9657
"BZR_PDB\n"
9658
"~~~~~~~"
9659
9660
#: en/help_topics/configuration.txt:47
9661
msgid "Control whether to launch a debugger on error."
9662
msgstr "Controla si lanzar un depurador para el error."
9663
9664
#: en/help_topics/configuration.txt:49
9665
msgid ""
9666
"* 0 = Standard behavior\n"
9667
"* 1 = Launch debugger"
9668
msgstr ""
9669
"* 0 = Comportamiento estándar\n"
9670
"* 1 = Lanzar depurador"
9671
9672
#: en/help_topics/configuration.txt:52
9673
msgid ""
9674
"BZR_REMOTE_PATH\n"
9675
"~~~~~~~~~~~~~~~"
9676
msgstr ""
9677
"BZR_REMOTE_PATH\n"
9678
"~~~~~~~~~~~~~~~"
9679
9680
#: en/help_topics/configuration.txt:55
9681
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:57
9685
msgid "See also the ``bzr_remote_path`` configuration option."
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:59
9689
msgid ""
9690
"BZR_EDITOR\n"
9691
"~~~~~~~~~~"
9692
msgstr ""
9693
"BZR_EDITOR\n"
9694
"~~~~~~~~~~"
9695
9696
#: en/help_topics/configuration.txt:62
9697
msgid "Path to the editor Bazaar should use for commit messages, etc."
9698
msgstr ""
9699
9700
#: en/help_topics/configuration.txt:64
9701
msgid ""
9702
"BZR_LOG\n"
9703
"~~~~~~~"
9704
msgstr ""
9705
"BZR_LOG\n"
9706
"~~~~~~~"
9707
9708
#: en/help_topics/configuration.txt:67
9709
msgid ""
9710
"Location of the Bazaar log file. You can check the current location by\n"
9711
"running ``bzr version``."
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:70
9715
msgid ""
9716
"The log file contains debug information that is useful for diagnosing or\n"
9717
"reporting problems with Bazaar."
9718
msgstr ""
9719
9720
#: en/help_topics/configuration.txt:73
9721
msgid ""
9722
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9723
"will disable logging."
9724
msgstr ""
9725
9726
#: en/help_topics/configuration.txt:76
9727
msgid ""
9728
"\n"
9729
"BZR_PLUGIN_PATH\n"
9730
"~~~~~~~~~~~~~~~"
9731
msgstr ""
9732
"\n"
9733
"BZR_PLUGIN_PATH\n"
9734
"~~~~~~~~~~~~~~~"
9735
9736
#: en/help_topics/configuration.txt:80
9737
msgid ""
9738
"The path to the plugins directory that Bazaar should use.\n"
9739
"If not set, Bazaar will search for plugins in:"
9740
msgstr ""
9741
9742
#: en/help_topics/configuration.txt:83
9743
msgid ""
9744
"* the user specific plugin directory (containing the ``user`` plugins),"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:85
9748
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9749
msgstr "* el directorio bzrlib (contiene los complementos «core»),"
9750
9751
#: en/help_topics/configuration.txt:87
9752
msgid ""
9753
"* the site specific plugin directory if applicable (containing\n"
9754
" the ``site`` plugins)."
9755
msgstr ""
9756
9757
#: en/help_topics/configuration.txt:90
9758
msgid ""
9759
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9760
"the way the plugin are searched. "
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:93
9764
msgid ""
9765
"As for the ``PATH`` variables, if multiple directories are\n"
9766
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9767
"platform specific appropriate character (':' on Unix,\n"
9768
"';' on windows)"
9769
msgstr ""
9770
9771
#: en/help_topics/configuration.txt:98
9772
msgid ""
9773
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9774
"in ``user``. However it will continue to search in ``core`` and\n"
9775
"``site`` unless they are explicitly removed."
9776
msgstr ""
9777
9778
#: en/help_topics/configuration.txt:102
9779
msgid ""
9780
"If you need to change the order or remove one of these\n"
9781
"directories, you should use special values:"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:105
9785
msgid ""
9786
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9787
" path from the default values,"
9788
msgstr ""
9789
"* «-user», «-core», «-site» eliminarán las correspondientes\n"
9790
" rutas de los valores predeterminados,"
9791
9792
#: en/help_topics/configuration.txt:108
9793
msgid ""
9794
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9795
" before the remaining default values (and also remove it from\n"
9796
" the default values)."
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:112
9800
msgid ""
9801
"Note that the special values 'user', 'core' and 'site' should be\n"
9802
"used literally, they will be substituted by the corresponding,\n"
9803
"platform specific, values."
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:116
9807
msgid ""
9808
"The examples below use ':' as the separator, windows users\n"
9809
"should use ';'."
9810
msgstr ""
9811
9812
#: en/help_topics/configuration.txt:119
9813
msgid "Overriding the default user plugin directory::"
9814
msgstr ""
9815
"Sobrescribiendo el directorio de complemento de usuario predeterminado::"
9816
9817
#: en/help_topics/configuration.txt:121
9818
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9819
msgstr " BZR_PLUGIN_PATH='/ruta/a/mis/otros/complementos'"
9820
9821
#: en/help_topics/configuration.txt:123
9822
msgid "Disabling the site directory while retaining the user directory::"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:125
9826
msgid " BZR_PLUGIN_PATH='-site:+user'"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:127
9830
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:129
9834
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9835
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
9836
9837
#: en/help_topics/configuration.txt:131
9838
msgid "Overriding the default site plugin directory::"
9839
msgstr "Sobrescribe el directorio de complemento de sitio predeterminado::"
9840
9841
#: en/help_topics/configuration.txt:133
9842
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9843
msgstr " BZR_PLUGIN_PATH='/ruta/a/mi/sitiode/complementos:-sitio':+usuario"
9844
9845
#: en/help_topics/configuration.txt:135
9846
msgid ""
9847
"BZR_DISABLE_PLUGINS\n"
9848
"~~~~~~~~~~~~~~~~~~~"
9849
msgstr ""
9850
"BZR_DISABLE_PLUGINS\n"
9851
"~~~~~~~~~~~~~~~~~~~"
9852
9853
#: en/help_topics/configuration.txt:138
9854
msgid ""
9855
"Under special circumstances (mostly when trying to diagnose a\n"
9856
"bug), it's better to disable a plugin (or several) rather than\n"
9857
"uninstalling them completely. Such plugins can be specified in\n"
9858
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9859
msgstr ""
9860
9861
#: en/help_topics/configuration.txt:143
9862
msgid ""
9863
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9864
"will raise an import error if they are explicitly imported (by\n"
9865
"another plugin that depends on them for example)."
9866
msgstr ""
9867
9868
#: en/help_topics/configuration.txt:147
9869
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9870
msgstr "Desactivar «myplugin» y «yourplugin» se consigue::"
9871
9872
#: en/help_topics/configuration.txt:149
9873
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9874
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9875
9876
#: en/help_topics/configuration.txt:151
9877
msgid ""
9878
"BZR_PLUGINS_AT\n"
9879
"~~~~~~~~~~~~~~"
9880
msgstr ""
9881
"BZR_PLUGINS_AT\n"
9882
"~~~~~~~~~~~~~~"
9883
9884
#: en/help_topics/configuration.txt:154
9885
msgid ""
9886
"When adding a new feature or working on a bug in a plugin,\n"
9887
"developers often need to use a specific version of a given\n"
9888
"plugin. Since python requires that the directory containing the\n"
9889
"code is named like the plugin itself this make it impossible to\n"
9890
"use arbitrary directory names (using a two-level directory scheme\n"
9891
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9892
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:162
9896
msgid ""
9897
"Plugins specified in this environment variable takes precedence\n"
9898
"over the ones in ``BZR_PLUGIN_PATH``."
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:165
9902
msgid ""
9903
"The variable specified a list of ``plugin_name@plugin path``,\n"
9904
"``plugin_name`` being the name of the plugin as it appears in\n"
9905
"python module paths, ``plugin_path`` being the path to the\n"
9906
"directory containing the plugin code itself\n"
9907
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9908
"separator, use ';' on windows."
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:172
9912
msgid ""
9913
"Example:\n"
9914
"~~~~~~~~"
9915
msgstr ""
9916
"Ejemplo:\n"
9917
"~~~~~~~~"
9918
9919
#: en/help_topics/configuration.txt:175
9920
msgid ""
9921
"Using a specific version of ``myplugin``:\n"
9922
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:178
9926
msgid ""
9927
"BZRPATH\n"
9928
"~~~~~~~"
9929
msgstr ""
9930
"BZRPATH\n"
9931
"~~~~~~~"
9932
9933
#: en/help_topics/configuration.txt:181
9934
msgid "The path where Bazaar should look for shell plugin external commands."
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:183
9938
msgid ""
9939
"\n"
9940
"http_proxy, https_proxy\n"
9941
"~~~~~~~~~~~~~~~~~~~~~~~"
9942
msgstr ""
9943
"\n"
9944
"http_proxy, https_proxy\n"
9945
"~~~~~~~~~~~~~~~~~~~~~~~"
9946
9947
#: en/help_topics/configuration.txt:187
9948
msgid "Specifies the network proxy for outgoing connections, for example::"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:189
9952
msgid ""
9953
" http_proxy=http://proxy.example.com:3128/ \n"
9954
" https_proxy=http://proxy.example.com:3128/"
9955
msgstr ""
9956
" http_proxy=http://proxy.ejemplo.com:3128/ \n"
9957
" https_proxy=http://proxy.ejemplo.com:3128/"
9958
9959
#: en/help_topics/configuration.txt:192
9960
msgid ""
9961
"\n"
9962
"Configuration files\n"
9963
"-------------------"
9964
msgstr ""
9965
"\n"
9966
"Archivos de configuración\n"
9967
"-------------------------"
9968
9969
#: en/help_topics/configuration.txt:196
9970
msgid ""
9971
"Location\n"
9972
"~~~~~~~~"
9973
msgstr ""
9974
"Ubicación\n"
9975
"~~~~~~~~"
9976
9977
#: en/help_topics/configuration.txt:199
9978
msgid ""
9979
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9980
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9981
"on\n"
9982
"Windows. (You can check the location for your system by using\n"
9983
"``bzr version``.)"
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:204
9987
msgid "There are three primary configuration files in this location:"
9988
msgstr "Hay tres archivos de configuración primarios en esta ubicación:"
9989
9990
#: en/help_topics/configuration.txt:206
9991
msgid "* ``bazaar.conf`` describes default configuration options,"
9992
msgstr ""
9993
"* «bazaar.conf» describe las opciones de configuración predeterminadas,"
9994
9995
#: en/help_topics/configuration.txt:208
9996
msgid ""
9997
"* ``locations.conf`` describes configuration information for\n"
9998
" specific branch locations,"
9999
msgstr ""
10000
"* «locations.conf» describe información de configuración para\n"
10001
" ubicaciones de rama específicas,"
10002
10003
#: en/help_topics/configuration.txt:211
10004
msgid ""
10005
"* ``authentication.conf`` describes credential information for\n"
10006
" remote servers."
10007
msgstr ""
10008
"* «authentication.conf» describe información de credencial para\n"
10009
" servidores remotos."
10010
10011
#: en/help_topics/configuration.txt:214
10012
msgid ""
10013
"Each branch can also contain a configuration file that sets values specific\n"
10014
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10015
"the\n"
10016
"branch. This file is visible to all users of a branch, if you wish to "
10017
"override\n"
10018
"one of the values for a branch with a setting that is specific to you then "
10019
"you\n"
10020
"can do so in ``locations.conf``."
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:220
10024
msgid ""
10025
"General format\n"
10026
"~~~~~~~~~~~~~~"
10027
msgstr ""
10028
"Formato general\n"
10029
"~~~~~~~~~~~~~~~"
10030
10031
#: en/help_topics/configuration.txt:223
10032
msgid ""
10033
"An ini file has three types of contructs: section headers, section\n"
10034
"options and comments."
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:226
10038
msgid ""
10039
"Comments\n"
10040
"^^^^^^^^"
10041
msgstr ""
10042
"Commentarios\n"
10043
"^^^^^^^^^^^^"
10044
10045
#: en/help_topics/configuration.txt:229
10046
msgid ""
10047
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10048
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10049
"Bazaar when parsing ini files."
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:233
10053
msgid ""
10054
"Section headers\n"
10055
"^^^^^^^^^^^^^^^"
10056
msgstr ""
10057
"Cabeceras de sección\n"
10058
"^^^^^^^^^^^^^^^^^^^^"
10059
10060
#: en/help_topics/configuration.txt:236
10061
msgid ""
10062
"A section header is a word enclosed in brackets that starts at the begining\n"
10063
"of a line. A typical section header looks like this::"
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:239
10067
msgid " [DEFAULT]"
10068
msgstr " [PREDETERMINADO]"
10069
10070
#: en/help_topics/configuration.txt:241
10071
msgid ""
10072
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10073
"[ALIASES]. Section headers are case sensitive. The default section provides "
10074
"for\n"
10075
"setting options which can be overridden with the branch config file."
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:245
10079
msgid ""
10080
"For ``locations.conf``, the options from the section with the\n"
10081
"longest matching section header are used to the exclusion of other\n"
10082
"potentially valid section headers. A section header uses the path for\n"
10083
"the branch as the section header. Some examples include::"
10084
msgstr ""
10085
10086
#: en/help_topics/configuration.txt:250
10087
msgid ""
10088
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10089
" [/home/jdoe/branches/]"
10090
msgstr ""
10091
" [http://misramas.isp.com/~jdado/dirrama]\n"
10092
" [/home/jdado/ramas/]"
10093
10094
#: en/help_topics/configuration.txt:253
10095
msgid ""
10096
"\n"
10097
"Section options\n"
10098
"^^^^^^^^^^^^^^^"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:257
10102
msgid ""
10103
"A section option resides within a section. A section option contains an\n"
10104
"option name, an equals sign and a value. For example::"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:260
10108
msgid ""
10109
" email = John Doe <jdoe@isp.com>\n"
10110
" gpg_signing_key = Amy Pond <amy@example.com>"
10111
msgstr ""
10112
" email = Juan Dado <jdado@isp.com>\n"
10113
" gpg_signing_key = Ana Pons <ana@ejemplo.com>"
10114
10115
#: en/help_topics/configuration.txt:263
10116
msgid ""
10117
"A option can reference other options by enclosing them in curly brackets::"
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:265
10121
msgid ""
10122
" my_branch_name = feature_x\n"
10123
" my_server = bzr+ssh://example.com\n"
10124
" push_location = {my_server}/project/{my_branch_name}"
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:269
10128
msgid ""
10129
"Option policies\n"
10130
"^^^^^^^^^^^^^^^"
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:272
10134
msgid ""
10135
"Options defined in a section affect the named directory or URL plus\n"
10136
"any locations they contain. Policies can be used to change how an\n"
10137
"option value is interpreted for contained locations. Currently\n"
10138
"there are three policies available:"
10139
msgstr ""
10140
10141
#: en/help_topics/configuration.txt:277
10142
msgid ""
10143
" none:\n"
10144
" the value is interpreted the same for contained locations. This is\n"
10145
" the default behaviour.\n"
10146
" norecurse:\n"
10147
" the value is only used for the exact location specified by the\n"
10148
" section name.\n"
10149
" appendpath:\n"
10150
" for contained locations, any additional path components are\n"
10151
" appended to the value."
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:287
10155
msgid ""
10156
"Policies are specified by keys with names of the form "
10157
"\"<option_name>:policy\".\n"
10158
"For example, to define the push location for a tree of branches, the\n"
10159
"following could be used::"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:291
10163
msgid ""
10164
" [/top/location]\n"
10165
" push_location = sftp://example.com/location\n"
10166
" push_location:policy = appendpath"
10167
msgstr ""
10168
" [/top/ubicacón]\n"
10169
" push_location = sftp://ejemplo.com/ubicaciñon\n"
10170
" push_location:policy = appendpath"
10171
10172
#: en/help_topics/configuration.txt:295
10173
msgid ""
10174
"With this configuration, the push location for ``/top/location/branch1``\n"
10175
"would be ``sftp://example.com/location/branch1``."
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:298
10179
msgid ""
10180
"Section local options\n"
10181
"^^^^^^^^^^^^^^^^^^^^^"
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:301
10185
msgid ""
10186
"Some options are defined automatically inside a given section and can be\n"
10187
"refered to in this section only. "
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:304
10191
msgid "For example, the ``appendpath`` policy can be used like this::"
10192
msgstr ""
10193
10194
#: en/help_topics/configuration.txt:306
10195
msgid ""
10196
" [/home/vila/src/bzr/bugs]\n"
10197
" mypush = lp:~vila/bzr\n"
10198
" mypush:policy=appendpath"
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:310
10202
msgid "Using ``relpath`` to achieve the same result is done like this::"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:312
10206
msgid ""
10207
" [/home/vila/src/bzr/bugs]\n"
10208
" mypush = lp:~vila/bzr/{relpath}"
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:315
10212
msgid ""
10213
"In both cases, when used in a directory like\n"
10214
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10218
msgid ""
10219
" $ bzr config mypush\n"
10220
" lp:~vila/bzr/832013-expand-in-stack"
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:321
10224
msgid "Another such option is ``basename`` which can be used like this::"
10225
msgstr ""
10226
10227
#: en/help_topics/configuration.txt:323
10228
msgid ""
10229
" [/home/vila/src/bzr]\n"
10230
" mypush = lp:~vila/bzr/{basename}"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:326
10234
msgid ""
10235
"When used in a directory like\n"
10236
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:332
10240
msgid ""
10241
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10242
"itself is defined as the relative path between the section name and the\n"
10243
"location it matches."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:336
10247
msgid ""
10248
"When an option is local to a Section, it cannot be referred to from option\n"
10249
"values in any other section from the same ``Store`` nor from any other\n"
10250
"``Store``."
10251
msgstr ""
10252
10253
#: en/help_topics/configuration.txt:340
10254
msgid ""
10255
"\n"
10256
"The main configuration file, bazaar.conf\n"
10257
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10258
msgstr ""
10259
"\n"
10260
"El archivo de configuración principal, bazaar.conf\n"
10261
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10262
10263
#: en/help_topics/configuration.txt:344
10264
msgid ""
10265
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10266
"The default section contains the default\n"
10267
"configuration options for all branches. The default section can be\n"
10268
"overriden by providing a branch-specific section in ``locations.conf``."
10269
msgstr ""
10270
10271
#: en/help_topics/configuration.txt:349
10272
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:351
10276
msgid ""
10277
" [DEFAULT]\n"
10278
" email = John Doe <jdoe@isp.com>\n"
10279
" editor = /usr/bin/vim\n"
10280
" create_signatures = when-required"
10281
msgstr ""
10282
" [DEFAULT]\n"
10283
" email = Juan Dado <jdado@isp.com>\n"
10284
" editor = /usr/bin/vim\n"
10285
" create_signatures = when-required"
10286
10287
#: en/help_topics/configuration.txt:356
10288
msgid ""
10289
"\n"
10290
"The branch location configuration file, locations.conf\n"
10291
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10292
msgstr ""
10293
"\n"
10294
"El archivo de ubicación de la rama, locations.conf\n"
10295
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10296
10297
#: en/help_topics/configuration.txt:360
10298
msgid ""
10299
"``locations.conf`` allows one to specify overriding settings for\n"
10300
"a specific branch. The format is almost identical to the default section in\n"
10301
"bazaar.conf with one significant change: The section header, instead of "
10302
"saying\n"
10303
"default, will be the path to a branch that you wish to override a value\n"
10304
"for. The '?' and '*' wildcards are supported::"
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:366
10308
msgid ""
10309
" [/home/jdoe/branches/nethack]\n"
10310
" email = Nethack Admin <nethack@nethack.com>"
10311
msgstr ""
10312
" [/home/jdado/ramas/nethack]\n"
10313
" email = Nethack Admin <nethack@nethack.com>"
10314
10315
#: en/help_topics/configuration.txt:369
10316
msgid ""
10317
" [http://hypothetical.site.com/branches/devel-branch]\n"
10318
" create_signatures = always"
10319
msgstr ""
10320
" [http://hypothetical.site.com/branches/devel-branch]\n"
10321
" create_signatures = always"
10322
10323
#: en/help_topics/configuration.txt:372
10324
msgid ""
10325
"The authentication configuration file, authentication.conf\n"
10326
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10327
msgstr ""
10328
"El archivo de configuración de la autenticación, authentication.conf\n"
10329
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10330
10331
#: en/help_topics/configuration.txt:375
10332
msgid ""
10333
"``authentication.conf`` allows one to specify credentials for\n"
10334
"remote servers. This can be used for all the supported transports and any "
10335
"part\n"
10336
"of bzr that requires authentication (smtp for example)."
10337
msgstr ""
10338
10339
#: en/help_topics/configuration.txt:379
10340
msgid ""
10341
"The syntax of the file obeys the same rules as the others except for the\n"
10342
"option policies which don't apply."
10343
msgstr ""
10344
10345
#: en/help_topics/configuration.txt:382
10346
msgid ""
10347
"For more information on the possible uses of the authentication "
10348
"configuration\n"
10349
"file see :doc:`authentication-help`."
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:385
10353
msgid ""
10354
"\n"
10355
"Common options\n"
10356
"--------------"
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:389
10360
msgid ""
10361
"debug_flags\n"
10362
"~~~~~~~~~~~"
10363
msgstr ""
10364
"debug_flags\n"
10365
"~~~~~~~~~~~"
10366
10367
#: en/help_topics/configuration.txt:392
10368
msgid ""
10369
"A comma-separated list of debugging options to turn on. The same values\n"
10370
"can be used as with the -D command-line option (see `help global-options`).\n"
10371
"For example::"
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:396
10375
msgid " debug_flags = hpss"
10376
msgstr " debug_flags = hpss"
10377
10378
#: en/help_topics/configuration.txt:400
10379
msgid " debug_flags = hpss,evil"
10380
msgstr " debug_flags = hpss,evil"
10381
10382
#: en/help_topics/configuration.txt:402
10383
msgid ""
10384
"email\n"
10385
"~~~~~"
10386
msgstr ""
10387
"correo\n"
10388
"~~~~~"
10389
10390
#: en/help_topics/configuration.txt:405
10391
msgid ""
10392
"The email address to use when committing a branch. Typically takes the form\n"
10393
"of::"
10394
msgstr ""
10395
10396
#: en/help_topics/configuration.txt:408
10397
msgid " email = Full Name <account@hostname.tld>"
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:410
10401
msgid ""
10402
"editor\n"
10403
"~~~~~~"
10404
msgstr ""
10405
"editor\n"
10406
"~~~~~~"
10407
10408
#: en/help_topics/configuration.txt:413
10409
msgid ""
10410
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10411
"a commit message. This setting is trumped by the environment variable\n"
10412
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10413
"variables."
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:418
10417
msgid ""
10418
"log_format\n"
10419
"~~~~~~~~~~"
10420
msgstr ""
10421
"log_format\n"
10422
"~~~~~~~~~~"
10423
10424
#: en/help_topics/configuration.txt:421
10425
msgid ""
10426
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10427
"and ``line``. Additional formats may be provided by plugins. The default\n"
10428
"value is ``long``."
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:425
10432
msgid ""
10433
"check_signatures\n"
10434
"~~~~~~~~~~~~~~~~"
10435
msgstr ""
10436
"check_signatures\n"
10437
"~~~~~~~~~~~~~~~~"
10438
10439
#: en/help_topics/configuration.txt:428
10440
msgid ""
10441
"Reserved for future use. These options will allow a policy for branches to\n"
10442
"require signatures."
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:431
10446
msgid ""
10447
"require\n"
10448
" The gnupg signature for revisions must be present and must be valid."
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:434
10452
msgid ""
10453
"ignore\n"
10454
" Do not check gnupg signatures of revisions."
10455
msgstr ""
10456
10457
#: en/help_topics/configuration.txt:437
10458
msgid ""
10459
"check-available\n"
10460
" (default) If gnupg signatures for revisions are present, check them.\n"
10461
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10462
" no signature is present."
10463
msgstr ""
10464
10465
#: en/help_topics/configuration.txt:442
10466
msgid ""
10467
"create_signatures\n"
10468
"~~~~~~~~~~~~~~~~~"
10469
msgstr ""
10470
"create_signatures\n"
10471
"~~~~~~~~~~~~~~~~~"
10472
10473
#: en/help_topics/configuration.txt:445
10474
msgid ""
10475
"Defines the behaviour of signing revisions on commits. By default bzr will "
10476
"not\n"
10477
"sign new commits."
10478
msgstr ""
10479
10480
#: en/help_topics/configuration.txt:448
10481
msgid ""
10482
"always\n"
10483
" Sign every new revision that is committed. If the signing fails then "
10484
"the\n"
10485
" commit will not be made."
10486
msgstr ""
10487
10488
#: en/help_topics/configuration.txt:452
10489
msgid ""
10490
"when-required\n"
10491
" Reserved for future use."
10492
msgstr ""
10493
"when-required\n"
10494
" Reservada para uso futuro."
10495
10496
#: en/help_topics/configuration.txt:455
10497
msgid ""
10498
"never\n"
10499
" Reserved for future use."
10500
msgstr ""
10501
"never\n"
10502
" Reservada para uso futuro."
10503
10504
#: en/help_topics/configuration.txt:458
10505
msgid ""
10506
"In future it is planned that ``when-required`` will sign newly\n"
10507
"committed revisions only when the branch requires them. ``never`` will "
10508
"refuse\n"
10509
"to sign newly committed revisions, even if the branch requires signatures."
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:462
10513
msgid ""
10514
"dirstate.fdatasync\n"
10515
"~~~~~~~~~~~~~~~~~~"
10516
msgstr ""
10517
"dirstate.fdatasync\n"
10518
"~~~~~~~~~~~~~~~~~~"
10519
10520
#: en/help_topics/configuration.txt:465
10521
msgid ""
10522
"If true (default), working tree metadata changes are flushed through the\n"
10523
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10524
"should not be lost if the machine crashes. See also repository.fdatasync."
10525
msgstr ""
10526
10527
#: en/help_topics/configuration.txt:469
10528
msgid ""
10529
"gpg_signing_key\n"
10530
"~~~~~~~~~~~~~~~"
10531
msgstr ""
10532
"gpg_signing_key\n"
10533
"~~~~~~~~~~~~~~~"
10534
10535
#: en/help_topics/configuration.txt:472
10536
msgid ""
10537
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10538
"address, key fingerprint or full key ID. When unset or when set to\n"
10539
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10540
msgstr ""
10541
10542
#: en/help_topics/configuration.txt:476
10543
msgid ""
10544
"recurse\n"
10545
"~~~~~~~"
10546
msgstr ""
10547
"recurse\n"
10548
"~~~~~~~"
10549
10550
#: en/help_topics/configuration.txt:479
10551
msgid ""
10552
"Only useful in ``locations.conf``. Defines whether or not the\n"
10553
"configuration for this section applies to subdirectories:"
10554
msgstr ""
10555
10556
#: en/help_topics/configuration.txt:482
10557
msgid ""
10558
"true\n"
10559
" (default) This section applies to subdirectories as well."
10560
msgstr ""
10561
10562
#: en/help_topics/configuration.txt:485
10563
msgid ""
10564
"false\n"
10565
" This section only applies to the branch at this directory and not\n"
10566
" branches below it."
10567
msgstr ""
10568
10569
#: en/help_topics/configuration.txt:489
10570
msgid ""
10571
"gpg_signing_command\n"
10572
"~~~~~~~~~~~~~~~~~~~"
10573
msgstr ""
10574
"gpg_signing_command\n"
10575
"~~~~~~~~~~~~~~~~~~~"
10576
10577
#: en/help_topics/configuration.txt:492
10578
msgid ""
10579
"(Default: \"gpg\"). Which program should be used to sign and check "
10580
"revisions.\n"
10581
"For example::"
10582
msgstr ""
10583
10584
#: en/help_topics/configuration.txt:495
10585
msgid " gpg_signing_command = /usr/bin/gnpg"
10586
msgstr " gpg_signing_command = /usr/bin/gnpg"
10587
10588
#: en/help_topics/configuration.txt:497
10589
msgid ""
10590
"The specified command must accept the options \"--clearsign\" and \"-u "
10591
"<email>\"."
10592
msgstr ""
10593
"La orden especificada puede aceptar las opciones «--clearsign» y «-u "
10594
"<correo>»."
10595
10596
#: en/help_topics/configuration.txt:499
10597
msgid ""
10598
"bzr_remote_path\n"
10599
"~~~~~~~~~~~~~~~"
10600
msgstr ""
10601
"bzr_remote_path\n"
10602
"~~~~~~~~~~~~~~~"
10603
10604
#: en/help_topics/configuration.txt:502
10605
msgid ""
10606
"(Default: \"bzr\"). The path to the command that should be used to run the "
10607
"smart\n"
10608
"server for bzr. This value may only be specified in locations.conf, because:"
10609
msgstr ""
10610
10611
#: en/help_topics/configuration.txt:505
10612
msgid ""
10613
"- it's needed before branch.conf is accessible\n"
10614
"- allowing remote branch.conf files to specify commands would be a security\n"
10615
" risk"
10616
msgstr ""
10617
10618
#: en/help_topics/configuration.txt:509
10619
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10620
msgstr ""
10621
10622
#: en/help_topics/configuration.txt:511
10623
msgid ""
10624
"smtp_server\n"
10625
"~~~~~~~~~~~"
10626
msgstr ""
10627
"smtp_server\n"
10628
"~~~~~~~~~~~"
10629
10630
#: en/help_topics/configuration.txt:514
10631
msgid ""
10632
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10633
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10634
msgstr ""
10635
10636
#: en/help_topics/configuration.txt:517
10637
msgid ""
10638
"smtp_username, smtp_password\n"
10639
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10640
msgstr ""
10641
"smtp_username, smtp_password\n"
10642
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10643
10644
#: en/help_topics/configuration.txt:520
10645
msgid ""
10646
"User and password to authenticate to the SMTP server. If smtp_username\n"
10647
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10648
"These settings are only needed if the SMTP server requires authentication\n"
10649
"to send mail."
10650
msgstr ""
10651
10652
#: en/help_topics/configuration.txt:525
10653
msgid ""
10654
"locks.steal_dead\n"
10655
"~~~~~~~~~~~~~~~~"
10656
msgstr ""
10657
"locks.steal_dead\n"
10658
"~~~~~~~~~~~~~~~~"
10659
10660
#: en/help_topics/configuration.txt:528
10661
msgid ""
10662
"If set to true, bzr will automatically break locks held by processes from\n"
10663
"the same machine and user that are no longer alive. Otherwise, it will\n"
10664
"print a message and you can break the lock manually, if you are satisfied\n"
10665
"the object is no longer in use."
10666
msgstr ""
10667
10668
#: en/help_topics/configuration.txt:533
10669
msgid ""
10670
"mail_client\n"
10671
"~~~~~~~~~~~"
10672
msgstr ""
10673
"mail_client\n"
10674
"~~~~~~~~~~~"
10675
10676
#: en/help_topics/configuration.txt:536
10677
msgid ""
10678
"A mail client to use for sending merge requests.\n"
10679
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10680
"it\n"
10681
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10682
"``editor``."
10683
msgstr ""
10684
10685
#: en/help_topics/configuration.txt:541
10686
msgid "Supported values for specific clients:"
10687
msgstr "Valores permitidos para clientes específicos:"
10688
10689
#: en/help_topics/configuration.txt:543
10690
msgid ""
10691
":claws: Use Claws. This skips a dialog for attaching files.\n"
10692
":evolution: Use Evolution.\n"
10693
":kmail: Use KMail.\n"
10694
":mutt: Use Mutt.\n"
10695
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10696
"1.5,\n"
10697
" this works around some bugs that xdg-email doesn't handle."
10698
msgstr ""
10699
10700
#: en/help_topics/configuration.txt:550
10701
msgid "Supported generic values are:"
10702
msgstr "Los valores genéricos permitidos son:"
10703
10704
#: en/help_topics/configuration.txt:552
10705
msgid ""
10706
":default: See above.\n"
10707
":editor: Use your editor to compose the merge request. This also uses\n"
10708
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10709
" smtp_username and smtp_password.\n"
10710
":mapi: Use your preferred e-mail client on Windows.\n"
10711
":xdg-email: Use xdg-email to run your preferred mail program"
10712
msgstr ""
10713
10714
#: en/help_topics/configuration.txt:559
10715
msgid ""
10716
"repository.fdatasync\n"
10717
"~~~~~~~~~~~~~~~~~~~~"
10718
msgstr ""
10719
"repository.fdatasync\n"
10720
"~~~~~~~~~~~~~~~~~~~~"
10721
10722
#: en/help_topics/configuration.txt:562
10723
msgid ""
10724
"If true (default), repository changes are flushed through the OS buffers\n"
10725
"to physical disk. This is somewhat slower, but means data should not be\n"
10726
"lost if the machine crashes. See also dirstate.fdatasync."
10727
msgstr ""
10728
10729
#: en/help_topics/configuration.txt:566
10730
msgid ""
10731
"submit_branch\n"
10732
"~~~~~~~~~~~~~"
10733
msgstr ""
10734
"submit_branch\n"
10735
"~~~~~~~~~~~~~"
10736
10737
#: en/help_topics/configuration.txt:569
10738
msgid ""
10739
"The branch you intend to submit your current work to. This is "
10740
"automatically\n"
10741
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10742
"This\n"
10743
"should usually be set on a per-branch or per-location basis."
10744
msgstr ""
10745
10746
#: en/help_topics/configuration.txt:573
10747
msgid ""
10748
"public_branch\n"
10749
"~~~~~~~~~~~~~"
10750
msgstr ""
10751
"public_branch\n"
10752
"~~~~~~~~~~~~~"
10753
10754
#: en/help_topics/configuration.txt:576
10755
msgid ""
10756
"A publically-accessible version of this branch (implying that this version "
10757
"is\n"
10758
"not publically-accessible). Used (and set) by ``bzr send``."
10759
msgstr ""
10760
10761
#: en/help_topics/configuration.txt:579
10762
msgid ""
10763
"suppress_warnings\n"
10764
"~~~~~~~~~~~~~~~~~"
10765
msgstr ""
10766
"suppress_warnings\n"
10767
"~~~~~~~~~~~~~~~~~"
10768
10769
#: en/help_topics/configuration.txt:582
10770
msgid ""
10771
"A list of strings, each string represent a warning that can be emitted by\n"
10772
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10773
msgstr ""
10774
10775
#: en/help_topics/configuration.txt:585
10776
msgid "Valid values:"
10777
msgstr "valores válidos:"
10778
10779
#: en/help_topics/configuration.txt:587
10780
msgid ""
10781
"* ``format_deprecation``:\n"
10782
" whether the format deprecation warning is shown on repositories that "
10783
"are\n"
10784
" using deprecated formats."
10785
msgstr ""
10786
10787
#: en/help_topics/configuration.txt:591
10788
msgid ""
10789
"default_format\n"
10790
"~~~~~~~~~~~~~~"
10791
msgstr ""
10792
"default_format\n"
10793
"~~~~~~~~~~~~~~"
10794
10795
#: en/help_topics/configuration.txt:594
10796
msgid ""
10797
"A format name for the default format used when creating branches. See "
10798
"``bzr\n"
10799
"help formats`` for possible values."
10800
msgstr ""
10801
10802
#: en/help_topics/configuration.txt:597
10803
msgid ""
10804
"\n"
10805
"Unicode options\n"
10806
"---------------"
10807
msgstr ""
10808
"\n"
10809
"Opciones Unicode\n"
10810
"---------------"
10811
10812
#: en/help_topics/configuration.txt:601
10813
msgid ""
10814
"output_encoding\n"
10815
"~~~~~~~~~~~~~~~"
10816
msgstr ""
10817
"output_encoding\n"
10818
"~~~~~~~~~~~~~~~"
10819
10820
#: en/help_topics/configuration.txt:604
10821
msgid ""
10822
"A Python unicode encoding name for text output from bzr, such as log\n"
10823
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10824
"is the terminal encoding prefered by the operating system."
10825
msgstr ""
10826
10827
#: en/help_topics/configuration.txt:608
10828
msgid ""
10829
"\n"
10830
"Branch type specific options\n"
10831
"----------------------------"
10832
msgstr ""
10833
"\n"
10834
"Opciones específicas del tipo de rama\n"
10835
"-----------------------------------------------------------"
10836
10837
#: en/help_topics/configuration.txt:612
10838
msgid ""
10839
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10840
"later format. They\n"
10841
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10842
"manually set in ``locations.conf`` or ``bazaar.conf``."
10843
msgstr ""
10844
10845
#: en/help_topics/configuration.txt:617
10846
msgid ""
10847
"append_revisions_only\n"
10848
"~~~~~~~~~~~~~~~~~~~~~"
10849
msgstr ""
10850
"append_revisions_only\n"
10851
"~~~~~~~~~~~~~~~~~~~~~"
10852
10853
#: en/help_topics/configuration.txt:620
10854
msgid ""
10855
"If set to \"True\" then revisions can only be appended to the log, not\n"
10856
"removed. A branch with this setting enabled can only pull from another\n"
10857
"branch if the other branch's log is a longer version of its own. This is\n"
10858
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10859
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10860
"compatibility with previous bzr versions (older than 2.2)."
10861
msgstr ""
10862
10863
#: en/help_topics/configuration.txt:627
10864
msgid ""
10865
"parent_location\n"
10866
"~~~~~~~~~~~~~~~"
10867
msgstr ""
10868
"parent_location\n"
10869
"~~~~~~~~~~~~~~~"
10870
10871
#: en/help_topics/configuration.txt:630
10872
msgid ""
10873
"If present, the location of the default branch for pull or merge. This "
10874
"option\n"
10875
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10876
"--remember``."
10877
msgstr ""
10878
10879
#: en/help_topics/configuration.txt:634
10880
msgid ""
10881
"push_location\n"
10882
"~~~~~~~~~~~~~"
10883
msgstr ""
10884
"push_location\n"
10885
"~~~~~~~~~~~~~"
10886
10887
#: en/help_topics/configuration.txt:637
10888
msgid ""
10889
"If present, the location of the default branch for push. This option\n"
10890
"is normally set by the first ``push`` or ``push --remember``."
10891
msgstr ""
10892
10893
#: en/help_topics/configuration.txt:640
10894
msgid ""
10895
"push_strict\n"
10896
"~~~~~~~~~~~"
10897
msgstr ""
10898
"push_strict\n"
10899
"~~~~~~~~~~~"
10900
10901
#: en/help_topics/configuration.txt:643
10902
msgid ""
10903
"If present, defines the ``--strict`` option default value for checking\n"
10904
"uncommitted changes before pushing."
10905
msgstr ""
10906
10907
#: en/help_topics/configuration.txt:646
10908
msgid ""
10909
"dpush_strict\n"
10910
"~~~~~~~~~~~~"
10911
msgstr ""
10912
"dpush_strict\n"
10913
"~~~~~~~~~~~~"
10914
10915
#: en/help_topics/configuration.txt:649
10916
msgid ""
10917
"If present, defines the ``--strict`` option default value for checking\n"
10918
"uncommitted changes before pushing into a different VCS without any\n"
10919
"custom bzr metadata."
10920
msgstr ""
10921
10922
#: en/help_topics/configuration.txt:653
10923
msgid ""
10924
"bound_location\n"
10925
"~~~~~~~~~~~~~~"
10926
msgstr ""
10927
"bound_location\n"
10928
"~~~~~~~~~~~~~~"
10929
10930
#: en/help_topics/configuration.txt:656
10931
msgid ""
10932
"The location that commits should go to when acting as a checkout.\n"
10933
"This option is normally set by ``bind``."
10934
msgstr ""
10935
10936
#: en/help_topics/configuration.txt:659
10937
msgid ""
10938
"bound\n"
10939
"~~~~~"
10940
msgstr ""
10941
"bound\n"
10942
"~~~~~"
10943
10944
#: en/help_topics/configuration.txt:662
10945
msgid ""
10946
"If set to \"True\", the branch should act as a checkout, and push each "
10947
"commit to\n"
10948
"the bound_location. This option is normally set by ``bind``/``unbind``."
10949
msgstr ""
10950
10951
#: en/help_topics/configuration.txt:665
10952
msgid ""
10953
"send_strict\n"
10954
"~~~~~~~~~~~"
10955
msgstr ""
10956
"send_strict\n"
10957
"~~~~~~~~~"
10958
10959
#: en/help_topics/configuration.txt:668
10960
msgid ""
10961
"If present, defines the ``--strict`` option default value for checking\n"
10962
"uncommitted changes before sending a merge directive."
10963
msgstr ""
10964
10965
#: en/help_topics/configuration.txt:671
10966
msgid ""
10967
"add.maximum_file_size\n"
10968
"~~~~~~~~~~~~~~~~~~~~~"
10969
msgstr ""
10970
"add.maximum_file_size\n"
10971
"~~~~~~~~~~~~~~~~~~~"
10972
10973
#: en/help_topics/configuration.txt:674
10974
msgid ""
10975
"Defines the maximum file size the command line \"add\" operation will allow\n"
10976
"in recursive mode, with files larger than this value being skipped. You may "
10977
"\n"
10978
"specify this value as an integer (in which case it is interpreted as bytes), "
10979
"\n"
10980
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10981
"0 \n"
10982
"will disable skipping."
10983
msgstr ""
10984
10985
#: en/help_topics/configuration.txt:680
10986
msgid ""
10987
"External Merge Tools\n"
10988
"--------------------"
10989
msgstr ""
10990
"Herramientas de fusión externas\n"
10991
"----------------------------------------------------"
10992
10993
#: en/help_topics/configuration.txt:683
10994
msgid ""
10995
"bzr.mergetool.<name>\n"
10996
"~~~~~~~~~~~~~~~~~~~~"
10997
msgstr ""
10998
"bzr.mergetool.<nombre>\n"
10999
"~~~~~~~~~~~~~~~~~~~"
11000
11001
#: en/help_topics/configuration.txt:686
11002
msgid ""
11003
"Defines an external merge tool called <name> with the given command-line.\n"
11004
"Arguments containing spaces should be quoted using single or double quotes. "
11005
"The\n"
11006
"executable may omit its path if it can be found on the PATH."
11007
msgstr ""
11008
11009
#: en/help_topics/configuration.txt:690
11010
msgid ""
11011
"The following markers can be used in the command-line to substitute "
11012
"filenames\n"
11013
"involved in the merge conflict::"
11014
msgstr ""
11015
11016
#: en/help_topics/configuration.txt:693
11017
msgid ""
11018
" {base} file.BASE\n"
11019
" {this} file.THIS\n"
11020
" {other} file.OTHER\n"
11021
" {result} output file\n"
11022
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
11023
"merge\n"
11024
" succeeds."
11025
msgstr ""
11026
11027
#: en/help_topics/configuration.txt:702
11028
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11029
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {este} {otro} -o {resultado}"
11030
11031
#: en/help_topics/configuration.txt:704
11032
msgid ""
11033
"bzr.default_mergetool\n"
11034
"~~~~~~~~~~~~~~~~~~~~~"
11035
msgstr ""
11036
"bzr.default_mergetool\n"
11037
"~~~~~~~~~~~~~~~~~~"
11038
11039
#: en/help_topics/configuration.txt:707
11040
msgid ""
11041
"Specifies which external merge tool (as defined above) should be selected "
11042
"by\n"
11043
"default in tools such as ``bzr qconflicts``."
11044
msgstr ""
11045
11046
#: en/help_topics/configuration.txt:712
11047
msgid " bzr.default_mergetool = kdiff3\n"
11048
msgstr " bzr.default_mergetool = kdiff3\n"
11049
11050
#: en/help_topics/conflict-types.txt:1
11051
msgid ""
11052
"Conflict Types\n"
11053
"=============="
11054
msgstr ""
11055
"Tipos de conflicto\n"
11056
"=================="
11057
11058
#: en/help_topics/conflict-types.txt:4
11059
msgid ""
11060
"Some operations, like merge, revert and pull, modify the contents of your\n"
11061
"working tree. These modifications are programmatically generated, and so "
11062
"they\n"
11063
"may conflict with the current state of your working tree. "
11064
msgstr ""
11065
11066
#: en/help_topics/conflict-types.txt:8
11067
msgid ""
11068
"When conflicts are present in your working tree (as shown by ``bzr\n"
11069
"conflicts``), you should resolve them and then inform bzr that the "
11070
"conflicts\n"
11071
"have been resolved."
11072
msgstr ""
11073
11074
#: en/help_topics/conflict-types.txt:12
11075
msgid ""
11076
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11077
"should resolve them is not the one responsible for their occurrence, as is "
11078
"the\n"
11079
"case when merging other people's work or because some conflicts are "
11080
"presented\n"
11081
"in a way that is not easy to understand."
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:17
11085
msgid ""
11086
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11087
"conflict if and only if there's an actual conceptual conflict in the source\n"
11088
"tree. Because Bazaar doesn't understand the real meaning of the files "
11089
"being\n"
11090
"versioned, it can, when faced with ambiguities, fall short in either "
11091
"direction\n"
11092
"trying to resolve the conflict itself. Many kinds of changes can be "
11093
"combined\n"
11094
"programmatically, but sometimes only a human can determine the right thing "
11095
"to\n"
11096
"do."
11097
msgstr ""
11098
11099
#: en/help_topics/conflict-types.txt:25
11100
msgid ""
11101
"When Bazaar generates a conflict, it adds information into the working tree "
11102
"to\n"
11103
"present the conflicting versions, and it's up to you to find the correct\n"
11104
"resolution."
11105
msgstr ""
11106
11107
#: en/help_topics/conflict-types.txt:29
11108
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:31
11112
msgid ""
11113
"1. Modify the working tree content so that the conflicted item is now in "
11114
"the\n"
11115
" state you want to keep, then"
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:34
11119
msgid ""
11120
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11121
" remaining generated information (``bzr resolve <item>``)."
11122
msgstr ""
11123
11124
#: en/help_topics/conflict-types.txt:37
11125
msgid ""
11126
"For most conflict types, there are some obvious ways to modify the working\n"
11127
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11128
"itself already made a choice, when possible."
11129
msgstr ""
11130
11131
#: en/help_topics/conflict-types.txt:41
11132
msgid ""
11133
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11134
"different ways to resolve the conflict."
11135
msgstr ""
11136
11137
#: en/help_topics/conflict-types.txt:44
11138
msgid ""
11139
"Each type of conflict is explained below, and the action which must be done "
11140
"to\n"
11141
"resolve the conflict is outlined."
11142
msgstr ""
11143
11144
#: en/help_topics/conflict-types.txt:47
11145
msgid ""
11146
"Various actions are available depending on the kind of conflict, for some "
11147
"of\n"
11148
"these actions, Bazaar can provide some help. In the end you should at least\n"
11149
"inform Bazaar that you're done with the conflict with::"
11150
msgstr ""
11151
11152
#: en/help_topics/conflict-types.txt:51
11153
msgid " ``bzr resolve FILE --action=done'"
11154
msgstr ""
11155
11156
#: en/help_topics/conflict-types.txt:53
11157
msgid ""
11158
"Note that this is the default action when a single file is involved so you "
11159
"can\n"
11160
"simply use::"
11161
msgstr ""
11162
11163
#: en/help_topics/conflict-types.txt:56
11164
msgid " ``bzr resolve FILE``"
11165
msgstr " «bzr resolve ARCHIVO»"
11166
11167
#: en/help_topics/conflict-types.txt:58
11168
msgid "See ``bzr help resolve`` for more details."
11169
msgstr "Vea «bzr help resolve» para tener más detalles."
11170
11171
#: en/help_topics/conflict-types.txt:60
11172
msgid ""
11173
"Text conflicts\n"
11174
"--------------"
11175
msgstr ""
11176
"Conflictos de texto\n"
11177
"------------------------------"
11178
11179
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11180
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11181
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11182
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11183
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11184
msgid "Typical message::"
11185
msgstr "Mensaje típico::"
11186
11187
#: en/help_topics/conflict-types.txt:65
11188
msgid " Text conflict in FILE"
11189
msgstr " Conflictos de texto en ARCHIVO"
11190
11191
#: en/help_topics/conflict-types.txt:67
11192
msgid ""
11193
"These are produced when a text merge cannot completely reconcile two sets "
11194
"of\n"
11195
"text changes. Bazaar will emit files for each version with the extensions\n"
11196
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11197
"tree,\n"
11198
"i.e. the tree that you are merging changes into. OTHER is the version that "
11199
"you\n"
11200
"are merging into the target. BASE is an older version that is used as a "
11201
"basis\n"
11202
"for comparison."
11203
msgstr ""
11204
11205
#: en/help_topics/conflict-types.txt:74
11206
msgid ""
11207
"In the main copy of the file, Bazaar will include all the changes that it\n"
11208
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11209
"\"herringbone\" markers like ``<<<<<<<``."
11210
msgstr ""
11211
11212
#: en/help_topics/conflict-types.txt:78
11213
msgid ""
11214
"Say the initial text is \"The project leader released it.\", and THIS "
11215
"modifies it\n"
11216
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11217
"leader\n"
11218
"released Bazaar.\" A conflict would look like this::"
11219
msgstr ""
11220
11221
#: en/help_topics/conflict-types.txt:82
11222
msgid ""
11223
" <<<<<<< TREE\n"
11224
" Martin Pool released it.\n"
11225
" =======\n"
11226
" The project leader released Bazaar.\n"
11227
" >>>>>>> MERGE-SOURCE"
11228
msgstr ""
11229
" <<<<<<< TREE\n"
11230
" Martin Pool released it.\n"
11231
" =======\n"
11232
" The project leader released Bazaar.\n"
11233
" >>>>>>> MERGE-SOURCE"
11234
11235
#: en/help_topics/conflict-types.txt:88
11236
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11237
msgstr "La resolución correcta debería ser «Martin Pool released Bazaar.»"
11238
11239
#: en/help_topics/conflict-types.txt:90
11240
msgid ""
11241
"You can handle text conflicts either by editing the main copy of the file,\n"
11242
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11243
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11244
"set of changes over the other (but see below when you encounter these\n"
11245
"cases). More often, the two sets of changes must be intelligently combined."
11246
msgstr ""
11247
11248
#: en/help_topics/conflict-types.txt:96
11249
msgid ""
11250
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11251
"you are done editing, the file should look like it never had a conflict, and "
11252
"be\n"
11253
"ready to commit."
11254
msgstr ""
11255
11256
#: en/help_topics/conflict-types.txt:100
11257
msgid ""
11258
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11259
"Bazaar will auto-detect which conflicts you have resolved."
11260
msgstr ""
11261
11262
#: en/help_topics/conflict-types.txt:103
11263
msgid ""
11264
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11265
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11266
"working tree."
11267
msgstr ""
11268
11269
#: en/help_topics/conflict-types.txt:107
11270
msgid ""
11271
"\n"
11272
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11273
"resolve`` with one of the following actions:"
11274
msgstr ""
11275
11276
#: en/help_topics/conflict-types.txt:111
11277
msgid ""
11278
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11279
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11280
msgstr ""
11281
11282
#: en/help_topics/conflict-types.txt:114
11283
msgid ""
11284
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11285
"modifications will be taken into account."
11286
msgstr ""
11287
11288
#: en/help_topics/conflict-types.txt:117
11289
msgid ""
11290
"Content conflicts\n"
11291
"-----------------"
11292
msgstr ""
11293
"Conflictos de contenido\n"
11294
"-------------------------------------"
11295
11296
#: en/help_topics/conflict-types.txt:122
11297
msgid " Contents conflict in FILE"
11298
msgstr " Conflictos de contenido en ARCHIVO"
11299
11300
#: en/help_topics/conflict-types.txt:124
11301
msgid ""
11302
"This conflict happens when there are conflicting changes in the working "
11303
"tree\n"
11304
"and the merge source, but the conflicted items are not text files. They "
11305
"may\n"
11306
"be binary files, or symlinks, or directories. It can even happen with "
11307
"files\n"
11308
"that are deleted on one side, and modified on the other."
11309
msgstr ""
11310
11311
#: en/help_topics/conflict-types.txt:129
11312
msgid ""
11313
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11314
"be\n"
11315
"regular files, symlinks or directories). But it will not include a \"main "
11316
"copy\"\n"
11317
"of the file with herringbone conflict markers. It will appear that the "
11318
"\"main\n"
11319
"copy\" has been renamed to THIS or OTHER."
11320
msgstr ""
11321
11322
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11323
msgid ""
11324
"To resolve that kind of conflict, you should rebuild FILE from either "
11325
"version\n"
11326
"or a combination of both."
11327
msgstr ""
11328
11329
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11330
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11331
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11332
#: en/help_topics/conflict-types.txt:361
11333
msgid "``bzr resolve`` recognizes the following actions:"
11334
msgstr "«bzr resolve» reconoce las siguientes acciones:"
11335
11336
#: en/help_topics/conflict-types.txt:139
11337
msgid ""
11338
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11339
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11340
"* ``--action=done`` will just mark the conflict as resolved."
11341
msgstr ""
11342
11343
#: en/help_topics/conflict-types.txt:143
11344
msgid ""
11345
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11346
"and\n"
11347
"``.OTHER`` files if they are still present in the working tree."
11348
msgstr ""
11349
11350
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11351
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11352
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11353
#: en/help_topics/conflict-types.txt:369
11354
msgid ""
11355
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11356
msgstr ""
11357
"Bazaar no puede detectar automáticamente cuando se han resuelto conflictos "
11358
"de esta clase."
11359
11360
#: en/help_topics/conflict-types.txt:148
11361
msgid ""
11362
"Tag conflicts\n"
11363
"-------------"
11364
msgstr ""
11365
"Conflicto de etiquetas\n"
11366
"-----------------------------------"
11367
11368
#: en/help_topics/conflict-types.txt:153
11369
msgid ""
11370
" Conflicting tags:\n"
11371
" version-0.1"
11372
msgstr ""
11373
11374
#: en/help_topics/conflict-types.txt:156
11375
msgid ""
11376
"When pulling from or pushing to another branch, Bazaar informs you about "
11377
"tags\n"
11378
"that conflict between the two branches; that is the same tag points to two\n"
11379
"different revisions. You need not resolve these conflicts, but subsequent\n"
11380
"uses of pull or push will result in the same message."
11381
msgstr ""
11382
11383
#: en/help_topics/conflict-types.txt:161
11384
msgid ""
11385
"To resolve the conflict, you must apply the correct tags to either the "
11386
"target\n"
11387
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11388
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11389
"target branch's tags match the source branch, then in the target branch do\n"
11390
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11391
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11392
"source\n"
11393
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11394
"favor of the target branch, you need to similarly use ``tag --force`` in "
11395
"the\n"
11396
"source branch. (Note that pulling or pushing using --overwrite will "
11397
"overwrite\n"
11398
"all tags as well.)"
11399
msgstr ""
11400
11401
#: en/help_topics/conflict-types.txt:172
11402
msgid ""
11403
"Duplicate paths\n"
11404
"---------------"
11405
msgstr ""
11406
"Rutas duplicadas\n"
11407
"--------------------------"
11408
11409
#: en/help_topics/conflict-types.txt:177
11410
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11411
msgstr ""
11412
11413
#: en/help_topics/conflict-types.txt:179
11414
msgid ""
11415
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11416
"already been used. The existing file will be renamed to \"FILE.moved\". "
11417
msgstr ""
11418
11419
#: en/help_topics/conflict-types.txt:187
11420
msgid ""
11421
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11422
"FILE``,\n"
11423
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11424
"* ``--action=done`` will just mark the conflict as resolved."
11425
msgstr ""
11426
11427
#: en/help_topics/conflict-types.txt:191
11428
msgid ""
11429
"Note that you must get rid of FILE.moved before using ``--action=done``."
11430
msgstr ""
11431
11432
#: en/help_topics/conflict-types.txt:195
11433
msgid ""
11434
"Unversioned parent\n"
11435
"------------------"
11436
msgstr ""
11437
"Padre sin versión\n"
11438
"--------------------------"
11439
11440
#: en/help_topics/conflict-types.txt:200
11441
msgid ""
11442
" Conflict because FILE is not versioned, but has versioned children."
11443
msgstr ""
11444
11445
#: en/help_topics/conflict-types.txt:202
11446
msgid ""
11447
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11448
"not\n"
11449
"versioned. This happens when the directory has been deleted in the target,\n"
11450
"but has a new child in the source, or vice versa. In this situation, "
11451
"Bazaar\n"
11452
"will version the parent directory as well. Resolving this issue depends\n"
11453
"very much on the particular scenario. You may wish to rename or delete "
11454
"either\n"
11455
"the file or the directory. When you are satisfied, you can run \"bzr "
11456
"resolve\n"
11457
"FILE\" to mark the conflict as resolved."
11458
msgstr ""
11459
11460
#: en/help_topics/conflict-types.txt:210
11461
msgid ""
11462
"Missing parent\n"
11463
"--------------"
11464
msgstr ""
11465
"Falta el padre\n"
11466
"---------------------"
11467
11468
#: en/help_topics/conflict-types.txt:215
11469
msgid " Conflict adding files to FILE. Created directory."
11470
msgstr ""
11471
11472
#: en/help_topics/conflict-types.txt:217
11473
msgid ""
11474
"This happens when a directory has been deleted in the target, but has new\n"
11475
"children in the source. This is similar to the \"unversioned parent\" "
11476
"conflict,\n"
11477
"except that the parent directory does not *exist*, instead of just being\n"
11478
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11479
"Resolving this issue depends very much on the particular scenario."
11480
msgstr ""
11481
11482
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11483
msgid ""
11484
"To resolve that kind of conflict, you should either remove or rename the\n"
11485
"children or the directory or a combination of both."
11486
msgstr ""
11487
11488
#: en/help_topics/conflict-types.txt:228
11489
msgid ""
11490
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11491
" children,\n"
11492
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11493
"children\n"
11494
" and restoring the directory,\n"
11495
"* ``--action=done`` will just mark the conflict as resolved."
11496
msgstr ""
11497
11498
#: en/help_topics/conflict-types.txt:236
11499
msgid ""
11500
"Deleting parent\n"
11501
"---------------"
11502
msgstr ""
11503
"Eliminando padre\n"
11504
"---------------------------"
11505
11506
#: en/help_topics/conflict-types.txt:241
11507
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11508
msgstr ""
11509
11510
#: en/help_topics/conflict-types.txt:243
11511
msgid ""
11512
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11513
"source, but has new children in the target (either because a directory\n"
11514
"deletion is merged or because the merge introduce new children). Bazaar\n"
11515
"will retain the directory. Resolving this issue depends very much on the\n"
11516
"particular scenario."
11517
msgstr ""
11518
11519
#: en/help_topics/conflict-types.txt:254
11520
msgid ""
11521
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11522
"directory,"
11523
msgstr ""
11524
11525
#: en/help_topics/conflict-types.txt:256
11526
msgid ""
11527
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11528
" children,"
11529
msgstr ""
11530
11531
#: en/help_topics/conflict-types.txt:259
11532
msgid "* ``--action=done`` will just mark the conflict as resolved."
11533
msgstr ""
11534
11535
#: en/help_topics/conflict-types.txt:261
11536
msgid ""
11537
"Note that when merging a directory deletion, if unversioned files are\n"
11538
"present, they become potential orphans has they don't have a directory\n"
11539
"parent anymore."
11540
msgstr ""
11541
11542
#: en/help_topics/conflict-types.txt:265
11543
msgid ""
11544
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11545
"setting the ``bzr.transform.orphan_policy`` configuration option."
11546
msgstr ""
11547
11548
#: en/help_topics/conflict-types.txt:268
11549
msgid "There are two possible values for this option:"
11550
msgstr "Hay dos posibles valores para esta opción:"
11551
11552
#: en/help_topics/conflict-types.txt:270
11553
msgid ""
11554
"* ``conflict`` (the default): will leave the orphans in place and\n"
11555
" generate a conflicts,"
11556
msgstr ""
11557
11558
#: en/help_topics/conflict-types.txt:273
11559
msgid ""
11560
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11561
"root\n"
11562
" of the working tree with names like ``<file>.~#~``."
11563
msgstr ""
11564
11565
#: en/help_topics/conflict-types.txt:278
11566
msgid ""
11567
"Path conflict\n"
11568
"-------------"
11569
msgstr ""
11570
"Conflicto de ruta\n"
11571
"--------------------------"
11572
11573
#: en/help_topics/conflict-types.txt:283
11574
msgid " Path conflict: PATH1 / PATH2"
11575
msgstr ""
11576
11577
#: en/help_topics/conflict-types.txt:285
11578
msgid ""
11579
"This happens when the source and target have each modified the name or "
11580
"parent\n"
11581
"directory of a file. Bazaar will use the path elements from the source."
11582
msgstr ""
11583
11584
#: en/help_topics/conflict-types.txt:288
11585
msgid ""
11586
"To resolve that kind of conflict, you just have to decide what name should "
11587
"be\n"
11588
"retained for the file involved."
11589
msgstr ""
11590
11591
#: en/help_topics/conflict-types.txt:293
11592
msgid ""
11593
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11594
" issuing ``bzr mv PATH2 PATH1``,\n"
11595
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11596
"``PATH2``,\n"
11597
"* ``--action=done`` will just mark the conflict as resolved."
11598
msgstr ""
11599
11600
#: en/help_topics/conflict-types.txt:300
11601
msgid ""
11602
"Parent loop\n"
11603
"-----------"
11604
msgstr ""
11605
11606
#: en/help_topics/conflict-types.txt:305
11607
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11608
msgstr ""
11609
11610
#: en/help_topics/conflict-types.txt:307
11611
msgid ""
11612
"This happens when the source and the target have each moved directories, so\n"
11613
"that, if the change could be applied, a directory would be contained by "
11614
"itself.\n"
11615
"For example::"
11616
msgstr ""
11617
11618
#: en/help_topics/conflict-types.txt:311
11619
msgid ""
11620
" $ bzr init\n"
11621
" $ bzr mkdir white\n"
11622
" $ bzr mkdir black\n"
11623
" $ bzr commit -m \"BASE\"\n"
11624
" $ bzr branch . ../other\n"
11625
" $ bzr mv white black\n"
11626
" $ bzr commit -m \"THIS\"\n"
11627
" $ bzr mv ../other/black ../other/white\n"
11628
" $ bzr commit ../other -m \"OTHER\"\n"
11629
" $ bzr merge ../other"
11630
msgstr ""
11631
" $ bzr init\n"
11632
" $ bzr mkdir white\n"
11633
" $ bzr mkdir black\n"
11634
" $ bzr commit -m \"BASE\"\n"
11635
" $ bzr branch . ../other\n"
11636
" $ bzr mv white black\n"
11637
" $ bzr commit -m \"THIS\"\n"
11638
" $ bzr mv ../other/black ../other/white\n"
11639
" $ bzr commit ../other -m \"OTHER\"\n"
11640
" $ bzr merge ../other"
11641
11642
#: en/help_topics/conflict-types.txt:322
11643
msgid ""
11644
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11645
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11646
"name should be retained for the directories involved."
11647
msgstr ""
11648
11649
#: en/help_topics/conflict-types.txt:328
11650
msgid ""
11651
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11652
"\n"
11653
" in ``black``,\n"
11654
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11655
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11656
"* ``--action=done`` will just mark the conflict as resolved."
11657
msgstr ""
11658
11659
#: en/help_topics/conflict-types.txt:336
11660
msgid ""
11661
"Non-directory parent\n"
11662
"--------------------"
11663
msgstr ""
11664
11665
#: en/help_topics/conflict-types.txt:341
11666
msgid ""
11667
" Conflict: foo.new is not a directory, but has files in it.\n"
11668
" Created directory."
11669
msgstr ""
11670
11671
#: en/help_topics/conflict-types.txt:344
11672
msgid ""
11673
"This happens when one side has added files to a directory, and the other "
11674
"side\n"
11675
"has changed the directory into a file or symlink. For example::"
11676
msgstr ""
11677
11678
#: en/help_topics/conflict-types.txt:347
11679
msgid ""
11680
" $ bzr init\n"
11681
" $ bzr mkdir foo\n"
11682
" $ bzr commit -m \"BASE\"\n"
11683
" $ bzr branch . ../other\n"
11684
" $ rmdir foo\n"
11685
" $ touch foo\n"
11686
" $ bzr commit -m \"THIS\"\n"
11687
" $ bzr mkdir ../other/foo/bar\n"
11688
" $ bzr commit ../other -m \"OTHER\"\n"
11689
" $ bzr merge ../other"
11690
msgstr ""
11691
" $ bzr init\n"
11692
" $ bzr mkdir foo\n"
11693
" $ bzr commit -m \"BASE\"\n"
11694
" $ bzr branch . ../other\n"
11695
" $ rmdir foo\n"
11696
" $ touch foo\n"
11697
" $ bzr commit -m \"THIS\"\n"
11698
" $ bzr mkdir ../other/foo/bar\n"
11699
" $ bzr commit ../other -m \"OTHER\"\n"
11700
" $ bzr merge ../other"
11701
11702
#: en/help_topics/conflict-types.txt:358
11703
msgid ""
11704
"To resolve that kind of conflict, you have to decide what name should be\n"
11705
"retained for the file, directory or symlink involved."
11706
msgstr ""
11707
11708
#: en/help_topics/conflict-types.txt:363
11709
msgid ""
11710
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11711
" ``bzr add foo``,\n"
11712
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11713
" ``bzr mv foo.new foo``,\n"
11714
"* ``--action=done`` will just mark the conflict as resolved."
11715
msgstr ""
11716
11717
#: en/help_topics/conflict-types.txt:371
11718
msgid ""
11719
"MalformedTransform\n"
11720
"------------------"
11721
msgstr ""
11722
11723
#: en/help_topics/conflict-types.txt:374
11724
msgid ""
11725
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11726
"exception. This means that Bazaar encountered a filesystem conflict that it "
11727
"was\n"
11728
"unable to resolve. This usually indicates a bug. Please let us know if "
11729
"you\n"
11730
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11731
msgstr ""
11732
11733
#: en/help_topics/content-filters.txt:1
11734
msgid ""
11735
"Content Filters\n"
11736
"==============="
11737
msgstr ""
11738
11739
#: en/help_topics/content-filters.txt:4
11740
msgid ""
11741
"Content formats\n"
11742
"---------------"
11743
msgstr ""
11744
11745
#: en/help_topics/content-filters.txt:7
11746
msgid ""
11747
"Bazaar's content filtering allows you to store files in a different\n"
11748
"format from the copy in your working tree. This lets you, or your\n"
11749
"co-developers, use Windows development tools that expect CRLF files\n"
11750
"on projects that use other line-ending conventions. Among other things,\n"
11751
"content filters also let Unix developers more easily work on projects\n"
11752
"using Windows line-ending conventions, keyword expansion/compression,\n"
11753
"and trailing spaces on lines in text files to be implicitly stripped\n"
11754
"when committed."
11755
msgstr ""
11756
11757
#: en/help_topics/content-filters.txt:16
11758
msgid "To generalize, there are two content formats supported by Bazaar:"
11759
msgstr "Generalizando, hay dos formatos de contenido permitidos por Bazaar:"
11760
11761
#: en/help_topics/content-filters.txt:18
11762
msgid ""
11763
"* a canonical format - how files are stored internally\n"
11764
"* a convenience format - how files are created in a working tree."
11765
msgstr ""
11766
11767
#: en/help_topics/content-filters.txt:21
11768
msgid ""
11769
"\n"
11770
"Format conversion\n"
11771
"-----------------"
11772
msgstr ""
11773
"\n"
11774
"Conversión de formato\n"
11775
"------------------------------------"
11776
11777
#: en/help_topics/content-filters.txt:25
11778
msgid ""
11779
"The conversion between these formats is done by content filters.\n"
11780
"A content filter has two parts:"
11781
msgstr ""
11782
11783
#: en/help_topics/content-filters.txt:28
11784
msgid ""
11785
"* a read converter - converts from convenience to canonical format\n"
11786
"* a write converter - converts from canonical to convenience format."
11787
msgstr ""
11788
11789
#: en/help_topics/content-filters.txt:31
11790
msgid ""
11791
"Many of these converters will provide *round-trip* conversion,\n"
11792
"i.e. applying the read converter followed by the write converter\n"
11793
"gives back the original content. However, others may provide an\n"
11794
"asymmetric conversion. For example, a read converter might strip\n"
11795
"trailing whitespace off lines in source code while the matching\n"
11796
"write converter might pass content through unchanged."
11797
msgstr ""
11798
11799
#: en/help_topics/content-filters.txt:38
11800
msgid ""
11801
"\n"
11802
"Enabling content filters\n"
11803
"------------------------"
11804
msgstr ""
11805
"\n"
11806
"Activar filtros de contenido\n"
11807
"--------------------------------------------"
11808
11809
#: en/help_topics/content-filters.txt:42
11810
msgid ""
11811
"Content filters are typically provided by plugins, so the first step\n"
11812
"in using them is to install the relevant plugins and read their\n"
11813
"documentation. Some plugins may be very specific about which files\n"
11814
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11815
"In other cases, the plugin may leave it in the user's hands to\n"
11816
"define which files are to be filtered. This is typically done\n"
11817
"using rule-based preferences. See ``bzr help rules`` for general\n"
11818
"information about defining these."
11819
msgstr ""
11820
11821
#: en/help_topics/content-filters.txt:51
11822
msgid ""
11823
"\n"
11824
"Impact on commands\n"
11825
"------------------"
11826
msgstr ""
11827
"\n"
11828
"Impacto en las órdenes\n"
11829
"------------------------------------"
11830
11831
#: en/help_topics/content-filters.txt:55
11832
msgid ""
11833
"Read converters are only applied to commands that read content from\n"
11834
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11835
"will apply read converters to files in the working tree, then compare\n"
11836
"the results to the content last committed."
11837
msgstr ""
11838
11839
#: en/help_topics/content-filters.txt:60
11840
msgid ""
11841
"Write converters are only applied by commands that **create files in a\n"
11842
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11843
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11844
"respectively."
11845
msgstr ""
11846
11847
#: en/help_topics/content-filters.txt:65
11848
msgid ""
11849
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11850
"comitting files. If this makes sense for a given plugin providing\n"
11851
"a content filter, the plugin can usually achieve this effect by using a\n"
11852
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11853
"for more information on hooks."
11854
msgstr ""
11855
11856
#: en/help_topics/content-filters.txt:71
11857
msgid ""
11858
"\n"
11859
"Refreshing your working tree\n"
11860
"----------------------------"
11861
msgstr ""
11862
"\n"
11863
"Actualizar su árbol de trabajo\n"
11864
"----------------------------------------------"
11865
11866
#: en/help_topics/content-filters.txt:75
11867
msgid ""
11868
"For performance reasons, Bazaar caches the timestamps of files in\n"
11869
"a working tree, and assumes files are unchanged if their timestamps\n"
11870
"match the cached values. As a consequence, there are times when\n"
11871
"you may need to explicitly ask for content filtering to be reapplied\n"
11872
"in one or both directions, e.g. after installing or reconfiguring\n"
11873
"plugins providing it."
11874
msgstr ""
11875
11876
#: en/help_topics/content-filters.txt:82
11877
msgid "Here are some general guidelines for doing this:"
11878
msgstr "Aquí hay algunas directrices para hacer esto:"
11879
11880
#: en/help_topics/content-filters.txt:84
11881
msgid ""
11882
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11883
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11884
" relevant read converters and compare the end result with the\n"
11885
" canonical format."
11886
msgstr ""
11887
11888
#: en/help_topics/content-filters.txt:89
11889
msgid ""
11890
" * To reapply write converters, ensure there are no local changes,\n"
11891
" delete the relevant files and run ``bzr revert`` on those files."
11892
msgstr ""
11893
11894
#: en/help_topics/content-filters.txt:92
11895
msgid ""
11896
"Note: In the future, it is likely that additional options will be added\n"
11897
"to commands to make this refreshing process faster and safer.\n"
11898
msgstr ""
11899
11900
#: en/help_topics/current-formats.txt:1
11901
msgid "Current Storage Formats"
11902
msgstr "Formatos de almacenamiento actual"
11903
11904
#: en/help_topics/current-formats.txt:3
11905
msgid ""
11906
":2a:\n"
11907
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11908
" compress storage. Provides rich roots which are a one-way\n"
11909
" transition."
11910
msgstr ""
11911
11912
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11913
msgid ""
11914
"\n"
11915
"See :doc:`formats-help` for more about storage formats."
11916
msgstr ""
11917
11918
#: en/help_topics/debug-flags.txt:1
11919
msgid ""
11920
"Debug Flags\n"
11921
"==========="
11922
msgstr ""
11923
"Marcas de depuración\n"
11924
"================="
11925
11926
#: en/help_topics/debug-flags.txt:4
11927
msgid ""
11928
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11929
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11930
msgstr ""
11931
11932
#: en/help_topics/debug-flags.txt:7
11933
msgid ""
11934
"-Dauth Trace authentication sections used.\n"
11935
"-Dbytes Print out how many bytes were transferred\n"
11936
"-Ddirstate Trace dirstate activity (verbose!)\n"
11937
"-Derror Instead of normal error handling, always print a "
11938
"traceback\n"
11939
" on error.\n"
11940
"-Devil Capture call sites that do expensive or badly-scaling\n"
11941
" operations.\n"
11942
"-Dfetch Trace history copying between repositories.\n"
11943
"-Dfilters Emit information for debugging content filtering.\n"
11944
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11945
"fetch.\n"
11946
"-Dgraph Trace graph traversal.\n"
11947
"-Dhashcache Log every time a working file is read to determine its "
11948
"hash.\n"
11949
"-Dhooks Trace hook execution.\n"
11950
"-Dhpss Trace smart protocol requests and responses.\n"
11951
"-Dhpssdetail More hpss details.\n"
11952
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11953
"-Dhttp Trace http connections, requests and responses.\n"
11954
"-Dindex Trace major index operations.\n"
11955
"-Dknit Trace knit operations.\n"
11956
"-Dlock Trace when lockdir locks are taken or released.\n"
11957
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11958
" retrying the request.\n"
11959
"-Dprogress Trace progress bar operations.\n"
11960
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11961
"-Dmerge Emit information for debugging merges.\n"
11962
"-Dno_apport Don't use apport to report crashes.\n"
11963
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11964
"-Dpack Emit information about pack operations.\n"
11965
"-Drelock Emit a message every time a branch or repository object "
11966
"is\n"
11967
" unlocked then relocked the same way.\n"
11968
"-Dsftp Trace SFTP internals.\n"
11969
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11970
"expected\n"
11971
"-Dstream Trace fetch streams.\n"
11972
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11973
"portable\n"
11974
" manner.\n"
11975
"-Dunlock Some errors during unlock are treated as warnings.\n"
11976
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11977
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11978
"appropriate\n"
11979
" for the format, even for non-local fetches.\n"
11980
msgstr ""
11981
11982
#: en/help_topics/diverged-branches.txt:1
11983
msgid ""
11984
"Diverged Branches\n"
11985
"================="
11986
msgstr ""
11987
"Ramas con divergencia\n"
11988
"=================="
11989
11990
#: en/help_topics/diverged-branches.txt:4
11991
msgid ""
11992
"When Bazaar tries to push one branch onto another, it requires that the\n"
11993
"destination branch must be ready to receive the source branch. If this "
11994
"isn't\n"
11995
"the case, then we say that the branches have ``diverged``. Branches are\n"
11996
"considered diverged if the destination branch's most recent commit is one "
11997
"that\n"
11998
"has not been merged (directly or indirectly) by the source branch. To "
11999
"recover\n"
12000
"from diverged branches, one must merge the missing revisions into the "
12001
"source\n"
12002
"branch."
12003
msgstr ""
12004
12005
#: en/help_topics/diverged-branches.txt:12
12006
msgid ""
12007
"This situation commonly arises when using a centralized workflow with local\n"
12008
"commits. If someone else has committed new work to the mainline since your\n"
12009
"last pull and you have local commits that have not yet been pushed to the\n"
12010
"mainline, then your local branch and the mainline have diverged."
12011
msgstr ""
12012
12013
#: en/help_topics/diverged-branches.txt:17
12014
msgid ""
12015
"Discovering What Has Diverged\n"
12016
"-----------------------------"
12017
msgstr ""
12018
12019
#: en/help_topics/diverged-branches.txt:20
12020
msgid ""
12021
"The ``bzr missing`` command is used to find out what revisions are in "
12022
"another\n"
12023
"branch that are not present in the current branch, and vice-versa. It shows "
12024
"a\n"
12025
"summary of which extra revisions exist in each branch. If you want to see "
12026
"the\n"
12027
"precise effects of those revisions, you can use ``bzr diff --"
12028
"old=other_branch``\n"
12029
"to show the differences between other_branch and your current branch."
12030
msgstr ""
12031
12032
#: en/help_topics/diverged-branches.txt:26
12033
msgid ""
12034
"A Solution\n"
12035
"----------"
12036
msgstr ""
12037
"Una solución\n"
12038
"------------"
12039
12040
#: en/help_topics/diverged-branches.txt:29
12041
msgid ""
12042
"The solution is to merge the revisions from the mainline into your local\n"
12043
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
12044
"mainline. This merge may result in conflicts if the other developer's "
12045
"changes\n"
12046
"overlap with your changes. These conflicts should be resolved before\n"
12047
"continuing. After any conflicts have been resolved, or even if there were "
12048
"no\n"
12049
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
12050
"to your local branch. This requirement gives you an opportunity to test "
12051
"the\n"
12052
"resulting working tree for correctness, since the merged revisions could "
12053
"have\n"
12054
"made arbitrary changes. After testing, you should commit the merge using\n"
12055
"``bzr commit``. This clears up the diverged branches situation. Your "
12056
"local\n"
12057
"branch can now be pushed to the mainline.\n"
12058
msgstr ""
12059
12060
#: en/help_topics/eol.txt:1
12061
msgid ""
12062
"End of Line Conversion\n"
12063
"======================"
12064
msgstr ""
12065
"Conversión de fin de línea\n"
12066
"====================="
12067
12068
#: en/help_topics/eol.txt:4
12069
msgid ""
12070
"EOL conversion is provided as a content filter where Bazaar internally\n"
12071
"stores a canonical format but outputs a convenience format. See\n"
12072
"``bzr help content-filters`` for general information about using these."
12073
msgstr ""
12074
12075
#: en/help_topics/eol.txt:8
12076
msgid ""
12077
"Note: Content filtering is only supported in recently added formats,\n"
12078
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12079
"in a recent format. (Just setting the format on the repository\n"
12080
"is not enough.) If content filtering does not appear to be working, use\n"
12081
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
12082
"or later."
12083
msgstr ""
12084
12085
#: en/help_topics/eol.txt:15
12086
msgid ""
12087
"EOL conversion needs to be enabled for selected file patterns using\n"
12088
"rules. See ``bzr help rules`` for general information on defining rules.\n"
12089
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
12090
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
12091
"supported in a future verison of Bazaar."
12092
msgstr ""
12093
12094
#: en/help_topics/eol.txt:21
12095
msgid ""
12096
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12097
"(If a value is not set, ``exact`` is the default.)"
12098
msgstr ""
12099
12100
#: en/help_topics/eol.txt:24
12101
msgid ""
12102
" ========== ===================================== ======================\n"
12103
" Value Checkout end-of-lines as Commit end-of-lines as\n"
12104
" ========== ===================================== ======================\n"
12105
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12106
" ---------- ------------------------------------- ----------------------\n"
12107
" ``lf`` ``lf`` ``lf``\n"
12108
" ---------- ------------------------------------- ----------------------\n"
12109
" ``crlf`` ``crlf`` ``lf``\n"
12110
" ---------- ------------------------------------- ----------------------\n"
12111
" ``exact`` No conversion Exactly as in file\n"
12112
" ========== ===================================== ======================"
12113
msgstr ""
12114
12115
#: en/help_topics/eol.txt:36
12116
msgid ""
12117
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12118
"byte is detected in the file."
12119
msgstr ""
12120
12121
#: en/help_topics/eol.txt:39
12122
msgid ""
12123
"For users working on a cross-platform project, here is a suggested rule\n"
12124
"to use as a starting point::"
12125
msgstr ""
12126
12127
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12128
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12129
msgid ""
12130
" [name *]\n"
12131
" eol = native"
12132
msgstr ""
12133
12134
#: en/help_topics/eol.txt:45
12135
msgid ""
12136
"If you have binary files that do not contain a null byte though, be\n"
12137
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12138
"by giving more explicit patterns earlier in the rules file. For example::"
12139
msgstr ""
12140
12141
#: en/help_topics/eol.txt:49
12142
msgid ""
12143
" [name *.png]\n"
12144
" eol = exact"
12145
msgstr ""
12146
12147
#: en/help_topics/eol.txt:55
12148
msgid ""
12149
"If your working tree is on a network drive shared by users on different\n"
12150
"operating systems, you typically want to force certain conventions for\n"
12151
"certain files. In that way, if a file is created with the wrong line\n"
12152
"endings or line endings get mixed during editing, it gets committed\n"
12153
"correctly and gets checked out correctly. For example::"
12154
msgstr ""
12155
12156
#: en/help_topics/eol.txt:61
12157
msgid ""
12158
" [name *.bat]\n"
12159
" eol = crlf"
12160
msgstr ""
12161
12162
#: en/help_topics/eol.txt:64
12163
msgid ""
12164
" [name *.sh]\n"
12165
" eol = lf"
12166
msgstr ""
12167
12168
#: en/help_topics/eol.txt:70
12169
msgid ""
12170
"If you take the care to create files with their required endings, you can\n"
12171
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12172
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12173
"introducing mixed line endings will be corrected during commit for files\n"
12174
"with those settings."
12175
msgstr ""
12176
12177
#: en/help_topics/eol.txt:76
12178
msgid ""
12179
"If you have sample test data that deliberately has text files with mixed\n"
12180
"newline conventions, you can ask for those to be left alone like this::"
12181
msgstr ""
12182
12183
#: en/help_topics/eol.txt:79
12184
msgid ""
12185
" [name test_data/]\n"
12186
" eol = exact"
12187
msgstr ""
12188
12189
#: en/help_topics/eol.txt:85
12190
msgid ""
12191
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12192
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12193
"of content analysis to detect binary files for commands like ``diff``.\n"
12194
"In the future, a ``binary = true`` rule may be added but it is not\n"
12195
"supported yet.)"
12196
msgstr ""
12197
12198
#: en/help_topics/eol.txt:91
12199
msgid ""
12200
"If you have an existing repository with text files already stored using\n"
12201
"Windows newline conventions (``crlf``), then you may want to keep using "
12202
"that\n"
12203
"convention in the repository. Forcing certain files to this convention\n"
12204
"may also help users who do not have rules configured. To do this, set\n"
12205
"``eol`` to one of the values below."
12206
msgstr ""
12207
12208
#: en/help_topics/eol.txt:97
12209
msgid ""
12210
" ============================ ======================== "
12211
"======================\n"
12212
" Value Checkout end-of-lines as Commit end-of-lines "
12213
"as\n"
12214
" ============================ ======================== "
12215
"======================\n"
12216
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12217
" ``lf`` otherwise\n"
12218
" ---------------------------- ------------------------ ----------------------"
12219
"\n"
12220
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12221
" ---------------------------- ------------------------ ----------------------"
12222
"\n"
12223
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12224
" ============================ ======================== ======================"
12225
msgstr ""
12226
12227
#: en/help_topics/eol.txt:108
12228
msgid ""
12229
"For users working on an existing project that uses Windows newline\n"
12230
"conventions in their Bazaar repository, this rule is suggested as a\n"
12231
"starting point::"
12232
msgstr ""
12233
12234
#: en/help_topics/eol.txt:112
12235
msgid ""
12236
" [name *]\n"
12237
" eol = native-with-crlf-in-repo"
12238
msgstr ""
12239
12240
#: en/help_topics/eol.txt:115
12241
msgid ""
12242
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12243
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12244
"``crlf`` and ``exact``."
12245
msgstr ""
12246
12247
#: en/help_topics/eol.txt:119
12248
msgid ""
12249
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12250
"never reject files because a given line ending or mixed line endings\n"
12251
"are found. A precommit hook should be used if you wish to validate\n"
12252
"(and not just convert) content before committing.\n"
12253
msgstr ""
12254
12255
#: en/help_topics/hidden-commands.txt:1
12256
msgid ""
12257
"added List files added in working tree.\n"
12258
"ancestry List all revisions merged into this branch.\n"
12259
"assert-fail Test reporting of assertion failures\n"
12260
"bundle-info Output interesting stats about a bundle\n"
12261
"bundle-revisions Create a merge-directive for submitting changes.\n"
12262
"cat-revision Write out metadata for a revision.\n"
12263
"dump-btree Dump the contents of a btree index file to stdout.\n"
12264
"export-pot Export command helps and error messages in po format.\n"
12265
"file-id Print file_id of a particular file or directory.\n"
12266
"file-path Print path of file_ids to a file or directory.\n"
12267
"find-merge-base Find and print a base revision for merging two "
12268
"branches.\n"
12269
"hooks Show hooks.\n"
12270
"inventory Show inventory of the current working copy or a "
12271
"revision.\n"
12272
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12273
"lookup-revision Lookup the revision-id from a revision-number\n"
12274
"merge-directive Generate a merge directive for auto-merge tools.\n"
12275
"modified List files modified in working tree.\n"
12276
"re-sign Create a digital signature for an existing revision.\n"
12277
"reference list, view and set branch locations for nested trees.\n"
12278
"relpath Show path of a file relative to root\n"
12279
"repair-workingtree Reset the working tree state file.\n"
12280
"revision-history Display the list of revision ids on a branch.\n"
12281
"revision-info Show revision number and revision id for a given "
12282
"revision\n"
12283
" identifier.\n"
12284
"rocks Statement of optimism.\n"
12285
"selftest Run internal test suite.\n"
12286
"shell-complete Show appropriate completions for context.\n"
12287
"test-script Run a shell-like test from a file.\n"
12288
"touching-revisions Return revision-ids which affected a particular file.\n"
12289
"unknowns List unknown files.\n"
12290
"wait-until-signalled Test helper for\n"
12291
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:1
12295
msgid ""
12296
"\n"
12297
"Hooks\n"
12298
"====="
12299
msgstr ""
12300
"\n"
12301
"Ganchos\n"
12302
"======="
12303
12304
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12305
msgid ""
12306
"Introduction\n"
12307
"------------"
12308
msgstr ""
12309
"Introducción\n"
12310
"------------"
12311
12312
#: en/help_topics/hooks.txt:8
12313
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:10
12317
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12318
msgstr ""
12319
12320
#: en/help_topics/hooks.txt:12
12321
msgid ""
12322
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12323
msgstr ""
12324
12325
#: en/help_topics/hooks.txt:14
12326
msgid ""
12327
"The class that contains each hook is given before the hooks it supplies. "
12328
"For\n"
12329
"instance, BranchHooks as the class is the hooks class for\n"
12330
"`bzrlib.branch.Branch.hooks`."
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:18
12334
msgid ""
12335
"Each description also indicates whether the hook runs on the client (the\n"
12336
"machine where bzr was invoked) or the server (the machine addressed by\n"
12337
"the branch URL). These may be, but are not necessarily, the same machine."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:22
12341
msgid ""
12342
"Plugins (including hooks) are run on the server if all of these is true:"
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:24
12346
msgid ""
12347
" * The connection is via a smart server (accessed with a URL starting with\n"
12348
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12349
"\"http://\"\n"
12350
" URL when a smart server is available via HTTP)."
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:28
12354
msgid ""
12355
" * The hook is either server specific or part of general infrastructure "
12356
"rather\n"
12357
" than client specific code (such as commit)."
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:31
12361
msgid ""
12362
"\n"
12363
"BranchHooks\n"
12364
"-----------"
12365
msgstr ""
12366
"\n"
12367
"BranchHooks\n"
12368
"-----------"
12369
12370
#: en/help_topics/hooks.txt:35
12371
msgid ""
12372
"automatic_tag_name\n"
12373
"~~~~~~~~~~~~~~~~~~"
12374
msgstr ""
12375
"automatic_tag_name\n"
12376
"~~~~~~~~~~~~~~~~~~"
12377
12378
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12379
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12380
msgid "Introduced in: 2.2"
12381
msgstr "Introducido en: 2.2"
12382
12383
#: en/help_topics/hooks.txt:40
12384
msgid ""
12385
"Called to determine an automatic tag name for a revision.\n"
12386
"automatic_tag_name is called with (branch, revision_id) and should\n"
12387
"return a tag name or None if no tag name could be determined. The\n"
12388
"first non-None tag name returned will be used."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:45
12392
msgid ""
12393
"open\n"
12394
"~~~~"
12395
msgstr ""
12396
"open\n"
12397
"~~~~"
12398
12399
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12400
#: en/help_topics/hooks.txt:304
12401
msgid "Introduced in: 1.8"
12402
msgstr "Introducido en: 1.8"
12403
12404
#: en/help_topics/hooks.txt:50
12405
msgid ""
12406
"Called with the Branch object that has been opened after a branch is\n"
12407
"opened."
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:53
12411
msgid ""
12412
"post_branch_init\n"
12413
"~~~~~~~~~~~~~~~~"
12414
msgstr ""
12415
"post_branch_init\n"
12416
"~~~~~~~~~~~~~~~~"
12417
12418
#: en/help_topics/hooks.txt:58
12419
msgid ""
12420
"Called after new branch initialization completes. post_branch_init is\n"
12421
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12422
"branch and checkout (both heavyweight and lightweight) will all\n"
12423
"trigger this hook."
12424
msgstr ""
12425
12426
#: en/help_topics/hooks.txt:63
12427
msgid ""
12428
"post_change_branch_tip\n"
12429
"~~~~~~~~~~~~~~~~~~~~~~"
12430
msgstr ""
12431
"post_change_branch_tip\n"
12432
"~~~~~~~~~~~~~~~~~~~~~~"
12433
12434
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12435
msgid "Introduced in: 1.4"
12436
msgstr "Introducido en: 1.4"
12437
12438
#: en/help_topics/hooks.txt:68
12439
msgid ""
12440
"Called in bzr client and server after a change to the tip of a branch\n"
12441
"is made. post_change_branch_tip is called with a\n"
12442
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12443
"uncommit will all trigger this hook."
12444
msgstr ""
12445
12446
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12447
msgid ""
12448
"post_commit\n"
12449
"~~~~~~~~~~~"
12450
msgstr ""
12451
"post_commit\n"
12452
"~~~~~~~~~~~"
12453
12454
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12455
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12456
#: en/help_topics/hooks.txt:145
12457
msgid "Introduced in: 0.15"
12458
msgstr "Introducido en: 0.15"
12459
12460
#: en/help_topics/hooks.txt:78
12461
msgid ""
12462
"Called in the bzr client after a commit has completed. post_commit is\n"
12463
"called with (local, master, old_revno, old_revid, new_revno,\n"
12464
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12465
"branch."
12466
msgstr ""
12467
12468
#: en/help_topics/hooks.txt:83
12469
msgid ""
12470
"post_pull\n"
12471
"~~~~~~~~~"
12472
msgstr ""
12473
"post_pull\n"
12474
"~~~~~~~~~"
12475
12476
#: en/help_topics/hooks.txt:88
12477
msgid ""
12478
"Called after a pull operation completes. post_pull is called with a\n"
12479
"bzrlib.branch.PullResult object and only runs in the bzr client."
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:91
12483
msgid ""
12484
"post_push\n"
12485
"~~~~~~~~~"
12486
msgstr ""
12487
"post_push\n"
12488
"~~~~~~~~~"
12489
12490
#: en/help_topics/hooks.txt:96
12491
msgid ""
12492
"Called after a push operation completes. post_push is called with a\n"
12493
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:99
12497
msgid ""
12498
"post_switch\n"
12499
"~~~~~~~~~~~"
12500
msgstr ""
12501
"post_switch\n"
12502
"~~~~~~~~~~~"
12503
12504
#: en/help_topics/hooks.txt:104
12505
msgid ""
12506
"Called after a checkout switches branch. post_switch is called with a\n"
12507
"bzrlib.branch.SwitchHookParams."
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:107
12511
msgid ""
12512
"post_uncommit\n"
12513
"~~~~~~~~~~~~~"
12514
msgstr ""
12515
"post_uncommit\n"
12516
"~~~~~~~~~~~~~"
12517
12518
#: en/help_topics/hooks.txt:112
12519
msgid ""
12520
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12521
"called with (local, master, old_revno, old_revid, new_revno,\n"
12522
"new_revid) where local is the local branch or None, master is the\n"
12523
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12524
"of None."
12525
msgstr ""
12526
12527
#: en/help_topics/hooks.txt:118
12528
msgid ""
12529
"pre_change_branch_tip\n"
12530
"~~~~~~~~~~~~~~~~~~~~~"
12531
msgstr ""
12532
"pre_change_branch_tip\n"
12533
"~~~~~~~~~~~~~~~~~~~~~"
12534
12535
#: en/help_topics/hooks.txt:121
12536
msgid "Introduced in: 1.6"
12537
msgstr "Introducido en: 1.6"
12538
12539
#: en/help_topics/hooks.txt:123
12540
msgid ""
12541
"Called in bzr client and server before a change to the tip of a branch\n"
12542
"is made. pre_change_branch_tip is called with a\n"
12543
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12544
"uncommit will all trigger this hook."
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:128
12548
msgid ""
12549
"pre_commit\n"
12550
"~~~~~~~~~~"
12551
msgstr ""
12552
"pre_commit\n"
12553
"~~~~~~~~~~"
12554
12555
#: en/help_topics/hooks.txt:131
12556
msgid "Introduced in: 0.91"
12557
msgstr "Introducido en: 0.91"
12558
12559
#: en/help_topics/hooks.txt:133
12560
msgid ""
12561
"Called after a commit is calculated but before it is completed.\n"
12562
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12563
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12564
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12565
"TreeDelta object describing changes from the basis revision. hooks\n"
12566
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12567
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12568
"tree."
12569
msgstr ""
12570
12571
#: en/help_topics/hooks.txt:142
12572
msgid ""
12573
"set_rh\n"
12574
"~~~~~~"
12575
msgstr ""
12576
"set_rh\n"
12577
"~~~~~~"
12578
12579
#: en/help_topics/hooks.txt:147
12580
msgid ""
12581
"Invoked whenever the revision history has been set via\n"
12582
"set_revision_history. The api signature is (branch, revision_history),\n"
12583
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12584
"for bzr to trigger, a better hook to use is\n"
12585
"Branch.post_change_branch_tip."
12586
msgstr ""
12587
12588
#: en/help_topics/hooks.txt:153
12589
msgid ""
12590
"transform_fallback_location\n"
12591
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12592
msgstr ""
12593
"transform_fallback_location\n"
12594
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12595
12596
#: en/help_topics/hooks.txt:156
12597
msgid "Introduced in: 1.9"
12598
msgstr "Introducido en: 1.9"
12599
12600
#: en/help_topics/hooks.txt:158
12601
msgid ""
12602
"Called when a stacked branch is activating its fallback locations.\n"
12603
"transform_fallback_location is called with (branch, url), and should\n"
12604
"return a new url. Returning the same url allows it to be used as-is,\n"
12605
"returning a different one can be used to cause the branch to stack on\n"
12606
"a closer copy of that fallback_location. Note that the branch cannot\n"
12607
"have history accessing methods called on it during this hook because\n"
12608
"the fallback locations have not been activated. When there are\n"
12609
"multiple hooks installed for transform_fallback_location, all are\n"
12610
"called with the url returned from the previous hook.The order is\n"
12611
"however undefined."
12612
msgstr ""
12613
12614
#: en/help_topics/hooks.txt:169
12615
msgid ""
12616
"CommandHooks\n"
12617
"------------"
12618
msgstr ""
12619
"CommandHooks\n"
12620
"------------"
12621
12622
#: en/help_topics/hooks.txt:172
12623
msgid ""
12624
"extend_command\n"
12625
"~~~~~~~~~~~~~~"
12626
msgstr ""
12627
"extend_command\n"
12628
"~~~~~~~~~~~~~~"
12629
12630
#: en/help_topics/hooks.txt:175
12631
msgid "Introduced in: 1.13"
12632
msgstr "Introducido en: 1.13"
12633
12634
#: en/help_topics/hooks.txt:177
12635
msgid ""
12636
"Called after creating a command object to allow modifications such as\n"
12637
"adding or removing options, docs etc. Called with the new\n"
12638
"bzrlib.commands.Command object."
12639
msgstr ""
12640
12641
#: en/help_topics/hooks.txt:181
12642
msgid ""
12643
"get_command\n"
12644
"~~~~~~~~~~~"
12645
msgstr ""
12646
"get_command\n"
12647
"~~~~~~~~~~~"
12648
12649
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12650
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12651
msgid "Introduced in: 1.17"
12652
msgstr "Introducido en: 1.17"
12653
12654
#: en/help_topics/hooks.txt:186
12655
msgid ""
12656
"Called when creating a single command. Called with (cmd_or_None,\n"
12657
"command_name). get_command should either return the cmd_or_None\n"
12658
"parameter, or a replacement Command object that should be used for the\n"
12659
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12660
"Many users will prefer to use bzrlib.commands.register_command or\n"
12661
"plugin_cmds.register_lazy."
12662
msgstr ""
12663
12664
#: en/help_topics/hooks.txt:193
12665
msgid ""
12666
"get_missing_command\n"
12667
"~~~~~~~~~~~~~~~~~~~"
12668
msgstr ""
12669
"get_missing_command\n"
12670
"~~~~~~~~~~~~~~~~~~~"
12671
12672
#: en/help_topics/hooks.txt:198
12673
msgid ""
12674
"Called when creating a single command if no command could be found.\n"
12675
"Called with (command_name). get_missing_command should either return\n"
12676
"None, or a Command object to be used for the command."
12677
msgstr ""
12678
12679
#: en/help_topics/hooks.txt:202
12680
msgid ""
12681
"list_commands\n"
12682
"~~~~~~~~~~~~~"
12683
msgstr ""
12684
"list_commands\n"
12685
"~~~~~~~~~~~~~"
12686
12687
#: en/help_topics/hooks.txt:207
12688
msgid ""
12689
"Called when enumerating commands. Called with a set of cmd_name\n"
12690
"strings for all the commands found so far. This set is safe to mutate\n"
12691
"- e.g. to remove a command. list_commands should return the updated\n"
12692
"set of command names."
12693
msgstr ""
12694
12695
#: en/help_topics/hooks.txt:212
12696
msgid ""
12697
"_ConfigHooks\n"
12698
"------------"
12699
msgstr ""
12700
"_ConfigHooks\n"
12701
"------------"
12702
12703
#: en/help_topics/hooks.txt:215
12704
msgid ""
12705
"get\n"
12706
"~~~"
12707
msgstr ""
12708
"get\n"
12709
"~~~"
12710
12711
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12712
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12713
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12714
#: en/help_topics/hooks.txt:443
12715
msgid "Introduced in: 2.4"
12716
msgstr "Introducido en: 2.4"
12717
12718
#: en/help_topics/hooks.txt:220
12719
msgid ""
12720
"Invoked when a config option is read. The signature is (stack, name,\n"
12721
"value)."
12722
msgstr ""
12723
12724
#: en/help_topics/hooks.txt:223
12725
msgid ""
12726
"load\n"
12727
"~~~~"
12728
msgstr ""
12729
"load\n"
12730
"~~~~"
12731
12732
#: en/help_topics/hooks.txt:228
12733
msgid "Invoked when a config store is loaded. The signature is (store)."
12734
msgstr ""
12735
12736
#: en/help_topics/hooks.txt:230
12737
msgid ""
12738
"remove\n"
12739
"~~~~~~"
12740
msgstr ""
12741
"remove\n"
12742
"~~~~~~"
12743
12744
#: en/help_topics/hooks.txt:235
12745
msgid ""
12746
"Invoked when a config option is removed. The signature is (stack,\n"
12747
"name)."
12748
msgstr ""
12749
12750
#: en/help_topics/hooks.txt:238
12751
msgid ""
12752
"save\n"
12753
"~~~~"
12754
msgstr ""
12755
"save\n"
12756
"~~~~"
12757
12758
#: en/help_topics/hooks.txt:243
12759
msgid "Invoked when a config store is saved. The signature is (store)."
12760
msgstr ""
12761
12762
#: en/help_topics/hooks.txt:245
12763
msgid ""
12764
"set\n"
12765
"~~~"
12766
msgstr ""
12767
"set\n"
12768
"~~~"
12769
12770
#: en/help_topics/hooks.txt:250
12771
msgid ""
12772
"Invoked when a config option is set. The signature is (stack, name,\n"
12773
"value)."
12774
msgstr ""
12775
12776
#: en/help_topics/hooks.txt:253
12777
msgid ""
12778
"ControlDirHooks\n"
12779
"---------------"
12780
msgstr ""
12781
12782
#: en/help_topics/hooks.txt:256
12783
msgid ""
12784
"post_repo_init\n"
12785
"~~~~~~~~~~~~~~"
12786
msgstr ""
12787
"post_repo_init\n"
12788
"~~~~~~~~~~~~~~"
12789
12790
#: en/help_topics/hooks.txt:261
12791
msgid ""
12792
"Invoked after a repository has been initialized. post_repo_init is\n"
12793
"called with a bzrlib.controldir.RepoInitHookParams."
12794
msgstr ""
12795
12796
#: en/help_topics/hooks.txt:264
12797
msgid ""
12798
"pre_open\n"
12799
"~~~~~~~~"
12800
msgstr ""
12801
"pre_open\n"
12802
"~~~~~~~~"
12803
12804
#: en/help_topics/hooks.txt:267
12805
msgid "Introduced in: 1.14"
12806
msgstr "Introducido en: 1.14"
12807
12808
#: en/help_topics/hooks.txt:269
12809
msgid ""
12810
"Invoked before attempting to open a ControlDir with the transport that\n"
12811
"the open will use."
12812
msgstr ""
12813
12814
#: en/help_topics/hooks.txt:272
12815
msgid ""
12816
"InfoHooks\n"
12817
"---------"
12818
msgstr ""
12819
"InfoHooks\n"
12820
"---------"
12821
12822
#: en/help_topics/hooks.txt:275
12823
msgid ""
12824
"repository\n"
12825
"~~~~~~~~~~"
12826
msgstr ""
12827
"repository\n"
12828
"~~~~~~~~~~"
12829
12830
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12831
#: en/help_topics/hooks.txt:521
12832
msgid "Introduced in: 1.15"
12833
msgstr "Introducido en: 1.15"
12834
12835
#: en/help_topics/hooks.txt:280
12836
msgid ""
12837
"Invoked when displaying the statistics for a repository. repository is\n"
12838
"called with a statistics dictionary as returned by the repository and\n"
12839
"a file-like object to write to."
12840
msgstr ""
12841
12842
#: en/help_topics/hooks.txt:284
12843
msgid ""
12844
"LockHooks\n"
12845
"---------"
12846
msgstr ""
12847
"LockHooks\n"
12848
"---------"
12849
12850
#: en/help_topics/hooks.txt:287
12851
msgid ""
12852
"lock_acquired\n"
12853
"~~~~~~~~~~~~~"
12854
msgstr ""
12855
"lock_acquired\n"
12856
"~~~~~~~~~~~~~"
12857
12858
#: en/help_topics/hooks.txt:292
12859
msgid ""
12860
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12861
msgstr ""
12862
12863
#: en/help_topics/hooks.txt:294
12864
msgid ""
12865
"lock_broken\n"
12866
"~~~~~~~~~~~"
12867
msgstr ""
12868
"lock_broken\n"
12869
"~~~~~~~~~~~"
12870
12871
#: en/help_topics/hooks.txt:299
12872
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12873
msgstr ""
12874
12875
#: en/help_topics/hooks.txt:301
12876
msgid ""
12877
"lock_released\n"
12878
"~~~~~~~~~~~~~"
12879
msgstr ""
12880
"lock_released\n"
12881
"~~~~~~~~~~~~~"
12882
12883
#: en/help_topics/hooks.txt:306
12884
msgid ""
12885
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12886
msgstr ""
12887
12888
#: en/help_topics/hooks.txt:308
12889
msgid ""
12890
"MergeHooks\n"
12891
"----------"
12892
msgstr ""
12893
"MergeHooks\n"
12894
"----------"
12895
12896
#: en/help_topics/hooks.txt:311
12897
msgid ""
12898
"merge_file_content\n"
12899
"~~~~~~~~~~~~~~~~~~"
12900
msgstr ""
12901
"merge_file_content\n"
12902
"~~~~~~~~~~~~~~~~~~"
12903
12904
#: en/help_topics/hooks.txt:314
12905
msgid "Introduced in: 2.1"
12906
msgstr "Introducido en: 2.1"
12907
12908
#: en/help_topics/hooks.txt:316
12909
msgid ""
12910
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12911
"object when starting a merge. Should return either None or a subclass\n"
12912
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12913
"called per file that needs to be merged (including when one side has\n"
12914
"deleted the file and the other has changed it). See the\n"
12915
"AbstractPerFileMerger API docs for details on how it is used by merge."
12916
msgstr ""
12917
12918
#: en/help_topics/hooks.txt:323
12919
msgid ""
12920
"post_merge\n"
12921
"~~~~~~~~~~"
12922
msgstr ""
12923
12924
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12925
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12926
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12927
msgid "Introduced in: 2.5"
12928
msgstr ""
12929
12930
#: en/help_topics/hooks.txt:328
12931
msgid ""
12932
"Called after a merge. Receives a Merger object as the single argument.\n"
12933
"The return value is ignored."
12934
msgstr ""
12935
12936
#: en/help_topics/hooks.txt:331
12937
msgid ""
12938
"pre_merge\n"
12939
"~~~~~~~~~"
12940
msgstr ""
12941
12942
#: en/help_topics/hooks.txt:336
12943
msgid ""
12944
"Called before a merge. Receives a Merger object as the single\n"
12945
"argument."
12946
msgstr ""
12947
12948
#: en/help_topics/hooks.txt:339
12949
msgid ""
12950
"MergeDirectiveHooks\n"
12951
"-------------------"
12952
msgstr ""
12953
"MergeDirectiveHooks\n"
12954
"-------------------"
12955
12956
#: en/help_topics/hooks.txt:342
12957
msgid ""
12958
"merge_request_body\n"
12959
"~~~~~~~~~~~~~~~~~~"
12960
msgstr ""
12961
"merge_request_body\n"
12962
"~~~~~~~~~~~~~~~~~~"
12963
12964
#: en/help_topics/hooks.txt:345
12965
msgid "Introduced in: 1.15.0"
12966
msgstr "Introducido en: 1.15.0"
12967
12968
#: en/help_topics/hooks.txt:347
12969
msgid ""
12970
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12971
"request. Callbacks must return a body. If more than one callback is\n"
12972
"registered, the output of one callback is provided to the next."
12973
msgstr ""
12974
12975
#: en/help_topics/hooks.txt:351
12976
msgid ""
12977
"MessageEditorHooks\n"
12978
"------------------"
12979
msgstr ""
12980
"MessageEditorHooks\n"
12981
"------------------"
12982
12983
#: en/help_topics/hooks.txt:354
12984
msgid ""
12985
"commit_message_template\n"
12986
"~~~~~~~~~~~~~~~~~~~~~~~"
12987
msgstr ""
12988
"commit_message_template\n"
12989
"~~~~~~~~~~~~~~~~~~~~~~~"
12990
12991
#: en/help_topics/hooks.txt:357
12992
msgid "Introduced in: 1.10"
12993
msgstr "Introducido en: 1.10"
12994
12995
#: en/help_topics/hooks.txt:359
12996
msgid ""
12997
"Called when a commit message is being generated.\n"
12998
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12999
"and the message that is known so far. commit_message_template must\n"
13000
"return a new message to use (which could be the same as it was given).\n"
13001
"When there are multiple hooks registered for commit_message_template,\n"
13002
"they are chained with the result from the first passed into the\n"
13003
"second, and so on."
13004
msgstr ""
13005
13006
#: en/help_topics/hooks.txt:367
13007
msgid ""
13008
"set_commit_message\n"
13009
"~~~~~~~~~~~~~~~~~~"
13010
msgstr ""
13011
"set_commit_message\n"
13012
"~~~~~~~~~~~~~~~~~~"
13013
13014
#: en/help_topics/hooks.txt:372
13015
msgid ""
13016
"Set a fixed commit message. set_commit_message is called with the\n"
13017
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
13018
"properties by editing commit.builder._revprops) and the message so\n"
13019
"far. set_commit_message must return the message to use or None if it\n"
13020
"should use the message editor as normal."
13021
msgstr ""
13022
13023
#: en/help_topics/hooks.txt:378
13024
msgid ""
13025
"MutableTreeHooks\n"
13026
"----------------"
13027
msgstr ""
13028
"MutableTreeHooks\n"
13029
"----------------"
13030
13031
#: en/help_topics/hooks.txt:381
13032
msgid ""
13033
"post_build_tree\n"
13034
"~~~~~~~~~~~~~~~"
13035
msgstr ""
13036
13037
#: en/help_topics/hooks.txt:386
13038
msgid ""
13039
"Called after a completely new tree is built. The hook is called with\n"
13040
"the tree as its only argument."
13041
msgstr ""
13042
13043
#: en/help_topics/hooks.txt:392
13044
msgid "Introduced in: 2.0"
13045
msgstr "Introducido en: 2.0"
13046
13047
#: en/help_topics/hooks.txt:394
13048
msgid ""
13049
"Called after a commit is performed on a tree. The hook is called with\n"
13050
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
13051
"commit was performed on is available via the mutable_tree attribute of\n"
13052
"that object."
13053
msgstr ""
13054
13055
#: en/help_topics/hooks.txt:399
13056
msgid ""
13057
"post_transform\n"
13058
"~~~~~~~~~~~~~~"
13059
msgstr ""
13060
13061
#: en/help_topics/hooks.txt:404
13062
msgid ""
13063
"Called after a tree transform has been performed on a tree. The hook\n"
13064
"is called with the tree that is being transformed and the transform."
13065
msgstr ""
13066
13067
#: en/help_topics/hooks.txt:407
13068
msgid ""
13069
"pre_transform\n"
13070
"~~~~~~~~~~~~~"
13071
msgstr ""
13072
13073
#: en/help_topics/hooks.txt:412
13074
msgid ""
13075
"Called before a tree transform on this tree. The hook is called with\n"
13076
"the tree that is being transformed and the transform."
13077
msgstr ""
13078
13079
#: en/help_topics/hooks.txt:415
13080
msgid ""
13081
"start_commit\n"
13082
"~~~~~~~~~~~~"
13083
msgstr ""
13084
"start_commit\n"
13085
"~~~~~~~~~~~~"
13086
13087
#: en/help_topics/hooks.txt:420
13088
msgid ""
13089
"Called before a commit is performed on a tree. The start commit hook\n"
13090
"is able to change the tree before the commit takes place. start_commit\n"
13091
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
13092
"being performed on."
13093
msgstr ""
13094
13095
#: en/help_topics/hooks.txt:425
13096
msgid ""
13097
"SmartClientHooks\n"
13098
"----------------"
13099
msgstr ""
13100
"SmartClientHooks\n"
13101
"----------------"
13102
13103
#: en/help_topics/hooks.txt:428
13104
msgid ""
13105
"call\n"
13106
"~~~~"
13107
msgstr ""
13108
"call\n"
13109
"~~~~"
13110
13111
#: en/help_topics/hooks.txt:431
13112
msgid "Introduced in: unknown"
13113
msgstr ""
13114
13115
#: en/help_topics/hooks.txt:433
13116
msgid ""
13117
"Called when the smart client is submitting a request to the smart\n"
13118
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13119
"Streaming request bodies, and responses, are not accessible."
13120
msgstr ""
13121
13122
#: en/help_topics/hooks.txt:437
13123
msgid ""
13124
"SmartServerHooks\n"
13125
"----------------"
13126
msgstr ""
13127
"SmartServerHooks\n"
13128
"----------------"
13129
13130
#: en/help_topics/hooks.txt:440
13131
msgid ""
13132
"server_exception\n"
13133
"~~~~~~~~~~~~~~~~"
13134
msgstr ""
13135
"server_exception\n"
13136
"~~~~~~~~~~~~~~~~"
13137
13138
#: en/help_topics/hooks.txt:445
13139
msgid ""
13140
"Called by the bzr server when an exception occurs. server_exception is\n"
13141
"called with the sys.exc_info() tuple return true for the hook if the\n"
13142
"exception has been handled, in which case the server will exit\n"
13143
"normally."
13144
msgstr ""
13145
13146
#: en/help_topics/hooks.txt:450
13147
msgid ""
13148
"server_started\n"
13149
"~~~~~~~~~~~~~~"
13150
msgstr ""
13151
"server_started\n"
13152
"~~~~~~~~~~~~~~"
13153
13154
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
13155
msgid "Introduced in: 0.16"
13156
msgstr ""
13157
13158
#: en/help_topics/hooks.txt:455
13159
msgid ""
13160
"Called by the bzr server when it starts serving a directory.\n"
13161
"server_started is called with (backing urls, public url), where\n"
13162
"backing_url is a list of URLs giving the server-specific directory\n"
13163
"locations, and public_url is the public URL for the directory being\n"
13164
"served."
13165
msgstr ""
13166
13167
#: en/help_topics/hooks.txt:461
13168
msgid ""
13169
"server_started_ex\n"
13170
"~~~~~~~~~~~~~~~~~"
13171
msgstr ""
13172
"server_started_ex\n"
13173
"~~~~~~~~~~~~~~~~~"
13174
13175
#: en/help_topics/hooks.txt:466
13176
msgid ""
13177
"Called by the bzr server when it starts serving a directory.\n"
13178
"server_started is called with (backing_urls, server_obj)."
13179
msgstr ""
13180
13181
#: en/help_topics/hooks.txt:469
13182
msgid ""
13183
"server_stopped\n"
13184
"~~~~~~~~~~~~~~"
13185
msgstr ""
13186
"server_stopped\n"
13187
"~~~~~~~~~~~~~~"
13188
13189
#: en/help_topics/hooks.txt:474
13190
msgid ""
13191
"Called by the bzr server when it stops serving a directory.\n"
13192
"server_stopped is called with the same parameters as the\n"
13193
"server_started hook: (backing_urls, public_url)."
13194
msgstr ""
13195
13196
#: en/help_topics/hooks.txt:478
13197
msgid ""
13198
"StatusHooks\n"
13199
"-----------"
13200
msgstr ""
13201
"StatusHooks\n"
13202
"-----------"
13203
13204
#: en/help_topics/hooks.txt:481
13205
msgid ""
13206
"post_status\n"
13207
"~~~~~~~~~~~"
13208
msgstr ""
13209
"post_status\n"
13210
"~~~~~~~~~~~"
13211
13212
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13213
msgid "Introduced in: 2.3"
13214
msgstr ""
13215
13216
#: en/help_topics/hooks.txt:486
13217
msgid ""
13218
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13219
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13220
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13221
"correspond to the command line options specified by the user for the\n"
13222
"status command. to_file is the output stream for writing."
13223
msgstr ""
13224
13225
#: en/help_topics/hooks.txt:492
13226
msgid ""
13227
"pre_status\n"
13228
"~~~~~~~~~~"
13229
msgstr ""
13230
"pre_status\n"
13231
"~~~~~~~~~~"
13232
13233
#: en/help_topics/hooks.txt:497
13234
msgid ""
13235
"Called with argument StatusHookParams before Bazaar displays the\n"
13236
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13237
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13238
"correspond to the command line options specified by the user for the\n"
13239
"status command. to_file is the output stream for writing."
13240
msgstr ""
13241
13242
#: en/help_topics/hooks.txt:503
13243
msgid ""
13244
"TransportHooks\n"
13245
"--------------"
13246
msgstr ""
13247
13248
#: en/help_topics/hooks.txt:506
13249
msgid ""
13250
"post_connect\n"
13251
"~~~~~~~~~~~~"
13252
msgstr ""
13253
13254
#: en/help_topics/hooks.txt:511
13255
msgid ""
13256
"Called after a new connection is established or a reconnect occurs.\n"
13257
"The sole argument passed is either the connected transport or smart\n"
13258
"medium instance."
13259
msgstr ""
13260
13261
#: en/help_topics/hooks.txt:515
13262
msgid ""
13263
"RioVersionInfoBuilderHooks\n"
13264
"--------------------------"
13265
msgstr ""
13266
"RioVersionInfoBuilderHooks\n"
13267
"--------------------------"
13268
13269
#: en/help_topics/hooks.txt:518
13270
msgid ""
13271
"revision\n"
13272
"~~~~~~~~"
13273
msgstr ""
13274
"revisión\n"
13275
"~~~~~~~~"
13276
13277
#: en/help_topics/hooks.txt:523
13278
msgid ""
13279
"Invoked when adding information about a revision to the RIO stanza\n"
13280
"that is printed. revision is called with a revision object and a RIO\n"
13281
"stanza.\n"
13282
msgstr ""
13283
13284
#: en/help_topics/location-alias.txt:1
13285
msgid ""
13286
"Location aliases\n"
13287
"================"
13288
msgstr ""
13289
"Alias de ubicación\n"
13290
"=============="
13291
13292
#: en/help_topics/location-alias.txt:4
13293
msgid ""
13294
"Bazaar defines several aliases for locations associated with a branch. "
13295
"These\n"
13296
"can be used with most commands that expect a location, such as `bzr push`."
13297
msgstr ""
13298
13299
#: en/help_topics/location-alias.txt:7
13300
msgid "The aliases are::"
13301
msgstr "Los alias son::"
13302
13303
#: en/help_topics/location-alias.txt:9
13304
msgid ""
13305
" :bound The branch this branch is bound to, for bound branches.\n"
13306
" :parent The parent of this branch.\n"
13307
" :public The public location of this branch.\n"
13308
" :push The saved location used for `bzr push` with no arguments.\n"
13309
" :submit The submit branch for this branch.\n"
13310
" :this This branch."
13311
msgstr ""
13312
13313
#: en/help_topics/location-alias.txt:16
13314
msgid "For example, to push to the parent location::"
13315
msgstr "Por ejemplo para impulsar la ubicación padre::"
13316
13317
#: en/help_topics/location-alias.txt:18
13318
msgid " bzr push :parent\n"
13319
msgstr ""
13320
13321
#: en/help_topics/log-formats.txt:1
13322
msgid ""
13323
"Log Formats\n"
13324
"==========="
13325
msgstr ""
13326
"Formatos de registro\n"
13327
"================"
13328
13329
#: en/help_topics/log-formats.txt:4
13330
msgid ""
13331
"A log format controls how information about each revision is displayed.\n"
13332
"The standard log formats are compared below::"
13333
msgstr ""
13334
13335
#: en/help_topics/log-formats.txt:7
13336
msgid ""
13337
" Feature long short line\n"
13338
" ---------------------- ------------- ------------ -------------------\n"
13339
" design goal detailed view concise view 1 revision per line\n"
13340
" committer name+email name only name only\n"
13341
" author name+email - -\n"
13342
" date-time format full date only date only\n"
13343
" commit message full full top line\n"
13344
" tags yes yes yes\n"
13345
" merges indicator - yes -\n"
13346
" status/delta optional optional -\n"
13347
" diff/patch optional optional -\n"
13348
" revision-id optional optional -\n"
13349
" branch nick yes - -\n"
13350
" foreign vcs properties yes yes -\n"
13351
" preferred levels all 1 1\n"
13352
" digital signature optional - -"
13353
msgstr ""
13354
13355
#: en/help_topics/log-formats.txt:24
13356
msgid ""
13357
"The default format is ``long``. To change this, define the ``log_format``\n"
13358
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13359
msgstr ""
13360
13361
#: en/help_topics/log-formats.txt:27
13362
msgid ""
13363
" [DEFAULT]\n"
13364
" log_format = short"
13365
msgstr ""
13366
13367
#: en/help_topics/log-formats.txt:30
13368
msgid ""
13369
"Alternatively, to change the log format used for a given query, use the\n"
13370
"--long, --short or --line options."
13371
msgstr ""
13372
13373
#: en/help_topics/log-formats.txt:33
13374
msgid ""
13375
"If one of the standard log formats does not meet your needs, additional\n"
13376
"formats can be provided by plugins.\n"
13377
msgstr ""
13378
13379
#: en/help_topics/other-formats.txt:1
13380
msgid "Other Storage Formats"
13381
msgstr "Otros formatos de almacenamiento"
13382
13383
#: en/help_topics/other-formats.txt:3
13384
msgid "Experimental formats are shown below."
13385
msgstr ""
13386
13387
#: en/help_topics/other-formats.txt:5
13388
msgid ""
13389
":development-colo:\n"
13390
" (native) The 2a format with experimental support for colocated\n"
13391
" branches."
13392
msgstr ""
13393
13394
#: en/help_topics/other-formats.txt:9
13395
msgid ""
13396
"\n"
13397
"Deprecated formats are shown below."
13398
msgstr ""
13399
13400
#: en/help_topics/other-formats.txt:12
13401
msgid ""
13402
":pack-0.92:\n"
13403
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13404
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13405
" by bzr < 0.92."
13406
msgstr ""
13407
13408
#: en/help_topics/patterns.txt:1
13409
msgid ""
13410
"Patterns\n"
13411
"========"
13412
msgstr ""
13413
"Patrones\n"
13414
"========"
13415
13416
#: en/help_topics/patterns.txt:4
13417
msgid ""
13418
"Bazaar uses patterns to match files at various times. For example,\n"
13419
"the ``add`` command skips over files that match ignore patterns\n"
13420
"and preferences can be associated with files using rule patterns.\n"
13421
"The pattern syntax is described below."
13422
msgstr ""
13423
13424
#: en/help_topics/patterns.txt:9
13425
msgid ""
13426
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13427
"slash or is a regular expression, it is compared to the whole path\n"
13428
"from the branch root. Otherwise, it is compared to only the last\n"
13429
"component of the path. To match a file only in the root directory,\n"
13430
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13431
msgstr ""
13432
13433
#: en/help_topics/patterns.txt:15
13434
msgid "Patterns may include globbing wildcards such as::"
13435
msgstr "Los patrones pueden incluir comodines globales tales como::"
13436
13437
#: en/help_topics/patterns.txt:17
13438
msgid ""
13439
" ? - Matches any single character except '/'\n"
13440
" * - Matches 0 or more characters except '/'\n"
13441
" /**/ - Matches 0 or more directories in a path\n"
13442
" [a-z] - Matches a single character from within a group of characters"
13443
msgstr ""
13444
13445
#: en/help_topics/patterns.txt:22
13446
msgid ""
13447
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13448
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13449
"expression. Regular expression patterns may not include named or\n"
13450
"numbered groups."
13451
msgstr ""
13452
13453
#: en/help_topics/patterns.txt:27
13454
msgid ""
13455
"Case insensitive ignore patterns can be specified with regular expressions\n"
13456
"by using the ``i`` (for ignore case) flag in the pattern."
13457
msgstr ""
13458
13459
#: en/help_topics/patterns.txt:30
13460
msgid ""
13461
"For example, a case insensitive match for ``foo`` may be specified as::"
13462
msgstr ""
13463
13464
#: en/help_topics/patterns.txt:32
13465
msgid " RE:(?i)foo"
13466
msgstr ""
13467
13468
#: en/help_topics/patterns.txt:34
13469
msgid ""
13470
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13471
"matched by that pattern will not be ignored."
13472
msgstr ""
13473
13474
#: en/help_topics/patterns.txt:37
13475
msgid ""
13476
".. _Python regular expressions: http://docs.python.org/library/re.html"
13477
msgstr ""
13478
13479
#: en/help_topics/revisionspec.txt:1
13480
msgid "Revision Identifiers"
13481
msgstr "Identificadores de revisión"
13482
13483
#: en/help_topics/revisionspec.txt:3
13484
msgid ""
13485
"A revision identifier refers to a specific state of a branch's history. It\n"
13486
"can be expressed in several ways. It can begin with a keyword to\n"
13487
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13488
"'before:yesterday' and 'submit:'."
13489
msgstr ""
13490
13491
#: en/help_topics/revisionspec.txt:8
13492
msgid ""
13493
"Alternately, it can be given without a keyword, in which case it will be\n"
13494
"checked as a revision number, a tag, a revision id, a date specification, or "
13495
"a\n"
13496
"branch specification, in that order. For example, 'date:today' could be\n"
13497
"written as simply 'today', though if you have a tag called 'today' that "
13498
"will\n"
13499
"be found first."
13500
msgstr ""
13501
13502
#: en/help_topics/revisionspec.txt:14
13503
msgid ""
13504
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13505
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13506
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13507
"or\n"
13508
"spaces around the '..')."
13509
msgstr ""
13510
13511
#: en/help_topics/revisionspec.txt:19
13512
msgid ""
13513
"Ranges are interpreted differently by different commands. To the \"log\" "
13514
"command,\n"
13515
"a range is a sequence of log messages, but to the \"diff\" command, the "
13516
"range\n"
13517
"denotes a change between revisions (and not a sequence of changes). In\n"
13518
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13519
"consider it\n"
13520
"to be open-ended, that is, they include one end but not the other. For "
13521
"example:\n"
13522
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13523
"3649,\n"
13524
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13525
"and\n"
13526
"3649, but not 3647."
13527
msgstr ""
13528
13529
#: en/help_topics/revisionspec.txt:28
13530
msgid "The keywords used as revision selection methods are the following:"
13531
msgstr ""
13532
"Las palabras claves usadas como métodos de selección de revisión son las "
13533
"siguientes:"
13534
13535
#: en/help_topics/revisionspec.txt:30
13536
msgid ""
13537
":revid:\n"
13538
"\tSelects a revision using the revision id.\n"
13539
":submit:\n"
13540
"\tSelects a common ancestor with the submit branch.\n"
13541
":ancestor:\n"
13542
"\tSelects a common ancestor with a second branch.\n"
13543
":date:\n"
13544
"\tSelects a revision on the basis of a datestamp.\n"
13545
":branch:\n"
13546
"\tSelects the last revision of a specified branch.\n"
13547
":tag:\n"
13548
"\tSelects a revision identified by a tag name.\n"
13549
":revno:\n"
13550
"\tSelects a revision using a number.\n"
13551
":before:\n"
13552
"\tSelects the parent of the revision specified.\n"
13553
":annotate:\n"
13554
"\tSelect the revision that last modified the specified line.\n"
13555
":mainline:\n"
13556
"\tSelect mainline revision that merged the specified revision.\n"
13557
":last:\n"
13558
"\tSelects the nth revision from the end."
13559
msgstr ""
13560
13561
#: en/help_topics/revisionspec.txt:53
13562
msgid "In addition, plugins can provide other keywords."
13563
msgstr "Además, los complementos pueden proporcionar otras palabras clave."
13564
13565
#: en/help_topics/revisionspec.txt:55
13566
msgid "A detailed description of each keyword is given below."
13567
msgstr ""
13568
"A continuación se proporciona una detallada descripción de cada palabra "
13569
"clave."
13570
13571
#: en/help_topics/revisionspec.txt:57
13572
msgid ":revid:"
13573
msgstr ":revid:"
13574
13575
#: en/help_topics/revisionspec.txt:59
13576
msgid ""
13577
" Supply a specific revision id, that can be used to specify any\n"
13578
" revision id in the ancestry of the branch.\n"
13579
" Including merges, and pending merges.\n"
13580
" Examples::"
13581
msgstr ""
13582
13583
#: en/help_topics/revisionspec.txt:64
13584
msgid ""
13585
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13586
msgstr ""
13587
" revid:aaaa@bbbb-123456789 -> Selecciona la revisión «aaaa@bbbb-"
13588
"123456789»"
13589
13590
#: en/help_topics/revisionspec.txt:66
13591
msgid ":submit:"
13592
msgstr ":submit:"
13593
13594
#: en/help_topics/revisionspec.txt:68
13595
msgid ""
13596
" Diffing against this shows all the changes that were made in this "
13597
"branch,\n"
13598
" and is a good predictor of what merge will do. The submit branch is\n"
13599
" used by the bundle and merge directive commands. If no submit branch\n"
13600
" is specified, the parent branch is used instead."
13601
msgstr ""
13602
13603
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13604
msgid ""
13605
" The common ancestor is the last revision that existed in both\n"
13606
" branches. Usually this is the branch point, but it could also be\n"
13607
" a revision that was merged."
13608
msgstr ""
13609
13610
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13611
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13612
#: en/help_topics/revisionspec.txt:153
13613
msgid " Examples::"
13614
msgstr " Ejemplos::"
13615
13616
#: en/help_topics/revisionspec.txt:79
13617
msgid " $ bzr diff -r submit:"
13618
msgstr " $ bzr diff -r submit:"
13619
13620
#: en/help_topics/revisionspec.txt:81
13621
msgid ":ancestor:"
13622
msgstr ":ancestor:"
13623
13624
#: en/help_topics/revisionspec.txt:83
13625
msgid " Supply the path to a branch to select the common ancestor."
13626
msgstr ""
13627
13628
#: en/help_topics/revisionspec.txt:89
13629
msgid ""
13630
" This is frequently used with 'diff' to return all of the changes\n"
13631
" that your branch introduces, while excluding the changes that you\n"
13632
" have not merged from the remote branch."
13633
msgstr ""
13634
13635
#: en/help_topics/revisionspec.txt:95
13636
msgid ""
13637
" ancestor:/path/to/branch\n"
13638
" $ bzr diff -r ancestor:../../mainline/branch"
13639
msgstr ""
13640
13641
#: en/help_topics/revisionspec.txt:98
13642
msgid ":date:"
13643
msgstr ":date:"
13644
13645
#: en/help_topics/revisionspec.txt:100
13646
msgid ""
13647
" Supply a datestamp to select the first revision that matches the date.\n"
13648
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13649
" Matches the first entry after a given date (either at midnight or\n"
13650
" at a specified time)."
13651
msgstr ""
13652
13653
#: en/help_topics/revisionspec.txt:105
13654
msgid " One way to display all the changes since yesterday would be::"
13655
msgstr ""
13656
13657
#: en/help_topics/revisionspec.txt:107
13658
msgid " bzr log -r date:yesterday.."
13659
msgstr ""
13660
13661
#: en/help_topics/revisionspec.txt:111
13662
msgid ""
13663
" date:yesterday -> select the first revision since "
13664
"yesterday\n"
13665
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13666
" August 14th, 2006 at 5:10pm."
13667
msgstr ""
13668
13669
#: en/help_topics/revisionspec.txt:115
13670
msgid ":branch:"
13671
msgstr ":branch:"
13672
13673
#: en/help_topics/revisionspec.txt:117
13674
msgid " Supply the path to a branch to select its last revision."
13675
msgstr ""
13676
" Suministra la ruta a una rama para seleccionar su última revisión."
13677
13678
#: en/help_topics/revisionspec.txt:121
13679
msgid " branch:/path/to/branch"
13680
msgstr " branch:/ruta/a/rama"
13681
13682
#: en/help_topics/revisionspec.txt:123
13683
msgid ":tag:"
13684
msgstr ":tag:"
13685
13686
#: en/help_topics/revisionspec.txt:125
13687
msgid " Tags are stored in the branch and created by the 'tag' command."
13688
msgstr ""
13689
13690
#: en/help_topics/revisionspec.txt:127
13691
msgid ":revno:"
13692
msgstr ":revno:"
13693
13694
#: en/help_topics/revisionspec.txt:129
13695
msgid ""
13696
" Use an integer to specify a revision in the history of the branch.\n"
13697
" Optionally a branch can be specified. A negative number will count\n"
13698
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13699
" one). If the negative number is larger than the branch's history, the\n"
13700
" first revision is returned.\n"
13701
" Examples::"
13702
msgstr ""
13703
13704
#: en/help_topics/revisionspec.txt:136
13705
msgid ""
13706
" revno:1 -> return the first revision of this branch\n"
13707
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13708
" the branch '/path/to/branch'\n"
13709
" revno:-1 -> The last revision in a branch.\n"
13710
" -2:http://other/branch -> The second to last revision in the\n"
13711
" remote branch.\n"
13712
" -1000000 -> Most likely the first revision, unless\n"
13713
" your history is very long."
13714
msgstr ""
13715
13716
#: en/help_topics/revisionspec.txt:145
13717
msgid ":before:"
13718
msgstr ":before:"
13719
13720
#: en/help_topics/revisionspec.txt:147
13721
msgid ""
13722
" Supply any revision spec to return the parent of that revision. This "
13723
"is\n"
13724
" mostly useful when inspecting revisions that are not in the revision "
13725
"history\n"
13726
" of a branch."
13727
msgstr ""
13728
13729
#: en/help_topics/revisionspec.txt:151
13730
msgid ""
13731
" It is an error to request the parent of the null revision (before:0)."
13732
msgstr ""
13733
13734
#: en/help_topics/revisionspec.txt:155
13735
msgid ""
13736
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13737
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13738
" aaaa@bbbb-1234567890\n"
13739
" bzr diff -r before:1913..1913\n"
13740
" -> Find the changes between revision 1913 and its parent "
13741
"(1912).\n"
13742
" (What changes did revision 1913 introduce).\n"
13743
" This is equivalent to: bzr diff -c 1913"
13744
msgstr ""
13745
13746
#: en/help_topics/revisionspec.txt:163
13747
msgid ":annotate:"
13748
msgstr ":annotate:"
13749
13750
#: en/help_topics/revisionspec.txt:165
13751
msgid ""
13752
" Select the revision that last modified the specified line. Line is\n"
13753
" specified as path:number. Path is a relative path to the file. "
13754
"Numbers\n"
13755
" start at 1, and are relative to the current version, not the last-\n"
13756
" committed version of the file."
13757
msgstr ""
13758
13759
#: en/help_topics/revisionspec.txt:170
13760
msgid ":mainline:"
13761
msgstr ":mainline:"
13762
13763
#: en/help_topics/revisionspec.txt:172
13764
msgid ""
13765
" Select the revision that merged the specified revision into mainline."
13766
msgstr ""
13767
13768
#: en/help_topics/revisionspec.txt:174
13769
msgid ":last:"
13770
msgstr ":last:"
13771
13772
#: en/help_topics/revisionspec.txt:176
13773
msgid ""
13774
" Supply a positive number to get the nth revision from the end.\n"
13775
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13776
" Examples::"
13777
msgstr ""
13778
13779
#: en/help_topics/revisionspec.txt:180
13780
msgid ""
13781
" last:1 -> return the last revision\n"
13782
" last:3 -> return the revision 2 before the end.\n"
13783
msgstr ""
13784
" last:1 -> devuelve la última revisión\n"
13785
" last:3 -> devuelve la revisión 2 antes del final.\n"
13786
13787
#: en/help_topics/rules.txt:1
13788
msgid ""
13789
"Rules\n"
13790
"====="
13791
msgstr ""
13792
"Reglas\n"
13793
"======"
13794
13795
#: en/help_topics/rules.txt:7
13796
msgid ""
13797
"Rules are defined in ini file format where the sections are file glob\n"
13798
"patterns and the contents of each section are the preferences for files\n"
13799
"matching that pattern(s). For example::"
13800
msgstr ""
13801
13802
#: en/help_topics/rules.txt:11
13803
msgid ""
13804
" [name *.bat]\n"
13805
" eol = native"
13806
msgstr ""
13807
13808
#: en/help_topics/rules.txt:14
13809
msgid ""
13810
" [name *.html *.xml]\n"
13811
" keywords = xml_escape"
13812
msgstr ""
13813
" [name *.html *.xml]\n"
13814
" keywords = xml_escape"
13815
13816
#: en/help_topics/rules.txt:17
13817
msgid ""
13818
"Preferences like these are useful for commands and plugins wishing to\n"
13819
"provide custom behaviour for selected files. For more information on \n"
13820
"end of line conversion see :doc:`eol-help`.\n"
13821
"Keyword support is provided by the `keywords plugin\n"
13822
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13823
msgstr ""
13824
13825
#: en/help_topics/rules.txt:23
13826
msgid ""
13827
"Files\n"
13828
"-----"
13829
msgstr ""
13830
"Archivos\n"
13831
"--------"
13832
13833
#: en/help_topics/rules.txt:26
13834
msgid ""
13835
"Default rules for all branches are defined in the optional file\n"
13836
"``BZR_HOME/rules``. "
13837
msgstr ""
13838
13839
#: en/help_topics/rules.txt:29
13840
msgid ""
13841
"Rule Patterns\n"
13842
"-------------"
13843
msgstr ""
13844
"Patrones de regla\n"
13845
"----------------------------"
13846
13847
#: en/help_topics/rules.txt:32
13848
msgid ""
13849
"Patterns are ordered and searching stops as soon as one matches.\n"
13850
"As a consequence, more explicit patterns should be placed towards\n"
13851
"the top of the file. Rule patterns use exactly the same conventions\n"
13852
"as ignore patterns. See :doc:`patterns-help` for details."
13853
msgstr ""
13854
13855
#: en/help_topics/rules.txt:37
13856
msgid ".. note::"
13857
msgstr ".. nota::"
13858
13859
#: en/help_topics/rules.txt:39
13860
msgid ""
13861
" Patterns containing square brackets or spaces should be\n"
13862
" surrounded in quotes to ensure they are correctly parsed.\n"
13863
msgstr ""
13864
13865
#: en/help_topics/topics.txt:1
13866
msgid ""
13867
"authentication Information on configuring authentication\n"
13868
"basic Basic commands\n"
13869
"branches Information on what a branch is\n"
13870
"bugs Bug tracker settings\n"
13871
"checkouts Information on what a checkout is\n"
13872
"commands Basic help for all commands\n"
13873
"configuration Details on the configuration settings available\n"
13874
"conflict-types Types of conflicts and what to do about them\n"
13875
"content-filters Conversion of content into/from working trees\n"
13876
"criss-cross Information on criss-cross merging\n"
13877
"current-formats Current storage formats\n"
13878
"debug-flags Options to show or record debug information\n"
13879
"diverged-branches How to fix diverged branches\n"
13880
"env-variables Environment variable names and values\n"
13881
"eol Information on end-of-line handling\n"
13882
"files Information on configuration and log files\n"
13883
"formats Information on choosing a storage format\n"
13884
"global-options Options that control how Bazaar runs\n"
13885
"hidden-commands All hidden commands\n"
13886
"hooks Points at which custom processing can be added\n"
13887
"launchpad Using Bazaar with Launchpad.net\n"
13888
"location-alias Aliases for remembered locations\n"
13889
"log-formats Details on the logging formats available\n"
13890
"other-formats Experimental and deprecated storage formats\n"
13891
"patterns Information on the pattern syntax\n"
13892
"repositories Basic information on shared repositories.\n"
13893
"revisionspec Explain how to use --revision\n"
13894
"rules Information on defining rule-based preferences\n"
13895
"standalone-trees Information on what a standalone tree is\n"
13896
"standard-options Options that can be used with any command\n"
13897
"status-flags Help on status flags\n"
13898
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13899
"topics Topics list\n"
13900
"url-special-chars Special character handling in URLs\n"
13901
"urlspec Supported transport protocols\n"
13902
"working-trees Information on working trees\n"
13903
msgstr ""
13904
13905
#: en/help_topics/url-special-chars.txt:1
13906
msgid ""
13907
"Special character handling in URLs\n"
13908
"=================================="
13909
msgstr ""
13910
13911
#: en/help_topics/url-special-chars.txt:4
13912
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13913
msgstr ""
13914
13915
#: en/help_topics/url-special-chars.txt:6
13916
msgid " * Fully qualified URLs"
13917
msgstr ""
13918
13919
#: en/help_topics/url-special-chars.txt:8
13920
msgid " * File system paths, relative or absolute"
13921
msgstr " * Rutas de sistemas de archivo, relativas o absolutas"
13922
13923
#: en/help_topics/url-special-chars.txt:10
13924
msgid ""
13925
"Internally bzr treats all locations as URLs. For any file system paths\n"
13926
"that are specified it will automatically determine the appropriate URL\n"
13927
"representation, and escape special characters where necessary."
13928
msgstr ""
13929
13930
#: en/help_topics/url-special-chars.txt:14
13931
msgid ""
13932
"There are a few characters which have special meaning in URLs and need "
13933
"careful\n"
13934
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13935
"value in URLs. Any non-ASCII characters in a file path will automatically "
13936
"be\n"
13937
"urlencoded when the path is converted to a URL."
13938
msgstr ""
13939
13940
#: en/help_topics/url-special-chars.txt:19
13941
msgid ""
13942
"URLs represent non-ASCII characters in an encoding defined by the server, "
13943
"but\n"
13944
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13945
"be\n"
13946
"generous in what it accepts as a URL and to print them in a way that\n"
13947
"will be readable."
13948
msgstr ""
13949
13950
#: en/help_topics/url-special-chars.txt:24
13951
msgid ""
13952
"For example, if you have a directory named '/tmp/%2False' these are all "
13953
"valid\n"
13954
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13955
"slash)::"
13956
msgstr ""
13957
13958
#: en/help_topics/url-special-chars.txt:27
13959
msgid ""
13960
" cd /tmp\n"
13961
" bzr log /tmp/%2False\n"
13962
" bzr log %2False\n"
13963
" bzr log file:///tmp/%252False\n"
13964
" bzr log file://localhost/tmp/%252False\n"
13965
" bzr log file:%252False"
13966
msgstr ""
13967
" cd /tmp\n"
13968
" bzr log /tmp/%2False\n"
13969
" bzr log %2False\n"
13970
" bzr log file:///tmp/%252False\n"
13971
" bzr log file://localhost/tmp/%252False\n"
13972
" bzr log file:%252False"
13973
13974
#: en/help_topics/url-special-chars.txt:34
13975
msgid "These are valid but do not refer to the same file::"
13976
msgstr "Estas son válidas pero no se refieren al mismo archivo::"
13977
13978
#: en/help_topics/url-special-chars.txt:36
13979
msgid ""
13980
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13981
" bzr log %252False (refers to a file called /tmp/%252False)"
13982
msgstr ""
13983
" bzr log file:///tmp/%2Falso (se refiere al archivo llamado /tmp/\\/also)\n"
13984
" bzr log %252Falso (se refiere al archivo llamado /tmp/%252Falso)"
13985
13986
#: en/help_topics/url-special-chars.txt:39
13987
msgid ""
13988
"Comma also has special meaning in URLs, because it denotes `segment "
13989
"parameters`_"
13990
msgstr ""
13991
13992
#: en/help_topics/url-special-chars.txt:41
13993
msgid ""
13994
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13995
msgstr ""
13996
13997
#: en/help_topics/url-special-chars.txt:43
13998
msgid ""
13999
"Comma is also special in any file system paths that are specified. To use a "
14000
"literal\n"
14001
"comma in a file system path, specify a URL and URL encode the comma::"
14002
msgstr ""
14003
14004
#: en/help_topics/url-special-chars.txt:46
14005
msgid ""
14006
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
14007
"\"branch\" set to \"bla\"\n"
14008
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
14009
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
14010
"\"branch\" set to \"bla\"\n"
14011
msgstr ""
14012
14013
#: en/help_topics/urlspec.txt:1
14014
msgid "URL Identifiers"
14015
msgstr "Identificadores de URL"
14016
14017
#: en/help_topics/urlspec.txt:3
14018
msgid "Supported URL prefixes::"
14019
msgstr "Prefijos de URL permitidos:"
14020
14021
#: en/help_topics/urlspec.txt:5
14022
msgid ""
14023
" aftp:// Access using active FTP.\n"
14024
" bzr:// Fast access using the Bazaar smart server.\n"
14025
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
14026
" file:// Access using the standard filesystem (default)\n"
14027
" ftp:// Access using passive FTP.\n"
14028
" http:// Read-only access of branches exported on the web.\n"
14029
" https:// Read-only access of branches exported on the web using "
14030
"SSL.\n"
14031
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
14032
msgstr ""
14033
14034
#: en/help_topics/urlspec.txt:14
14035
msgid "Supported modifiers::"
14036
msgstr "Modificadores permitidos:"
14037
14038
#: en/help_topics/urlspec.txt:16
14039
msgid " gio+ Access using any GIO supported protocols."
14040
msgstr ""
14041
14042
#: en/help_topics/urlspec.txt:18
14043
msgid "Bazaar supports all of the standard parts within the URL::"
14044
msgstr "Bazaar permite todas las partes estándar con el URL::"
14045
14046
#: en/help_topics/urlspec.txt:20
14047
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
14048
msgstr " <protocolo>://[usuario[:contraseña]@]anfitrión[:puerto]/[ruta]"
14049
14050
#: en/help_topics/urlspec.txt:22
14051
msgid "allowing URLs such as::"
14052
msgstr "permitir URL tales como:"
14053
14054
#: en/help_topics/urlspec.txt:24
14055
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
14056
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
14057
14058
#: en/help_topics/urlspec.txt:26
14059
msgid ""
14060
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
14061
"with '~' as meaning that the rest of the path should be interpreted\n"
14062
"relative to the remote user's home directory. For example if the user\n"
14063
"``remote`` has a home directory of ``/home/remote`` on the server\n"
14064
"shell.example.com, then::"
14065
msgstr ""
14066
14067
#: en/help_topics/urlspec.txt:32
14068
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
14069
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
14070
14071
#: en/help_topics/urlspec.txt:34
14072
msgid "would refer to ``/home/remote/myproject/trunk``."
14073
msgstr "re refieren a «/home/remote/myproject/trunk»."
14074
14075
#: en/help_topics/urlspec.txt:36
14076
msgid ""
14077
"Many commands that accept URLs also accept location aliases too.\n"
14078
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
14079
msgstr ""
14080
"Muchas órdenes que aceptan URL también aceptan alias de ubicaciones.\n"
14081
"Vea :doc:`location-alias-help` y :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1