« back to all changes in this revision
Viewing changes to po/es.po
- browse files at revision 6093.4.72
- compare with another revision
- download diff
- download tarball
- view history from revision 6093.4.72
- Committer: Jelmer Vernooij
- Date: 2012-02-20 12:19:29 UTC
- mfrom: (6437.23.11 2.5)
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/es.po
1
# Spanish translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
# Paco Molinero <paco@byasl.com>, 2011.
6
#
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bzr\n"
10
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
12
"PO-Revision-Date: 2011-12-11 18:15+0000\n"
13
"Last-Translator: Paco Molinero <paco@byasl.com>\n"
14
"Language-Team: Spanish <es@li.org>\n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
"Plural-Forms: nplurals=2; plural=n != 1;\n"
19
"X-Launchpad-Export-Date: 2012-02-04 04:49+0000\n"
20
"X-Generator: Launchpad (build 14738)\n"
21
22
#: bzrlib/add.py:95
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr "omitiendo {0} (mayor que {1} de {2} bytes)"
25
26
#: bzrlib/branch.py:872
27
msgid "Unstacking"
28
msgstr "Desapilando"
29
30
#: bzrlib/branch.py:3205
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr "Subido a la revisión %d."
34
35
#: bzrlib/branch.py:3207
36
#, python-format
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] "%d etiqueta actualizada"
40
msgstr[1] "%d etiquetas actualizadas"
41
42
#: bzrlib/branch.py:3210
43
msgid "No new revisions or tags to push."
44
msgstr "No hay revisiones o etiquetas para subir."
45
46
#: bzrlib/branch.py:3212
47
msgid "No new revisions to push."
48
msgstr "No hay revisiones para subir."
49
50
#: bzrlib/branch.py:3232
51
msgid "checked branch {0} format {1}"
52
msgstr "rama comprobada {0} formato {1}"
53
54
#: bzrlib/branch.py:3235
55
#, python-format
56
msgid "found error:%s"
57
msgstr "error encontrado: %s"
58
59
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
60
#, python-format
61
msgid "Ignoring files outside view. View is %s"
62
msgstr "Ignorando archivos fuera de la vista. La vista es %s"
63
64
#: bzrlib/builtins.py:218
65
#, python-format
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
68
69
#: bzrlib/builtins.py:303
70
msgid "Display status summary."
71
msgstr "Mostrar resumen de estado."
72
73
#: bzrlib/builtins.py:305
74
msgid ""
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
77
msgstr ""
78
"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
79
"agrupados por estado. Los estados posibles son:"
80
81
#: bzrlib/builtins.py:308
82
msgid ""
83
"added\n"
84
" Versioned in the working copy but not in the previous revision."
85
msgstr ""
86
"añadido\n"
87
" Versionado en la copia de trabajo pero no en la revisión anterior."
88
89
#: bzrlib/builtins.py:311
90
msgid ""
91
"removed\n"
92
" Versioned in the previous revision but removed or deleted\n"
93
" in the working copy."
94
msgstr ""
95
"eliminado\n"
96
" Versionado en la revisión anterior pero borrado o eliminado\n"
97
" en la copia de trabajo."
98
99
#: bzrlib/builtins.py:315
100
msgid ""
101
"renamed\n"
102
" Path of this file changed from the previous revision;\n"
103
" the text may also have changed. This includes files whose\n"
104
" parent directory was renamed."
105
msgstr ""
106
"renombrado\n"
107
" La ruta de este archivo ha cambiado desde una revisión anterior;\n"
108
" el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
109
" directorio padre ha sido renombrado."
110
111
#: bzrlib/builtins.py:320
112
msgid ""
113
"modified\n"
114
" Text has changed since the previous revision."
115
msgstr ""
116
"modificado\n"
117
" El texto ha cambiado desde una revisión previa."
118
119
#: bzrlib/builtins.py:323
120
msgid ""
121
"kind changed\n"
122
" File kind has been changed (e.g. from file to directory)."
123
msgstr ""
124
"tipo cambiado\n"
125
" El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
126
127
#: bzrlib/builtins.py:326
128
msgid ""
129
"unknown\n"
130
" Not versioned and not matching an ignore pattern."
131
msgstr ""
132
"desconocido\n"
133
" Ni se ha versionado ni se ha encontrado un patrón ignorado."
134
135
#: bzrlib/builtins.py:329
136
msgid ""
137
"Additionally for directories, symlinks and files with a changed\n"
138
"executable bit, Bazaar indicates their type using a trailing\n"
139
"character: '/', '@' or '*' respectively. These decorations can be\n"
140
"disabled using the '--no-classify' option."
141
msgstr ""
142
"Adicionalmente para directorios, vínculos simbólicos y archivos con el bit "
143
"de\n"
144
"ejecutable cambiado, Bazaar indica su tipo usando un carácter \n"
145
"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
146
"desactivadas usando la opción «--no-classify»."
147
148
#: bzrlib/builtins.py:334
149
msgid ""
150
"To see ignored files use 'bzr ignored'. For details on the\n"
151
"changes to file texts, use 'bzr diff'."
152
msgstr ""
153
"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
154
"cambios de textos en los archivos, use «bzr diff»."
155
156
#: bzrlib/builtins.py:337
157
msgid ""
158
"Note that --short or -S gives status flags for each item, similar\n"
159
"to Subversion's status command. To get output similar to svn -q,\n"
160
"use bzr status -SV."
161
msgstr ""
162
"Note que --short o -S devuelve indicadores de estado para cada elemento, de "
163
"forma\n"
164
"similar a la orden status de Subversion. Para obtener una salida similar a "
165
"svn -q\n"
166
" use bzr status -SV."
167
168
#: bzrlib/builtins.py:341
169
msgid ""
170
"If no arguments are specified, the status of the entire working\n"
171
"directory is shown. Otherwise, only the status of the specified\n"
172
"files or directories is reported. If a directory is given, status\n"
173
"is reported for everything inside that directory."
174
msgstr ""
175
"Si no se indican argumentos, se muestra el estado del directorio de\n"
176
"trabajo completo. De otra forma, solo se informa del estado de los\n"
177
"archivos o directorios indicados. Si se proporciona un directorio, se\n"
178
"informa del estado de todo lo contenido en ese directorio."
179
180
#: bzrlib/builtins.py:346
181
msgid ""
182
"Before merges are committed, the pending merge tip revisions are\n"
183
"shown. To see all pending merge revisions, use the -v option.\n"
184
"To skip the display of pending merge information altogether, use\n"
185
"the no-pending option or specify a file/directory."
186
msgstr ""
187
"Antes de que se confirmen las fusiones, se muestran las sugerencias de\n"
188
"fusión de las revisiones. Para ver todas las fusiones pendientes, use la "
189
"opción -v.\n"
190
"Para evitar que se muestre la información de fusiones pendientes del todo, "
191
"use\n"
192
"la opción no-pending o indique un archivo/directorio."
193
194
#: bzrlib/builtins.py:351
195
msgid ""
196
"To compare the working directory to a specific revision, pass a\n"
197
"single revision to the revision argument."
198
msgstr ""
199
"Para comparar el directorio de trabajo con una revisión concreta, pase una\n"
200
"única revisión como argumento a la revisión."
201
202
#: bzrlib/builtins.py:354
203
msgid ""
204
"To see which files have changed in a specific revision, or between\n"
205
"two revisions, pass a revision range to the revision argument.\n"
206
"This will produce the same results as calling 'bzr diff --summarize'."
207
msgstr ""
208
"Para ver que archivos han cambiado en una revisión concreta, o entre\n"
209
"dos revisiones, pase un rango de revisiones al argumento de la revisión.\n"
210
"Esto producirá los mismos resultados que llamar «bzr diff --summarize»."
211
212
#: bzrlib/builtins.py:363
213
msgid "Use short status indicators."
214
msgstr "Usar indicadores de estado cortos."
215
216
#: bzrlib/builtins.py:365
217
msgid "Only show versioned files."
218
msgstr "Solo mostrar archivos versionados."
219
220
#: bzrlib/builtins.py:367
221
msgid "Don't show pending merges."
222
msgstr "No mostrar fusiones pendientes."
223
224
#: bzrlib/builtins.py:370
225
msgid "Do not mark object type using indicator."
226
msgstr "No marcar tipo de objeto usando indicador."
227
228
#: bzrlib/builtins.py:385
229
msgid "bzr status --revision takes exactly one or two revision specifiers"
230
msgstr ""
231
"bzr status --revision toma exactamente uno o dos especificadores de revisión"
232
233
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
234
msgid "You can only supply one of revision_id or --revision"
235
msgstr "Puede suiministrar solo uno revision_id o --revision"
236
237
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
238
msgid "You must supply either --revision or a revision_id"
239
msgstr "Puede suiministrar ambos revision_id o --revision"
240
241
#: bzrlib/builtins.py:439
242
#, python-format
243
msgid "Repository %r does not support access to raw revision texts"
244
msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
245
246
#: bzrlib/builtins.py:450
247
msgid "The repository {0} contains no revision {1}."
248
msgstr "El repositorio {0} no contiene revisión {1}."
249
250
#: bzrlib/builtins.py:457
251
msgid "You cannot specify a NULL revision."
252
msgstr "No puede especificar una revisión NULL."
253
254
#: bzrlib/builtins.py:549
255
msgid "Remove the working tree from a given branch/checkout."
256
msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
257
258
#: bzrlib/builtins.py:551
259
msgid ""
260
"Since a lightweight checkout is little more than a working tree\n"
261
"this will refuse to run against one."
262
msgstr ""
263
"Dado que una extracción ligera es poco más que un árbol de trabajo\n"
264
"esto impedirá que se ejecute contra una."
265
266
#: bzrlib/builtins.py:554
267
msgid "To re-create the working tree, use \"bzr checkout\"."
268
msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
269
270
#: bzrlib/builtins.py:560
271
msgid ""
272
"Remove the working tree even if it has uncommitted or shelved changes."
273
msgstr ""
274
"Eliminar el árbol de trabajo incluso si tiene cambios no confirmados o "
275
"archivados."
276
277
#: bzrlib/builtins.py:574
278
msgid "No working tree to remove"
279
msgstr "No existe un árbol de trabajo para eliminar"
280
281
#: bzrlib/builtins.py:576
282
msgid "You cannot remove the working tree of a remote path"
283
msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
284
285
#: bzrlib/builtins.py:585
286
msgid "You cannot remove the working tree from a lightweight checkout"
287
msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
288
289
#: bzrlib/builtins.py:625
290
msgid ""
291
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
292
"instead. Use \"--force\" if you are sure you want to reset the working tree."
293
msgstr ""
294
"El árbol no parece estar corrupto. Probablemente quiera «bzr revert» en su "
295
"lugar. Use «--force» si está seguro de que quiere reiniciar el árbol de "
296
"trabajo."
297
298
#: bzrlib/builtins.py:636
299
msgid ""
300
", the header appears corrupt, try passing -r -1 to set the state to the last "
301
"commit"
302
msgstr ""
303
", la cabecera parece corrupta, intente pasando -r -1 para establecer el "
304
"estado del último envío"
305
306
#: bzrlib/builtins.py:640
307
msgid "failed to reset the tree state{0}"
308
msgstr "fallo al restablecer el estado{0} del árbol"
309
310
#: bzrlib/builtins.py:644
311
msgid "Show current revision number."
312
msgstr "Mostrar número de revisión actual."
313
314
#: bzrlib/builtins.py:646
315
msgid "This is equal to the number of revisions on this branch."
316
msgstr "Esto es igual al número de revisiones en esta rama."
317
318
#: bzrlib/builtins.py:659
319
msgid "--tree and --revision can not be used together"
320
msgstr "--tree y --revision no se pueden usar juntos"
321
322
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
323
msgid "Tags can only be placed on a single revision, not on a range"
324
msgstr ""
325
"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
326
327
#: bzrlib/builtins.py:700
328
msgid "Show revno of working tree."
329
msgstr "Mostrar número de revisión del árbol de trabajo."
330
331
#: bzrlib/builtins.py:748
332
msgid "Add specified files or directories."
333
msgstr "Añadir archivos especificados o directorios."
334
335
#: bzrlib/builtins.py:750
336
msgid ""
337
"In non-recursive mode, all the named items are added, regardless\n"
338
"of whether they were previously ignored. A warning is given if\n"
339
"any of the named files are already versioned."
340
msgstr ""
341
"En el modo no recursivo, todos los puntos mencionados se añaden, \n"
342
"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
343
"cualquiera de los archivos nombrados ya está versionado."
344
345
#: bzrlib/builtins.py:754
346
msgid ""
347
"In recursive mode (the default), files are treated the same way\n"
348
"but the behaviour for directories is different. Directories that\n"
349
"are already versioned do not give a warning. All directories,\n"
350
"whether already versioned or not, are searched for files or\n"
351
"subdirectories that are neither versioned or ignored, and these\n"
352
"are added. This search proceeds recursively into versioned\n"
353
"directories. If no names are given '.' is assumed."
354
msgstr ""
355
"En modo recursivo (predeterminado), los archivos se tratan de la misma "
356
"manera\n"
357
"pero el comportamiento para directorios es diferente. Los directorios que\n"
358
"ya han sido versionados no generan un aviso. Todos los directorios,\n"
359
"hayan sido versionados o no, son recorridos buscando archivos o\n"
360
"subdirectorios que no hayan sido versionados o ignorados, y estos\n"
361
"son añadidos. Esta búsqueda procede recursivamente por los directorios\n"
362
"versionados. SI no se indican nombres se asume «.»."
363
364
#: bzrlib/builtins.py:762
365
msgid ""
366
"A warning will be printed when nested trees are encountered,\n"
367
"unless they are explicitly ignored."
368
msgstr ""
369
370
#: bzrlib/builtins.py:765
371
msgid ""
372
"Therefore simply saying 'bzr add' will version all files that\n"
373
"are currently unknown."
374
msgstr ""
375
"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
376
"desconocidos actualmente."
377
378
#: bzrlib/builtins.py:768
379
msgid ""
380
"Adding a file whose parent directory is not versioned will\n"
381
"implicitly add the parent, and so on up to the root. This means\n"
382
"you should never need to explicitly add a directory, they'll just\n"
383
"get added when you add a file in the directory."
384
msgstr ""
385
"Al añadir un archivos cuyo padre no esté versionado añadirá\n"
386
"implícitamente al padre, y así sucesivamente hasta la raíz. Esto\n"
387
"significa que nunca necesitaría añadir explícitamente un directorio,\n"
388
"ya que serán añadidos cuando añada un archivo del directorio."
389
390
#: bzrlib/builtins.py:773
391
msgid ""
392
"--dry-run will show which files would be added, but not actually\n"
393
"add them."
394
msgstr ""
395
"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
396
"añade realmente."
397
398
#: bzrlib/builtins.py:776
399
msgid ""
400
"--file-ids-from will try to use the file ids from the supplied path.\n"
401
"It looks up ids trying to find a matching parent directory with the\n"
402
"same filename, and then by pure path. This option is rarely needed\n"
403
"but can be useful when adding the same logical file into two\n"
404
"branches that will be merged later (without showing the two different\n"
405
"adds as a conflict). It is also useful when merging another project\n"
406
"into a subdirectory of this one."
407
msgstr ""
408
"--file-ids-from intentará usar el archivo de ids de la ruta proporcionada.\n"
409
"Busca ids intentado encontrar un directorio padre que coincida con el\n"
410
"mismo nombre de archivo, y luego por ruta pura. Esta opción raramente\n"
411
"se necesita pero puede ser útil al añadir el mismo archivo lógico en dos\n"
412
"ramas que se fusionarán posteriormente (sin mostrar las dos adiciones\n"
413
"diferentes como un conflicto). También es útil al fusionar otro proyecto\n"
414
"en un subdirectorio de éste."
415
416
#: bzrlib/builtins.py:784
417
msgid ""
418
"Any files matching patterns in the ignore list will not be added\n"
419
"unless they are explicitly mentioned."
420
msgstr ""
421
"Cualquier archivo que coincida con los patrones en la lista de ignorados no "
422
"se añadirá\n"
423
"salvo que se mencione explícitamente."
424
425
#: bzrlib/builtins.py:787
426
msgid ""
427
"In recursive mode, files larger than the configuration option \n"
428
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
429
"to file size."
430
msgstr ""
431
"En modo recursivo, los archivos mayores que la opción de configuración \n"
432
"add.maximum_file_size se omitirán. Los elementos nombrados nunca se "
433
"omitirán\n"
434
"por su tamaño."
435
436
#: bzrlib/builtins.py:794
437
msgid "Don't recursively add the contents of directories."
438
msgstr "No añade de manera recursiva los contenidos de los directorios."
439
440
#: bzrlib/builtins.py:800
441
msgid "Lookup file ids from this tree."
442
msgstr "Buscar id de archivos desde este árbol."
443
444
#: bzrlib/builtins.py:836
445
msgid "ignored {0} matching \"{1}\"\n"
446
msgstr "ignorado {0} coincidente «{1}»\n"
447
448
#: bzrlib/builtins.py:841
449
msgid "Create a new versioned directory."
450
msgstr "Crear un directorio versionado nuevo."
451
452
#: bzrlib/builtins.py:843
453
msgid "This is equivalent to creating the directory and then adding it."
454
msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
455
456
#: bzrlib/builtins.py:850
457
msgid "No error if existing, make parent directories as needed."
458
msgstr ""
459
460
#: bzrlib/builtins.py:884
461
#, python-format
462
msgid "added %s\n"
463
msgstr "añadido %s\n"
464
465
#: bzrlib/builtins.py:926
466
#, python-format
467
msgid "invalid kind %r specified"
468
msgstr "tipo inválido %r especificado"
469
470
#: bzrlib/builtins.py:963
471
msgid "Move or rename a file."
472
msgstr "Mover o renombrar un archivo."
473
474
#: bzrlib/builtins.py:965
475
msgid " bzr mv SOURCE... DESTINATION"
476
msgstr " bzr mv ORIGEN... DESTINO"
477
478
#: bzrlib/builtins.py:967
479
msgid ""
480
"If the last argument is a versioned directory, all the other names\n"
481
"are moved into it. Otherwise, there must be exactly two arguments\n"
482
"and the file is changed to a new name."
483
msgstr ""
484
"Si el último argumento es un directorio versionado, todos los demás nombres\n"
485
"se moverán a él. De otra forma, deben haber exactamente dos argumentos\n"
486
"y el archivo se cambia al nuevo nombre."
487
488
#: bzrlib/builtins.py:971
489
msgid ""
490
"If OLDNAME does not exist on the filesystem but is versioned and\n"
491
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
492
"assumes that the file has been manually moved and only updates\n"
493
"its internal inventory to reflect that change.\n"
494
"The same is valid when moving many SOURCE files to a DESTINATION."
495
msgstr ""
496
"Si NOMBREANTIGUO no existe en el sistema de archivos pero esta versionado y\n"
497
"NOMBRENUEVO existe en el sistema de archivos pero no está versionado, mv\n"
498
"asume que el archivo se ha movido manualmente y sólo actualiza su\n"
499
"inventario interno para reflejar ese cambio.\n"
500
"Lo mismo es válido cuando se mueven muchos archivos ORIGEN a un DESTINO."
501
502
#: bzrlib/builtins.py:977
503
msgid "Files cannot be moved between branches."
504
msgstr "Los archivos no se pueden mover entre ramas."
505
506
#: bzrlib/builtins.py:984
507
msgid ""
508
"Move only the bzr identifier of the file, because the file has already been "
509
"moved."
510
msgstr ""
511
"Mover solo el identificador bzr del archivo, porque el archivo ya ha sido "
512
"movido."
513
514
#: bzrlib/builtins.py:986
515
msgid "Automatically guess renames."
516
msgstr "Adivinar automáticamente rel renombrado."
517
518
#: bzrlib/builtins.py:987
519
msgid "Avoid making changes when guessing renames."
520
msgstr "Evitar hacer cambios cunado se adivina el renombrado."
521
522
#: bzrlib/builtins.py:996
523
msgid "--dry-run requires --auto."
524
msgstr "--dry-run requiere --auto."
525
526
#: bzrlib/builtins.py:1000
527
msgid "missing file argument"
528
msgstr "falta el argumento de archivo"
529
530
#: bzrlib/builtins.py:1004
531
msgid "can not move root of branch"
532
msgstr "no se puede mover la raíz de la rama"
533
534
#: bzrlib/builtins.py:1010
535
msgid "Only one path may be specified to --auto."
536
msgstr "Solo se puede especificar una ruta a --auto"
537
538
#: bzrlib/builtins.py:1013
539
msgid "--after cannot be specified with --auto."
540
msgstr "--after no se puede especificar con --auto."
541
542
#: bzrlib/builtins.py:1050
543
msgid "to mv multiple files the destination must be a versioned directory"
544
msgstr ""
545
"para hacer mv a múltiples archivos el destino debe ser un directorio "
546
"versionado"
547
548
#: bzrlib/builtins.py:1102
549
msgid "Turn this branch into a mirror of another branch."
550
msgstr "Cambiar esta rama a una réplica de otra rama."
551
552
#: bzrlib/builtins.py:1104
553
msgid ""
554
"By default, this command only works on branches that have not diverged.\n"
555
"Branches are considered diverged if the destination branch's most recent \n"
556
"commit is one that has not been merged (directly or indirectly) into the \n"
557
"parent."
558
msgstr ""
559
"Predeterminado, esta orden solo funciona en ramas que no han divergido.\n"
560
"Las ramas se consideran divergidas si la confirmación más reciente de la \n"
561
"rama destino es una que no ha sido fusionada (directa o indirectamente) \n"
562
"en el padre."
563
564
#: bzrlib/builtins.py:1109
565
msgid ""
566
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
567
"from one into the other. Once one branch has merged, the other should\n"
568
"be able to pull it again."
569
msgstr ""
570
"Si las ramas han divergido, puede usar «bzr merge» para integrar los "
571
"cambios\n"
572
"de una en la otra. Una vez que una rama se ha fusionado, la otra debería\n"
573
"ser capaz de extraer de nuevo."
574
575
#: bzrlib/builtins.py:1113
576
msgid ""
577
"If you want to replace your local changes and just want your branch to\n"
578
"match the remote one, use pull --overwrite. This will work even if the two\n"
579
"branches have diverged."
580
msgstr ""
581
"Si quiere reemplazar su cambios locales y solo quiere que su rama\n"
582
"coincida con la remota, use pull --overwrite. Esto funcionará incluso\n"
583
"si las dos ramas han divergido."
584
585
#: bzrlib/builtins.py:1117
586
msgid ""
587
"If there is no default location set, the first pull will set it (use\n"
588
"--no-remember to avoid setting it). After that, you can omit the\n"
589
"location to use the default. To change the default, use --remember. The\n"
590
"value will only be saved if the remote location can be accessed."
591
msgstr ""
592
"Si no hay ubicación predeterminada establecida, la primera extracción la \n"
593
"establecerá (use --no-remember para evitarlo). Después puede omitir la \n"
594
"ubicación para usar la predeterminada. Para cambiarla, use --remember. El\n"
595
"valor solo se guardará si la ubicación remota es accesible."
596
597
#: bzrlib/builtins.py:1122
598
msgid ""
599
"The --verbose option will display the revisions pulled using the log_format\n"
600
"configuration option. You can use a different format by overriding it with\n"
601
"-Olog_format=<other_format>."
602
msgstr ""
603
"La opción --verbose mostrará las revisiones extraídas usando la opción de\n"
604
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
605
"con -Olog_format=<otro_formato>."
606
607
#: bzrlib/builtins.py:1126
608
msgid ""
609
"Note: The location can be specified either in the form of a branch,\n"
610
"or in the form of a path to a file containing a merge directive generated\n"
611
"with bzr send."
612
msgstr ""
613
"Nota: la ubicación se puede indicar bien en forma de una rama,\n"
614
"o en forma de una ruta a un archivo conteniendo una directiva de\n"
615
"fusión generada con bzr send."
616
617
#: bzrlib/builtins.py:1134
618
msgid "Show logs of pulled revisions."
619
msgstr "Mostrar registros de revisiones extraídas."
620
621
#: bzrlib/builtins.py:1136
622
msgid ""
623
"Branch to pull into, rather than the one containing the working directory."
624
msgstr ""
625
"Rama en la que extraer, en lugar de la que contiene el directorio de trabajo."
626
627
#: bzrlib/builtins.py:1139
628
msgid ""
629
"Perform a local pull in a bound branch. Local pulls are not applied to the "
630
"master branch."
631
msgstr ""
632
"Efectuar una extracción local en una rama ligada. Las extracciones locales "
633
"no se aplican a la rama maestra."
634
635
#: bzrlib/builtins.py:1168
636
msgid "Need working tree for --show-base."
637
msgstr "Se necesita árbol de trabajo para --show-base."
638
639
#: bzrlib/builtins.py:1184
640
msgid "No pull location known or specified."
641
msgstr "Ubicación de extración no conocida ni indicada."
642
643
#: bzrlib/builtins.py:1190
644
#, python-format
645
msgid "Using saved parent location: %s\n"
646
msgstr "Usar ubicaciones padre guardadas: %s\n"
647
648
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
649
msgid "Cannot use -r with merge directives or bundles"
650
msgstr "No se puede usar -r con directivas de fusión o paquetes"
651
652
#: bzrlib/builtins.py:1238
653
msgid "Update a mirror of this branch."
654
msgstr "Actualizar una réplica de esta rama."
655
656
#: bzrlib/builtins.py:1240
657
msgid ""
658
"The target branch will not have its working tree populated because this\n"
659
"is both expensive, and is not supported on remote file systems."
660
msgstr ""
661
"El árbol de trabajo de la rama destino no se rellenará porque esto\n"
662
"es tanto costoso como no soportado por sistemas de archivos remotos."
663
664
#: bzrlib/builtins.py:1243
665
msgid ""
666
"Some smart servers or protocols *may* put the working tree in place in\n"
667
"the future."
668
msgstr ""
669
"Algunos servidores inteligentes o protocolos *pueden* poner el árbol de "
670
"trabajo\n"
671
"en su lugar en el futuro."
672
673
#: bzrlib/builtins.py:1246
674
msgid ""
675
"This command only works on branches that have not diverged. Branches are\n"
676
"considered diverged if the destination branch's most recent commit is one\n"
677
"that has not been merged (directly or indirectly) by the source branch."
678
msgstr ""
679
"Esta orden solo funciona en ramas que no han divergido. Las ramas se\n"
680
"consideran divergidas si la confirmación más reciente de la rama destino es\n"
681
"una que no ha sido fusionada (directa o indirectamente) por la rama origen."
682
683
#: bzrlib/builtins.py:1250
684
msgid ""
685
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
686
"the other branch completely, discarding its unmerged changes."
687
msgstr ""
688
"Si las ramas tienen divergencias, puede usar «bzr push --overwrite» para "
689
"reemplazar\n"
690
"la otra rama completamente, descartando sus cambios no fusionados."
691
692
#: bzrlib/builtins.py:1253
693
msgid ""
694
"If you want to ensure you have the different changes in the other branch,\n"
695
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
696
"After that you will be able to do a push without '--overwrite'."
697
msgstr ""
698
"Si quiere asegurarse de que tiene los distintos cambios de la otra rama,\n"
699
"haga una fusión (vea bzr help merge) desde la otra rama y confirmela.\n"
700
"Después eso será capaz de hacer una inserción sin «--overwrite»."
701
702
#: bzrlib/builtins.py:1257
703
msgid ""
704
"If there is no default push location set, the first push will set it (use\n"
705
"--no-remember to avoid setting it). After that, you can omit the\n"
706
"location to use the default. To change the default, use --remember. The\n"
707
"value will only be saved if the remote location can be accessed."
708
msgstr ""
709
710
#: bzrlib/builtins.py:1262
711
msgid ""
712
"The --verbose option will display the revisions pushed using the log_format\n"
713
"configuration option. You can use a different format by overriding it with\n"
714
"-Olog_format=<other_format>."
715
msgstr ""
716
"La opción --verbose mostrará las revisiones insertadas usando la opción de\n"
717
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
718
"con -Olog_format=<otro_formato>."
719
720
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
721
msgid ""
722
"Branch to push from, rather than the one containing the working directory."
723
msgstr ""
724
"Rama desde la que impulsar en vez de la que contiene el directorio de "
725
"trabajo."
726
727
#: bzrlib/builtins.py:1276
728
msgid ""
729
"By default push will fail if the target directory exists, but does not "
730
"already have a control directory. This flag will allow push to proceed."
731
msgstr ""
732
"Por defecto «push» fallará si el directorio destino existe, pero no tiene "
733
"todavía un directorio de control. Este marcador permitirá a «push» proceder."
734
735
#: bzrlib/builtins.py:1281
736
msgid ""
737
"Create a stacked branch that references the public location of the parent "
738
"branch."
739
msgstr ""
740
"Crear una rama apilada que referencia a la ubicación pública de la rama "
741
"padre."
742
743
#: bzrlib/builtins.py:1284
744
msgid ""
745
"Create a stacked branch that refers to another branch for the commit "
746
"history. Only the work not present in the referenced branch is included in "
747
"the branch created."
748
msgstr ""
749
"Crear una rama apilada que se refiera a otra para historial de "
750
"confirmaciones. Solo el trabajo no presente en la rama referenciada se "
751
"incluye en la rama creada."
752
753
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
754
msgid ""
755
"Refuse to push if there are uncommitted changes in the working tree, --no-"
756
"strict disables the check."
757
msgstr ""
758
"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
759
"strict desactiva la comprobación."
760
761
#: bzrlib/builtins.py:1292
762
msgid "Don't populate the working tree, even for protocols that support it."
763
msgstr ""
764
"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
765
766
#: bzrlib/builtins.py:1336
767
msgid "Could not determine branch to refer to."
768
msgstr "No se puede determinar la rama a la que referirse."
769
770
#: bzrlib/builtins.py:1345
771
#, python-format
772
msgid ""
773
"No push location known or specified. To push to the parent branch (at %s), "
774
"use 'bzr push :parent'."
775
msgstr ""
776
"Ubicación de inserción no conocida ni indicada. Para insertar en la rama "
777
"padre (en %s), use «bzr push :parent»."
778
779
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
780
msgid "No push location known or specified."
781
msgstr "No hay una ubicación para impulsar conocida o especificada."
782
783
#: bzrlib/builtins.py:1355
784
#, python-format
785
msgid "Using saved push location: %s"
786
msgstr "Usar la ubicación para impulsar guardada: %s"
787
788
#: bzrlib/builtins.py:1365
789
msgid "Create a new branch that is a copy of an existing branch."
790
msgstr "Crea una nueva rama que es una copia de la rama existente."
791
792
#: bzrlib/builtins.py:1367
793
msgid ""
794
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
795
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
796
"./bar.\n"
797
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
798
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
799
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
800
"create ./foo-bar."
801
msgstr ""
802
803
#: bzrlib/builtins.py:1374
804
msgid ""
805
"To retrieve the branch as of a particular revision, supply the --revision\n"
806
"parameter, as in \"branch foo/bar -r 5\"."
807
msgstr ""
808
"Para conseguir la rama de una revisión particular, proporcione el parámetro -"
809
"-revision\n"
810
"como en «branch foo/bar -r 5»."
811
812
#: bzrlib/builtins.py:1377
813
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
814
msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
815
816
#: bzrlib/builtins.py:1387
817
msgid "Create a branch without a working-tree."
818
msgstr "Crear una rama sin directorio de trabajo."
819
820
#: bzrlib/builtins.py:1389
821
msgid "Switch the checkout in the current directory to the new branch."
822
msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
823
824
#: bzrlib/builtins.py:1392
825
msgid ""
826
"Create a stacked branch referring to the source branch. The new branch will "
827
"depend on the availability of the source branch for all operations."
828
msgstr ""
829
"Crear una rama apilada refiriéndose a la rama origen. La nueva rama "
830
"dependerá de la disponibilidad de la rama fuente para todas las operaciones."
831
832
#: bzrlib/builtins.py:1396
833
msgid "Do not use a shared repository, even if available."
834
msgstr "No usar un repositorio compartido, incluso si está disponible."
835
836
#: bzrlib/builtins.py:1398
837
msgid ""
838
"By default branch will fail if the target directory exists, but does not "
839
"already have a control directory. This flag will allow branch to proceed."
840
msgstr ""
841
"Por defecto «branch» fallará si el directorio destino existe, pero no tiene "
842
"todavía un directorio de control. Este marcador permitirá a «branch» "
843
"proceder."
844
845
#: bzrlib/builtins.py:1403
846
msgid "Bind new branch to from location."
847
msgstr "Vincular una rama nueva desde la ubicación."
848
849
#: bzrlib/builtins.py:1450
850
#, python-format
851
msgid "Target directory \"%s\" already exists."
852
msgstr "El directorio objetivo «%s» ya existe."
853
854
#: bzrlib/builtins.py:1462
855
#, python-format
856
msgid "Parent of \"%s\" does not exist."
857
msgstr "El padre de «%s» no existe."
858
859
#: bzrlib/builtins.py:1481
860
msgid "The branch {0} has no revision {1}."
861
msgstr "La rama {0} no tiene revisión {1}."
862
863
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
864
#, python-format
865
msgid "Created new stacked branch referring to %s."
866
msgstr "Creada rama apilada nueva referida a %s."
867
868
#: bzrlib/builtins.py:1500
869
#, python-format
870
msgid "Branched %d revision."
871
msgid_plural "Branched %d revisions."
872
msgstr[0] "%d revisión enramada"
873
msgstr[1] "%d revisiones enramadas"
874
875
#: bzrlib/builtins.py:1505
876
#, python-format
877
msgid "New branch bound to %s"
878
msgstr "Nueva rama unida a %s"
879
880
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
881
#, python-format
882
msgid "Switched to branch: %s"
883
msgstr "Cambiado a la rama: %s"
884
885
#: bzrlib/builtins.py:1515
886
msgid "List the branches available at the current location."
887
msgstr "Lista las ramas disponibles en la ubicación actual."
888
889
#: bzrlib/builtins.py:1517
890
msgid ""
891
"This command will print the names of all the branches at the current\n"
892
"location."
893
msgstr ""
894
"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
895
"actual."
896
897
#: bzrlib/builtins.py:1524
898
msgid ""
899
"Recursively scan for branches rather than just looking in the specified "
900
"location."
901
msgstr ""
902
"Buscar recursivamente en las ramas en lugar de mirar solo en la ubicación "
903
"indicada."
904
905
#: bzrlib/builtins.py:1554
906
msgid "(default)"
907
msgstr "(predeterminado)"
908
909
#: bzrlib/builtins.py:1566
910
msgid "Create a new checkout of an existing branch."
911
msgstr "Crea una nueva comprobación de una rama existente."
912
913
#: bzrlib/builtins.py:1568
914
msgid ""
915
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
916
"for\n"
917
"the branch found in '.'. This is useful if you have removed the working "
918
"tree\n"
919
"or if it was never created - i.e. if you pushed the branch to its current\n"
920
"location using SFTP."
921
msgstr ""
922
923
#: bzrlib/builtins.py:1573
924
msgid ""
925
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
926
"will\n"
927
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
928
"./bar.\n"
929
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
930
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
931
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
932
"create ./foo-bar."
933
msgstr ""
934
935
#: bzrlib/builtins.py:1580
936
msgid ""
937
"To retrieve the branch as of a particular revision, supply the --revision\n"
938
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
939
"immediately\n"
940
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
941
"old\n"
942
"code.)"
943
msgstr ""
944
"Para recuperar la rama de una revisión particular, proporcione el parámetro\n"
945
"--revision, como en «checkout foo/bar -r 5». Note que esto estará "
946
"inmediatamente\n"
947
"desfasado [por lo que no puede confirmar] pero aún así puede ser útil (por \n"
948
"ejemplo, para examinar código antiguo)."
949
950
#: bzrlib/builtins.py:1590
951
msgid ""
952
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
953
"the branch for every operation. Normal checkouts can perform common "
954
"operations like diff and status without such access, and also support local "
955
"commits."
956
msgstr ""
957
"Realizar una extracción ligera. Las extracciones ligeras depende del acceso "
958
"a la rama para cada operación. Las extracciones normales pueden realizar "
959
"operaciones habituales como diff y status sin este acceso, así como permitir "
960
"confirmaciones locales."
961
962
#: bzrlib/builtins.py:1597
963
msgid "Get file contents from this tree."
964
msgstr "Conseguir contenidos de archivo desde este árbol."
965
966
#: bzrlib/builtins.py:1599
967
msgid "Hard-link working tree files where possible."
968
msgstr ""
969
"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
970
971
#: bzrlib/builtins.py:1640
972
msgid ""
973
"Show list of renamed files.\n"
974
" "
975
msgstr ""
976
"Mostrar la lista de archivos renombrados\n"
977
" "
978
979
#: bzrlib/builtins.py:1670
980
msgid "Update a working tree to a new revision."
981
msgstr "Actualiza un árbol de trabajo a una revisión nueva."
982
983
#: bzrlib/builtins.py:1672
984
msgid ""
985
"This will perform a merge of the destination revision (the tip of the\n"
986
"branch, or the specified revision) into the working tree, and then make\n"
987
"that revision the basis revision for the working tree. "
988
msgstr ""
989
"Efectuará una fusión de la revisión de destino (el extremo de la\n"
990
"rama, o la revisión indicada) en el árbol de trabajo, y hará esa\n"
991
"revisión la revisión base del árbol de trabajo. "
992
993
#: bzrlib/builtins.py:1676
994
msgid ""
995
"You can use this to visit an older revision, or to update a working tree\n"
996
"that is out of date from its branch."
997
msgstr ""
998
"Puede usar esto para visitar una revisión antigua, o para actualizar un "
999
"árbol de trabajo\n"
1000
"que esté desactualizado de su rama."
1001
1002
#: bzrlib/builtins.py:1679
1003
msgid ""
1004
"If there are any uncommitted changes in the tree, they will be carried\n"
1005
"across and remain as uncommitted changes after the update. To discard\n"
1006
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1007
"with the changes brought in by the change in basis revision."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1684
1011
msgid ""
1012
"If the tree's branch is bound to a master branch, bzr will also update\n"
1013
"the branch from the master."
1014
msgstr ""
1015
"Si la rama del árbol esta atada a una rama superior, bzr también "
1016
"actualizará\n"
1017
"la rama de la superior."
1018
1019
#: bzrlib/builtins.py:1687
1020
msgid ""
1021
"You cannot update just a single file or directory, because each Bazaar\n"
1022
"working tree has just a single basis revision. If you want to restore a\n"
1023
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1024
"update'. If you want to restore a file to its state in a previous\n"
1025
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1026
"out the old content of that file to a new location."
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:1694
1030
msgid ""
1031
"The 'dir' argument, if given, must be the location of the root of a\n"
1032
"working tree to update. By default, the working tree that contains the \n"
1033
"current working directory is used."
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:1710
1037
msgid "bzr update --revision takes exactly one revision"
1038
msgstr "bzr update --revision toma exactamente una revisión"
1039
1040
#: bzrlib/builtins.py:1718
1041
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1042
msgstr ""
1043
"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
1044
1045
#: bzrlib/builtins.py:1749
1046
msgid "Tree is up to date at revision {0} of branch {1}"
1047
msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
1048
1049
#: bzrlib/builtins.py:1765
1050
#, python-format
1051
msgid ""
1052
"branch has no revision %s\n"
1053
"bzr update --revision only works for a revision in the branch history"
1054
msgstr ""
1055
"la rama no tiene revisión %s\n"
1056
"bzr update --revision solo funciona para una revisión en el histórico de la "
1057
"rama"
1058
1059
#: bzrlib/builtins.py:1771
1060
msgid "Updated to revision {0} of branch {1}"
1061
msgstr "Actualizado a la revisión {0} de la rama {1}"
1062
1063
#: bzrlib/builtins.py:1775
1064
msgid ""
1065
"Your local commits will now show as pending merges with 'bzr status', and "
1066
"can be committed with 'bzr commit'."
1067
msgstr ""
1068
"Sus confirmaciones locales serán ahora mostradas como fusiones pendientes "
1069
"con «bzr status», y pueden ser confirmadas con «bzr commit»."
1070
1071
#: bzrlib/builtins.py:1784
1072
msgid "Show information about a working tree, branch or repository."
1073
msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
1074
1075
#: bzrlib/builtins.py:1786
1076
msgid ""
1077
"This command will show all known locations and formats associated to the\n"
1078
"tree, branch or repository."
1079
msgstr ""
1080
"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
1081
"árbol, rama o repositorio."
1082
1083
#: bzrlib/builtins.py:1789
1084
msgid ""
1085
"In verbose mode, statistical information is included with each report.\n"
1086
"To see extended statistic information, use a verbosity level of 2 or\n"
1087
"higher by specifying the verbose option multiple times, e.g. -vv."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:1793
1091
msgid "Branches and working trees will also report any missing revisions."
1092
msgstr ""
1093
"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
1094
"que falte."
1095
1096
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1097
#: bzrlib/builtins.py:6442
1098
msgid ":Examples:"
1099
msgstr ":Ejemplos:"
1100
1101
#: bzrlib/builtins.py:1797
1102
msgid " Display information on the format and related locations:"
1103
msgstr " Muestra información en el formato y ubicaciones relacionadas:"
1104
1105
#: bzrlib/builtins.py:1799
1106
msgid " bzr info"
1107
msgstr " información bzr"
1108
1109
#: bzrlib/builtins.py:1801
1110
msgid ""
1111
" Display the above together with extended format information and\n"
1112
" basic statistics (like the number of files in the working tree and\n"
1113
" number of revisions in the branch and repository):"
1114
msgstr ""
1115
1116
#: bzrlib/builtins.py:1805
1117
msgid " bzr info -v"
1118
msgstr " bzr info -v"
1119
1120
#: bzrlib/builtins.py:1807
1121
msgid " Display the above together with number of committers to the branch:"
1122
msgstr " Mostrar lo anterior junto con el número de aplicadores de la rama:"
1123
1124
#: bzrlib/builtins.py:1809
1125
msgid " bzr info -vv"
1126
msgstr " bzr info -vv"
1127
1128
#: bzrlib/builtins.py:1828
1129
msgid "Remove files or directories."
1130
msgstr "Elimina archivos o directorios."
1131
1132
#: bzrlib/builtins.py:1830
1133
msgid ""
1134
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1135
"delete them if they can easily be recovered using revert otherwise they\n"
1136
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1137
"parameters are given Bazaar will scan for files that are being tracked by\n"
1138
"Bazaar but missing in your tree and stop tracking them for you."
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:1838
1142
msgid "Only remove files that have never been committed."
1143
msgstr "Eliminar solo los archivos que nunca se han aplicado."
1144
1145
#: bzrlib/builtins.py:1840
1146
msgid "The file deletion mode to be used."
1147
msgstr "El modo de borrado de archivo a usar."
1148
1149
#: bzrlib/builtins.py:1841
1150
msgid "Deletion Strategy"
1151
msgstr "Estrategia de borrado"
1152
1153
#: bzrlib/builtins.py:1842
1154
msgid "Backup changed files (default)."
1155
msgstr "Copiar archivos modificados (predeterminado)."
1156
1157
#: bzrlib/builtins.py:1843
1158
msgid "Delete from bzr but leave the working copy."
1159
msgstr "Borrar de bzr pero dejar la copia de trabajo."
1160
1161
#: bzrlib/builtins.py:1844
1162
msgid "Don't backup changed files."
1163
msgstr "No copiar los archivos modificados."
1164
1165
#: bzrlib/builtins.py:1845
1166
msgid ""
1167
"Delete all the specified files, even if they can not be recovered and even "
1168
"if they are non-empty directories. (deprecated, use no-backup)"
1169
msgstr ""
1170
"Borrar todos los archivos indicados, incluso si no pueden ser recuperados y "
1171
"aunque existan directorios no vacíos (obsoleto, use no-backup)."
1172
1173
#: bzrlib/builtins.py:1854
1174
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1175
msgstr ""
1176
"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
1177
1178
#: bzrlib/builtins.py:1871
1179
msgid "No matching files."
1180
msgstr "No hay archivos coincidentes."
1181
1182
#: bzrlib/builtins.py:1932
1183
msgid "Reconcile bzr metadata in a branch."
1184
msgstr "Reconcilia metadatos bzr en una rama."
1185
1186
#: bzrlib/builtins.py:1934
1187
msgid ""
1188
"This can correct data mismatches that may have been caused by\n"
1189
"previous ghost operations or bzr upgrades. You should only\n"
1190
"need to run this command if 'bzr check' or a bzr developer\n"
1191
"advises you to run it."
1192
msgstr ""
1193
1194
#: bzrlib/builtins.py:1939
1195
msgid ""
1196
"If a second branch is provided, cross-branch reconciliation is\n"
1197
"also attempted, which will check that data like the tree root\n"
1198
"id which was not present in very early bzr versions is represented\n"
1199
"correctly in both branches."
1200
msgstr ""
1201
1202
#: bzrlib/builtins.py:1944
1203
msgid ""
1204
"At the same time it is run it may recompress data resulting in\n"
1205
"a potential saving in disk space or performance gain."
1206
msgstr ""
1207
"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
1208
"un ahorro potencial de espacio en disco o aumento el rendimiento."
1209
1210
#: bzrlib/builtins.py:1947
1211
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1212
msgstr ""
1213
"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
1214
"o sftp."
1215
1216
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1217
msgid ""
1218
"Format for the bzr 2.0 series.\n"
1219
"Uses group-compress storage.\n"
1220
"Provides rich roots which are a one-way transition.\n"
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1224
msgid ""
1225
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1226
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1230
msgid "The 2a format with experimental support for colocated branches.\n"
1231
msgstr ""
1232
1233
#: bzrlib/builtins.py:2015
1234
msgid "Make a directory into a versioned branch."
1235
msgstr "Hacer un directorio en una rama versionada."
1236
1237
#: bzrlib/builtins.py:2017
1238
msgid ""
1239
"Use this to create an empty branch, or before importing an\n"
1240
"existing project."
1241
msgstr ""
1242
"Use esto para crear una rama nueva o antes de importar un\n"
1243
"proyecto existente."
1244
1245
#: bzrlib/builtins.py:2020
1246
msgid ""
1247
"If there is a repository in a parent directory of the location, then\n"
1248
"the history of the branch will be stored in the repository. Otherwise\n"
1249
"init creates a standalone branch which carries its own history\n"
1250
"in the .bzr directory."
1251
msgstr ""
1252
"SI hay un repositorio en un directorio padre de la ubicación, el\n"
1253
"historial de la rama se almacenará en el repositorio. En otro caso\n"
1254
"init crea una rama independiente que lleva su propio historial \n"
1255
"en el directorio .bzr."
1256
1257
#: bzrlib/builtins.py:2025
1258
msgid ""
1259
"If there is already a branch at the location but it has no working tree,\n"
1260
"the tree can be populated with 'bzr checkout'."
1261
msgstr ""
1262
"Si existe ya una rama en la ubicación, pero no tiene árbol de trabajo,\n"
1263
"se puede poblar el árbol con «bzr checkout»."
1264
1265
#: bzrlib/builtins.py:2028
1266
msgid "Recipe for importing a tree of files::"
1267
msgstr "Recipiente para importar un árbol de archivos:"
1268
1269
#: bzrlib/builtins.py:2030
1270
msgid ""
1271
" cd ~/project\n"
1272
" bzr init\n"
1273
" bzr add .\n"
1274
" bzr status\n"
1275
" bzr commit -m \"imported project\""
1276
msgstr ""
1277
" cd ~/project\n"
1278
" bzr init\n"
1279
" bzr add .\n"
1280
" bzr status\n"
1281
" bzr commit -m «proyecto importado»"
1282
1283
#: bzrlib/builtins.py:2041
1284
msgid ""
1285
"Create the path leading up to the branch if it does not already exist."
1286
msgstr "Crea la ruta que conduce a la rama si no existe ya."
1287
1288
#: bzrlib/builtins.py:2044
1289
msgid "Specify a format for this branch. See \"help formats\"."
1290
msgstr "Especificar un formato para esta rama. Vea «help formats»"
1291
1292
#: bzrlib/builtins.py:2052
1293
msgid ""
1294
"Never change revnos or the existing log. Append revisions to it only."
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2055
1298
msgid "Create a branch without a working tree."
1299
msgstr "Crea una rama sin árbol de trabajo."
1300
1301
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1302
#, python-format
1303
msgid ""
1304
"Parent directory of %s does not exist.\n"
1305
"You may supply --create-prefix to create all leading parent directories."
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2109
1309
msgid ""
1310
"This branch format cannot be set to append-revisions-only. Try --default."
1311
msgstr ""
1312
"Este formato de rama no se puede establecer como append-revisions-only. "
1313
"Intente --default."
1314
1315
#: bzrlib/builtins.py:2120
1316
msgid "Created a {0} (format: {1})\n"
1317
msgstr "Creado un {0} (formaot: {1})\n"
1318
1319
#: bzrlib/builtins.py:2129
1320
#, python-format
1321
msgid "Using shared repository: %s\n"
1322
msgstr "Usando el repositorio compartido: %s\n"
1323
1324
#: bzrlib/builtins.py:2133
1325
msgid "Create a shared repository for branches to share storage space."
1326
msgstr ""
1327
"Crea un repositorio compartido para ramas para compartir el espacio de "
1328
"almacenamiento."
1329
1330
#: bzrlib/builtins.py:2135
1331
msgid ""
1332
"New branches created under the repository directory will store their\n"
1333
"revisions in the repository, not in the branch directory. For branches\n"
1334
"with shared history, this reduces the amount of storage needed and \n"
1335
"speeds up the creation of new branches."
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2140
1339
msgid ""
1340
"If the --no-trees option is given then the branches in the repository\n"
1341
"will not have working trees by default. They will still exist as \n"
1342
"directories on disk, but they will not have separate copies of the \n"
1343
"files at a certain revision. This can be useful for repositories that\n"
1344
"store branches which are interacted with through checkouts or remote\n"
1345
"branches, such as on a server."
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2147
1349
msgid ""
1350
":Examples:\n"
1351
" Create a shared repository holding just branches::"
1352
msgstr ""
1353
":Ejemplos:\n"
1354
" Crear un repositorio compartido manteniendo solo las ramas::"
1355
1356
#: bzrlib/builtins.py:2150
1357
msgid ""
1358
" bzr init-repo --no-trees repo\n"
1359
" bzr init repo/trunk"
1360
msgstr ""
1361
" bzr init-repo --no-trees repo\n"
1362
" bzr init repo/trunk"
1363
1364
#: bzrlib/builtins.py:2153
1365
msgid " Make a lightweight checkout elsewhere::"
1366
msgstr " Hace una comprobación ligera en cualquier sitio::"
1367
1368
#: bzrlib/builtins.py:2155
1369
msgid ""
1370
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1371
" cd trunk-checkout\n"
1372
" (add files here)"
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2163
1376
msgid ""
1377
"Specify a format for this repository. See \"bzr help formats\" for details."
1378
msgstr ""
1379
"Especificar un formato para este repositorio, Vea «bzr help formats» para "
1380
"tener más detalles."
1381
1382
#: bzrlib/builtins.py:2167
1383
msgid "Repository format"
1384
msgstr "Formato de repositorio"
1385
1386
#: bzrlib/builtins.py:2169
1387
msgid "Branches in the repository will default to not having a working tree."
1388
msgstr ""
1389
"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
1390
"trabajo."
1391
1392
#: bzrlib/builtins.py:2195
1393
msgid "Show differences in the working tree, between revisions or branches."
1394
msgstr ""
1395
"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
1396
1397
#: bzrlib/builtins.py:2197
1398
msgid ""
1399
"If no arguments are given, all changes for the current tree are listed.\n"
1400
"If files are given, only the changes in those files are listed.\n"
1401
"Remote and multiple branches can be compared by using the --old and\n"
1402
"--new options. If not provided, the default for both is derived from\n"
1403
"the first argument, if any, or the current tree if no arguments are\n"
1404
"given."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2204
1408
msgid ""
1409
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1410
"produces patches suitable for \"patch -p1\"."
1411
msgstr ""
1412
"«bzr diff -p1» es equivalente a «bzr diff --prefix old/:new/», y\n"
1413
"produce parches adecuados para «patch -p1»."
1414
1415
#: bzrlib/builtins.py:2207
1416
msgid ""
1417
"Note that when using the -r argument with a range of revisions, the\n"
1418
"differences are computed between the two specified revisions. That\n"
1419
"is, the command does not show the changes introduced by the first \n"
1420
"revision in the range. This differs from the interpretation of \n"
1421
"revision ranges used by \"bzr log\" which includes the first revision\n"
1422
"in the range."
1423
msgstr ""
1424
1425
#: bzrlib/builtins.py:2214
1426
msgid ""
1427
":Exit values:\n"
1428
" 1 - changed\n"
1429
" 2 - unrepresentable changes\n"
1430
" 3 - error\n"
1431
" 0 - no change"
1432
msgstr ""
1433
":Valores de salida:\n"
1434
" 1 - cambiado\n"
1435
" 2 - cambios no representables\n"
1436
" 3 - error\n"
1437
" 0 - sin cambios"
1438
1439
#: bzrlib/builtins.py:2220
1440
msgid ""
1441
":Examples:\n"
1442
" Shows the difference in the working tree versus the last commit::"
1443
msgstr ""
1444
":Ejemplos:\n"
1445
" Muestra las diferencias en el árbol de trabajo contra la última "
1446
"aplicación::"
1447
1448
#: bzrlib/builtins.py:2223
1449
msgid " bzr diff"
1450
msgstr " bzr diff"
1451
1452
#: bzrlib/builtins.py:2225
1453
msgid " Difference between the working tree and revision 1::"
1454
msgstr " Diferencia entre el árbol de trabajo y la revisión 1::"
1455
1456
#: bzrlib/builtins.py:2227
1457
msgid " bzr diff -r1"
1458
msgstr " bzr diff -r1"
1459
1460
#: bzrlib/builtins.py:2229
1461
msgid " Difference between revision 3 and revision 1::"
1462
msgstr " Diferencia entre revisión 3 y revisión 1::"
1463
1464
#: bzrlib/builtins.py:2231
1465
msgid " bzr diff -r1..3"
1466
msgstr " bzr diff -r1..3"
1467
1468
#: bzrlib/builtins.py:2233
1469
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1470
msgstr " Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
1471
1472
#: bzrlib/builtins.py:2235
1473
msgid " bzr diff -r1..3 xxx"
1474
msgstr " bzr diff -r1..3 xxx"
1475
1476
#: bzrlib/builtins.py:2237
1477
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1478
msgstr ""
1479
" Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
1480
1481
#: bzrlib/builtins.py:2239
1482
msgid " bzr diff -c2"
1483
msgstr " bzr diff -c2"
1484
1485
#: bzrlib/builtins.py:2241
1486
msgid ""
1487
" To see the changes introduced by revision X::\n"
1488
" \n"
1489
" bzr diff -cX"
1490
msgstr ""
1491
" Para ver los cambios introducidos por la revisión X::\n"
1492
" \n"
1493
" bzr diff -cX"
1494
1495
#: bzrlib/builtins.py:2245
1496
msgid ""
1497
" Note that in the case of a merge, the -c option shows the changes\n"
1498
" compared to the left hand parent. To see the changes against\n"
1499
" another parent, use::"
1500
msgstr ""
1501
1502
#: bzrlib/builtins.py:2249
1503
msgid " bzr diff -r<chosen_parent>..X"
1504
msgstr " bzr diff -r<padre_elegido>..X"
1505
1506
#: bzrlib/builtins.py:2251
1507
msgid ""
1508
" The changes between the current revision and the previous revision\n"
1509
" (equivalent to -c-1 and -r-2..-1)"
1510
msgstr ""
1511
" Los cambios entre la versión actual y la previa\n"
1512
" (equivalente a -c-1 y -r-2..-1)"
1513
1514
#: bzrlib/builtins.py:2254
1515
msgid " bzr diff -r-2.."
1516
msgstr " bzr diff -r-2.."
1517
1518
#: bzrlib/builtins.py:2256
1519
msgid " Show just the differences for file NEWS::"
1520
msgstr " Solo muestra las diferencias para el archivo NEWS::"
1521
1522
#: bzrlib/builtins.py:2258
1523
msgid " bzr diff NEWS"
1524
msgstr " bzr diff NEWS"
1525
1526
#: bzrlib/builtins.py:2260
1527
msgid " Show the differences in working tree xxx for file NEWS::"
1528
msgstr ""
1529
" Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
1530
1531
#: bzrlib/builtins.py:2262
1532
msgid " bzr diff xxx/NEWS"
1533
msgstr " bzr diff xxx/NEWS"
1534
1535
#: bzrlib/builtins.py:2264
1536
msgid " Show the differences from branch xxx to this working tree:"
1537
msgstr ""
1538
" Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
1539
1540
#: bzrlib/builtins.py:2266
1541
msgid " bzr diff --old xxx"
1542
msgstr " bzr diff --old xxx"
1543
1544
#: bzrlib/builtins.py:2268
1545
msgid " Show the differences between two branches for file NEWS::"
1546
msgstr " Muestra las diferencias entre dos ramas para el archivo NEWS:"
1547
1548
#: bzrlib/builtins.py:2270
1549
msgid " bzr diff --old xxx --new yyy NEWS"
1550
msgstr " bzr diff --old xxx --new yyy NEWS"
1551
1552
#: bzrlib/builtins.py:2272
1553
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1554
msgstr ""
1555
" Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
1556
1557
#: bzrlib/builtins.py:2274
1558
msgid ""
1559
" bzr diff --prefix old/:new/\n"
1560
" \n"
1561
" Show the differences using a custom diff program with options::\n"
1562
" \n"
1563
" bzr diff --using /usr/bin/diff --diff-options -wu"
1564
msgstr ""
1565
1566
#: bzrlib/builtins.py:2284
1567
msgid "Pass these options to the external diff program."
1568
msgstr "Pasa esta opciones para el programa diff externo."
1569
1570
#: bzrlib/builtins.py:2287
1571
msgid ""
1572
"Set prefixes added to old and new filenames, as two values separated by a "
1573
"colon. (eg \"old/:new/\")."
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2290
1577
msgid "Branch/tree to compare from."
1578
msgstr "Rama/árbol desde donde comparar."
1579
1580
#: bzrlib/builtins.py:2294
1581
msgid "Branch/tree to compare to."
1582
msgstr "Rama/árbol a la que comparar."
1583
1584
#: bzrlib/builtins.py:2300
1585
msgid "Use this command to compare files."
1586
msgstr "Use esta orden para comparar archivos."
1587
1588
#: bzrlib/builtins.py:2305
1589
msgid "Diff format to use."
1590
msgstr "Formato diff a usar."
1591
1592
#: bzrlib/builtins.py:2307
1593
msgid "Diff format"
1594
msgstr "Formato diff"
1595
1596
#: bzrlib/builtins.py:2329
1597
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1598
msgstr ""
1599
"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
1600
1601
#: bzrlib/builtins.py:2333
1602
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1603
msgstr ""
1604
"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
1605
1606
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1607
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1608
msgid "{0} and {1} are mutually exclusive"
1609
msgstr "{0} y {1} se excluyen mutuamente"
1610
1611
#: bzrlib/builtins.py:2358
1612
msgid ""
1613
"List files deleted in the working tree.\n"
1614
" "
1615
msgstr ""
1616
"Lista archivos eliminados en el árbol de trabajo.\n"
1617
" "
1618
1619
#: bzrlib/builtins.py:2436
1620
msgid "Show the tree root directory."
1621
msgstr "Muestra el directorio raíz del árbol."
1622
1623
#: bzrlib/builtins.py:2438
1624
msgid ""
1625
"The root is the nearest enclosing directory with a .bzr control\n"
1626
"directory."
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2453
1630
msgid "The limit argument must be an integer."
1631
msgstr "El argumento límite debe ser un entero."
1632
1633
#: bzrlib/builtins.py:2461
1634
msgid "The levels argument must be an integer."
1635
msgstr "Los argumentos de niveles deben ser un entero."
1636
1637
#: bzrlib/builtins.py:2466
1638
msgid "Show historical log for a branch or subset of a branch."
1639
msgstr ""
1640
"Muestra el registro histórico de una rama o un subconjunto de una rama."
1641
1642
#: bzrlib/builtins.py:2468
1643
msgid ""
1644
"log is bzr's default tool for exploring the history of a branch.\n"
1645
"The branch to use is taken from the first parameter. If no parameters\n"
1646
"are given, the branch containing the working directory is logged.\n"
1647
"Here are some simple examples::"
1648
msgstr ""
1649
1650
#: bzrlib/builtins.py:2473
1651
msgid ""
1652
" bzr log log the current branch\n"
1653
" bzr log foo.py log a file in its branch\n"
1654
" bzr log http://server/branch log a branch on a server"
1655
msgstr ""
1656
" bzr log registra la rama actual\n"
1657
" bzr log foo.py registra un archivo en esta rama\n"
1658
" bzr log http://servidor/rama registra una rama en un servidor"
1659
1660
#: bzrlib/builtins.py:2477
1661
msgid ""
1662
"The filtering, ordering and information shown for each revision can\n"
1663
"be controlled as explained below. By default, all revisions are\n"
1664
"shown sorted (topologically) so that newer revisions appear before\n"
1665
"older ones and descendants always appear before ancestors. If displayed,\n"
1666
"merged revisions are shown indented under the revision in which they\n"
1667
"were merged."
1668
msgstr ""
1669
1670
#: bzrlib/builtins.py:2484
1671
msgid ":Output control:"
1672
msgstr ":Control de saliuda:"
1673
1674
#: bzrlib/builtins.py:2486
1675
msgid ""
1676
" The log format controls how information about each revision is\n"
1677
" displayed. The standard log formats are called ``long``, ``short``\n"
1678
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1679
" for more details on log formats."
1680
msgstr ""
1681
1682
#: bzrlib/builtins.py:2491
1683
msgid ""
1684
" The following options can be used to control what information is\n"
1685
" displayed::"
1686
msgstr ""
1687
" Las siguientes opciones se pueden usar para controlar qué información\n"
1688
" se muestra::"
1689
1690
#: bzrlib/builtins.py:2494
1691
msgid ""
1692
" -l N display a maximum of N revisions\n"
1693
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1694
" -v display a status summary (delta) for each revision\n"
1695
" -p display a diff (patch) for each revision\n"
1696
" --show-ids display revision-ids (and file-ids), not just revnos"
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2500
1700
msgid ""
1701
" Note that the default number of levels to display is a function of the\n"
1702
" log format. If the -n option is not used, the standard log formats show\n"
1703
" just the top level (mainline)."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2504
1707
msgid ""
1708
" Status summaries are shown using status flags like A, M, etc. To see\n"
1709
" the changes explained using words like ``added`` and ``modified``\n"
1710
" instead, use the -vv option."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2508
1714
msgid ":Ordering control:"
1715
msgstr ":Control de ordenación:"
1716
1717
#: bzrlib/builtins.py:2510
1718
msgid ""
1719
" To display revisions from oldest to newest, use the --forward option.\n"
1720
" In most cases, using this option will have little impact on the total\n"
1721
" time taken to produce a log, though --forward does not incrementally\n"
1722
" display revisions like --reverse does when it can."
1723
msgstr ""
1724
1725
#: bzrlib/builtins.py:2515
1726
msgid ":Revision filtering:"
1727
msgstr ":Filtrado de revisión:"
1728
1729
#: bzrlib/builtins.py:2517
1730
msgid ""
1731
" The -r option can be used to specify what revision or range of revisions\n"
1732
" to filter against. The various forms are shown below::"
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2520
1736
msgid ""
1737
" -rX display revision X\n"
1738
" -rX.. display revision X and later\n"
1739
" -r..Y display up to and including revision Y\n"
1740
" -rX..Y display from X to Y inclusive"
1741
msgstr ""
1742
" -rX muestra revisión X\n"
1743
" -rX.. muestra revisión X y posterior\n"
1744
" -r..Y muestra hasta la revisión Y inclusive\n"
1745
" -rX..Y muestra desde X a Y inclusive"
1746
1747
#: bzrlib/builtins.py:2525
1748
msgid ""
1749
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1750
" Some common examples are given below::"
1751
msgstr ""
1752
" Vea «bzr help revisionspec» para tener más detalles sobre como especificar "
1753
"X e Y.\n"
1754
" Más abajo se listan algunos ejemplos::"
1755
1756
#: bzrlib/builtins.py:2528
1757
msgid ""
1758
" -r-1 show just the tip\n"
1759
" -r-10.. show the last 10 mainline revisions\n"
1760
" -rsubmit:.. show what's new on this branch\n"
1761
" -rancestor:path.. show changes since the common ancestor of this\n"
1762
" branch and the one at location path\n"
1763
" -rdate:yesterday.. show changes since yesterday"
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2535
1767
msgid ""
1768
" When logging a range of revisions using -rX..Y, log starts at\n"
1769
" revision Y and searches back in history through the primary\n"
1770
" (\"left-hand\") parents until it finds X. When logging just the\n"
1771
" top level (using -n1), an error is reported if X is not found\n"
1772
" along the way. If multi-level logging is used (-n0), X may be\n"
1773
" a nested merge revision and the log will be truncated accordingly."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2542
1777
msgid ":Path filtering:"
1778
msgstr ":Filtrado de ruta:"
1779
1780
#: bzrlib/builtins.py:2544
1781
msgid ""
1782
" If parameters are given and the first one is not a branch, the log\n"
1783
" will be filtered to show only those revisions that changed the\n"
1784
" nominated files or directories."
1785
msgstr ""
1786
" Si se dan los parámetros y el primero no es una rama, el registro\n"
1787
" se filtrará para mostrar solo las revisiones que cambiaron los\n"
1788
" archivos o directorios nominados."
1789
1790
#: bzrlib/builtins.py:2548
1791
msgid ""
1792
" Filenames are interpreted within their historical context. To log a\n"
1793
" deleted file, specify a revision range so that the file existed at\n"
1794
" the end or start of the range."
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:2552
1798
msgid ""
1799
" Historical context is also important when interpreting pathnames of\n"
1800
" renamed files/directories. Consider the following example:"
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:2555
1804
msgid ""
1805
" * revision 1: add tutorial.txt\n"
1806
" * revision 2: modify tutorial.txt\n"
1807
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1808
msgstr ""
1809
" * revisión 1: añadir tutorial.txt\n"
1810
" * revisión 2: modificar tutorial.txt\n"
1811
" * revisión 3: renombrar tutorial.txt a guide.txt; añadir tutorial.txt"
1812
1813
#: bzrlib/builtins.py:2559
1814
msgid " In this case:"
1815
msgstr " en este caso:"
1816
1817
#: bzrlib/builtins.py:2561
1818
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1819
msgstr ""
1820
" * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
1821
1822
#: bzrlib/builtins.py:2563
1823
msgid ""
1824
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1825
msgstr ""
1826
" * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
1827
"revisión 3"
1828
1829
#: bzrlib/builtins.py:2565
1830
msgid ""
1831
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1832
" the original file in revision 2."
1833
msgstr ""
1834
" * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
1835
" archivo original en la revisión 2."
1836
1837
#: bzrlib/builtins.py:2568
1838
msgid ""
1839
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1840
" was no file called guide.txt in revision 2."
1841
msgstr ""
1842
1843
#: bzrlib/builtins.py:2571
1844
msgid ""
1845
" Renames are always followed by log. By design, there is no need to\n"
1846
" explicitly ask for this (and no way to stop logging a file back\n"
1847
" until it was last renamed)."
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:2575
1851
msgid ":Other filtering:"
1852
msgstr ":Otro filtrado:"
1853
1854
#: bzrlib/builtins.py:2577
1855
msgid ""
1856
" The --match option can be used for finding revisions that match a\n"
1857
" regular expression in a commit message, committer, author or bug.\n"
1858
" Specifying the option several times will match any of the supplied\n"
1859
" expressions. --match-author, --match-bugs, --match-committer and\n"
1860
" --match-message can be used to only match a specific field."
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:2583
1864
msgid ":Tips & tricks:"
1865
msgstr ":Trucos y consejos:"
1866
1867
#: bzrlib/builtins.py:2585
1868
msgid ""
1869
" GUI tools and IDEs are often better at exploring history than command\n"
1870
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1871
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1872
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1873
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:2591
1877
msgid ""
1878
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:2593
1882
msgid ""
1883
" [ALIASES]\n"
1884
" tip = log -r-1\n"
1885
" top = log -l10 --line\n"
1886
" show = log -v -p"
1887
msgstr ""
1888
" [ALIAS]\n"
1889
" tip = log -r-1\n"
1890
" top = log -l10 --line\n"
1891
" show = log -v -p"
1892
1893
#: bzrlib/builtins.py:2598
1894
msgid ""
1895
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1896
" will show the last 10 mainline revisions. To see the details of a\n"
1897
" particular revision X, ``bzr show -rX``."
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:2602
1901
msgid ""
1902
" If you are interested in looking deeper into a particular merge X,\n"
1903
" use ``bzr log -n0 -rX``."
1904
msgstr ""
1905
" Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
1906
" use «bzr log -n0 -rX»."
1907
1908
#: bzrlib/builtins.py:2605
1909
msgid ""
1910
" ``bzr log -v`` on a branch with lots of history is currently\n"
1911
" very slow. A fix for this issue is currently under development.\n"
1912
" With or without that fix, it is recommended that a revision range\n"
1913
" be given when using the -v option."
1914
msgstr ""
1915
1916
#: bzrlib/builtins.py:2610
1917
msgid ""
1918
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1919
" used to find revisions matching user names, commit messages, etc.\n"
1920
" Among other features, this plugin can find all revisions containing\n"
1921
" a list of words but not others."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:2615
1925
msgid ""
1926
" When exploring non-mainline history on large projects with deep\n"
1927
" history, the performance of log can be greatly improved by installing\n"
1928
" the historycache plugin. This plugin buffers historical information\n"
1929
" trading disk space for faster speed."
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:2624
1933
msgid "Show from oldest to newest."
1934
msgstr "Muestra desde el más antiguo al más moderno."
1935
1936
#: bzrlib/builtins.py:2627
1937
msgid "Show files changed in each revision."
1938
msgstr "Muestra los archivos cambiados en cada revisión."
1939
1940
#: bzrlib/builtins.py:2633
1941
msgid "Show just the specified revision. See also \"help revisionspec\"."
1942
msgstr ""
1943
"Muestra solo la revisión especificada. Vea también «help revisionspec»."
1944
1945
#: bzrlib/builtins.py:2637
1946
msgid "What names to list as authors - first, all or committer."
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:2638
1950
msgid "Authors"
1951
msgstr "Autores"
1952
1953
#: bzrlib/builtins.py:2643
1954
msgid "Number of levels to display - 0 for all, 1 for flat."
1955
msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
1956
1957
#: bzrlib/builtins.py:2653
1958
msgid "Limit the output to the first N revisions."
1959
msgstr "Límite de salida para las primeras N revisiones."
1960
1961
#: bzrlib/builtins.py:2658
1962
msgid "Show changes made in each revision as a patch."
1963
msgstr "Mostrar cambios realizados en cada revisión como un parche."
1964
1965
#: bzrlib/builtins.py:2660
1966
msgid "Show merged revisions like --levels 0 does."
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:2664
1970
msgid "Do not report commits with more than one parent."
1971
msgstr "No informar de ejecuciones con más de un padre."
1972
1973
#: bzrlib/builtins.py:2666
1974
msgid ""
1975
"Display only the revisions that are not part of both ancestries (require -"
1976
"rX..Y)."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:2670
1980
msgid "Show digital signature validity."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:2673
1984
msgid "Show revisions whose properties match this expression."
1985
msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
1986
1987
#: bzrlib/builtins.py:2677
1988
msgid "Show revisions whose message matches this expression."
1989
msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
1990
1991
#: bzrlib/builtins.py:2681
1992
msgid "Show revisions whose committer matches this expression."
1993
msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
1994
1995
#: bzrlib/builtins.py:2685
1996
msgid "Show revisions whose authors match this expression."
1997
msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
1998
1999
#: bzrlib/builtins.py:2689
2000
msgid "Show revisions whose bugs match this expression."
2001
msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
2002
2003
#: bzrlib/builtins.py:2743
2004
msgid "--exclude-common-ancestry requires -r with two revisions"
2005
msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
2006
2007
#: bzrlib/builtins.py:2771
2008
#, python-format
2009
msgid "Path unknown at end or start of revision range: %s"
2010
msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
2011
2012
#: bzrlib/builtins.py:2888
2013
#, python-format
2014
msgid "bzr %s doesn't accept two revisions in different branches."
2015
msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
2016
2017
#: bzrlib/builtins.py:2904
2018
#, python-format
2019
msgid "bzr %s --revision takes one or two values."
2020
msgstr "bzr %s --revision toma uno o dos valores."
2021
2022
#: bzrlib/builtins.py:2949
2023
msgid ""
2024
"List files in a tree.\n"
2025
" "
2026
msgstr ""
2027
"Lista archivos en un árbol\n"
2028
" "
2029
2030
#: bzrlib/builtins.py:2958
2031
msgid "Recurse into subdirectories."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:2960
2035
msgid "Print paths relative to the root of the branch."
2036
msgstr "Imprime rutas relativas a la raíz de la rama."
2037
2038
#: bzrlib/builtins.py:2962
2039
msgid "Print unknown files."
2040
msgstr "Imprimir archivos desconocidos."
2041
2042
#: bzrlib/builtins.py:2963
2043
msgid "Print versioned files."
2044
msgstr "Imprimir archivos versionados."
2045
2046
#: bzrlib/builtins.py:2966
2047
msgid "Print ignored files."
2048
msgstr "Imprimir archivos ignorados."
2049
2050
#: bzrlib/builtins.py:2968
2051
msgid "List entries of a particular kind: file, directory, symlink."
2052
msgstr ""
2053
"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
2054
2055
#: bzrlib/builtins.py:2981
2056
msgid "invalid kind specified"
2057
msgstr "tivo inválido especificado"
2058
2059
#: bzrlib/builtins.py:2984
2060
msgid "Cannot set both --verbose and --null"
2061
msgstr "No se pueden establecer ambos --verbose y --null"
2062
2063
#: bzrlib/builtins.py:2993
2064
msgid "cannot specify both --from-root and PATH"
2065
msgstr "No se pueden establecer ambos --from-root y PATH"
2066
2067
#: bzrlib/builtins.py:3080
2068
msgid "Ignore specified files or patterns."
2069
msgstr "Ignorar archivos o patrones especificados."
2070
2071
#: bzrlib/builtins.py:3082
2072
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2073
msgstr ""
2074
"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
2075
2076
#: bzrlib/builtins.py:3084
2077
msgid ""
2078
"If a .bzrignore file does not exist, the ignore command\n"
2079
"will create one and add the specified files or patterns to the newly\n"
2080
"created file. The ignore command will also automatically add the \n"
2081
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2082
"the use of the ignore command will require an explicit add command."
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3090
2086
msgid ""
2087
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2088
"After adding, editing or deleting that file either indirectly by\n"
2089
"using this command or directly by using an editor, be sure to commit\n"
2090
"it."
2091
msgstr ""
2092
"Para eliminar los patrones de la lista de ignorados, edite el archivo "
2093
".bzrignore.\n"
2094
"Después de añadir, editar o borrar el archivo o bien indirectamente por\n"
2095
"el uso de esta orden, o directamente mediante un editor, asegúrese de "
2096
"ejecutarlo."
2097
2098
#: bzrlib/builtins.py:3095
2099
msgid ""
2100
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2101
"the global ignore file can be found in the application data directory as\n"
2102
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2103
"Global ignores are not touched by this command. The global ignore file\n"
2104
"can be edited directly using an editor."
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3101
2108
msgid ""
2109
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2110
"precedence over regular ignores. Such exceptions are used to specify\n"
2111
"files that should be versioned which would otherwise be ignored."
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3105
2115
msgid ""
2116
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2117
"precedence over the '!' exception patterns."
2118
msgstr ""
2119
2120
#: bzrlib/builtins.py:3108
2121
msgid ""
2122
":Notes: \n"
2123
" \n"
2124
"* Ignore patterns containing shell wildcards must be quoted from\n"
2125
" the shell on Unix."
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3113
2129
msgid ""
2130
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2131
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3116
2135
msgid ""
2136
":Examples:\n"
2137
" Ignore the top level Makefile::"
2138
msgstr ""
2139
2140
#: bzrlib/builtins.py:3119
2141
msgid " bzr ignore ./Makefile"
2142
msgstr " bzr ignore ./Makefile"
2143
2144
#: bzrlib/builtins.py:3121
2145
msgid " Ignore .class files in all directories...::"
2146
msgstr " Ignorar archivos .class en todos los directorios...::"
2147
2148
#: bzrlib/builtins.py:3123
2149
msgid " bzr ignore \"*.class\""
2150
msgstr " bzr ignore \"*.class\""
2151
2152
#: bzrlib/builtins.py:3125
2153
msgid " ...but do not ignore \"special.class\"::"
2154
msgstr " ...pero no ignora «special.class»::"
2155
2156
#: bzrlib/builtins.py:3127
2157
msgid " bzr ignore \"!special.class\""
2158
msgstr " bzr ignore «!special.class»"
2159
2160
#: bzrlib/builtins.py:3129
2161
msgid " Ignore files whose name begins with the \"#\" character::"
2162
msgstr " Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
2163
2164
#: bzrlib/builtins.py:3131
2165
msgid " bzr ignore \"RE:^#\""
2166
msgstr " bzr ignore \"RE:^#\""
2167
2168
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2169
msgid " Ignore .o files under the lib directory::"
2170
msgstr " Ignorar archivos .o bajo el directorio lib::"
2171
2172
#: bzrlib/builtins.py:3135
2173
msgid " bzr ignore \"lib/**/*.o\""
2174
msgstr " bzr ignore \"lib/**/*.o\""
2175
2176
#: bzrlib/builtins.py:3139
2177
msgid " bzr ignore \"RE:lib/.*\\.o\""
2178
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2179
2180
#: bzrlib/builtins.py:3141
2181
msgid " Ignore everything but the \"debian\" toplevel directory::"
2182
msgstr ""
2183
" Ignorar todo excepto el directorio de nivel superior de «debian»::"
2184
2185
#: bzrlib/builtins.py:3143
2186
msgid ""
2187
" bzr ignore \"RE:(?!debian/).*\"\n"
2188
" \n"
2189
" Ignore everything except the \"local\" toplevel directory,\n"
2190
" but always ignore autosave files ending in ~, even under local/::\n"
2191
" \n"
2192
" bzr ignore \"*\"\n"
2193
" bzr ignore \"!./local\"\n"
2194
" bzr ignore \"!!*~\""
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3157
2198
msgid "Display the default ignore rules that bzr uses."
2199
msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
2200
2201
#: bzrlib/builtins.py:3169
2202
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3180
2206
#, python-format
2207
msgid "Invalid ignore pattern found. %s"
2208
msgid_plural "Invalid ignore patterns found. %s"
2209
msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
2210
msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
2211
2212
#: bzrlib/builtins.py:3189
2213
msgid "NAME_PATTERN should not be an absolute path"
2214
msgstr "NAME_PATTERN no debe ser una ruta absoluta"
2215
2216
#: bzrlib/builtins.py:3202
2217
#, python-format
2218
msgid ""
2219
"Warning: the following files are version controlled and match your ignore "
2220
"pattern:\n"
2221
"%s\n"
2222
"These files will continue to be version controlled unless you 'bzr remove' "
2223
"them.\n"
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3209
2227
msgid "List ignored files and the patterns that matched them."
2228
msgstr "Lista todos los archivos ignorados y patrones que conciden."
2229
2230
#: bzrlib/builtins.py:3211
2231
msgid ""
2232
"List all the ignored files and the ignore pattern that caused the file to\n"
2233
"be ignored."
2234
msgstr ""
2235
2236
#: bzrlib/builtins.py:3214
2237
msgid "Alternatively, to list just the files::"
2238
msgstr "Alternativamente, lista solo los archivos:"
2239
2240
#: bzrlib/builtins.py:3216
2241
msgid " bzr ls --ignored"
2242
msgstr " bzr ls --ignored"
2243
2244
#: bzrlib/builtins.py:3250
2245
#, python-format
2246
msgid "not a valid revision-number: %r"
2247
msgstr "no es un número de revisión válido: %r"
2248
2249
#: bzrlib/builtins.py:3257
2250
msgid ""
2251
"Export current or past revision to a destination directory or archive."
2252
msgstr ""
2253
"Exporta la revisión actual o pasada a un directorio de destino o un "
2254
"archivador."
2255
2256
#: bzrlib/builtins.py:3259
2257
msgid "If no revision is specified this exports the last committed revision."
2258
msgstr "Si no se especifica revisión, exporta la última revisión ejecutada."
2259
2260
#: bzrlib/builtins.py:3261
2261
msgid ""
2262
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2263
"given, try to find the format with the extension. If no extension\n"
2264
"is found exports to a directory (equivalent to --format=dir)."
2265
msgstr ""
2266
2267
#: bzrlib/builtins.py:3265
2268
msgid ""
2269
"If root is supplied, it will be used as the root directory inside\n"
2270
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2271
"to the exported filename. The root option has no effect for 'dir' format."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3269
2275
msgid ""
2276
"If branch is omitted then the branch containing the current working\n"
2277
"directory will be used."
2278
msgstr ""
2279
"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
2280
"de trabajo actual."
2281
2282
#: bzrlib/builtins.py:3272
2283
msgid ""
2284
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2285
msgstr ""
2286
"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
2287
2288
#: bzrlib/builtins.py:3274
2289
msgid ""
2290
" ================= =========================\n"
2291
" Supported formats Autodetected by extension\n"
2292
" ================= =========================\n"
2293
" dir (none)\n"
2294
" tar .tar\n"
2295
" tbz2 .tar.bz2, .tbz2\n"
2296
" tgz .tar.gz, .tgz\n"
2297
" zip .zip\n"
2298
" ================= ========================="
2299
msgstr ""
2300
" ================= ===================================\n"
2301
" Formatos permitidos Detectados automáticamente por extensión\n"
2302
" ================= ===================================\n"
2303
" dir (ninguno)\n"
2304
" tar .tar\n"
2305
" tbz2 .tar.bz2, .tbz2\n"
2306
" tgz .tar.gz, .tgz\n"
2307
" zip .zip\n"
2308
" ================= ==================================="
2309
2310
#: bzrlib/builtins.py:3288
2311
msgid "Type of file to export to."
2312
msgstr "Tipo de archivo para exportar."
2313
2314
#: bzrlib/builtins.py:3291
2315
msgid "Apply content filters to export the convenient form."
2316
msgstr ""
2317
"Aplicar los filtros de contenido para exportar el formulario conveniente."
2318
2319
#: bzrlib/builtins.py:3295
2320
msgid "Name of the root directory inside the exported file."
2321
msgstr "Nombre del directorio raíz dentro del archivo exportado."
2322
2323
#: bzrlib/builtins.py:3297
2324
msgid ""
2325
"Set modification time of files to that of the last revision in which it was "
2326
"changed."
2327
msgstr ""
2328
"Establecer la fecha de modificación de los archivos a la de la última "
2329
"revisión en la que se cambió."
2330
2331
#: bzrlib/builtins.py:3300
2332
msgid ""
2333
"Export the working tree contents rather than that of the last revision."
2334
msgstr ""
2335
2336
#: bzrlib/builtins.py:3319
2337
msgid "--uncommitted requires a working tree"
2338
msgstr ""
2339
2340
#: bzrlib/builtins.py:3328
2341
#, python-format
2342
msgid "Unsupported export format: %s"
2343
msgstr "Formato de exportación no permitido: %s"
2344
2345
#: bzrlib/builtins.py:3332
2346
msgid ""
2347
"Write the contents of a file as of a given revision to standard output."
2348
msgstr ""
2349
"Escribir los contenidos de un archivo como una revisión dada a la salida "
2350
"estándar."
2351
2352
#: bzrlib/builtins.py:3334
2353
msgid "If no revision is nominated, the last revision is used."
2354
msgstr "SI no hay una revisión nominada, se usa la última revisión."
2355
2356
#: bzrlib/builtins.py:3336
2357
msgid ""
2358
"Note: Take care to redirect standard output when using this command on a\n"
2359
"binary file."
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3342
2363
msgid "The path name in the old tree."
2364
msgstr "La ruta en el árbol antiguo."
2365
2366
#: bzrlib/builtins.py:3343
2367
msgid "Apply content filters to display the convenience form."
2368
msgstr ""
2369
2370
#: bzrlib/builtins.py:3354
2371
msgid "bzr cat --revision takes exactly one revision specifier"
2372
msgstr "bzr cat --revision toma específicamente un especificador de revisión"
2373
2374
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2375
msgid "{0!r} is not present in revision {1}"
2376
msgstr "{0!r} no está presente en la revisión {1}"
2377
2378
#: bzrlib/builtins.py:3414
2379
msgid "Commit changes into a new revision."
2380
msgstr "Ejecutar cambios en una revisión nueva."
2381
2382
#: bzrlib/builtins.py:3416
2383
msgid ""
2384
"An explanatory message needs to be given for each commit. This is\n"
2385
"often done by using the --message option (getting the message from the\n"
2386
"command line) or by using the --file option (getting the message from\n"
2387
"a file). If neither of these options is given, an editor is opened for\n"
2388
"the user to enter the message. To see the changed files in the\n"
2389
"boilerplate text loaded into the editor, use the --show-diff option."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3423
2393
msgid ""
2394
"By default, the entire tree is committed and the person doing the\n"
2395
"commit is assumed to be the author. These defaults can be overridden\n"
2396
"as explained below."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3427
2400
msgid ":Selective commits:"
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3429
2404
msgid ""
2405
" If selected files are specified, only changes to those files are\n"
2406
" committed. If a directory is specified then the directory and\n"
2407
" everything within it is committed."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3433
2411
msgid ""
2412
" When excludes are given, they take precedence over selected files.\n"
2413
" For example, to commit only changes within foo, but not changes\n"
2414
" within foo/bar::"
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3437
2418
msgid " bzr commit foo -x foo/bar"
2419
msgstr " bzr commit foo -x foo/bar"
2420
2421
#: bzrlib/builtins.py:3439
2422
msgid " A selective commit after a merge is not yet supported."
2423
msgstr " No está permitida una ejecución selectiva después de una fusión."
2424
2425
#: bzrlib/builtins.py:3441
2426
msgid ":Custom authors:"
2427
msgstr ":Autores personalizados:"
2428
2429
#: bzrlib/builtins.py:3443
2430
msgid ""
2431
" If the author of the change is not the same person as the committer,\n"
2432
" you can specify the author's name using the --author option. The\n"
2433
" name should be in the same format as a committer-id, e.g.\n"
2434
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2435
" the change you can specify the option multiple times, once for each\n"
2436
" author."
2437
msgstr ""
2438
2439
#: bzrlib/builtins.py:3450
2440
msgid ":Checks:"
2441
msgstr ":Comprobaciones:"
2442
2443
#: bzrlib/builtins.py:3452
2444
msgid ""
2445
" A common mistake is to forget to add a new file or directory before\n"
2446
" running the commit command. The --strict option checks for unknown\n"
2447
" files and aborts the commit if any are found. More advanced pre-commit\n"
2448
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2449
" for details."
2450
msgstr ""
2451
2452
#: bzrlib/builtins.py:3458
2453
msgid ":Things to note:"
2454
msgstr ":Cosas a tener en cuenta:"
2455
2456
#: bzrlib/builtins.py:3460
2457
msgid ""
2458
" If you accidentially commit the wrong changes or make a spelling\n"
2459
" mistake in the commit message say, you can use the uncommit command\n"
2460
" to undo it. See ``bzr help uncommit`` for details."
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3464
2464
msgid ""
2465
" Hooks can also be configured to run after a commit. This allows you\n"
2466
" to trigger updates to external systems like bug trackers. The --fixes\n"
2467
" option can be used to record the association between a revision and\n"
2468
" one or more bugs. See ``bzr help bugs`` for details."
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3474
2472
msgid "Do not consider changes made to a given path."
2473
msgstr "No considerar los cambios realizados en una ruta dada."
2474
2475
#: bzrlib/builtins.py:3477
2476
msgid "Description of the new revision."
2477
msgstr "Descripción de la revisión nueva."
2478
2479
#: bzrlib/builtins.py:3480
2480
msgid "Commit even if nothing has changed."
2481
msgstr "Ejecutar incluso si no ha cambiado nada."
2482
2483
#: bzrlib/builtins.py:3484
2484
msgid "Take commit message from this file."
2485
msgstr "Tomar el mensaje de ejecución desde este archivo."
2486
2487
#: bzrlib/builtins.py:3486
2488
msgid "Refuse to commit if there are unknown files in the working tree."
2489
msgstr ""
2490
"Rechazar la ejecución si hay archivos desconocidos en el árbol de trabajo."
2491
2492
#: bzrlib/builtins.py:3489
2493
msgid ""
2494
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2495
"08:00:00 +0100'."
2496
msgstr ""
2497
"Establecer manualmente la hora de ejecución usando un formato de fecha de "
2498
"ejecución, por ejemplo «2009-10-10 08:00:00 +0100»."
2499
2500
#: bzrlib/builtins.py:3492
2501
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2502
msgstr ""
2503
"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
2504
2505
#: bzrlib/builtins.py:3495
2506
msgid "Set the author's name, if it's different from the committer."
2507
msgstr ""
2508
"Establecer el nombre del autor, si este es diferente al del ejecutor."
2509
2510
#: bzrlib/builtins.py:3498
2511
msgid ""
2512
"Perform a local commit in a bound branch. Local commits are not pushed to "
2513
"the master branch until a normal commit is performed."
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3504
2517
msgid ""
2518
"When no message is supplied, show the diff along with the status summary in "
2519
"the message editor."
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3507
2523
msgid ""
2524
"When committing to a foreign version control system do not push data that "
2525
"can not be natively represented."
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3525
2529
#, python-format
2530
msgid ""
2531
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2532
"default bug tracker using the `bugtracker` option.\n"
2533
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:3534
2537
#, python-format
2538
msgid ""
2539
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2540
"for more information on this feature.\n"
2541
"Commit refused."
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3543
2545
#, python-format
2546
msgid "Unrecognized bug %s. Commit refused."
2547
msgstr "Error no reconocido %s. Ejecución rechazada."
2548
2549
#: bzrlib/builtins.py:3546
2550
#, python-format
2551
msgid ""
2552
"%s\n"
2553
"Commit refused."
2554
msgstr ""
2555
"%s\n"
2556
"Ejecución rechazada."
2557
2558
#: bzrlib/builtins.py:3570
2559
msgid "Could not parse --commit-time: "
2560
msgstr "No se puede analizar --commit-time: "
2561
2562
#: bzrlib/builtins.py:3610
2563
msgid "please specify either --message or --file"
2564
msgstr "especifique uno --message o --file"
2565
2566
#: bzrlib/builtins.py:3639
2567
msgid "please specify a commit message with either --message or --file"
2568
msgstr "especifique un mensaje de ejecución con --message o --file"
2569
2570
#: bzrlib/builtins.py:3642
2571
msgid ""
2572
"Empty commit message specified. Please specify a commit message with either -"
2573
"-message or --file or leave a blank message with --message \"\"."
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:3662
2577
msgid ""
2578
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2579
"-unchanged to force an empty commit."
2580
msgstr ""
2581
"No hay cambios que ejecutar. «bzr add» los archivos que quiera ejecutar o "
2582
"use --unchanged para forzar una ejecución vacía."
2583
2584
#: bzrlib/builtins.py:3666
2585
msgid ""
2586
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2587
"resolve FILE\" to resolve."
2588
msgstr ""
2589
"Conflictos detectados en el árbol de trabajo. Use «bzr conflicts» para "
2590
"listar, «bzr resolve ARCHIVO»\" para resolver."
2591
2592
#: bzrlib/builtins.py:3670
2593
msgid "Commit refused because there are unknown files in the working tree."
2594
msgstr ""
2595
"Ejecución rechazada porque hay archivos desconocidos en el árbol de trabajo."
2596
2597
#: bzrlib/builtins.py:3673
2598
msgid ""
2599
"\n"
2600
"To commit to master branch, run update and then commit.\n"
2601
"You can also pass --local to commit to continue working disconnected."
2602
msgstr ""
2603
2604
#: bzrlib/builtins.py:3681
2605
msgid ""
2606
"Validate working tree structure, branch consistency and repository history."
2607
msgstr ""
2608
"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
2609
"historial del repositorio."
2610
2611
#: bzrlib/builtins.py:3683
2612
msgid ""
2613
"This command checks various invariants about branch and repository storage\n"
2614
"to detect data corruption or bzr bugs."
2615
msgstr ""
2616
2617
#: bzrlib/builtins.py:3686
2618
msgid ""
2619
"The working tree and branch checks will only give output if a problem is\n"
2620
"detected. The output fields of the repository check are:"
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:3689
2624
msgid ""
2625
"revisions\n"
2626
" This is just the number of revisions checked. It doesn't\n"
2627
" indicate a problem."
2628
msgstr ""
2629
"revisions\n"
2630
" Esto es solo el número de revisiones comprobadas, No\n"
2631
" indica un problema."
2632
2633
#: bzrlib/builtins.py:3693
2634
msgid ""
2635
"versionedfiles\n"
2636
" This is just the number of versionedfiles checked. It\n"
2637
" doesn't indicate a problem."
2638
msgstr ""
2639
"versionedfiles\n"
2640
" Esto es solo el número de archivos versionados comprobados.. No\n"
2641
" indica un problema."
2642
2643
#: bzrlib/builtins.py:3697
2644
msgid ""
2645
"unreferenced ancestors\n"
2646
" Texts that are ancestors of other texts, but\n"
2647
" are not properly referenced by the revision ancestry. This is a\n"
2648
" subtle problem that Bazaar can work around."
2649
msgstr ""
2650
2651
#: bzrlib/builtins.py:3702
2652
msgid ""
2653
"unique file texts\n"
2654
" This is the total number of unique file contents\n"
2655
" seen in the checked revisions. It does not indicate a problem."
2656
msgstr ""
2657
2658
#: bzrlib/builtins.py:3706
2659
msgid ""
2660
"repeated file texts\n"
2661
" This is the total number of repeated texts seen\n"
2662
" in the checked revisions. Texts can be repeated when their file\n"
2663
" entries are modified, but the file contents are not. It does not\n"
2664
" indicate a problem."
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:3712
2668
msgid ""
2669
"If no restrictions are specified, all Bazaar data that is found at the "
2670
"given\n"
2671
"location will be checked."
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:3717
2675
msgid " Check the tree and branch at 'foo'::"
2676
msgstr " Comprueba el árbol y la rama en «foo»::"
2677
2678
#: bzrlib/builtins.py:3719
2679
msgid " bzr check --tree --branch foo"
2680
msgstr " bzr check --tree --branch foo"
2681
2682
#: bzrlib/builtins.py:3721
2683
msgid " Check only the repository at 'bar'::"
2684
msgstr " Comprueba solo el repositorio en «bar»::"
2685
2686
#: bzrlib/builtins.py:3723
2687
msgid " bzr check --repo bar"
2688
msgstr " bzr check --repo bar"
2689
2690
#: bzrlib/builtins.py:3725
2691
msgid " Check everything at 'baz'::"
2692
msgstr " Comprueba todo en «baz»::"
2693
2694
#: bzrlib/builtins.py:3727
2695
msgid " bzr check baz"
2696
msgstr " bzr check baz"
2697
2698
#: bzrlib/builtins.py:3733
2699
msgid "Check the branch related to the current directory."
2700
msgstr "Comprueba la rama relacionada con el directorio actual."
2701
2702
#: bzrlib/builtins.py:3735
2703
msgid "Check the repository related to the current directory."
2704
msgstr "Comprueba el repositorio relacionado con el directorio actual."
2705
2706
#: bzrlib/builtins.py:3737
2707
msgid "Check the working tree related to the current directory."
2708
msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
2709
2710
#: bzrlib/builtins.py:3751
2711
msgid "Upgrade a repository, branch or working tree to a newer format."
2712
msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
2713
2714
#: bzrlib/builtins.py:3753
2715
msgid ""
2716
"When the default format has changed after a major new release of\n"
2717
"Bazaar, you may be informed during certain operations that you\n"
2718
"should upgrade. Upgrading to a newer format may improve performance\n"
2719
"or make new features available. It may however limit interoperability\n"
2720
"with older repositories or with older versions of Bazaar."
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:3759
2724
msgid ""
2725
"If you wish to upgrade to a particular format rather than the\n"
2726
"current default, that can be specified using the --format option.\n"
2727
"As a consequence, you can use the upgrade command this way to\n"
2728
"\"downgrade\" to an earlier format, though some conversions are\n"
2729
"a one way process (e.g. changing from the 1.x default to the\n"
2730
"2.x default) so downgrading is not always possible."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:3766
2734
msgid ""
2735
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2736
"process (where # is a number). By default, this is left there on\n"
2737
"completion. If the conversion fails, delete the new .bzr directory\n"
2738
"and rename this one back in its place. Use the --clean option to ask\n"
2739
"for the backup.bzr directory to be removed on successful conversion.\n"
2740
"Alternatively, you can delete it by hand if everything looks good\n"
2741
"afterwards."
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:3774
2745
msgid ""
2746
"If the location given is a shared repository, dependent branches\n"
2747
"are also converted provided the repository converts successfully.\n"
2748
"If the conversion of a branch fails, remaining branches are still\n"
2749
"tried."
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:3779
2753
msgid ""
2754
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2755
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2756
msgstr ""
2757
"Para tener más información sobre actualizaciones, vea la Guía de "
2758
"actualización de Bazaar,\n"
2759
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2760
2761
#: bzrlib/builtins.py:3787
2762
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2763
msgstr ""
2764
"Actualizar a un formato específico. Vea «bzr help formats» para tener más "
2765
"detalles."
2766
2767
#: bzrlib/builtins.py:3791
2768
msgid "Branch format"
2769
msgstr "Formato de la rama"
2770
2771
#: bzrlib/builtins.py:3793
2772
msgid "Remove the backup.bzr directory if successful."
2773
msgstr "Elimina el directorio backup.bzr si tiene éxito."
2774
2775
#: bzrlib/builtins.py:3795
2776
msgid "Show what would be done, but don't actually do anything."
2777
msgstr ""
2778
2779
#: bzrlib/builtins.py:3810
2780
msgid "Show or set bzr user id."
2781
msgstr "Muestra o establece la id de usuario bzr."
2782
2783
#: bzrlib/builtins.py:3812
2784
msgid ""
2785
":Examples:\n"
2786
" Show the email of the current user::"
2787
msgstr ""
2788
":Ejemplos:\n"
2789
" Muestra el correo del usuario actual::"
2790
2791
#: bzrlib/builtins.py:3815
2792
msgid " bzr whoami --email"
2793
msgstr " bzr whoami --email"
2794
2795
#: bzrlib/builtins.py:3817
2796
msgid " Set the current user::"
2797
msgstr " Establece el usuario actual::"
2798
2799
#: bzrlib/builtins.py:3819
2800
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2801
msgstr " bzr whoami «Frank Chu <fchu@example.com>»"
2802
2803
#: bzrlib/builtins.py:3823
2804
msgid "Display email address only."
2805
msgstr "Muestra solo la dirección de correo."
2806
2807
#: bzrlib/builtins.py:3825
2808
msgid "Set identity for the current branch instead of globally."
2809
msgstr "Establece la identidad de la rama actual en lugar de globalmente."
2810
2811
#: bzrlib/builtins.py:3851
2812
msgid "--email can only be used to display existing identity"
2813
msgstr "--email solo se puede usar para mostrar la identidad del directorio"
2814
2815
#: bzrlib/builtins.py:3873
2816
msgid "Print or set the branch nickname."
2817
msgstr "Muestra o establece el apodo de la rama."
2818
2819
#: bzrlib/builtins.py:3875
2820
msgid ""
2821
"If unset, the tree root directory name is used as the nickname.\n"
2822
"To print the current nickname, execute with no argument."
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:3878
2826
msgid ""
2827
"Bound branches use the nickname of its master branch unless it is set\n"
2828
"locally."
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:3898
2832
msgid "Set/unset and display aliases."
2833
msgstr "Establece/desestablece y muestra alias."
2834
2835
#: bzrlib/builtins.py:3900
2836
msgid ""
2837
":Examples:\n"
2838
" Show the current aliases::"
2839
msgstr ""
2840
":Ejemplos:\n"
2841
" Muestra los alias actuales::"
2842
2843
#: bzrlib/builtins.py:3903
2844
msgid " bzr alias"
2845
msgstr " bzr alias"
2846
2847
#: bzrlib/builtins.py:3905
2848
msgid " Show the alias specified for 'll'::"
2849
msgstr " Muestra los alias especificados por «ll»::"
2850
2851
#: bzrlib/builtins.py:3907
2852
msgid " bzr alias ll"
2853
msgstr " bzr alias ll"
2854
2855
#: bzrlib/builtins.py:3909
2856
msgid " Set an alias for 'll'::"
2857
msgstr " Establece un alias para «ll»::"
2858
2859
#: bzrlib/builtins.py:3911
2860
msgid " bzr alias ll=\"log --line -r-10..-1\""
2861
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2862
2863
#: bzrlib/builtins.py:3913
2864
msgid " To remove an alias for 'll'::"
2865
msgstr " Para eliminar un alias de «ll»::"
2866
2867
#: bzrlib/builtins.py:3915
2868
msgid " bzr alias --remove ll"
2869
msgstr " bzr alias --remove ll"
2870
2871
#: bzrlib/builtins.py:3920
2872
msgid "Remove the alias."
2873
msgstr "Elimina los alias."
2874
2875
#: bzrlib/builtins.py:3938
2876
msgid "bzr alias --remove expects an alias to remove."
2877
msgstr ""
2878
2879
#: bzrlib/builtins.py:4119
2880
msgid ""
2881
"subunit not available. subunit needs to be installed to use --subunit."
2882
msgstr ""
2883
2884
#: bzrlib/builtins.py:4136
2885
msgid ""
2886
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2887
msgstr ""
2888
"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
2889
2890
#: bzrlib/builtins.py:4183
2891
msgid "Show version of bzr."
2892
msgstr "Muestra la versión de bzr."
2893
2894
#: bzrlib/builtins.py:4187
2895
msgid "Print just the version number."
2896
msgstr "Solamente imprime el número de versión."
2897
2898
#: bzrlib/builtins.py:4206
2899
msgid "It sure does!\n"
2900
msgstr "¡Seguro que si!\n"
2901
2902
#: bzrlib/builtins.py:4230
2903
#, python-format
2904
msgid "merge base is revision %s\n"
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4234
2908
msgid "Perform a three-way merge."
2909
msgstr "Realiza una fusión de tres vías."
2910
2911
#: bzrlib/builtins.py:4236
2912
msgid ""
2913
"The source of the merge can be specified either in the form of a branch,\n"
2914
"or in the form of a path to a file containing a merge directive generated\n"
2915
"with bzr send. If neither is specified, the default is the upstream branch\n"
2916
"or the branch most recently merged using --remember. The source of the\n"
2917
"merge may also be specified in the form of a path to a file in another\n"
2918
"branch: in this case, only the modifications to that file are merged into\n"
2919
"the current working tree."
2920
msgstr ""
2921
2922
#: bzrlib/builtins.py:4244
2923
msgid ""
2924
"When merging from a branch, by default bzr will try to merge in all new\n"
2925
"work from the other branch, automatically determining an appropriate base\n"
2926
"revision. If this fails, you may need to give an explicit base."
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4248
2930
msgid ""
2931
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2932
"try to merge in all new work up to and including revision OTHER."
2933
msgstr ""
2934
2935
#: bzrlib/builtins.py:4251
2936
msgid ""
2937
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2938
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2939
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2940
"not already contain revision BASE, such a merge is commonly referred to as\n"
2941
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2942
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2943
"changes from the other branch is not stored in the commit."
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4259
2947
msgid "Revision numbers are always relative to the source branch."
2948
msgstr ""
2949
"Los números de revisión están siempre relacionados con la rama origen."
2950
2951
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2952
msgid ""
2953
"Merge will do its best to combine the changes in two branches, but there\n"
2954
"are some kinds of problems only a human can fix. When it encounters those,\n"
2955
"it will mark a conflict. A conflict means that you need to fix something,\n"
2956
"before you can commit."
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4266
2960
msgid ""
2961
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2962
msgstr ""
2963
"Use bzr resolve cuando tenga un problema arreglado. Vea también bzr "
2964
"conflicts."
2965
2966
#: bzrlib/builtins.py:4268
2967
msgid ""
2968
"If there is no default branch set, the first merge will set it (use\n"
2969
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2970
"to use the default. To change the default, use --remember. The value will\n"
2971
"only be saved if the remote location can be accessed."
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4273
2975
msgid ""
2976
"The results of the merge are placed into the destination working\n"
2977
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2978
"committed to record the result of the merge."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4277
2982
msgid ""
2983
"merge refuses to run if there are any uncommitted changes, unless\n"
2984
"--force is given. If --force is given, then the changes from the source \n"
2985
"will be merged with the current working tree, including any uncommitted\n"
2986
"changes in the tree. The --force option can also be used to create a\n"
2987
"merge revision which has more than two parents."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4283
2991
msgid ""
2992
"If one would like to merge changes from the working tree of the other\n"
2993
"branch without merging any committed revisions, the --uncommitted option\n"
2994
"can be given."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4287
2998
msgid ""
2999
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3000
"you to apply each diff hunk and file change, similar to \"shelve\"."
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4290
3004
msgid ""
3005
":Examples:\n"
3006
" To merge all new revisions from bzr.dev::"
3007
msgstr ""
3008
":Ejemplos:\n"
3009
" Para fusionar todas las revisiones nuevas de bzr.dev::"
3010
3011
#: bzrlib/builtins.py:4293
3012
msgid " bzr merge ../bzr.dev"
3013
msgstr " bzr merge ../bzr.dev"
3014
3015
#: bzrlib/builtins.py:4295
3016
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3017
msgstr " Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
3018
3019
#: bzrlib/builtins.py:4297
3020
msgid " bzr merge -r 82 ../bzr.dev"
3021
msgstr " bzr merge -r 82 ../bzr.dev"
3022
3023
#: bzrlib/builtins.py:4299
3024
msgid " To merge the changes introduced by 82, without previous changes::"
3025
msgstr ""
3026
" Para fusionar los cambios introducidos por 82, sin cambios previos::"
3027
3028
#: bzrlib/builtins.py:4301
3029
msgid " bzr merge -r 81..82 ../bzr.dev"
3030
msgstr " bzr merge -r 81..82 ../bzr.dev"
3031
3032
#: bzrlib/builtins.py:4303
3033
msgid " To apply a merge directive contained in /tmp/merge::"
3034
msgstr " Para aplicar una directiva de fusión contenida en /tmp/merge::"
3035
3036
#: bzrlib/builtins.py:4305
3037
msgid " bzr merge /tmp/merge"
3038
msgstr " bzr merge /tmp/merge"
3039
3040
#: bzrlib/builtins.py:4307
3041
msgid ""
3042
" To create a merge revision with three parents from two branches\n"
3043
" feature1a and feature1b:"
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4310
3047
msgid ""
3048
" bzr merge ../feature1a\n"
3049
" bzr merge ../feature1b --force\n"
3050
" bzr commit -m 'revision with three parents'"
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4322
3054
msgid "Merge even if the destination tree has uncommitted changes."
3055
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin ejecutar."
3056
3057
#: bzrlib/builtins.py:4328
3058
msgid ""
3059
"Apply uncommitted changes from a working copy, instead of branch changes."
3060
msgstr ""
3061
"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
3062
"de rama."
3063
3064
#: bzrlib/builtins.py:4330
3065
msgid ""
3066
"If the destination is already completely merged into the source, pull from "
3067
"the source rather than merging. When this happens, you do not need to "
3068
"commit the result."
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:4335
3072
msgid ""
3073
"Branch to merge into, rather than the one containing the working directory."
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:4337
3077
msgid "Instead of merging, show a diff of the merge."
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:4339
3081
msgid "Select changes interactively."
3082
msgstr "Seleccionar cambios de manera interactiva."
3083
3084
#: bzrlib/builtins.py:4361
3085
msgid ""
3086
"Merging into empty branches not currently supported, "
3087
"https://bugs.launchpad.net/bzr/+bug/308562"
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:4388
3091
msgid "Cannot use --uncommitted with bundles or merge directives."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:4399
3095
msgid "Cannot use --uncommitted and --revision at the same time."
3096
msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
3097
3098
#: bzrlib/builtins.py:4419
3099
msgid "merger: "
3100
msgstr "fusión: "
3101
3102
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3103
msgid "Nothing to do."
3104
msgstr "Nada que hacer."
3105
3106
#: bzrlib/builtins.py:4425
3107
msgid "Cannot pull individual files"
3108
msgstr "No se puede tirar de archivos individuales"
3109
3110
#: bzrlib/builtins.py:4433
3111
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3112
msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
3113
3114
#: bzrlib/builtins.py:4491
3115
#, python-format
3116
msgid "Show-base is not supported for this merge type. %s"
3117
msgstr "Show-base no está permitido en este tipo de fusión. %s"
3118
3119
#: bzrlib/builtins.py:4500
3120
#, python-format
3121
msgid "Conflict reduction is not supported for merge type %s."
3122
msgstr ""
3123
"La reducción de conflicot no está permitida para el tipo de fusión %s."
3124
3125
#: bzrlib/builtins.py:4504
3126
msgid "Cannot do conflict reduction and show base."
3127
msgstr ""
3128
3129
#: bzrlib/builtins.py:4615
3130
msgid "No location specified or remembered"
3131
msgstr "No hay ubicación especificada o recordada"
3132
3133
#: bzrlib/builtins.py:4617
3134
msgid "{0} remembered {1} location {2}"
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:4623
3138
msgid "Redo a merge."
3139
msgstr "Rehacer una fusión."
3140
3141
#: bzrlib/builtins.py:4625
3142
msgid ""
3143
"Use this if you want to try a different merge technique while resolving\n"
3144
"conflicts. Some merge techniques are better than others, and remerge\n"
3145
"lets you try different ones on different files."
3146
msgstr ""
3147
3148
#: bzrlib/builtins.py:4629
3149
msgid ""
3150
"The options for remerge have the same meaning and defaults as the ones for\n"
3151
"merge. The difference is that remerge can (only) be run when there is a\n"
3152
"pending merge, and it lets you specify particular files."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:4633
3156
msgid ""
3157
":Examples:\n"
3158
" Re-do the merge of all conflicted files, and show the base text in\n"
3159
" conflict regions, in addition to the usual THIS and OTHER texts::"
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:4637
3163
msgid " bzr remerge --show-base"
3164
msgstr " bzr remerge --show-base"
3165
3166
#: bzrlib/builtins.py:4639
3167
msgid ""
3168
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3169
" additional processing to reduce the size of conflict regions::"
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:4642
3173
msgid " bzr remerge --merge-type weave --reprocess foobar"
3174
msgstr ""
3175
3176
#: bzrlib/builtins.py:4649
3177
msgid "Show base revision text in conflicts."
3178
msgstr "Mostrar el texto de revisión base en los conflictos."
3179
3180
#: bzrlib/builtins.py:4661
3181
msgid ""
3182
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3183
"merges."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:4717
3187
msgid "Revert files to a previous revision."
3188
msgstr "Revierte los archivos a la revisión previa."
3189
3190
#: bzrlib/builtins.py:4719
3191
msgid ""
3192
"Giving a list of files will revert only those files. Otherwise, all files\n"
3193
"will be reverted. If the revision is not specified with '--revision', the\n"
3194
"last committed revision is used."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:4723
3198
msgid ""
3199
"To remove only some changes, without reverting to a prior version, use\n"
3200
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3201
"will remove the changes introduced by the second last commit (-2), without\n"
3202
"affecting the changes introduced by the last commit (-1). To remove\n"
3203
"certain changes on a hunk-by-hunk basis, see the shelve command."
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:4729
3207
msgid ""
3208
"By default, any files that have been manually changed will be backed up\n"
3209
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3210
"'.~#~' appended to their name, where # is a number."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:4733
3214
msgid ""
3215
"When you provide files, you can use their current pathname or the pathname\n"
3216
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3217
"name. If you name a directory, all the contents of that directory will be\n"
3218
"reverted."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:4738
3222
msgid ""
3223
"If you have newly added files since the target revision, they will be\n"
3224
"removed. If the files to be removed have been changed, backups will be\n"
3225
"created as above. Directories containing unknown files will not be\n"
3226
"deleted."
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:4743
3230
msgid ""
3231
"The working tree contains a list of revisions that have been merged but\n"
3232
"not yet committed. These revisions will be included as additional parents\n"
3233
"of the next commit. Normally, using revert clears that list as well as\n"
3234
"reverting the files. If any files are specified, revert leaves the list\n"
3235
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3236
".`` in the tree root to revert all files but keep the recorded merges,\n"
3237
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3238
"reverting any files."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:4752
3242
msgid ""
3243
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3244
"changes from a branch in a single revision. To do this, perform the merge\n"
3245
"as desired. Then doing revert with the \"--forget-merges\" option will "
3246
"keep\n"
3247
"the content of the tree as it was, but it will clear the list of pending\n"
3248
"merges. The next commit will then contain all of the changes that are\n"
3249
"present in the other branch, but without any other parent revisions.\n"
3250
"Because this technique forgets where these changes originated, it may\n"
3251
"cause additional conflicts on later merges involving the same source and\n"
3252
"target branches."
3253
msgstr ""
3254
3255
#: bzrlib/builtins.py:4766
3256
msgid "Do not save backups of reverted files."
3257
msgstr "No guardar respaldos de los archivos revertidos"
3258
3259
#: bzrlib/builtins.py:4768
3260
msgid "Remove pending merge marker, without changing any files."
3261
msgstr ""
3262
"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
3263
3264
#: bzrlib/builtins.py:4799
3265
msgid ""
3266
"Show help on a command or other topic.\n"
3267
" "
3268
msgstr ""
3269
"Muestra ayuda en una orden u otro tema.\n"
3270
" "
3271
3272
#: bzrlib/builtins.py:4804
3273
msgid "Show help on all commands."
3274
msgstr "Muestra ayuda en todas las órdenes"
3275
3276
#: bzrlib/builtins.py:4833
3277
msgid "Show unmerged/unpulled revisions between two branches."
3278
msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
3279
3280
#: bzrlib/builtins.py:4835
3281
msgid "OTHER_BRANCH may be local or remote."
3282
msgstr "OTHER_BRANCH puede ser local o remoto."
3283
3284
#: bzrlib/builtins.py:4837
3285
msgid ""
3286
"To filter on a range of revisions, you can use the command -r begin..end\n"
3287
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3288
"also valid.\n"
3289
" \n"
3290
":Exit values:\n"
3291
" 1 - some missing revisions\n"
3292
" 0 - no missing revisions"
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:4847
3296
msgid ""
3297
" Determine the missing revisions between this and the branch at the\n"
3298
" remembered pull location::"
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:4850
3302
msgid " bzr missing"
3303
msgstr " bzr missing"
3304
3305
#: bzrlib/builtins.py:4852
3306
msgid " Determine the missing revisions between this and another branch::"
3307
msgstr " Determina las revisiones perdidas entre esta y otra rama::"
3308
3309
#: bzrlib/builtins.py:4854
3310
msgid " bzr missing http://server/branch"
3311
msgstr " bzr missing http://server/branch"
3312
3313
#: bzrlib/builtins.py:4856
3314
msgid ""
3315
" Determine the missing revisions up to a specific revision on the other\n"
3316
" branch::"
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:4859
3320
msgid " bzr missing -r ..-10"
3321
msgstr " bzr missing -r ..-10"
3322
3323
#: bzrlib/builtins.py:4861
3324
msgid ""
3325
" Determine the missing revisions up to a specific revision on this\n"
3326
" branch::"
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:4864
3330
msgid " bzr missing --my-revision ..-10"
3331
msgstr " bzr missing --my-revision ..-10"
3332
3333
#: bzrlib/builtins.py:4871
3334
msgid "Reverse the order of revisions."
3335
msgstr "Revierte el orden de las revisiones."
3336
3337
#: bzrlib/builtins.py:4873
3338
msgid "Display changes in the local branch only."
3339
msgstr "Muestra cambios solo en la rama local."
3340
3341
#: bzrlib/builtins.py:4874
3342
msgid "Same as --mine-only."
3343
msgstr "Lo mismo que --mine-only."
3344
3345
#: bzrlib/builtins.py:4876
3346
msgid "Display changes in the remote branch only."
3347
msgstr "Muestra cambios solo en la rama remota."
3348
3349
#: bzrlib/builtins.py:4877
3350
msgid "Same as --theirs-only."
3351
msgstr "Lo mismo que --theirs-only."
3352
3353
#: bzrlib/builtins.py:4882
3354
msgid ""
3355
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3356
"details."
3357
msgstr ""
3358
"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
3359
"tener más detalles."
3360
3361
#: bzrlib/builtins.py:4886
3362
msgid ""
3363
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3364
"details."
3365
msgstr ""
3366
"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
3367
"para tener más detalles."
3368
3369
#: bzrlib/builtins.py:4889
3370
msgid "Show all revisions in addition to the mainline ones."
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:4943
3374
msgid "No peer location known or specified."
3375
msgstr "No hay ubicación del par conocida o especificada."
3376
3377
#: bzrlib/builtins.py:4947
3378
msgid "Using saved parent location: {0}\n"
3379
msgstr "Usar ubicación padre guardada: {0}\n"
3380
3381
#: bzrlib/builtins.py:4980
3382
#, python-format
3383
msgid "You have %d extra revision:\n"
3384
msgid_plural "You have %d extra revisions:\n"
3385
msgstr[0] "Tiene %d revisión extra:\n"
3386
msgstr[1] "Tiene %d revisiones extra:\n"
3387
3388
#: bzrlib/builtins.py:4996
3389
#, python-format
3390
msgid "You are missing %d revision:\n"
3391
msgid_plural "You are missing %d revisions:\n"
3392
msgstr[0] "Tiene %d revisión perdida:\n"
3393
msgstr[1] "Tiene %d revisiones perdidas:\n"
3394
3395
#: bzrlib/builtins.py:5008
3396
msgid "This branch has no new revisions.\n"
3397
msgstr "Esta rama no tiene revisiones.\n"
3398
3399
#: bzrlib/builtins.py:5011
3400
msgid "Other branch has no new revisions.\n"
3401
msgstr "Otra rama no tiene revisiones nuevas.\n"
3402
3403
#: bzrlib/builtins.py:5016
3404
msgid "Branches are up to date.\n"
3405
msgstr "La rama está actualizada:\n"
3406
3407
#: bzrlib/builtins.py:5027
3408
msgid "Compress the data within a repository."
3409
msgstr "Comprime los datos en un repositorio."
3410
3411
#: bzrlib/builtins.py:5029
3412
msgid ""
3413
"This operation compresses the data within a bazaar repository. As\n"
3414
"bazaar supports automatic packing of repository, this operation is\n"
3415
"normally not required to be done manually."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:5033
3419
msgid ""
3420
"During the pack operation, bazaar takes a backup of existing repository\n"
3421
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3422
"automatically when it is safe to do so. To save disk space by removing\n"
3423
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3424
"used."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5039
3428
msgid ""
3429
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3430
"during or immediately after repacking, you may be left with a state\n"
3431
"where the deletion has been written to disk but the new packs have not\n"
3432
"been. In this case the repository may be unusable."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5048
3436
msgid "Delete obsolete packs to save disk space."
3437
msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
3438
3439
#: bzrlib/builtins.py:5062
3440
msgid "List the installed plugins."
3441
msgstr "Lista los complementos instalados."
3442
3443
#: bzrlib/builtins.py:5064
3444
msgid ""
3445
"This command displays the list of installed plugins including\n"
3446
"version of plugin and a short description of each."
3447
msgstr ""
3448
"Esta orden muestra la lista de complementos instalados incluyendo\n"
3449
"versión del complemento y una breve descripción de cada uno."
3450
3451
#: bzrlib/builtins.py:5067
3452
msgid "--verbose shows the path where each plugin is located."
3453
msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
3454
3455
#: bzrlib/builtins.py:5069
3456
msgid ""
3457
"A plugin is an external component for Bazaar that extends the\n"
3458
"revision control system, by adding or replacing code in Bazaar.\n"
3459
"Plugins can do a variety of things, including overriding commands,\n"
3460
"adding new commands, providing additional network transports and\n"
3461
"customizing log output."
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5075
3465
msgid ""
3466
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3467
"for further information on plugins including where to find them and how to\n"
3468
"install them. Instructions are also provided there on how to write new\n"
3469
"plugins using the Python programming language."
3470
msgstr ""
3471
3472
#: bzrlib/builtins.py:5091
3473
msgid "Show testament (signing-form) of a revision."
3474
msgstr ""
3475
3476
#: bzrlib/builtins.py:5094
3477
msgid "Produce long-format testament."
3478
msgstr "Produce testamento en formato largo."
3479
3480
#: bzrlib/builtins.py:5096
3481
msgid "Produce a strict-format testament."
3482
msgstr "Produce testamento en formato estricto."
3483
3484
#: bzrlib/builtins.py:5122
3485
msgid "Show the origin of each line in a file."
3486
msgstr "Muestra el origen de cada línea en un archivo"
3487
3488
#: bzrlib/builtins.py:5124
3489
msgid ""
3490
"This prints out the given file with an annotation on the left side\n"
3491
"indicating which revision, author and date introduced the change."
3492
msgstr ""
3493
3494
#: bzrlib/builtins.py:5127
3495
msgid ""
3496
"If the origin is the same for a run of consecutive lines, it is\n"
3497
"shown only at the top, unless the --all option is given."
3498
msgstr ""
3499
3500
#: bzrlib/builtins.py:5135
3501
msgid "Show annotations on all lines."
3502
msgstr "Muestra anotaciones en todas las líneas."
3503
3504
#: bzrlib/builtins.py:5136
3505
msgid "Show commit date in annotations."
3506
msgstr "Muestra la fecha de ejecución en anotaciones."
3507
3508
#: bzrlib/builtins.py:5223
3509
msgid "Cannot sign a range of non-revision-history revisions"
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5235
3513
msgid "Please supply either one revision, or a range."
3514
msgstr "Proporcione una revisión o un rango."
3515
3516
#: bzrlib/builtins.py:5239
3517
msgid ""
3518
"Convert the current branch into a checkout of the supplied branch.\n"
3519
"If no branch is supplied, rebind to the last bound location."
3520
msgstr ""
3521
3522
#: bzrlib/builtins.py:5242
3523
msgid ""
3524
"Once converted into a checkout, commits must succeed on the master branch\n"
3525
"before they will be applied to the local branch."
3526
msgstr ""
3527
3528
#: bzrlib/builtins.py:5245
3529
msgid ""
3530
"Bound branches use the nickname of its master branch unless it is set\n"
3531
"locally, in which case binding will update the local nickname to be\n"
3532
"that of the master."
3533
msgstr ""
3534
3535
#: bzrlib/builtins.py:5260
3536
msgid "No location supplied. This format does not remember old locations."
3537
msgstr ""
3538
"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
3539
3540
#: bzrlib/builtins.py:5265
3541
msgid "Branch is already bound"
3542
msgstr "La rama ya está asociada"
3543
3544
#: bzrlib/builtins.py:5267
3545
msgid "No location supplied and no previous location known"
3546
msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
3547
3548
#: bzrlib/builtins.py:5273
3549
msgid "These branches have diverged. Try merging, and then bind again."
3550
msgstr ""
3551
"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
3552
3553
#: bzrlib/builtins.py:5280
3554
msgid "Convert the current checkout into a regular branch."
3555
msgstr "Convertir la comprobación actual en una rama regular."
3556
3557
#: bzrlib/builtins.py:5282
3558
msgid ""
3559
"After unbinding, the local branch is considered independent and subsequent\n"
3560
"commits will be local only."
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:5293
3564
msgid "Local branch is not bound"
3565
msgstr "La rama local no está vinculada"
3566
3567
#: bzrlib/builtins.py:5297
3568
msgid "Remove the last committed revision."
3569
msgstr "Elimina la última revisión ejecutada."
3570
3571
#: bzrlib/builtins.py:5299
3572
msgid ""
3573
"--verbose will print out what is being removed.\n"
3574
"--dry-run will go through all the motions, but not actually\n"
3575
"remove anything."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5303
3579
msgid ""
3580
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3581
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3582
"branch at revision 15."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5307
3586
msgid ""
3587
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3588
"it may make is to restore any pending merges that were present before\n"
3589
"the commit."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5318
3593
msgid "Don't actually make changes."
3594
msgstr "En relaidad no hace cambios."
3595
3596
#: bzrlib/builtins.py:5319
3597
msgid "Say yes to all questions."
3598
msgstr "Decir sí a todas las preguntas."
3599
3600
#: bzrlib/builtins.py:5321
3601
msgid "Keep tags that point to removed revisions."
3602
msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
3603
3604
#: bzrlib/builtins.py:5323
3605
msgid "Only remove the commits from the local branch when in a checkout."
3606
msgstr ""
3607
"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
3608
3609
#: bzrlib/builtins.py:5372
3610
msgid "No revisions to uncommit.\n"
3611
msgstr "No hay revisiones para desejecutar.\n"
3612
3613
#: bzrlib/builtins.py:5387
3614
msgid "Dry-run, pretending to remove the above revisions.\n"
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5390
3618
msgid "The above revision(s) will be removed.\n"
3619
msgstr "Las revisiones de arriba se eliminarán.\n"
3620
3621
#: bzrlib/builtins.py:5394
3622
msgid "Uncommit these revisions"
3623
msgstr "Desejecutar estas revisiones"
3624
3625
#: bzrlib/builtins.py:5397
3626
msgid "Canceled\n"
3627
msgstr "Cancelado\n"
3628
3629
#: bzrlib/builtins.py:5404
3630
#, python-format
3631
msgid ""
3632
"You can restore the old tip by running:\n"
3633
" bzr pull . -r revid:%s\n"
3634
msgstr ""
3635
"Puede restaurar el consejo antiguo ejecutando:\n"
3636
" bzr pull . -r revid:%s\n"
3637
3638
#: bzrlib/builtins.py:5409
3639
msgid "Break a dead lock."
3640
msgstr "Romper un bloqueo."
3641
3642
#: bzrlib/builtins.py:5411
3643
msgid ""
3644
"This command breaks a lock on a repository, branch, working directory or\n"
3645
"config file."
3646
msgstr ""
3647
"Esta orden rompe un bloqueo en un repositorio, rama, directorio de trabajo "
3648
"o\n"
3649
"archivo de configuración."
3650
3651
#: bzrlib/builtins.py:5414
3652
msgid ""
3653
"CAUTION: Locks should only be broken when you are sure that the process\n"
3654
"holding the lock has been stopped."
3655
msgstr ""
3656
3657
#: bzrlib/builtins.py:5417
3658
msgid ""
3659
"You can get information on what locks are open via the 'bzr info\n"
3660
"[location]' command."
3661
msgstr ""
3662
3663
#: bzrlib/builtins.py:5420
3664
msgid ""
3665
":Examples:\n"
3666
" bzr break-lock\n"
3667
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3668
" bzr break-lock --conf ~/.bazaar"
3669
msgstr ""
3670
":Ejemplos:\n"
3671
" bzr break-lock\n"
3672
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3673
" bzr break-lock --conf ~/.bazaar"
3674
3675
#: bzrlib/builtins.py:5429
3676
msgid "LOCATION is the directory where the config lock is."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5431
3680
msgid "Do not ask for confirmation before breaking the lock."
3681
msgstr "No pedir confirmación antes de romper el bloqueo."
3682
3683
#: bzrlib/builtins.py:5466
3684
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5467
3688
msgid "Run the bzr server."
3689
msgstr "Ejecutar el servidor bzr."
3690
3691
#: bzrlib/builtins.py:5473
3692
msgid "Serve on stdin/out for use from inetd or sshd."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:5474
3696
msgid "protocol"
3697
msgstr "protocolo"
3698
3699
#: bzrlib/builtins.py:5475
3700
msgid "Protocol to serve."
3701
msgstr "Protocolo a servir."
3702
3703
#: bzrlib/builtins.py:5479
3704
msgid ""
3705
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3706
"Passing 0 as the port number will result in a dynamically allocated port. "
3707
"The default port depends on the protocol."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:5485
3711
msgid "Serve contents of this directory."
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:5487
3715
msgid ""
3716
"By default the server is a readonly server. Supplying --allow-writes "
3717
"enables write access to the contents of the served directory and below. "
3718
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3719
"of external authentication is arranged supplying this option leads to global "
3720
"uncontrolled write access to your file system."
3721
msgstr ""
3722
3723
#: bzrlib/builtins.py:5496
3724
msgid "Override the default idle client timeout (5min)."
3725
msgstr ""
3726
3727
#: bzrlib/builtins.py:5546
3728
msgid "Combine a tree into its containing tree."
3729
msgstr "Combina un árbol en su árbol contenedor."
3730
3731
#: bzrlib/builtins.py:5548
3732
msgid "This command requires the target tree to be in a rich-root format."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:5550
3736
msgid ""
3737
"The TREE argument should be an independent tree, inside another tree, but\n"
3738
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3739
"running \"bzr branch\" with the target inside a tree.)"
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:5554
3743
msgid ""
3744
"The result is a combined tree, with the subtree no longer an independent\n"
3745
"part. This is marked as a merge of the subtree into the containing tree,\n"
3746
"and all history is preserved."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:5572
3750
#, python-format
3751
msgid ""
3752
"Can't join trees because %s doesn't support rich root data.\n"
3753
"You can use bzr upgrade on the repository."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3757
msgid "Cannot join {0}. {1}"
3758
msgstr "No se puede unir {0}. {1}"
3759
3760
#: bzrlib/builtins.py:5592
3761
msgid "Split a subdirectory of a tree into a separate tree."
3762
msgstr "Divide un subdirectorio de un árbol en un árbol separado."
3763
3764
#: bzrlib/builtins.py:5594
3765
msgid ""
3766
"This command will produce a target tree in a format that supports\n"
3767
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3768
"converted into earlier formats like 'dirstate-tags'."
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:5598
3772
msgid ""
3773
"The TREE argument should be a subdirectory of a working tree. That\n"
3774
"subdirectory will be converted into an independent tree, with its own\n"
3775
"branch. Commits in the top-level tree will not apply to the new subtree."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5678
3779
msgid "No submit branch specified or known"
3780
msgstr "No se ha enviado una rama especificada o conocida"
3781
3782
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3783
msgid "No public branch specified or known"
3784
msgstr "No hay una rama especificada o conocida pública"
3785
3786
#: bzrlib/builtins.py:5691
3787
msgid "bzr merge-directive takes at most two one revision identifiers"
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:5700
3791
msgid "No revisions to bundle."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:5719
3795
msgid "Mail or create a merge-directive for submitting changes."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:5721
3799
msgid "A merge directive provides many things needed for requesting merges:"
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:5723
3803
msgid "* A machine-readable description of the merge to perform"
3804
msgstr ""
3805
3806
#: bzrlib/builtins.py:5725
3807
msgid "* An optional patch that is a preview of the changes requested"
3808
msgstr ""
3809
"* Una ruta opcional que es una vista previa de los cambios requeridos"
3810
3811
#: bzrlib/builtins.py:5727
3812
msgid ""
3813
"* An optional bundle of revision data, so that the changes can be applied\n"
3814
" directly from the merge directive, without retrieving data from a\n"
3815
" branch."
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:5731
3819
msgid ""
3820
"`bzr send` creates a compact data set that, when applied using bzr\n"
3821
"merge, has the same effect as merging from the source branch. "
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:5734
3825
msgid ""
3826
"By default the merge directive is self-contained and can be applied to any\n"
3827
"branch containing submit_branch in its ancestory without needing access to\n"
3828
"the source branch."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5738
3832
msgid ""
3833
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3834
"revisions, but only a structured request to merge from the\n"
3835
"public_location. In that case the public_branch is needed and it must be\n"
3836
"up-to-date and accessible to the recipient. The public_branch is always\n"
3837
"included if known, so that people can check it later."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5744
3841
msgid ""
3842
"The submit branch defaults to the parent of the source branch, but can be\n"
3843
"overridden. Both submit branch and public branch will be remembered in\n"
3844
"branch.conf the first time they are used for a particular branch. The\n"
3845
"source branch defaults to that containing the working directory, but can\n"
3846
"be changed using --from."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:5750
3850
msgid ""
3851
"Both the submit branch and the public branch follow the usual behavior with\n"
3852
"respect to --remember: If there is no default location set, the first send\n"
3853
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3854
"omit the location to use the default. To change the default, use\n"
3855
"--remember. The value will only be saved if the location can be accessed."
3856
msgstr ""
3857
3858
#: bzrlib/builtins.py:5756
3859
msgid ""
3860
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3861
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3862
"If a public location is known for the submit_branch, that location is used\n"
3863
"in the merge directive."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:5761
3867
msgid ""
3868
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3869
"given, in which case it is sent to a file."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:5764
3873
msgid ""
3874
"Mail is sent using your preferred mail program. This should be transparent\n"
3875
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3876
"If the preferred client can't be found (or used), your editor will be used."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:5768
3880
msgid ""
3881
"To use a specific mail program, set the mail_client configuration option.\n"
3882
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3883
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3884
"(MacOS X's\n"
3885
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3886
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3887
"add\n"
3888
"supported clients."
3889
msgstr ""
3890
3891
#: bzrlib/builtins.py:5775
3892
msgid ""
3893
"If mail is being sent, a to address is required. This can be supplied\n"
3894
"either on the commandline, by setting the submit_to configuration\n"
3895
"option in the branch itself or the child_submit_to configuration option\n"
3896
"in the submit branch."
3897
msgstr ""
3898
3899
#: bzrlib/builtins.py:5780
3900
msgid ""
3901
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3902
"and\n"
3903
"merge directive format 2. It is significantly faster and smaller than\n"
3904
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3905
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3906
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:5786
3910
msgid ""
3911
"The merge directives created by bzr send may be applied using bzr merge or\n"
3912
"bzr pull by specifying a file containing a merge directive as the location."
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:5789
3916
msgid ""
3917
"bzr send makes extensive use of public locations to map local locations "
3918
"into\n"
3919
"URLs that can be used by other people. See `bzr help configuration` to\n"
3920
"set them, and use `bzr info` to display them."
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:5813
3924
msgid "Write merge directive to this file or directory; use - for stdout."
3925
msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
3926
3927
#: bzrlib/builtins.py:5817
3928
msgid ""
3929
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3930
"strict disables the check."
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:5819
3934
msgid "Mail the request to this address."
3935
msgstr "Enviar por correo la petición a esta dirección"
3936
3937
#: bzrlib/builtins.py:5823
3938
msgid "Body for the email."
3939
msgstr "Cuerpo para el correo."
3940
3941
#: bzrlib/builtins.py:5876
3942
msgid "Do not include a bundle in the merge directive."
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:5877
3946
msgid "Do not include a preview patch in the merge directive."
3947
msgstr "No incluir una ruta de vista previa en la directiva de fusión."
3948
3949
#: bzrlib/builtins.py:5880
3950
msgid "Remember submit and public branch."
3951
msgstr "Recordar el envío y la rama pública."
3952
3953
#: bzrlib/builtins.py:5882
3954
msgid ""
3955
"Branch to generate the submission from, rather than the one containing the "
3956
"working directory."
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3960
msgid "format"
3961
msgstr "formato"
3962
3963
#: bzrlib/builtins.py:5893
3964
msgid "Use the specified output format."
3965
msgstr "Usar el formato de salida especificado."
3966
3967
#: bzrlib/builtins.py:5915
3968
msgid "Create, remove or modify a tag naming a revision."
3969
msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
3970
3971
#: bzrlib/builtins.py:5917
3972
msgid ""
3973
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3974
"(--revision) option can be given -rtag:X, where X is any previously\n"
3975
"created tag."
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:5921
3979
msgid ""
3980
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3981
"along when you branch, push, pull or merge."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:5924
3985
msgid ""
3986
"It is an error to give a tag name that already exists unless you pass\n"
3987
"--force, in which case the tag is moved to point to the new revision."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:5927
3991
msgid ""
3992
"To rename a tag (change the name but keep it on the same revsion), run "
3993
"``bzr\n"
3994
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:5930
3998
msgid ""
3999
"If no tag name is specified it will be determined through the \n"
4000
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4001
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4002
"details."
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:5940
4006
msgid "Delete this tag rather than placing it."
4007
msgstr "Eliminar esta etiqueta en lugar de colocarla."
4008
4009
#: bzrlib/builtins.py:5943
4010
msgid "Branch in which to place the tag."
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:5945
4014
msgid "Replace existing tags."
4015
msgstr "Reemplazar las etiquetas existentes."
4016
4017
#: bzrlib/builtins.py:5960
4018
msgid "No tag specified to delete."
4019
msgstr "No hay etiquetas especificadas para eliminar."
4020
4021
#: bzrlib/builtins.py:5962
4022
#, python-format
4023
msgid "Deleted tag %s."
4024
msgstr "Etiqueta%s eliminada."
4025
4026
#: bzrlib/builtins.py:5976
4027
msgid "Please specify a tag name."
4028
msgstr "Especifique un nombre de etiqueta."
4029
4030
#: bzrlib/builtins.py:5984
4031
#, python-format
4032
msgid "Tag %s already exists for that revision."
4033
msgstr "La etiqueta %s existe para esta revisión."
4034
4035
#: bzrlib/builtins.py:5988
4036
#, python-format
4037
msgid "Created tag %s."
4038
msgstr "Etiqueta %s creada."
4039
4040
#: bzrlib/builtins.py:5990
4041
#, python-format
4042
msgid "Updated tag %s."
4043
msgstr "Etiqueta actualizada %s."
4044
4045
#: bzrlib/builtins.py:5994
4046
msgid "List tags."
4047
msgstr "Listar etiquetas."
4048
4049
#: bzrlib/builtins.py:5996
4050
msgid ""
4051
"This command shows a table of tag names and the revisions they reference."
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6002
4055
msgid "Branch whose tags should be displayed."
4056
msgstr "Rama cuyas etiquetas se deben mostrar."
4057
4058
#: bzrlib/builtins.py:6004
4059
msgid "Sort tags by different criteria."
4060
msgstr "Ordenar etiquetas con diferentes criterios."
4061
4062
#: bzrlib/builtins.py:6004
4063
msgid "Sorting"
4064
msgstr "Ordenación"
4065
4066
#: bzrlib/builtins.py:6073
4067
msgid "Reconfigure the type of a bzr directory."
4068
msgstr "Reconfigura el tipo de un directorio bzr."
4069
4070
#: bzrlib/builtins.py:6075
4071
msgid "A target configuration must be specified."
4072
msgstr "Se debe especificar una configuración objetivo."
4073
4074
#: bzrlib/builtins.py:6077
4075
msgid ""
4076
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4077
"The order of preference is\n"
4078
"1. For a lightweight checkout, the current bound location.\n"
4079
"2. For branches that used to be checkouts, the previously-bound location.\n"
4080
"3. The push location.\n"
4081
"4. The parent location.\n"
4082
"If none of these is available, --bind-to must be specified."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6091
4086
msgid "Tree type"
4087
msgstr "Tipo de árbol"
4088
4089
#: bzrlib/builtins.py:6092
4090
msgid "The relation between branch and tree."
4091
msgstr "La relación entre rama y árbol."
4092
4093
#: bzrlib/builtins.py:6094
4094
msgid "Reconfigure to be an unbound branch with no working tree."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6095
4098
msgid "Reconfigure to be an unbound branch with a working tree."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6096
4102
msgid "Reconfigure to be a bound branch with a working tree."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6097
4106
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6102
4110
msgid "Repository type"
4111
msgstr "Tipo de repositorio"
4112
4113
#: bzrlib/builtins.py:6103
4114
msgid "Location fo the repository."
4115
msgstr "Ubicación en el repositorio."
4116
4117
#: bzrlib/builtins.py:6105
4118
msgid ""
4119
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6107
4123
msgid "Reconfigure to use a shared repository."
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6111
4127
msgid "Trees in Repository"
4128
msgstr "Árboles en el repositorio"
4129
4130
#: bzrlib/builtins.py:6112
4131
msgid "Whether new branches in the repository have trees."
4132
msgstr "Si las ramas nuevas en el repositorio tienen árboles."
4133
4134
#: bzrlib/builtins.py:6114
4135
msgid ""
4136
"Reconfigure repository to create working trees on branches by default."
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6116
4140
msgid ""
4141
"Reconfigure repository to not create working trees on branches by default."
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6119
4145
msgid "Branch to bind checkout to."
4146
msgstr ""
4147
4148
#: bzrlib/builtins.py:6121
4149
msgid "Perform reconfiguration even if local changes will be lost."
4150
msgstr ""
4151
"Realizar reconfiguración incluso si se han perdido los cambios locales."
4152
4153
#: bzrlib/builtins.py:6124
4154
msgid "Reconfigure a branch to be stacked on another branch."
4155
msgstr "Reconfigurar una rama para apilarla en otra rama."
4156
4157
#: bzrlib/builtins.py:6128
4158
msgid ""
4159
"Reconfigure a branch to be unstacked. This may require copying substantial "
4160
"data into it."
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6138
4164
msgid "Can't use both --stacked-on and --unstacked"
4165
msgstr "No se pueden usar ambos --stacked-on y --unstacked"
4166
4167
#: bzrlib/builtins.py:6152
4168
msgid "No target configuration specified"
4169
msgstr "No se ha especificado una configuración objetivo"
4170
4171
#: bzrlib/builtins.py:6187
4172
msgid "Set the branch of a checkout and update."
4173
msgstr "Establezca la rama de una comprobación y actualización."
4174
4175
#: bzrlib/builtins.py:6189
4176
msgid ""
4177
"For lightweight checkouts, this changes the branch being referenced.\n"
4178
"For heavyweight checkouts, this checks that there are no local commits\n"
4179
"versus the current bound branch, then it makes the local branch a mirror\n"
4180
"of the new location and binds to it."
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6194
4184
msgid ""
4185
"In both cases, the working tree is updated and uncommitted changes\n"
4186
"are merged. The user can commit or revert these as they desire."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6197
4190
msgid "Pending merges need to be committed or reverted before using switch."
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6199
4194
msgid ""
4195
"The path to the branch to switch to can be specified relative to the parent\n"
4196
"directory of the current branch. For example, if you are currently in a\n"
4197
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4198
"/path/to/newbranch."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6204
4202
msgid ""
4203
"Bound branches use the nickname of its master branch unless it is set\n"
4204
"locally, in which case switching will update the local nickname to be\n"
4205
"that of the master."
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6212
4209
msgid "Switch even if local commits will be lost."
4210
msgstr "Cambiar incluso si las ejecuciones se han perdido."
4211
4212
#: bzrlib/builtins.py:6215
4213
msgid "Create the target branch from this one before switching to it."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6229
4217
msgid "You must supply either a revision or a location"
4218
msgstr "Debe especificar una revisión o una ubicación"
4219
4220
#: bzrlib/builtins.py:6242
4221
msgid "cannot create branch without source branch"
4222
msgstr "no se puede crear una rama sin rama origen"
4223
4224
#: bzrlib/builtins.py:6262
4225
msgid "Manage filtered views."
4226
msgstr "Gestionar vistas filtradas."
4227
4228
#: bzrlib/builtins.py:6264
4229
msgid ""
4230
"Views provide a mask over the tree so that users can focus on\n"
4231
"a subset of a tree when doing their work. After creating a view,\n"
4232
"commands that support a list of files - status, diff, commit, etc -\n"
4233
"effectively have that list of files implicitly given each time.\n"
4234
"An explicit list of files can still be given but those files\n"
4235
"must be within the current view."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6271
4239
msgid ""
4240
"In most cases, a view has a short life-span: it is created to make\n"
4241
"a selected change and is deleted once that change is committed.\n"
4242
"At other times, you may wish to create one or more named views\n"
4243
"and switch between them."
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6276
4247
msgid ""
4248
"To disable the current view without deleting it, you can switch to\n"
4249
"the pseudo view called ``off``. This can be useful when you need\n"
4250
"to see the whole tree for an operation or two (e.g. merge) but\n"
4251
"want to switch back to your view after that."
4252
msgstr ""
4253
4254
#: bzrlib/builtins.py:6281
4255
msgid ""
4256
":Examples:\n"
4257
" To define the current view::"
4258
msgstr ""
4259
":Ejemplos:\n"
4260
" Para definir la vista actual::"
4261
4262
#: bzrlib/builtins.py:6284
4263
msgid " bzr view file1 dir1 ..."
4264
msgstr " bzr view file1 dir1 ..."
4265
4266
#: bzrlib/builtins.py:6286
4267
msgid " To list the current view::"
4268
msgstr " Para listar la vista actual::"
4269
4270
#: bzrlib/builtins.py:6288
4271
msgid " bzr view"
4272
msgstr " vista bzr"
4273
4274
#: bzrlib/builtins.py:6290
4275
msgid " To delete the current view::"
4276
msgstr " Para eliminar la vista actual::"
4277
4278
#: bzrlib/builtins.py:6292
4279
msgid " bzr view --delete"
4280
msgstr " bzr view --delete"
4281
4282
#: bzrlib/builtins.py:6294
4283
msgid " To disable the current view without deleting it::"
4284
msgstr " Para desactivar la vista actual sin eliminarla::"
4285
4286
#: bzrlib/builtins.py:6296
4287
msgid " bzr view --switch off"
4288
msgstr " bzr view --switch off"
4289
4290
#: bzrlib/builtins.py:6298
4291
msgid " To define a named view and switch to it::"
4292
msgstr ""
4293
4294
#: bzrlib/builtins.py:6300
4295
msgid " bzr view --name view-name file1 dir1 ..."
4296
msgstr " bzr view --name view-name file1 dir1 ..."
4297
4298
#: bzrlib/builtins.py:6302
4299
msgid " To list a named view::"
4300
msgstr " Para lista la vista nombrada::"
4301
4302
#: bzrlib/builtins.py:6304
4303
msgid " bzr view --name view-name"
4304
msgstr " bzr view --name view-name"
4305
4306
#: bzrlib/builtins.py:6306
4307
msgid " To delete a named view::"
4308
msgstr " Para eliminar una vista nombrada::"
4309
4310
#: bzrlib/builtins.py:6308
4311
msgid " bzr view --name view-name --delete"
4312
msgstr " bzr view --name view-name --delete"
4313
4314
#: bzrlib/builtins.py:6310
4315
msgid " To switch to a named view::"
4316
msgstr " Para cambiar a una vista nombrada::"
4317
4318
#: bzrlib/builtins.py:6312
4319
msgid " bzr view --switch view-name"
4320
msgstr " bzr view --switch view-name"
4321
4322
#: bzrlib/builtins.py:6314
4323
msgid " To list all views defined::"
4324
msgstr " Para listar todas las vistas definidas::"
4325
4326
#: bzrlib/builtins.py:6316
4327
msgid " bzr view --all"
4328
msgstr " bzr view --all"
4329
4330
#: bzrlib/builtins.py:6318
4331
msgid " To delete all views::"
4332
msgstr " Para eliminar todas las vistas::"
4333
4334
#: bzrlib/builtins.py:6320
4335
msgid " bzr view --delete --all"
4336
msgstr " bzr view --delete --all"
4337
4338
#: bzrlib/builtins.py:6327
4339
msgid "Apply list or delete action to all views."
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6330
4343
msgid "Delete the view."
4344
msgstr "Eliminar la vista."
4345
4346
#: bzrlib/builtins.py:6333
4347
msgid "Name of the view to define, list or delete."
4348
msgstr "Nombre de la vista a definir, listar o eliminar."
4349
4350
#: bzrlib/builtins.py:6337
4351
msgid "Name of the view to switch to."
4352
msgstr "Nombre de la vista a la que cambiar."
4353
4354
#: bzrlib/builtins.py:6356
4355
msgid "Both --delete and a file list specified"
4356
msgstr ""
4357
4358
#: bzrlib/builtins.py:6359
4359
msgid "Both --delete and --switch specified"
4360
msgstr "Ambos --delete y --switch especificados"
4361
4362
#: bzrlib/builtins.py:6362
4363
msgid "Deleted all views.\n"
4364
msgstr "Eliminar todas las vistas.\n"
4365
4366
#: bzrlib/builtins.py:6364
4367
msgid "No current view to delete"
4368
msgstr "No hay vista para eliminar"
4369
4370
#: bzrlib/builtins.py:6367
4371
#, python-format
4372
msgid "Deleted '%s' view.\n"
4373
msgstr "Vista «%s» eliminada.\n"
4374
4375
#: bzrlib/builtins.py:6371
4376
msgid "Both --switch and a file list specified"
4377
msgstr ""
4378
4379
#: bzrlib/builtins.py:6374
4380
msgid "Both --switch and --all specified"
4381
msgstr "Ambos --switch y --all especificados"
4382
4383
#: bzrlib/builtins.py:6377
4384
msgid "No current view to disable"
4385
msgstr "No hay vista actual que desactivar"
4386
4387
#: bzrlib/builtins.py:6379
4388
#, python-format
4389
msgid "Disabled '%s' view.\n"
4390
msgstr "Vista «%s» desactivada.\n"
4391
4392
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4393
msgid "Using '{0}' view: {1}\n"
4394
msgstr "Usar «{0}» vista: {1}\n"
4395
4396
#: bzrlib/builtins.py:6386
4397
msgid "Views defined:\n"
4398
msgstr "Vistas definidas:\n"
4399
4400
#: bzrlib/builtins.py:6395
4401
msgid "No views defined.\n"
4402
msgstr "No hay vista definida.\n"
4403
4404
#: bzrlib/builtins.py:6402
4405
msgid "Cannot change the 'off' pseudo view"
4406
msgstr ""
4407
4408
#: bzrlib/builtins.py:6410
4409
msgid "No current view.\n"
4410
msgstr "No hay vista actual.\n"
4411
4412
#: bzrlib/builtins.py:6413
4413
msgid "'{0}' view is: {1}\n"
4414
msgstr "«{0}» vista es: {1}\n"
4415
4416
#: bzrlib/builtins.py:6433
4417
msgid " <no hooks installed>\n"
4418
msgstr ""
4419
4420
#: bzrlib/builtins.py:6437
4421
msgid "Remove a branch."
4422
msgstr "Eliminar una rama."
4423
4424
#: bzrlib/builtins.py:6439
4425
msgid ""
4426
"This will remove the branch from the specified location but \n"
4427
"will keep any working tree or repository in place."
4428
msgstr ""
4429
4430
#: bzrlib/builtins.py:6444
4431
msgid " Remove the branch at repo/trunk::"
4432
msgstr " Eliminar la rama en repo/trunk::"
4433
4434
#: bzrlib/builtins.py:6446
4435
msgid " bzr remove-branch repo/trunk"
4436
msgstr " bzr remove-branch repo/trunk"
4437
4438
#: bzrlib/builtins.py:6461
4439
msgid "Plaintext diff output."
4440
msgstr ""
4441
4442
#: bzrlib/builtins.py:6462
4443
msgid "Temporarily set aside some changes from the current tree."
4444
msgstr ""
4445
4446
#: bzrlib/builtins.py:6464
4447
msgid ""
4448
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4449
"ie. out of the way, until a later time when you can bring them back from\n"
4450
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4451
"your working tree, and so they aren't propagated along with your branch nor\n"
4452
"will they survive its deletion."
4453
msgstr ""
4454
4455
#: bzrlib/builtins.py:6470
4456
msgid "If shelve --list is specified, previously-shelved changes are listed."
4457
msgstr ""
4458
4459
#: bzrlib/builtins.py:6472
4460
msgid ""
4461
"Shelve is intended to help separate several sets of changes that have\n"
4462
"been inappropriately mingled. If you just want to get rid of all changes\n"
4463
"and you don't need to restore them later, use revert. If you want to\n"
4464
"shelve all text changes at once, use shelve --all."
4465
msgstr ""
4466
4467
#: bzrlib/builtins.py:6477
4468
msgid ""
4469
"If filenames are specified, only the changes to those files will be\n"
4470
"shelved. Other files will be left untouched."
4471
msgstr ""
4472
4473
#: bzrlib/builtins.py:6480
4474
msgid ""
4475
"If a revision is specified, changes since that revision will be shelved."
4476
msgstr ""
4477
"Si se especifica una revisión, los cambios realizados desde esta revisión "
4478
"serán archivados."
4479
4480
#: bzrlib/builtins.py:6482
4481
msgid ""
4482
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4483
"restore the most recently shelved changes."
4484
msgstr ""
4485
4486
#: bzrlib/builtins.py:6485
4487
msgid ""
4488
"For complicated changes, it is possible to edit the changes in a separate\n"
4489
"editor program to decide what the file remaining in the working copy\n"
4490
"should look like. To do this, add the configuration option"
4491
msgstr ""
4492
4493
#: bzrlib/builtins.py:6489
4494
msgid " change_editor = PROGRAM @new_path @old_path"
4495
msgstr ""
4496
4497
#: bzrlib/builtins.py:6491
4498
msgid ""
4499
"where @new_path is replaced with the path of the new version of the \n"
4500
"file and @old_path is replaced with the path of the old version of \n"
4501
"the file. The PROGRAM should save the new file with the desired \n"
4502
"contents of the file in the working tree.\n"
4503
" "
4504
msgstr ""
4505
4506
#: bzrlib/builtins.py:6503
4507
msgid "Shelve all changes."
4508
msgstr "Guardar todos los cambios."
4509
4510
#: bzrlib/builtins.py:6505
4511
msgid "Method to use for writing diffs."
4512
msgstr "Método a usar para escribir diferencias."
4513
4514
#: bzrlib/builtins.py:6505
4515
msgid "writer"
4516
msgstr "escritor"
4517
4518
#: bzrlib/builtins.py:6509
4519
msgid "List shelved changes."
4520
msgstr "Listar cambios guardados."
4521
4522
#: bzrlib/builtins.py:6511
4523
msgid "Destroy removed changes instead of shelving them."
4524
msgstr "Destruir cambios eliminados en vez de guardarlos."
4525
4526
#: bzrlib/builtins.py:6540
4527
msgid "No shelved changes."
4528
msgstr "No ha cambios guardados."
4529
4530
#: bzrlib/builtins.py:6551
4531
msgid "Restore shelved changes."
4532
msgstr "Restaurar cambios guardados."
4533
4534
#: bzrlib/builtins.py:6553
4535
msgid ""
4536
"By default, the most recently shelved changes are restored. However if you\n"
4537
"specify a shelf by id those changes will be restored instead. This works\n"
4538
"best when the changes don't depend on each other."
4539
msgstr ""
4540
4541
#: bzrlib/builtins.py:6562
4542
msgid "The action to perform."
4543
msgstr "La acción a realizar."
4544
4545
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4546
msgid "action"
4547
msgstr "acción"
4548
4549
#: bzrlib/builtins.py:6564
4550
msgid "Apply changes and remove from the shelf."
4551
msgstr ""
4552
4553
#: bzrlib/builtins.py:6565
4554
msgid "Show changes, but do not apply or remove them."
4555
msgstr ""
4556
4557
#: bzrlib/builtins.py:6566
4558
msgid ""
4559
"Instead of unshelving the changes, show the diff that would result from "
4560
"unshelving."
4561
msgstr ""
4562
4563
#: bzrlib/builtins.py:6568
4564
msgid "Delete changes without applying them."
4565
msgstr ""
4566
4567
#: bzrlib/builtins.py:6569
4568
msgid "Apply changes but don't delete them."
4569
msgstr ""
4570
4571
#: bzrlib/builtins.py:6584
4572
msgid "Remove unwanted files from working tree."
4573
msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
4574
4575
#: bzrlib/builtins.py:6586
4576
msgid ""
4577
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4578
"files are never deleted."
4579
msgstr ""
4580
4581
#: bzrlib/builtins.py:6589
4582
msgid ""
4583
"Another class is 'detritus', which includes files emitted by bzr during\n"
4584
"normal operations and selftests. (The value of these files decreases with\n"
4585
"time.)"
4586
msgstr ""
4587
4588
#: bzrlib/builtins.py:6593
4589
msgid ""
4590
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4591
"flags are respected, and may be combined."
4592
msgstr ""
4593
4594
#: bzrlib/builtins.py:6596
4595
msgid "To check what clean-tree will do, use --dry-run."
4596
msgstr ""
4597
4598
#: bzrlib/builtins.py:6599
4599
msgid "Delete all ignored files."
4600
msgstr "Eliminar todos los archivos ignorados."
4601
4602
#: bzrlib/builtins.py:6600
4603
msgid ""
4604
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4605
msgstr ""
4606
4607
#: bzrlib/builtins.py:6603
4608
msgid "Delete files unknown to bzr (default)."
4609
msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
4610
4611
#: bzrlib/builtins.py:6604
4612
msgid "Show files to delete instead of deleting them."
4613
msgstr "Mostrar archivos a eliminar en vez de eliminarles."
4614
4615
#: bzrlib/builtins.py:6606
4616
msgid "Do not prompt before deleting."
4617
msgstr "No preguntar antes de eliminar."
4618
4619
#: bzrlib/bundle/__init__.py:59
4620
msgid "A directory cannot be a bundle"
4621
msgstr ""
4622
4623
#: bzrlib/bundle/apply_bundle.py:40
4624
msgid "Install revisions"
4625
msgstr ""
4626
4627
#: bzrlib/bundle/commands.py:64
4628
msgid "--verbose requires a merge directive"
4629
msgstr ""
4630
4631
#: bzrlib/bundle/commands.py:67
4632
msgid "Bundle format not supported"
4633
msgstr ""
4634
4635
#: bzrlib/bundle/commands.py:77
4636
msgid "Records\n"
4637
msgstr ""
4638
4639
#: bzrlib/bundle/commands.py:81
4640
msgid "{0}: {1} ({2} multiparent)\n"
4641
msgstr ""
4642
4643
#: bzrlib/bundle/commands.py:83
4644
#, python-format
4645
msgid "unique files: %d\n"
4646
msgstr ""
4647
4648
#: bzrlib/bundle/commands.py:92
4649
msgid "Revisions\n"
4650
msgstr ""
4651
4652
#: bzrlib/bundle/commands.py:93
4653
#, python-format
4654
msgid "nicks: %s\n"
4655
msgstr ""
4656
4657
#: bzrlib/bundle/commands.py:95
4658
#, python-format
4659
msgid ""
4660
"committers: \n"
4661
"%s\n"
4662
msgstr ""
4663
4664
#: bzrlib/bundle/commands.py:103
4665
msgid "Decoded contents\n"
4666
msgstr ""
4667
4668
#: bzrlib/bundle/serializer/v4.py:327
4669
#, python-format
4670
msgid "Bundling %d revision."
4671
msgid_plural "Bundling %d revisions."
4672
msgstr[0] ""
4673
msgstr[1] ""
4674
4675
#: bzrlib/bzrdir.py:490
4676
msgid ""
4677
"making backup of {0}\n"
4678
" to {1}"
4679
msgstr ""
4680
"haciendo respaldo de {0}\n"
4681
" a {1}"
4682
4683
#: bzrlib/bzrdir.py:513
4684
msgid "renamed {0} to {1}"
4685
msgstr "renombrado {0} a {1}"
4686
4687
#: bzrlib/bzrdir.py:1652
4688
#, python-format
4689
msgid ""
4690
"Source repository format does not support stacking, using format:\n"
4691
" %s"
4692
msgstr ""
4693
4694
#: bzrlib/bzrdir.py:1672
4695
#, python-format
4696
msgid ""
4697
"Source branch format does not support stacking, using format:\n"
4698
" %s"
4699
msgstr ""
4700
4701
#: bzrlib/bzrdir.py:1818
4702
msgid "starting repository conversion"
4703
msgstr "iniciar conversión de repositorio"
4704
4705
#: bzrlib/bzrdir.py:2039
4706
msgid "Using default stacking branch {0} at {1}"
4707
msgstr ""
4708
4709
#: bzrlib/check.py:108
4710
msgid "check"
4711
msgstr "marcar"
4712
4713
#: bzrlib/check.py:110
4714
msgid "checking revisions"
4715
msgstr "marcar revisiones"
4716
4717
#: bzrlib/check.py:112
4718
msgid "checking commit contents"
4719
msgstr ""
4720
4721
#: bzrlib/check.py:114
4722
msgid "checking file graphs"
4723
msgstr ""
4724
4725
#: bzrlib/check.py:118
4726
msgid "checking branches and trees"
4727
msgstr ""
4728
4729
#: bzrlib/check.py:205
4730
msgid "checked repository {0} format {1}"
4731
msgstr ""
4732
4733
#: bzrlib/check.py:208
4734
#, python-format
4735
msgid "%6d revisions"
4736
msgstr "%6d revisiones"
4737
4738
#: bzrlib/check.py:209
4739
#, python-format
4740
msgid "%6d file-ids"
4741
msgstr ""
4742
4743
#: bzrlib/check.py:211
4744
#, python-format
4745
msgid "%6d unreferenced text versions"
4746
msgstr "%6d versiones de texto no referenciadas"
4747
4748
#: bzrlib/check.py:215
4749
msgid "unreferenced version: {{{0}}} in {1}"
4750
msgstr "versión no referenciada: {{{0}}} en {1}"
4751
4752
#: bzrlib/check.py:218
4753
#, python-format
4754
msgid "%6d revisions are missing inventory_sha1"
4755
msgstr ""
4756
4757
#: bzrlib/check.py:221
4758
#, python-format
4759
msgid "%6d revisions are mentioned but not present"
4760
msgstr ""
4761
4762
#: bzrlib/check.py:224
4763
#, python-format
4764
msgid "%6d ghost revisions"
4765
msgstr ""
4766
4767
#: bzrlib/check.py:229
4768
#, python-format
4769
msgid "%6d revisions missing parents in ancestry"
4770
msgstr ""
4771
4772
#: bzrlib/check.py:233
4773
#, python-format
4774
msgid " %s should be in the ancestry for:"
4775
msgstr ""
4776
4777
#: bzrlib/check.py:237
4778
#, python-format
4779
msgid "%6d inconsistent parents"
4780
msgstr "%6d padres inconsistentes"
4781
4782
#: bzrlib/check.py:241
4783
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4784
msgstr ""
4785
4786
#: bzrlib/check.py:247
4787
#, python-format
4788
msgid "%6d revisions have incorrect parents in the revision index"
4789
msgstr ""
4790
4791
#: bzrlib/check.py:253
4792
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4793
msgstr ""
4794
4795
#: bzrlib/check.py:267
4796
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4797
msgstr ""
4798
4799
#: bzrlib/check.py:296
4800
msgid ""
4801
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4802
"{{{4}}}"
4803
msgstr ""
4804
4805
#: bzrlib/check.py:354
4806
#, python-format
4807
msgid "Checking branch at '%s'."
4808
msgstr "Comprobando rama en «%s»."
4809
4810
#: bzrlib/check.py:374
4811
#, python-format
4812
msgid "Checking working tree at '%s'."
4813
msgstr "Comprobando árbol de trabajo en «%s»."
4814
4815
#: bzrlib/check.py:427 bzrlib/check.py:441
4816
msgid "No branch found at specified location."
4817
msgstr "No se ha encontrado rama en la ubicación especificada."
4818
4819
#: bzrlib/check.py:429 bzrlib/check.py:439
4820
msgid "No working tree found at specified location."
4821
msgstr "No se ha encontrado árbol de trabajo en la ubicación especificada."
4822
4823
#: bzrlib/check.py:432
4824
#, python-format
4825
msgid "Checking repository at '%s'."
4826
msgstr "Comprobando repositorio en «%s»."
4827
4828
#: bzrlib/check.py:443
4829
msgid "No repository found at specified location."
4830
msgstr "No se ha encontrado repositorio en la ubicación especificada."
4831
4832
#: bzrlib/clean_tree.py:63
4833
msgid "Nothing to delete."
4834
msgstr "Nada que eliminar."
4835
4836
#: bzrlib/clean_tree.py:68
4837
msgid "Are you sure you wish to delete these"
4838
msgstr ""
4839
4840
#: bzrlib/clean_tree.py:70
4841
msgid "Canceled"
4842
msgstr ""
4843
4844
#: bzrlib/clean_tree.py:107
4845
#, python-format
4846
msgid "unable to remove %s"
4847
msgstr "imposible eliminar %s"
4848
4849
#: bzrlib/clean_tree.py:111
4850
msgid "deleting paths:"
4851
msgstr "eliminar rutas:"
4852
4853
#: bzrlib/clean_tree.py:125
4854
msgid "unable to remove \"{0}\": {1}."
4855
msgstr "imposible eliminar «{0}»: {1}."
4856
4857
#: bzrlib/clean_tree.py:130
4858
msgid "No files deleted."
4859
msgstr "No hay archivos eliminados."
4860
4861
#: bzrlib/cmd_version_info.py:47
4862
msgid "No known version info format {0}. Supported types are: {1}"
4863
msgstr ""
4864
4865
#: bzrlib/cmd_version_info.py:52
4866
msgid "Version info in Custom template-based format."
4867
msgstr ""
4868
4869
#: bzrlib/cmd_version_info.py:52
4870
msgid "Version info in Python format."
4871
msgstr ""
4872
4873
#: bzrlib/cmd_version_info.py:52
4874
msgid "Version info in RIO (simple text) format (default)."
4875
msgstr ""
4876
4877
#: bzrlib/cmd_version_info.py:53
4878
msgid "Show version information about this tree."
4879
msgstr "Mostrar la información de la versión acerca de este árbol."
4880
4881
#: bzrlib/cmd_version_info.py:55
4882
msgid ""
4883
"You can use this command to add information about version into\n"
4884
"source code of an application. The output can be in one of the\n"
4885
"supported formats or in a custom format based on a template."
4886
msgstr ""
4887
4888
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4889
#: en/help_topics/configuration.txt:710
4890
msgid "For example::"
4891
msgstr "Por ejemplo::"
4892
4893
#: bzrlib/cmd_version_info.py:61
4894
msgid ""
4895
" bzr version-info --custom \\\n"
4896
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4897
msgstr ""
4898
4899
#: bzrlib/cmd_version_info.py:64
4900
msgid ""
4901
"will produce a C header file with formatted string containing the\n"
4902
"current revision number. Other supported variables in templates are:"
4903
msgstr ""
4904
4905
#: bzrlib/cmd_version_info.py:67
4906
msgid ""
4907
" * {date} - date of the last revision\n"
4908
" * {build_date} - current date\n"
4909
" * {revno} - revision number\n"
4910
" * {revision_id} - revision id\n"
4911
" * {branch_nick} - branch nickname\n"
4912
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4913
" otherwise 1"
4914
msgstr ""
4915
4916
#: bzrlib/cmd_version_info.py:77
4917
msgid "Select the output format."
4918
msgstr "Seleccionar el formato de salida."
4919
4920
#: bzrlib/cmd_version_info.py:81
4921
msgid "Include all possible information."
4922
msgstr "Incluir toda la información posible."
4923
4924
#: bzrlib/cmd_version_info.py:82
4925
msgid "Check if tree is clean."
4926
msgstr "Comprobar si el árbol está limpio."
4927
4928
#: bzrlib/cmd_version_info.py:84
4929
msgid "Include the revision-history."
4930
msgstr ""
4931
4932
#: bzrlib/cmd_version_info.py:86
4933
msgid "Include the last revision for each file."
4934
msgstr ""
4935
4936
#: bzrlib/cmd_version_info.py:87
4937
msgid "Template for the output."
4938
msgstr "Plantilla para la salida."
4939
4940
#: bzrlib/cmd_version_info.py:101
4941
msgid "bzr version-info --revision takes exactly one revision specifier"
4942
msgstr ""
4943
4944
#: bzrlib/commands.py:229
4945
#, python-format
4946
msgid "unknown command \"%s\""
4947
msgstr "orden «%s» desconocida"
4948
4949
#: bzrlib/commands.py:476
4950
msgid "No help for this command."
4951
msgstr "No hay ayuda para esta orden."
4952
4953
#: bzrlib/commands.py:489
4954
#, python-format
4955
msgid ":Purpose: %s\n"
4956
msgstr ":Propósito: %s\n"
4957
4958
#: bzrlib/commands.py:491
4959
#, python-format
4960
msgid ""
4961
":Usage:\n"
4962
"%s\n"
4963
msgstr ""
4964
":Uso:\n"
4965
"%s\n"
4966
4967
#: bzrlib/commands.py:493
4968
#, python-format
4969
msgid ":Usage: %s\n"
4970
msgstr ":Uso: %s\n"
4971
4972
#: bzrlib/commands.py:512
4973
#, python-format
4974
msgid ":Options:%s"
4975
msgstr ":Opciones:%s"
4976
4977
#: bzrlib/commands.py:523
4978
#, python-format
4979
msgid ""
4980
":Description:\n"
4981
" %s\n"
4982
"\n"
4983
msgstr ""
4984
":Descripción:\n"
4985
" %s\n"
4986
"\n"
4987
4988
#: bzrlib/commands.py:533
4989
#, python-format
4990
msgid ""
4991
"See bzr help %s for more details and examples.\n"
4992
"\n"
4993
msgstr ""
4994
4995
#: bzrlib/commands.py:538
4996
msgid ":Aliases: "
4997
msgstr ":Alias: "
4998
4999
#: bzrlib/commands.py:542
5000
#, python-format
5001
msgid ":From: plugin \"%s\"\n"
5002
msgstr ":Desde: complemento «%s»\n"
5003
5004
#: bzrlib/commands.py:554
5005
msgid ":doc:`{0} <{1}-help>`"
5006
msgstr ":doc:`{0} <{1}-help>`"
5007
5008
#: bzrlib/commands.py:558
5009
#, python-format
5010
msgid ":See also: %s"
5011
msgstr ":Vea también: %s"
5012
5013
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5014
msgid "Only ASCII permitted in option names"
5015
msgstr "Solo se permiten nombres de opción en ASCII"
5016
5017
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5018
msgid "command {0!r} needs one or more {1}"
5019
msgstr "la orden {0!r} necesita una o más {1}"
5020
5021
#: bzrlib/commands.py:858
5022
msgid "command {0!r} requires argument {1}"
5023
msgstr "la orden {0!r} necesita un argumento {1}"
5024
5025
#: bzrlib/commands.py:865
5026
msgid "extra argument to command {0}: {1}"
5027
msgstr ""
5028
5029
#: bzrlib/commands.py:962
5030
#, python-format
5031
msgid "Profile data written to \"%s\"."
5032
msgstr "Datos de perfil escritos en «%s»"
5033
5034
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5035
msgid "added"
5036
msgstr "añadido"
5037
5038
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5039
msgid "modified"
5040
msgstr "modificado"
5041
5042
#: bzrlib/commit.py:131
5043
#, python-format
5044
msgid "Committing%s"
5045
msgstr ""
5046
5047
#: bzrlib/commit.py:134
5048
#, python-format
5049
msgid "Committed revision %d."
5050
msgstr ""
5051
5052
#: bzrlib/commit.py:143
5053
#, python-format
5054
msgid "deleted %s"
5055
msgstr "eliminado %s"
5056
5057
#: bzrlib/commit.py:146
5058
#, python-format
5059
msgid "missing %s"
5060
msgstr "falta %s"
5061
5062
#: bzrlib/commit.py:511
5063
msgid ""
5064
"Conflicting tags in bound branch:\n"
5065
"{0}"
5066
msgstr ""
5067
5068
#: bzrlib/commit.py:742
5069
msgid "renamed"
5070
msgstr "renombrado"
5071
5072
#: bzrlib/commit.py:977
5073
msgid "unchanged"
5074
msgstr "sin cambios"
5075
5076
#: bzrlib/commit.py:999
5077
msgid "{0} [{1}] - Stage"
5078
msgstr ""
5079
5080
#: bzrlib/commit.py:1002
5081
#, python-format
5082
msgid "%s - Stage"
5083
msgstr ""
5084
5085
#: bzrlib/commit_signature_commands.py:36
5086
msgid "Sign all commits by a given committer."
5087
msgstr ""
5088
5089
#: bzrlib/commit_signature_commands.py:38
5090
msgid ""
5091
"If location is not specified the local tree is used.\n"
5092
"If committer is not specified the default committer is used."
5093
msgstr ""
5094
5095
#: bzrlib/commit_signature_commands.py:41
5096
msgid "This does not sign commits that already have signatures."
5097
msgstr ""
5098
5099
#: bzrlib/commit_signature_commands.py:49
5100
msgid ""
5101
"Don't actually sign anything, just print the revisions that would be signed."
5102
msgstr ""
5103
5104
#: bzrlib/commit_signature_commands.py:103
5105
msgid "Verify all commit signatures."
5106
msgstr "Verificar todas las firmas de ejecución."
5107
5108
#: bzrlib/commit_signature_commands.py:105
5109
msgid ""
5110
"Verifies that all commits in the branch are signed by known GnuPG keys."
5111
msgstr ""
5112
5113
#: bzrlib/commit_signature_commands.py:110
5114
msgid ""
5115
"Comma separated list of GPG key patterns which are acceptable for "
5116
"verification."
5117
msgstr ""
5118
5119
#: bzrlib/commit_signature_commands.py:147
5120
msgid "Cannot verify a range of non-revision-history revisions"
5121
msgstr ""
5122
5123
#: bzrlib/commit_signature_commands.py:168
5124
msgid "All commits signed with verifiable keys"
5125
msgstr ""
5126
5127
#: bzrlib/config.py:475
5128
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5129
msgstr ""
5130
5131
#: bzrlib/config.py:2485
5132
msgid "{0} is not an SI unit."
5133
msgstr ""
5134
5135
#: bzrlib/config.py:2949
5136
msgid ""
5137
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5138
"will be saved."
5139
msgstr ""
5140
5141
#: bzrlib/config.py:3093
5142
#, python-format
5143
msgid "Invalid '%s', should be of the form 'name=value'"
5144
msgstr ""
5145
5146
#: bzrlib/config.py:3962
5147
msgid "Display, set or remove a configuration option."
5148
msgstr ""
5149
5150
#: bzrlib/config.py:3964
5151
msgid "Display the active value for a given option."
5152
msgstr ""
5153
5154
#: bzrlib/config.py:3966
5155
msgid ""
5156
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5157
"matching options are displayed mentioning their scope. The active value\n"
5158
"that bzr will take into account is the first one displayed for each option."
5159
msgstr ""
5160
5161
#: bzrlib/config.py:3970
5162
msgid "If no NAME is given, --all .* is implied."
5163
msgstr ""
5164
5165
#: bzrlib/config.py:3972
5166
msgid ""
5167
"Setting a value is achieved by using name=value without spaces. The value\n"
5168
"is set in the most relevant scope and can be checked by displaying the\n"
5169
"option again."
5170
msgstr ""
5171
5172
#: bzrlib/config.py:3984
5173
msgid "Reduce the scope to the specified configuration file."
5174
msgstr ""
5175
5176
#: bzrlib/config.py:3988
5177
msgid "Display all the defined values for the matching options."
5178
msgstr ""
5179
5180
#: bzrlib/config.py:3990
5181
msgid "Remove the option from the configuration file."
5182
msgstr ""
5183
5184
#: bzrlib/conflicts.py:50
5185
msgid "List files with conflicts."
5186
msgstr ""
5187
5188
#: bzrlib/conflicts.py:57
5189
msgid ""
5190
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5191
"is supplied, the pathnames of files with text conflicts are listed,\n"
5192
"instead. (This is useful for editing all files with text conflicts.)"
5193
msgstr ""
5194
5195
#: bzrlib/conflicts.py:61
5196
msgid "Use bzr resolve when you have fixed a problem."
5197
msgstr ""
5198
5199
#: bzrlib/conflicts.py:66
5200
msgid "List paths of files with text conflicts."
5201
msgstr ""
5202
5203
#: bzrlib/conflicts.py:85
5204
msgid "Marks the conflict as resolved."
5205
msgstr ""
5206
5207
#: bzrlib/conflicts.py:88
5208
msgid "Resolve the conflict preserving the version in the working tree."
5209
msgstr ""
5210
5211
#: bzrlib/conflicts.py:91
5212
msgid "Resolve the conflict taking the merged version into account."
5213
msgstr ""
5214
5215
#: bzrlib/conflicts.py:98
5216
msgid "How to resolve the conflict."
5217
msgstr ""
5218
5219
#: bzrlib/conflicts.py:104
5220
msgid "Mark a conflict as resolved."
5221
msgstr ""
5222
5223
#: bzrlib/conflicts.py:111
5224
msgid ""
5225
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5226
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5227
"as\n"
5228
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5229
msgstr ""
5230
5231
#: bzrlib/conflicts.py:119
5232
msgid "Resolve all conflicts in this tree."
5233
msgstr "Resolver todos los conflictos es este árbol."
5234
5235
#: bzrlib/conflicts.py:126
5236
msgid "If --all is specified, no FILE may be provided"
5237
msgstr ""
5238
5239
#: bzrlib/conflicts.py:151
5240
#, python-format
5241
msgid "%d conflict auto-resolved."
5242
msgid_plural "%d conflicts auto-resolved."
5243
msgstr[0] ""
5244
msgstr[1] ""
5245
5246
#: bzrlib/conflicts.py:154
5247
msgid "Remaining conflicts:"
5248
msgstr "Mantener conflictos:"
5249
5250
#: bzrlib/conflicts.py:159
5251
msgid "All conflicts resolved."
5252
msgstr "Todos los conflictos resueltos."
5253
5254
#: bzrlib/conflicts.py:168
5255
msgid "{0} conflict resolved, {1} remaining"
5256
msgid_plural "{0} conflicts resolved, {1} remaining"
5257
msgstr[0] ""
5258
msgstr[1] ""
5259
5260
#: bzrlib/controldir.py:710
5261
msgid "{0} is{1} redirected to {2}"
5262
msgstr "{0} es{1} redirigido a {2}"
5263
5264
#: bzrlib/diff.py:399
5265
#, python-format
5266
msgid "*** Ignoring files outside view. View is %s"
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:157
5270
msgid "The tree builder is already building a tree."
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:178
5274
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:197
5278
msgid ""
5279
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5280
"versions \"%(minimum)s\" to \"%(current)s\"."
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:209
5284
msgid "The transport '%(transport)s' is only accessible within this process."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:227
5288
msgid "Invalid revision number %(revno)s"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:236
5292
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:247
5296
msgid "Reserved revision-id {%(revision_id)s}"
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:261
5300
msgid "There is no public branch set for \"%(branch_url)s\"."
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:271
5304
msgid ""
5305
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5306
"obtain a list of topics."
5307
msgstr ""
5308
5309
#: bzrlib/errors.py:280
5310
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:290
5314
msgid ""
5315
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:299
5319
msgid "The branch '%(branch)s' is not stacked."
5320
msgstr ""
5321
5322
#: bzrlib/errors.py:313
5323
msgid "No WorkingTree exists for \"%(base)s\"."
5324
msgstr ""
5325
5326
#: bzrlib/errors.py:322
5327
msgid "Not currently building a tree."
5328
msgstr ""
5329
5330
#: bzrlib/errors.py:327
5331
msgid "%(url)s is not a local path."
5332
msgstr ""
5333
5334
#: bzrlib/errors.py:355
5335
msgid "%(not_locked)r is not write locked but needs to be."
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:363
5339
msgid "Error in command line options"
5340
msgstr "Error en las opciones de la línea de órdenes"
5341
5342
#: bzrlib/errors.py:368
5343
msgid "%(value)s is not an index of type %(_type)s."
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:378
5347
msgid "Error in data for index %(value)s."
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:387
5351
msgid "The key '%(key)s' is already in index '%(index)s'."
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:397
5355
msgid "The key '%(key)s' is not a valid key."
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:406
5359
msgid "Could not parse options for index %(value)s."
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:415
5363
msgid "The value '%(value)s' is not a valid value."
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:424
5367
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:443
5371
msgid "Generic path error: %(path)r%(extra)s)"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:456
5375
msgid "No such file: %(path)r%(extra)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:461
5379
msgid "File exists: %(path)r%(extra)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:467
5383
msgid ""
5384
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5385
"after to tell bzr about a rename that has already happened)%(extra)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:483
5389
msgid "\"%(path)s\" is not a directory %(extra)s"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:488
5393
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:493
5397
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:498
5401
msgid "Hard-linking \"%(path)s\" is not supported"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:513
5405
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:518
5409
msgid "Permission denied: \"%(path)s\"%(extra)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:523
5413
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:528
5417
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:539
5421
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:561
5425
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:571
5429
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:579
5433
msgid ""
5434
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5435
"upgrade the branch to permit branch stacking."
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:590
5439
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:600
5443
msgid ""
5444
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5445
"need to upgrade the repository to permit branch stacking."
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:611
5449
msgid "Error reading from %(path)r."
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:630
5453
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:646
5457
msgid "Path \"%(path)s\" is not unicode normalized"
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:654
5461
msgid "Not a branch: \"%(path)s\"%(detail)s."
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:696
5465
msgid "No submit branch available for branch \"%(path)s\""
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:705
5469
msgid "A control directory already exists: \"%(path)s\"."
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:710
5473
msgid "Already a branch: \"%(path)s\"."
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:715
5477
msgid "Parent branch already exists: \"%(path)s\"."
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:721
5481
msgid ""
5482
"Directory contains a branch, but no working tree (use bzr checkout if you "
5483
"wish to build a working tree): \"%(path)s\""
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:726
5487
msgid ""
5488
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:736
5492
msgid ""
5493
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:746
5497
msgid "No repository present: \"%(path)s\""
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:753
5501
msgid ""
5502
"Unsupported branch format: %(format)s\n"
5503
"Please run 'bzr upgrade'"
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:759
5507
msgid "Unknown %(kind)s format: %(format)r"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:768
5511
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:778
5515
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:793
5519
msgid ""
5520
"%(target)s\n"
5521
"is not compatible with\n"
5522
"%(source)s\n"
5523
"%(details)s"
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:809
5527
msgid "Revision is not compatible with %(repo_format)s"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:819
5531
msgid "%(context_info)s%(path)s is already versioned."
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:840
5535
msgid "%(context_info)s%(path)s is not versioned."
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:861
5539
msgid "Path(s) are not versioned: %(paths_as_string)s"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:872
5543
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:891
5547
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:899
5551
msgid ""
5552
"Filename %(filename)r is not valid in your current filesystem encoding "
5553
"%(fs_encoding)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:910
5557
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:928
5561
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:967
5565
msgid "Cannot lock %(lock)s: %(why)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:977
5569
msgid ""
5570
"A transaction related operation was attempted after the transaction finished."
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1004
5574
msgid "Cannot lock: transport is read only: %(transport)s"
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:1012
5578
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:1023
5582
msgid ""
5583
"Lock was broken while still open: %(lock)s - check storage consistency!"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:1034
5587
msgid ""
5588
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5589
"%(holder)r, wanted to break %(target)r"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:1046
5593
msgid ""
5594
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5595
"Use 'bzr break-lock' to clear it"
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:1059
5599
msgid "Lock not held: %(lock)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:1088
5603
msgid "No changes to commit"
5604
msgstr "No hay cambios que ejecutar."
5605
5606
#: bzrlib/errors.py:1093
5607
msgid ""
5608
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:1103
5612
msgid ""
5613
"Excluding paths during commit is not supported by repository at "
5614
"%(repository)r."
5615
msgstr ""
5616
5617
#: bzrlib/errors.py:1112
5618
msgid ""
5619
"The specified commit message contains characters unsupported by the current "
5620
"encoding."
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:1118
5624
msgid "Upgrade URL cannot work with readonly URLs."
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:1123
5628
msgid "The branch format %(format)s is already at the most recent format."
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:1146
5632
msgid "Option --change does not accept revision ranges"
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:1151
5636
msgid "No namespace registered for string: %(spec)r"
5637
msgstr ""
5638
5639
#: bzrlib/errors.py:1170
5640
msgid ""
5641
"Requested revision: '%(spec)s' does not exist in branch: "
5642
"%(branch_url)s%(extra)s"
5643
msgstr ""
5644
5645
#: bzrlib/errors.py:1184
5646
msgid ""
5647
"Operation denied because it would change the main history, which is not "
5648
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5649
msgstr ""
5650
5651
#: bzrlib/errors.py:1195
5652
msgid ""
5653
"These branches have diverged. Use the missing command to see how.\n"
5654
"Use the merge command to reconcile them."
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:1215
5658
msgid ""
5659
"Branches have no common ancestor, and no merge base revision was specified."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:1221
5663
msgid ""
5664
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:1227
5668
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5669
msgstr ""
5670
5671
#: bzrlib/errors.py:1236
5672
msgid ""
5673
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:1245
5677
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:1254
5681
msgid "Branch %(branch)s has no commits."
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:1272
5685
msgid ""
5686
"Bound branch %(branch)s is out of date with master branch "
5687
"%(master)s.%(extra_help)s"
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:1284
5691
msgid ""
5692
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5693
"bound to %(remote)s."
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:1296
5697
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:1305
5701
msgid ""
5702
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5703
"%(error)s"
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:1317
5707
msgid "Error in processing weave: %(msg)s"
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:1326
5711
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:1337
5715
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:1347
5719
msgid "Weave invariant violated: %(what)s"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:1356
5723
msgid "Parents are mismatched between two revisions. %(msg)s"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:1378
5727
msgid ""
5728
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5729
"%(weave_b)s"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:1390
5733
msgid "Versioned file error"
5734
msgstr "Error en el archivo versiondao"
5735
5736
#: bzrlib/errors.py:1395
5737
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:1405
5741
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:1415
5745
msgid "Text did not match its checksum: %(msg)s"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:1541
5749
msgid "Export format %(format)r not supported"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:1550
5753
msgid "Transport error: %(msg)s %(orig_error)s"
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:1576
5757
msgid "Generic bzr smart protocol error: %(details)s"
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:1584
5761
msgid "Received bad protocol version marker: %(marker)r"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:1616
5765
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:1621
5769
msgid "Connection error: %(msg)s %(orig_error)s"
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:1626
5773
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:1647
5777
msgid "Connection closed: %(msg)s %(orig_error)s"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:1652
5781
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:1657
5785
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:1667
5789
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:1682
5793
msgid "Certificate error: %(error)s"
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:1690
5797
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:1704
5801
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:1712
5805
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:1721
5809
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:1735
5813
msgid "Too many redirections"
5814
msgstr "Demasiadas redirecciones"
5815
5816
#: bzrlib/errors.py:1740
5817
msgid "Working tree has conflicts."
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:1744
5821
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:1753
5825
msgid ""
5826
"Error(s) parsing config file %(filename)s:\n"
5827
"%(errors)s"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:1763
5831
msgid ""
5832
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5833
"See ``bzr help %(name)s``"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:1773
5837
msgid "%(username)r does not seem to contain a reasonable email address"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:1782
5841
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:1790
5845
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:1798
5849
msgid "Unable to import library \"%(library)s\": %(error)s"
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:1806
5853
msgid "python-gpgme is not installed, it is needed to verify signatures"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:1814
5857
msgid ""
5858
"The working tree for %(basedir)s has changed since the last commit, but "
5859
"weave merge requires that it be unchanged"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:1824
5863
msgid ""
5864
"Can't reprocess and show base, because reprocessing obscures the "
5865
"relationship of conflicting lines to the base"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:1830
5869
msgid "Cycle in graph %(graph)r"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:1858
5873
msgid "File %(filename)s is not conflicted."
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:1880
5877
msgid "No bundle was found in \"%(filename)s\"."
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:1889
5881
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:1899
5885
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:1912
5889
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:1922
5893
msgid "Key %(key)s is already present in map"
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:1927
5897
msgid "The prefix %(prefix)s is in the help search path twice."
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:1937
5901
msgid ""
5902
"No final name for trans_id %(trans_id)r\n"
5903
"file-id: %(file_id)r\n"
5904
"root trans-id: %(root_trans_id)r\n"
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:1969
5908
msgid "Attempt to reuse a transform that has already been applied."
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:1974
5912
msgid "Moving the root directory is not supported at this time"
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:1979
5916
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:1990
5920
msgid ""
5921
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2026
5925
msgid ""
5926
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2056
5930
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2064
5934
msgid "Nothing to merge."
5935
msgstr "Nada a fusionar."
5936
5937
#: bzrlib/errors.py:2069
5938
msgid "Format %(format)s cannot be initialised by this version of bzr."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2078
5942
msgid ""
5943
"Cannot convert from format %(from_format)s to format %(format)s. "
5944
"%(problem)s"
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2090
5948
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2098
5952
msgid "%(exe_name)s could not be found on this machine"
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2106
5956
msgid "Diff is not installed on this machine: %(msg)s"
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2114
5960
msgid "Diff3 is not installed on this machine."
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2120
5964
msgid "The content being inserted is already present."
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2125
5968
msgid ""
5969
"This tree contains left-over files from a failed operation.\n"
5970
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5971
"to\n"
5972
" keep, and delete it when you are done."
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2136
5976
msgid ""
5977
"This tree contains left-over files from a failed operation.\n"
5978
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5979
" wish to keep, and delete it when you are done."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2146
5983
msgid ""
5984
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5985
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5986
"to\n"
5987
" keep, and delete it when you are done."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2157
5991
msgid ""
5992
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5993
"examine %(pending_deletion)s to see if it contains any files you wish to "
5994
"keep, and delete it when you are done."
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:2167
5998
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2181
6002
msgid ""
6003
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2194
6007
msgid "Error in merge modified format"
6008
msgstr "Error en el formato modificado de fusión"
6009
6010
#: bzrlib/errors.py:2199
6011
msgid "Format error in conflict listings"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2203
6015
msgid ""
6016
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6017
"Error: %(description)s"
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:2214
6021
msgid ""
6022
"An error has been detected in the repository %(repo_path)s.\n"
6023
"Please run bzr reconcile on this repository."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2225
6027
msgid ""
6028
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6029
"reason: %(reason)s"
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2238
6033
msgid ""
6034
"An inconsistent delta was supplied: %(delta)r\n"
6035
"reason: %(reason)s"
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:2250
6039
msgid "To use this feature you must upgrade your branch at %(path)s."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:2259
6043
msgid "To use this feature you must upgrade your repository at %(path)s."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:2264
6047
msgid ""
6048
"To use this feature you must upgrade your branch at %(path)s to a format "
6049
"which supports rich roots."
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:2270
6053
msgid "Cannot perform local-only commits on unbound branches."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:2275
6057
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6058
msgstr ""
6059
6060
#: bzrlib/errors.py:2296
6061
msgid "Ghost tags not supported by format %(format)r."
6062
msgstr ""
6063
6064
#: bzrlib/errors.py:2304
6065
msgid "File is binary but should be text."
6066
msgstr ""
6067
6068
#: bzrlib/errors.py:2309
6069
msgid "The path %(path)s is not permitted on this platform"
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:2318
6073
msgid ""
6074
"Testament did not match expected value.\n"
6075
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6076
" {%(measured)s}"
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:2330
6080
msgid "Not a bzr revision-bundle: %(text)r"
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:2339
6084
msgid "Bad bzr revision-bundle: %(text)r"
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:2348
6088
msgid "Malformed bzr revision-bundle header: %(text)r"
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:2353
6092
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:2358
6096
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:2363
6100
msgid "End of line marker was not \\n in bzr revision-bundle"
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:2373
6104
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:2383
6108
msgid "Root class for inventory serialization errors"
6109
msgstr ""
6110
6111
#: bzrlib/errors.py:2387
6112
msgid ""
6113
"The inventory was not in the expected format:\n"
6114
" %(msg)s"
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:2396
6118
msgid "This operation requires rich root data storage"
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:2409
6122
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:2418
6126
msgid ""
6127
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6128
"variable."
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:2425
6132
msgid ""
6133
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6134
"ghost at {%(ghost_revision_id)s}"
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:2435
6138
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:2486
6142
msgid ""
6143
"A merge directive must provide either a bundle or a public branch location."
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:2493
6147
msgid "Bad merge directive payload %(start)r"
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:2503
6151
msgid "Preview patch does not match requested changes."
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:2509
6155
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2519
6159
msgid ""
6160
"Your branch does not have all of the revisions required in order to merge "
6161
"this merge directive and the target location specified in the merge "
6162
"directive is not a branch: %(location)s."
6163
msgstr ""
6164
6165
#: bzrlib/errors.py:2531
6166
msgid "Unsupported entry kind %(kind)s"
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:2539
6170
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:2549
6174
msgid "Subsume target %(other_tree)s needs to be upgraded."
6175
msgstr ""
6176
6177
#: bzrlib/errors.py:2568
6178
msgid "No such tag: %(tag_name)s"
6179
msgstr ""
6180
6181
#: bzrlib/errors.py:2576
6182
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6183
msgstr ""
6184
6185
#: bzrlib/errors.py:2585
6186
msgid "Tag %(tag_name)s already exists."
6187
msgstr ""
6188
6189
#: bzrlib/errors.py:2593
6190
msgid ""
6191
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6192
"bugs\" for more information on this feature."
6193
msgstr ""
6194
6195
#: bzrlib/errors.py:2603
6196
msgid ""
6197
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6198
msgstr ""
6199
6200
#: bzrlib/errors.py:2613
6201
msgid ""
6202
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6203
msgstr ""
6204
6205
#: bzrlib/errors.py:2623
6206
msgid "Invalid line in bugs property: '%(line)s'"
6207
msgstr ""
6208
6209
#: bzrlib/errors.py:2631
6210
msgid "Invalid bug status: '%(status)s'"
6211
msgstr ""
6212
6213
#: bzrlib/errors.py:2639
6214
msgid "Could not understand response from smart server: %(response_tuple)r"
6215
msgstr ""
6216
6217
#: bzrlib/errors.py:2678
6218
msgid "Server sent an unexpected error: %(error_tuple)r"
6219
msgstr "El servidor envió un error inesperado: %(error_tuple)r"
6220
6221
#: bzrlib/errors.py:2697
6222
msgid "Unrecognised container format: %(container_format)r"
6223
msgstr ""
6224
6225
#: bzrlib/errors.py:2705
6226
msgid "Unexpected end of container stream"
6227
msgstr "Final inesperado del flujo del contenedor"
6228
6229
#: bzrlib/errors.py:2710
6230
msgid "Unknown record type: %(record_type)r"
6231
msgstr "Tipo de registro inesperado: %(record_type)r"
6232
6233
#: bzrlib/errors.py:2718
6234
msgid "Invalid record: %(reason)s"
6235
msgstr "Registro inesperado: %(reason)s"
6236
6237
#: bzrlib/errors.py:2726
6238
msgid "Container has data after end marker: %(excess)r"
6239
msgstr ""
6240
6241
#: bzrlib/errors.py:2734
6242
msgid "Container has multiple records with the same name: %(name)s"
6243
msgstr ""
6244
6245
#: bzrlib/errors.py:2747
6246
msgid "Corrupt or incompatible data stream: %(reason)s"
6247
msgstr ""
6248
6249
#: bzrlib/errors.py:2755
6250
msgid "SMTP error: %(error)s"
6251
msgstr "Error SMTP: %(error)s"
6252
6253
#: bzrlib/errors.py:2763
6254
msgid "No message supplied."
6255
msgstr "No se ha proporcionado mensaje."
6256
6257
#: bzrlib/errors.py:2768
6258
msgid "No mail-to address (--mail-to) or output (-o) specified."
6259
msgstr ""
6260
"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
6261
"o)."
6262
6263
#: bzrlib/errors.py:2773
6264
msgid "Unknown mail client: %(mail_client)s"
6265
msgstr "Correo de cliente desconocido: %(mail_client)s"
6266
6267
#: bzrlib/errors.py:2781
6268
msgid ""
6269
"Unable to find mail client with the following names: "
6270
"%(mail_command_list_string)s"
6271
msgstr ""
6272
6273
#: bzrlib/errors.py:2791
6274
msgid "SMTP connection to %(host)s refused"
6275
msgstr "Las conexiones SMTP a %(host)s se han rechazado"
6276
6277
#: bzrlib/errors.py:2800
6278
msgid "Please specify smtp_server. No server at default %(host)s."
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:2814
6282
msgid ""
6283
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6284
"reconfigure."
6285
msgstr ""
6286
6287
#: bzrlib/errors.py:2826
6288
msgid "'%(display_url)s' is already a branch."
6289
msgstr "«%(display_url)s» ya es una la rama."
6290
6291
#: bzrlib/errors.py:2831
6292
msgid "'%(display_url)s' is already a tree."
6293
msgstr "«%(display_url)s» ya es un árbol."
6294
6295
#: bzrlib/errors.py:2836
6296
msgid "'%(display_url)s' is already a checkout."
6297
msgstr "«%(display_url)s» ya es una comprobación."
6298
6299
#: bzrlib/errors.py:2841
6300
msgid "'%(display_url)s' is already a lightweight checkout."
6301
msgstr "«%(display_url)s» ya es una comprobación ligera."
6302
6303
#: bzrlib/errors.py:2846
6304
msgid "'%(display_url)s' is already using a shared repository."
6305
msgstr "«%(display_url)s» ya está usando un repositorio compartido."
6306
6307
#: bzrlib/errors.py:2851
6308
msgid "'%(display_url)s' is already standalone."
6309
msgstr "«%(display_url)s» ya es autónomo."
6310
6311
#: bzrlib/errors.py:2856
6312
msgid "Shared repository '%(display_url)s' already creates working trees."
6313
msgstr ""
6314
6315
#: bzrlib/errors.py:2862
6316
msgid ""
6317
"Shared repository '%(display_url)s' already doesn't create working trees."
6318
msgstr ""
6319
6320
#: bzrlib/errors.py:2868
6321
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6322
msgstr ""
6323
6324
#: bzrlib/errors.py:2873
6325
msgid "No location could be found to bind to at %(display_url)s."
6326
msgstr "No se encontró ubicación a donde vincular %(display_url)s."
6327
6328
#: bzrlib/errors.py:2878
6329
msgid ""
6330
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6331
"status).%(more)s"
6332
msgstr ""
6333
6334
#: bzrlib/errors.py:2897
6335
msgid ""
6336
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6337
"list).%(more)s"
6338
msgstr ""
6339
6340
#: bzrlib/errors.py:2903
6341
msgid "Variable {%(name)s} is not available."
6342
msgstr "La variable {%(name)s} no está disponible."
6343
6344
#: bzrlib/errors.py:2911
6345
msgid "No template specified."
6346
msgstr "No se ha especificado una plantilla."
6347
6348
#: bzrlib/errors.py:2916
6349
msgid "Unable to create symlink %(path_str)son this platform"
6350
msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
6351
6352
#: bzrlib/errors.py:2931
6353
msgid ""
6354
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6355
"\"original\", \"local\"."
6356
msgstr ""
6357
"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
6358
"«original», «local»."
6359
6360
#: bzrlib/errors.py:2965
6361
msgid ""
6362
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6363
msgstr ""
6364
6365
#: bzrlib/errors.py:2977
6366
msgid "The \"%(config_id)s\" configuration does not exist."
6367
msgstr ""
6368
6369
#: bzrlib/errors.py:2985
6370
msgid "The \"%(option_name)s\" configuration option does not exist."
6371
msgstr ""
6372
6373
#: bzrlib/errors.py:2993
6374
msgid "The alias \"%(alias_name)s\" does not exist."
6375
msgstr ""
6376
6377
#: bzrlib/errors.py:3007
6378
msgid "\"%(alias_name)s\" is not a valid location alias."
6379
msgstr ""
6380
6381
#: bzrlib/errors.py:3015
6382
msgid "No %(alias_name)s location assigned."
6383
msgstr ""
6384
6385
#: bzrlib/errors.py:3023
6386
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6387
msgstr ""
6388
6389
#: bzrlib/errors.py:3033
6390
msgid "Unknown rules detected: %(unknowns_str)s."
6391
msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
6392
6393
#: bzrlib/errors.py:3044
6394
msgid "Tip change rejected: %(msg)s"
6395
msgstr ""
6396
6397
#: bzrlib/errors.py:3052
6398
msgid "Shelf corrupt."
6399
msgstr ""
6400
6401
#: bzrlib/errors.py:3057
6402
msgid "Corruption while decompressing repository file%(orig_error)s"
6403
msgstr ""
6404
6405
#: bzrlib/errors.py:3069
6406
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6407
msgstr ""
6408
6409
#: bzrlib/errors.py:3077
6410
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6411
msgstr ""
6412
6413
#: bzrlib/errors.py:3085
6414
msgid ""
6415
"An attempt to access a url outside the server jail was made: '%(url)s'."
6416
msgstr ""
6417
6418
#: bzrlib/errors.py:3093
6419
msgid "The user aborted the operation."
6420
msgstr "El usuario abortó la operación."
6421
6422
#: bzrlib/errors.py:3098
6423
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6424
msgstr ""
6425
6426
#: bzrlib/errors.py:3108
6427
msgid "No such view: %(view_name)s."
6428
msgstr ""
6429
6430
#: bzrlib/errors.py:3118
6431
msgid ""
6432
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6433
"to a later format."
6434
msgstr ""
6435
6436
#: bzrlib/errors.py:3127
6437
msgid ""
6438
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6439
msgstr ""
6440
6441
#: bzrlib/errors.py:3194
6442
msgid "%(bzrdir)r does not support co-located branches."
6443
msgstr ""
6444
6445
#: bzrlib/errors.py:3200
6446
msgid ""
6447
"Unable to determine your name.\n"
6448
"Please, set your name with the 'whoami' command.\n"
6449
"E.g. bzr whoami \"Your Name <name@example.com>\""
6450
msgstr ""
6451
6452
#: bzrlib/errors.py:3209
6453
msgid "Invalid pattern(s) found. %(msg)s"
6454
msgstr "Se encontró un patrón inválido. %(msg)s"
6455
6456
#: bzrlib/errors.py:3217
6457
msgid ""
6458
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6459
"unbind` to fix."
6460
msgstr ""
6461
6462
#: bzrlib/errors.py:3228
6463
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6464
msgstr ""
6465
6466
#: bzrlib/errors.py:3237
6467
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6468
msgstr ""
6469
6470
#: bzrlib/errors.py:3246
6471
msgid ""
6472
"No compatible object available for operations from %(source)r to %(target)r."
6473
msgstr ""
6474
6475
#: bzrlib/errors.py:3256
6476
msgid ""
6477
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6478
"%(arguments)s."
6479
msgstr ""
6480
6481
#: bzrlib/errors.py:3266
6482
msgid ""
6483
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6484
"format %(format)r"
6485
msgstr ""
6486
6487
#: bzrlib/errors.py:3278
6488
msgid ""
6489
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6490
"plugin."
6491
msgstr ""
6492
6493
#: bzrlib/errors.py:3291
6494
msgid "Binary files section encountered."
6495
msgstr ""
6496
6497
#: bzrlib/errors.py:3299
6498
msgid ""
6499
"Malformed patch header. %(desc)s\n"
6500
"%(line)r"
6501
msgstr ""
6502
6503
#: bzrlib/errors.py:3308
6504
msgid ""
6505
"Malformed hunk header. %(desc)s\n"
6506
"%(line)r"
6507
msgstr ""
6508
6509
#: bzrlib/errors.py:3317
6510
msgid ""
6511
"Malformed line. %(desc)s\n"
6512
"%(line)r"
6513
msgstr ""
6514
6515
#: bzrlib/errors.py:3327
6516
msgid ""
6517
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6518
"but patch says it should be \"%(patch_line)s\""
6519
msgstr ""
6520
6521
#: bzrlib/errors.py:3338
6522
msgid "The feature %(feature)s has already been registered."
6523
msgstr ""
6524
6525
#: bzrlib/export_pot.py:252
6526
#, python-format
6527
msgid "Exporting messages from builtin command: %s"
6528
msgstr ""
6529
6530
#: bzrlib/export_pot.py:271
6531
msgid "Exporting messages from plugin command: {0} in {1}"
6532
msgstr ""
6533
6534
#: bzrlib/export_pot.py:292
6535
#, python-format
6536
msgid "Exporting message from error: %s"
6537
msgstr "Exportando mensaje del error: %s"
6538
6539
#: bzrlib/fetch.py:98
6540
msgid "Finding revisions"
6541
msgstr "Buscando revisiones"
6542
6543
#: bzrlib/fetch.py:103
6544
msgid "Fetching revisions"
6545
msgstr "Obteniendo revisiones"
6546
6547
#: bzrlib/foreign.py:262
6548
msgid "Push into a different VCS without any custom bzr metadata."
6549
msgstr ""
6550
6551
#: bzrlib/foreign.py:264
6552
msgid ""
6553
"This will afterwards rebase the local branch on the remote\n"
6554
"branch unless the --no-rebase option is used, in which case \n"
6555
"the two branches will be out of sync after the push. "
6556
msgstr ""
6557
6558
#: bzrlib/foreign.py:277
6559
msgid "Do not rebase after push."
6560
msgstr ""
6561
6562
#: bzrlib/foreign.py:311
6563
#, python-format
6564
msgid "Using saved location: %s\n"
6565
msgstr "Usando las ubicaciones guardadas: %s\n"
6566
6567
#: bzrlib/foreign.py:321
6568
msgid ""
6569
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6570
"regular push."
6571
msgstr ""
6572
6573
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6574
msgid "{0} commits with valid signatures"
6575
msgstr "{0} ejecuciones con firmas válidas"
6576
6577
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6578
msgid "{0} commit with unknown key"
6579
msgid_plural "{0} commits with unknown keys"
6580
msgstr[0] "{0} ejecución con clave desconocida"
6581
msgstr[1] "{0} ejecuciones con claves desconocidas"
6582
6583
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6584
msgid "{0} commit not valid"
6585
msgid_plural "{0} commits not valid"
6586
msgstr[0] "{0} ejecución inválida"
6587
msgstr[1] "{0} ejecuciones inválidas"
6588
6589
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6590
msgid "{0} commit not signed"
6591
msgid_plural "{0} commits not signed"
6592
msgstr[0] "{0} ejecución no firmada"
6593
msgstr[1] "{0} ejecuciones no firmadas"
6594
6595
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6596
msgid "{0} commit with key now expired"
6597
msgid_plural "{0} commits with key now expired"
6598
msgstr[0] ""
6599
msgstr[1] ""
6600
6601
#: bzrlib/gpg.py:343
6602
msgid "No GnuPG key results for pattern: {0}"
6603
msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
6604
6605
#: bzrlib/gpg.py:386
6606
msgid "{0} signed {1} commit"
6607
msgid_plural "{0} signed {1} commits"
6608
msgstr[0] ""
6609
msgstr[1] ""
6610
6611
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6612
msgid "{0} commit by author {1}"
6613
msgid_plural "{0} commits by author {1}"
6614
msgstr[0] ""
6615
msgstr[1] ""
6616
6617
#: bzrlib/gpg.py:433
6618
msgid "Unknown key {0} signed {1} commit"
6619
msgid_plural "Unknown key {0} signed {1} commits"
6620
msgstr[0] ""
6621
msgstr[1] ""
6622
6623
#: bzrlib/gpg.py:452
6624
msgid "{0} commit by author {1} with key {2} now expired"
6625
msgid_plural "{0} commits by author {1} with key {2} now expired"
6626
msgstr[0] ""
6627
msgstr[1] ""
6628
6629
#: bzrlib/groupcompress.py:1739
6630
#, python-format
6631
msgid "Insert claimed random_id=True, but then inserted %r two times"
6632
msgstr ""
6633
6634
#: bzrlib/hooks.py:331
6635
#, python-format
6636
msgid "Introduced in: %s"
6637
msgstr ""
6638
6639
#: bzrlib/hooks.py:334
6640
#, python-format
6641
msgid "Deprecated in: %s"
6642
msgstr ""
6643
6644
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6645
msgid "Walking content"
6646
msgstr ""
6647
6648
#: bzrlib/knit.py:3330
6649
msgid "annotating"
6650
msgstr "anotar"
6651
6652
#: bzrlib/lock.py:548
6653
msgid "{0!r} was {1} locked again"
6654
msgstr ""
6655
6656
#: bzrlib/lockdir.py:321
6657
#, python-format
6658
msgid "error removing pending lock: %s"
6659
msgstr ""
6660
6661
#: bzrlib/lockdir.py:616
6662
msgid "Unable to obtain"
6663
msgstr ""
6664
6665
#: bzrlib/lockdir.py:618
6666
msgid "Lock owner changed for"
6667
msgstr ""
6668
6669
#: bzrlib/lockdir.py:620
6670
msgid "{0} lock {1} {2}."
6671
msgstr ""
6672
6673
#: bzrlib/lockdir.py:627
6674
#, python-format
6675
msgid "Will continue to try until %s, unless you press Ctrl-C."
6676
msgstr ""
6677
6678
#: bzrlib/lockdir.py:629
6679
msgid "See \"bzr help break-lock\" for more."
6680
msgstr ""
6681
6682
#: bzrlib/lockdir.py:739
6683
#, python-format
6684
msgid ""
6685
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6686
msgstr ""
6687
6688
#: bzrlib/log.py:572
6689
msgid "--exclude-common-ancestry requires two different revisions"
6690
msgstr "--exclude-common-ancestry requiere dos revisiones diferentes"
6691
6692
#: bzrlib/log.py:574
6693
#, python-format
6694
msgid "invalid direction %r"
6695
msgstr "dirección %r inválida"
6696
6697
#: bzrlib/log.py:662
6698
msgid "Start revision not found in history of end revision."
6699
msgstr ""
6700
6701
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6702
msgid "Logging revision 0 is invalid."
6703
msgstr ""
6704
6705
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6706
msgid "Start revision must be older than the end revision."
6707
msgstr "El inicio de la revisión debe ser anterior al final."
6708
6709
#: bzrlib/log.py:1827
6710
#, python-format
6711
msgid "unknown log formatter: %r"
6712
msgstr ""
6713
6714
#: bzrlib/log.py:2123
6715
msgid "fixes bug"
6716
msgid_plural "fixes bugs"
6717
msgstr[0] "error areglado"
6718
msgstr[1] "errores arreglados"
6719
6720
#: bzrlib/merge.py:689
6721
msgid "All changes applied successfully."
6722
msgstr "Cambios aplicados con éxito."
6723
6724
#: bzrlib/merge.py:691
6725
#, python-format
6726
msgid "%d conflicts encountered."
6727
msgstr "%d conflictos encontrados."
6728
6729
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6730
msgid "Preparing file merge"
6731
msgstr ""
6732
6733
#: bzrlib/multiparent.py:426
6734
msgid "Importing revisions"
6735
msgstr "Importar revisiones"
6736
6737
#: bzrlib/option.py:526
6738
msgid "Show help message."
6739
msgstr "Mostrar mensaje de ayuda."
6740
6741
#: bzrlib/option.py:528
6742
msgid "Only display errors and warnings."
6743
msgstr "Mostrar solo errores y avisos."
6744
6745
#: bzrlib/option.py:531
6746
msgid "Show usage message and options."
6747
msgstr "Mostrar mensaje de uso y opciones."
6748
6749
#: bzrlib/option.py:533
6750
msgid "Display more information."
6751
msgstr "Mostrar más información."
6752
6753
#: bzrlib/option.py:541
6754
msgid ""
6755
"Select changes introduced by the specified revision. See also \"help "
6756
"revisionspec\"."
6757
msgstr ""
6758
6759
#: bzrlib/option.py:543
6760
msgid "Branch to operate on, instead of working directory."
6761
msgstr ""
6762
6763
#: bzrlib/option.py:545
6764
msgid "Detailed log format."
6765
msgstr ""
6766
6767
#: bzrlib/option.py:545
6768
msgid "Format used by GNU ChangeLog files."
6769
msgstr ""
6770
6771
#: bzrlib/option.py:545
6772
msgid "Log format with one line per revision."
6773
msgstr ""
6774
6775
#: bzrlib/option.py:545
6776
msgid "Moderately short log format."
6777
msgstr ""
6778
6779
#: bzrlib/option.py:545
6780
msgid "Use specified log format."
6781
msgstr "Usar el formato de registro especificado."
6782
6783
#: bzrlib/option.py:547
6784
msgid "Log format"
6785
msgstr "Formato de registro"
6786
6787
#: bzrlib/option.py:549
6788
msgid "LCA-newness merge."
6789
msgstr ""
6790
6791
#: bzrlib/option.py:549
6792
msgid "Merge using external diff3."
6793
msgstr ""
6794
6795
#: bzrlib/option.py:549
6796
msgid "Native diff3-style merge."
6797
msgstr ""
6798
6799
#: bzrlib/option.py:549
6800
msgid "Select a particular merge algorithm."
6801
msgstr "Seleccionar un algoritmo de fusión particular."
6802
6803
#: bzrlib/option.py:549
6804
msgid "Weave-based merge."
6805
msgstr ""
6806
6807
#: bzrlib/option.py:551
6808
msgid "Merge algorithm"
6809
msgstr "Algoritmo de fusión"
6810
6811
#: bzrlib/option.py:554
6812
msgid "Message string."
6813
msgstr "Cadena de mensaje."
6814
6815
#: bzrlib/option.py:556
6816
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6817
msgstr ""
6818
6819
#: bzrlib/option.py:558
6820
msgid "Ignore differences between branches and overwrite unconditionally."
6821
msgstr ""
6822
6823
#: bzrlib/option.py:560
6824
msgid "Remember the specified location as a default."
6825
msgstr "Recordar la ubicación especificada como predeterminada."
6826
6827
#: bzrlib/option.py:562
6828
msgid "Reprocess to reduce spurious conflicts."
6829
msgstr "Reprocesar para reducir los conflictos espurios."
6830
6831
#: bzrlib/option.py:566
6832
msgid "See \"help revisionspec\" for details."
6833
msgstr "Consulte «help revisionspec» para obtener más detalles."
6834
6835
#: bzrlib/option.py:568
6836
msgid "Show internal object ids."
6837
msgstr "Mostrar las id de los objetos internos."
6838
6839
#: bzrlib/option.py:571
6840
msgid "Display timezone as local, original, or utc."
6841
msgstr ""
6842
6843
#: bzrlib/osutils.py:100
6844
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6845
msgstr ""
6846
6847
#: bzrlib/osutils.py:220
6848
msgid "lstat/stat of ({0!r}): {1!r}"
6849
msgstr "lstat/stat de ({0!r}): {1!r}"
6850
6851
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6852
#, python-format
6853
msgid "sorry, %r not allowed in path"
6854
msgstr ""
6855
6856
#: bzrlib/osutils.py:1237
6857
#, python-format
6858
msgid "%r is too short to calculate a relative path"
6859
msgstr ""
6860
6861
#: bzrlib/plugin.py:143
6862
#, python-format
6863
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6864
msgstr ""
6865
6866
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6867
msgid "Enable completions for the selected plugin (default: all plugins)"
6868
msgstr ""
6869
6870
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6871
msgid "Generate a shell function for bash command line completion."
6872
msgstr ""
6873
6874
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6875
msgid ""
6876
"This command generates a shell function which can be used by bash to\n"
6877
"automatically complete the currently typed command when the user presses\n"
6878
"the completion key (usually tab)."
6879
msgstr ""
6880
6881
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6882
msgid ""
6883
"Commonly used like this:\n"
6884
" eval \"`bzr bash-completion`\""
6885
msgstr ""
6886
6887
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6888
msgid "Name of the generated function (default: _bzr)"
6889
msgstr "Nombre de la función generada (predeterminado: _bzr)"
6890
6891
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6892
msgid "Generate only the shell function, don't enable it"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/launchpad/__init__.py:81
6896
msgid "Register a branch with launchpad.net."
6897
msgstr "Registrar una rama con launchpad.net."
6898
6899
#: bzrlib/plugins/launchpad/__init__.py:83
6900
msgid ""
6901
"This command lists a bzr branch in the directory of branches on\n"
6902
"launchpad.net. Registration allows the branch to be associated with\n"
6903
"bugs or specifications."
6904
msgstr ""
6905
6906
#: bzrlib/plugins/launchpad/__init__.py:87
6907
msgid ""
6908
"Before using this command you must register the project to which the\n"
6909
"branch belongs, and create an account for yourself on launchpad.net."
6910
msgstr ""
6911
6912
#: bzrlib/plugins/launchpad/__init__.py:90
6913
msgid ""
6914
"arguments:\n"
6915
" public_url: The publicly visible url for the branch to register.\n"
6916
" This must be an http or https url (which Launchpad can read\n"
6917
" from to access the branch). Local file urls, SFTP urls, and\n"
6918
" bzr+ssh urls will not work.\n"
6919
" If no public_url is provided, bzr will use the configured\n"
6920
" public_url if there is one for the current branch, and\n"
6921
" otherwise error."
6922
msgstr ""
6923
6924
#: bzrlib/plugins/launchpad/__init__.py:99
6925
msgid ""
6926
"example:\n"
6927
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6928
" --project fooproject"
6929
msgstr ""
6930
6931
#: bzrlib/plugins/launchpad/__init__.py:106
6932
msgid "Launchpad project short name to associate with the branch."
6933
msgstr "Nombre corto del proyecto de Launchpad para asociar con la rama."
6934
6935
#: bzrlib/plugins/launchpad/__init__.py:113
6936
msgid ""
6937
"Short name for the branch; by default taken from the last component of the "
6938
"url."
6939
msgstr ""
6940
6941
#: bzrlib/plugins/launchpad/__init__.py:117
6942
msgid "One-sentence description of the branch."
6943
msgstr ""
6944
6945
#: bzrlib/plugins/launchpad/__init__.py:120
6946
msgid "Longer description of the purpose or contents of the branch."
6947
msgstr ""
6948
6949
#: bzrlib/plugins/launchpad/__init__.py:123
6950
msgid "Branch author's email address, if not yourself."
6951
msgstr ""
6952
6953
#: bzrlib/plugins/launchpad/__init__.py:126
6954
msgid "The bug this branch fixes."
6955
msgstr "El error que arregla esta rama."
6956
6957
#: bzrlib/plugins/launchpad/__init__.py:129
6958
msgid "Prepare the request but don't actually send it."
6959
msgstr ""
6960
6961
#: bzrlib/plugins/launchpad/__init__.py:151
6962
msgid ""
6963
"register-branch requires a public branch url - see bzr help register-branch."
6964
msgstr ""
6965
6966
#: bzrlib/plugins/launchpad/__init__.py:159
6967
msgid "--product is deprecated; please use --project."
6968
msgstr ""
6969
6970
#: bzrlib/plugins/launchpad/__init__.py:191
6971
msgid "Open a Launchpad branch page in your web browser."
6972
msgstr "Abrir una página de rama de Launchpad en su navegador web."
6973
6974
#: bzrlib/plugins/launchpad/__init__.py:196
6975
msgid "Do not actually open the browser. Just say the URL we would use."
6976
msgstr ""
6977
6978
#: bzrlib/plugins/launchpad/__init__.py:231
6979
#, python-format
6980
msgid "Opening %s in web browser"
6981
msgstr ""
6982
6983
#: bzrlib/plugins/launchpad/__init__.py:241
6984
msgid "Show or set the Launchpad user ID."
6985
msgstr "Mostrar o establecer el ID de usuario de Launchpad."
6986
6987
#: bzrlib/plugins/launchpad/__init__.py:243
6988
msgid ""
6989
"When communicating with Launchpad, some commands need to know your\n"
6990
"Launchpad user ID. This command can be used to set or show the\n"
6991
"user ID that Bazaar will use for such communication."
6992
msgstr ""
6993
6994
#: bzrlib/plugins/launchpad/__init__.py:247
6995
msgid ""
6996
":Examples:\n"
6997
" Show the Launchpad ID of the current user::"
6998
msgstr ""
6999
7000
#: bzrlib/plugins/launchpad/__init__.py:250
7001
msgid " bzr launchpad-login"
7002
msgstr " bzr launchpad-login"
7003
7004
#: bzrlib/plugins/launchpad/__init__.py:252
7005
msgid " Set the Launchpad ID of the current user to 'bob'::"
7006
msgstr ""
7007
7008
#: bzrlib/plugins/launchpad/__init__.py:254
7009
msgid " bzr launchpad-login bob"
7010
msgstr " bzr launchpad-login bob"
7011
7012
#: bzrlib/plugins/launchpad/__init__.py:261
7013
msgid "Don't check that the user name is valid."
7014
msgstr "No comprueba que el nombre de usuario sea válido."
7015
7016
#: bzrlib/plugins/launchpad/__init__.py:276
7017
#: bzrlib/plugins/launchpad/__init__.py:287
7018
msgid "Launchpad user ID exists and has SSH keys.\n"
7019
msgstr ""
7020
7021
#: bzrlib/plugins/launchpad/__init__.py:279
7022
msgid "No Launchpad user ID configured.\n"
7023
msgstr ""
7024
7025
#: bzrlib/plugins/launchpad/__init__.py:290
7026
#, python-format
7027
msgid "Launchpad user ID set to '%s'.\n"
7028
msgstr ""
7029
7030
#: bzrlib/plugins/launchpad/__init__.py:298
7031
msgid "Ask Launchpad to mirror a branch now."
7032
msgstr ""
7033
7034
#: bzrlib/plugins/launchpad/__init__.py:318
7035
msgid "Propose merging a branch on Launchpad."
7036
msgstr ""
7037
7038
#: bzrlib/plugins/launchpad/__init__.py:320
7039
msgid ""
7040
"This will open your usual editor to provide the initial comment. When it\n"
7041
"has created the proposal, it will open it in your default web browser."
7042
msgstr ""
7043
7044
#: bzrlib/plugins/launchpad/__init__.py:323
7045
msgid ""
7046
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7047
"is not supplied, the remembered submit branch will be used. If no submit\n"
7048
"branch is remembered, the development focus will be used."
7049
msgstr ""
7050
7051
#: bzrlib/plugins/launchpad/__init__.py:327
7052
msgid ""
7053
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7054
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7055
"The parameter the launchpad account name of the desired reviewer. This\n"
7056
"may optionally be followed by '=' and the review type. For example:"
7057
msgstr ""
7058
7059
#: bzrlib/plugins/launchpad/__init__.py:332
7060
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7061
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
7062
7063
#: bzrlib/plugins/launchpad/__init__.py:334
7064
msgid ""
7065
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7066
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7067
msgstr ""
7068
7069
#: bzrlib/plugins/launchpad/__init__.py:339
7070
msgid "Propose the merge on staging."
7071
msgstr ""
7072
7073
#: bzrlib/plugins/launchpad/__init__.py:341
7074
msgid "Commit message."
7075
msgstr "Mensaje de ejecución."
7076
7077
#: bzrlib/plugins/launchpad/__init__.py:343
7078
msgid "Mark the proposal as approved immediately."
7079
msgstr "Marcar el propuesto como aprobado inmediatamente."
7080
7081
#: bzrlib/plugins/launchpad/__init__.py:345
7082
msgid "Requested reviewer and optional type."
7083
msgstr "Revisor solicitado y tipo opcional."
7084
7085
#: bzrlib/plugins/launchpad/__init__.py:382
7086
msgid "Find the proposal to merge this revision."
7087
msgstr "Buscar el propuesto para fusionar esta revisión."
7088
7089
#: bzrlib/plugins/launchpad/__init__.py:384
7090
msgid ""
7091
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7092
"This works only if the selected branch was the merge proposal target, and\n"
7093
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7094
"are opened in a web browser."
7095
msgstr ""
7096
7097
#: bzrlib/plugins/launchpad/__init__.py:389
7098
msgid ""
7099
"Any revision involved in the merge may be specified-- the revision in\n"
7100
"which the merge was performed, or one of the revisions that was merged."
7101
msgstr ""
7102
7103
#: bzrlib/plugins/launchpad/__init__.py:392
7104
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7105
msgstr ""
7106
7107
#: bzrlib/plugins/launchpad/__init__.py:394
7108
msgid " bzr lp-find-proposal -r annotate:README:1"
7109
msgstr " bzr lp-find-proposal -r annotate:README:1"
7110
7111
#: bzrlib/plugins/launchpad/__init__.py:409
7112
msgid "No review found."
7113
msgstr ""
7114
7115
#: bzrlib/plugins/launchpad/__init__.py:410
7116
#, python-format
7117
msgid "%d proposals(s) found."
7118
msgstr ""
7119
7120
#: bzrlib/plugins/launchpad/__init__.py:420
7121
msgid "Finding revision-id"
7122
msgstr ""
7123
7124
#: bzrlib/plugins/launchpad/__init__.py:427
7125
msgid "Finding merge"
7126
msgstr ""
7127
7128
#: bzrlib/plugins/launchpad/__init__.py:432
7129
msgid "Finding revno"
7130
msgstr ""
7131
7132
#: bzrlib/plugins/launchpad/__init__.py:437
7133
msgid "Finding Launchpad branch"
7134
msgstr ""
7135
7136
#: bzrlib/plugins/launchpad/__init__.py:440
7137
msgid "Finding proposals"
7138
msgstr ""
7139
7140
#: bzrlib/plugins/launchpad/account.py:66
7141
msgid "Setting ssh/sftp usernames for launchpad.net."
7142
msgstr ""
7143
7144
#: bzrlib/plugins/launchpad/lp_api.py:241
7145
#: bzrlib/plugins/launchpad/lp_api.py:246
7146
#, python-format
7147
msgid "%s is not registered on Launchpad"
7148
msgstr ""
7149
7150
#: bzrlib/plugins/launchpad/lp_api.py:256
7151
#, python-format
7152
msgid "%s has no development focus."
7153
msgstr ""
7154
7155
#: bzrlib/plugins/launchpad/lp_api.py:261
7156
#, python-format
7157
msgid "development focus %s has no branch."
7158
msgstr ""
7159
7160
#: bzrlib/plugins/launchpad/lp_api.py:266
7161
#, python-format
7162
msgid "source package %s has no branch."
7163
msgstr ""
7164
7165
#: bzrlib/plugins/launchpad/lp_api.py:270
7166
#, python-format
7167
msgid "%s has no associated product or source package."
7168
msgstr ""
7169
7170
#: bzrlib/plugins/launchpad/lp_api.py:282
7171
#, python-format
7172
msgid "%s is already up-to-date."
7173
msgstr ""
7174
7175
#: bzrlib/plugins/launchpad/lp_api.py:289
7176
#, python-format
7177
msgid "Pushing to %s"
7178
msgstr ""
7179
7180
#: bzrlib/plugins/launchpad/lp_directory.py:170
7181
msgid ""
7182
"resolution for {0}\n"
7183
" local: {1}\n"
7184
" remote: {2}"
7185
msgstr ""
7186
7187
#: bzrlib/plugins/launchpad/lp_propose.py:149
7188
#, python-format
7189
msgid "There is already a branch merge proposal: %s"
7190
msgstr ""
7191
7192
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7193
msgid "pb parameter to convert() is deprecated"
7194
msgstr ""
7195
7196
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7197
msgid "starting upgrade from format 4 to 5"
7198
msgstr ""
7199
7200
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7201
msgid "note: upgrade may be faster if all store files are ungzipped first"
7202
msgstr ""
7203
7204
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7205
msgid "converting revision"
7206
msgstr ""
7207
7208
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7209
msgid "upgraded to weaves:"
7210
msgstr ""
7211
7212
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7213
#, python-format
7214
msgid "%6d revisions and inventories"
7215
msgstr ""
7216
7217
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7218
#, python-format
7219
msgid "%6d revisions not present"
7220
msgstr ""
7221
7222
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7223
#, python-format
7224
msgid "%6d texts"
7225
msgstr ""
7226
7227
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7228
msgid "writing weave"
7229
msgstr ""
7230
7231
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7232
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7233
msgid "inventory"
7234
msgstr ""
7235
7236
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7237
msgid "write revision"
7238
msgstr ""
7239
7240
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7241
msgid "loading revision"
7242
msgstr ""
7243
7244
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7245
#, python-format
7246
msgid "revision {%s} not present in branch; will be converted as a ghost"
7247
msgstr ""
7248
7249
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7250
msgid "starting upgrade from format 5 to 6"
7251
msgstr ""
7252
7253
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7254
#, python-format
7255
msgid "adding prefixes to %s"
7256
msgstr ""
7257
7258
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7259
msgid "starting upgrade from format 6 to metadir"
7260
msgstr ""
7261
7262
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7263
msgid "Removing ancestry.weave"
7264
msgstr ""
7265
7266
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7267
msgid "Finding branch files"
7268
msgstr ""
7269
7270
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7271
msgid "Upgrading repository"
7272
msgstr ""
7273
7274
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7275
msgid "Upgrading branch"
7276
msgstr ""
7277
7278
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7279
msgid "No working tree."
7280
msgstr ""
7281
7282
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7283
msgid "Upgrading working tree"
7284
msgstr ""
7285
7286
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7287
#, python-format
7288
msgid "Make %s lock"
7289
msgstr ""
7290
7291
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7292
#, python-format
7293
msgid "Moving %s"
7294
msgstr ""
7295
7296
#: bzrlib/push.py:56
7297
msgid "Created new branch."
7298
msgstr "Rama nueva creada."
7299
7300
#: bzrlib/push.py:97
7301
#, python-format
7302
msgid ""
7303
"Target directory %s already contains a .bzr directory, but it is not valid."
7304
msgstr ""
7305
7306
#: bzrlib/push.py:101
7307
#, python-format
7308
msgid ""
7309
"Target directory %s already exists, but does not have a .bzr directory. "
7310
"Supply --use-existing-dir to push there anyway."
7311
msgstr ""
7312
7313
#: bzrlib/push.py:122
7314
#, python-format
7315
msgid "Too many redirections trying to make %s."
7316
msgstr ""
7317
7318
#: bzrlib/push.py:147
7319
msgid ""
7320
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7321
"information."
7322
msgstr ""
7323
7324
#: bzrlib/push.py:151
7325
#, python-format
7326
msgid ""
7327
"It is not possible to losslessly push to %s. You may want to use dpush "
7328
"instead."
7329
msgstr ""
7330
7331
#: bzrlib/push.py:157
7332
#, python-format
7333
msgid ""
7334
"At %s you have a valid .bzr control directory, but not a branch or "
7335
"repository. This is an unsupported configuration. Please move the target "
7336
"directory out of the way and try again."
7337
msgstr ""
7338
7339
#: bzrlib/reconcile.py:97
7340
#, python-format
7341
msgid "Reconciling branch %s"
7342
msgstr "Reconciliando rama %s"
7343
7344
#: bzrlib/reconcile.py:103
7345
#, python-format
7346
msgid "Reconciling repository %s"
7347
msgstr "Reconciliando repositorio %s"
7348
7349
#: bzrlib/reconcile.py:105
7350
msgid "Reconciling repository"
7351
msgstr "Reconciliando repositorio"
7352
7353
#: bzrlib/reconcile.py:111
7354
#, python-format
7355
msgid "%s cannot canonicalize CHKs."
7356
msgstr ""
7357
7358
#: bzrlib/reconcile.py:119
7359
msgid "Reconcile aborted: revision index has inconsistent parents."
7360
msgstr ""
7361
7362
#: bzrlib/reconcile.py:121
7363
msgid "Run \"bzr check\" for more details."
7364
msgstr ""
7365
7366
#: bzrlib/reconcile.py:123
7367
msgid "Reconciliation complete."
7368
msgstr "Reconciliación completa."
7369
7370
#: bzrlib/reconcile.py:166
7371
msgid "Fixing last revision info {0} => {1}"
7372
msgstr ""
7373
7374
#: bzrlib/reconcile.py:173
7375
msgid "revision_history ok."
7376
msgstr ""
7377
7378
#: bzrlib/reconcile.py:234
7379
msgid "Reading inventory data"
7380
msgstr "Leyendo los datos de inventario"
7381
7382
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7383
msgid "Inventory ok."
7384
msgstr ""
7385
7386
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7387
msgid "Backing up inventory"
7388
msgstr "Respaldando inventario"
7389
7390
#: bzrlib/reconcile.py:258
7391
msgid "Backup inventory created."
7392
msgstr ""
7393
7394
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7395
msgid "Writing weave"
7396
msgstr ""
7397
7398
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7399
msgid "Inventory regenerated."
7400
msgstr "Inventario regenerado."
7401
7402
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7403
msgid "Reading indexes"
7404
msgstr "Leyendo índices"
7405
7406
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7407
msgid "Checking unused inventories"
7408
msgstr ""
7409
7410
#: bzrlib/reconcile.py:388
7411
msgid "Backup Inventory created"
7412
msgstr ""
7413
7414
#: bzrlib/reconcile.py:446
7415
msgid "Fixing text parents"
7416
msgstr ""
7417
7418
#: bzrlib/reconfigure.py:54
7419
msgid "{0} is now stacked on {1}\n"
7420
msgstr "{0} está ahora apilado en {1}\n"
7421
7422
#: bzrlib/reconfigure.py:69
7423
#, python-format
7424
msgid "%s is now not stacked\n"
7425
msgstr ""
7426
7427
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7428
#, python-format
7429
msgid "bzr: ERROR (ignored): %s"
7430
msgstr "bzr: ERROR (ignorado): %s"
7431
7432
#: bzrlib/remote.py:2541
7433
msgid "Copying repository content as tarball..."
7434
msgstr ""
7435
7436
#: bzrlib/rename_map.py:69
7437
msgid "Calculating hashes"
7438
msgstr "Calculando hashes"
7439
7440
#: bzrlib/rename_map.py:107
7441
msgid "Determining hash hits"
7442
msgstr ""
7443
7444
#: bzrlib/rename_map.py:242
7445
msgid "{0} => {1}"
7446
msgstr "{0} => {1}"
7447
7448
#: bzrlib/repository.py:1787
7449
msgid "Moving repository to repository.backup"
7450
msgstr ""
7451
7452
#: bzrlib/repository.py:1794
7453
msgid "Creating new repository"
7454
msgstr "Creando repositorio nuevo"
7455
7456
#: bzrlib/repository.py:1799
7457
msgid "Copying content"
7458
msgstr "Copiar contenido"
7459
7460
#: bzrlib/repository.py:1803
7461
msgid "Deleting old repository content"
7462
msgstr ""
7463
7464
#: bzrlib/repository.py:1805
7465
msgid "repository converted"
7466
msgstr "repositorio convertido"
7467
7468
#: bzrlib/revisionspec.py:903
7469
msgid "Using {0} {1}"
7470
msgstr "Usando {0} {1}"
7471
7472
#: bzrlib/send.py:58
7473
#, python-format
7474
msgid "Mail client \"%s\" does not support specifying body"
7475
msgstr ""
7476
7477
#: bzrlib/send.py:62
7478
msgid "--remember requires a branch to be specified."
7479
msgstr ""
7480
7481
#: bzrlib/send.py:77
7482
msgid "No submit branch known or specified"
7483
msgstr ""
7484
7485
#: bzrlib/send.py:80
7486
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7487
msgstr ""
7488
7489
#: bzrlib/send.py:98
7490
#, python-format
7491
msgid "No such send format '%s'."
7492
msgstr ""
7493
7494
#: bzrlib/send.py:114
7495
msgid "bzr send takes at most two one revision identifiers"
7496
msgstr ""
7497
7498
#: bzrlib/send.py:127
7499
msgid "No revisions to submit."
7500
msgstr "No hay revisiones para enviar."
7501
7502
#: bzrlib/send.py:139
7503
msgid ""
7504
"- not supported for merge directives that use more than one output file."
7505
msgstr ""
7506
7507
#: bzrlib/send.py:185
7508
msgid "Format 0.9 does not permit bundle with no patch"
7509
msgstr ""
7510
7511
#: bzrlib/shelf_ui.py:46
7512
#, python-format
7513
msgid "Shelve adding file \"%(path)s\"?"
7514
msgstr ""
7515
7516
#: bzrlib/shelf_ui.py:47
7517
msgid "Shelve binary changes?"
7518
msgstr ""
7519
7520
#: bzrlib/shelf_ui.py:48
7521
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7522
msgstr ""
7523
7524
#: bzrlib/shelf_ui.py:50
7525
#, python-format
7526
msgid "Shelve removing file \"%(path)s\"?"
7527
msgstr ""
7528
7529
#: bzrlib/shelf_ui.py:51
7530
#, python-format
7531
msgid "Shelve %d change(s)?"
7532
msgstr ""
7533
7534
#: bzrlib/shelf_ui.py:52
7535
msgid "Shelve?"
7536
msgstr "¿Arrinconar?"
7537
7538
#: bzrlib/shelf_ui.py:53
7539
#, python-format
7540
msgid ""
7541
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7542
msgstr ""
7543
7544
#: bzrlib/shelf_ui.py:55
7545
#, python-format
7546
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7547
msgstr ""
7548
7549
#: bzrlib/shelf_ui.py:70
7550
#, python-format
7551
msgid "Changes shelved with id \"%d\"."
7552
msgstr ""
7553
7554
#: bzrlib/shelf_ui.py:74
7555
msgid "Selected changes destroyed."
7556
msgstr "Cambios seleccionados destruidos."
7557
7558
#: bzrlib/shelf_ui.py:78
7559
msgid "Selected changes:"
7560
msgstr "Cambios seleccionados:"
7561
7562
#: bzrlib/shelf_ui.py:98
7563
#, python-format
7564
msgid "Delete file \"%(path)s\"?"
7565
msgstr "¿Eliminar archivo «%(path)s»?"
7566
7567
#: bzrlib/shelf_ui.py:99
7568
msgid "Apply binary changes?"
7569
msgstr "¿Aplicar cambios binarios?"
7570
7571
#: bzrlib/shelf_ui.py:100
7572
#, python-format
7573
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7574
msgstr ""
7575
7576
#: bzrlib/shelf_ui.py:102
7577
#, python-format
7578
msgid "Add file \"%(path)s\"?"
7579
msgstr "¿Añadir archivo «%(path)s»?"
7580
7581
#: bzrlib/shelf_ui.py:103
7582
#, python-format
7583
msgid "Apply %d change(s)?"
7584
msgstr "¿Aplicar %d cambio(s)?"
7585
7586
#: bzrlib/shelf_ui.py:104
7587
msgid "Apply change?"
7588
msgstr "¿Aplicar cambio?"
7589
7590
#: bzrlib/shelf_ui.py:105
7591
#, python-format
7592
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7593
msgstr ""
7594
7595
#: bzrlib/shelf_ui.py:107
7596
#, python-format
7597
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7598
msgstr ""
7599
7600
#: bzrlib/shelf_ui.py:402
7601
msgid "No changes are shelved."
7602
msgstr "No se han arrinconado cambios."
7603
7604
#: bzrlib/shelf_ui.py:460
7605
#, python-format
7606
msgid "Using changes with id \"%d\"."
7607
msgstr ""
7608
7609
#: bzrlib/shelf_ui.py:464
7610
#, python-format
7611
msgid "Message: %s"
7612
msgstr "Mensaje: %s"
7613
7614
#: bzrlib/shelf_ui.py:476
7615
#, python-format
7616
msgid "Deleted changes with id \"%d\"."
7617
msgstr ""
7618
7619
#: bzrlib/smart/medium.py:714
7620
msgid "HPSS calls: {0} ({1} vfs) {2}"
7621
msgstr ""
7622
7623
#: bzrlib/smart/server.py:169
7624
msgid "Requested to stop gracefully"
7625
msgstr ""
7626
7627
#: bzrlib/smart/server.py:179
7628
#, python-format
7629
msgid "Waiting for %d client(s) to finish"
7630
msgstr ""
7631
7632
#: bzrlib/smart/server.py:185
7633
#, python-format
7634
msgid "Still waiting for %d client(s) to finish"
7635
msgstr ""
7636
7637
#: bzrlib/smart/server.py:219
7638
#, python-format
7639
msgid "listening socket error: %s"
7640
msgstr ""
7641
7642
#: bzrlib/smart/server.py:452
7643
#, python-format
7644
msgid "listening on port: %s"
7645
msgstr ""
7646
7647
#: bzrlib/switch.py:73
7648
msgid "Pending merges must be committed or reverted before using switch."
7649
msgstr ""
7650
7651
#: bzrlib/switch.py:100
7652
msgid ""
7653
"Cannot switch as local commits found in the checkout. Commit these to the "
7654
"bound branch or use --force to throw them away."
7655
msgstr ""
7656
7657
#: bzrlib/switch.py:105
7658
#, python-format
7659
msgid ""
7660
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7661
"anyway, use --force."
7662
msgstr ""
7663
7664
#: bzrlib/switch.py:125
7665
msgid "Cannot switch a branch, only a checkout."
7666
msgstr ""
7667
7668
#: bzrlib/switch.py:163
7669
#, python-format
7670
msgid "Tree is up to date at revision %d."
7671
msgstr ""
7672
7673
#: bzrlib/switch.py:169
7674
#, python-format
7675
msgid "Updated to revision %d."
7676
msgstr ""
7677
7678
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7679
msgid "Apply phase"
7680
msgstr "Aplicar fase"
7681
7682
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7683
msgid "removing file"
7684
msgstr "eliminar archivo"
7685
7686
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7687
msgid "adding file"
7688
msgstr "añadiendo archivo"
7689
7690
#: bzrlib/transform.py:2591
7691
msgid "Building tree"
7692
msgstr "Construyendo árbol"
7693
7694
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7695
msgid "Adding file contents"
7696
msgstr "Añadiendo contenidos de archivo"
7697
7698
#: bzrlib/transform.py:3028
7699
msgid "Resolution pass"
7700
msgstr ""
7701
7702
#: bzrlib/transport/ftp/_gssapi.py:88
7703
#, python-format
7704
msgid "Authenticated as %s"
7705
msgstr ""
7706
7707
#: bzrlib/tree.py:634
7708
msgid "*** {0} content-filter: {1} => {2!r}"
7709
msgstr ""
7710
7711
#: bzrlib/upgrade.py:77
7712
#, python-format
7713
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7714
msgstr ""
7715
7716
#: bzrlib/upgrade.py:100
7717
#, python-format
7718
msgid "cannot upgrade from bzrdir format %s"
7719
msgstr ""
7720
7721
#: bzrlib/upgrade.py:103
7722
#, python-format
7723
msgid "starting upgrade of %s"
7724
msgstr ""
7725
7726
#: bzrlib/upgrade.py:110
7727
msgid "finished"
7728
msgstr ""
7729
7730
#: bzrlib/upgrade.py:120
7731
msgid "Deleting backup.bzr"
7732
msgstr ""
7733
7734
#: bzrlib/upgrade.py:151
7735
msgid ""
7736
"\n"
7737
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7738
msgstr ""
7739
7740
#: bzrlib/upgrade.py:208
7741
#, python-format
7742
msgid "Found %d dependent branches - upgrading ..."
7743
msgstr ""
7744
7745
#: bzrlib/upgrade.py:276
7746
msgid "Upgrading bzrdirs"
7747
msgstr "Actualizando bzrdirs"
7748
7749
#: bzrlib/upgrade.py:282
7750
#, python-format
7751
msgid "Upgrading %s"
7752
msgstr "Actualizando %s"
7753
7754
#: bzrlib/upgrade.py:283
7755
msgid "Upgrading {0} {1} ..."
7756
msgstr "Actualizando {0} {1} ..."
7757
7758
#: bzrlib/upgrade.py:301
7759
msgid "Removing backup ..."
7760
msgstr ""
7761
7762
#: bzrlib/upgrade.py:305
7763
msgid "failed to clean-up {0}: {1}"
7764
msgstr ""
7765
7766
#: bzrlib/vf_repository.py:1090
7767
msgid "inventories"
7768
msgstr ""
7769
7770
#: bzrlib/vf_repository.py:1116
7771
msgid "texts"
7772
msgstr "textos"
7773
7774
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7775
msgid "Calculating text parents"
7776
msgstr ""
7777
7778
#: bzrlib/vf_repository.py:1706
7779
msgid "Fetch texts"
7780
msgstr ""
7781
7782
#: bzrlib/vf_repository.py:2535
7783
msgid "loading text store"
7784
msgstr ""
7785
7786
#: bzrlib/vf_repository.py:2541
7787
msgid "checking text graph"
7788
msgstr ""
7789
7790
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7791
#: bzrlib/vf_repository.py:3124
7792
msgid "Transferring revisions"
7793
msgstr ""
7794
7795
#: bzrlib/win32utils.py:146
7796
msgid "Failed to GetProcessMemoryInfo()"
7797
msgstr ""
7798
7799
#: bzrlib/win32utils.py:167
7800
msgid "Cannot debug memory on win32 without ctypes or win32process"
7801
msgstr ""
7802
7803
#: bzrlib/win32utils.py:172
7804
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7805
msgstr ""
7806
7807
#: bzrlib/win32utils.py:180
7808
#, python-format
7809
msgid "WorkingSize %8d KiB"
7810
msgstr ""
7811
7812
#: bzrlib/win32utils.py:181
7813
#, python-format
7814
msgid "PeakWorking %8d KiB"
7815
msgstr ""
7816
7817
#: bzrlib/win32utils.py:182
7818
#, python-format
7819
msgid "PagefileUsage %8d KiB"
7820
msgstr ""
7821
7822
#: bzrlib/win32utils.py:183
7823
#, python-format
7824
msgid "PeakPagefileUsage %8d KiB"
7825
msgstr ""
7826
7827
#: bzrlib/win32utils.py:185
7828
#, python-format
7829
msgid "PrivateUsage %8d KiB"
7830
msgstr ""
7831
7832
#: bzrlib/win32utils.py:186
7833
#, python-format
7834
msgid "PageFaultCount %8d"
7835
msgstr ""
7836
7837
#: bzrlib/workingtree.py:1478
7838
msgid "Rerun update after fixing the conflicts."
7839
msgstr ""
7840
7841
#: dummy/help_topics/authentication/summary.txt:1
7842
msgid "Information on configuring authentication"
7843
msgstr ""
7844
7845
#: dummy/help_topics/basic/detail.txt:1
7846
msgid ""
7847
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7848
"http://bazaar.canonical.com/"
7849
msgstr ""
7850
7851
#: dummy/help_topics/basic/detail.txt:4
7852
msgid ""
7853
"Basic commands:\n"
7854
" bzr init makes this directory a versioned branch\n"
7855
" bzr branch make a copy of another branch"
7856
msgstr ""
7857
7858
#: dummy/help_topics/basic/detail.txt:8
7859
msgid ""
7860
" bzr add make files or directories versioned\n"
7861
" bzr ignore ignore a file or pattern\n"
7862
" bzr mv move or rename a versioned file"
7863
msgstr ""
7864
7865
#: dummy/help_topics/basic/detail.txt:12
7866
msgid ""
7867
" bzr status summarize changes in working copy\n"
7868
" bzr diff show detailed diffs"
7869
msgstr ""
7870
7871
#: dummy/help_topics/basic/detail.txt:15
7872
msgid ""
7873
" bzr merge pull in changes from another branch\n"
7874
" bzr commit save some or all changes\n"
7875
" bzr send send changes via email"
7876
msgstr ""
7877
7878
#: dummy/help_topics/basic/detail.txt:19
7879
msgid ""
7880
" bzr log show history of changes\n"
7881
" bzr check validate storage"
7882
msgstr ""
7883
" bzr log muestra el historial de cambios\n"
7884
" bzr check valida el almacenamiento"
7885
7886
#: dummy/help_topics/basic/detail.txt:22
7887
msgid ""
7888
" bzr help init more help on e.g. init command\n"
7889
" bzr help commands list all commands\n"
7890
" bzr help topics list all help topics\n"
7891
msgstr ""
7892
7893
#: dummy/help_topics/basic/summary.txt:1
7894
msgid "Basic commands"
7895
msgstr "Órdenes básicas"
7896
7897
#: dummy/help_topics/branches/detail.txt:1
7898
msgid "Branches"
7899
msgstr "Ramas"
7900
7901
#: dummy/help_topics/branches/detail.txt:3
7902
msgid ""
7903
"A branch consists of the state of a project, including all of its\n"
7904
"history. All branches have a repository associated (which is where the\n"
7905
"branch history is stored), but multiple branches may share the same\n"
7906
"repository (a shared repository). Branches can be copied and merged."
7907
msgstr ""
7908
7909
#: dummy/help_topics/branches/detail.txt:8
7910
msgid ""
7911
"In addition, one branch may be bound to another one. Binding to another\n"
7912
"branch indicates that commits which happen in this branch must also \n"
7913
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7914
"commits when the two branches are out of date. In order for a commit \n"
7915
"to succeed, it may be necessary to update the current branch using \n"
7916
"``bzr update``."
7917
msgstr ""
7918
7919
#: dummy/help_topics/branches/detail.txt:15
7920
#: dummy/help_topics/checkouts/detail.txt:66
7921
#: dummy/help_topics/repositories/detail.txt:36
7922
msgid "Related commands::"
7923
msgstr "Órdenes relacionadas"
7924
7925
#: dummy/help_topics/branches/detail.txt:17
7926
msgid ""
7927
" init Change a directory into a versioned branch.\n"
7928
" branch Create a new branch that is a copy of an existing branch.\n"
7929
" merge Perform a three-way merge.\n"
7930
" bind Bind a branch to another one.\n"
7931
msgstr ""
7932
7933
#: dummy/help_topics/branches/summary.txt:1
7934
msgid "Information on what a branch is"
7935
msgstr ""
7936
7937
#: dummy/help_topics/bugs/summary.txt:1
7938
msgid "Bug tracker settings"
7939
msgstr "Configuración del seguimiento de errores"
7940
7941
#: dummy/help_topics/checkouts/detail.txt:1
7942
msgid "Checkouts"
7943
msgstr "Comrpobaciones"
7944
7945
#: dummy/help_topics/checkouts/detail.txt:3
7946
msgid ""
7947
"Checkouts are source trees that are connected to a branch, so that when\n"
7948
"you commit in the source tree, the commit goes into that branch. They\n"
7949
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7950
"Bazaar's decentralized features until you want them. Using checkouts\n"
7951
"with shared repositories is very similar to working with SVN or CVS, but\n"
7952
"doesn't have the same restrictions. And using checkouts still allows\n"
7953
"others working on the project to use whatever workflow they like."
7954
msgstr ""
7955
7956
#: dummy/help_topics/checkouts/detail.txt:11
7957
msgid ""
7958
"A checkout is created with the bzr checkout command (see \"help "
7959
"checkout\").\n"
7960
"You pass it a reference to another branch, and it will create a local copy\n"
7961
"for you that still contains a reference to the branch you created the\n"
7962
"checkout from (the master branch). Then if you make any commits they will "
7963
"be\n"
7964
"made on the other branch first. This creates an instant mirror of your work, "
7965
"or\n"
7966
"facilitates lockstep development, where each developer is working together,\n"
7967
"continuously integrating the changes of others."
7968
msgstr ""
7969
7970
#: dummy/help_topics/checkouts/detail.txt:19
7971
msgid ""
7972
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7973
"you have the full history locally. As you have a first class branch you "
7974
"can\n"
7975
"also commit locally if you want, for instance due to the temporary loss af "
7976
"a\n"
7977
"network connection. Use the --local option to commit to do this. All the "
7978
"local\n"
7979
"commits will then be made on the master branch the next time you do a non-"
7980
"local\n"
7981
"commit."
7982
msgstr ""
7983
7984
#: dummy/help_topics/checkouts/detail.txt:26
7985
msgid ""
7986
"If you are using a checkout from a shared branch you will periodically want "
7987
"to\n"
7988
"pull in all the changes made by others. This is done using the \"update\"\n"
7989
"command. The changes need to be applied before any non-local commit, but\n"
7990
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7991
"command when needed."
7992
msgstr ""
7993
7994
#: dummy/help_topics/checkouts/detail.txt:32
7995
msgid ""
7996
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7997
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7998
"SVN checkout in that it is not a first class branch, it mainly consists of "
7999
"the\n"
8000
"working tree. This means that any history operations must query the master\n"
8001
"branch, which could be slow if a network connection is involved. Also, as "
8002
"you\n"
8003
"don't have a local branch, then you cannot commit locally."
8004
msgstr ""
8005
8006
#: dummy/help_topics/checkouts/detail.txt:39
8007
msgid ""
8008
"Lightweight checkouts work best when you have fast reliable access to the\n"
8009
"master branch. This means that if the master branch is on the same disk or "
8010
"LAN\n"
8011
"a lightweight checkout will be faster than a heavyweight one for any "
8012
"commands\n"
8013
"that modify the revision history (as only one copy of the branch needs to\n"
8014
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8015
"that uses the history but does not change it, but if the master branch is "
8016
"on\n"
8017
"the same disk then there won't be a noticeable difference."
8018
msgstr ""
8019
8020
#: dummy/help_topics/checkouts/detail.txt:47
8021
msgid ""
8022
"Another possible use for a checkout is to use it with a treeless repository\n"
8023
"containing your branches, where you maintain only one working tree by\n"
8024
"switching the master branch that the checkout points to when you want to\n"
8025
"work on a different branch."
8026
msgstr ""
8027
8028
#: dummy/help_topics/checkouts/detail.txt:52
8029
msgid ""
8030
"Obviously to commit on a checkout you need to be able to write to the "
8031
"master\n"
8032
"branch. This means that the master branch must be accessible over a "
8033
"writeable\n"
8034
"protocol , such as sftp://, and that you have write permissions at the "
8035
"other\n"
8036
"end. Checkouts also work on the local file system, so that all that matters "
8037
"is\n"
8038
"file permissions."
8039
msgstr ""
8040
8041
#: dummy/help_topics/checkouts/detail.txt:58
8042
msgid ""
8043
"You can change the master of a checkout by using the \"switch\" command "
8044
"(see\n"
8045
"\"help switch\"). This will change the location that the commits are sent "
8046
"to.\n"
8047
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8048
"checkout. If you would like to convert your heavy checkout into a normal\n"
8049
"branch so that every commit is local, you can use the \"unbind\" command. To "
8050
"see\n"
8051
"whether or not a branch is bound or not you can use the \"info\" command. If "
8052
"the\n"
8053
"branch is bound it will tell you the location of the bound branch."
8054
msgstr ""
8055
8056
#: dummy/help_topics/checkouts/detail.txt:68
8057
msgid ""
8058
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8059
" checkout\n"
8060
" update Pull any changes in the master branch in to your checkout\n"
8061
" commit Make a commit that is sent to the master branch. If you have\n"
8062
" a heavy checkout then the --local option will commit to the\n"
8063
" checkout without sending the commit to the master\n"
8064
" switch Change the master branch that the commits in the checkout "
8065
"will\n"
8066
" be sent to\n"
8067
" bind Turn a standalone branch into a heavy checkout so that any\n"
8068
" commits will be sent to the master branch\n"
8069
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8070
" commits are only made locally\n"
8071
" info Displays whether a branch is bound or unbound. If the branch "
8072
"is\n"
8073
" bound, then it will also display the location of the bound "
8074
"branch\n"
8075
msgstr ""
8076
8077
#: dummy/help_topics/checkouts/summary.txt:1
8078
msgid "Information on what a checkout is"
8079
msgstr "información sobre lo que es una comprobación"
8080
8081
#: dummy/help_topics/commands/summary.txt:1
8082
msgid "Basic help for all commands"
8083
msgstr "Ayuda básica para todas las órdenes"
8084
8085
#: dummy/help_topics/configuration/summary.txt:1
8086
msgid "Details on the configuration settings available"
8087
msgstr "Detalles de las configuraciones disponibles"
8088
8089
#: dummy/help_topics/conflict-types/summary.txt:1
8090
msgid "Types of conflicts and what to do about them"
8091
msgstr "Tipos de conflicto y qué hacer con ellos"
8092
8093
#: dummy/help_topics/content-filters/summary.txt:1
8094
msgid "Conversion of content into/from working trees"
8095
msgstr ""
8096
8097
#: dummy/help_topics/criss-cross/detail.txt:1
8098
msgid "Criss-Cross"
8099
msgstr ""
8100
8101
#: dummy/help_topics/criss-cross/detail.txt:3
8102
msgid ""
8103
"A criss-cross in the branch history can cause the default merge technique\n"
8104
"to emit more conflicts than would normally be expected."
8105
msgstr ""
8106
8107
#: dummy/help_topics/criss-cross/detail.txt:6
8108
msgid ""
8109
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8110
"give\n"
8111
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8112
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8113
msgstr ""
8114
8115
#: dummy/help_topics/criss-cross/detail.txt:10
8116
msgid ""
8117
"Criss-crosses occur in a branch's history if two branches merge the same "
8118
"thing\n"
8119
"and then merge one another, or if two branches merge one another at the "
8120
"same\n"
8121
"time. They can be avoided by having each branch only merge from or into a\n"
8122
"designated central branch (a \"star topology\")."
8123
msgstr ""
8124
8125
#: dummy/help_topics/criss-cross/detail.txt:15
8126
msgid ""
8127
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8128
"default\n"
8129
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8130
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8131
"differences between THIS and OTHER are due to one side adding lines, or\n"
8132
"from another side removing lines."
8133
msgstr ""
8134
8135
#: dummy/help_topics/criss-cross/detail.txt:21
8136
msgid ""
8137
"Criss-crosses mean there is no good choice for a base. Selecting the "
8138
"recent\n"
8139
"merge points could cause one side's changes to be silently discarded.\n"
8140
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8141
"are emitted."
8142
msgstr ""
8143
8144
#: dummy/help_topics/criss-cross/detail.txt:26
8145
msgid ""
8146
"The ``weave`` merge type is not affected by this problem because it uses\n"
8147
"line-origin detection instead of a basis revision to determine the cause of\n"
8148
"differences.\n"
8149
msgstr ""
8150
8151
#: dummy/help_topics/criss-cross/summary.txt:1
8152
msgid "Information on criss-cross merging"
8153
msgstr ""
8154
8155
#: dummy/help_topics/current-formats/summary.txt:1
8156
msgid "Current storage formats"
8157
msgstr ""
8158
8159
#: dummy/help_topics/debug-flags/summary.txt:1
8160
msgid "Options to show or record debug information"
8161
msgstr "Opciones para mostrar o grabar información de depuración"
8162
8163
#: dummy/help_topics/diverged-branches/summary.txt:1
8164
msgid "How to fix diverged branches"
8165
msgstr ""
8166
8167
#: dummy/help_topics/env-variables/detail.txt:1
8168
msgid "Environment Variables"
8169
msgstr "Variables de entorno"
8170
8171
#: dummy/help_topics/env-variables/detail.txt:3
8172
msgid ""
8173
"=================== "
8174
"===========================================================\n"
8175
"BZRPATH Path where bzr is to look for shell plugin external\n"
8176
" commands.\n"
8177
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8178
"EMAIL E-Mail address of the user.\n"
8179
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8180
"EDITOR Editor for editing commit messages.\n"
8181
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8182
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8183
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8184
"BZR_PLUGIN_PATH.\n"
8185
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8186
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8187
"and\n"
8188
" HOME.\n"
8189
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8190
"URLs).\n"
8191
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8192
"sshcorp,\n"
8193
" plink or lsh.\n"
8194
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8195
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8196
"BZR_COLUMNS Override implicit terminal width.\n"
8197
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8198
"(selftest)\n"
8199
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8200
"'text'.\n"
8201
"BZR_PDB Control whether to launch a debugger on error.\n"
8202
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8203
" breakin debugger.\n"
8204
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8205
"(instead\n"
8206
" of char-based).\n"
8207
"=================== "
8208
"===========================================================\n"
8209
msgstr ""
8210
8211
#: dummy/help_topics/env-variables/summary.txt:1
8212
msgid "Environment variable names and values"
8213
msgstr "Nombres y valores de variables de entorno"
8214
8215
#: dummy/help_topics/eol/summary.txt:1
8216
msgid "Information on end-of-line handling"
8217
msgstr ""
8218
8219
#: dummy/help_topics/files/detail.txt:1
8220
msgid "Files"
8221
msgstr "Archivos"
8222
8223
#: dummy/help_topics/files/detail.txt:3
8224
msgid ""
8225
":On Unix: ~/.bazaar/bazaar.conf\n"
8226
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8227
"bazaar\\\\2.0\\\\bazaar.conf"
8228
msgstr ""
8229
8230
#: dummy/help_topics/files/detail.txt:6
8231
msgid ""
8232
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8233
"used to define general configuration that will be applied everywhere.\n"
8234
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8235
"commonly used options."
8236
msgstr ""
8237
8238
#: dummy/help_topics/files/detail.txt:11
8239
msgid "A typical config file might look something like::"
8240
msgstr ""
8241
8242
#: dummy/help_topics/files/detail.txt:13
8243
msgid ""
8244
" [DEFAULT]\n"
8245
" email=John Doe <jdoe@isp.com>"
8246
msgstr ""
8247
8248
#: dummy/help_topics/files/detail.txt:16
8249
msgid ""
8250
" [ALIASES]\n"
8251
" commit = commit --strict\n"
8252
" log10 = log --short -r -10..-1\n"
8253
msgstr ""
8254
" [ALIASES]\n"
8255
" commit = commit --strict\n"
8256
" log10 = log --short -r -10..-1\n"
8257
8258
#: dummy/help_topics/files/summary.txt:1
8259
msgid "Information on configuration and log files"
8260
msgstr "Información sobre configuración y archivos de registro"
8261
8262
#: dummy/help_topics/formats/detail.txt:1
8263
msgid "Storage Formats"
8264
msgstr "Formatos de almacenamiento"
8265
8266
#: dummy/help_topics/formats/detail.txt:3
8267
msgid ""
8268
"To ensure that older clients do not access data incorrectly,\n"
8269
"Bazaar's policy is to introduce a new storage format whenever\n"
8270
"new features requiring new metadata are added. New storage\n"
8271
"formats may also be introduced to improve performance and\n"
8272
"scalability."
8273
msgstr ""
8274
8275
#: dummy/help_topics/formats/detail.txt:9
8276
msgid ""
8277
"The newest format, 2a, is highly recommended. If your\n"
8278
"project is not using 2a, then you should suggest to the\n"
8279
"project owner to upgrade."
8280
msgstr ""
8281
8282
#: dummy/help_topics/formats/detail.txt:13
8283
msgid ""
8284
"\n"
8285
".. note::"
8286
msgstr ""
8287
"\n"
8288
".. nota::"
8289
8290
#: dummy/help_topics/formats/detail.txt:16
8291
msgid ""
8292
" Some of the older formats have two variants:\n"
8293
" a plain one and a rich-root one. The latter include an additional\n"
8294
" field about the root of the tree. There is no performance cost\n"
8295
" for using a rich-root format but you cannot easily merge changes\n"
8296
" from a rich-root format into a plain format. As a consequence,\n"
8297
" moving a project to a rich-root format takes some co-ordination\n"
8298
" in that all contributors need to upgrade their repositories\n"
8299
" around the same time. 2a and all future formats will be\n"
8300
" implicitly rich-root."
8301
msgstr ""
8302
8303
#: dummy/help_topics/formats/detail.txt:26
8304
msgid ""
8305
"See :doc:`current-formats-help` for the complete list of\n"
8306
"currently supported formats. See :doc:`other-formats-help` for\n"
8307
"descriptions of any available experimental and deprecated formats.\n"
8308
msgstr ""
8309
8310
#: dummy/help_topics/formats/summary.txt:1
8311
msgid "Information on choosing a storage format"
8312
msgstr "Información para escoger un formato de almacenamiento"
8313
8314
#: dummy/help_topics/global-options/detail.txt:1
8315
msgid "Global Options"
8316
msgstr "Opciones globales"
8317
8318
#: dummy/help_topics/global-options/detail.txt:3
8319
msgid ""
8320
"These options may be used with any command, and may appear in front of any\n"
8321
"command. (e.g. ``bzr --profile help``)."
8322
msgstr ""
8323
8324
#: dummy/help_topics/global-options/detail.txt:6
8325
msgid ""
8326
"--version Print the version number. Must be supplied before the "
8327
"command.\n"
8328
"--no-aliases Do not process command aliases when running this command.\n"
8329
"--builtin Use the built-in version of a command, not the plugin "
8330
"version.\n"
8331
" This does not suppress other plugin effects.\n"
8332
"--no-plugins Do not process any plugins.\n"
8333
"--no-l10n Do not translate messages.\n"
8334
"--concurrency Number of processes that can be run concurrently (selftest)."
8335
msgstr ""
8336
8337
#: dummy/help_topics/global-options/detail.txt:14
8338
msgid ""
8339
"--profile Profile execution using the hotshot profiler.\n"
8340
"--lsprof Profile execution using the lsprof profiler.\n"
8341
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8342
" results to a specified file. If the filename ends with "
8343
"\".txt\",\n"
8344
" text format will be used. If the filename either starts "
8345
"with\n"
8346
" \"callgrind.out\" or end with \".callgrind\", the output will "
8347
"be\n"
8348
" formatted for use with KCacheGrind. Otherwise, the output\n"
8349
" will be a pickle.\n"
8350
"--coverage Generate line coverage report in the specified directory."
8351
msgstr ""
8352
8353
#: dummy/help_topics/global-options/detail.txt:24
8354
msgid ""
8355
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8356
"for\n"
8357
" the duration of the command. This can be used multiple times "
8358
"if\n"
8359
" several options need to be overridden."
8360
msgstr ""
8361
8362
#: dummy/help_topics/global-options/detail.txt:28
8363
msgid ""
8364
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8365
"information on profiling."
8366
msgstr ""
8367
"Visite http://doc.bazaar.canonical.com/developers/profiling.html para tener\n"
8368
"más información del perfilado."
8369
8370
#: dummy/help_topics/global-options/detail.txt:31
8371
msgid ""
8372
"A number of debug flags are also available to assist troubleshooting and\n"
8373
"development. See :doc:`debug-flags-help`.\n"
8374
msgstr ""
8375
8376
#: dummy/help_topics/global-options/summary.txt:1
8377
msgid "Options that control how Bazaar runs"
8378
msgstr "Opciones que controlan como se ejecuta Bazaar"
8379
8380
#: dummy/help_topics/hidden-commands/summary.txt:1
8381
msgid "All hidden commands"
8382
msgstr "Todas las órdenes ocultas"
8383
8384
#: dummy/help_topics/hooks/summary.txt:1
8385
msgid "Points at which custom processing can be added"
8386
msgstr ""
8387
8388
#: dummy/help_topics/launchpad/detail.txt:1
8389
msgid "Integration with Launchpad.net"
8390
msgstr "Integración con Launchpad.net"
8391
8392
#: dummy/help_topics/launchpad/detail.txt:3
8393
msgid ""
8394
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8395
"specification tracking."
8396
msgstr ""
8397
8398
#: dummy/help_topics/launchpad/detail.txt:6
8399
msgid ""
8400
"The bzr client (through the plugin called 'launchpad') has special\n"
8401
"features to communicate with Launchpad:"
8402
msgstr ""
8403
8404
#: dummy/help_topics/launchpad/detail.txt:9
8405
msgid ""
8406
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8407
"This\n"
8408
" is then used by the 'lp:' transport to download your branches using\n"
8409
" bzr+ssh://."
8410
msgstr ""
8411
8412
#: dummy/help_topics/launchpad/detail.txt:13
8413
msgid ""
8414
" * The 'lp:' transport uses Launchpad as a directory service: for "
8415
"example\n"
8416
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8417
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8418
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8419
msgstr ""
8420
8421
#: dummy/help_topics/launchpad/detail.txt:18
8422
msgid ""
8423
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8424
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8425
"lp:12345'\n"
8426
" will record a revision property that marks that revision as fixing\n"
8427
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8428
" automatically be linked to the bug report."
8429
msgstr ""
8430
8431
#: dummy/help_topics/launchpad/detail.txt:24
8432
msgid ""
8433
" * The register-branch command tells Launchpad about the url of a\n"
8434
" public branch. Launchpad will then mirror the branch, display\n"
8435
" its contents and allow it to be attached to bugs and other\n"
8436
" objects."
8437
msgstr ""
8438
8439
#: dummy/help_topics/launchpad/detail.txt:29
8440
msgid "For more information see http://help.launchpad.net/\n"
8441
msgstr ""
8442
8443
#: dummy/help_topics/launchpad/summary.txt:1
8444
msgid "Using Bazaar with Launchpad.net"
8445
msgstr "Usar Bazaar con Launchpad.net"
8446
8447
#: dummy/help_topics/location-alias/summary.txt:1
8448
msgid "Aliases for remembered locations"
8449
msgstr "Alias para recordar ubicaciones"
8450
8451
#: dummy/help_topics/log-formats/summary.txt:1
8452
msgid "Details on the logging formats available"
8453
msgstr "Detalles sobre los formatos de acceso disponibles"
8454
8455
#: dummy/help_topics/other-formats/summary.txt:1
8456
msgid "Experimental and deprecated storage formats"
8457
msgstr "Formatos de almacenamiento experimentales y obsoletos"
8458
8459
#: dummy/help_topics/patterns/summary.txt:1
8460
msgid "Information on the pattern syntax"
8461
msgstr "Información de la sintaxis de patrones"
8462
8463
#: dummy/help_topics/repositories/detail.txt:1
8464
msgid "Repositories"
8465
msgstr "Repositorios"
8466
8467
#: dummy/help_topics/repositories/detail.txt:3
8468
msgid ""
8469
"Repositories in Bazaar are where committed information is stored. There is\n"
8470
"a repository associated with every branch."
8471
msgstr ""
8472
8473
#: dummy/help_topics/repositories/detail.txt:6
8474
msgid ""
8475
"Repositories are a form of database. Bzr will usually maintain this for\n"
8476
"good performance automatically, but in some situations (e.g. when doing\n"
8477
"very many commits in a short time period) you may want to ask bzr to\n"
8478
"optimise the database indices. This can be done by the 'bzr pack' command."
8479
msgstr ""
8480
8481
#: dummy/help_topics/repositories/detail.txt:11
8482
msgid ""
8483
"By default just running 'bzr init' will create a repository within the new\n"
8484
"branch but it is possible to create a shared repository which allows "
8485
"multiple\n"
8486
"branches to share their information in the same location. When a new branch "
8487
"is\n"
8488
"created it will first look to see if there is a containing shared repository "
8489
"it\n"
8490
"can use."
8491
msgstr ""
8492
8493
#: dummy/help_topics/repositories/detail.txt:17
8494
msgid ""
8495
"When two branches of the same project share a repository, there is\n"
8496
"generally a large space saving. For some operations (e.g. branching\n"
8497
"within the repository) this translates in to a large time saving."
8498
msgstr ""
8499
8500
#: dummy/help_topics/repositories/detail.txt:21
8501
msgid ""
8502
"To create a shared repository use the init-repository command (or the alias\n"
8503
"init-repo). This command takes the location of the repository to create. "
8504
"This\n"
8505
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8506
"which contains a shared repository. Any new branches that are created in "
8507
"this\n"
8508
"directory will then use it for storage."
8509
msgstr ""
8510
8511
#: dummy/help_topics/repositories/detail.txt:27
8512
msgid ""
8513
"It is a good idea to create a repository whenever you might create more\n"
8514
"than one branch of a project. This is true for both working areas where you\n"
8515
"are doing the development, and any server areas that you use for hosting\n"
8516
"projects. In the latter case, it is common to want branches without working\n"
8517
"trees. Since the files in the branch will not be edited directly there is "
8518
"no\n"
8519
"need to use up disk space for a working tree. To create a repository in "
8520
"which\n"
8521
"the branches will not have working trees pass the '--no-trees' option to\n"
8522
"'init-repository'."
8523
msgstr ""
8524
8525
#: dummy/help_topics/repositories/detail.txt:38
8526
msgid ""
8527
" init-repository Create a shared repository. Use --no-trees to create "
8528
"one\n"
8529
" in which new branches won't get a working tree.\n"
8530
msgstr ""
8531
8532
#: dummy/help_topics/repositories/summary.txt:1
8533
msgid "Basic information on shared repositories."
8534
msgstr "Información básica de los repositorios compartidos."
8535
8536
#: dummy/help_topics/revisionspec/summary.txt:1
8537
msgid "Explain how to use --revision"
8538
msgstr "Explicar cómo se usa --revision"
8539
8540
#: dummy/help_topics/rules/summary.txt:1
8541
msgid "Information on defining rule-based preferences"
8542
msgstr ""
8543
8544
#: dummy/help_topics/standalone-trees/detail.txt:1
8545
msgid "Standalone Trees"
8546
msgstr "Áboles autónomos"
8547
8548
#: dummy/help_topics/standalone-trees/detail.txt:3
8549
msgid ""
8550
"A standalone tree is a working tree with an associated repository. It\n"
8551
"is an independently usable branch, with no dependencies on any other.\n"
8552
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8553
"an existing project under version control."
8554
msgstr ""
8555
8556
#: dummy/help_topics/standalone-trees/detail.txt:8
8557
msgid "Related Commands::"
8558
msgstr "Órdenes relacionadas::"
8559
8560
#: dummy/help_topics/standalone-trees/detail.txt:10
8561
msgid " init Make a directory into a versioned branch.\n"
8562
msgstr ""
8563
8564
#: dummy/help_topics/standalone-trees/summary.txt:1
8565
msgid "Information on what a standalone tree is"
8566
msgstr "Información sobre lo que es un árbol autónomo"
8567
8568
#: dummy/help_topics/standard-options/detail.txt:1
8569
msgid "Standard Options"
8570
msgstr "Opciones estándar"
8571
8572
#: dummy/help_topics/standard-options/detail.txt:3
8573
msgid "Standard options are legal for all commands."
8574
msgstr "Las opciones estándar son legales para todas las órdenes."
8575
8576
#: dummy/help_topics/standard-options/detail.txt:5
8577
msgid ""
8578
"--help, -h Show help message.\n"
8579
"--verbose, -v Display more information.\n"
8580
"--quiet, -q Only display errors and warnings."
8581
msgstr ""
8582
8583
#: dummy/help_topics/standard-options/detail.txt:9
8584
msgid "Unlike global options, standard options can be used in aliases.\n"
8585
msgstr ""
8586
8587
#: dummy/help_topics/standard-options/summary.txt:1
8588
msgid "Options that can be used with any command"
8589
msgstr "Opciones que se pueden usar con cualquier orden"
8590
8591
#: dummy/help_topics/status-flags/detail.txt:1
8592
msgid "Status Flags"
8593
msgstr "Marcas de estado"
8594
8595
#: dummy/help_topics/status-flags/detail.txt:3
8596
msgid ""
8597
"Status flags are used to summarise changes to the working tree in a concise\n"
8598
"manner. They are in the form::"
8599
msgstr ""
8600
8601
#: dummy/help_topics/status-flags/detail.txt:6
8602
msgid " xxx <filename>"
8603
msgstr " xxx <nombre de archivo>"
8604
8605
#: dummy/help_topics/status-flags/detail.txt:8
8606
msgid "where the columns' meanings are as follows."
8607
msgstr "donde los significados de las columnas son los siguientes"
8608
8609
#: dummy/help_topics/status-flags/detail.txt:10
8610
msgid "Column 1 - versioning/renames::"
8611
msgstr ""
8612
8613
#: dummy/help_topics/status-flags/detail.txt:12
8614
msgid ""
8615
" + File versioned\n"
8616
" - File unversioned\n"
8617
" R File renamed\n"
8618
" ? File unknown\n"
8619
" X File nonexistent (and unknown to bzr)\n"
8620
" C File has conflicts\n"
8621
" P Entry for a pending merge (not a file)"
8622
msgstr ""
8623
8624
#: dummy/help_topics/status-flags/detail.txt:20
8625
msgid "Column 2 - contents::"
8626
msgstr "Columna 2 - contenidos::"
8627
8628
#: dummy/help_topics/status-flags/detail.txt:22
8629
msgid ""
8630
" N File created\n"
8631
" D File deleted\n"
8632
" K File kind changed\n"
8633
" M File modified"
8634
msgstr ""
8635
8636
#: dummy/help_topics/status-flags/detail.txt:27
8637
msgid "Column 3 - execute::"
8638
msgstr ""
8639
8640
#: dummy/help_topics/status-flags/detail.txt:29
8641
msgid " * The execute bit was changed\n"
8642
msgstr ""
8643
8644
#: dummy/help_topics/status-flags/summary.txt:1
8645
msgid "Help on status flags"
8646
msgstr "Ayuda sobre marcas de estado"
8647
8648
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8649
msgid "Branches Out of Sync"
8650
msgstr "Ramas sin sincronización"
8651
8652
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8653
msgid ""
8654
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8655
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8656
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8657
"have the same last revision as the new reference branch for the lightweight\n"
8658
"checkout, data could be lost, so Bazaar refuses."
8659
msgstr ""
8660
8661
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8662
msgid "How you deal with this depends on *why* the branches are out of sync."
8663
msgstr ""
8664
8665
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8666
msgid ""
8667
"If you have a checkout and have done local commits, you can get back in "
8668
"sync\n"
8669
"by running \"bzr update\" (and possibly \"bzr commit\")."
8670
msgstr ""
8671
8672
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8673
msgid ""
8674
"If you have a branch and the remote branch is out-of-date, you can push\n"
8675
"the local changes using \"bzr push\". If the local branch is out of date, "
8676
"you\n"
8677
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8678
"commit\n"
8679
"and then push your changes. If you decide that some of the changes aren't\n"
8680
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8681
msgstr ""
8682
8683
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8684
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8685
msgstr ""
8686
8687
#: dummy/help_topics/topics/summary.txt:1
8688
msgid "Topics list"
8689
msgstr "Lista de temas"
8690
8691
#: dummy/help_topics/url-special-chars/summary.txt:1
8692
msgid "Special character handling in URLs"
8693
msgstr ""
8694
8695
#: dummy/help_topics/urlspec/summary.txt:1
8696
msgid "Supported transport protocols"
8697
msgstr "Protocolos de transporte permitidos"
8698
8699
#: dummy/help_topics/working-trees/detail.txt:1
8700
msgid "Working Trees"
8701
msgstr "Árboles de trabajo"
8702
8703
#: dummy/help_topics/working-trees/detail.txt:3
8704
msgid ""
8705
"A working tree is the contents of a branch placed on disk so that you can\n"
8706
"see the files and edit them. The working tree is where you make changes to "
8707
"a\n"
8708
"branch, and when you commit the current state of the working tree is the\n"
8709
"snapshot that is recorded in the commit."
8710
msgstr ""
8711
8712
#: dummy/help_topics/working-trees/detail.txt:8
8713
msgid ""
8714
"When you push a branch to a remote system, a working tree will not be\n"
8715
"created. If one is already present the files will not be updated. The\n"
8716
"branch information will be updated and the working tree will be marked\n"
8717
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8718
"may be uncommitted changes or the update may cause content conflicts that "
8719
"are\n"
8720
"difficult to deal with remotely."
8721
msgstr ""
8722
8723
#: dummy/help_topics/working-trees/detail.txt:15
8724
msgid ""
8725
"If you have a branch with no working tree you can use the 'checkout' "
8726
"command\n"
8727
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8728
"will\n"
8729
"create the working tree. If the branch is updated remotely, you can update "
8730
"the\n"
8731
"working tree by running 'bzr update' in that directory."
8732
msgstr ""
8733
8734
#: dummy/help_topics/working-trees/detail.txt:20
8735
msgid ""
8736
"If you have a branch with a working tree that you do not want the 'remove-"
8737
"tree'\n"
8738
"command will remove the tree if it is safe. This can be done to avoid the\n"
8739
"warning about the remote working tree not being updated when pushing to the\n"
8740
"branch. It can also be useful when working with a '--no-trees' repository\n"
8741
"(see 'bzr help repositories')."
8742
msgstr ""
8743
8744
#: dummy/help_topics/working-trees/detail.txt:26
8745
msgid ""
8746
"If you want to have a working tree on a remote machine that you push to you\n"
8747
"can either run 'bzr update' in the remote branch after each push, or use "
8748
"some\n"
8749
"other method to update the tree during the push. There is an 'rspush' "
8750
"plugin\n"
8751
"that will update the working tree using rsync as well as doing a push. "
8752
"There\n"
8753
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8754
"SSH\n"
8755
"after each push."
8756
msgstr ""
8757
8758
#: dummy/help_topics/working-trees/detail.txt:33
8759
msgid "Useful commands::"
8760
msgstr "Órdenes útiles::"
8761
8762
#: dummy/help_topics/working-trees/detail.txt:35
8763
msgid ""
8764
" checkout Create a working tree when a branch does not have one.\n"
8765
" remove-tree Removes the working tree from a branch when it is safe to do "
8766
"so.\n"
8767
" update When a working tree is out of sync with its associated "
8768
"branch\n"
8769
" this will update the tree to match the branch.\n"
8770
msgstr ""
8771
8772
#: dummy/help_topics/working-trees/summary.txt:1
8773
msgid "Information on working trees"
8774
msgstr "Información en árboles de trabajo"
8775
8776
#: en/help_topics/authentication.txt:1
8777
msgid ""
8778
"Authentication Settings\n"
8779
"======================="
8780
msgstr ""
8781
"Configuración de la autenticación\n"
8782
"==========================="
8783
8784
#: en/help_topics/authentication.txt:4
8785
msgid ""
8786
"\n"
8787
"Intent\n"
8788
"------"
8789
msgstr ""
8790
"\n"
8791
"Intento\n"
8792
"-----------"
8793
8794
#: en/help_topics/authentication.txt:8
8795
msgid ""
8796
"Many different authentication policies can be described in the\n"
8797
"``authentication.conf`` file but a particular user should need only a few\n"
8798
"definitions to cover his needs without having to specify a user and a "
8799
"password\n"
8800
"for every branch he uses."
8801
msgstr ""
8802
8803
#: en/help_topics/authentication.txt:13
8804
msgid ""
8805
"The definitions found in this file are used to find the credentials to use "
8806
"for\n"
8807
"a given url. The same credentials can generally be used for as many branches "
8808
"as\n"
8809
"possible by grouping their declaration around the remote servers that need\n"
8810
"them. It's even possible to declare credentials that will be used by "
8811
"different\n"
8812
"servers."
8813
msgstr ""
8814
8815
#: en/help_topics/authentication.txt:19
8816
msgid ""
8817
"The intent is to make this file as small as possible to minimize maintenance."
8818
msgstr ""
8819
"El intento es hacer este archivo tan pequeño como sea posible para minimizar "
8820
"el mantenimiento."
8821
8822
#: en/help_topics/authentication.txt:21
8823
msgid ""
8824
"Once the relevant credentials are declared in this file you may use branch "
8825
"urls\n"
8826
"without embedding passwords (security hazard) or even users (enabling "
8827
"sharing\n"
8828
"of your urls with others)."
8829
msgstr ""
8830
8831
#: en/help_topics/authentication.txt:25
8832
msgid "Instead of using::"
8833
msgstr "en vez de usar::"
8834
8835
#: en/help_topics/authentication.txt:27
8836
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8837
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8838
8839
#: en/help_topics/authentication.txt:29
8840
msgid "you simply use::"
8841
msgstr "simplemente use::"
8842
8843
#: en/help_topics/authentication.txt:31
8844
msgid " bzr branch ftp://host.com/path/to/my/branch"
8845
msgstr " bzr branch ftp://host.com/path/to/my/branch"
8846
8847
#: en/help_topics/authentication.txt:33
8848
msgid ""
8849
"provided you have created the following ``authentication.conf`` file::"
8850
msgstr ""
8851
8852
#: en/help_topics/authentication.txt:35
8853
msgid ""
8854
" [myprojects]\n"
8855
" scheme=ftp\n"
8856
" host=host.com\n"
8857
" user=joe\n"
8858
" password=secret\n"
8859
" "
8860
msgstr ""
8861
" [misproyectos]\n"
8862
" scheme=ftp\n"
8863
" host=host.com\n"
8864
" user=juan\n"
8865
" password=secreta\n"
8866
" "
8867
8868
#: en/help_topics/authentication.txt:42
8869
msgid ""
8870
"Authentication definitions\n"
8871
"--------------------------"
8872
msgstr ""
8873
"Definiciones de autenticación\n"
8874
"--------------------------"
8875
8876
#: en/help_topics/authentication.txt:45
8877
msgid ""
8878
"There are two kinds of authentication used by the various schemes supported "
8879
"by\n"
8880
"bzr:"
8881
msgstr ""
8882
8883
#: en/help_topics/authentication.txt:48
8884
msgid "1. user and password"
8885
msgstr "1. usuario y contraseña"
8886
8887
#: en/help_topics/authentication.txt:50
8888
msgid ""
8889
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8890
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8891
"ssh agents are a better, more secure solution. So we have chosen to not "
8892
"provide\n"
8893
"our own less secure method."
8894
msgstr ""
8895
8896
#: en/help_topics/authentication.txt:55
8897
msgid "2. user, realm and password"
8898
msgstr "2. usuario, reino y contraseña"
8899
8900
#: en/help_topics/authentication.txt:57
8901
msgid ""
8902
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8903
"against a host. But, by using ``.htaccess`` files, for example, it is "
8904
"possible\n"
8905
"to define several (``user, realm, password``) for a given ``host``. So what "
8906
"is\n"
8907
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8908
"is\n"
8909
"not taken into account in the definitions, but will displayed if bzr "
8910
"prompts\n"
8911
"you for a password."
8912
msgstr ""
8913
8914
#: en/help_topics/authentication.txt:64
8915
msgid ""
8916
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8917
"specifying the appropriate port."
8918
msgstr ""
8919
8920
#: en/help_topics/authentication.txt:67
8921
msgid ""
8922
"To take all schemes into account, the password will be deduced from a set "
8923
"of\n"
8924
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8925
"``user``,\n"
8926
"``password``)."
8927
msgstr ""
8928
8929
#: en/help_topics/authentication.txt:71
8930
msgid ""
8931
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8932
"used\n"
8933
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8934
"``ssh``\n"
8935
" should be used instead since this is the real scheme regarding\n"
8936
" authentication,"
8937
msgstr ""
8938
8939
#: en/help_topics/authentication.txt:76
8940
msgid " * ``host``: can be empty (to act as a default for any host),"
8941
msgstr ""
8942
8943
#: en/help_topics/authentication.txt:78
8944
msgid ""
8945
" * ``port`` can be empty (useful when an host provides several servers for "
8946
"the\n"
8947
" same scheme), only numerical values are allowed, this should be used "
8948
"only\n"
8949
" when the server uses a port different than the scheme standard port,"
8950
msgstr ""
8951
8952
#: en/help_topics/authentication.txt:82
8953
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8954
msgstr ""
8955
8956
#: en/help_topics/authentication.txt:84
8957
msgid ""
8958
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8959
" ``getpass.get_user()``),"
8960
msgstr ""
8961
8962
#: en/help_topics/authentication.txt:87
8963
msgid ""
8964
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8965
" password."
8966
msgstr ""
8967
8968
#: en/help_topics/authentication.txt:90
8969
msgid ""
8970
"Multiple definitions can be provided and, for a given URL, bzr will select "
8971
"a\n"
8972
"(``user`` [, ``password``]) based on the following rules :"
8973
msgstr ""
8974
8975
#: en/help_topics/authentication.txt:93
8976
msgid " 1. the first match wins,"
8977
msgstr " 1. la primera coincidencia gana,"
8978
8979
#: en/help_topics/authentication.txt:95
8980
msgid " 2. empty fields match everything,"
8981
msgstr " 2. los campos vacíos coinciden siempre,"
8982
8983
#: en/help_topics/authentication.txt:97
8984
msgid ""
8985
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8986
msgstr ""
8987
" 3. «scheme» coincide incluso si los decoradores se han usado en el URL "
8988
"solicitado,"
8989
8990
#: en/help_topics/authentication.txt:99
8991
msgid ""
8992
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8993
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8994
"``projectbzr.sf.net``\n"
8995
" will not match ``bzr.sf.net``)."
8996
msgstr ""
8997
8998
#: en/help_topics/authentication.txt:103
8999
msgid ""
9000
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9001
msgstr ""
9002
9003
#: en/help_topics/authentication.txt:105
9004
msgid ""
9005
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9006
"above,\n"
9007
" empty paths will match any provided path)."
9008
msgstr ""
9009
9010
#: en/help_topics/authentication.txt:110
9011
msgid ""
9012
"File format\n"
9013
"-----------"
9014
msgstr ""
9015
"Formato de archivo\n"
9016
"------------------"
9017
9018
#: en/help_topics/authentication.txt:113
9019
msgid ""
9020
"The general rules for :doc:`configuration files <configuration-help>`\n"
9021
"apply except for the variable policies."
9022
msgstr ""
9023
9024
#: en/help_topics/authentication.txt:116
9025
msgid "Each section describes an authentication definition."
9026
msgstr "Cada sección describe una definición de autenticación."
9027
9028
#: en/help_topics/authentication.txt:118
9029
msgid ""
9030
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9031
"reserved\n"
9032
"and should appear as the *last* section."
9033
msgstr ""
9034
9035
#: en/help_topics/authentication.txt:121
9036
msgid "Each section should define:"
9037
msgstr "Cada sección debe definir:"
9038
9039
#: en/help_topics/authentication.txt:123
9040
msgid "* ``user``: the login to be used,"
9041
msgstr "* «user»: el acceso a usar,"
9042
9043
#: en/help_topics/authentication.txt:125
9044
msgid "Each section could define:"
9045
msgstr "Cada sección puede definir:"
9046
9047
#: en/help_topics/authentication.txt:127
9048
msgid "* ``host``: the remote server,"
9049
msgstr "* «host»: el servidor remoto,"
9050
9051
#: en/help_topics/authentication.txt:129
9052
msgid "* ``port``: the port the server is listening,"
9053
msgstr "* «port»: el puerto en el que escucha el servidor,"
9054
9055
#: en/help_topics/authentication.txt:131
9056
msgid "* ``path``: the branch location,"
9057
msgstr "* «path»: la ubicación de la rama,"
9058
9059
#: en/help_topics/authentication.txt:133
9060
msgid "* ``password``: the password."
9061
msgstr "* «password»: la contraseña."
9062
9063
#: en/help_topics/authentication.txt:135
9064
msgid ""
9065
"\n"
9066
"Examples\n"
9067
"--------"
9068
msgstr ""
9069
"\n"
9070
"Ejemplos\n"
9071
"--------"
9072
9073
#: en/help_topics/authentication.txt:139
9074
msgid ""
9075
"\n"
9076
"Personal projects hosted outside\n"
9077
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9078
msgstr ""
9079
9080
#: en/help_topics/authentication.txt:143
9081
msgid ""
9082
"All connections are done with the same ``user`` (the remote one for which "
9083
"the\n"
9084
"default bzr one is not appropriate) and the password is always prompted "
9085
"with\n"
9086
"some exceptions::"
9087
msgstr ""
9088
9089
#: en/help_topics/authentication.txt:147
9090
msgid ""
9091
" # Pet projects on hobby.net\n"
9092
" [hobby]\n"
9093
" host=r.hobby.net\n"
9094
" user=jim\n"
9095
" password=obvious1234\n"
9096
" \n"
9097
" # Home server\n"
9098
" [home]\n"
9099
" scheme=https\n"
9100
" host=home.net\n"
9101
" user=joe\n"
9102
" password=1essobV10us\n"
9103
" \n"
9104
" [DEFAULT]\n"
9105
" # Our local user is barbaz, on all remote sites we're known as "
9106
"foobar\n"
9107
" user=foobar"
9108
msgstr ""
9109
" # Proyecto de mascotas para hobby.net\n"
9110
" [hobby]\n"
9111
" host=r.hobby.net\n"
9112
" user=jaime\n"
9113
" password=obvia1234\n"
9114
" \n"
9115
" # Home server\n"
9116
" [home]\n"
9117
" scheme=https\n"
9118
" host=home.net\n"
9119
" user=juan\n"
9120
" password=1essobV10us\n"
9121
" \n"
9122
" [DEFAULT]\n"
9123
" # Nuestro usuario local es barbaz, en todos los sitios remotos se "
9124
"conoce como foobar\n"
9125
" user=foobar"
9126
9127
#: en/help_topics/authentication.txt:164
9128
msgid ""
9129
"\n"
9130
"Source hosting provider\n"
9131
"~~~~~~~~~~~~~~~~~~~~~~~"
9132
msgstr ""
9133
"\n"
9134
"Proveedor del albergue de origen\n"
9135
"~~~~~~~~~~~~~~~~~~~~~~~~~~"
9136
9137
#: en/help_topics/authentication.txt:168
9138
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9139
msgstr ""
9140
"En el dominio shp.net (ficticio) cada proyecto tiene su propio sitio::"
9141
9142
#: en/help_topics/authentication.txt:170
9143
msgid ""
9144
" [shpnet domain]\n"
9145
" # we use sftp, but ssh is the scheme used for authentication\n"
9146
" scheme=ssh\n"
9147
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9148
" host=.shp.net\n"
9149
" user=joe\n"
9150
" # bzr don't support supplying a password for sftp,\n"
9151
" # consider using an ssh agent if you don't want to supply\n"
9152
" # a password interactively. (pageant, ssh-agent, etc)"
9153
msgstr ""
9154
9155
#: en/help_topics/authentication.txt:180
9156
msgid ""
9157
"HTTPS, SFTP servers and their proxy\n"
9158
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9159
msgstr ""
9160
"HTTPS, servidores SFTP y su proxy\n"
9161
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9162
9163
#: en/help_topics/authentication.txt:183
9164
msgid ""
9165
"At company.com, the server hosting release and integration branches is "
9166
"behind a\n"
9167
"proxy, and the two branches use different authentication policies::"
9168
msgstr ""
9169
9170
#: en/help_topics/authentication.txt:186
9171
msgid ""
9172
" [reference code]\n"
9173
" scheme=https\n"
9174
" host=dev.company.com\n"
9175
" path=/dev\n"
9176
" user=user1\n"
9177
" password=pass1"
9178
msgstr ""
9179
" [reference code]\n"
9180
" scheme=https\n"
9181
" host=dev.company.com\n"
9182
" path=/dev\n"
9183
" user=user1\n"
9184
" password=pass1"
9185
9186
#: en/help_topics/authentication.txt:193
9187
msgid ""
9188
" # development branches on dev server\n"
9189
" [dev]\n"
9190
" scheme=ssh # bzr+ssh and sftp are available here\n"
9191
" host=dev.company.com\n"
9192
" path=/dev/integration\n"
9193
" user=user2\n"
9194
" \n"
9195
" # proxy\n"
9196
" [proxy]\n"
9197
" scheme=http\n"
9198
" host=proxy.company.com\n"
9199
" port=3128\n"
9200
" user=proxyuser1\n"
9201
" password=proxypass1"
9202
msgstr ""
9203
9204
#: en/help_topics/authentication.txt:208
9205
msgid ""
9206
"\n"
9207
"Planned enhancements\n"
9208
"--------------------"
9209
msgstr ""
9210
"\n"
9211
"Mejoras planificadas\n"
9212
"--------------------"
9213
9214
#: en/help_topics/authentication.txt:212
9215
msgid ""
9216
"The following are not yet implemented but planned as parts of a work in\n"
9217
"progress:"
9218
msgstr ""
9219
9220
#: en/help_topics/authentication.txt:215
9221
msgid "* add a ``password_encoding`` field allowing:"
9222
msgstr ""
9223
9224
#: en/help_topics/authentication.txt:217
9225
msgid ""
9226
" - storing the passwords in various obfuscating encodings (base64 for one),"
9227
msgstr ""
9228
9229
#: en/help_topics/authentication.txt:219
9230
msgid " - delegate password storage to plugins (.netrc for example)."
9231
msgstr ""
9232
9233
#: en/help_topics/authentication.txt:221
9234
msgid ""
9235
"* update the credentials when the user is prompted for user or password,"
9236
msgstr ""
9237
9238
#: en/help_topics/authentication.txt:223
9239
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9240
msgstr "* añadri un campo «verify_certificates» para «HTTPS»."
9241
9242
#: en/help_topics/authentication.txt:225
9243
msgid ""
9244
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9245
"but\n"
9246
"ignored in the actual implementation.\n"
9247
msgstr ""
9248
9249
#: en/help_topics/bugs.txt:1
9250
msgid "Bug Tracker Settings"
9251
msgstr "Configuración del seguimiento de errores"
9252
9253
#: en/help_topics/bugs.txt:3
9254
msgid ""
9255
"When making a commit, metadata about bugs fixed by that change can be\n"
9256
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9257
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9258
"(The only ``status`` value currently supported is ``fixed.``)"
9259
msgstr ""
9260
9261
#: en/help_topics/bugs.txt:8
9262
msgid ""
9263
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9264
"identifier\n"
9265
"rather than a full URL. This looks like::"
9266
msgstr ""
9267
9268
#: en/help_topics/bugs.txt:11
9269
msgid " bzr commit --fixes <tracker>:<id>"
9270
msgstr " bzr commit --fixes <tracker>:<id>"
9271
9272
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9273
msgid "or::"
9274
msgstr "o::"
9275
9276
#: en/help_topics/bugs.txt:15
9277
msgid " bzr commit --fixes <id>"
9278
msgstr " bzr commit --fixes <id>"
9279
9280
#: en/help_topics/bugs.txt:17
9281
msgid ""
9282
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9283
"the\n"
9284
"identifier for that bug within the bugtracker, usually the bug number.\n"
9285
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9286
"or global configuration is used."
9287
msgstr ""
9288
9289
#: en/help_topics/bugs.txt:22
9290
msgid ""
9291
"Bazaar knows about a few bug trackers that have many users. If\n"
9292
"you use one of these bug trackers then there is no setup required to\n"
9293
"use this feature, you just need to know the tracker identifier to use.\n"
9294
"These are the bugtrackers that are built in:"
9295
msgstr ""
9296
9297
#: en/help_topics/bugs.txt:27
9298
msgid ""
9299
" ============================ ============ ============\n"
9300
" URL Abbreviation Example\n"
9301
" ============================ ============ ============\n"
9302
" https://bugs.launchpad.net/ lp lp:12345\n"
9303
" http://bugs.debian.org/ deb deb:12345\n"
9304
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9305
" ============================ ============ ============"
9306
msgstr ""
9307
" ============================ ============ ============\n"
9308
" URL Ejemplo de abreviatura\n"
9309
" ============================ ============ ============\n"
9310
" https://bugs.launchpad.net/ lp lp:12345\n"
9311
" http://bugs.debian.org/ deb deb:12345\n"
9312
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9313
" ============================ ============ ============"
9314
9315
#: en/help_topics/bugs.txt:35
9316
msgid ""
9317
"For the bug trackers not listed above configuration is required.\n"
9318
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9319
"is built in, along with a template mechanism for other bugtrackers with\n"
9320
"simple URL schemes. If your bug tracker can't be described by one\n"
9321
"of the schemes described below then you can write a plugin to support\n"
9322
"it."
9323
msgstr ""
9324
9325
#: en/help_topics/bugs.txt:42
9326
msgid ""
9327
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9328
"variable which contains the base URL of the bug tracker. These options\n"
9329
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9330
"configuration section in ``locations.conf``. You can set up these values\n"
9331
"for each of the projects you work on."
9332
msgstr ""
9333
9334
#: en/help_topics/bugs.txt:48
9335
msgid ""
9336
"Note: As you provide a short name for each tracker, you can specify one or\n"
9337
"more bugs in one or more trackers at commit time if you wish."
9338
msgstr ""
9339
9340
#: en/help_topics/bugs.txt:51
9341
msgid ""
9342
"Launchpad\n"
9343
"---------"
9344
msgstr ""
9345
"Launchpad\n"
9346
"---------"
9347
9348
#: en/help_topics/bugs.txt:54
9349
msgid ""
9350
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9351
msgstr ""
9352
"Use «bzr commit --fixes lp:2»» para grabar que esta ejecución arregla el "
9353
"error 2."
9354
9355
#: en/help_topics/bugs.txt:56
9356
msgid ""
9357
"bugzilla_<tracker>_url\n"
9358
"----------------------"
9359
msgstr ""
9360
"bugzilla_<tracker>_url\n"
9361
"----------------------"
9362
9363
#: en/help_topics/bugs.txt:59
9364
msgid ""
9365
"If present, the location of the Bugzilla bug tracker referred to by\n"
9366
"<tracker>. This option can then be used together with ``bzr commit\n"
9367
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9368
"example::"
9369
msgstr ""
9370
9371
#: en/help_topics/bugs.txt:64
9372
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9373
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9374
9375
#: en/help_topics/bugs.txt:66
9376
msgid ""
9377
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9378
"fixed."
9379
msgstr ""
9380
9381
#: en/help_topics/bugs.txt:69
9382
msgid ""
9383
"trac_<tracker>_url\n"
9384
"------------------"
9385
msgstr ""
9386
"trac_<tracker>_url\n"
9387
"------------------"
9388
9389
#: en/help_topics/bugs.txt:72
9390
msgid ""
9391
"If present, the location of the Trac instance referred to by\n"
9392
"<tracker>. This option can then be used together with ``bzr commit\n"
9393
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9394
"example::"
9395
msgstr ""
9396
9397
#: en/help_topics/bugs.txt:77
9398
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9399
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9400
9401
#: en/help_topics/bugs.txt:79
9402
msgid ""
9403
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9404
"as\n"
9405
"fixed."
9406
msgstr ""
9407
9408
#: en/help_topics/bugs.txt:82
9409
msgid ""
9410
"bugtracker_<tracker>_url\n"
9411
"------------------------"
9412
msgstr ""
9413
"bugtracker_<tracker>_url\n"
9414
"------------------------"
9415
9416
#: en/help_topics/bugs.txt:85
9417
msgid ""
9418
"If present, the location of a generic bug tracker instance referred to by\n"
9419
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9420
"which will be replaced by a specific bug ID. This option can then be used\n"
9421
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9422
"fixed by that commit. For example::"
9423
msgstr ""
9424
9425
#: en/help_topics/bugs.txt:91
9426
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9427
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
9428
9429
#: en/help_topics/bugs.txt:93
9430
msgid ""
9431
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9432
"Roundup bug tracker as fixed, or::"
9433
msgstr ""
9434
9435
#: en/help_topics/bugs.txt:96
9436
msgid ""
9437
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9438
msgstr ""
9439
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9440
9441
#: en/help_topics/bugs.txt:98
9442
msgid ""
9443
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9444
"RT bug tracker as fixed, or::"
9445
msgstr ""
9446
9447
#: en/help_topics/bugs.txt:101
9448
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9449
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9450
9451
#: en/help_topics/bugs.txt:103
9452
msgid ""
9453
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9454
"1234\n"
9455
"in Hudson's JIRA bug tracker as fixed.\n"
9456
msgstr ""
9457
9458
#: en/help_topics/commands.txt:1
9459
msgid ""
9460
"add Add specified files or directories.\n"
9461
"alias Set/unset and display aliases.\n"
9462
"annotate Show the origin of each line in a file.\n"
9463
"bash-completion Generate a shell function for bash command line "
9464
"completion.\n"
9465
" [bash_completion]\n"
9466
"bind Convert the current branch into a checkout of the "
9467
"supplied\n"
9468
" branch.\n"
9469
"branch Create a new branch that is a copy of an existing branch.\n"
9470
"branches List the branches available at the current location.\n"
9471
"break-lock Break a dead lock.\n"
9472
"cat Write the contents of a file as of a given revision to\n"
9473
" standard output.\n"
9474
"check Validate working tree structure, branch consistency and\n"
9475
" repository history.\n"
9476
"checkout Create a new checkout of an existing branch.\n"
9477
"clean-tree Remove unwanted files from working tree.\n"
9478
"commit Commit changes into a new revision.\n"
9479
"config Display, set or remove a configuration option.\n"
9480
"conflicts List files with conflicts.\n"
9481
"deleted List files deleted in the working tree.\n"
9482
"diff Show differences in the working tree, between revisions "
9483
"or\n"
9484
" branches.\n"
9485
"dpush Push into a different VCS without any custom bzr "
9486
"metadata.\n"
9487
"export Export current or past revision to a destination directory "
9488
"or\n"
9489
" archive.\n"
9490
"help Show help on a command or other topic.\n"
9491
"ignore Ignore specified files or patterns.\n"
9492
"ignored List ignored files and the patterns that matched them.\n"
9493
"info Show information about a working tree, branch or "
9494
"repository.\n"
9495
"init Make a directory into a versioned branch.\n"
9496
"init-repository Create a shared repository for branches to share storage\n"
9497
" space.\n"
9498
"join Combine a tree into its containing tree.\n"
9499
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9500
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9501
"launchpad-open Open a Launchpad branch page in your web browser. "
9502
"[launchpad]\n"
9503
"log Show historical log for a branch or subset of a branch.\n"
9504
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9505
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9506
"ls List files in a tree.\n"
9507
"merge Perform a three-way merge.\n"
9508
"missing Show unmerged/unpulled revisions between two branches.\n"
9509
"mkdir Create a new versioned directory.\n"
9510
"mv Move or rename a file.\n"
9511
"nick Print or set the branch nickname.\n"
9512
"pack Compress the data within a repository.\n"
9513
"plugins List the installed plugins.\n"
9514
"pull Turn this branch into a mirror of another branch.\n"
9515
"push Update a mirror of this branch.\n"
9516
"reconcile Reconcile bzr metadata in a branch.\n"
9517
"reconfigure Reconfigure the type of a bzr directory.\n"
9518
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9519
"remerge Redo a merge.\n"
9520
"remove Remove files or directories.\n"
9521
"remove-branch Remove a branch.\n"
9522
"remove-tree Remove the working tree from a given branch/checkout.\n"
9523
"renames Show list of renamed files.\n"
9524
"resolve Mark a conflict as resolved.\n"
9525
"revert Revert files to a previous revision.\n"
9526
"revno Show current revision number.\n"
9527
"root Show the tree root directory.\n"
9528
"send Mail or create a merge-directive for submitting changes.\n"
9529
"serve Run the bzr server.\n"
9530
"shelve Temporarily set aside some changes from the current tree.\n"
9531
"sign-my-commits Sign all commits by a given committer.\n"
9532
"split Split a subdirectory of a tree into a separate tree.\n"
9533
"status Display status summary.\n"
9534
"switch Set the branch of a checkout and update.\n"
9535
"tag Create, remove or modify a tag naming a revision.\n"
9536
"tags List tags.\n"
9537
"testament Show testament (signing-form) of a revision.\n"
9538
"unbind Convert the current checkout into a regular branch.\n"
9539
"uncommit Remove the last committed revision.\n"
9540
"unshelve Restore shelved changes.\n"
9541
"update Update a working tree to a new revision.\n"
9542
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9543
" format.\n"
9544
"verify-signatures Verify all commit signatures.\n"
9545
"version Show version of bzr.\n"
9546
"version-info Show version information about this tree.\n"
9547
"view Manage filtered views.\n"
9548
"whoami Show or set bzr user id.\n"
9549
msgstr ""
9550
9551
#: en/help_topics/configuration.txt:1
9552
msgid ""
9553
"Configuration Settings\n"
9554
"======================="
9555
msgstr ""
9556
"Configuración\n"
9557
"============="
9558
9559
#: en/help_topics/configuration.txt:4
9560
msgid ""
9561
"Environment settings\n"
9562
"---------------------"
9563
msgstr ""
9564
"Configuración de entrono\n"
9565
"---------------------"
9566
9567
#: en/help_topics/configuration.txt:7
9568
msgid ""
9569
"While most configuration is handled by configuration files, some options\n"
9570
"which may be semi-permanent can also be controlled through the environment."
9571
msgstr ""
9572
9573
#: en/help_topics/configuration.txt:10
9574
msgid ""
9575
"BZR_EMAIL\n"
9576
"~~~~~~~~~"
9577
msgstr ""
9578
"BZR_EMAIL\n"
9579
"~~~~~~~~~"
9580
9581
#: en/help_topics/configuration.txt:13
9582
msgid "Override the email id used by Bazaar. Typical format::"
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:15
9586
msgid " \"John Doe <jdoe@example.com>\""
9587
msgstr " \"Juan Dado <jdado@ejemplo.com>\""
9588
9589
#: en/help_topics/configuration.txt:17
9590
msgid "See also the ``email`` configuration option."
9591
msgstr "Vea también las opciones de configuración de «email»"
9592
9593
#: en/help_topics/configuration.txt:19
9594
msgid ""
9595
"BZR_PROGRESS_BAR\n"
9596
"~~~~~~~~~~~~~~~~"
9597
msgstr ""
9598
"BZR_PROGRESS_BAR\n"
9599
"~~~~~~~~~~~~~~~~"
9600
9601
#: en/help_topics/configuration.txt:22
9602
msgid ""
9603
"Override the progress display. Possible values are \"none\" or \"text\". "
9604
"If\n"
9605
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9606
"draws\n"
9607
"the ordinary command line progress bar."
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:26
9611
msgid ""
9612
"BZR_SIGQUIT_PDB\n"
9613
"~~~~~~~~~~~~~~~"
9614
msgstr ""
9615
"BZR_SIGQUIT_PDB\n"
9616
"~~~~~~~~~~~~~~~"
9617
9618
#: en/help_topics/configuration.txt:29
9619
msgid ""
9620
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9621
msgstr ""
9622
9623
#: en/help_topics/configuration.txt:31
9624
msgid ""
9625
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9626
"* 1 = Invoke breakin debugger (default)"
9627
msgstr ""
9628
9629
#: en/help_topics/configuration.txt:34
9630
msgid ""
9631
"BZR_HOME\n"
9632
"~~~~~~~~"
9633
msgstr ""
9634
"BZR_HOME\n"
9635
"~~~~~~~~"
9636
9637
#: en/help_topics/configuration.txt:37
9638
msgid "Override the home directory used by Bazaar."
9639
msgstr "Sobrescribe el directorio de inicio usado por Bazaar."
9640
9641
#: en/help_topics/configuration.txt:39
9642
msgid ""
9643
"BZR_SSH\n"
9644
"~~~~~~~"
9645
msgstr ""
9646
"BZR_SSH\n"
9647
"~~~~~~~"
9648
9649
#: en/help_topics/configuration.txt:42
9650
msgid "Select a different SSH implementation."
9651
msgstr "Seleccione una implementación SSH diferente."
9652
9653
#: en/help_topics/configuration.txt:44
9654
msgid ""
9655
"BZR_PDB\n"
9656
"~~~~~~~"
9657
msgstr ""
9658
"BZR_PDB\n"
9659
"~~~~~~~"
9660
9661
#: en/help_topics/configuration.txt:47
9662
msgid "Control whether to launch a debugger on error."
9663
msgstr "Controla si lanzar un depurador para el error."
9664
9665
#: en/help_topics/configuration.txt:49
9666
msgid ""
9667
"* 0 = Standard behavior\n"
9668
"* 1 = Launch debugger"
9669
msgstr ""
9670
"* 0 = Comportamiento estándar\n"
9671
"* 1 = Lanzar depurador"
9672
9673
#: en/help_topics/configuration.txt:52
9674
msgid ""
9675
"BZR_REMOTE_PATH\n"
9676
"~~~~~~~~~~~~~~~"
9677
msgstr ""
9678
"BZR_REMOTE_PATH\n"
9679
"~~~~~~~~~~~~~~~"
9680
9681
#: en/help_topics/configuration.txt:55
9682
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:57
9686
msgid "See also the ``bzr_remote_path`` configuration option."
9687
msgstr ""
9688
9689
#: en/help_topics/configuration.txt:59
9690
msgid ""
9691
"BZR_EDITOR\n"
9692
"~~~~~~~~~~"
9693
msgstr ""
9694
"BZR_EDITOR\n"
9695
"~~~~~~~~~~"
9696
9697
#: en/help_topics/configuration.txt:62
9698
msgid "Path to the editor Bazaar should use for commit messages, etc."
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:64
9702
msgid ""
9703
"BZR_LOG\n"
9704
"~~~~~~~"
9705
msgstr ""
9706
"BZR_LOG\n"
9707
"~~~~~~~"
9708
9709
#: en/help_topics/configuration.txt:67
9710
msgid ""
9711
"Location of the Bazaar log file. You can check the current location by\n"
9712
"running ``bzr version``."
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:70
9716
msgid ""
9717
"The log file contains debug information that is useful for diagnosing or\n"
9718
"reporting problems with Bazaar."
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:73
9722
msgid ""
9723
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9724
"will disable logging."
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:76
9728
msgid ""
9729
"\n"
9730
"BZR_PLUGIN_PATH\n"
9731
"~~~~~~~~~~~~~~~"
9732
msgstr ""
9733
"\n"
9734
"BZR_PLUGIN_PATH\n"
9735
"~~~~~~~~~~~~~~~"
9736
9737
#: en/help_topics/configuration.txt:80
9738
msgid ""
9739
"The path to the plugins directory that Bazaar should use.\n"
9740
"If not set, Bazaar will search for plugins in:"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:83
9744
msgid ""
9745
"* the user specific plugin directory (containing the ``user`` plugins),"
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:85
9749
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9750
msgstr "* el directorio bzrlib (contiene los complementos «core»),"
9751
9752
#: en/help_topics/configuration.txt:87
9753
msgid ""
9754
"* the site specific plugin directory if applicable (containing\n"
9755
" the ``site`` plugins)."
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:90
9759
msgid ""
9760
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9761
"the way the plugin are searched. "
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:93
9765
msgid ""
9766
"As for the ``PATH`` variables, if multiple directories are\n"
9767
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9768
"platform specific appropriate character (':' on Unix,\n"
9769
"';' on windows)"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:98
9773
msgid ""
9774
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9775
"in ``user``. However it will continue to search in ``core`` and\n"
9776
"``site`` unless they are explicitly removed."
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:102
9780
msgid ""
9781
"If you need to change the order or remove one of these\n"
9782
"directories, you should use special values:"
9783
msgstr ""
9784
9785
#: en/help_topics/configuration.txt:105
9786
msgid ""
9787
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9788
" path from the default values,"
9789
msgstr ""
9790
"* «-user», «-core», «-site» eliminarán las correspondientes\n"
9791
" rutas de los valores predeterminados,"
9792
9793
#: en/help_topics/configuration.txt:108
9794
msgid ""
9795
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9796
" before the remaining default values (and also remove it from\n"
9797
" the default values)."
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:112
9801
msgid ""
9802
"Note that the special values 'user', 'core' and 'site' should be\n"
9803
"used literally, they will be substituted by the corresponding,\n"
9804
"platform specific, values."
9805
msgstr ""
9806
9807
#: en/help_topics/configuration.txt:116
9808
msgid ""
9809
"The examples below use ':' as the separator, windows users\n"
9810
"should use ';'."
9811
msgstr ""
9812
9813
#: en/help_topics/configuration.txt:119
9814
msgid "Overriding the default user plugin directory::"
9815
msgstr ""
9816
"Sobrescribiendo el directorio de complemento de usuario predeterminado::"
9817
9818
#: en/help_topics/configuration.txt:121
9819
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9820
msgstr " BZR_PLUGIN_PATH='/ruta/a/mis/otros/complementos'"
9821
9822
#: en/help_topics/configuration.txt:123
9823
msgid "Disabling the site directory while retaining the user directory::"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:125
9827
msgid " BZR_PLUGIN_PATH='-site:+user'"
9828
msgstr ""
9829
9830
#: en/help_topics/configuration.txt:127
9831
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:129
9835
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9836
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
9837
9838
#: en/help_topics/configuration.txt:131
9839
msgid "Overriding the default site plugin directory::"
9840
msgstr "Sobrescribe el directorio de complemento de sitio predeterminado::"
9841
9842
#: en/help_topics/configuration.txt:133
9843
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9844
msgstr " BZR_PLUGIN_PATH='/ruta/a/mi/sitiode/complementos:-sitio':+usuario"
9845
9846
#: en/help_topics/configuration.txt:135
9847
msgid ""
9848
"BZR_DISABLE_PLUGINS\n"
9849
"~~~~~~~~~~~~~~~~~~~"
9850
msgstr ""
9851
"BZR_DISABLE_PLUGINS\n"
9852
"~~~~~~~~~~~~~~~~~~~"
9853
9854
#: en/help_topics/configuration.txt:138
9855
msgid ""
9856
"Under special circumstances (mostly when trying to diagnose a\n"
9857
"bug), it's better to disable a plugin (or several) rather than\n"
9858
"uninstalling them completely. Such plugins can be specified in\n"
9859
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9860
msgstr ""
9861
9862
#: en/help_topics/configuration.txt:143
9863
msgid ""
9864
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9865
"will raise an import error if they are explicitly imported (by\n"
9866
"another plugin that depends on them for example)."
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:147
9870
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9871
msgstr "Desactivar «myplugin» y «yourplugin» se consigue::"
9872
9873
#: en/help_topics/configuration.txt:149
9874
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9875
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9876
9877
#: en/help_topics/configuration.txt:151
9878
msgid ""
9879
"BZR_PLUGINS_AT\n"
9880
"~~~~~~~~~~~~~~"
9881
msgstr ""
9882
"BZR_PLUGINS_AT\n"
9883
"~~~~~~~~~~~~~~"
9884
9885
#: en/help_topics/configuration.txt:154
9886
msgid ""
9887
"When adding a new feature or working on a bug in a plugin,\n"
9888
"developers often need to use a specific version of a given\n"
9889
"plugin. Since python requires that the directory containing the\n"
9890
"code is named like the plugin itself this make it impossible to\n"
9891
"use arbitrary directory names (using a two-level directory scheme\n"
9892
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9893
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:162
9897
msgid ""
9898
"Plugins specified in this environment variable takes precedence\n"
9899
"over the ones in ``BZR_PLUGIN_PATH``."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:165
9903
msgid ""
9904
"The variable specified a list of ``plugin_name@plugin path``,\n"
9905
"``plugin_name`` being the name of the plugin as it appears in\n"
9906
"python module paths, ``plugin_path`` being the path to the\n"
9907
"directory containing the plugin code itself\n"
9908
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9909
"separator, use ';' on windows."
9910
msgstr ""
9911
9912
#: en/help_topics/configuration.txt:172
9913
msgid ""
9914
"Example:\n"
9915
"~~~~~~~~"
9916
msgstr ""
9917
"Ejemplo:\n"
9918
"~~~~~~~~"
9919
9920
#: en/help_topics/configuration.txt:175
9921
msgid ""
9922
"Using a specific version of ``myplugin``:\n"
9923
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:178
9927
msgid ""
9928
"BZRPATH\n"
9929
"~~~~~~~"
9930
msgstr ""
9931
"BZRPATH\n"
9932
"~~~~~~~"
9933
9934
#: en/help_topics/configuration.txt:181
9935
msgid "The path where Bazaar should look for shell plugin external commands."
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:183
9939
msgid ""
9940
"\n"
9941
"http_proxy, https_proxy\n"
9942
"~~~~~~~~~~~~~~~~~~~~~~~"
9943
msgstr ""
9944
"\n"
9945
"http_proxy, https_proxy\n"
9946
"~~~~~~~~~~~~~~~~~~~~~~~"
9947
9948
#: en/help_topics/configuration.txt:187
9949
msgid "Specifies the network proxy for outgoing connections, for example::"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:189
9953
msgid ""
9954
" http_proxy=http://proxy.example.com:3128/ \n"
9955
" https_proxy=http://proxy.example.com:3128/"
9956
msgstr ""
9957
" http_proxy=http://proxy.ejemplo.com:3128/ \n"
9958
" https_proxy=http://proxy.ejemplo.com:3128/"
9959
9960
#: en/help_topics/configuration.txt:192
9961
msgid ""
9962
"\n"
9963
"Configuration files\n"
9964
"-------------------"
9965
msgstr ""
9966
"\n"
9967
"Archivos de configuración\n"
9968
"-------------------------"
9969
9970
#: en/help_topics/configuration.txt:196
9971
msgid ""
9972
"Location\n"
9973
"~~~~~~~~"
9974
msgstr ""
9975
"Ubicación\n"
9976
"~~~~~~~~"
9977
9978
#: en/help_topics/configuration.txt:199
9979
msgid ""
9980
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9981
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9982
"on\n"
9983
"Windows. (You can check the location for your system by using\n"
9984
"``bzr version``.)"
9985
msgstr ""
9986
9987
#: en/help_topics/configuration.txt:204
9988
msgid "There are three primary configuration files in this location:"
9989
msgstr "Hay tres archivos de configuración primarios en esta ubicación:"
9990
9991
#: en/help_topics/configuration.txt:206
9992
msgid "* ``bazaar.conf`` describes default configuration options,"
9993
msgstr ""
9994
"* «bazaar.conf» describe las opciones de configuración predeterminadas,"
9995
9996
#: en/help_topics/configuration.txt:208
9997
msgid ""
9998
"* ``locations.conf`` describes configuration information for\n"
9999
" specific branch locations,"
10000
msgstr ""
10001
"* «locations.conf» describe información de configuración para\n"
10002
" ubicaciones de rama específicas,"
10003
10004
#: en/help_topics/configuration.txt:211
10005
msgid ""
10006
"* ``authentication.conf`` describes credential information for\n"
10007
" remote servers."
10008
msgstr ""
10009
"* «authentication.conf» describe información de credencial para\n"
10010
" servidores remotos."
10011
10012
#: en/help_topics/configuration.txt:214
10013
msgid ""
10014
"Each branch can also contain a configuration file that sets values specific\n"
10015
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10016
"the\n"
10017
"branch. This file is visible to all users of a branch, if you wish to "
10018
"override\n"
10019
"one of the values for a branch with a setting that is specific to you then "
10020
"you\n"
10021
"can do so in ``locations.conf``."
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:220
10025
msgid ""
10026
"General format\n"
10027
"~~~~~~~~~~~~~~"
10028
msgstr ""
10029
"Formato general\n"
10030
"~~~~~~~~~~~~~~~"
10031
10032
#: en/help_topics/configuration.txt:223
10033
msgid ""
10034
"An ini file has three types of contructs: section headers, section\n"
10035
"options and comments."
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:226
10039
msgid ""
10040
"Comments\n"
10041
"^^^^^^^^"
10042
msgstr ""
10043
"Commentarios\n"
10044
"^^^^^^^^^^^^"
10045
10046
#: en/help_topics/configuration.txt:229
10047
msgid ""
10048
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10049
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10050
"Bazaar when parsing ini files."
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:233
10054
msgid ""
10055
"Section headers\n"
10056
"^^^^^^^^^^^^^^^"
10057
msgstr ""
10058
"Cabeceras de sección\n"
10059
"^^^^^^^^^^^^^^^^^^^^"
10060
10061
#: en/help_topics/configuration.txt:236
10062
msgid ""
10063
"A section header is a word enclosed in brackets that starts at the begining\n"
10064
"of a line. A typical section header looks like this::"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:239
10068
msgid " [DEFAULT]"
10069
msgstr " [PREDETERMINADO]"
10070
10071
#: en/help_topics/configuration.txt:241
10072
msgid ""
10073
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10074
"[ALIASES]. Section headers are case sensitive. The default section provides "
10075
"for\n"
10076
"setting options which can be overridden with the branch config file."
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:245
10080
msgid ""
10081
"For ``locations.conf``, the options from the section with the\n"
10082
"longest matching section header are used to the exclusion of other\n"
10083
"potentially valid section headers. A section header uses the path for\n"
10084
"the branch as the section header. Some examples include::"
10085
msgstr ""
10086
10087
#: en/help_topics/configuration.txt:250
10088
msgid ""
10089
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10090
" [/home/jdoe/branches/]"
10091
msgstr ""
10092
" [http://misramas.isp.com/~jdado/dirrama]\n"
10093
" [/home/jdado/ramas/]"
10094
10095
#: en/help_topics/configuration.txt:253
10096
msgid ""
10097
"\n"
10098
"Section options\n"
10099
"^^^^^^^^^^^^^^^"
10100
msgstr ""
10101
10102
#: en/help_topics/configuration.txt:257
10103
msgid ""
10104
"A section option resides within a section. A section option contains an\n"
10105
"option name, an equals sign and a value. For example::"
10106
msgstr ""
10107
10108
#: en/help_topics/configuration.txt:260
10109
msgid ""
10110
" email = John Doe <jdoe@isp.com>\n"
10111
" gpg_signing_key = Amy Pond <amy@example.com>"
10112
msgstr ""
10113
" email = Juan Dado <jdado@isp.com>\n"
10114
" gpg_signing_key = Ana Pons <ana@ejemplo.com>"
10115
10116
#: en/help_topics/configuration.txt:263
10117
msgid ""
10118
"A option can reference other options by enclosing them in curly brackets::"
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:265
10122
msgid ""
10123
" my_branch_name = feature_x\n"
10124
" my_server = bzr+ssh://example.com\n"
10125
" push_location = {my_server}/project/{my_branch_name}"
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:269
10129
msgid ""
10130
"Option policies\n"
10131
"^^^^^^^^^^^^^^^"
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:272
10135
msgid ""
10136
"Options defined in a section affect the named directory or URL plus\n"
10137
"any locations they contain. Policies can be used to change how an\n"
10138
"option value is interpreted for contained locations. Currently\n"
10139
"there are three policies available:"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:277
10143
msgid ""
10144
" none:\n"
10145
" the value is interpreted the same for contained locations. This is\n"
10146
" the default behaviour.\n"
10147
" norecurse:\n"
10148
" the value is only used for the exact location specified by the\n"
10149
" section name.\n"
10150
" appendpath:\n"
10151
" for contained locations, any additional path components are\n"
10152
" appended to the value."
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:287
10156
msgid ""
10157
"Policies are specified by keys with names of the form "
10158
"\"<option_name>:policy\".\n"
10159
"For example, to define the push location for a tree of branches, the\n"
10160
"following could be used::"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:291
10164
msgid ""
10165
" [/top/location]\n"
10166
" push_location = sftp://example.com/location\n"
10167
" push_location:policy = appendpath"
10168
msgstr ""
10169
" [/top/ubicacón]\n"
10170
" push_location = sftp://ejemplo.com/ubicaciñon\n"
10171
" push_location:policy = appendpath"
10172
10173
#: en/help_topics/configuration.txt:295
10174
msgid ""
10175
"With this configuration, the push location for ``/top/location/branch1``\n"
10176
"would be ``sftp://example.com/location/branch1``."
10177
msgstr ""
10178
10179
#: en/help_topics/configuration.txt:298
10180
msgid ""
10181
"Section local options\n"
10182
"^^^^^^^^^^^^^^^^^^^^^"
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:301
10186
msgid ""
10187
"Some options are defined automatically inside a given section and can be\n"
10188
"refered to in this section only. "
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:304
10192
msgid "For example, the ``appendpath`` policy can be used like this::"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:306
10196
msgid ""
10197
" [/home/vila/src/bzr/bugs]\n"
10198
" mypush = lp:~vila/bzr\n"
10199
" mypush:policy=appendpath"
10200
msgstr ""
10201
10202
#: en/help_topics/configuration.txt:310
10203
msgid "Using ``relpath`` to achieve the same result is done like this::"
10204
msgstr ""
10205
10206
#: en/help_topics/configuration.txt:312
10207
msgid ""
10208
" [/home/vila/src/bzr/bugs]\n"
10209
" mypush = lp:~vila/bzr/{relpath}"
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:315
10213
msgid ""
10214
"In both cases, when used in a directory like\n"
10215
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10219
msgid ""
10220
" $ bzr config mypush\n"
10221
" lp:~vila/bzr/832013-expand-in-stack"
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:321
10225
msgid "Another such option is ``basename`` which can be used like this::"
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:323
10229
msgid ""
10230
" [/home/vila/src/bzr]\n"
10231
" mypush = lp:~vila/bzr/{basename}"
10232
msgstr ""
10233
10234
#: en/help_topics/configuration.txt:326
10235
msgid ""
10236
"When used in a directory like\n"
10237
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10238
msgstr ""
10239
10240
#: en/help_topics/configuration.txt:332
10241
msgid ""
10242
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10243
"itself is defined as the relative path between the section name and the\n"
10244
"location it matches."
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:336
10248
msgid ""
10249
"When an option is local to a Section, it cannot be referred to from option\n"
10250
"values in any other section from the same ``Store`` nor from any other\n"
10251
"``Store``."
10252
msgstr ""
10253
10254
#: en/help_topics/configuration.txt:340
10255
msgid ""
10256
"\n"
10257
"The main configuration file, bazaar.conf\n"
10258
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10259
msgstr ""
10260
"\n"
10261
"El archivo de configuración principal, bazaar.conf\n"
10262
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10263
10264
#: en/help_topics/configuration.txt:344
10265
msgid ""
10266
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10267
"The default section contains the default\n"
10268
"configuration options for all branches. The default section can be\n"
10269
"overriden by providing a branch-specific section in ``locations.conf``."
10270
msgstr ""
10271
10272
#: en/help_topics/configuration.txt:349
10273
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:351
10277
msgid ""
10278
" [DEFAULT]\n"
10279
" email = John Doe <jdoe@isp.com>\n"
10280
" editor = /usr/bin/vim\n"
10281
" create_signatures = when-required"
10282
msgstr ""
10283
" [DEFAULT]\n"
10284
" email = Juan Dado <jdado@isp.com>\n"
10285
" editor = /usr/bin/vim\n"
10286
" create_signatures = when-required"
10287
10288
#: en/help_topics/configuration.txt:356
10289
msgid ""
10290
"\n"
10291
"The branch location configuration file, locations.conf\n"
10292
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10293
msgstr ""
10294
"\n"
10295
"El archivo de ubicación de la rama, locations.conf\n"
10296
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10297
10298
#: en/help_topics/configuration.txt:360
10299
msgid ""
10300
"``locations.conf`` allows one to specify overriding settings for\n"
10301
"a specific branch. The format is almost identical to the default section in\n"
10302
"bazaar.conf with one significant change: The section header, instead of "
10303
"saying\n"
10304
"default, will be the path to a branch that you wish to override a value\n"
10305
"for. The '?' and '*' wildcards are supported::"
10306
msgstr ""
10307
10308
#: en/help_topics/configuration.txt:366
10309
msgid ""
10310
" [/home/jdoe/branches/nethack]\n"
10311
" email = Nethack Admin <nethack@nethack.com>"
10312
msgstr ""
10313
" [/home/jdado/ramas/nethack]\n"
10314
" email = Nethack Admin <nethack@nethack.com>"
10315
10316
#: en/help_topics/configuration.txt:369
10317
msgid ""
10318
" [http://hypothetical.site.com/branches/devel-branch]\n"
10319
" create_signatures = always"
10320
msgstr ""
10321
" [http://hypothetical.site.com/branches/devel-branch]\n"
10322
" create_signatures = always"
10323
10324
#: en/help_topics/configuration.txt:372
10325
msgid ""
10326
"The authentication configuration file, authentication.conf\n"
10327
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10328
msgstr ""
10329
"El archivo de configuración de la autenticación, authentication.conf\n"
10330
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10331
10332
#: en/help_topics/configuration.txt:375
10333
msgid ""
10334
"``authentication.conf`` allows one to specify credentials for\n"
10335
"remote servers. This can be used for all the supported transports and any "
10336
"part\n"
10337
"of bzr that requires authentication (smtp for example)."
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:379
10341
msgid ""
10342
"The syntax of the file obeys the same rules as the others except for the\n"
10343
"option policies which don't apply."
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:382
10347
msgid ""
10348
"For more information on the possible uses of the authentication "
10349
"configuration\n"
10350
"file see :doc:`authentication-help`."
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:385
10354
msgid ""
10355
"\n"
10356
"Common options\n"
10357
"--------------"
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:389
10361
msgid ""
10362
"debug_flags\n"
10363
"~~~~~~~~~~~"
10364
msgstr ""
10365
"debug_flags\n"
10366
"~~~~~~~~~~~"
10367
10368
#: en/help_topics/configuration.txt:392
10369
msgid ""
10370
"A comma-separated list of debugging options to turn on. The same values\n"
10371
"can be used as with the -D command-line option (see `help global-options`).\n"
10372
"For example::"
10373
msgstr ""
10374
10375
#: en/help_topics/configuration.txt:396
10376
msgid " debug_flags = hpss"
10377
msgstr " debug_flags = hpss"
10378
10379
#: en/help_topics/configuration.txt:400
10380
msgid " debug_flags = hpss,evil"
10381
msgstr " debug_flags = hpss,evil"
10382
10383
#: en/help_topics/configuration.txt:402
10384
msgid ""
10385
"email\n"
10386
"~~~~~"
10387
msgstr ""
10388
"correo\n"
10389
"~~~~~"
10390
10391
#: en/help_topics/configuration.txt:405
10392
msgid ""
10393
"The email address to use when committing a branch. Typically takes the form\n"
10394
"of::"
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:408
10398
msgid " email = Full Name <account@hostname.tld>"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:410
10402
msgid ""
10403
"editor\n"
10404
"~~~~~~"
10405
msgstr ""
10406
"editor\n"
10407
"~~~~~~"
10408
10409
#: en/help_topics/configuration.txt:413
10410
msgid ""
10411
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10412
"a commit message. This setting is trumped by the environment variable\n"
10413
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10414
"variables."
10415
msgstr ""
10416
10417
#: en/help_topics/configuration.txt:418
10418
msgid ""
10419
"log_format\n"
10420
"~~~~~~~~~~"
10421
msgstr ""
10422
"log_format\n"
10423
"~~~~~~~~~~"
10424
10425
#: en/help_topics/configuration.txt:421
10426
msgid ""
10427
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10428
"and ``line``. Additional formats may be provided by plugins. The default\n"
10429
"value is ``long``."
10430
msgstr ""
10431
10432
#: en/help_topics/configuration.txt:425
10433
msgid ""
10434
"check_signatures\n"
10435
"~~~~~~~~~~~~~~~~"
10436
msgstr ""
10437
"check_signatures\n"
10438
"~~~~~~~~~~~~~~~~"
10439
10440
#: en/help_topics/configuration.txt:428
10441
msgid ""
10442
"Reserved for future use. These options will allow a policy for branches to\n"
10443
"require signatures."
10444
msgstr ""
10445
10446
#: en/help_topics/configuration.txt:431
10447
msgid ""
10448
"require\n"
10449
" The gnupg signature for revisions must be present and must be valid."
10450
msgstr ""
10451
10452
#: en/help_topics/configuration.txt:434
10453
msgid ""
10454
"ignore\n"
10455
" Do not check gnupg signatures of revisions."
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:437
10459
msgid ""
10460
"check-available\n"
10461
" (default) If gnupg signatures for revisions are present, check them.\n"
10462
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10463
" no signature is present."
10464
msgstr ""
10465
10466
#: en/help_topics/configuration.txt:442
10467
msgid ""
10468
"create_signatures\n"
10469
"~~~~~~~~~~~~~~~~~"
10470
msgstr ""
10471
"create_signatures\n"
10472
"~~~~~~~~~~~~~~~~~"
10473
10474
#: en/help_topics/configuration.txt:445
10475
msgid ""
10476
"Defines the behaviour of signing revisions on commits. By default bzr will "
10477
"not\n"
10478
"sign new commits."
10479
msgstr ""
10480
10481
#: en/help_topics/configuration.txt:448
10482
msgid ""
10483
"always\n"
10484
" Sign every new revision that is committed. If the signing fails then "
10485
"the\n"
10486
" commit will not be made."
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:452
10490
msgid ""
10491
"when-required\n"
10492
" Reserved for future use."
10493
msgstr ""
10494
"when-required\n"
10495
" Reservada para uso futuro."
10496
10497
#: en/help_topics/configuration.txt:455
10498
msgid ""
10499
"never\n"
10500
" Reserved for future use."
10501
msgstr ""
10502
"never\n"
10503
" Reservada para uso futuro."
10504
10505
#: en/help_topics/configuration.txt:458
10506
msgid ""
10507
"In future it is planned that ``when-required`` will sign newly\n"
10508
"committed revisions only when the branch requires them. ``never`` will "
10509
"refuse\n"
10510
"to sign newly committed revisions, even if the branch requires signatures."
10511
msgstr ""
10512
10513
#: en/help_topics/configuration.txt:462
10514
msgid ""
10515
"dirstate.fdatasync\n"
10516
"~~~~~~~~~~~~~~~~~~"
10517
msgstr ""
10518
"dirstate.fdatasync\n"
10519
"~~~~~~~~~~~~~~~~~~"
10520
10521
#: en/help_topics/configuration.txt:465
10522
msgid ""
10523
"If true (default), working tree metadata changes are flushed through the\n"
10524
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10525
"should not be lost if the machine crashes. See also repository.fdatasync."
10526
msgstr ""
10527
10528
#: en/help_topics/configuration.txt:469
10529
msgid ""
10530
"gpg_signing_key\n"
10531
"~~~~~~~~~~~~~~~"
10532
msgstr ""
10533
"gpg_signing_key\n"
10534
"~~~~~~~~~~~~~~~"
10535
10536
#: en/help_topics/configuration.txt:472
10537
msgid ""
10538
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10539
"address, key fingerprint or full key ID. When unset or when set to\n"
10540
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10541
msgstr ""
10542
10543
#: en/help_topics/configuration.txt:476
10544
msgid ""
10545
"recurse\n"
10546
"~~~~~~~"
10547
msgstr ""
10548
"recurse\n"
10549
"~~~~~~~"
10550
10551
#: en/help_topics/configuration.txt:479
10552
msgid ""
10553
"Only useful in ``locations.conf``. Defines whether or not the\n"
10554
"configuration for this section applies to subdirectories:"
10555
msgstr ""
10556
10557
#: en/help_topics/configuration.txt:482
10558
msgid ""
10559
"true\n"
10560
" (default) This section applies to subdirectories as well."
10561
msgstr ""
10562
10563
#: en/help_topics/configuration.txt:485
10564
msgid ""
10565
"false\n"
10566
" This section only applies to the branch at this directory and not\n"
10567
" branches below it."
10568
msgstr ""
10569
10570
#: en/help_topics/configuration.txt:489
10571
msgid ""
10572
"gpg_signing_command\n"
10573
"~~~~~~~~~~~~~~~~~~~"
10574
msgstr ""
10575
"gpg_signing_command\n"
10576
"~~~~~~~~~~~~~~~~~~~"
10577
10578
#: en/help_topics/configuration.txt:492
10579
msgid ""
10580
"(Default: \"gpg\"). Which program should be used to sign and check "
10581
"revisions.\n"
10582
"For example::"
10583
msgstr ""
10584
10585
#: en/help_topics/configuration.txt:495
10586
msgid " gpg_signing_command = /usr/bin/gnpg"
10587
msgstr " gpg_signing_command = /usr/bin/gnpg"
10588
10589
#: en/help_topics/configuration.txt:497
10590
msgid ""
10591
"The specified command must accept the options \"--clearsign\" and \"-u "
10592
"<email>\"."
10593
msgstr ""
10594
"La orden especificada puede aceptar las opciones «--clearsign» y «-u "
10595
"<correo>»."
10596
10597
#: en/help_topics/configuration.txt:499
10598
msgid ""
10599
"bzr_remote_path\n"
10600
"~~~~~~~~~~~~~~~"
10601
msgstr ""
10602
"bzr_remote_path\n"
10603
"~~~~~~~~~~~~~~~"
10604
10605
#: en/help_topics/configuration.txt:502
10606
msgid ""
10607
"(Default: \"bzr\"). The path to the command that should be used to run the "
10608
"smart\n"
10609
"server for bzr. This value may only be specified in locations.conf, because:"
10610
msgstr ""
10611
10612
#: en/help_topics/configuration.txt:505
10613
msgid ""
10614
"- it's needed before branch.conf is accessible\n"
10615
"- allowing remote branch.conf files to specify commands would be a security\n"
10616
" risk"
10617
msgstr ""
10618
10619
#: en/help_topics/configuration.txt:509
10620
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10621
msgstr ""
10622
10623
#: en/help_topics/configuration.txt:511
10624
msgid ""
10625
"smtp_server\n"
10626
"~~~~~~~~~~~"
10627
msgstr ""
10628
"smtp_server\n"
10629
"~~~~~~~~~~~"
10630
10631
#: en/help_topics/configuration.txt:514
10632
msgid ""
10633
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10634
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10635
msgstr ""
10636
10637
#: en/help_topics/configuration.txt:517
10638
msgid ""
10639
"smtp_username, smtp_password\n"
10640
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10641
msgstr ""
10642
"smtp_username, smtp_password\n"
10643
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10644
10645
#: en/help_topics/configuration.txt:520
10646
msgid ""
10647
"User and password to authenticate to the SMTP server. If smtp_username\n"
10648
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10649
"These settings are only needed if the SMTP server requires authentication\n"
10650
"to send mail."
10651
msgstr ""
10652
10653
#: en/help_topics/configuration.txt:525
10654
msgid ""
10655
"locks.steal_dead\n"
10656
"~~~~~~~~~~~~~~~~"
10657
msgstr ""
10658
"locks.steal_dead\n"
10659
"~~~~~~~~~~~~~~~~"
10660
10661
#: en/help_topics/configuration.txt:528
10662
msgid ""
10663
"If set to true, bzr will automatically break locks held by processes from\n"
10664
"the same machine and user that are no longer alive. Otherwise, it will\n"
10665
"print a message and you can break the lock manually, if you are satisfied\n"
10666
"the object is no longer in use."
10667
msgstr ""
10668
10669
#: en/help_topics/configuration.txt:533
10670
msgid ""
10671
"mail_client\n"
10672
"~~~~~~~~~~~"
10673
msgstr ""
10674
"mail_client\n"
10675
"~~~~~~~~~~~"
10676
10677
#: en/help_topics/configuration.txt:536
10678
msgid ""
10679
"A mail client to use for sending merge requests.\n"
10680
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10681
"it\n"
10682
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10683
"``editor``."
10684
msgstr ""
10685
10686
#: en/help_topics/configuration.txt:541
10687
msgid "Supported values for specific clients:"
10688
msgstr "Valores permitidos para clientes específicos:"
10689
10690
#: en/help_topics/configuration.txt:543
10691
msgid ""
10692
":claws: Use Claws. This skips a dialog for attaching files.\n"
10693
":evolution: Use Evolution.\n"
10694
":kmail: Use KMail.\n"
10695
":mutt: Use Mutt.\n"
10696
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10697
"1.5,\n"
10698
" this works around some bugs that xdg-email doesn't handle."
10699
msgstr ""
10700
10701
#: en/help_topics/configuration.txt:550
10702
msgid "Supported generic values are:"
10703
msgstr "Los valores genéricos permitidos son:"
10704
10705
#: en/help_topics/configuration.txt:552
10706
msgid ""
10707
":default: See above.\n"
10708
":editor: Use your editor to compose the merge request. This also uses\n"
10709
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10710
" smtp_username and smtp_password.\n"
10711
":mapi: Use your preferred e-mail client on Windows.\n"
10712
":xdg-email: Use xdg-email to run your preferred mail program"
10713
msgstr ""
10714
10715
#: en/help_topics/configuration.txt:559
10716
msgid ""
10717
"repository.fdatasync\n"
10718
"~~~~~~~~~~~~~~~~~~~~"
10719
msgstr ""
10720
"repository.fdatasync\n"
10721
"~~~~~~~~~~~~~~~~~~~~"
10722
10723
#: en/help_topics/configuration.txt:562
10724
msgid ""
10725
"If true (default), repository changes are flushed through the OS buffers\n"
10726
"to physical disk. This is somewhat slower, but means data should not be\n"
10727
"lost if the machine crashes. See also dirstate.fdatasync."
10728
msgstr ""
10729
10730
#: en/help_topics/configuration.txt:566
10731
msgid ""
10732
"submit_branch\n"
10733
"~~~~~~~~~~~~~"
10734
msgstr ""
10735
"submit_branch\n"
10736
"~~~~~~~~~~~~~"
10737
10738
#: en/help_topics/configuration.txt:569
10739
msgid ""
10740
"The branch you intend to submit your current work to. This is "
10741
"automatically\n"
10742
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10743
"This\n"
10744
"should usually be set on a per-branch or per-location basis."
10745
msgstr ""
10746
10747
#: en/help_topics/configuration.txt:573
10748
msgid ""
10749
"public_branch\n"
10750
"~~~~~~~~~~~~~"
10751
msgstr ""
10752
"public_branch\n"
10753
"~~~~~~~~~~~~~"
10754
10755
#: en/help_topics/configuration.txt:576
10756
msgid ""
10757
"A publically-accessible version of this branch (implying that this version "
10758
"is\n"
10759
"not publically-accessible). Used (and set) by ``bzr send``."
10760
msgstr ""
10761
10762
#: en/help_topics/configuration.txt:579
10763
msgid ""
10764
"suppress_warnings\n"
10765
"~~~~~~~~~~~~~~~~~"
10766
msgstr ""
10767
"suppress_warnings\n"
10768
"~~~~~~~~~~~~~~~~~"
10769
10770
#: en/help_topics/configuration.txt:582
10771
msgid ""
10772
"A list of strings, each string represent a warning that can be emitted by\n"
10773
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10774
msgstr ""
10775
10776
#: en/help_topics/configuration.txt:585
10777
msgid "Valid values:"
10778
msgstr "valores válidos:"
10779
10780
#: en/help_topics/configuration.txt:587
10781
msgid ""
10782
"* ``format_deprecation``:\n"
10783
" whether the format deprecation warning is shown on repositories that "
10784
"are\n"
10785
" using deprecated formats."
10786
msgstr ""
10787
10788
#: en/help_topics/configuration.txt:591
10789
msgid ""
10790
"default_format\n"
10791
"~~~~~~~~~~~~~~"
10792
msgstr ""
10793
"default_format\n"
10794
"~~~~~~~~~~~~~~"
10795
10796
#: en/help_topics/configuration.txt:594
10797
msgid ""
10798
"A format name for the default format used when creating branches. See "
10799
"``bzr\n"
10800
"help formats`` for possible values."
10801
msgstr ""
10802
10803
#: en/help_topics/configuration.txt:597
10804
msgid ""
10805
"\n"
10806
"Unicode options\n"
10807
"---------------"
10808
msgstr ""
10809
"\n"
10810
"Opciones Unicode\n"
10811
"---------------"
10812
10813
#: en/help_topics/configuration.txt:601
10814
msgid ""
10815
"output_encoding\n"
10816
"~~~~~~~~~~~~~~~"
10817
msgstr ""
10818
"output_encoding\n"
10819
"~~~~~~~~~~~~~~~"
10820
10821
#: en/help_topics/configuration.txt:604
10822
msgid ""
10823
"A Python unicode encoding name for text output from bzr, such as log\n"
10824
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10825
"is the terminal encoding prefered by the operating system."
10826
msgstr ""
10827
10828
#: en/help_topics/configuration.txt:608
10829
msgid ""
10830
"\n"
10831
"Branch type specific options\n"
10832
"----------------------------"
10833
msgstr ""
10834
"\n"
10835
"Opciones específicas del tipo de rama\n"
10836
"-----------------------------------------------------------"
10837
10838
#: en/help_topics/configuration.txt:612
10839
msgid ""
10840
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10841
"later format. They\n"
10842
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10843
"manually set in ``locations.conf`` or ``bazaar.conf``."
10844
msgstr ""
10845
10846
#: en/help_topics/configuration.txt:617
10847
msgid ""
10848
"append_revisions_only\n"
10849
"~~~~~~~~~~~~~~~~~~~~~"
10850
msgstr ""
10851
"append_revisions_only\n"
10852
"~~~~~~~~~~~~~~~~~~~~~"
10853
10854
#: en/help_topics/configuration.txt:620
10855
msgid ""
10856
"If set to \"True\" then revisions can only be appended to the log, not\n"
10857
"removed. A branch with this setting enabled can only pull from another\n"
10858
"branch if the other branch's log is a longer version of its own. This is\n"
10859
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10860
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10861
"compatibility with previous bzr versions (older than 2.2)."
10862
msgstr ""
10863
10864
#: en/help_topics/configuration.txt:627
10865
msgid ""
10866
"parent_location\n"
10867
"~~~~~~~~~~~~~~~"
10868
msgstr ""
10869
"parent_location\n"
10870
"~~~~~~~~~~~~~~~"
10871
10872
#: en/help_topics/configuration.txt:630
10873
msgid ""
10874
"If present, the location of the default branch for pull or merge. This "
10875
"option\n"
10876
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10877
"--remember``."
10878
msgstr ""
10879
10880
#: en/help_topics/configuration.txt:634
10881
msgid ""
10882
"push_location\n"
10883
"~~~~~~~~~~~~~"
10884
msgstr ""
10885
"push_location\n"
10886
"~~~~~~~~~~~~~"
10887
10888
#: en/help_topics/configuration.txt:637
10889
msgid ""
10890
"If present, the location of the default branch for push. This option\n"
10891
"is normally set by the first ``push`` or ``push --remember``."
10892
msgstr ""
10893
10894
#: en/help_topics/configuration.txt:640
10895
msgid ""
10896
"push_strict\n"
10897
"~~~~~~~~~~~"
10898
msgstr ""
10899
"push_strict\n"
10900
"~~~~~~~~~~~"
10901
10902
#: en/help_topics/configuration.txt:643
10903
msgid ""
10904
"If present, defines the ``--strict`` option default value for checking\n"
10905
"uncommitted changes before pushing."
10906
msgstr ""
10907
10908
#: en/help_topics/configuration.txt:646
10909
msgid ""
10910
"dpush_strict\n"
10911
"~~~~~~~~~~~~"
10912
msgstr ""
10913
"dpush_strict\n"
10914
"~~~~~~~~~~~~"
10915
10916
#: en/help_topics/configuration.txt:649
10917
msgid ""
10918
"If present, defines the ``--strict`` option default value for checking\n"
10919
"uncommitted changes before pushing into a different VCS without any\n"
10920
"custom bzr metadata."
10921
msgstr ""
10922
10923
#: en/help_topics/configuration.txt:653
10924
msgid ""
10925
"bound_location\n"
10926
"~~~~~~~~~~~~~~"
10927
msgstr ""
10928
"bound_location\n"
10929
"~~~~~~~~~~~~~~"
10930
10931
#: en/help_topics/configuration.txt:656
10932
msgid ""
10933
"The location that commits should go to when acting as a checkout.\n"
10934
"This option is normally set by ``bind``."
10935
msgstr ""
10936
10937
#: en/help_topics/configuration.txt:659
10938
msgid ""
10939
"bound\n"
10940
"~~~~~"
10941
msgstr ""
10942
"bound\n"
10943
"~~~~~"
10944
10945
#: en/help_topics/configuration.txt:662
10946
msgid ""
10947
"If set to \"True\", the branch should act as a checkout, and push each "
10948
"commit to\n"
10949
"the bound_location. This option is normally set by ``bind``/``unbind``."
10950
msgstr ""
10951
10952
#: en/help_topics/configuration.txt:665
10953
msgid ""
10954
"send_strict\n"
10955
"~~~~~~~~~~~"
10956
msgstr ""
10957
"send_strict\n"
10958
"~~~~~~~~~"
10959
10960
#: en/help_topics/configuration.txt:668
10961
msgid ""
10962
"If present, defines the ``--strict`` option default value for checking\n"
10963
"uncommitted changes before sending a merge directive."
10964
msgstr ""
10965
10966
#: en/help_topics/configuration.txt:671
10967
msgid ""
10968
"add.maximum_file_size\n"
10969
"~~~~~~~~~~~~~~~~~~~~~"
10970
msgstr ""
10971
"add.maximum_file_size\n"
10972
"~~~~~~~~~~~~~~~~~~~"
10973
10974
#: en/help_topics/configuration.txt:674
10975
msgid ""
10976
"Defines the maximum file size the command line \"add\" operation will allow\n"
10977
"in recursive mode, with files larger than this value being skipped. You may "
10978
"\n"
10979
"specify this value as an integer (in which case it is interpreted as bytes), "
10980
"\n"
10981
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10982
"0 \n"
10983
"will disable skipping."
10984
msgstr ""
10985
10986
#: en/help_topics/configuration.txt:680
10987
msgid ""
10988
"External Merge Tools\n"
10989
"--------------------"
10990
msgstr ""
10991
"Herramientas de fusión externas\n"
10992
"----------------------------------------------------"
10993
10994
#: en/help_topics/configuration.txt:683
10995
msgid ""
10996
"bzr.mergetool.<name>\n"
10997
"~~~~~~~~~~~~~~~~~~~~"
10998
msgstr ""
10999
"bzr.mergetool.<nombre>\n"
11000
"~~~~~~~~~~~~~~~~~~~"
11001
11002
#: en/help_topics/configuration.txt:686
11003
msgid ""
11004
"Defines an external merge tool called <name> with the given command-line.\n"
11005
"Arguments containing spaces should be quoted using single or double quotes. "
11006
"The\n"
11007
"executable may omit its path if it can be found on the PATH."
11008
msgstr ""
11009
11010
#: en/help_topics/configuration.txt:690
11011
msgid ""
11012
"The following markers can be used in the command-line to substitute "
11013
"filenames\n"
11014
"involved in the merge conflict::"
11015
msgstr ""
11016
11017
#: en/help_topics/configuration.txt:693
11018
msgid ""
11019
" {base} file.BASE\n"
11020
" {this} file.THIS\n"
11021
" {other} file.OTHER\n"
11022
" {result} output file\n"
11023
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
11024
"merge\n"
11025
" succeeds."
11026
msgstr ""
11027
11028
#: en/help_topics/configuration.txt:702
11029
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11030
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {este} {otro} -o {resultado}"
11031
11032
#: en/help_topics/configuration.txt:704
11033
msgid ""
11034
"bzr.default_mergetool\n"
11035
"~~~~~~~~~~~~~~~~~~~~~"
11036
msgstr ""
11037
"bzr.default_mergetool\n"
11038
"~~~~~~~~~~~~~~~~~~"
11039
11040
#: en/help_topics/configuration.txt:707
11041
msgid ""
11042
"Specifies which external merge tool (as defined above) should be selected "
11043
"by\n"
11044
"default in tools such as ``bzr qconflicts``."
11045
msgstr ""
11046
11047
#: en/help_topics/configuration.txt:712
11048
msgid " bzr.default_mergetool = kdiff3\n"
11049
msgstr " bzr.default_mergetool = kdiff3\n"
11050
11051
#: en/help_topics/conflict-types.txt:1
11052
msgid ""
11053
"Conflict Types\n"
11054
"=============="
11055
msgstr ""
11056
"Tipos de conflicto\n"
11057
"=================="
11058
11059
#: en/help_topics/conflict-types.txt:4
11060
msgid ""
11061
"Some operations, like merge, revert and pull, modify the contents of your\n"
11062
"working tree. These modifications are programmatically generated, and so "
11063
"they\n"
11064
"may conflict with the current state of your working tree. "
11065
msgstr ""
11066
11067
#: en/help_topics/conflict-types.txt:8
11068
msgid ""
11069
"When conflicts are present in your working tree (as shown by ``bzr\n"
11070
"conflicts``), you should resolve them and then inform bzr that the "
11071
"conflicts\n"
11072
"have been resolved."
11073
msgstr ""
11074
11075
#: en/help_topics/conflict-types.txt:12
11076
msgid ""
11077
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11078
"should resolve them is not the one responsible for their occurrence, as is "
11079
"the\n"
11080
"case when merging other people's work or because some conflicts are "
11081
"presented\n"
11082
"in a way that is not easy to understand."
11083
msgstr ""
11084
11085
#: en/help_topics/conflict-types.txt:17
11086
msgid ""
11087
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11088
"conflict if and only if there's an actual conceptual conflict in the source\n"
11089
"tree. Because Bazaar doesn't understand the real meaning of the files "
11090
"being\n"
11091
"versioned, it can, when faced with ambiguities, fall short in either "
11092
"direction\n"
11093
"trying to resolve the conflict itself. Many kinds of changes can be "
11094
"combined\n"
11095
"programmatically, but sometimes only a human can determine the right thing "
11096
"to\n"
11097
"do."
11098
msgstr ""
11099
11100
#: en/help_topics/conflict-types.txt:25
11101
msgid ""
11102
"When Bazaar generates a conflict, it adds information into the working tree "
11103
"to\n"
11104
"present the conflicting versions, and it's up to you to find the correct\n"
11105
"resolution."
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:29
11109
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11110
msgstr ""
11111
11112
#: en/help_topics/conflict-types.txt:31
11113
msgid ""
11114
"1. Modify the working tree content so that the conflicted item is now in "
11115
"the\n"
11116
" state you want to keep, then"
11117
msgstr ""
11118
11119
#: en/help_topics/conflict-types.txt:34
11120
msgid ""
11121
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11122
" remaining generated information (``bzr resolve <item>``)."
11123
msgstr ""
11124
11125
#: en/help_topics/conflict-types.txt:37
11126
msgid ""
11127
"For most conflict types, there are some obvious ways to modify the working\n"
11128
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11129
"itself already made a choice, when possible."
11130
msgstr ""
11131
11132
#: en/help_topics/conflict-types.txt:41
11133
msgid ""
11134
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11135
"different ways to resolve the conflict."
11136
msgstr ""
11137
11138
#: en/help_topics/conflict-types.txt:44
11139
msgid ""
11140
"Each type of conflict is explained below, and the action which must be done "
11141
"to\n"
11142
"resolve the conflict is outlined."
11143
msgstr ""
11144
11145
#: en/help_topics/conflict-types.txt:47
11146
msgid ""
11147
"Various actions are available depending on the kind of conflict, for some "
11148
"of\n"
11149
"these actions, Bazaar can provide some help. In the end you should at least\n"
11150
"inform Bazaar that you're done with the conflict with::"
11151
msgstr ""
11152
11153
#: en/help_topics/conflict-types.txt:51
11154
msgid " ``bzr resolve FILE --action=done'"
11155
msgstr ""
11156
11157
#: en/help_topics/conflict-types.txt:53
11158
msgid ""
11159
"Note that this is the default action when a single file is involved so you "
11160
"can\n"
11161
"simply use::"
11162
msgstr ""
11163
11164
#: en/help_topics/conflict-types.txt:56
11165
msgid " ``bzr resolve FILE``"
11166
msgstr " «bzr resolve ARCHIVO»"
11167
11168
#: en/help_topics/conflict-types.txt:58
11169
msgid "See ``bzr help resolve`` for more details."
11170
msgstr "Vea «bzr help resolve» para tener más detalles."
11171
11172
#: en/help_topics/conflict-types.txt:60
11173
msgid ""
11174
"Text conflicts\n"
11175
"--------------"
11176
msgstr ""
11177
"Conflictos de texto\n"
11178
"------------------------------"
11179
11180
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11181
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11182
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11183
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11184
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11185
msgid "Typical message::"
11186
msgstr "Mensaje típico::"
11187
11188
#: en/help_topics/conflict-types.txt:65
11189
msgid " Text conflict in FILE"
11190
msgstr " Conflictos de texto en ARCHIVO"
11191
11192
#: en/help_topics/conflict-types.txt:67
11193
msgid ""
11194
"These are produced when a text merge cannot completely reconcile two sets "
11195
"of\n"
11196
"text changes. Bazaar will emit files for each version with the extensions\n"
11197
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11198
"tree,\n"
11199
"i.e. the tree that you are merging changes into. OTHER is the version that "
11200
"you\n"
11201
"are merging into the target. BASE is an older version that is used as a "
11202
"basis\n"
11203
"for comparison."
11204
msgstr ""
11205
11206
#: en/help_topics/conflict-types.txt:74
11207
msgid ""
11208
"In the main copy of the file, Bazaar will include all the changes that it\n"
11209
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11210
"\"herringbone\" markers like ``<<<<<<<``."
11211
msgstr ""
11212
11213
#: en/help_topics/conflict-types.txt:78
11214
msgid ""
11215
"Say the initial text is \"The project leader released it.\", and THIS "
11216
"modifies it\n"
11217
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11218
"leader\n"
11219
"released Bazaar.\" A conflict would look like this::"
11220
msgstr ""
11221
11222
#: en/help_topics/conflict-types.txt:82
11223
msgid ""
11224
" <<<<<<< TREE\n"
11225
" Martin Pool released it.\n"
11226
" =======\n"
11227
" The project leader released Bazaar.\n"
11228
" >>>>>>> MERGE-SOURCE"
11229
msgstr ""
11230
" <<<<<<< TREE\n"
11231
" Martin Pool released it.\n"
11232
" =======\n"
11233
" The project leader released Bazaar.\n"
11234
" >>>>>>> MERGE-SOURCE"
11235
11236
#: en/help_topics/conflict-types.txt:88
11237
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11238
msgstr "La resolución correcta debería ser «Martin Pool released Bazaar.»"
11239
11240
#: en/help_topics/conflict-types.txt:90
11241
msgid ""
11242
"You can handle text conflicts either by editing the main copy of the file,\n"
11243
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11244
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11245
"set of changes over the other (but see below when you encounter these\n"
11246
"cases). More often, the two sets of changes must be intelligently combined."
11247
msgstr ""
11248
11249
#: en/help_topics/conflict-types.txt:96
11250
msgid ""
11251
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11252
"you are done editing, the file should look like it never had a conflict, and "
11253
"be\n"
11254
"ready to commit."
11255
msgstr ""
11256
11257
#: en/help_topics/conflict-types.txt:100
11258
msgid ""
11259
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11260
"Bazaar will auto-detect which conflicts you have resolved."
11261
msgstr ""
11262
11263
#: en/help_topics/conflict-types.txt:103
11264
msgid ""
11265
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11266
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11267
"working tree."
11268
msgstr ""
11269
11270
#: en/help_topics/conflict-types.txt:107
11271
msgid ""
11272
"\n"
11273
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11274
"resolve`` with one of the following actions:"
11275
msgstr ""
11276
11277
#: en/help_topics/conflict-types.txt:111
11278
msgid ""
11279
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11280
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11281
msgstr ""
11282
11283
#: en/help_topics/conflict-types.txt:114
11284
msgid ""
11285
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11286
"modifications will be taken into account."
11287
msgstr ""
11288
11289
#: en/help_topics/conflict-types.txt:117
11290
msgid ""
11291
"Content conflicts\n"
11292
"-----------------"
11293
msgstr ""
11294
"Conflictos de contenido\n"
11295
"-------------------------------------"
11296
11297
#: en/help_topics/conflict-types.txt:122
11298
msgid " Contents conflict in FILE"
11299
msgstr " Conflictos de contenido en ARCHIVO"
11300
11301
#: en/help_topics/conflict-types.txt:124
11302
msgid ""
11303
"This conflict happens when there are conflicting changes in the working "
11304
"tree\n"
11305
"and the merge source, but the conflicted items are not text files. They "
11306
"may\n"
11307
"be binary files, or symlinks, or directories. It can even happen with "
11308
"files\n"
11309
"that are deleted on one side, and modified on the other."
11310
msgstr ""
11311
11312
#: en/help_topics/conflict-types.txt:129
11313
msgid ""
11314
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11315
"be\n"
11316
"regular files, symlinks or directories). But it will not include a \"main "
11317
"copy\"\n"
11318
"of the file with herringbone conflict markers. It will appear that the "
11319
"\"main\n"
11320
"copy\" has been renamed to THIS or OTHER."
11321
msgstr ""
11322
11323
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11324
msgid ""
11325
"To resolve that kind of conflict, you should rebuild FILE from either "
11326
"version\n"
11327
"or a combination of both."
11328
msgstr ""
11329
11330
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11331
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11332
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11333
#: en/help_topics/conflict-types.txt:361
11334
msgid "``bzr resolve`` recognizes the following actions:"
11335
msgstr "«bzr resolve» reconoce las siguientes acciones:"
11336
11337
#: en/help_topics/conflict-types.txt:139
11338
msgid ""
11339
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11340
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11341
"* ``--action=done`` will just mark the conflict as resolved."
11342
msgstr ""
11343
11344
#: en/help_topics/conflict-types.txt:143
11345
msgid ""
11346
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11347
"and\n"
11348
"``.OTHER`` files if they are still present in the working tree."
11349
msgstr ""
11350
11351
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11352
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11353
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11354
#: en/help_topics/conflict-types.txt:369
11355
msgid ""
11356
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11357
msgstr ""
11358
"Bazaar no puede detectar automáticamente cuando se han resuelto conflictos "
11359
"de esta clase."
11360
11361
#: en/help_topics/conflict-types.txt:148
11362
msgid ""
11363
"Tag conflicts\n"
11364
"-------------"
11365
msgstr ""
11366
"Conflicto de etiquetas\n"
11367
"-----------------------------------"
11368
11369
#: en/help_topics/conflict-types.txt:153
11370
msgid ""
11371
" Conflicting tags:\n"
11372
" version-0.1"
11373
msgstr ""
11374
11375
#: en/help_topics/conflict-types.txt:156
11376
msgid ""
11377
"When pulling from or pushing to another branch, Bazaar informs you about "
11378
"tags\n"
11379
"that conflict between the two branches; that is the same tag points to two\n"
11380
"different revisions. You need not resolve these conflicts, but subsequent\n"
11381
"uses of pull or push will result in the same message."
11382
msgstr ""
11383
11384
#: en/help_topics/conflict-types.txt:161
11385
msgid ""
11386
"To resolve the conflict, you must apply the correct tags to either the "
11387
"target\n"
11388
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11389
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11390
"target branch's tags match the source branch, then in the target branch do\n"
11391
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11392
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11393
"source\n"
11394
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11395
"favor of the target branch, you need to similarly use ``tag --force`` in "
11396
"the\n"
11397
"source branch. (Note that pulling or pushing using --overwrite will "
11398
"overwrite\n"
11399
"all tags as well.)"
11400
msgstr ""
11401
11402
#: en/help_topics/conflict-types.txt:172
11403
msgid ""
11404
"Duplicate paths\n"
11405
"---------------"
11406
msgstr ""
11407
"Rutas duplicadas\n"
11408
"--------------------------"
11409
11410
#: en/help_topics/conflict-types.txt:177
11411
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11412
msgstr ""
11413
11414
#: en/help_topics/conflict-types.txt:179
11415
msgid ""
11416
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11417
"already been used. The existing file will be renamed to \"FILE.moved\". "
11418
msgstr ""
11419
11420
#: en/help_topics/conflict-types.txt:187
11421
msgid ""
11422
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11423
"FILE``,\n"
11424
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11425
"* ``--action=done`` will just mark the conflict as resolved."
11426
msgstr ""
11427
11428
#: en/help_topics/conflict-types.txt:191
11429
msgid ""
11430
"Note that you must get rid of FILE.moved before using ``--action=done``."
11431
msgstr ""
11432
11433
#: en/help_topics/conflict-types.txt:195
11434
msgid ""
11435
"Unversioned parent\n"
11436
"------------------"
11437
msgstr ""
11438
"Padre sin versión\n"
11439
"--------------------------"
11440
11441
#: en/help_topics/conflict-types.txt:200
11442
msgid ""
11443
" Conflict because FILE is not versioned, but has versioned children."
11444
msgstr ""
11445
11446
#: en/help_topics/conflict-types.txt:202
11447
msgid ""
11448
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11449
"not\n"
11450
"versioned. This happens when the directory has been deleted in the target,\n"
11451
"but has a new child in the source, or vice versa. In this situation, "
11452
"Bazaar\n"
11453
"will version the parent directory as well. Resolving this issue depends\n"
11454
"very much on the particular scenario. You may wish to rename or delete "
11455
"either\n"
11456
"the file or the directory. When you are satisfied, you can run \"bzr "
11457
"resolve\n"
11458
"FILE\" to mark the conflict as resolved."
11459
msgstr ""
11460
11461
#: en/help_topics/conflict-types.txt:210
11462
msgid ""
11463
"Missing parent\n"
11464
"--------------"
11465
msgstr ""
11466
"Falta el padre\n"
11467
"---------------------"
11468
11469
#: en/help_topics/conflict-types.txt:215
11470
msgid " Conflict adding files to FILE. Created directory."
11471
msgstr ""
11472
11473
#: en/help_topics/conflict-types.txt:217
11474
msgid ""
11475
"This happens when a directory has been deleted in the target, but has new\n"
11476
"children in the source. This is similar to the \"unversioned parent\" "
11477
"conflict,\n"
11478
"except that the parent directory does not *exist*, instead of just being\n"
11479
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11480
"Resolving this issue depends very much on the particular scenario."
11481
msgstr ""
11482
11483
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11484
msgid ""
11485
"To resolve that kind of conflict, you should either remove or rename the\n"
11486
"children or the directory or a combination of both."
11487
msgstr ""
11488
11489
#: en/help_topics/conflict-types.txt:228
11490
msgid ""
11491
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11492
" children,\n"
11493
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11494
"children\n"
11495
" and restoring the directory,\n"
11496
"* ``--action=done`` will just mark the conflict as resolved."
11497
msgstr ""
11498
11499
#: en/help_topics/conflict-types.txt:236
11500
msgid ""
11501
"Deleting parent\n"
11502
"---------------"
11503
msgstr ""
11504
"Eliminando padre\n"
11505
"---------------------------"
11506
11507
#: en/help_topics/conflict-types.txt:241
11508
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11509
msgstr ""
11510
11511
#: en/help_topics/conflict-types.txt:243
11512
msgid ""
11513
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11514
"source, but has new children in the target (either because a directory\n"
11515
"deletion is merged or because the merge introduce new children). Bazaar\n"
11516
"will retain the directory. Resolving this issue depends very much on the\n"
11517
"particular scenario."
11518
msgstr ""
11519
11520
#: en/help_topics/conflict-types.txt:254
11521
msgid ""
11522
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11523
"directory,"
11524
msgstr ""
11525
11526
#: en/help_topics/conflict-types.txt:256
11527
msgid ""
11528
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11529
" children,"
11530
msgstr ""
11531
11532
#: en/help_topics/conflict-types.txt:259
11533
msgid "* ``--action=done`` will just mark the conflict as resolved."
11534
msgstr ""
11535
11536
#: en/help_topics/conflict-types.txt:261
11537
msgid ""
11538
"Note that when merging a directory deletion, if unversioned files are\n"
11539
"present, they become potential orphans has they don't have a directory\n"
11540
"parent anymore."
11541
msgstr ""
11542
11543
#: en/help_topics/conflict-types.txt:265
11544
msgid ""
11545
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11546
"setting the ``bzr.transform.orphan_policy`` configuration option."
11547
msgstr ""
11548
11549
#: en/help_topics/conflict-types.txt:268
11550
msgid "There are two possible values for this option:"
11551
msgstr "Hay dos posibles valores para esta opción:"
11552
11553
#: en/help_topics/conflict-types.txt:270
11554
msgid ""
11555
"* ``conflict`` (the default): will leave the orphans in place and\n"
11556
" generate a conflicts,"
11557
msgstr ""
11558
11559
#: en/help_topics/conflict-types.txt:273
11560
msgid ""
11561
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11562
"root\n"
11563
" of the working tree with names like ``<file>.~#~``."
11564
msgstr ""
11565
11566
#: en/help_topics/conflict-types.txt:278
11567
msgid ""
11568
"Path conflict\n"
11569
"-------------"
11570
msgstr ""
11571
"Conflicto de ruta\n"
11572
"--------------------------"
11573
11574
#: en/help_topics/conflict-types.txt:283
11575
msgid " Path conflict: PATH1 / PATH2"
11576
msgstr ""
11577
11578
#: en/help_topics/conflict-types.txt:285
11579
msgid ""
11580
"This happens when the source and target have each modified the name or "
11581
"parent\n"
11582
"directory of a file. Bazaar will use the path elements from the source."
11583
msgstr ""
11584
11585
#: en/help_topics/conflict-types.txt:288
11586
msgid ""
11587
"To resolve that kind of conflict, you just have to decide what name should "
11588
"be\n"
11589
"retained for the file involved."
11590
msgstr ""
11591
11592
#: en/help_topics/conflict-types.txt:293
11593
msgid ""
11594
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11595
" issuing ``bzr mv PATH2 PATH1``,\n"
11596
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11597
"``PATH2``,\n"
11598
"* ``--action=done`` will just mark the conflict as resolved."
11599
msgstr ""
11600
11601
#: en/help_topics/conflict-types.txt:300
11602
msgid ""
11603
"Parent loop\n"
11604
"-----------"
11605
msgstr ""
11606
11607
#: en/help_topics/conflict-types.txt:305
11608
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11609
msgstr ""
11610
11611
#: en/help_topics/conflict-types.txt:307
11612
msgid ""
11613
"This happens when the source and the target have each moved directories, so\n"
11614
"that, if the change could be applied, a directory would be contained by "
11615
"itself.\n"
11616
"For example::"
11617
msgstr ""
11618
11619
#: en/help_topics/conflict-types.txt:311
11620
msgid ""
11621
" $ bzr init\n"
11622
" $ bzr mkdir white\n"
11623
" $ bzr mkdir black\n"
11624
" $ bzr commit -m \"BASE\"\n"
11625
" $ bzr branch . ../other\n"
11626
" $ bzr mv white black\n"
11627
" $ bzr commit -m \"THIS\"\n"
11628
" $ bzr mv ../other/black ../other/white\n"
11629
" $ bzr commit ../other -m \"OTHER\"\n"
11630
" $ bzr merge ../other"
11631
msgstr ""
11632
" $ bzr init\n"
11633
" $ bzr mkdir white\n"
11634
" $ bzr mkdir black\n"
11635
" $ bzr commit -m \"BASE\"\n"
11636
" $ bzr branch . ../other\n"
11637
" $ bzr mv white black\n"
11638
" $ bzr commit -m \"THIS\"\n"
11639
" $ bzr mv ../other/black ../other/white\n"
11640
" $ bzr commit ../other -m \"OTHER\"\n"
11641
" $ bzr merge ../other"
11642
11643
#: en/help_topics/conflict-types.txt:322
11644
msgid ""
11645
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11646
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11647
"name should be retained for the directories involved."
11648
msgstr ""
11649
11650
#: en/help_topics/conflict-types.txt:328
11651
msgid ""
11652
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11653
"\n"
11654
" in ``black``,\n"
11655
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11656
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11657
"* ``--action=done`` will just mark the conflict as resolved."
11658
msgstr ""
11659
11660
#: en/help_topics/conflict-types.txt:336
11661
msgid ""
11662
"Non-directory parent\n"
11663
"--------------------"
11664
msgstr ""
11665
11666
#: en/help_topics/conflict-types.txt:341
11667
msgid ""
11668
" Conflict: foo.new is not a directory, but has files in it.\n"
11669
" Created directory."
11670
msgstr ""
11671
11672
#: en/help_topics/conflict-types.txt:344
11673
msgid ""
11674
"This happens when one side has added files to a directory, and the other "
11675
"side\n"
11676
"has changed the directory into a file or symlink. For example::"
11677
msgstr ""
11678
11679
#: en/help_topics/conflict-types.txt:347
11680
msgid ""
11681
" $ bzr init\n"
11682
" $ bzr mkdir foo\n"
11683
" $ bzr commit -m \"BASE\"\n"
11684
" $ bzr branch . ../other\n"
11685
" $ rmdir foo\n"
11686
" $ touch foo\n"
11687
" $ bzr commit -m \"THIS\"\n"
11688
" $ bzr mkdir ../other/foo/bar\n"
11689
" $ bzr commit ../other -m \"OTHER\"\n"
11690
" $ bzr merge ../other"
11691
msgstr ""
11692
" $ bzr init\n"
11693
" $ bzr mkdir foo\n"
11694
" $ bzr commit -m \"BASE\"\n"
11695
" $ bzr branch . ../other\n"
11696
" $ rmdir foo\n"
11697
" $ touch foo\n"
11698
" $ bzr commit -m \"THIS\"\n"
11699
" $ bzr mkdir ../other/foo/bar\n"
11700
" $ bzr commit ../other -m \"OTHER\"\n"
11701
" $ bzr merge ../other"
11702
11703
#: en/help_topics/conflict-types.txt:358
11704
msgid ""
11705
"To resolve that kind of conflict, you have to decide what name should be\n"
11706
"retained for the file, directory or symlink involved."
11707
msgstr ""
11708
11709
#: en/help_topics/conflict-types.txt:363
11710
msgid ""
11711
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11712
" ``bzr add foo``,\n"
11713
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11714
" ``bzr mv foo.new foo``,\n"
11715
"* ``--action=done`` will just mark the conflict as resolved."
11716
msgstr ""
11717
11718
#: en/help_topics/conflict-types.txt:371
11719
msgid ""
11720
"MalformedTransform\n"
11721
"------------------"
11722
msgstr ""
11723
11724
#: en/help_topics/conflict-types.txt:374
11725
msgid ""
11726
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11727
"exception. This means that Bazaar encountered a filesystem conflict that it "
11728
"was\n"
11729
"unable to resolve. This usually indicates a bug. Please let us know if "
11730
"you\n"
11731
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11732
msgstr ""
11733
11734
#: en/help_topics/content-filters.txt:1
11735
msgid ""
11736
"Content Filters\n"
11737
"==============="
11738
msgstr ""
11739
11740
#: en/help_topics/content-filters.txt:4
11741
msgid ""
11742
"Content formats\n"
11743
"---------------"
11744
msgstr ""
11745
11746
#: en/help_topics/content-filters.txt:7
11747
msgid ""
11748
"Bazaar's content filtering allows you to store files in a different\n"
11749
"format from the copy in your working tree. This lets you, or your\n"
11750
"co-developers, use Windows development tools that expect CRLF files\n"
11751
"on projects that use other line-ending conventions. Among other things,\n"
11752
"content filters also let Unix developers more easily work on projects\n"
11753
"using Windows line-ending conventions, keyword expansion/compression,\n"
11754
"and trailing spaces on lines in text files to be implicitly stripped\n"
11755
"when committed."
11756
msgstr ""
11757
11758
#: en/help_topics/content-filters.txt:16
11759
msgid "To generalize, there are two content formats supported by Bazaar:"
11760
msgstr "Generalizando, hay dos formatos de contenido permitidos por Bazaar:"
11761
11762
#: en/help_topics/content-filters.txt:18
11763
msgid ""
11764
"* a canonical format - how files are stored internally\n"
11765
"* a convenience format - how files are created in a working tree."
11766
msgstr ""
11767
11768
#: en/help_topics/content-filters.txt:21
11769
msgid ""
11770
"\n"
11771
"Format conversion\n"
11772
"-----------------"
11773
msgstr ""
11774
"\n"
11775
"Conversión de formato\n"
11776
"------------------------------------"
11777
11778
#: en/help_topics/content-filters.txt:25
11779
msgid ""
11780
"The conversion between these formats is done by content filters.\n"
11781
"A content filter has two parts:"
11782
msgstr ""
11783
11784
#: en/help_topics/content-filters.txt:28
11785
msgid ""
11786
"* a read converter - converts from convenience to canonical format\n"
11787
"* a write converter - converts from canonical to convenience format."
11788
msgstr ""
11789
11790
#: en/help_topics/content-filters.txt:31
11791
msgid ""
11792
"Many of these converters will provide *round-trip* conversion,\n"
11793
"i.e. applying the read converter followed by the write converter\n"
11794
"gives back the original content. However, others may provide an\n"
11795
"asymmetric conversion. For example, a read converter might strip\n"
11796
"trailing whitespace off lines in source code while the matching\n"
11797
"write converter might pass content through unchanged."
11798
msgstr ""
11799
11800
#: en/help_topics/content-filters.txt:38
11801
msgid ""
11802
"\n"
11803
"Enabling content filters\n"
11804
"------------------------"
11805
msgstr ""
11806
"\n"
11807
"Activar filtros de contenido\n"
11808
"--------------------------------------------"
11809
11810
#: en/help_topics/content-filters.txt:42
11811
msgid ""
11812
"Content filters are typically provided by plugins, so the first step\n"
11813
"in using them is to install the relevant plugins and read their\n"
11814
"documentation. Some plugins may be very specific about which files\n"
11815
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11816
"In other cases, the plugin may leave it in the user's hands to\n"
11817
"define which files are to be filtered. This is typically done\n"
11818
"using rule-based preferences. See ``bzr help rules`` for general\n"
11819
"information about defining these."
11820
msgstr ""
11821
11822
#: en/help_topics/content-filters.txt:51
11823
msgid ""
11824
"\n"
11825
"Impact on commands\n"
11826
"------------------"
11827
msgstr ""
11828
"\n"
11829
"Impacto en las órdenes\n"
11830
"------------------------------------"
11831
11832
#: en/help_topics/content-filters.txt:55
11833
msgid ""
11834
"Read converters are only applied to commands that read content from\n"
11835
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11836
"will apply read converters to files in the working tree, then compare\n"
11837
"the results to the content last committed."
11838
msgstr ""
11839
11840
#: en/help_topics/content-filters.txt:60
11841
msgid ""
11842
"Write converters are only applied by commands that **create files in a\n"
11843
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11844
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11845
"respectively."
11846
msgstr ""
11847
11848
#: en/help_topics/content-filters.txt:65
11849
msgid ""
11850
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11851
"comitting files. If this makes sense for a given plugin providing\n"
11852
"a content filter, the plugin can usually achieve this effect by using a\n"
11853
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11854
"for more information on hooks."
11855
msgstr ""
11856
11857
#: en/help_topics/content-filters.txt:71
11858
msgid ""
11859
"\n"
11860
"Refreshing your working tree\n"
11861
"----------------------------"
11862
msgstr ""
11863
"\n"
11864
"Actualizar su árbol de trabajo\n"
11865
"----------------------------------------------"
11866
11867
#: en/help_topics/content-filters.txt:75
11868
msgid ""
11869
"For performance reasons, Bazaar caches the timestamps of files in\n"
11870
"a working tree, and assumes files are unchanged if their timestamps\n"
11871
"match the cached values. As a consequence, there are times when\n"
11872
"you may need to explicitly ask for content filtering to be reapplied\n"
11873
"in one or both directions, e.g. after installing or reconfiguring\n"
11874
"plugins providing it."
11875
msgstr ""
11876
11877
#: en/help_topics/content-filters.txt:82
11878
msgid "Here are some general guidelines for doing this:"
11879
msgstr "Aquí hay algunas directrices para hacer esto:"
11880
11881
#: en/help_topics/content-filters.txt:84
11882
msgid ""
11883
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11884
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11885
" relevant read converters and compare the end result with the\n"
11886
" canonical format."
11887
msgstr ""
11888
11889
#: en/help_topics/content-filters.txt:89
11890
msgid ""
11891
" * To reapply write converters, ensure there are no local changes,\n"
11892
" delete the relevant files and run ``bzr revert`` on those files."
11893
msgstr ""
11894
11895
#: en/help_topics/content-filters.txt:92
11896
msgid ""
11897
"Note: In the future, it is likely that additional options will be added\n"
11898
"to commands to make this refreshing process faster and safer.\n"
11899
msgstr ""
11900
11901
#: en/help_topics/current-formats.txt:1
11902
msgid "Current Storage Formats"
11903
msgstr "Formatos de almacenamiento actual"
11904
11905
#: en/help_topics/current-formats.txt:3
11906
msgid ""
11907
":2a:\n"
11908
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11909
" compress storage. Provides rich roots which are a one-way\n"
11910
" transition."
11911
msgstr ""
11912
11913
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11914
msgid ""
11915
"\n"
11916
"See :doc:`formats-help` for more about storage formats."
11917
msgstr ""
11918
11919
#: en/help_topics/debug-flags.txt:1
11920
msgid ""
11921
"Debug Flags\n"
11922
"==========="
11923
msgstr ""
11924
"Marcas de depuración\n"
11925
"================="
11926
11927
#: en/help_topics/debug-flags.txt:4
11928
msgid ""
11929
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11930
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11931
msgstr ""
11932
11933
#: en/help_topics/debug-flags.txt:7
11934
msgid ""
11935
"-Dauth Trace authentication sections used.\n"
11936
"-Dbytes Print out how many bytes were transferred\n"
11937
"-Ddirstate Trace dirstate activity (verbose!)\n"
11938
"-Derror Instead of normal error handling, always print a "
11939
"traceback\n"
11940
" on error.\n"
11941
"-Devil Capture call sites that do expensive or badly-scaling\n"
11942
" operations.\n"
11943
"-Dfetch Trace history copying between repositories.\n"
11944
"-Dfilters Emit information for debugging content filtering.\n"
11945
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11946
"fetch.\n"
11947
"-Dgraph Trace graph traversal.\n"
11948
"-Dhashcache Log every time a working file is read to determine its "
11949
"hash.\n"
11950
"-Dhooks Trace hook execution.\n"
11951
"-Dhpss Trace smart protocol requests and responses.\n"
11952
"-Dhpssdetail More hpss details.\n"
11953
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11954
"-Dhttp Trace http connections, requests and responses.\n"
11955
"-Dindex Trace major index operations.\n"
11956
"-Dknit Trace knit operations.\n"
11957
"-Dlock Trace when lockdir locks are taken or released.\n"
11958
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11959
" retrying the request.\n"
11960
"-Dprogress Trace progress bar operations.\n"
11961
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11962
"-Dmerge Emit information for debugging merges.\n"
11963
"-Dno_apport Don't use apport to report crashes.\n"
11964
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11965
"-Dpack Emit information about pack operations.\n"
11966
"-Drelock Emit a message every time a branch or repository object "
11967
"is\n"
11968
" unlocked then relocked the same way.\n"
11969
"-Dsftp Trace SFTP internals.\n"
11970
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11971
"expected\n"
11972
"-Dstream Trace fetch streams.\n"
11973
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11974
"portable\n"
11975
" manner.\n"
11976
"-Dunlock Some errors during unlock are treated as warnings.\n"
11977
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11978
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11979
"appropriate\n"
11980
" for the format, even for non-local fetches.\n"
11981
msgstr ""
11982
11983
#: en/help_topics/diverged-branches.txt:1
11984
msgid ""
11985
"Diverged Branches\n"
11986
"================="
11987
msgstr ""
11988
"Ramas con divergencia\n"
11989
"=================="
11990
11991
#: en/help_topics/diverged-branches.txt:4
11992
msgid ""
11993
"When Bazaar tries to push one branch onto another, it requires that the\n"
11994
"destination branch must be ready to receive the source branch. If this "
11995
"isn't\n"
11996
"the case, then we say that the branches have ``diverged``. Branches are\n"
11997
"considered diverged if the destination branch's most recent commit is one "
11998
"that\n"
11999
"has not been merged (directly or indirectly) by the source branch. To "
12000
"recover\n"
12001
"from diverged branches, one must merge the missing revisions into the "
12002
"source\n"
12003
"branch."
12004
msgstr ""
12005
12006
#: en/help_topics/diverged-branches.txt:12
12007
msgid ""
12008
"This situation commonly arises when using a centralized workflow with local\n"
12009
"commits. If someone else has committed new work to the mainline since your\n"
12010
"last pull and you have local commits that have not yet been pushed to the\n"
12011
"mainline, then your local branch and the mainline have diverged."
12012
msgstr ""
12013
12014
#: en/help_topics/diverged-branches.txt:17
12015
msgid ""
12016
"Discovering What Has Diverged\n"
12017
"-----------------------------"
12018
msgstr ""
12019
12020
#: en/help_topics/diverged-branches.txt:20
12021
msgid ""
12022
"The ``bzr missing`` command is used to find out what revisions are in "
12023
"another\n"
12024
"branch that are not present in the current branch, and vice-versa. It shows "
12025
"a\n"
12026
"summary of which extra revisions exist in each branch. If you want to see "
12027
"the\n"
12028
"precise effects of those revisions, you can use ``bzr diff --"
12029
"old=other_branch``\n"
12030
"to show the differences between other_branch and your current branch."
12031
msgstr ""
12032
12033
#: en/help_topics/diverged-branches.txt:26
12034
msgid ""
12035
"A Solution\n"
12036
"----------"
12037
msgstr ""
12038
"Una solución\n"
12039
"------------"
12040
12041
#: en/help_topics/diverged-branches.txt:29
12042
msgid ""
12043
"The solution is to merge the revisions from the mainline into your local\n"
12044
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
12045
"mainline. This merge may result in conflicts if the other developer's "
12046
"changes\n"
12047
"overlap with your changes. These conflicts should be resolved before\n"
12048
"continuing. After any conflicts have been resolved, or even if there were "
12049
"no\n"
12050
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
12051
"to your local branch. This requirement gives you an opportunity to test "
12052
"the\n"
12053
"resulting working tree for correctness, since the merged revisions could "
12054
"have\n"
12055
"made arbitrary changes. After testing, you should commit the merge using\n"
12056
"``bzr commit``. This clears up the diverged branches situation. Your "
12057
"local\n"
12058
"branch can now be pushed to the mainline.\n"
12059
msgstr ""
12060
12061
#: en/help_topics/eol.txt:1
12062
msgid ""
12063
"End of Line Conversion\n"
12064
"======================"
12065
msgstr ""
12066
"Conversión de fin de línea\n"
12067
"====================="
12068
12069
#: en/help_topics/eol.txt:4
12070
msgid ""
12071
"EOL conversion is provided as a content filter where Bazaar internally\n"
12072
"stores a canonical format but outputs a convenience format. See\n"
12073
"``bzr help content-filters`` for general information about using these."
12074
msgstr ""
12075
12076
#: en/help_topics/eol.txt:8
12077
msgid ""
12078
"Note: Content filtering is only supported in recently added formats,\n"
12079
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12080
"in a recent format. (Just setting the format on the repository\n"
12081
"is not enough.) If content filtering does not appear to be working, use\n"
12082
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
12083
"or later."
12084
msgstr ""
12085
12086
#: en/help_topics/eol.txt:15
12087
msgid ""
12088
"EOL conversion needs to be enabled for selected file patterns using\n"
12089
"rules. See ``bzr help rules`` for general information on defining rules.\n"
12090
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
12091
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
12092
"supported in a future verison of Bazaar."
12093
msgstr ""
12094
12095
#: en/help_topics/eol.txt:21
12096
msgid ""
12097
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12098
"(If a value is not set, ``exact`` is the default.)"
12099
msgstr ""
12100
12101
#: en/help_topics/eol.txt:24
12102
msgid ""
12103
" ========== ===================================== ======================\n"
12104
" Value Checkout end-of-lines as Commit end-of-lines as\n"
12105
" ========== ===================================== ======================\n"
12106
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12107
" ---------- ------------------------------------- ----------------------\n"
12108
" ``lf`` ``lf`` ``lf``\n"
12109
" ---------- ------------------------------------- ----------------------\n"
12110
" ``crlf`` ``crlf`` ``lf``\n"
12111
" ---------- ------------------------------------- ----------------------\n"
12112
" ``exact`` No conversion Exactly as in file\n"
12113
" ========== ===================================== ======================"
12114
msgstr ""
12115
12116
#: en/help_topics/eol.txt:36
12117
msgid ""
12118
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12119
"byte is detected in the file."
12120
msgstr ""
12121
12122
#: en/help_topics/eol.txt:39
12123
msgid ""
12124
"For users working on a cross-platform project, here is a suggested rule\n"
12125
"to use as a starting point::"
12126
msgstr ""
12127
12128
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12129
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12130
msgid ""
12131
" [name *]\n"
12132
" eol = native"
12133
msgstr ""
12134
12135
#: en/help_topics/eol.txt:45
12136
msgid ""
12137
"If you have binary files that do not contain a null byte though, be\n"
12138
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12139
"by giving more explicit patterns earlier in the rules file. For example::"
12140
msgstr ""
12141
12142
#: en/help_topics/eol.txt:49
12143
msgid ""
12144
" [name *.png]\n"
12145
" eol = exact"
12146
msgstr ""
12147
12148
#: en/help_topics/eol.txt:55
12149
msgid ""
12150
"If your working tree is on a network drive shared by users on different\n"
12151
"operating systems, you typically want to force certain conventions for\n"
12152
"certain files. In that way, if a file is created with the wrong line\n"
12153
"endings or line endings get mixed during editing, it gets committed\n"
12154
"correctly and gets checked out correctly. For example::"
12155
msgstr ""
12156
12157
#: en/help_topics/eol.txt:61
12158
msgid ""
12159
" [name *.bat]\n"
12160
" eol = crlf"
12161
msgstr ""
12162
12163
#: en/help_topics/eol.txt:64
12164
msgid ""
12165
" [name *.sh]\n"
12166
" eol = lf"
12167
msgstr ""
12168
12169
#: en/help_topics/eol.txt:70
12170
msgid ""
12171
"If you take the care to create files with their required endings, you can\n"
12172
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12173
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12174
"introducing mixed line endings will be corrected during commit for files\n"
12175
"with those settings."
12176
msgstr ""
12177
12178
#: en/help_topics/eol.txt:76
12179
msgid ""
12180
"If you have sample test data that deliberately has text files with mixed\n"
12181
"newline conventions, you can ask for those to be left alone like this::"
12182
msgstr ""
12183
12184
#: en/help_topics/eol.txt:79
12185
msgid ""
12186
" [name test_data/]\n"
12187
" eol = exact"
12188
msgstr ""
12189
12190
#: en/help_topics/eol.txt:85
12191
msgid ""
12192
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12193
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12194
"of content analysis to detect binary files for commands like ``diff``.\n"
12195
"In the future, a ``binary = true`` rule may be added but it is not\n"
12196
"supported yet.)"
12197
msgstr ""
12198
12199
#: en/help_topics/eol.txt:91
12200
msgid ""
12201
"If you have an existing repository with text files already stored using\n"
12202
"Windows newline conventions (``crlf``), then you may want to keep using "
12203
"that\n"
12204
"convention in the repository. Forcing certain files to this convention\n"
12205
"may also help users who do not have rules configured. To do this, set\n"
12206
"``eol`` to one of the values below."
12207
msgstr ""
12208
12209
#: en/help_topics/eol.txt:97
12210
msgid ""
12211
" ============================ ======================== "
12212
"======================\n"
12213
" Value Checkout end-of-lines as Commit end-of-lines "
12214
"as\n"
12215
" ============================ ======================== "
12216
"======================\n"
12217
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12218
" ``lf`` otherwise\n"
12219
" ---------------------------- ------------------------ ----------------------"
12220
"\n"
12221
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12222
" ---------------------------- ------------------------ ----------------------"
12223
"\n"
12224
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12225
" ============================ ======================== ======================"
12226
msgstr ""
12227
12228
#: en/help_topics/eol.txt:108
12229
msgid ""
12230
"For users working on an existing project that uses Windows newline\n"
12231
"conventions in their Bazaar repository, this rule is suggested as a\n"
12232
"starting point::"
12233
msgstr ""
12234
12235
#: en/help_topics/eol.txt:112
12236
msgid ""
12237
" [name *]\n"
12238
" eol = native-with-crlf-in-repo"
12239
msgstr ""
12240
12241
#: en/help_topics/eol.txt:115
12242
msgid ""
12243
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12244
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12245
"``crlf`` and ``exact``."
12246
msgstr ""
12247
12248
#: en/help_topics/eol.txt:119
12249
msgid ""
12250
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12251
"never reject files because a given line ending or mixed line endings\n"
12252
"are found. A precommit hook should be used if you wish to validate\n"
12253
"(and not just convert) content before committing.\n"
12254
msgstr ""
12255
12256
#: en/help_topics/hidden-commands.txt:1
12257
msgid ""
12258
"added List files added in working tree.\n"
12259
"ancestry List all revisions merged into this branch.\n"
12260
"assert-fail Test reporting of assertion failures\n"
12261
"bundle-info Output interesting stats about a bundle\n"
12262
"bundle-revisions Create a merge-directive for submitting changes.\n"
12263
"cat-revision Write out metadata for a revision.\n"
12264
"dump-btree Dump the contents of a btree index file to stdout.\n"
12265
"export-pot Export command helps and error messages in po format.\n"
12266
"file-id Print file_id of a particular file or directory.\n"
12267
"file-path Print path of file_ids to a file or directory.\n"
12268
"find-merge-base Find and print a base revision for merging two "
12269
"branches.\n"
12270
"hooks Show hooks.\n"
12271
"inventory Show inventory of the current working copy or a "
12272
"revision.\n"
12273
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12274
"lookup-revision Lookup the revision-id from a revision-number\n"
12275
"merge-directive Generate a merge directive for auto-merge tools.\n"
12276
"modified List files modified in working tree.\n"
12277
"re-sign Create a digital signature for an existing revision.\n"
12278
"reference list, view and set branch locations for nested trees.\n"
12279
"relpath Show path of a file relative to root\n"
12280
"repair-workingtree Reset the working tree state file.\n"
12281
"revision-history Display the list of revision ids on a branch.\n"
12282
"revision-info Show revision number and revision id for a given "
12283
"revision\n"
12284
" identifier.\n"
12285
"rocks Statement of optimism.\n"
12286
"selftest Run internal test suite.\n"
12287
"shell-complete Show appropriate completions for context.\n"
12288
"test-script Run a shell-like test from a file.\n"
12289
"touching-revisions Return revision-ids which affected a particular file.\n"
12290
"unknowns List unknown files.\n"
12291
"wait-until-signalled Test helper for\n"
12292
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:1
12296
msgid ""
12297
"\n"
12298
"Hooks\n"
12299
"====="
12300
msgstr ""
12301
"\n"
12302
"Ganchos\n"
12303
"======="
12304
12305
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12306
msgid ""
12307
"Introduction\n"
12308
"------------"
12309
msgstr ""
12310
"Introducción\n"
12311
"------------"
12312
12313
#: en/help_topics/hooks.txt:8
12314
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:10
12318
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:12
12322
msgid ""
12323
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12324
msgstr ""
12325
12326
#: en/help_topics/hooks.txt:14
12327
msgid ""
12328
"The class that contains each hook is given before the hooks it supplies. "
12329
"For\n"
12330
"instance, BranchHooks as the class is the hooks class for\n"
12331
"`bzrlib.branch.Branch.hooks`."
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:18
12335
msgid ""
12336
"Each description also indicates whether the hook runs on the client (the\n"
12337
"machine where bzr was invoked) or the server (the machine addressed by\n"
12338
"the branch URL). These may be, but are not necessarily, the same machine."
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:22
12342
msgid ""
12343
"Plugins (including hooks) are run on the server if all of these is true:"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:24
12347
msgid ""
12348
" * The connection is via a smart server (accessed with a URL starting with\n"
12349
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12350
"\"http://\"\n"
12351
" URL when a smart server is available via HTTP)."
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:28
12355
msgid ""
12356
" * The hook is either server specific or part of general infrastructure "
12357
"rather\n"
12358
" than client specific code (such as commit)."
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:31
12362
msgid ""
12363
"\n"
12364
"BranchHooks\n"
12365
"-----------"
12366
msgstr ""
12367
"\n"
12368
"BranchHooks\n"
12369
"-----------"
12370
12371
#: en/help_topics/hooks.txt:35
12372
msgid ""
12373
"automatic_tag_name\n"
12374
"~~~~~~~~~~~~~~~~~~"
12375
msgstr ""
12376
"automatic_tag_name\n"
12377
"~~~~~~~~~~~~~~~~~~"
12378
12379
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12380
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12381
msgid "Introduced in: 2.2"
12382
msgstr "Introducido en: 2.2"
12383
12384
#: en/help_topics/hooks.txt:40
12385
msgid ""
12386
"Called to determine an automatic tag name for a revision.\n"
12387
"automatic_tag_name is called with (branch, revision_id) and should\n"
12388
"return a tag name or None if no tag name could be determined. The\n"
12389
"first non-None tag name returned will be used."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:45
12393
msgid ""
12394
"open\n"
12395
"~~~~"
12396
msgstr ""
12397
"open\n"
12398
"~~~~"
12399
12400
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12401
#: en/help_topics/hooks.txt:304
12402
msgid "Introduced in: 1.8"
12403
msgstr "Introducido en: 1.8"
12404
12405
#: en/help_topics/hooks.txt:50
12406
msgid ""
12407
"Called with the Branch object that has been opened after a branch is\n"
12408
"opened."
12409
msgstr ""
12410
12411
#: en/help_topics/hooks.txt:53
12412
msgid ""
12413
"post_branch_init\n"
12414
"~~~~~~~~~~~~~~~~"
12415
msgstr ""
12416
"post_branch_init\n"
12417
"~~~~~~~~~~~~~~~~"
12418
12419
#: en/help_topics/hooks.txt:58
12420
msgid ""
12421
"Called after new branch initialization completes. post_branch_init is\n"
12422
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12423
"branch and checkout (both heavyweight and lightweight) will all\n"
12424
"trigger this hook."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:63
12428
msgid ""
12429
"post_change_branch_tip\n"
12430
"~~~~~~~~~~~~~~~~~~~~~~"
12431
msgstr ""
12432
"post_change_branch_tip\n"
12433
"~~~~~~~~~~~~~~~~~~~~~~"
12434
12435
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12436
msgid "Introduced in: 1.4"
12437
msgstr "Introducido en: 1.4"
12438
12439
#: en/help_topics/hooks.txt:68
12440
msgid ""
12441
"Called in bzr client and server after a change to the tip of a branch\n"
12442
"is made. post_change_branch_tip is called with a\n"
12443
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12444
"uncommit will all trigger this hook."
12445
msgstr ""
12446
12447
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12448
msgid ""
12449
"post_commit\n"
12450
"~~~~~~~~~~~"
12451
msgstr ""
12452
"post_commit\n"
12453
"~~~~~~~~~~~"
12454
12455
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12456
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12457
#: en/help_topics/hooks.txt:145
12458
msgid "Introduced in: 0.15"
12459
msgstr "Introducido en: 0.15"
12460
12461
#: en/help_topics/hooks.txt:78
12462
msgid ""
12463
"Called in the bzr client after a commit has completed. post_commit is\n"
12464
"called with (local, master, old_revno, old_revid, new_revno,\n"
12465
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12466
"branch."
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:83
12470
msgid ""
12471
"post_pull\n"
12472
"~~~~~~~~~"
12473
msgstr ""
12474
"post_pull\n"
12475
"~~~~~~~~~"
12476
12477
#: en/help_topics/hooks.txt:88
12478
msgid ""
12479
"Called after a pull operation completes. post_pull is called with a\n"
12480
"bzrlib.branch.PullResult object and only runs in the bzr client."
12481
msgstr ""
12482
12483
#: en/help_topics/hooks.txt:91
12484
msgid ""
12485
"post_push\n"
12486
"~~~~~~~~~"
12487
msgstr ""
12488
"post_push\n"
12489
"~~~~~~~~~"
12490
12491
#: en/help_topics/hooks.txt:96
12492
msgid ""
12493
"Called after a push operation completes. post_push is called with a\n"
12494
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:99
12498
msgid ""
12499
"post_switch\n"
12500
"~~~~~~~~~~~"
12501
msgstr ""
12502
"post_switch\n"
12503
"~~~~~~~~~~~"
12504
12505
#: en/help_topics/hooks.txt:104
12506
msgid ""
12507
"Called after a checkout switches branch. post_switch is called with a\n"
12508
"bzrlib.branch.SwitchHookParams."
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:107
12512
msgid ""
12513
"post_uncommit\n"
12514
"~~~~~~~~~~~~~"
12515
msgstr ""
12516
"post_uncommit\n"
12517
"~~~~~~~~~~~~~"
12518
12519
#: en/help_topics/hooks.txt:112
12520
msgid ""
12521
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12522
"called with (local, master, old_revno, old_revid, new_revno,\n"
12523
"new_revid) where local is the local branch or None, master is the\n"
12524
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12525
"of None."
12526
msgstr ""
12527
12528
#: en/help_topics/hooks.txt:118
12529
msgid ""
12530
"pre_change_branch_tip\n"
12531
"~~~~~~~~~~~~~~~~~~~~~"
12532
msgstr ""
12533
"pre_change_branch_tip\n"
12534
"~~~~~~~~~~~~~~~~~~~~~"
12535
12536
#: en/help_topics/hooks.txt:121
12537
msgid "Introduced in: 1.6"
12538
msgstr "Introducido en: 1.6"
12539
12540
#: en/help_topics/hooks.txt:123
12541
msgid ""
12542
"Called in bzr client and server before a change to the tip of a branch\n"
12543
"is made. pre_change_branch_tip is called with a\n"
12544
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12545
"uncommit will all trigger this hook."
12546
msgstr ""
12547
12548
#: en/help_topics/hooks.txt:128
12549
msgid ""
12550
"pre_commit\n"
12551
"~~~~~~~~~~"
12552
msgstr ""
12553
"pre_commit\n"
12554
"~~~~~~~~~~"
12555
12556
#: en/help_topics/hooks.txt:131
12557
msgid "Introduced in: 0.91"
12558
msgstr "Introducido en: 0.91"
12559
12560
#: en/help_topics/hooks.txt:133
12561
msgid ""
12562
"Called after a commit is calculated but before it is completed.\n"
12563
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12564
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12565
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12566
"TreeDelta object describing changes from the basis revision. hooks\n"
12567
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12568
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12569
"tree."
12570
msgstr ""
12571
12572
#: en/help_topics/hooks.txt:142
12573
msgid ""
12574
"set_rh\n"
12575
"~~~~~~"
12576
msgstr ""
12577
"set_rh\n"
12578
"~~~~~~"
12579
12580
#: en/help_topics/hooks.txt:147
12581
msgid ""
12582
"Invoked whenever the revision history has been set via\n"
12583
"set_revision_history. The api signature is (branch, revision_history),\n"
12584
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12585
"for bzr to trigger, a better hook to use is\n"
12586
"Branch.post_change_branch_tip."
12587
msgstr ""
12588
12589
#: en/help_topics/hooks.txt:153
12590
msgid ""
12591
"transform_fallback_location\n"
12592
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12593
msgstr ""
12594
"transform_fallback_location\n"
12595
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12596
12597
#: en/help_topics/hooks.txt:156
12598
msgid "Introduced in: 1.9"
12599
msgstr "Introducido en: 1.9"
12600
12601
#: en/help_topics/hooks.txt:158
12602
msgid ""
12603
"Called when a stacked branch is activating its fallback locations.\n"
12604
"transform_fallback_location is called with (branch, url), and should\n"
12605
"return a new url. Returning the same url allows it to be used as-is,\n"
12606
"returning a different one can be used to cause the branch to stack on\n"
12607
"a closer copy of that fallback_location. Note that the branch cannot\n"
12608
"have history accessing methods called on it during this hook because\n"
12609
"the fallback locations have not been activated. When there are\n"
12610
"multiple hooks installed for transform_fallback_location, all are\n"
12611
"called with the url returned from the previous hook.The order is\n"
12612
"however undefined."
12613
msgstr ""
12614
12615
#: en/help_topics/hooks.txt:169
12616
msgid ""
12617
"CommandHooks\n"
12618
"------------"
12619
msgstr ""
12620
"CommandHooks\n"
12621
"------------"
12622
12623
#: en/help_topics/hooks.txt:172
12624
msgid ""
12625
"extend_command\n"
12626
"~~~~~~~~~~~~~~"
12627
msgstr ""
12628
"extend_command\n"
12629
"~~~~~~~~~~~~~~"
12630
12631
#: en/help_topics/hooks.txt:175
12632
msgid "Introduced in: 1.13"
12633
msgstr "Introducido en: 1.13"
12634
12635
#: en/help_topics/hooks.txt:177
12636
msgid ""
12637
"Called after creating a command object to allow modifications such as\n"
12638
"adding or removing options, docs etc. Called with the new\n"
12639
"bzrlib.commands.Command object."
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:181
12643
msgid ""
12644
"get_command\n"
12645
"~~~~~~~~~~~"
12646
msgstr ""
12647
"get_command\n"
12648
"~~~~~~~~~~~"
12649
12650
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12651
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12652
msgid "Introduced in: 1.17"
12653
msgstr "Introducido en: 1.17"
12654
12655
#: en/help_topics/hooks.txt:186
12656
msgid ""
12657
"Called when creating a single command. Called with (cmd_or_None,\n"
12658
"command_name). get_command should either return the cmd_or_None\n"
12659
"parameter, or a replacement Command object that should be used for the\n"
12660
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12661
"Many users will prefer to use bzrlib.commands.register_command or\n"
12662
"plugin_cmds.register_lazy."
12663
msgstr ""
12664
12665
#: en/help_topics/hooks.txt:193
12666
msgid ""
12667
"get_missing_command\n"
12668
"~~~~~~~~~~~~~~~~~~~"
12669
msgstr ""
12670
"get_missing_command\n"
12671
"~~~~~~~~~~~~~~~~~~~"
12672
12673
#: en/help_topics/hooks.txt:198
12674
msgid ""
12675
"Called when creating a single command if no command could be found.\n"
12676
"Called with (command_name). get_missing_command should either return\n"
12677
"None, or a Command object to be used for the command."
12678
msgstr ""
12679
12680
#: en/help_topics/hooks.txt:202
12681
msgid ""
12682
"list_commands\n"
12683
"~~~~~~~~~~~~~"
12684
msgstr ""
12685
"list_commands\n"
12686
"~~~~~~~~~~~~~"
12687
12688
#: en/help_topics/hooks.txt:207
12689
msgid ""
12690
"Called when enumerating commands. Called with a set of cmd_name\n"
12691
"strings for all the commands found so far. This set is safe to mutate\n"
12692
"- e.g. to remove a command. list_commands should return the updated\n"
12693
"set of command names."
12694
msgstr ""
12695
12696
#: en/help_topics/hooks.txt:212
12697
msgid ""
12698
"_ConfigHooks\n"
12699
"------------"
12700
msgstr ""
12701
"_ConfigHooks\n"
12702
"------------"
12703
12704
#: en/help_topics/hooks.txt:215
12705
msgid ""
12706
"get\n"
12707
"~~~"
12708
msgstr ""
12709
"get\n"
12710
"~~~"
12711
12712
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12713
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12714
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12715
#: en/help_topics/hooks.txt:443
12716
msgid "Introduced in: 2.4"
12717
msgstr "Introducido en: 2.4"
12718
12719
#: en/help_topics/hooks.txt:220
12720
msgid ""
12721
"Invoked when a config option is read. The signature is (stack, name,\n"
12722
"value)."
12723
msgstr ""
12724
12725
#: en/help_topics/hooks.txt:223
12726
msgid ""
12727
"load\n"
12728
"~~~~"
12729
msgstr ""
12730
"load\n"
12731
"~~~~"
12732
12733
#: en/help_topics/hooks.txt:228
12734
msgid "Invoked when a config store is loaded. The signature is (store)."
12735
msgstr ""
12736
12737
#: en/help_topics/hooks.txt:230
12738
msgid ""
12739
"remove\n"
12740
"~~~~~~"
12741
msgstr ""
12742
"remove\n"
12743
"~~~~~~"
12744
12745
#: en/help_topics/hooks.txt:235
12746
msgid ""
12747
"Invoked when a config option is removed. The signature is (stack,\n"
12748
"name)."
12749
msgstr ""
12750
12751
#: en/help_topics/hooks.txt:238
12752
msgid ""
12753
"save\n"
12754
"~~~~"
12755
msgstr ""
12756
"save\n"
12757
"~~~~"
12758
12759
#: en/help_topics/hooks.txt:243
12760
msgid "Invoked when a config store is saved. The signature is (store)."
12761
msgstr ""
12762
12763
#: en/help_topics/hooks.txt:245
12764
msgid ""
12765
"set\n"
12766
"~~~"
12767
msgstr ""
12768
"set\n"
12769
"~~~"
12770
12771
#: en/help_topics/hooks.txt:250
12772
msgid ""
12773
"Invoked when a config option is set. The signature is (stack, name,\n"
12774
"value)."
12775
msgstr ""
12776
12777
#: en/help_topics/hooks.txt:253
12778
msgid ""
12779
"ControlDirHooks\n"
12780
"---------------"
12781
msgstr ""
12782
12783
#: en/help_topics/hooks.txt:256
12784
msgid ""
12785
"post_repo_init\n"
12786
"~~~~~~~~~~~~~~"
12787
msgstr ""
12788
"post_repo_init\n"
12789
"~~~~~~~~~~~~~~"
12790
12791
#: en/help_topics/hooks.txt:261
12792
msgid ""
12793
"Invoked after a repository has been initialized. post_repo_init is\n"
12794
"called with a bzrlib.controldir.RepoInitHookParams."
12795
msgstr ""
12796
12797
#: en/help_topics/hooks.txt:264
12798
msgid ""
12799
"pre_open\n"
12800
"~~~~~~~~"
12801
msgstr ""
12802
"pre_open\n"
12803
"~~~~~~~~"
12804
12805
#: en/help_topics/hooks.txt:267
12806
msgid "Introduced in: 1.14"
12807
msgstr "Introducido en: 1.14"
12808
12809
#: en/help_topics/hooks.txt:269
12810
msgid ""
12811
"Invoked before attempting to open a ControlDir with the transport that\n"
12812
"the open will use."
12813
msgstr ""
12814
12815
#: en/help_topics/hooks.txt:272
12816
msgid ""
12817
"InfoHooks\n"
12818
"---------"
12819
msgstr ""
12820
"InfoHooks\n"
12821
"---------"
12822
12823
#: en/help_topics/hooks.txt:275
12824
msgid ""
12825
"repository\n"
12826
"~~~~~~~~~~"
12827
msgstr ""
12828
"repository\n"
12829
"~~~~~~~~~~"
12830
12831
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12832
#: en/help_topics/hooks.txt:521
12833
msgid "Introduced in: 1.15"
12834
msgstr "Introducido en: 1.15"
12835
12836
#: en/help_topics/hooks.txt:280
12837
msgid ""
12838
"Invoked when displaying the statistics for a repository. repository is\n"
12839
"called with a statistics dictionary as returned by the repository and\n"
12840
"a file-like object to write to."
12841
msgstr ""
12842
12843
#: en/help_topics/hooks.txt:284
12844
msgid ""
12845
"LockHooks\n"
12846
"---------"
12847
msgstr ""
12848
"LockHooks\n"
12849
"---------"
12850
12851
#: en/help_topics/hooks.txt:287
12852
msgid ""
12853
"lock_acquired\n"
12854
"~~~~~~~~~~~~~"
12855
msgstr ""
12856
"lock_acquired\n"
12857
"~~~~~~~~~~~~~"
12858
12859
#: en/help_topics/hooks.txt:292
12860
msgid ""
12861
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12862
msgstr ""
12863
12864
#: en/help_topics/hooks.txt:294
12865
msgid ""
12866
"lock_broken\n"
12867
"~~~~~~~~~~~"
12868
msgstr ""
12869
"lock_broken\n"
12870
"~~~~~~~~~~~"
12871
12872
#: en/help_topics/hooks.txt:299
12873
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12874
msgstr ""
12875
12876
#: en/help_topics/hooks.txt:301
12877
msgid ""
12878
"lock_released\n"
12879
"~~~~~~~~~~~~~"
12880
msgstr ""
12881
"lock_released\n"
12882
"~~~~~~~~~~~~~"
12883
12884
#: en/help_topics/hooks.txt:306
12885
msgid ""
12886
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:308
12890
msgid ""
12891
"MergeHooks\n"
12892
"----------"
12893
msgstr ""
12894
"MergeHooks\n"
12895
"----------"
12896
12897
#: en/help_topics/hooks.txt:311
12898
msgid ""
12899
"merge_file_content\n"
12900
"~~~~~~~~~~~~~~~~~~"
12901
msgstr ""
12902
"merge_file_content\n"
12903
"~~~~~~~~~~~~~~~~~~"
12904
12905
#: en/help_topics/hooks.txt:314
12906
msgid "Introduced in: 2.1"
12907
msgstr "Introducido en: 2.1"
12908
12909
#: en/help_topics/hooks.txt:316
12910
msgid ""
12911
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12912
"object when starting a merge. Should return either None or a subclass\n"
12913
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12914
"called per file that needs to be merged (including when one side has\n"
12915
"deleted the file and the other has changed it). See the\n"
12916
"AbstractPerFileMerger API docs for details on how it is used by merge."
12917
msgstr ""
12918
12919
#: en/help_topics/hooks.txt:323
12920
msgid ""
12921
"post_merge\n"
12922
"~~~~~~~~~~"
12923
msgstr ""
12924
12925
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12926
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12927
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12928
msgid "Introduced in: 2.5"
12929
msgstr ""
12930
12931
#: en/help_topics/hooks.txt:328
12932
msgid ""
12933
"Called after a merge. Receives a Merger object as the single argument.\n"
12934
"The return value is ignored."
12935
msgstr ""
12936
12937
#: en/help_topics/hooks.txt:331
12938
msgid ""
12939
"pre_merge\n"
12940
"~~~~~~~~~"
12941
msgstr ""
12942
12943
#: en/help_topics/hooks.txt:336
12944
msgid ""
12945
"Called before a merge. Receives a Merger object as the single\n"
12946
"argument."
12947
msgstr ""
12948
12949
#: en/help_topics/hooks.txt:339
12950
msgid ""
12951
"MergeDirectiveHooks\n"
12952
"-------------------"
12953
msgstr ""
12954
"MergeDirectiveHooks\n"
12955
"-------------------"
12956
12957
#: en/help_topics/hooks.txt:342
12958
msgid ""
12959
"merge_request_body\n"
12960
"~~~~~~~~~~~~~~~~~~"
12961
msgstr ""
12962
"merge_request_body\n"
12963
"~~~~~~~~~~~~~~~~~~"
12964
12965
#: en/help_topics/hooks.txt:345
12966
msgid "Introduced in: 1.15.0"
12967
msgstr "Introducido en: 1.15.0"
12968
12969
#: en/help_topics/hooks.txt:347
12970
msgid ""
12971
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12972
"request. Callbacks must return a body. If more than one callback is\n"
12973
"registered, the output of one callback is provided to the next."
12974
msgstr ""
12975
12976
#: en/help_topics/hooks.txt:351
12977
msgid ""
12978
"MessageEditorHooks\n"
12979
"------------------"
12980
msgstr ""
12981
"MessageEditorHooks\n"
12982
"------------------"
12983
12984
#: en/help_topics/hooks.txt:354
12985
msgid ""
12986
"commit_message_template\n"
12987
"~~~~~~~~~~~~~~~~~~~~~~~"
12988
msgstr ""
12989
"commit_message_template\n"
12990
"~~~~~~~~~~~~~~~~~~~~~~~"
12991
12992
#: en/help_topics/hooks.txt:357
12993
msgid "Introduced in: 1.10"
12994
msgstr "Introducido en: 1.10"
12995
12996
#: en/help_topics/hooks.txt:359
12997
msgid ""
12998
"Called when a commit message is being generated.\n"
12999
"commit_message_template is called with the bzrlib.commit.Commit object\n"
13000
"and the message that is known so far. commit_message_template must\n"
13001
"return a new message to use (which could be the same as it was given).\n"
13002
"When there are multiple hooks registered for commit_message_template,\n"
13003
"they are chained with the result from the first passed into the\n"
13004
"second, and so on."
13005
msgstr ""
13006
13007
#: en/help_topics/hooks.txt:367
13008
msgid ""
13009
"set_commit_message\n"
13010
"~~~~~~~~~~~~~~~~~~"
13011
msgstr ""
13012
"set_commit_message\n"
13013
"~~~~~~~~~~~~~~~~~~"
13014
13015
#: en/help_topics/hooks.txt:372
13016
msgid ""
13017
"Set a fixed commit message. set_commit_message is called with the\n"
13018
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
13019
"properties by editing commit.builder._revprops) and the message so\n"
13020
"far. set_commit_message must return the message to use or None if it\n"
13021
"should use the message editor as normal."
13022
msgstr ""
13023
13024
#: en/help_topics/hooks.txt:378
13025
msgid ""
13026
"MutableTreeHooks\n"
13027
"----------------"
13028
msgstr ""
13029
"MutableTreeHooks\n"
13030
"----------------"
13031
13032
#: en/help_topics/hooks.txt:381
13033
msgid ""
13034
"post_build_tree\n"
13035
"~~~~~~~~~~~~~~~"
13036
msgstr ""
13037
13038
#: en/help_topics/hooks.txt:386
13039
msgid ""
13040
"Called after a completely new tree is built. The hook is called with\n"
13041
"the tree as its only argument."
13042
msgstr ""
13043
13044
#: en/help_topics/hooks.txt:392
13045
msgid "Introduced in: 2.0"
13046
msgstr "Introducido en: 2.0"
13047
13048
#: en/help_topics/hooks.txt:394
13049
msgid ""
13050
"Called after a commit is performed on a tree. The hook is called with\n"
13051
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
13052
"commit was performed on is available via the mutable_tree attribute of\n"
13053
"that object."
13054
msgstr ""
13055
13056
#: en/help_topics/hooks.txt:399
13057
msgid ""
13058
"post_transform\n"
13059
"~~~~~~~~~~~~~~"
13060
msgstr ""
13061
13062
#: en/help_topics/hooks.txt:404
13063
msgid ""
13064
"Called after a tree transform has been performed on a tree. The hook\n"
13065
"is called with the tree that is being transformed and the transform."
13066
msgstr ""
13067
13068
#: en/help_topics/hooks.txt:407
13069
msgid ""
13070
"pre_transform\n"
13071
"~~~~~~~~~~~~~"
13072
msgstr ""
13073
13074
#: en/help_topics/hooks.txt:412
13075
msgid ""
13076
"Called before a tree transform on this tree. The hook is called with\n"
13077
"the tree that is being transformed and the transform."
13078
msgstr ""
13079
13080
#: en/help_topics/hooks.txt:415
13081
msgid ""
13082
"start_commit\n"
13083
"~~~~~~~~~~~~"
13084
msgstr ""
13085
"start_commit\n"
13086
"~~~~~~~~~~~~"
13087
13088
#: en/help_topics/hooks.txt:420
13089
msgid ""
13090
"Called before a commit is performed on a tree. The start commit hook\n"
13091
"is able to change the tree before the commit takes place. start_commit\n"
13092
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
13093
"being performed on."
13094
msgstr ""
13095
13096
#: en/help_topics/hooks.txt:425
13097
msgid ""
13098
"SmartClientHooks\n"
13099
"----------------"
13100
msgstr ""
13101
"SmartClientHooks\n"
13102
"----------------"
13103
13104
#: en/help_topics/hooks.txt:428
13105
msgid ""
13106
"call\n"
13107
"~~~~"
13108
msgstr ""
13109
"call\n"
13110
"~~~~"
13111
13112
#: en/help_topics/hooks.txt:431
13113
msgid "Introduced in: unknown"
13114
msgstr ""
13115
13116
#: en/help_topics/hooks.txt:433
13117
msgid ""
13118
"Called when the smart client is submitting a request to the smart\n"
13119
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13120
"Streaming request bodies, and responses, are not accessible."
13121
msgstr ""
13122
13123
#: en/help_topics/hooks.txt:437
13124
msgid ""
13125
"SmartServerHooks\n"
13126
"----------------"
13127
msgstr ""
13128
"SmartServerHooks\n"
13129
"----------------"
13130
13131
#: en/help_topics/hooks.txt:440
13132
msgid ""
13133
"server_exception\n"
13134
"~~~~~~~~~~~~~~~~"
13135
msgstr ""
13136
"server_exception\n"
13137
"~~~~~~~~~~~~~~~~"
13138
13139
#: en/help_topics/hooks.txt:445
13140
msgid ""
13141
"Called by the bzr server when an exception occurs. server_exception is\n"
13142
"called with the sys.exc_info() tuple return true for the hook if the\n"
13143
"exception has been handled, in which case the server will exit\n"
13144
"normally."
13145
msgstr ""
13146
13147
#: en/help_topics/hooks.txt:450
13148
msgid ""
13149
"server_started\n"
13150
"~~~~~~~~~~~~~~"
13151
msgstr ""
13152
"server_started\n"
13153
"~~~~~~~~~~~~~~"
13154
13155
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
13156
msgid "Introduced in: 0.16"
13157
msgstr ""
13158
13159
#: en/help_topics/hooks.txt:455
13160
msgid ""
13161
"Called by the bzr server when it starts serving a directory.\n"
13162
"server_started is called with (backing urls, public url), where\n"
13163
"backing_url is a list of URLs giving the server-specific directory\n"
13164
"locations, and public_url is the public URL for the directory being\n"
13165
"served."
13166
msgstr ""
13167
13168
#: en/help_topics/hooks.txt:461
13169
msgid ""
13170
"server_started_ex\n"
13171
"~~~~~~~~~~~~~~~~~"
13172
msgstr ""
13173
"server_started_ex\n"
13174
"~~~~~~~~~~~~~~~~~"
13175
13176
#: en/help_topics/hooks.txt:466
13177
msgid ""
13178
"Called by the bzr server when it starts serving a directory.\n"
13179
"server_started is called with (backing_urls, server_obj)."
13180
msgstr ""
13181
13182
#: en/help_topics/hooks.txt:469
13183
msgid ""
13184
"server_stopped\n"
13185
"~~~~~~~~~~~~~~"
13186
msgstr ""
13187
"server_stopped\n"
13188
"~~~~~~~~~~~~~~"
13189
13190
#: en/help_topics/hooks.txt:474
13191
msgid ""
13192
"Called by the bzr server when it stops serving a directory.\n"
13193
"server_stopped is called with the same parameters as the\n"
13194
"server_started hook: (backing_urls, public_url)."
13195
msgstr ""
13196
13197
#: en/help_topics/hooks.txt:478
13198
msgid ""
13199
"StatusHooks\n"
13200
"-----------"
13201
msgstr ""
13202
"StatusHooks\n"
13203
"-----------"
13204
13205
#: en/help_topics/hooks.txt:481
13206
msgid ""
13207
"post_status\n"
13208
"~~~~~~~~~~~"
13209
msgstr ""
13210
"post_status\n"
13211
"~~~~~~~~~~~"
13212
13213
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13214
msgid "Introduced in: 2.3"
13215
msgstr ""
13216
13217
#: en/help_topics/hooks.txt:486
13218
msgid ""
13219
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13220
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13221
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13222
"correspond to the command line options specified by the user for the\n"
13223
"status command. to_file is the output stream for writing."
13224
msgstr ""
13225
13226
#: en/help_topics/hooks.txt:492
13227
msgid ""
13228
"pre_status\n"
13229
"~~~~~~~~~~"
13230
msgstr ""
13231
"pre_status\n"
13232
"~~~~~~~~~~"
13233
13234
#: en/help_topics/hooks.txt:497
13235
msgid ""
13236
"Called with argument StatusHookParams before Bazaar displays the\n"
13237
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13238
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13239
"correspond to the command line options specified by the user for the\n"
13240
"status command. to_file is the output stream for writing."
13241
msgstr ""
13242
13243
#: en/help_topics/hooks.txt:503
13244
msgid ""
13245
"TransportHooks\n"
13246
"--------------"
13247
msgstr ""
13248
13249
#: en/help_topics/hooks.txt:506
13250
msgid ""
13251
"post_connect\n"
13252
"~~~~~~~~~~~~"
13253
msgstr ""
13254
13255
#: en/help_topics/hooks.txt:511
13256
msgid ""
13257
"Called after a new connection is established or a reconnect occurs.\n"
13258
"The sole argument passed is either the connected transport or smart\n"
13259
"medium instance."
13260
msgstr ""
13261
13262
#: en/help_topics/hooks.txt:515
13263
msgid ""
13264
"RioVersionInfoBuilderHooks\n"
13265
"--------------------------"
13266
msgstr ""
13267
"RioVersionInfoBuilderHooks\n"
13268
"--------------------------"
13269
13270
#: en/help_topics/hooks.txt:518
13271
msgid ""
13272
"revision\n"
13273
"~~~~~~~~"
13274
msgstr ""
13275
"revisión\n"
13276
"~~~~~~~~"
13277
13278
#: en/help_topics/hooks.txt:523
13279
msgid ""
13280
"Invoked when adding information about a revision to the RIO stanza\n"
13281
"that is printed. revision is called with a revision object and a RIO\n"
13282
"stanza.\n"
13283
msgstr ""
13284
13285
#: en/help_topics/location-alias.txt:1
13286
msgid ""
13287
"Location aliases\n"
13288
"================"
13289
msgstr ""
13290
"Alias de ubicación\n"
13291
"=============="
13292
13293
#: en/help_topics/location-alias.txt:4
13294
msgid ""
13295
"Bazaar defines several aliases for locations associated with a branch. "
13296
"These\n"
13297
"can be used with most commands that expect a location, such as `bzr push`."
13298
msgstr ""
13299
13300
#: en/help_topics/location-alias.txt:7
13301
msgid "The aliases are::"
13302
msgstr "Los alias son::"
13303
13304
#: en/help_topics/location-alias.txt:9
13305
msgid ""
13306
" :bound The branch this branch is bound to, for bound branches.\n"
13307
" :parent The parent of this branch.\n"
13308
" :public The public location of this branch.\n"
13309
" :push The saved location used for `bzr push` with no arguments.\n"
13310
" :submit The submit branch for this branch.\n"
13311
" :this This branch."
13312
msgstr ""
13313
13314
#: en/help_topics/location-alias.txt:16
13315
msgid "For example, to push to the parent location::"
13316
msgstr "Por ejemplo para impulsar la ubicación padre::"
13317
13318
#: en/help_topics/location-alias.txt:18
13319
msgid " bzr push :parent\n"
13320
msgstr ""
13321
13322
#: en/help_topics/log-formats.txt:1
13323
msgid ""
13324
"Log Formats\n"
13325
"==========="
13326
msgstr ""
13327
"Formatos de registro\n"
13328
"================"
13329
13330
#: en/help_topics/log-formats.txt:4
13331
msgid ""
13332
"A log format controls how information about each revision is displayed.\n"
13333
"The standard log formats are compared below::"
13334
msgstr ""
13335
13336
#: en/help_topics/log-formats.txt:7
13337
msgid ""
13338
" Feature long short line\n"
13339
" ---------------------- ------------- ------------ -------------------\n"
13340
" design goal detailed view concise view 1 revision per line\n"
13341
" committer name+email name only name only\n"
13342
" author name+email - -\n"
13343
" date-time format full date only date only\n"
13344
" commit message full full top line\n"
13345
" tags yes yes yes\n"
13346
" merges indicator - yes -\n"
13347
" status/delta optional optional -\n"
13348
" diff/patch optional optional -\n"
13349
" revision-id optional optional -\n"
13350
" branch nick yes - -\n"
13351
" foreign vcs properties yes yes -\n"
13352
" preferred levels all 1 1\n"
13353
" digital signature optional - -"
13354
msgstr ""
13355
13356
#: en/help_topics/log-formats.txt:24
13357
msgid ""
13358
"The default format is ``long``. To change this, define the ``log_format``\n"
13359
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13360
msgstr ""
13361
13362
#: en/help_topics/log-formats.txt:27
13363
msgid ""
13364
" [DEFAULT]\n"
13365
" log_format = short"
13366
msgstr ""
13367
13368
#: en/help_topics/log-formats.txt:30
13369
msgid ""
13370
"Alternatively, to change the log format used for a given query, use the\n"
13371
"--long, --short or --line options."
13372
msgstr ""
13373
13374
#: en/help_topics/log-formats.txt:33
13375
msgid ""
13376
"If one of the standard log formats does not meet your needs, additional\n"
13377
"formats can be provided by plugins.\n"
13378
msgstr ""
13379
13380
#: en/help_topics/other-formats.txt:1
13381
msgid "Other Storage Formats"
13382
msgstr "Otros formatos de almacenamiento"
13383
13384
#: en/help_topics/other-formats.txt:3
13385
msgid "Experimental formats are shown below."
13386
msgstr ""
13387
13388
#: en/help_topics/other-formats.txt:5
13389
msgid ""
13390
":development-colo:\n"
13391
" (native) The 2a format with experimental support for colocated\n"
13392
" branches."
13393
msgstr ""
13394
13395
#: en/help_topics/other-formats.txt:9
13396
msgid ""
13397
"\n"
13398
"Deprecated formats are shown below."
13399
msgstr ""
13400
13401
#: en/help_topics/other-formats.txt:12
13402
msgid ""
13403
":pack-0.92:\n"
13404
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13405
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13406
" by bzr < 0.92."
13407
msgstr ""
13408
13409
#: en/help_topics/patterns.txt:1
13410
msgid ""
13411
"Patterns\n"
13412
"========"
13413
msgstr ""
13414
"Patrones\n"
13415
"========"
13416
13417
#: en/help_topics/patterns.txt:4
13418
msgid ""
13419
"Bazaar uses patterns to match files at various times. For example,\n"
13420
"the ``add`` command skips over files that match ignore patterns\n"
13421
"and preferences can be associated with files using rule patterns.\n"
13422
"The pattern syntax is described below."
13423
msgstr ""
13424
13425
#: en/help_topics/patterns.txt:9
13426
msgid ""
13427
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13428
"slash or is a regular expression, it is compared to the whole path\n"
13429
"from the branch root. Otherwise, it is compared to only the last\n"
13430
"component of the path. To match a file only in the root directory,\n"
13431
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13432
msgstr ""
13433
13434
#: en/help_topics/patterns.txt:15
13435
msgid "Patterns may include globbing wildcards such as::"
13436
msgstr "Los patrones pueden incluir comodines globales tales como::"
13437
13438
#: en/help_topics/patterns.txt:17
13439
msgid ""
13440
" ? - Matches any single character except '/'\n"
13441
" * - Matches 0 or more characters except '/'\n"
13442
" /**/ - Matches 0 or more directories in a path\n"
13443
" [a-z] - Matches a single character from within a group of characters"
13444
msgstr ""
13445
13446
#: en/help_topics/patterns.txt:22
13447
msgid ""
13448
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13449
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13450
"expression. Regular expression patterns may not include named or\n"
13451
"numbered groups."
13452
msgstr ""
13453
13454
#: en/help_topics/patterns.txt:27
13455
msgid ""
13456
"Case insensitive ignore patterns can be specified with regular expressions\n"
13457
"by using the ``i`` (for ignore case) flag in the pattern."
13458
msgstr ""
13459
13460
#: en/help_topics/patterns.txt:30
13461
msgid ""
13462
"For example, a case insensitive match for ``foo`` may be specified as::"
13463
msgstr ""
13464
13465
#: en/help_topics/patterns.txt:32
13466
msgid " RE:(?i)foo"
13467
msgstr ""
13468
13469
#: en/help_topics/patterns.txt:34
13470
msgid ""
13471
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13472
"matched by that pattern will not be ignored."
13473
msgstr ""
13474
13475
#: en/help_topics/patterns.txt:37
13476
msgid ""
13477
".. _Python regular expressions: http://docs.python.org/library/re.html"
13478
msgstr ""
13479
13480
#: en/help_topics/revisionspec.txt:1
13481
msgid "Revision Identifiers"
13482
msgstr "Identificadores de revisión"
13483
13484
#: en/help_topics/revisionspec.txt:3
13485
msgid ""
13486
"A revision identifier refers to a specific state of a branch's history. It\n"
13487
"can be expressed in several ways. It can begin with a keyword to\n"
13488
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13489
"'before:yesterday' and 'submit:'."
13490
msgstr ""
13491
13492
#: en/help_topics/revisionspec.txt:8
13493
msgid ""
13494
"Alternately, it can be given without a keyword, in which case it will be\n"
13495
"checked as a revision number, a tag, a revision id, a date specification, or "
13496
"a\n"
13497
"branch specification, in that order. For example, 'date:today' could be\n"
13498
"written as simply 'today', though if you have a tag called 'today' that "
13499
"will\n"
13500
"be found first."
13501
msgstr ""
13502
13503
#: en/help_topics/revisionspec.txt:14
13504
msgid ""
13505
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13506
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13507
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13508
"or\n"
13509
"spaces around the '..')."
13510
msgstr ""
13511
13512
#: en/help_topics/revisionspec.txt:19
13513
msgid ""
13514
"Ranges are interpreted differently by different commands. To the \"log\" "
13515
"command,\n"
13516
"a range is a sequence of log messages, but to the \"diff\" command, the "
13517
"range\n"
13518
"denotes a change between revisions (and not a sequence of changes). In\n"
13519
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13520
"consider it\n"
13521
"to be open-ended, that is, they include one end but not the other. For "
13522
"example:\n"
13523
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13524
"3649,\n"
13525
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13526
"and\n"
13527
"3649, but not 3647."
13528
msgstr ""
13529
13530
#: en/help_topics/revisionspec.txt:28
13531
msgid "The keywords used as revision selection methods are the following:"
13532
msgstr ""
13533
"Las palabras claves usadas como métodos de selección de revisión son las "
13534
"siguientes:"
13535
13536
#: en/help_topics/revisionspec.txt:30
13537
msgid ""
13538
":revid:\n"
13539
"\tSelects a revision using the revision id.\n"
13540
":submit:\n"
13541
"\tSelects a common ancestor with the submit branch.\n"
13542
":ancestor:\n"
13543
"\tSelects a common ancestor with a second branch.\n"
13544
":date:\n"
13545
"\tSelects a revision on the basis of a datestamp.\n"
13546
":branch:\n"
13547
"\tSelects the last revision of a specified branch.\n"
13548
":tag:\n"
13549
"\tSelects a revision identified by a tag name.\n"
13550
":revno:\n"
13551
"\tSelects a revision using a number.\n"
13552
":before:\n"
13553
"\tSelects the parent of the revision specified.\n"
13554
":annotate:\n"
13555
"\tSelect the revision that last modified the specified line.\n"
13556
":mainline:\n"
13557
"\tSelect mainline revision that merged the specified revision.\n"
13558
":last:\n"
13559
"\tSelects the nth revision from the end."
13560
msgstr ""
13561
13562
#: en/help_topics/revisionspec.txt:53
13563
msgid "In addition, plugins can provide other keywords."
13564
msgstr "Además, los complementos pueden proporcionar otras palabras clave."
13565
13566
#: en/help_topics/revisionspec.txt:55
13567
msgid "A detailed description of each keyword is given below."
13568
msgstr ""
13569
"A continuación se proporciona una detallada descripción de cada palabra "
13570
"clave."
13571
13572
#: en/help_topics/revisionspec.txt:57
13573
msgid ":revid:"
13574
msgstr ":revid:"
13575
13576
#: en/help_topics/revisionspec.txt:59
13577
msgid ""
13578
" Supply a specific revision id, that can be used to specify any\n"
13579
" revision id in the ancestry of the branch.\n"
13580
" Including merges, and pending merges.\n"
13581
" Examples::"
13582
msgstr ""
13583
13584
#: en/help_topics/revisionspec.txt:64
13585
msgid ""
13586
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13587
msgstr ""
13588
" revid:aaaa@bbbb-123456789 -> Selecciona la revisión «aaaa@bbbb-"
13589
"123456789»"
13590
13591
#: en/help_topics/revisionspec.txt:66
13592
msgid ":submit:"
13593
msgstr ":submit:"
13594
13595
#: en/help_topics/revisionspec.txt:68
13596
msgid ""
13597
" Diffing against this shows all the changes that were made in this "
13598
"branch,\n"
13599
" and is a good predictor of what merge will do. The submit branch is\n"
13600
" used by the bundle and merge directive commands. If no submit branch\n"
13601
" is specified, the parent branch is used instead."
13602
msgstr ""
13603
13604
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13605
msgid ""
13606
" The common ancestor is the last revision that existed in both\n"
13607
" branches. Usually this is the branch point, but it could also be\n"
13608
" a revision that was merged."
13609
msgstr ""
13610
13611
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13612
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13613
#: en/help_topics/revisionspec.txt:153
13614
msgid " Examples::"
13615
msgstr " Ejemplos::"
13616
13617
#: en/help_topics/revisionspec.txt:79
13618
msgid " $ bzr diff -r submit:"
13619
msgstr " $ bzr diff -r submit:"
13620
13621
#: en/help_topics/revisionspec.txt:81
13622
msgid ":ancestor:"
13623
msgstr ":ancestor:"
13624
13625
#: en/help_topics/revisionspec.txt:83
13626
msgid " Supply the path to a branch to select the common ancestor."
13627
msgstr ""
13628
13629
#: en/help_topics/revisionspec.txt:89
13630
msgid ""
13631
" This is frequently used with 'diff' to return all of the changes\n"
13632
" that your branch introduces, while excluding the changes that you\n"
13633
" have not merged from the remote branch."
13634
msgstr ""
13635
13636
#: en/help_topics/revisionspec.txt:95
13637
msgid ""
13638
" ancestor:/path/to/branch\n"
13639
" $ bzr diff -r ancestor:../../mainline/branch"
13640
msgstr ""
13641
13642
#: en/help_topics/revisionspec.txt:98
13643
msgid ":date:"
13644
msgstr ":date:"
13645
13646
#: en/help_topics/revisionspec.txt:100
13647
msgid ""
13648
" Supply a datestamp to select the first revision that matches the date.\n"
13649
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13650
" Matches the first entry after a given date (either at midnight or\n"
13651
" at a specified time)."
13652
msgstr ""
13653
13654
#: en/help_topics/revisionspec.txt:105
13655
msgid " One way to display all the changes since yesterday would be::"
13656
msgstr ""
13657
13658
#: en/help_topics/revisionspec.txt:107
13659
msgid " bzr log -r date:yesterday.."
13660
msgstr ""
13661
13662
#: en/help_topics/revisionspec.txt:111
13663
msgid ""
13664
" date:yesterday -> select the first revision since "
13665
"yesterday\n"
13666
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13667
" August 14th, 2006 at 5:10pm."
13668
msgstr ""
13669
13670
#: en/help_topics/revisionspec.txt:115
13671
msgid ":branch:"
13672
msgstr ":branch:"
13673
13674
#: en/help_topics/revisionspec.txt:117
13675
msgid " Supply the path to a branch to select its last revision."
13676
msgstr ""
13677
" Suministra la ruta a una rama para seleccionar su última revisión."
13678
13679
#: en/help_topics/revisionspec.txt:121
13680
msgid " branch:/path/to/branch"
13681
msgstr " branch:/ruta/a/rama"
13682
13683
#: en/help_topics/revisionspec.txt:123
13684
msgid ":tag:"
13685
msgstr ":tag:"
13686
13687
#: en/help_topics/revisionspec.txt:125
13688
msgid " Tags are stored in the branch and created by the 'tag' command."
13689
msgstr ""
13690
13691
#: en/help_topics/revisionspec.txt:127
13692
msgid ":revno:"
13693
msgstr ":revno:"
13694
13695
#: en/help_topics/revisionspec.txt:129
13696
msgid ""
13697
" Use an integer to specify a revision in the history of the branch.\n"
13698
" Optionally a branch can be specified. A negative number will count\n"
13699
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13700
" one). If the negative number is larger than the branch's history, the\n"
13701
" first revision is returned.\n"
13702
" Examples::"
13703
msgstr ""
13704
13705
#: en/help_topics/revisionspec.txt:136
13706
msgid ""
13707
" revno:1 -> return the first revision of this branch\n"
13708
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13709
" the branch '/path/to/branch'\n"
13710
" revno:-1 -> The last revision in a branch.\n"
13711
" -2:http://other/branch -> The second to last revision in the\n"
13712
" remote branch.\n"
13713
" -1000000 -> Most likely the first revision, unless\n"
13714
" your history is very long."
13715
msgstr ""
13716
13717
#: en/help_topics/revisionspec.txt:145
13718
msgid ":before:"
13719
msgstr ":before:"
13720
13721
#: en/help_topics/revisionspec.txt:147
13722
msgid ""
13723
" Supply any revision spec to return the parent of that revision. This "
13724
"is\n"
13725
" mostly useful when inspecting revisions that are not in the revision "
13726
"history\n"
13727
" of a branch."
13728
msgstr ""
13729
13730
#: en/help_topics/revisionspec.txt:151
13731
msgid ""
13732
" It is an error to request the parent of the null revision (before:0)."
13733
msgstr ""
13734
13735
#: en/help_topics/revisionspec.txt:155
13736
msgid ""
13737
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13738
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13739
" aaaa@bbbb-1234567890\n"
13740
" bzr diff -r before:1913..1913\n"
13741
" -> Find the changes between revision 1913 and its parent "
13742
"(1912).\n"
13743
" (What changes did revision 1913 introduce).\n"
13744
" This is equivalent to: bzr diff -c 1913"
13745
msgstr ""
13746
13747
#: en/help_topics/revisionspec.txt:163
13748
msgid ":annotate:"
13749
msgstr ":annotate:"
13750
13751
#: en/help_topics/revisionspec.txt:165
13752
msgid ""
13753
" Select the revision that last modified the specified line. Line is\n"
13754
" specified as path:number. Path is a relative path to the file. "
13755
"Numbers\n"
13756
" start at 1, and are relative to the current version, not the last-\n"
13757
" committed version of the file."
13758
msgstr ""
13759
13760
#: en/help_topics/revisionspec.txt:170
13761
msgid ":mainline:"
13762
msgstr ":mainline:"
13763
13764
#: en/help_topics/revisionspec.txt:172
13765
msgid ""
13766
" Select the revision that merged the specified revision into mainline."
13767
msgstr ""
13768
13769
#: en/help_topics/revisionspec.txt:174
13770
msgid ":last:"
13771
msgstr ":last:"
13772
13773
#: en/help_topics/revisionspec.txt:176
13774
msgid ""
13775
" Supply a positive number to get the nth revision from the end.\n"
13776
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13777
" Examples::"
13778
msgstr ""
13779
13780
#: en/help_topics/revisionspec.txt:180
13781
msgid ""
13782
" last:1 -> return the last revision\n"
13783
" last:3 -> return the revision 2 before the end.\n"
13784
msgstr ""
13785
" last:1 -> devuelve la última revisión\n"
13786
" last:3 -> devuelve la revisión 2 antes del final.\n"
13787
13788
#: en/help_topics/rules.txt:1
13789
msgid ""
13790
"Rules\n"
13791
"====="
13792
msgstr ""
13793
"Reglas\n"
13794
"======"
13795
13796
#: en/help_topics/rules.txt:7
13797
msgid ""
13798
"Rules are defined in ini file format where the sections are file glob\n"
13799
"patterns and the contents of each section are the preferences for files\n"
13800
"matching that pattern(s). For example::"
13801
msgstr ""
13802
13803
#: en/help_topics/rules.txt:11
13804
msgid ""
13805
" [name *.bat]\n"
13806
" eol = native"
13807
msgstr ""
13808
13809
#: en/help_topics/rules.txt:14
13810
msgid ""
13811
" [name *.html *.xml]\n"
13812
" keywords = xml_escape"
13813
msgstr ""
13814
" [name *.html *.xml]\n"
13815
" keywords = xml_escape"
13816
13817
#: en/help_topics/rules.txt:17
13818
msgid ""
13819
"Preferences like these are useful for commands and plugins wishing to\n"
13820
"provide custom behaviour for selected files. For more information on \n"
13821
"end of line conversion see :doc:`eol-help`.\n"
13822
"Keyword support is provided by the `keywords plugin\n"
13823
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13824
msgstr ""
13825
13826
#: en/help_topics/rules.txt:23
13827
msgid ""
13828
"Files\n"
13829
"-----"
13830
msgstr ""
13831
"Archivos\n"
13832
"--------"
13833
13834
#: en/help_topics/rules.txt:26
13835
msgid ""
13836
"Default rules for all branches are defined in the optional file\n"
13837
"``BZR_HOME/rules``. "
13838
msgstr ""
13839
13840
#: en/help_topics/rules.txt:29
13841
msgid ""
13842
"Rule Patterns\n"
13843
"-------------"
13844
msgstr ""
13845
"Patrones de regla\n"
13846
"----------------------------"
13847
13848
#: en/help_topics/rules.txt:32
13849
msgid ""
13850
"Patterns are ordered and searching stops as soon as one matches.\n"
13851
"As a consequence, more explicit patterns should be placed towards\n"
13852
"the top of the file. Rule patterns use exactly the same conventions\n"
13853
"as ignore patterns. See :doc:`patterns-help` for details."
13854
msgstr ""
13855
13856
#: en/help_topics/rules.txt:37
13857
msgid ".. note::"
13858
msgstr ".. nota::"
13859
13860
#: en/help_topics/rules.txt:39
13861
msgid ""
13862
" Patterns containing square brackets or spaces should be\n"
13863
" surrounded in quotes to ensure they are correctly parsed.\n"
13864
msgstr ""
13865
13866
#: en/help_topics/topics.txt:1
13867
msgid ""
13868
"authentication Information on configuring authentication\n"
13869
"basic Basic commands\n"
13870
"branches Information on what a branch is\n"
13871
"bugs Bug tracker settings\n"
13872
"checkouts Information on what a checkout is\n"
13873
"commands Basic help for all commands\n"
13874
"configuration Details on the configuration settings available\n"
13875
"conflict-types Types of conflicts and what to do about them\n"
13876
"content-filters Conversion of content into/from working trees\n"
13877
"criss-cross Information on criss-cross merging\n"
13878
"current-formats Current storage formats\n"
13879
"debug-flags Options to show or record debug information\n"
13880
"diverged-branches How to fix diverged branches\n"
13881
"env-variables Environment variable names and values\n"
13882
"eol Information on end-of-line handling\n"
13883
"files Information on configuration and log files\n"
13884
"formats Information on choosing a storage format\n"
13885
"global-options Options that control how Bazaar runs\n"
13886
"hidden-commands All hidden commands\n"
13887
"hooks Points at which custom processing can be added\n"
13888
"launchpad Using Bazaar with Launchpad.net\n"
13889
"location-alias Aliases for remembered locations\n"
13890
"log-formats Details on the logging formats available\n"
13891
"other-formats Experimental and deprecated storage formats\n"
13892
"patterns Information on the pattern syntax\n"
13893
"repositories Basic information on shared repositories.\n"
13894
"revisionspec Explain how to use --revision\n"
13895
"rules Information on defining rule-based preferences\n"
13896
"standalone-trees Information on what a standalone tree is\n"
13897
"standard-options Options that can be used with any command\n"
13898
"status-flags Help on status flags\n"
13899
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13900
"topics Topics list\n"
13901
"url-special-chars Special character handling in URLs\n"
13902
"urlspec Supported transport protocols\n"
13903
"working-trees Information on working trees\n"
13904
msgstr ""
13905
13906
#: en/help_topics/url-special-chars.txt:1
13907
msgid ""
13908
"Special character handling in URLs\n"
13909
"=================================="
13910
msgstr ""
13911
13912
#: en/help_topics/url-special-chars.txt:4
13913
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13914
msgstr ""
13915
13916
#: en/help_topics/url-special-chars.txt:6
13917
msgid " * Fully qualified URLs"
13918
msgstr ""
13919
13920
#: en/help_topics/url-special-chars.txt:8
13921
msgid " * File system paths, relative or absolute"
13922
msgstr " * Rutas de sistemas de archivo, relativas o absolutas"
13923
13924
#: en/help_topics/url-special-chars.txt:10
13925
msgid ""
13926
"Internally bzr treats all locations as URLs. For any file system paths\n"
13927
"that are specified it will automatically determine the appropriate URL\n"
13928
"representation, and escape special characters where necessary."
13929
msgstr ""
13930
13931
#: en/help_topics/url-special-chars.txt:14
13932
msgid ""
13933
"There are a few characters which have special meaning in URLs and need "
13934
"careful\n"
13935
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13936
"value in URLs. Any non-ASCII characters in a file path will automatically "
13937
"be\n"
13938
"urlencoded when the path is converted to a URL."
13939
msgstr ""
13940
13941
#: en/help_topics/url-special-chars.txt:19
13942
msgid ""
13943
"URLs represent non-ASCII characters in an encoding defined by the server, "
13944
"but\n"
13945
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13946
"be\n"
13947
"generous in what it accepts as a URL and to print them in a way that\n"
13948
"will be readable."
13949
msgstr ""
13950
13951
#: en/help_topics/url-special-chars.txt:24
13952
msgid ""
13953
"For example, if you have a directory named '/tmp/%2False' these are all "
13954
"valid\n"
13955
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13956
"slash)::"
13957
msgstr ""
13958
13959
#: en/help_topics/url-special-chars.txt:27
13960
msgid ""
13961
" cd /tmp\n"
13962
" bzr log /tmp/%2False\n"
13963
" bzr log %2False\n"
13964
" bzr log file:///tmp/%252False\n"
13965
" bzr log file://localhost/tmp/%252False\n"
13966
" bzr log file:%252False"
13967
msgstr ""
13968
" cd /tmp\n"
13969
" bzr log /tmp/%2False\n"
13970
" bzr log %2False\n"
13971
" bzr log file:///tmp/%252False\n"
13972
" bzr log file://localhost/tmp/%252False\n"
13973
" bzr log file:%252False"
13974
13975
#: en/help_topics/url-special-chars.txt:34
13976
msgid "These are valid but do not refer to the same file::"
13977
msgstr "Estas son válidas pero no se refieren al mismo archivo::"
13978
13979
#: en/help_topics/url-special-chars.txt:36
13980
msgid ""
13981
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13982
" bzr log %252False (refers to a file called /tmp/%252False)"
13983
msgstr ""
13984
" bzr log file:///tmp/%2Falso (se refiere al archivo llamado /tmp/\\/also)\n"
13985
" bzr log %252Falso (se refiere al archivo llamado /tmp/%252Falso)"
13986
13987
#: en/help_topics/url-special-chars.txt:39
13988
msgid ""
13989
"Comma also has special meaning in URLs, because it denotes `segment "
13990
"parameters`_"
13991
msgstr ""
13992
13993
#: en/help_topics/url-special-chars.txt:41
13994
msgid ""
13995
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13996
msgstr ""
13997
13998
#: en/help_topics/url-special-chars.txt:43
13999
msgid ""
14000
"Comma is also special in any file system paths that are specified. To use a "
14001
"literal\n"
14002
"comma in a file system path, specify a URL and URL encode the comma::"
14003
msgstr ""
14004
14005
#: en/help_topics/url-special-chars.txt:46
14006
msgid ""
14007
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
14008
"\"branch\" set to \"bla\"\n"
14009
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
14010
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
14011
"\"branch\" set to \"bla\"\n"
14012
msgstr ""
14013
14014
#: en/help_topics/urlspec.txt:1
14015
msgid "URL Identifiers"
14016
msgstr "Identificadores de URL"
14017
14018
#: en/help_topics/urlspec.txt:3
14019
msgid "Supported URL prefixes::"
14020
msgstr "Prefijos de URL permitidos:"
14021
14022
#: en/help_topics/urlspec.txt:5
14023
msgid ""
14024
" aftp:// Access using active FTP.\n"
14025
" bzr:// Fast access using the Bazaar smart server.\n"
14026
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
14027
" file:// Access using the standard filesystem (default)\n"
14028
" ftp:// Access using passive FTP.\n"
14029
" http:// Read-only access of branches exported on the web.\n"
14030
" https:// Read-only access of branches exported on the web using "
14031
"SSL.\n"
14032
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
14033
msgstr ""
14034
14035
#: en/help_topics/urlspec.txt:14
14036
msgid "Supported modifiers::"
14037
msgstr "Modificadores permitidos:"
14038
14039
#: en/help_topics/urlspec.txt:16
14040
msgid " gio+ Access using any GIO supported protocols."
14041
msgstr ""
14042
14043
#: en/help_topics/urlspec.txt:18
14044
msgid "Bazaar supports all of the standard parts within the URL::"
14045
msgstr "Bazaar permite todas las partes estándar con el URL::"
14046
14047
#: en/help_topics/urlspec.txt:20
14048
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
14049
msgstr " <protocolo>://[usuario[:contraseña]@]anfitrión[:puerto]/[ruta]"
14050
14051
#: en/help_topics/urlspec.txt:22
14052
msgid "allowing URLs such as::"
14053
msgstr "permitir URL tales como:"
14054
14055
#: en/help_topics/urlspec.txt:24
14056
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
14057
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
14058
14059
#: en/help_topics/urlspec.txt:26
14060
msgid ""
14061
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
14062
"with '~' as meaning that the rest of the path should be interpreted\n"
14063
"relative to the remote user's home directory. For example if the user\n"
14064
"``remote`` has a home directory of ``/home/remote`` on the server\n"
14065
"shell.example.com, then::"
14066
msgstr ""
14067
14068
#: en/help_topics/urlspec.txt:32
14069
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
14070
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
14071
14072
#: en/help_topics/urlspec.txt:34
14073
msgid "would refer to ``/home/remote/myproject/trunk``."
14074
msgstr "re refieren a «/home/remote/myproject/trunk»."
14075
14076
#: en/help_topics/urlspec.txt:36
14077
msgid ""
14078
"Many commands that accept URLs also accept location aliases too.\n"
14079
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
14080
msgstr ""
14081
"Muchas órdenes que aceptan URL también aceptan alias de ubicaciones.\n"
14082
"Vea :doc:`location-alias-help` y :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1