« back to all changes in this revision
Viewing changes to po/es.po
- browse files at revision 6462
- compare with another revision
- download diff
- download tarball
- view history from revision 6462
- Committer: Patch Queue Manager
- Date: 2012-02-03 10:59:42 UTC
- mfrom: (6461.1.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20120203105942-zq9f2k9i5a2akbvu
(vila) Merge 2.5 branch (Vincent Ladeuil)
- files added:
- po/ast.po
- files modified:
- bzrlib/config.py
added
removed
po/es.po
1
# Spanish translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Spanish <es@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:17+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "omitiendo {0} (mayor que {1} de {2} bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Desapilando"
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Subido a la revisión %d."
33
34
#: bzrlib/branch.py:3185
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d etiqueta actualizada"
39
msgstr[1] "%d etiquetas actualizadas"
40
41
#: bzrlib/branch.py:3188
42
msgid "No new revisions or tags to push."
43
msgstr "No hay revisiones o etiquetas para subir."
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr "No hay revisiones para subir."
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr "rama comprobada {0} formato {1}"
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr "error encontrado: %s"
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorando archivos fuera de la vista. La vista es %s"
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr "Mostrar resumen de estado."
71
72
#: bzrlib/builtins.py:217
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
78
"agrupados por estado. Los estados posibles son:"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"añadido\n"
86
" Versionado en la copia de trabajo pero no en la revisión anterior."
87
88
#: bzrlib/builtins.py:223
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"eliminado\n"
95
" Versionado en la revisión anterior pero borrado o eliminado\n"
96
" en la copia de trabajo."
97
98
#: bzrlib/builtins.py:227
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renombrado\n"
106
" La ruta de este archivo ha cambiado desde una revisión anterior;\n"
107
" el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
108
" directorio padre ha sido renombrado."
109
110
#: bzrlib/builtins.py:232
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modificado\n"
116
" El texto ha cambiado desde una revisión previa."
117
118
#: bzrlib/builtins.py:235
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"tipo cambiado\n"
124
" El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
125
126
#: bzrlib/builtins.py:238
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"desconocido\n"
132
" Ni se ha versionado ni se ha encontrado un patrón ignorado."
133
134
#: bzrlib/builtins.py:241
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Adicionalmente para directorios, vínculos simbólicos y archivos con el bit "
142
"de\n"
143
"ejecutable cambiado, Bazaar indica su tipo usando un carácter \n"
144
"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
145
"desactivadas usando la opción «--no-classify»."
146
147
#: bzrlib/builtins.py:246
148
msgid ""
149
"To see ignored files use 'bzr ignored'. For details on the\n"
150
"changes to file texts, use 'bzr diff'."
151
msgstr ""
152
"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
153
"cambios de textos en los archivos, use «bzr diff»."
154
155
#: bzrlib/builtins.py:249
156
msgid ""
157
"Note that --short or -S gives status flags for each item, similar\n"
158
"to Subversion's status command. To get output similar to svn -q,\n"
159
"use bzr status -SV."
160
msgstr ""
161
162
#: bzrlib/builtins.py:253
163
msgid ""
164
"If no arguments are specified, the status of the entire working\n"
165
"directory is shown. Otherwise, only the status of the specified\n"
166
"files or directories is reported. If a directory is given, status\n"
167
"is reported for everything inside that directory."
168
msgstr ""
169
170
#: bzrlib/builtins.py:258
171
msgid ""
172
"Before merges are committed, the pending merge tip revisions are\n"
173
"shown. To see all pending merge revisions, use the -v option.\n"
174
"To skip the display of pending merge information altogether, use\n"
175
"the no-pending option or specify a file/directory."
176
msgstr ""
177
178
#: bzrlib/builtins.py:263
179
msgid ""
180
"To compare the working directory to a specific revision, pass a\n"
181
"single revision to the revision argument."
182
msgstr ""
183
184
#: bzrlib/builtins.py:266
185
msgid ""
186
"To see which files have changed in a specific revision, or between\n"
187
"two revisions, pass a revision range to the revision argument.\n"
188
"This will produce the same results as calling 'bzr diff --summarize'."
189
msgstr ""
190
191
#: bzrlib/builtins.py:275
192
msgid "Use short status indicators."
193
msgstr "Usar indicadores de estado cortos."
194
195
#: bzrlib/builtins.py:277
196
msgid "Only show versioned files."
197
msgstr "Solo mostrar archivos versionados."
198
199
#: bzrlib/builtins.py:279
200
msgid "Don't show pending merges."
201
msgstr "No mostrar fusiones pendientes."
202
203
#: bzrlib/builtins.py:282
204
msgid "Do not mark object type using indicator."
205
msgstr "No marcar tipo de objeto usando indicador."
206
207
#: bzrlib/builtins.py:297
208
msgid "bzr status --revision takes exactly one or two revision specifiers"
209
msgstr ""
210
"bzr status --revision toma exactamente uno o dos especificadores de revisión"
211
212
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
213
msgid "You can only supply one of revision_id or --revision"
214
msgstr "Puede suiministrar solo uno revision_id o --revision"
215
216
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
217
msgid "You must supply either --revision or a revision_id"
218
msgstr "Puede suiministrar ambos revision_id o --revision"
219
220
#: bzrlib/builtins.py:351
221
#, python-format
222
msgid "Repository %r does not support access to raw revision texts"
223
msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
224
225
#: bzrlib/builtins.py:362
226
msgid "The repository {0} contains no revision {1}."
227
msgstr "El repositorio {0} no contiene revisión {1}."
228
229
#: bzrlib/builtins.py:369
230
msgid "You cannot specify a NULL revision."
231
msgstr "No puede especificar una revisión NULL."
232
233
#: bzrlib/builtins.py:461
234
msgid "Remove the working tree from a given branch/checkout."
235
msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
236
237
#: bzrlib/builtins.py:463
238
msgid ""
239
"Since a lightweight checkout is little more than a working tree\n"
240
"this will refuse to run against one."
241
msgstr ""
242
243
#: bzrlib/builtins.py:466
244
msgid "To re-create the working tree, use \"bzr checkout\"."
245
msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
246
247
#: bzrlib/builtins.py:472
248
msgid ""
249
"Remove the working tree even if it has uncommitted or shelved changes."
250
msgstr ""
251
252
#: bzrlib/builtins.py:486
253
msgid "No working tree to remove"
254
msgstr "No existe un árbol de trabajo para eliminar"
255
256
#: bzrlib/builtins.py:488
257
msgid "You cannot remove the working tree of a remote path"
258
msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
259
260
#: bzrlib/builtins.py:497
261
msgid "You cannot remove the working tree from a lightweight checkout"
262
msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
263
264
#: bzrlib/builtins.py:537
265
msgid ""
266
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
267
"instead. Use \"--force\" if you are sure you want to reset the working tree."
268
msgstr ""
269
270
#: bzrlib/builtins.py:548
271
msgid ""
272
", the header appears corrupt, try passing -r -1 to set the state to the last "
273
"commit"
274
msgstr ""
275
276
#: bzrlib/builtins.py:552
277
msgid "failed to reset the tree state{0}"
278
msgstr "fallo al restablecer el estado{0} del árbol"
279
280
#: bzrlib/builtins.py:556
281
msgid "Show current revision number."
282
msgstr "Mostrar número de revisión actual."
283
284
#: bzrlib/builtins.py:558
285
msgid "This is equal to the number of revisions on this branch."
286
msgstr "Esto es igual al número de revisiones en esta rama."
287
288
#: bzrlib/builtins.py:571
289
msgid "--tree and --revision can not be used together"
290
msgstr "--tree y --revision no se pueden usar juntos"
291
292
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
293
msgid "Tags can only be placed on a single revision, not on a range"
294
msgstr ""
295
"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
296
297
#: bzrlib/builtins.py:612
298
msgid "Show revno of working tree."
299
msgstr "Mostrar número de revisión del árbol de trabajo."
300
301
#: bzrlib/builtins.py:660
302
msgid "Add specified files or directories."
303
msgstr "Añadir archivos especificados o directorios."
304
305
#: bzrlib/builtins.py:662
306
msgid ""
307
"In non-recursive mode, all the named items are added, regardless\n"
308
"of whether they were previously ignored. A warning is given if\n"
309
"any of the named files are already versioned."
310
msgstr ""
311
"En el modo no recursivo, todos los puntos mencionados se añaden, \n"
312
"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
313
"cualquiera de los archivos nombrados ya está versionado."
314
315
#: bzrlib/builtins.py:666
316
msgid ""
317
"In recursive mode (the default), files are treated the same way\n"
318
"but the behaviour for directories is different. Directories that\n"
319
"are already versioned do not give a warning. All directories,\n"
320
"whether already versioned or not, are searched for files or\n"
321
"subdirectories that are neither versioned or ignored, and these\n"
322
"are added. This search proceeds recursively into versioned\n"
323
"directories. If no names are given '.' is assumed."
324
msgstr ""
325
326
#: bzrlib/builtins.py:674
327
msgid ""
328
"A warning will be printed when nested trees are encountered,\n"
329
"unless they are explicitly ignored."
330
msgstr ""
331
332
#: bzrlib/builtins.py:677
333
msgid ""
334
"Therefore simply saying 'bzr add' will version all files that\n"
335
"are currently unknown."
336
msgstr ""
337
"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
338
"desconocidos actualmente."
339
340
#: bzrlib/builtins.py:680
341
msgid ""
342
"Adding a file whose parent directory is not versioned will\n"
343
"implicitly add the parent, and so on up to the root. This means\n"
344
"you should never need to explicitly add a directory, they'll just\n"
345
"get added when you add a file in the directory."
346
msgstr ""
347
348
#: bzrlib/builtins.py:685
349
msgid ""
350
"--dry-run will show which files would be added, but not actually\n"
351
"add them."
352
msgstr ""
353
"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
354
"añade realmente."
355
356
#: bzrlib/builtins.py:688
357
msgid ""
358
"--file-ids-from will try to use the file ids from the supplied path.\n"
359
"It looks up ids trying to find a matching parent directory with the\n"
360
"same filename, and then by pure path. This option is rarely needed\n"
361
"but can be useful when adding the same logical file into two\n"
362
"branches that will be merged later (without showing the two different\n"
363
"adds as a conflict). It is also useful when merging another project\n"
364
"into a subdirectory of this one."
365
msgstr ""
366
367
#: bzrlib/builtins.py:696
368
msgid ""
369
"Any files matching patterns in the ignore list will not be added\n"
370
"unless they are explicitly mentioned."
371
msgstr ""
372
"Cualquier archivo que coincida con los patrones en la lista de ignorados no "
373
"se añadirá\n"
374
"salvo que se mencione explícitamente."
375
376
#: bzrlib/builtins.py:699
377
msgid ""
378
"In recursive mode, files larger than the configuration option \n"
379
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
380
"to file size."
381
msgstr ""
382
"En modo recursivo, los archivos mayores que la opción de configuración \n"
383
"add.maximum_file_size se omitirán. Los elementos nombrados nunca se "
384
"omitirán\n"
385
"por su tamaño."
386
387
#: bzrlib/builtins.py:706
388
msgid "Don't recursively add the contents of directories."
389
msgstr "No añade de manera recursiva los contenidos de los directorios."
390
391
#: bzrlib/builtins.py:712
392
msgid "Lookup file ids from this tree."
393
msgstr "Buscar id de archivos desde este árbol."
394
395
#: bzrlib/builtins.py:748
396
msgid "ignored {0} matching \"{1}\"\n"
397
msgstr "ignorado {0} coincidente «{1}»\n"
398
399
#: bzrlib/builtins.py:753
400
msgid "Create a new versioned directory."
401
msgstr "Crear un directorio versionado nuevo."
402
403
#: bzrlib/builtins.py:755
404
msgid "This is equivalent to creating the directory and then adding it."
405
msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
406
407
#: bzrlib/builtins.py:762
408
msgid "No error if existing, make parent directories as needed."
409
msgstr ""
410
411
#: bzrlib/builtins.py:796
412
#, python-format
413
msgid "added %s\n"
414
msgstr "añadido %s\n"
415
416
#: bzrlib/builtins.py:838
417
#, python-format
418
msgid "invalid kind %r specified"
419
msgstr "tipo inválido %r especificado"
420
421
#: bzrlib/builtins.py:875
422
msgid "Move or rename a file."
423
msgstr "Mover o renombrar un archivo."
424
425
#: bzrlib/builtins.py:877
426
msgid " bzr mv SOURCE... DESTINATION"
427
msgstr " bzr mv ORIGEN... DESTINO"
428
429
#: bzrlib/builtins.py:879
430
msgid ""
431
"If the last argument is a versioned directory, all the other names\n"
432
"are moved into it. Otherwise, there must be exactly two arguments\n"
433
"and the file is changed to a new name."
434
msgstr ""
435
436
#: bzrlib/builtins.py:883
437
msgid ""
438
"If OLDNAME does not exist on the filesystem but is versioned and\n"
439
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
440
"assumes that the file has been manually moved and only updates\n"
441
"its internal inventory to reflect that change.\n"
442
"The same is valid when moving many SOURCE files to a DESTINATION."
443
msgstr ""
444
445
#: bzrlib/builtins.py:889
446
msgid "Files cannot be moved between branches."
447
msgstr "Los archivos no se pueden mover entre ramas."
448
449
#: bzrlib/builtins.py:896
450
msgid ""
451
"Move only the bzr identifier of the file, because the file has already been "
452
"moved."
453
msgstr ""
454
455
#: bzrlib/builtins.py:898
456
msgid "Automatically guess renames."
457
msgstr "Adivinar automáticamente rel renombrado."
458
459
#: bzrlib/builtins.py:899
460
msgid "Avoid making changes when guessing renames."
461
msgstr "Evitar hacer cambios cunado se adivina el renombrado."
462
463
#: bzrlib/builtins.py:908
464
msgid "--dry-run requires --auto."
465
msgstr "--dry-run requiere --auto."
466
467
#: bzrlib/builtins.py:912
468
msgid "missing file argument"
469
msgstr "falta el argumento de archivo"
470
471
#: bzrlib/builtins.py:916
472
msgid "can not move root of branch"
473
msgstr "no se puede mover la raíz de la rama"
474
475
#: bzrlib/builtins.py:922
476
msgid "Only one path may be specified to --auto."
477
msgstr "Solo se puede especificar una ruta a --auto"
478
479
#: bzrlib/builtins.py:925
480
msgid "--after cannot be specified with --auto."
481
msgstr "--after no se puede especificar con --auto."
482
483
#: bzrlib/builtins.py:962
484
msgid "to mv multiple files the destination must be a versioned directory"
485
msgstr ""
486
"para hacer mv a múltiples archivos el destino debe ser un directorio "
487
"versionado"
488
489
#: bzrlib/builtins.py:1014
490
msgid "Turn this branch into a mirror of another branch."
491
msgstr "Cambiar esta rama a una réplica de otra rama."
492
493
#: bzrlib/builtins.py:1016
494
msgid ""
495
"By default, this command only works on branches that have not diverged.\n"
496
"Branches are considered diverged if the destination branch's most recent \n"
497
"commit is one that has not been merged (directly or indirectly) into the \n"
498
"parent."
499
msgstr ""
500
501
#: bzrlib/builtins.py:1021
502
msgid ""
503
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
504
"from one into the other. Once one branch has merged, the other should\n"
505
"be able to pull it again."
506
msgstr ""
507
508
#: bzrlib/builtins.py:1025
509
msgid ""
510
"If you want to replace your local changes and just want your branch to\n"
511
"match the remote one, use pull --overwrite. This will work even if the two\n"
512
"branches have diverged."
513
msgstr ""
514
515
#: bzrlib/builtins.py:1029
516
msgid ""
517
"If there is no default location set, the first pull will set it (use\n"
518
"--no-remember to avoid setting it). After that, you can omit the\n"
519
"location to use the default. To change the default, use --remember. The\n"
520
"value will only be saved if the remote location can be accessed."
521
msgstr ""
522
523
#: bzrlib/builtins.py:1034
524
msgid ""
525
"The --verbose option will display the revisions pulled using the log_format\n"
526
"configuration option. You can use a different format by overriding it with\n"
527
"-Olog_format=<other_format>."
528
msgstr ""
529
530
#: bzrlib/builtins.py:1038
531
msgid ""
532
"Note: The location can be specified either in the form of a branch,\n"
533
"or in the form of a path to a file containing a merge directive generated\n"
534
"with bzr send."
535
msgstr ""
536
537
#: bzrlib/builtins.py:1046
538
msgid "Show logs of pulled revisions."
539
msgstr "Mostrar registros de revisiones extraídas."
540
541
#: bzrlib/builtins.py:1048
542
msgid ""
543
"Branch to pull into, rather than the one containing the working directory."
544
msgstr ""
545
546
#: bzrlib/builtins.py:1051
547
msgid ""
548
"Perform a local pull in a bound branch. Local pulls are not applied to the "
549
"master branch."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1080
553
msgid "Need working tree for --show-base."
554
msgstr "Se necesita árbol de trabajo para --show-base."
555
556
#: bzrlib/builtins.py:1096
557
msgid "No pull location known or specified."
558
msgstr ""
559
560
#: bzrlib/builtins.py:1102
561
#, python-format
562
msgid "Using saved parent location: %s\n"
563
msgstr "Usar ubicaciones padre guardadas: %s\n"
564
565
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
566
msgid "Cannot use -r with merge directives or bundles"
567
msgstr ""
568
569
#: bzrlib/builtins.py:1150
570
msgid "Update a mirror of this branch."
571
msgstr "Actualizar una réplica de esta rama."
572
573
#: bzrlib/builtins.py:1152
574
msgid ""
575
"The target branch will not have its working tree populated because this\n"
576
"is both expensive, and is not supported on remote file systems."
577
msgstr ""
578
579
#: bzrlib/builtins.py:1155
580
msgid ""
581
"Some smart servers or protocols *may* put the working tree in place in\n"
582
"the future."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1158
586
msgid ""
587
"This command only works on branches that have not diverged. Branches are\n"
588
"considered diverged if the destination branch's most recent commit is one\n"
589
"that has not been merged (directly or indirectly) by the source branch."
590
msgstr ""
591
592
#: bzrlib/builtins.py:1162
593
msgid ""
594
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
595
"the other branch completely, discarding its unmerged changes."
596
msgstr ""
597
"Si las ramas tienen divergencias, puede usar «bzr push --overwrite» para "
598
"reemplazar\n"
599
"la otra rama completamente, descartando sus cambios no fusionados."
600
601
#: bzrlib/builtins.py:1165
602
msgid ""
603
"If you want to ensure you have the different changes in the other branch,\n"
604
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
605
"After that you will be able to do a push without '--overwrite'."
606
msgstr ""
607
608
#: bzrlib/builtins.py:1169
609
msgid ""
610
"If there is no default push location set, the first push will set it (use\n"
611
"--no-remember to avoid setting it). After that, you can omit the\n"
612
"location to use the default. To change the default, use --remember. The\n"
613
"value will only be saved if the remote location can be accessed."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1174
617
msgid ""
618
"The --verbose option will display the revisions pushed using the log_format\n"
619
"configuration option. You can use a different format by overriding it with\n"
620
"-Olog_format=<other_format>."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
624
msgid ""
625
"Branch to push from, rather than the one containing the working directory."
626
msgstr ""
627
"Rama desde la que impulsar en vez de la que contiene el directorio de "
628
"trabajo."
629
630
#: bzrlib/builtins.py:1188
631
msgid ""
632
"By default push will fail if the target directory exists, but does not "
633
"already have a control directory. This flag will allow push to proceed."
634
msgstr ""
635
636
#: bzrlib/builtins.py:1193
637
msgid ""
638
"Create a stacked branch that references the public location of the parent "
639
"branch."
640
msgstr ""
641
"Crear una rama apilada que referencia a la ubicación pública de la rama "
642
"padre."
643
644
#: bzrlib/builtins.py:1196
645
msgid ""
646
"Create a stacked branch that refers to another branch for the commit "
647
"history. Only the work not present in the referenced branch is included in "
648
"the branch created."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
652
msgid ""
653
"Refuse to push if there are uncommitted changes in the working tree, --no-"
654
"strict disables the check."
655
msgstr ""
656
"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
657
"strict desactiva la comprobación."
658
659
#: bzrlib/builtins.py:1204
660
msgid "Don't populate the working tree, even for protocols that support it."
661
msgstr ""
662
"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
663
664
#: bzrlib/builtins.py:1248
665
msgid "Could not determine branch to refer to."
666
msgstr "No se puede determinar la rama a la que referirse."
667
668
#: bzrlib/builtins.py:1257
669
#, python-format
670
msgid ""
671
"No push location known or specified. To push to the parent branch (at %s), "
672
"use 'bzr push :parent'."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
676
msgid "No push location known or specified."
677
msgstr "No hay una ubicación para impulsar conocida o especificada."
678
679
#: bzrlib/builtins.py:1267
680
#, python-format
681
msgid "Using saved push location: %s"
682
msgstr "Usar la ubicación para impulsar guardada: %s"
683
684
#: bzrlib/builtins.py:1277
685
msgid "Create a new branch that is a copy of an existing branch."
686
msgstr "Crea una nueva rama que es una copia de la rama existente."
687
688
#: bzrlib/builtins.py:1279
689
msgid ""
690
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
691
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
692
"./bar.\n"
693
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
694
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
695
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
696
"create ./foo-bar."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1286
700
msgid ""
701
"To retrieve the branch as of a particular revision, supply the --revision\n"
702
"parameter, as in \"branch foo/bar -r 5\"."
703
msgstr ""
704
"Para conseguir la rama de una revisión particular, proporcione el parámetro -"
705
"-revision\n"
706
"como en «branch foo/bar -r 5»."
707
708
#: bzrlib/builtins.py:1289
709
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
710
msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
711
712
#: bzrlib/builtins.py:1299
713
msgid "Create a branch without a working-tree."
714
msgstr "Crear una rama sin directorio de trabajo."
715
716
#: bzrlib/builtins.py:1301
717
msgid "Switch the checkout in the current directory to the new branch."
718
msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
719
720
#: bzrlib/builtins.py:1304
721
msgid ""
722
"Create a stacked branch referring to the source branch. The new branch will "
723
"depend on the availability of the source branch for all operations."
724
msgstr ""
725
726
#: bzrlib/builtins.py:1308
727
msgid "Do not use a shared repository, even if available."
728
msgstr "No usar un repositorio compartido, incluso si está disponible."
729
730
#: bzrlib/builtins.py:1310
731
msgid ""
732
"By default branch will fail if the target directory exists, but does not "
733
"already have a control directory. This flag will allow branch to proceed."
734
msgstr ""
735
736
#: bzrlib/builtins.py:1315
737
msgid "Bind new branch to from location."
738
msgstr "Vincular una rama nueva desde la ubicación."
739
740
#: bzrlib/builtins.py:1362
741
#, python-format
742
msgid "Target directory \"%s\" already exists."
743
msgstr "El directorio objetivo «%s» ya existe."
744
745
#: bzrlib/builtins.py:1374
746
#, python-format
747
msgid "Parent of \"%s\" does not exist."
748
msgstr "El padre de «%s» no existe."
749
750
#: bzrlib/builtins.py:1393
751
msgid "The branch {0} has no revision {1}."
752
msgstr "La rama {0} no tiene revisión {1}."
753
754
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
755
#, python-format
756
msgid "Created new stacked branch referring to %s."
757
msgstr "Creada rama apilada nueva referida a %s."
758
759
#: bzrlib/builtins.py:1407
760
#, python-format
761
msgid "Branched %d revision."
762
msgid_plural "Branched %d revisions."
763
msgstr[0] "%d revisión enramada"
764
msgstr[1] "%d revisiones enramadas"
765
766
#: bzrlib/builtins.py:1412
767
#, python-format
768
msgid "New branch bound to %s"
769
msgstr "Nueva rama unida a %s"
770
771
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
772
#, python-format
773
msgid "Switched to branch: %s"
774
msgstr "Cambiado a la rama: %s"
775
776
#: bzrlib/builtins.py:1422
777
msgid "List the branches available at the current location."
778
msgstr "Lista las ramas disponibles en la ubicación actual."
779
780
#: bzrlib/builtins.py:1424
781
msgid ""
782
"This command will print the names of all the branches at the current\n"
783
"location."
784
msgstr ""
785
"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
786
"actual."
787
788
#: bzrlib/builtins.py:1431
789
msgid ""
790
"Recursively scan for branches rather than just looking in the specified "
791
"location."
792
msgstr ""
793
794
#: bzrlib/builtins.py:1461
795
msgid "(default)"
796
msgstr ""
797
798
#: bzrlib/builtins.py:1473
799
msgid "Create a new checkout of an existing branch."
800
msgstr "Crea una nueva comprobación de una rama existente."
801
802
#: bzrlib/builtins.py:1475
803
msgid ""
804
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
805
"for\n"
806
"the branch found in '.'. This is useful if you have removed the working "
807
"tree\n"
808
"or if it was never created - i.e. if you pushed the branch to its current\n"
809
"location using SFTP."
810
msgstr ""
811
812
#: bzrlib/builtins.py:1480
813
msgid ""
814
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
815
"will\n"
816
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
817
"./bar.\n"
818
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
819
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
820
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
821
"create ./foo-bar."
822
msgstr ""
823
824
#: bzrlib/builtins.py:1487
825
msgid ""
826
"To retrieve the branch as of a particular revision, supply the --revision\n"
827
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
828
"immediately\n"
829
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
830
"old\n"
831
"code.)"
832
msgstr ""
833
834
#: bzrlib/builtins.py:1497
835
msgid ""
836
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
837
"the branch for every operation. Normal checkouts can perform common "
838
"operations like diff and status without such access, and also support local "
839
"commits."
840
msgstr ""
841
842
#: bzrlib/builtins.py:1504
843
msgid "Get file contents from this tree."
844
msgstr "Conseguir contenidos de archivo desde este árbol."
845
846
#: bzrlib/builtins.py:1506
847
msgid "Hard-link working tree files where possible."
848
msgstr ""
849
"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
850
851
#: bzrlib/builtins.py:1547
852
msgid ""
853
"Show list of renamed files.\n"
854
" "
855
msgstr ""
856
"Mostrar la lista de archivos renombrados\n"
857
" "
858
859
#: bzrlib/builtins.py:1577
860
msgid "Update a working tree to a new revision."
861
msgstr "Actualiza un árbol de trabajo a una revisión nueva."
862
863
#: bzrlib/builtins.py:1579
864
msgid ""
865
"This will perform a merge of the destination revision (the tip of the\n"
866
"branch, or the specified revision) into the working tree, and then make\n"
867
"that revision the basis revision for the working tree. "
868
msgstr ""
869
870
#: bzrlib/builtins.py:1583
871
msgid ""
872
"You can use this to visit an older revision, or to update a working tree\n"
873
"that is out of date from its branch."
874
msgstr ""
875
876
#: bzrlib/builtins.py:1586
877
msgid ""
878
"If there are any uncommitted changes in the tree, they will be carried\n"
879
"across and remain as uncommitted changes after the update. To discard\n"
880
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
881
"with the changes brought in by the change in basis revision."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1591
885
msgid ""
886
"If the tree's branch is bound to a master branch, bzr will also update\n"
887
"the branch from the master."
888
msgstr ""
889
890
#: bzrlib/builtins.py:1594
891
msgid ""
892
"You cannot update just a single file or directory, because each Bazaar\n"
893
"working tree has just a single basis revision. If you want to restore a\n"
894
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
895
"update'. If you want to restore a file to its state in a previous\n"
896
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
897
"out the old content of that file to a new location."
898
msgstr ""
899
900
#: bzrlib/builtins.py:1601
901
msgid ""
902
"The 'dir' argument, if given, must be the location of the root of a\n"
903
"working tree to update. By default, the working tree that contains the \n"
904
"current working directory is used."
905
msgstr ""
906
907
#: bzrlib/builtins.py:1617
908
msgid "bzr update --revision takes exactly one revision"
909
msgstr "bzr update --revision toma exactamente una revisión"
910
911
#: bzrlib/builtins.py:1625
912
msgid "bzr update can only update a whole tree, not a file or subdirectory"
913
msgstr ""
914
"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
915
916
#: bzrlib/builtins.py:1656
917
msgid "Tree is up to date at revision {0} of branch {1}"
918
msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
919
920
#: bzrlib/builtins.py:1672
921
#, python-format
922
msgid ""
923
"branch has no revision %s\n"
924
"bzr update --revision only works for a revision in the branch history"
925
msgstr ""
926
"la rama no tiene revisión %s\n"
927
"bzr update --revision solo funciona para una revisión en el histórico de la "
928
"rama"
929
930
#: bzrlib/builtins.py:1678
931
msgid "Updated to revision {0} of branch {1}"
932
msgstr "Actualizado a la revisión {0} de la rama {1}"
933
934
#: bzrlib/builtins.py:1682
935
msgid ""
936
"Your local commits will now show as pending merges with 'bzr status', and "
937
"can be committed with 'bzr commit'."
938
msgstr ""
939
940
#: bzrlib/builtins.py:1691
941
msgid "Show information about a working tree, branch or repository."
942
msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
943
944
#: bzrlib/builtins.py:1693
945
msgid ""
946
"This command will show all known locations and formats associated to the\n"
947
"tree, branch or repository."
948
msgstr ""
949
"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
950
"árbol, rama o repositorio."
951
952
#: bzrlib/builtins.py:1696
953
msgid ""
954
"In verbose mode, statistical information is included with each report.\n"
955
"To see extended statistic information, use a verbosity level of 2 or\n"
956
"higher by specifying the verbose option multiple times, e.g. -vv."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1700
960
msgid "Branches and working trees will also report any missing revisions."
961
msgstr ""
962
"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
963
"que falte."
964
965
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
966
#: bzrlib/builtins.py:6389
967
msgid ":Examples:"
968
msgstr ":Ejemplos:"
969
970
#: bzrlib/builtins.py:1704
971
msgid " Display information on the format and related locations:"
972
msgstr " Muestra información en el formato y ubicaciones relacionadas:"
973
974
#: bzrlib/builtins.py:1706
975
msgid " bzr info"
976
msgstr " información bzr"
977
978
#: bzrlib/builtins.py:1708
979
msgid ""
980
" Display the above together with extended format information and\n"
981
" basic statistics (like the number of files in the working tree and\n"
982
" number of revisions in the branch and repository):"
983
msgstr ""
984
985
#: bzrlib/builtins.py:1712
986
msgid " bzr info -v"
987
msgstr " bzr info -v"
988
989
#: bzrlib/builtins.py:1714
990
msgid " Display the above together with number of committers to the branch:"
991
msgstr " Mostrar lo anterior junto con el número de aplicadores de la rama:"
992
993
#: bzrlib/builtins.py:1716
994
msgid " bzr info -vv"
995
msgstr " bzr info -vv"
996
997
#: bzrlib/builtins.py:1735
998
msgid "Remove files or directories."
999
msgstr "Elimina archivos o directorios."
1000
1001
#: bzrlib/builtins.py:1737
1002
msgid ""
1003
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1004
"delete them if they can easily be recovered using revert otherwise they\n"
1005
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1006
"parameters are given Bazaar will scan for files that are being tracked by\n"
1007
"Bazaar but missing in your tree and stop tracking them for you."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1745
1011
msgid "Only remove files that have never been committed."
1012
msgstr "Eliminar solo los archivos que nunca se han aplicado."
1013
1014
#: bzrlib/builtins.py:1747
1015
msgid "The file deletion mode to be used."
1016
msgstr "El modo de borrado de archivo a usar."
1017
1018
#: bzrlib/builtins.py:1748
1019
msgid "Deletion Strategy"
1020
msgstr "Estrategia de borrado"
1021
1022
#: bzrlib/builtins.py:1749
1023
msgid "Backup changed files (default)."
1024
msgstr ""
1025
1026
#: bzrlib/builtins.py:1750
1027
msgid "Delete from bzr but leave the working copy."
1028
msgstr ""
1029
1030
#: bzrlib/builtins.py:1751
1031
msgid "Don't backup changed files."
1032
msgstr ""
1033
1034
#: bzrlib/builtins.py:1752
1035
msgid ""
1036
"Delete all the specified files, even if they can not be recovered and even "
1037
"if they are non-empty directories. (deprecated, use no-backup)"
1038
msgstr ""
1039
1040
#: bzrlib/builtins.py:1761
1041
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1042
msgstr ""
1043
"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
1044
1045
#: bzrlib/builtins.py:1778
1046
msgid "No matching files."
1047
msgstr "No hay archivos coincidentes."
1048
1049
#: bzrlib/builtins.py:1839
1050
msgid "Reconcile bzr metadata in a branch."
1051
msgstr "Reconcilia metadatos bzr en una rama."
1052
1053
#: bzrlib/builtins.py:1841
1054
msgid ""
1055
"This can correct data mismatches that may have been caused by\n"
1056
"previous ghost operations or bzr upgrades. You should only\n"
1057
"need to run this command if 'bzr check' or a bzr developer\n"
1058
"advises you to run it."
1059
msgstr ""
1060
1061
#: bzrlib/builtins.py:1846
1062
msgid ""
1063
"If a second branch is provided, cross-branch reconciliation is\n"
1064
"also attempted, which will check that data like the tree root\n"
1065
"id which was not present in very early bzr versions is represented\n"
1066
"correctly in both branches."
1067
msgstr ""
1068
1069
#: bzrlib/builtins.py:1851
1070
msgid ""
1071
"At the same time it is run it may recompress data resulting in\n"
1072
"a potential saving in disk space or performance gain."
1073
msgstr ""
1074
"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
1075
"un ahorro potencial de espacio en disco o aumento el rendimiento."
1076
1077
#: bzrlib/builtins.py:1854
1078
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1079
msgstr ""
1080
"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
1081
"o sftp."
1082
1083
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1084
msgid ""
1085
"Format for the bzr 2.0 series.\n"
1086
"Uses group-compress storage.\n"
1087
"Provides rich roots which are a one-way transition.\n"
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1091
msgid ""
1092
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1093
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1094
msgstr ""
1095
1096
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1097
msgid "The 2a format with experimental support for colocated branches.\n"
1098
msgstr ""
1099
1100
#: bzrlib/builtins.py:1922
1101
msgid "Make a directory into a versioned branch."
1102
msgstr "Hacer un directorio en una rama versionada."
1103
1104
#: bzrlib/builtins.py:1924
1105
msgid ""
1106
"Use this to create an empty branch, or before importing an\n"
1107
"existing project."
1108
msgstr ""
1109
"Use esto para crear una rama nueva o antes de importar un\n"
1110
"proyecto existente."
1111
1112
#: bzrlib/builtins.py:1927
1113
msgid ""
1114
"If there is a repository in a parent directory of the location, then\n"
1115
"the history of the branch will be stored in the repository. Otherwise\n"
1116
"init creates a standalone branch which carries its own history\n"
1117
"in the .bzr directory."
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:1932
1121
msgid ""
1122
"If there is already a branch at the location but it has no working tree,\n"
1123
"the tree can be populated with 'bzr checkout'."
1124
msgstr ""
1125
1126
#: bzrlib/builtins.py:1935
1127
msgid "Recipe for importing a tree of files::"
1128
msgstr "Recipiente para importar un árbol de archivos:"
1129
1130
#: bzrlib/builtins.py:1937
1131
msgid ""
1132
" cd ~/project\n"
1133
" bzr init\n"
1134
" bzr add .\n"
1135
" bzr status\n"
1136
" bzr commit -m \"imported project\""
1137
msgstr ""
1138
" cd ~/project\n"
1139
" bzr init\n"
1140
" bzr add .\n"
1141
" bzr status\n"
1142
" bzr commit -m «proyecto importado»"
1143
1144
#: bzrlib/builtins.py:1948
1145
msgid ""
1146
"Create the path leading up to the branch if it does not already exist."
1147
msgstr "Crea la ruta que conduce a la rama si no existe ya."
1148
1149
#: bzrlib/builtins.py:1951
1150
msgid "Specify a format for this branch. See \"help formats\"."
1151
msgstr "Especificar un formato para esta rama. Vea «help formats»"
1152
1153
#: bzrlib/builtins.py:1959
1154
msgid ""
1155
"Never change revnos or the existing log. Append revisions to it only."
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:1962
1159
msgid "Create a branch without a working tree."
1160
msgstr "Crea una rama sin árbol de trabajo."
1161
1162
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1163
#, python-format
1164
msgid ""
1165
"Parent directory of %s does not exist.\n"
1166
"You may supply --create-prefix to create all leading parent directories."
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2016
1170
msgid ""
1171
"This branch format cannot be set to append-revisions-only. Try --default."
1172
msgstr ""
1173
"Este formato de rama no se puede establecer como append-revisions-only. "
1174
"Intente --default."
1175
1176
#: bzrlib/builtins.py:2027
1177
msgid "Created a {0} (format: {1})\n"
1178
msgstr "Creado un {0} (formaot: {1})\n"
1179
1180
#: bzrlib/builtins.py:2036
1181
#, python-format
1182
msgid "Using shared repository: %s\n"
1183
msgstr "Usando el repositorio compartido: %s\n"
1184
1185
#: bzrlib/builtins.py:2040
1186
msgid "Create a shared repository for branches to share storage space."
1187
msgstr ""
1188
"Crea un repositorio compartido para ramas para compartir el espacio de "
1189
"almacenamiento."
1190
1191
#: bzrlib/builtins.py:2042
1192
msgid ""
1193
"New branches created under the repository directory will store their\n"
1194
"revisions in the repository, not in the branch directory. For branches\n"
1195
"with shared history, this reduces the amount of storage needed and \n"
1196
"speeds up the creation of new branches."
1197
msgstr ""
1198
1199
#: bzrlib/builtins.py:2047
1200
msgid ""
1201
"If the --no-trees option is given then the branches in the repository\n"
1202
"will not have working trees by default. They will still exist as \n"
1203
"directories on disk, but they will not have separate copies of the \n"
1204
"files at a certain revision. This can be useful for repositories that\n"
1205
"store branches which are interacted with through checkouts or remote\n"
1206
"branches, such as on a server."
1207
msgstr ""
1208
1209
#: bzrlib/builtins.py:2054
1210
msgid ""
1211
":Examples:\n"
1212
" Create a shared repository holding just branches::"
1213
msgstr ""
1214
":Ejemplos:\n"
1215
" Crear un repositorio compartido manteniendo solo las ramas::"
1216
1217
#: bzrlib/builtins.py:2057
1218
msgid ""
1219
" bzr init-repo --no-trees repo\n"
1220
" bzr init repo/trunk"
1221
msgstr ""
1222
" bzr init-repo --no-trees repo\n"
1223
" bzr init repo/trunk"
1224
1225
#: bzrlib/builtins.py:2060
1226
msgid " Make a lightweight checkout elsewhere::"
1227
msgstr " Hace una comprobación ligera en cualquier sitio::"
1228
1229
#: bzrlib/builtins.py:2062
1230
msgid ""
1231
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1232
" cd trunk-checkout\n"
1233
" (add files here)"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2070
1237
msgid ""
1238
"Specify a format for this repository. See \"bzr help formats\" for details."
1239
msgstr ""
1240
"Especificar un formato para este repositorio, Vea «bzr help formats» para "
1241
"tener más detalles."
1242
1243
#: bzrlib/builtins.py:2074
1244
msgid "Repository format"
1245
msgstr "Formato de repositorio"
1246
1247
#: bzrlib/builtins.py:2076
1248
msgid "Branches in the repository will default to not having a working tree."
1249
msgstr ""
1250
"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
1251
"trabajo."
1252
1253
#: bzrlib/builtins.py:2102
1254
msgid "Show differences in the working tree, between revisions or branches."
1255
msgstr ""
1256
"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
1257
1258
#: bzrlib/builtins.py:2104
1259
msgid ""
1260
"If no arguments are given, all changes for the current tree are listed.\n"
1261
"If files are given, only the changes in those files are listed.\n"
1262
"Remote and multiple branches can be compared by using the --old and\n"
1263
"--new options. If not provided, the default for both is derived from\n"
1264
"the first argument, if any, or the current tree if no arguments are\n"
1265
"given."
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2111
1269
msgid ""
1270
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1271
"produces patches suitable for \"patch -p1\"."
1272
msgstr ""
1273
1274
#: bzrlib/builtins.py:2114
1275
msgid ""
1276
"Note that when using the -r argument with a range of revisions, the\n"
1277
"differences are computed between the two specified revisions. That\n"
1278
"is, the command does not show the changes introduced by the first \n"
1279
"revision in the range. This differs from the interpretation of \n"
1280
"revision ranges used by \"bzr log\" which includes the first revision\n"
1281
"in the range."
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2121
1285
msgid ""
1286
":Exit values:\n"
1287
" 1 - changed\n"
1288
" 2 - unrepresentable changes\n"
1289
" 3 - error\n"
1290
" 0 - no change"
1291
msgstr ""
1292
":Valores de salida:\n"
1293
" 1 - cambiado\n"
1294
" 2 - cambios no representables\n"
1295
" 3 - error\n"
1296
" 0 - sin cambios"
1297
1298
#: bzrlib/builtins.py:2127
1299
msgid ""
1300
":Examples:\n"
1301
" Shows the difference in the working tree versus the last commit::"
1302
msgstr ""
1303
":Ejemplos:\n"
1304
" Muestra las diferencias en el árbol de trabajo contra la última "
1305
"aplicación::"
1306
1307
#: bzrlib/builtins.py:2130
1308
msgid " bzr diff"
1309
msgstr " bzr diff"
1310
1311
#: bzrlib/builtins.py:2132
1312
msgid " Difference between the working tree and revision 1::"
1313
msgstr " Diferencia entre el árbol de trabajo y la revisión 1::"
1314
1315
#: bzrlib/builtins.py:2134
1316
msgid " bzr diff -r1"
1317
msgstr " bzr diff -r1"
1318
1319
#: bzrlib/builtins.py:2136
1320
msgid " Difference between revision 3 and revision 1::"
1321
msgstr " Diferencia entre revisión 3 y revisión 1::"
1322
1323
#: bzrlib/builtins.py:2138
1324
msgid " bzr diff -r1..3"
1325
msgstr " bzr diff -r1..3"
1326
1327
#: bzrlib/builtins.py:2140
1328
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1329
msgstr " Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
1330
1331
#: bzrlib/builtins.py:2142
1332
msgid " bzr diff -r1..3 xxx"
1333
msgstr " bzr diff -r1..3 xxx"
1334
1335
#: bzrlib/builtins.py:2144
1336
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1337
msgstr ""
1338
" Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
1339
1340
#: bzrlib/builtins.py:2146
1341
msgid " bzr diff -c2"
1342
msgstr " bzr diff -c2"
1343
1344
#: bzrlib/builtins.py:2148
1345
msgid ""
1346
" To see the changes introduced by revision X::\n"
1347
" \n"
1348
" bzr diff -cX"
1349
msgstr ""
1350
" Para ver los cambios introducidos por la revisión X::\n"
1351
" \n"
1352
" bzr diff -cX"
1353
1354
#: bzrlib/builtins.py:2152
1355
msgid ""
1356
" Note that in the case of a merge, the -c option shows the changes\n"
1357
" compared to the left hand parent. To see the changes against\n"
1358
" another parent, use::"
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2156
1362
msgid " bzr diff -r<chosen_parent>..X"
1363
msgstr " bzr diff -r<padre_elegido>..X"
1364
1365
#: bzrlib/builtins.py:2158
1366
msgid ""
1367
" The changes between the current revision and the previous revision\n"
1368
" (equivalent to -c-1 and -r-2..-1)"
1369
msgstr ""
1370
" Los cambios entre la versión actual y la previa\n"
1371
" (equivalente a -c-1 y -r-2..-1)"
1372
1373
#: bzrlib/builtins.py:2161
1374
msgid " bzr diff -r-2.."
1375
msgstr " bzr diff -r-2.."
1376
1377
#: bzrlib/builtins.py:2163
1378
msgid " Show just the differences for file NEWS::"
1379
msgstr " Solo muestra las diferencias para el archivo NEWS::"
1380
1381
#: bzrlib/builtins.py:2165
1382
msgid " bzr diff NEWS"
1383
msgstr " bzr diff NEWS"
1384
1385
#: bzrlib/builtins.py:2167
1386
msgid " Show the differences in working tree xxx for file NEWS::"
1387
msgstr ""
1388
" Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
1389
1390
#: bzrlib/builtins.py:2169
1391
msgid " bzr diff xxx/NEWS"
1392
msgstr " bzr diff xxx/NEWS"
1393
1394
#: bzrlib/builtins.py:2171
1395
msgid " Show the differences from branch xxx to this working tree:"
1396
msgstr ""
1397
" Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
1398
1399
#: bzrlib/builtins.py:2173
1400
msgid " bzr diff --old xxx"
1401
msgstr " bzr diff --old xxx"
1402
1403
#: bzrlib/builtins.py:2175
1404
msgid " Show the differences between two branches for file NEWS::"
1405
msgstr " Muestra las diferencias entre dos ramas para el archivo NEWS:"
1406
1407
#: bzrlib/builtins.py:2177
1408
msgid " bzr diff --old xxx --new yyy NEWS"
1409
msgstr " bzr diff --old xxx --new yyy NEWS"
1410
1411
#: bzrlib/builtins.py:2179
1412
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1413
msgstr ""
1414
" Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
1415
1416
#: bzrlib/builtins.py:2181
1417
msgid ""
1418
" bzr diff --prefix old/:new/\n"
1419
" \n"
1420
" Show the differences using a custom diff program with options::\n"
1421
" \n"
1422
" bzr diff --using /usr/bin/diff --diff-options -wu"
1423
msgstr ""
1424
1425
#: bzrlib/builtins.py:2191
1426
msgid "Pass these options to the external diff program."
1427
msgstr "Pasa esta opciones para el programa diff externo."
1428
1429
#: bzrlib/builtins.py:2194
1430
msgid ""
1431
"Set prefixes added to old and new filenames, as two values separated by a "
1432
"colon. (eg \"old/:new/\")."
1433
msgstr ""
1434
1435
#: bzrlib/builtins.py:2197
1436
msgid "Branch/tree to compare from."
1437
msgstr "Rama/árbol desde donde comparar."
1438
1439
#: bzrlib/builtins.py:2201
1440
msgid "Branch/tree to compare to."
1441
msgstr "Rama/árbol a la que comparar."
1442
1443
#: bzrlib/builtins.py:2207
1444
msgid "Use this command to compare files."
1445
msgstr "Use esta orden para comparar archivos."
1446
1447
#: bzrlib/builtins.py:2212
1448
msgid "Diff format to use."
1449
msgstr "Formato diff a usar."
1450
1451
#: bzrlib/builtins.py:2214
1452
msgid "Diff format"
1453
msgstr "Formato diff"
1454
1455
#: bzrlib/builtins.py:2236
1456
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1457
msgstr ""
1458
"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
1459
1460
#: bzrlib/builtins.py:2240
1461
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1462
msgstr ""
1463
"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
1464
1465
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1466
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1467
msgid "{0} and {1} are mutually exclusive"
1468
msgstr "{0} y {1} se excluyen mutuamente"
1469
1470
#: bzrlib/builtins.py:2265
1471
msgid ""
1472
"List files deleted in the working tree.\n"
1473
" "
1474
msgstr ""
1475
"Lista archivos eliminados en el árbol de trabajo.\n"
1476
" "
1477
1478
#: bzrlib/builtins.py:2343
1479
msgid "Show the tree root directory."
1480
msgstr "Muestra el directorio raíz del árbol."
1481
1482
#: bzrlib/builtins.py:2345
1483
msgid ""
1484
"The root is the nearest enclosing directory with a .bzr control\n"
1485
"directory."
1486
msgstr ""
1487
1488
#: bzrlib/builtins.py:2360
1489
msgid "The limit argument must be an integer."
1490
msgstr "El argumento límite debe ser un entero."
1491
1492
#: bzrlib/builtins.py:2368
1493
msgid "The levels argument must be an integer."
1494
msgstr "Los argumentos de niveles deben ser un entero."
1495
1496
#: bzrlib/builtins.py:2373
1497
msgid "Show historical log for a branch or subset of a branch."
1498
msgstr ""
1499
"Muestra el registro histórico de una rama o un subconjunto de una rama."
1500
1501
#: bzrlib/builtins.py:2375
1502
msgid ""
1503
"log is bzr's default tool for exploring the history of a branch.\n"
1504
"The branch to use is taken from the first parameter. If no parameters\n"
1505
"are given, the branch containing the working directory is logged.\n"
1506
"Here are some simple examples::"
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2380
1510
msgid ""
1511
" bzr log log the current branch\n"
1512
" bzr log foo.py log a file in its branch\n"
1513
" bzr log http://server/branch log a branch on a server"
1514
msgstr ""
1515
" bzr log registra la rama actual\n"
1516
" bzr log foo.py registra un archivo en esta rama\n"
1517
" bzr log http://servidor/rama registra una rama en un servidor"
1518
1519
#: bzrlib/builtins.py:2384
1520
msgid ""
1521
"The filtering, ordering and information shown for each revision can\n"
1522
"be controlled as explained below. By default, all revisions are\n"
1523
"shown sorted (topologically) so that newer revisions appear before\n"
1524
"older ones and descendants always appear before ancestors. If displayed,\n"
1525
"merged revisions are shown indented under the revision in which they\n"
1526
"were merged."
1527
msgstr ""
1528
1529
#: bzrlib/builtins.py:2391
1530
msgid ":Output control:"
1531
msgstr ":Control de saliuda:"
1532
1533
#: bzrlib/builtins.py:2393
1534
msgid ""
1535
" The log format controls how information about each revision is\n"
1536
" displayed. The standard log formats are called ``long``, ``short``\n"
1537
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1538
" for more details on log formats."
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2398
1542
msgid ""
1543
" The following options can be used to control what information is\n"
1544
" displayed::"
1545
msgstr ""
1546
" Las siguientes opciones se pueden usar para controlar qué información\n"
1547
" se muestra::"
1548
1549
#: bzrlib/builtins.py:2401
1550
msgid ""
1551
" -l N display a maximum of N revisions\n"
1552
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1553
" -v display a status summary (delta) for each revision\n"
1554
" -p display a diff (patch) for each revision\n"
1555
" --show-ids display revision-ids (and file-ids), not just revnos"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2407
1559
msgid ""
1560
" Note that the default number of levels to display is a function of the\n"
1561
" log format. If the -n option is not used, the standard log formats show\n"
1562
" just the top level (mainline)."
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2411
1566
msgid ""
1567
" Status summaries are shown using status flags like A, M, etc. To see\n"
1568
" the changes explained using words like ``added`` and ``modified``\n"
1569
" instead, use the -vv option."
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2415
1573
msgid ":Ordering control:"
1574
msgstr ":Control de ordenación:"
1575
1576
#: bzrlib/builtins.py:2417
1577
msgid ""
1578
" To display revisions from oldest to newest, use the --forward option.\n"
1579
" In most cases, using this option will have little impact on the total\n"
1580
" time taken to produce a log, though --forward does not incrementally\n"
1581
" display revisions like --reverse does when it can."
1582
msgstr ""
1583
1584
#: bzrlib/builtins.py:2422
1585
msgid ":Revision filtering:"
1586
msgstr ":Filtrado de revisión:"
1587
1588
#: bzrlib/builtins.py:2424
1589
msgid ""
1590
" The -r option can be used to specify what revision or range of revisions\n"
1591
" to filter against. The various forms are shown below::"
1592
msgstr ""
1593
1594
#: bzrlib/builtins.py:2427
1595
msgid ""
1596
" -rX display revision X\n"
1597
" -rX.. display revision X and later\n"
1598
" -r..Y display up to and including revision Y\n"
1599
" -rX..Y display from X to Y inclusive"
1600
msgstr ""
1601
" -rX muestra revisión X\n"
1602
" -rX.. muestra revisión X y posterior\n"
1603
" -r..Y muestra hasta la revisión Y inclusive\n"
1604
" -rX..Y muestra desde X a Y inclusive"
1605
1606
#: bzrlib/builtins.py:2432
1607
msgid ""
1608
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1609
" Some common examples are given below::"
1610
msgstr ""
1611
" Vea «bzr help revisionspec» para tener más detalles sobre como especificar "
1612
"X e Y.\n"
1613
" Más abajo se listan algunos ejemplos::"
1614
1615
#: bzrlib/builtins.py:2435
1616
msgid ""
1617
" -r-1 show just the tip\n"
1618
" -r-10.. show the last 10 mainline revisions\n"
1619
" -rsubmit:.. show what's new on this branch\n"
1620
" -rancestor:path.. show changes since the common ancestor of this\n"
1621
" branch and the one at location path\n"
1622
" -rdate:yesterday.. show changes since yesterday"
1623
msgstr ""
1624
1625
#: bzrlib/builtins.py:2442
1626
msgid ""
1627
" When logging a range of revisions using -rX..Y, log starts at\n"
1628
" revision Y and searches back in history through the primary\n"
1629
" (\"left-hand\") parents until it finds X. When logging just the\n"
1630
" top level (using -n1), an error is reported if X is not found\n"
1631
" along the way. If multi-level logging is used (-n0), X may be\n"
1632
" a nested merge revision and the log will be truncated accordingly."
1633
msgstr ""
1634
1635
#: bzrlib/builtins.py:2449
1636
msgid ":Path filtering:"
1637
msgstr ":Filtrado de ruta:"
1638
1639
#: bzrlib/builtins.py:2451
1640
msgid ""
1641
" If parameters are given and the first one is not a branch, the log\n"
1642
" will be filtered to show only those revisions that changed the\n"
1643
" nominated files or directories."
1644
msgstr ""
1645
" Si se dan los parámetros y el primero no es una rama, el registro\n"
1646
" se filtrará para mostrar solo las revisiones que cambiaron los\n"
1647
" archivos o directorios nominados."
1648
1649
#: bzrlib/builtins.py:2455
1650
msgid ""
1651
" Filenames are interpreted within their historical context. To log a\n"
1652
" deleted file, specify a revision range so that the file existed at\n"
1653
" the end or start of the range."
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2459
1657
msgid ""
1658
" Historical context is also important when interpreting pathnames of\n"
1659
" renamed files/directories. Consider the following example:"
1660
msgstr ""
1661
1662
#: bzrlib/builtins.py:2462
1663
msgid ""
1664
" * revision 1: add tutorial.txt\n"
1665
" * revision 2: modify tutorial.txt\n"
1666
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2466
1670
msgid " In this case:"
1671
msgstr " en este caso:"
1672
1673
#: bzrlib/builtins.py:2468
1674
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1675
msgstr ""
1676
" * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
1677
1678
#: bzrlib/builtins.py:2470
1679
msgid ""
1680
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1681
msgstr ""
1682
" * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
1683
"revisión 3"
1684
1685
#: bzrlib/builtins.py:2472
1686
msgid ""
1687
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1688
" the original file in revision 2."
1689
msgstr ""
1690
" * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
1691
" archivo original en la revisión 2."
1692
1693
#: bzrlib/builtins.py:2475
1694
msgid ""
1695
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1696
" was no file called guide.txt in revision 2."
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2478
1700
msgid ""
1701
" Renames are always followed by log. By design, there is no need to\n"
1702
" explicitly ask for this (and no way to stop logging a file back\n"
1703
" until it was last renamed)."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2482
1707
msgid ":Other filtering:"
1708
msgstr ":Otro filtrado:"
1709
1710
#: bzrlib/builtins.py:2484
1711
msgid ""
1712
" The --match option can be used for finding revisions that match a\n"
1713
" regular expression in a commit message, committer, author or bug.\n"
1714
" Specifying the option several times will match any of the supplied\n"
1715
" expressions. --match-author, --match-bugs, --match-committer and\n"
1716
" --match-message can be used to only match a specific field."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2490
1720
msgid ":Tips & tricks:"
1721
msgstr ":Trucos y consejos:"
1722
1723
#: bzrlib/builtins.py:2492
1724
msgid ""
1725
" GUI tools and IDEs are often better at exploring history than command\n"
1726
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1727
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1728
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1729
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2498
1733
msgid ""
1734
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2500
1738
msgid ""
1739
" [ALIASES]\n"
1740
" tip = log -r-1\n"
1741
" top = log -l10 --line\n"
1742
" show = log -v -p"
1743
msgstr ""
1744
" [ALIAS]\n"
1745
" tip = log -r-1\n"
1746
" top = log -l10 --line\n"
1747
" show = log -v -p"
1748
1749
#: bzrlib/builtins.py:2505
1750
msgid ""
1751
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1752
" will show the last 10 mainline revisions. To see the details of a\n"
1753
" particular revision X, ``bzr show -rX``."
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2509
1757
msgid ""
1758
" If you are interested in looking deeper into a particular merge X,\n"
1759
" use ``bzr log -n0 -rX``."
1760
msgstr ""
1761
" Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
1762
" use «bzr log -n0 -rX»."
1763
1764
#: bzrlib/builtins.py:2512
1765
msgid ""
1766
" ``bzr log -v`` on a branch with lots of history is currently\n"
1767
" very slow. A fix for this issue is currently under development.\n"
1768
" With or without that fix, it is recommended that a revision range\n"
1769
" be given when using the -v option."
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2517
1773
msgid ""
1774
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1775
" used to find revisions matching user names, commit messages, etc.\n"
1776
" Among other features, this plugin can find all revisions containing\n"
1777
" a list of words but not others."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2522
1781
msgid ""
1782
" When exploring non-mainline history on large projects with deep\n"
1783
" history, the performance of log can be greatly improved by installing\n"
1784
" the historycache plugin. This plugin buffers historical information\n"
1785
" trading disk space for faster speed."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:2531
1789
msgid "Show from oldest to newest."
1790
msgstr "Muestra desde el más antiguo al más moderno."
1791
1792
#: bzrlib/builtins.py:2534
1793
msgid "Show files changed in each revision."
1794
msgstr "Muestra los archivos cambiados en cada revisión."
1795
1796
#: bzrlib/builtins.py:2540
1797
msgid "Show just the specified revision. See also \"help revisionspec\"."
1798
msgstr ""
1799
"Muestra solo la revisión especificada. Vea también «help revisionspec»."
1800
1801
#: bzrlib/builtins.py:2544
1802
msgid "What names to list as authors - first, all or committer."
1803
msgstr ""
1804
1805
#: bzrlib/builtins.py:2545
1806
msgid "Authors"
1807
msgstr "Autores"
1808
1809
#: bzrlib/builtins.py:2550
1810
msgid "Number of levels to display - 0 for all, 1 for flat."
1811
msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
1812
1813
#: bzrlib/builtins.py:2560
1814
msgid "Limit the output to the first N revisions."
1815
msgstr "Límite de salida para las primeras N revisiones."
1816
1817
#: bzrlib/builtins.py:2565
1818
msgid "Show changes made in each revision as a patch."
1819
msgstr "Mostrar cambios realizados en cada revisión como un parche."
1820
1821
#: bzrlib/builtins.py:2567
1822
msgid "Show merged revisions like --levels 0 does."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:2571
1826
msgid "Do not report commits with more than one parent."
1827
msgstr "No informar de ejecuciones con más de un padre."
1828
1829
#: bzrlib/builtins.py:2573
1830
msgid ""
1831
"Display only the revisions that are not part of both ancestries (require -"
1832
"rX..Y)."
1833
msgstr ""
1834
1835
#: bzrlib/builtins.py:2577
1836
msgid "Show digital signature validity."
1837
msgstr ""
1838
1839
#: bzrlib/builtins.py:2580
1840
msgid "Show revisions whose properties match this expression."
1841
msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
1842
1843
#: bzrlib/builtins.py:2584
1844
msgid "Show revisions whose message matches this expression."
1845
msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
1846
1847
#: bzrlib/builtins.py:2588
1848
msgid "Show revisions whose committer matches this expression."
1849
msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
1850
1851
#: bzrlib/builtins.py:2592
1852
msgid "Show revisions whose authors match this expression."
1853
msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
1854
1855
#: bzrlib/builtins.py:2596
1856
msgid "Show revisions whose bugs match this expression."
1857
msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
1858
1859
#: bzrlib/builtins.py:2650
1860
msgid "--exclude-common-ancestry requires -r with two revisions"
1861
msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
1862
1863
#: bzrlib/builtins.py:2678
1864
#, python-format
1865
msgid "Path unknown at end or start of revision range: %s"
1866
msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
1867
1868
#: bzrlib/builtins.py:2795
1869
#, python-format
1870
msgid "bzr %s doesn't accept two revisions in different branches."
1871
msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
1872
1873
#: bzrlib/builtins.py:2811
1874
#, python-format
1875
msgid "bzr %s --revision takes one or two values."
1876
msgstr "bzr %s --revision toma uno o dos valores."
1877
1878
#: bzrlib/builtins.py:2856
1879
msgid ""
1880
"List files in a tree.\n"
1881
" "
1882
msgstr ""
1883
"Lista archivos en un árbol\n"
1884
" "
1885
1886
#: bzrlib/builtins.py:2865
1887
msgid "Recurse into subdirectories."
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:2867
1891
msgid "Print paths relative to the root of the branch."
1892
msgstr "Imprime rutas relativas a la raíz de la rama."
1893
1894
#: bzrlib/builtins.py:2869
1895
msgid "Print unknown files."
1896
msgstr "Imprimir archivos desconocidos."
1897
1898
#: bzrlib/builtins.py:2870
1899
msgid "Print versioned files."
1900
msgstr "Imprimir archivos versionados."
1901
1902
#: bzrlib/builtins.py:2873
1903
msgid "Print ignored files."
1904
msgstr "Imprimir archivos ignorados."
1905
1906
#: bzrlib/builtins.py:2875
1907
msgid "List entries of a particular kind: file, directory, symlink."
1908
msgstr ""
1909
"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
1910
1911
#: bzrlib/builtins.py:2888
1912
msgid "invalid kind specified"
1913
msgstr "tivo inválido especificado"
1914
1915
#: bzrlib/builtins.py:2891
1916
msgid "Cannot set both --verbose and --null"
1917
msgstr "No se pueden establecer ambos --verbose y --null"
1918
1919
#: bzrlib/builtins.py:2900
1920
msgid "cannot specify both --from-root and PATH"
1921
msgstr "No se pueden establecer ambos --from-root y PATH"
1922
1923
#: bzrlib/builtins.py:2987
1924
msgid "Ignore specified files or patterns."
1925
msgstr "Ignorar archivos o patrones especificados."
1926
1927
#: bzrlib/builtins.py:2989
1928
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1929
msgstr ""
1930
"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
1931
1932
#: bzrlib/builtins.py:2991
1933
msgid ""
1934
"If a .bzrignore file does not exist, the ignore command\n"
1935
"will create one and add the specified files or patterns to the newly\n"
1936
"created file. The ignore command will also automatically add the \n"
1937
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1938
"the use of the ignore command will require an explicit add command."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:2997
1942
msgid ""
1943
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1944
"After adding, editing or deleting that file either indirectly by\n"
1945
"using this command or directly by using an editor, be sure to commit\n"
1946
"it."
1947
msgstr ""
1948
"Para eliminar los patrones de la lista de ignorados, edite el archivo "
1949
".bzrignore.\n"
1950
"Después de añadir, editar o borrar el archivo o bien indirectamente por\n"
1951
"el uso de esta orden, o directamente mediante un editor, asegúrese de "
1952
"ejecutarlo."
1953
1954
#: bzrlib/builtins.py:3002
1955
msgid ""
1956
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1957
"the global ignore file can be found in the application data directory as\n"
1958
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1959
"Global ignores are not touched by this command. The global ignore file\n"
1960
"can be edited directly using an editor."
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3008
1964
msgid ""
1965
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1966
"precedence over regular ignores. Such exceptions are used to specify\n"
1967
"files that should be versioned which would otherwise be ignored."
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3012
1971
msgid ""
1972
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1973
"precedence over the '!' exception patterns."
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3015
1977
msgid ""
1978
":Notes: \n"
1979
" \n"
1980
"* Ignore patterns containing shell wildcards must be quoted from\n"
1981
" the shell on Unix."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3020
1985
msgid ""
1986
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1987
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1988
msgstr ""
1989
1990
#: bzrlib/builtins.py:3023
1991
msgid ""
1992
":Examples:\n"
1993
" Ignore the top level Makefile::"
1994
msgstr ""
1995
1996
#: bzrlib/builtins.py:3026
1997
msgid " bzr ignore ./Makefile"
1998
msgstr " bzr ignore ./Makefile"
1999
2000
#: bzrlib/builtins.py:3028
2001
msgid " Ignore .class files in all directories...::"
2002
msgstr " Ignorar archivos .class en todos los directorios...::"
2003
2004
#: bzrlib/builtins.py:3030
2005
msgid " bzr ignore \"*.class\""
2006
msgstr " bzr ignore \"*.class\""
2007
2008
#: bzrlib/builtins.py:3032
2009
msgid " ...but do not ignore \"special.class\"::"
2010
msgstr " ...pero no ignora «special.class»::"
2011
2012
#: bzrlib/builtins.py:3034
2013
msgid " bzr ignore \"!special.class\""
2014
msgstr " bzr ignore «!special.class»"
2015
2016
#: bzrlib/builtins.py:3036
2017
msgid " Ignore files whose name begins with the \"#\" character::"
2018
msgstr " Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
2019
2020
#: bzrlib/builtins.py:3038
2021
msgid " bzr ignore \"RE:^#\""
2022
msgstr " bzr ignore \"RE:^#\""
2023
2024
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
2025
msgid " Ignore .o files under the lib directory::"
2026
msgstr " Ignorar archivos .o bajo el directorio lib::"
2027
2028
#: bzrlib/builtins.py:3042
2029
msgid " bzr ignore \"lib/**/*.o\""
2030
msgstr " bzr ignore \"lib/**/*.o\""
2031
2032
#: bzrlib/builtins.py:3046
2033
msgid " bzr ignore \"RE:lib/.*\\.o\""
2034
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2035
2036
#: bzrlib/builtins.py:3048
2037
msgid " Ignore everything but the \"debian\" toplevel directory::"
2038
msgstr ""
2039
" Ignorar todo excepto el directorio de nivel superior de «debian»::"
2040
2041
#: bzrlib/builtins.py:3050
2042
msgid ""
2043
" bzr ignore \"RE:(?!debian/).*\"\n"
2044
" \n"
2045
" Ignore everything except the \"local\" toplevel directory,\n"
2046
" but always ignore autosave files ending in ~, even under local/::\n"
2047
" \n"
2048
" bzr ignore \"*\"\n"
2049
" bzr ignore \"!./local\"\n"
2050
" bzr ignore \"!!*~\""
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3064
2054
msgid "Display the default ignore rules that bzr uses."
2055
msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
2056
2057
#: bzrlib/builtins.py:3076
2058
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3087
2062
#, python-format
2063
msgid "Invalid ignore pattern found. %s"
2064
msgid_plural "Invalid ignore patterns found. %s"
2065
msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
2066
msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
2067
2068
#: bzrlib/builtins.py:3096
2069
msgid "NAME_PATTERN should not be an absolute path"
2070
msgstr "NAME_PATTERN no debe ser una ruta absoluta"
2071
2072
#: bzrlib/builtins.py:3109
2073
#, python-format
2074
msgid ""
2075
"Warning: the following files are version controlled and match your ignore "
2076
"pattern:\n"
2077
"%s\n"
2078
"These files will continue to be version controlled unless you 'bzr remove' "
2079
"them.\n"
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3116
2083
msgid "List ignored files and the patterns that matched them."
2084
msgstr "Lista todos los archivos ignorados y patrones que conciden."
2085
2086
#: bzrlib/builtins.py:3118
2087
msgid ""
2088
"List all the ignored files and the ignore pattern that caused the file to\n"
2089
"be ignored."
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3121
2093
msgid "Alternatively, to list just the files::"
2094
msgstr "Alternativamente, lista solo los archivos:"
2095
2096
#: bzrlib/builtins.py:3123
2097
msgid " bzr ls --ignored"
2098
msgstr " bzr ls --ignored"
2099
2100
#: bzrlib/builtins.py:3157
2101
#, python-format
2102
msgid "not a valid revision-number: %r"
2103
msgstr "no es un número de revisión válido: %r"
2104
2105
#: bzrlib/builtins.py:3164
2106
msgid ""
2107
"Export current or past revision to a destination directory or archive."
2108
msgstr ""
2109
"Exporta la revisión actual o pasada a un directorio de destino o un "
2110
"archivador."
2111
2112
#: bzrlib/builtins.py:3166
2113
msgid "If no revision is specified this exports the last committed revision."
2114
msgstr "Si no se especifica revisión, exporta la última revisión ejecutada."
2115
2116
#: bzrlib/builtins.py:3168
2117
msgid ""
2118
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2119
"given, try to find the format with the extension. If no extension\n"
2120
"is found exports to a directory (equivalent to --format=dir)."
2121
msgstr ""
2122
2123
#: bzrlib/builtins.py:3172
2124
msgid ""
2125
"If root is supplied, it will be used as the root directory inside\n"
2126
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2127
"to the exported filename. The root option has no effect for 'dir' format."
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3176
2131
msgid ""
2132
"If branch is omitted then the branch containing the current working\n"
2133
"directory will be used."
2134
msgstr ""
2135
"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
2136
"de trabajo actual."
2137
2138
#: bzrlib/builtins.py:3179
2139
msgid ""
2140
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2141
msgstr ""
2142
"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
2143
2144
#: bzrlib/builtins.py:3181
2145
msgid ""
2146
" ================= =========================\n"
2147
" Supported formats Autodetected by extension\n"
2148
" ================= =========================\n"
2149
" dir (none)\n"
2150
" tar .tar\n"
2151
" tbz2 .tar.bz2, .tbz2\n"
2152
" tgz .tar.gz, .tgz\n"
2153
" zip .zip\n"
2154
" ================= ========================="
2155
msgstr ""
2156
" ================= ===================================\n"
2157
" Formatos permitidos Detectados automáticamente por extensión\n"
2158
" ================= ===================================\n"
2159
" dir (ninguno)\n"
2160
" tar .tar\n"
2161
" tbz2 .tar.bz2, .tbz2\n"
2162
" tgz .tar.gz, .tgz\n"
2163
" zip .zip\n"
2164
" ================= ==================================="
2165
2166
#: bzrlib/builtins.py:3195
2167
msgid "Type of file to export to."
2168
msgstr "Tipo de archivo para exportar."
2169
2170
#: bzrlib/builtins.py:3198
2171
msgid "Apply content filters to export the convenient form."
2172
msgstr ""
2173
"Aplicar los filtros de contenido para exportar el formulario conveniente."
2174
2175
#: bzrlib/builtins.py:3202
2176
msgid "Name of the root directory inside the exported file."
2177
msgstr "Nombre del directorio raíz dentro del archivo exportado."
2178
2179
#: bzrlib/builtins.py:3204
2180
msgid ""
2181
"Set modification time of files to that of the last revision in which it was "
2182
"changed."
2183
msgstr ""
2184
"Establecer la fecha de modificación de los archivos a la de la última "
2185
"revisión en la que se cambió."
2186
2187
#: bzrlib/builtins.py:3207
2188
msgid ""
2189
"Export the working tree contents rather than that of the last revision."
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3226
2193
msgid "--uncommitted requires a working tree"
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3235
2197
#, python-format
2198
msgid "Unsupported export format: %s"
2199
msgstr "Formato de exportación no permitido: %s"
2200
2201
#: bzrlib/builtins.py:3239
2202
msgid ""
2203
"Write the contents of a file as of a given revision to standard output."
2204
msgstr ""
2205
"Escribir los contenidos de un archivo como una revisión dada a la salida "
2206
"estándar."
2207
2208
#: bzrlib/builtins.py:3241
2209
msgid "If no revision is nominated, the last revision is used."
2210
msgstr "SI no hay una revisión nominada, se usa la última revisión."
2211
2212
#: bzrlib/builtins.py:3243
2213
msgid ""
2214
"Note: Take care to redirect standard output when using this command on a\n"
2215
"binary file."
2216
msgstr ""
2217
2218
#: bzrlib/builtins.py:3249
2219
msgid "The path name in the old tree."
2220
msgstr "La ruta en el árbol antiguo."
2221
2222
#: bzrlib/builtins.py:3250
2223
msgid "Apply content filters to display the convenience form."
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3261
2227
msgid "bzr cat --revision takes exactly one revision specifier"
2228
msgstr "bzr cat --revision toma específicamente un especificador de revisión"
2229
2230
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2231
msgid "{0!r} is not present in revision {1}"
2232
msgstr "{0!r} no está presente en la revisión {1}"
2233
2234
#: bzrlib/builtins.py:3321
2235
msgid "Commit changes into a new revision."
2236
msgstr "Ejecutar cambios en una revisión nueva."
2237
2238
#: bzrlib/builtins.py:3323
2239
msgid ""
2240
"An explanatory message needs to be given for each commit. This is\n"
2241
"often done by using the --message option (getting the message from the\n"
2242
"command line) or by using the --file option (getting the message from\n"
2243
"a file). If neither of these options is given, an editor is opened for\n"
2244
"the user to enter the message. To see the changed files in the\n"
2245
"boilerplate text loaded into the editor, use the --show-diff option."
2246
msgstr ""
2247
2248
#: bzrlib/builtins.py:3330
2249
msgid ""
2250
"By default, the entire tree is committed and the person doing the\n"
2251
"commit is assumed to be the author. These defaults can be overridden\n"
2252
"as explained below."
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3334
2256
msgid ":Selective commits:"
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3336
2260
msgid ""
2261
" If selected files are specified, only changes to those files are\n"
2262
" committed. If a directory is specified then the directory and\n"
2263
" everything within it is committed."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3340
2267
msgid ""
2268
" When excludes are given, they take precedence over selected files.\n"
2269
" For example, to commit only changes within foo, but not changes\n"
2270
" within foo/bar::"
2271
msgstr ""
2272
2273
#: bzrlib/builtins.py:3344
2274
msgid " bzr commit foo -x foo/bar"
2275
msgstr " bzr commit foo -x foo/bar"
2276
2277
#: bzrlib/builtins.py:3346
2278
msgid " A selective commit after a merge is not yet supported."
2279
msgstr " No está permitida una ejecución selectiva después de una fusión."
2280
2281
#: bzrlib/builtins.py:3348
2282
msgid ":Custom authors:"
2283
msgstr ":Autores personalizados:"
2284
2285
#: bzrlib/builtins.py:3350
2286
msgid ""
2287
" If the author of the change is not the same person as the committer,\n"
2288
" you can specify the author's name using the --author option. The\n"
2289
" name should be in the same format as a committer-id, e.g.\n"
2290
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2291
" the change you can specify the option multiple times, once for each\n"
2292
" author."
2293
msgstr ""
2294
2295
#: bzrlib/builtins.py:3357
2296
msgid ":Checks:"
2297
msgstr ":Comprobaciones:"
2298
2299
#: bzrlib/builtins.py:3359
2300
msgid ""
2301
" A common mistake is to forget to add a new file or directory before\n"
2302
" running the commit command. The --strict option checks for unknown\n"
2303
" files and aborts the commit if any are found. More advanced pre-commit\n"
2304
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2305
" for details."
2306
msgstr ""
2307
2308
#: bzrlib/builtins.py:3365
2309
msgid ":Things to note:"
2310
msgstr ":Cosas a tener en cuenta:"
2311
2312
#: bzrlib/builtins.py:3367
2313
msgid ""
2314
" If you accidentially commit the wrong changes or make a spelling\n"
2315
" mistake in the commit message say, you can use the uncommit command\n"
2316
" to undo it. See ``bzr help uncommit`` for details."
2317
msgstr ""
2318
2319
#: bzrlib/builtins.py:3371
2320
msgid ""
2321
" Hooks can also be configured to run after a commit. This allows you\n"
2322
" to trigger updates to external systems like bug trackers. The --fixes\n"
2323
" option can be used to record the association between a revision and\n"
2324
" one or more bugs. See ``bzr help bugs`` for details."
2325
msgstr ""
2326
2327
#: bzrlib/builtins.py:3381
2328
msgid "Do not consider changes made to a given path."
2329
msgstr "No considerar los cambios realizados en una ruta dada."
2330
2331
#: bzrlib/builtins.py:3384
2332
msgid "Description of the new revision."
2333
msgstr "Descripción de la revisión nueva."
2334
2335
#: bzrlib/builtins.py:3387
2336
msgid "Commit even if nothing has changed."
2337
msgstr "Ejecutar incluso si no ha cambiado nada."
2338
2339
#: bzrlib/builtins.py:3391
2340
msgid "Take commit message from this file."
2341
msgstr "Tomar el mensaje de ejecución desde este archivo."
2342
2343
#: bzrlib/builtins.py:3393
2344
msgid "Refuse to commit if there are unknown files in the working tree."
2345
msgstr ""
2346
"Rechazar la ejecución si hay archivos desconocidos en el árbol de trabajo."
2347
2348
#: bzrlib/builtins.py:3396
2349
msgid ""
2350
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2351
"08:00:00 +0100'."
2352
msgstr ""
2353
"Establecer manualmente la hora de ejecución usando un formato de fecha de "
2354
"ejecución, por ejemplo «2009-10-10 08:00:00 +0100»."
2355
2356
#: bzrlib/builtins.py:3399
2357
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2358
msgstr ""
2359
"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
2360
2361
#: bzrlib/builtins.py:3402
2362
msgid "Set the author's name, if it's different from the committer."
2363
msgstr ""
2364
"Establecer el nombre del autor, si este es diferente al del ejecutor."
2365
2366
#: bzrlib/builtins.py:3405
2367
msgid ""
2368
"Perform a local commit in a bound branch. Local commits are not pushed to "
2369
"the master branch until a normal commit is performed."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3411
2373
msgid ""
2374
"When no message is supplied, show the diff along with the status summary in "
2375
"the message editor."
2376
msgstr ""
2377
2378
#: bzrlib/builtins.py:3414
2379
msgid ""
2380
"When committing to a foreign version control system do not push data that "
2381
"can not be natively represented."
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3432
2385
#, python-format
2386
msgid ""
2387
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2388
"default bug tracker using the `bugtracker` option.\n"
2389
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3441
2393
#, python-format
2394
msgid ""
2395
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2396
"for more information on this feature.\n"
2397
"Commit refused."
2398
msgstr ""
2399
2400
#: bzrlib/builtins.py:3450
2401
#, python-format
2402
msgid "Unrecognized bug %s. Commit refused."
2403
msgstr "Error no reconocido %s. Ejecución rechazada."
2404
2405
#: bzrlib/builtins.py:3453
2406
#, python-format
2407
msgid ""
2408
"%s\n"
2409
"Commit refused."
2410
msgstr ""
2411
"%s\n"
2412
"Ejecución rechazada."
2413
2414
#: bzrlib/builtins.py:3477
2415
msgid "Could not parse --commit-time: "
2416
msgstr "No se puede analizar --commit-time: "
2417
2418
#: bzrlib/builtins.py:3517
2419
msgid "please specify either --message or --file"
2420
msgstr "especifique uno --message o --file"
2421
2422
#: bzrlib/builtins.py:3546
2423
msgid "please specify a commit message with either --message or --file"
2424
msgstr "especifique un mensaje de ejecución con --message o --file"
2425
2426
#: bzrlib/builtins.py:3549
2427
msgid ""
2428
"Empty commit message specified. Please specify a commit message with either -"
2429
"-message or --file or leave a blank message with --message \"\"."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3569
2433
msgid ""
2434
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2435
"-unchanged to force an empty commit."
2436
msgstr ""
2437
"No hay cambios que ejecutar. «bzr add» los archivos que quiera ejecutar o "
2438
"use --unchanged para forzar una ejecución vacía."
2439
2440
#: bzrlib/builtins.py:3573
2441
msgid ""
2442
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2443
"resolve FILE\" to resolve."
2444
msgstr ""
2445
"Conflictos detectados en el árbol de trabajo. Use «bzr conflicts» para "
2446
"listar, «bzr resolve ARCHIVO»\" para resolver."
2447
2448
#: bzrlib/builtins.py:3577
2449
msgid "Commit refused because there are unknown files in the working tree."
2450
msgstr ""
2451
"Ejecución rechazada porque hay archivos desconocidos en el árbol de trabajo."
2452
2453
#: bzrlib/builtins.py:3580
2454
msgid ""
2455
"\n"
2456
"To commit to master branch, run update and then commit.\n"
2457
"You can also pass --local to commit to continue working disconnected."
2458
msgstr ""
2459
2460
#: bzrlib/builtins.py:3588
2461
msgid ""
2462
"Validate working tree structure, branch consistency and repository history."
2463
msgstr ""
2464
"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
2465
"historial del repositorio."
2466
2467
#: bzrlib/builtins.py:3590
2468
msgid ""
2469
"This command checks various invariants about branch and repository storage\n"
2470
"to detect data corruption or bzr bugs."
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3593
2474
msgid ""
2475
"The working tree and branch checks will only give output if a problem is\n"
2476
"detected. The output fields of the repository check are:"
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3596
2480
msgid ""
2481
"revisions\n"
2482
" This is just the number of revisions checked. It doesn't\n"
2483
" indicate a problem."
2484
msgstr ""
2485
"revisions\n"
2486
" Esto es solo el número de revisiones comprobadas, No\n"
2487
" indica un problema."
2488
2489
#: bzrlib/builtins.py:3600
2490
msgid ""
2491
"versionedfiles\n"
2492
" This is just the number of versionedfiles checked. It\n"
2493
" doesn't indicate a problem."
2494
msgstr ""
2495
"versionedfiles\n"
2496
" Esto es solo el número de archivos versionados comprobados.. No\n"
2497
" indica un problema."
2498
2499
#: bzrlib/builtins.py:3604
2500
msgid ""
2501
"unreferenced ancestors\n"
2502
" Texts that are ancestors of other texts, but\n"
2503
" are not properly referenced by the revision ancestry. This is a\n"
2504
" subtle problem that Bazaar can work around."
2505
msgstr ""
2506
2507
#: bzrlib/builtins.py:3609
2508
msgid ""
2509
"unique file texts\n"
2510
" This is the total number of unique file contents\n"
2511
" seen in the checked revisions. It does not indicate a problem."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3613
2515
msgid ""
2516
"repeated file texts\n"
2517
" This is the total number of repeated texts seen\n"
2518
" in the checked revisions. Texts can be repeated when their file\n"
2519
" entries are modified, but the file contents are not. It does not\n"
2520
" indicate a problem."
2521
msgstr ""
2522
2523
#: bzrlib/builtins.py:3619
2524
msgid ""
2525
"If no restrictions are specified, all Bazaar data that is found at the "
2526
"given\n"
2527
"location will be checked."
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3624
2531
msgid " Check the tree and branch at 'foo'::"
2532
msgstr " Comprueba el árbol y la rama en «foo»::"
2533
2534
#: bzrlib/builtins.py:3626
2535
msgid " bzr check --tree --branch foo"
2536
msgstr " bzr check --tree --branch foo"
2537
2538
#: bzrlib/builtins.py:3628
2539
msgid " Check only the repository at 'bar'::"
2540
msgstr " Comprueba solo el repositorio en «bar»::"
2541
2542
#: bzrlib/builtins.py:3630
2543
msgid " bzr check --repo bar"
2544
msgstr " bzr check --repo bar"
2545
2546
#: bzrlib/builtins.py:3632
2547
msgid " Check everything at 'baz'::"
2548
msgstr " Comprueba todo en «baz»::"
2549
2550
#: bzrlib/builtins.py:3634
2551
msgid " bzr check baz"
2552
msgstr " bzr check baz"
2553
2554
#: bzrlib/builtins.py:3640
2555
msgid "Check the branch related to the current directory."
2556
msgstr "Comprueba la rama relacionada con el directorio actual."
2557
2558
#: bzrlib/builtins.py:3642
2559
msgid "Check the repository related to the current directory."
2560
msgstr "Comprueba el repositorio relacionado con el directorio actual."
2561
2562
#: bzrlib/builtins.py:3644
2563
msgid "Check the working tree related to the current directory."
2564
msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
2565
2566
#: bzrlib/builtins.py:3658
2567
msgid "Upgrade a repository, branch or working tree to a newer format."
2568
msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
2569
2570
#: bzrlib/builtins.py:3660
2571
msgid ""
2572
"When the default format has changed after a major new release of\n"
2573
"Bazaar, you may be informed during certain operations that you\n"
2574
"should upgrade. Upgrading to a newer format may improve performance\n"
2575
"or make new features available. It may however limit interoperability\n"
2576
"with older repositories or with older versions of Bazaar."
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:3666
2580
msgid ""
2581
"If you wish to upgrade to a particular format rather than the\n"
2582
"current default, that can be specified using the --format option.\n"
2583
"As a consequence, you can use the upgrade command this way to\n"
2584
"\"downgrade\" to an earlier format, though some conversions are\n"
2585
"a one way process (e.g. changing from the 1.x default to the\n"
2586
"2.x default) so downgrading is not always possible."
2587
msgstr ""
2588
2589
#: bzrlib/builtins.py:3673
2590
msgid ""
2591
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2592
"process (where # is a number). By default, this is left there on\n"
2593
"completion. If the conversion fails, delete the new .bzr directory\n"
2594
"and rename this one back in its place. Use the --clean option to ask\n"
2595
"for the backup.bzr directory to be removed on successful conversion.\n"
2596
"Alternatively, you can delete it by hand if everything looks good\n"
2597
"afterwards."
2598
msgstr ""
2599
2600
#: bzrlib/builtins.py:3681
2601
msgid ""
2602
"If the location given is a shared repository, dependent branches\n"
2603
"are also converted provided the repository converts successfully.\n"
2604
"If the conversion of a branch fails, remaining branches are still\n"
2605
"tried."
2606
msgstr ""
2607
2608
#: bzrlib/builtins.py:3686
2609
msgid ""
2610
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2611
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2612
msgstr ""
2613
"Para tener más información sobre actualizaciones, vea la Guía de "
2614
"actualización de Bazaar,\n"
2615
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2616
2617
#: bzrlib/builtins.py:3694
2618
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2619
msgstr ""
2620
"Actualizar a un formato específico. Vea «bzr help formats» para tener más "
2621
"detalles."
2622
2623
#: bzrlib/builtins.py:3698
2624
msgid "Branch format"
2625
msgstr "Formato de la rama"
2626
2627
#: bzrlib/builtins.py:3700
2628
msgid "Remove the backup.bzr directory if successful."
2629
msgstr "Elimina el directorio backup.bzr si tiene éxito."
2630
2631
#: bzrlib/builtins.py:3702
2632
msgid "Show what would be done, but don't actually do anything."
2633
msgstr ""
2634
2635
#: bzrlib/builtins.py:3717
2636
msgid "Show or set bzr user id."
2637
msgstr "Muestra o establece la id de usuario bzr."
2638
2639
#: bzrlib/builtins.py:3719
2640
msgid ""
2641
":Examples:\n"
2642
" Show the email of the current user::"
2643
msgstr ""
2644
":Ejemplos:\n"
2645
" Muestra el correo del usuario actual::"
2646
2647
#: bzrlib/builtins.py:3722
2648
msgid " bzr whoami --email"
2649
msgstr " bzr whoami --email"
2650
2651
#: bzrlib/builtins.py:3724
2652
msgid " Set the current user::"
2653
msgstr " Establece el usuario actual::"
2654
2655
#: bzrlib/builtins.py:3726
2656
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2657
msgstr " bzr whoami «Frank Chu <fchu@example.com>»"
2658
2659
#: bzrlib/builtins.py:3730
2660
msgid "Display email address only."
2661
msgstr "Muestra solo la dirección de correo."
2662
2663
#: bzrlib/builtins.py:3732
2664
msgid "Set identity for the current branch instead of globally."
2665
msgstr "Establece la identidad de la rama actual en lugar de globalmente."
2666
2667
#: bzrlib/builtins.py:3758
2668
msgid "--email can only be used to display existing identity"
2669
msgstr "--email solo se puede usar para mostrar la identidad del directorio"
2670
2671
#: bzrlib/builtins.py:3780
2672
msgid "Print or set the branch nickname."
2673
msgstr "Muestra o establece el apodo de la rama."
2674
2675
#: bzrlib/builtins.py:3782
2676
msgid ""
2677
"If unset, the tree root directory name is used as the nickname.\n"
2678
"To print the current nickname, execute with no argument."
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:3785
2682
msgid ""
2683
"Bound branches use the nickname of its master branch unless it is set\n"
2684
"locally."
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:3805
2688
msgid "Set/unset and display aliases."
2689
msgstr "Establece/desestablece y muestra alias."
2690
2691
#: bzrlib/builtins.py:3807
2692
msgid ""
2693
":Examples:\n"
2694
" Show the current aliases::"
2695
msgstr ""
2696
":Ejemplos:\n"
2697
" Muestra los alias actuales::"
2698
2699
#: bzrlib/builtins.py:3810
2700
msgid " bzr alias"
2701
msgstr " bzr alias"
2702
2703
#: bzrlib/builtins.py:3812
2704
msgid " Show the alias specified for 'll'::"
2705
msgstr " Muestra los alias especificados por «ll»::"
2706
2707
#: bzrlib/builtins.py:3814
2708
msgid " bzr alias ll"
2709
msgstr " bzr alias ll"
2710
2711
#: bzrlib/builtins.py:3816
2712
msgid " Set an alias for 'll'::"
2713
msgstr " Establece un alias para «ll»::"
2714
2715
#: bzrlib/builtins.py:3818
2716
msgid " bzr alias ll=\"log --line -r-10..-1\""
2717
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2718
2719
#: bzrlib/builtins.py:3820
2720
msgid " To remove an alias for 'll'::"
2721
msgstr " Para eliminar un alias de «ll»::"
2722
2723
#: bzrlib/builtins.py:3822
2724
msgid " bzr alias --remove ll"
2725
msgstr " bzr alias --remove ll"
2726
2727
#: bzrlib/builtins.py:3827
2728
msgid "Remove the alias."
2729
msgstr "Elimina los alias."
2730
2731
#: bzrlib/builtins.py:3845
2732
msgid "bzr alias --remove expects an alias to remove."
2733
msgstr ""
2734
2735
#: bzrlib/builtins.py:4026
2736
msgid ""
2737
"subunit not available. subunit needs to be installed to use --subunit."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4043
2741
msgid ""
2742
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2743
msgstr ""
2744
"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
2745
2746
#: bzrlib/builtins.py:4090
2747
msgid "Show version of bzr."
2748
msgstr "Muestra la versión de bzr."
2749
2750
#: bzrlib/builtins.py:4094
2751
msgid "Print just the version number."
2752
msgstr "Solamente imprime el número de versión."
2753
2754
#: bzrlib/builtins.py:4113
2755
msgid "It sure does!\n"
2756
msgstr "¡Seguro que si!\n"
2757
2758
#: bzrlib/builtins.py:4137
2759
#, python-format
2760
msgid "merge base is revision %s\n"
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4141
2764
msgid "Perform a three-way merge."
2765
msgstr "Realiza una fusión de tres vías."
2766
2767
#: bzrlib/builtins.py:4143
2768
msgid ""
2769
"The source of the merge can be specified either in the form of a branch,\n"
2770
"or in the form of a path to a file containing a merge directive generated\n"
2771
"with bzr send. If neither is specified, the default is the upstream branch\n"
2772
"or the branch most recently merged using --remember. The source of the\n"
2773
"merge may also be specified in the form of a path to a file in another\n"
2774
"branch: in this case, only the modifications to that file are merged into\n"
2775
"the current working tree."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4151
2779
msgid ""
2780
"When merging from a branch, by default bzr will try to merge in all new\n"
2781
"work from the other branch, automatically determining an appropriate base\n"
2782
"revision. If this fails, you may need to give an explicit base."
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4155
2786
msgid ""
2787
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2788
"try to merge in all new work up to and including revision OTHER."
2789
msgstr ""
2790
2791
#: bzrlib/builtins.py:4158
2792
msgid ""
2793
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2794
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2795
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2796
"not already contain revision BASE, such a merge is commonly referred to as\n"
2797
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2798
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2799
"changes from the other branch is not stored in the commit."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4166
2803
msgid "Revision numbers are always relative to the source branch."
2804
msgstr ""
2805
"Los números de revisión están siempre relacionados con la rama origen."
2806
2807
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2808
msgid ""
2809
"Merge will do its best to combine the changes in two branches, but there\n"
2810
"are some kinds of problems only a human can fix. When it encounters those,\n"
2811
"it will mark a conflict. A conflict means that you need to fix something,\n"
2812
"before you should commit."
2813
msgstr ""
2814
2815
#: bzrlib/builtins.py:4173
2816
msgid ""
2817
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2818
msgstr ""
2819
"Use bzr resolve cuando tenga un problema arreglado. Vea también bzr "
2820
"conflicts."
2821
2822
#: bzrlib/builtins.py:4175
2823
msgid ""
2824
"If there is no default branch set, the first merge will set it (use\n"
2825
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2826
"to use the default. To change the default, use --remember. The value will\n"
2827
"only be saved if the remote location can be accessed."
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:4180
2831
msgid ""
2832
"The results of the merge are placed into the destination working\n"
2833
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2834
"committed to record the result of the merge."
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4184
2838
msgid ""
2839
"merge refuses to run if there are any uncommitted changes, unless\n"
2840
"--force is given. If --force is given, then the changes from the source \n"
2841
"will be merged with the current working tree, including any uncommitted\n"
2842
"changes in the tree. The --force option can also be used to create a\n"
2843
"merge revision which has more than two parents."
2844
msgstr ""
2845
2846
#: bzrlib/builtins.py:4190
2847
msgid ""
2848
"If one would like to merge changes from the working tree of the other\n"
2849
"branch without merging any committed revisions, the --uncommitted option\n"
2850
"can be given."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4194
2854
msgid ""
2855
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2856
"you to apply each diff hunk and file change, similar to \"shelve\"."
2857
msgstr ""
2858
2859
#: bzrlib/builtins.py:4197
2860
msgid ""
2861
":Examples:\n"
2862
" To merge all new revisions from bzr.dev::"
2863
msgstr ""
2864
":Ejemplos:\n"
2865
" Para fusionar todas las revisiones nuevas de bzr.dev::"
2866
2867
#: bzrlib/builtins.py:4200
2868
msgid " bzr merge ../bzr.dev"
2869
msgstr " bzr merge ../bzr.dev"
2870
2871
#: bzrlib/builtins.py:4202
2872
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2873
msgstr " Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
2874
2875
#: bzrlib/builtins.py:4204
2876
msgid " bzr merge -r 82 ../bzr.dev"
2877
msgstr " bzr merge -r 82 ../bzr.dev"
2878
2879
#: bzrlib/builtins.py:4206
2880
msgid " To merge the changes introduced by 82, without previous changes::"
2881
msgstr ""
2882
" Para fusionar los cambios introducidos por 82, sin cambios previos::"
2883
2884
#: bzrlib/builtins.py:4208
2885
msgid " bzr merge -r 81..82 ../bzr.dev"
2886
msgstr " bzr merge -r 81..82 ../bzr.dev"
2887
2888
#: bzrlib/builtins.py:4210
2889
msgid " To apply a merge directive contained in /tmp/merge::"
2890
msgstr " Para aplicar una directiva de fusión contenida en /tmp/merge::"
2891
2892
#: bzrlib/builtins.py:4212
2893
msgid " bzr merge /tmp/merge"
2894
msgstr " bzr merge /tmp/merge"
2895
2896
#: bzrlib/builtins.py:4214
2897
msgid ""
2898
" To create a merge revision with three parents from two branches\n"
2899
" feature1a and feature1b:"
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4217
2903
msgid ""
2904
" bzr merge ../feature1a\n"
2905
" bzr merge ../feature1b --force\n"
2906
" bzr commit -m 'revision with three parents'"
2907
msgstr ""
2908
2909
#: bzrlib/builtins.py:4229
2910
msgid "Merge even if the destination tree has uncommitted changes."
2911
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin ejecutar."
2912
2913
#: bzrlib/builtins.py:4235
2914
msgid ""
2915
"Apply uncommitted changes from a working copy, instead of branch changes."
2916
msgstr ""
2917
"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
2918
"de rama."
2919
2920
#: bzrlib/builtins.py:4237
2921
msgid ""
2922
"If the destination is already completely merged into the source, pull from "
2923
"the source rather than merging. When this happens, you do not need to "
2924
"commit the result."
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4242
2928
msgid ""
2929
"Branch to merge into, rather than the one containing the working directory."
2930
msgstr ""
2931
2932
#: bzrlib/builtins.py:4244
2933
msgid "Instead of merging, show a diff of the merge."
2934
msgstr ""
2935
2936
#: bzrlib/builtins.py:4246
2937
msgid "Select changes interactively."
2938
msgstr "Seleccionar cambios de manera interactiva."
2939
2940
#: bzrlib/builtins.py:4268
2941
msgid ""
2942
"Merging into empty branches not currently supported, "
2943
"https://bugs.launchpad.net/bzr/+bug/308562"
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4295
2947
msgid "Cannot use --uncommitted with bundles or merge directives."
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4306
2951
msgid "Cannot use --uncommitted and --revision at the same time."
2952
msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
2953
2954
#: bzrlib/builtins.py:4326
2955
msgid "merger: "
2956
msgstr "fusión: "
2957
2958
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2959
msgid "Nothing to do."
2960
msgstr "Nada que hacer."
2961
2962
#: bzrlib/builtins.py:4332
2963
msgid "Cannot pull individual files"
2964
msgstr "No se puede tirar de archivos individuales"
2965
2966
#: bzrlib/builtins.py:4340
2967
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2968
msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
2969
2970
#: bzrlib/builtins.py:4398
2971
#, python-format
2972
msgid "Show-base is not supported for this merge type. %s"
2973
msgstr "Show-base no está permitido en este tipo de fusión. %s"
2974
2975
#: bzrlib/builtins.py:4407
2976
#, python-format
2977
msgid "Conflict reduction is not supported for merge type %s."
2978
msgstr ""
2979
"La reducción de conflicot no está permitida para el tipo de fusión %s."
2980
2981
#: bzrlib/builtins.py:4411
2982
msgid "Cannot do conflict reduction and show base."
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4522
2986
msgid "No location specified or remembered"
2987
msgstr "No hay ubicación especificada o recordada"
2988
2989
#: bzrlib/builtins.py:4524
2990
msgid "{0} remembered {1} location {2}"
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4530
2994
msgid "Redo a merge."
2995
msgstr "Rehacer una fusión."
2996
2997
#: bzrlib/builtins.py:4532
2998
msgid ""
2999
"Use this if you want to try a different merge technique while resolving\n"
3000
"conflicts. Some merge techniques are better than others, and remerge\n"
3001
"lets you try different ones on different files."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4536
3005
msgid ""
3006
"The options for remerge have the same meaning and defaults as the ones for\n"
3007
"merge. The difference is that remerge can (only) be run when there is a\n"
3008
"pending merge, and it lets you specify particular files."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4540
3012
msgid ""
3013
":Examples:\n"
3014
" Re-do the merge of all conflicted files, and show the base text in\n"
3015
" conflict regions, in addition to the usual THIS and OTHER texts::"
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4544
3019
msgid " bzr remerge --show-base"
3020
msgstr " bzr remerge --show-base"
3021
3022
#: bzrlib/builtins.py:4546
3023
msgid ""
3024
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3025
" additional processing to reduce the size of conflict regions::"
3026
msgstr ""
3027
3028
#: bzrlib/builtins.py:4549
3029
msgid " bzr remerge --merge-type weave --reprocess foobar"
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:4556
3033
msgid "Show base revision text in conflicts."
3034
msgstr "Mostrar el texto de revisión base en los conflictos."
3035
3036
#: bzrlib/builtins.py:4568
3037
msgid ""
3038
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3039
"merges."
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4624
3043
msgid "Revert files to a previous revision."
3044
msgstr "Revierte los archivos a la revisión previa."
3045
3046
#: bzrlib/builtins.py:4626
3047
msgid ""
3048
"Giving a list of files will revert only those files. Otherwise, all files\n"
3049
"will be reverted. If the revision is not specified with '--revision', the\n"
3050
"last committed revision is used."
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4630
3054
msgid ""
3055
"To remove only some changes, without reverting to a prior version, use\n"
3056
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3057
"will remove the changes introduced by the second last commit (-2), without\n"
3058
"affecting the changes introduced by the last commit (-1). To remove\n"
3059
"certain changes on a hunk-by-hunk basis, see the shelve command."
3060
msgstr ""
3061
3062
#: bzrlib/builtins.py:4636
3063
msgid ""
3064
"By default, any files that have been manually changed will be backed up\n"
3065
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3066
"'.~#~' appended to their name, where # is a number."
3067
msgstr ""
3068
3069
#: bzrlib/builtins.py:4640
3070
msgid ""
3071
"When you provide files, you can use their current pathname or the pathname\n"
3072
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3073
"name. If you name a directory, all the contents of that directory will be\n"
3074
"reverted."
3075
msgstr ""
3076
3077
#: bzrlib/builtins.py:4645
3078
msgid ""
3079
"If you have newly added files since the target revision, they will be\n"
3080
"removed. If the files to be removed have been changed, backups will be\n"
3081
"created as above. Directories containing unknown files will not be\n"
3082
"deleted."
3083
msgstr ""
3084
3085
#: bzrlib/builtins.py:4650
3086
msgid ""
3087
"The working tree contains a list of revisions that have been merged but\n"
3088
"not yet committed. These revisions will be included as additional parents\n"
3089
"of the next commit. Normally, using revert clears that list as well as\n"
3090
"reverting the files. If any files are specified, revert leaves the list\n"
3091
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3092
".`` in the tree root to revert all files but keep the recorded merges,\n"
3093
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3094
"reverting any files."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4659
3098
msgid ""
3099
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3100
"changes from a branch in a single revision. To do this, perform the merge\n"
3101
"as desired. Then doing revert with the \"--forget-merges\" option will "
3102
"keep\n"
3103
"the content of the tree as it was, but it will clear the list of pending\n"
3104
"merges. The next commit will then contain all of the changes that are\n"
3105
"present in the other branch, but without any other parent revisions.\n"
3106
"Because this technique forgets where these changes originated, it may\n"
3107
"cause additional conflicts on later merges involving the same source and\n"
3108
"target branches."
3109
msgstr ""
3110
3111
#: bzrlib/builtins.py:4673
3112
msgid "Do not save backups of reverted files."
3113
msgstr "No guardar respaldos de los archivos revertidos"
3114
3115
#: bzrlib/builtins.py:4675
3116
msgid "Remove pending merge marker, without changing any files."
3117
msgstr ""
3118
"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
3119
3120
#: bzrlib/builtins.py:4706
3121
msgid ""
3122
"Show help on a command or other topic.\n"
3123
" "
3124
msgstr ""
3125
"Muestra ayuda en una orden u otro tema.\n"
3126
" "
3127
3128
#: bzrlib/builtins.py:4711
3129
msgid "Show help on all commands."
3130
msgstr "Muestra ayuda en todas las órdenes"
3131
3132
#: bzrlib/builtins.py:4740
3133
msgid "Show unmerged/unpulled revisions between two branches."
3134
msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
3135
3136
#: bzrlib/builtins.py:4742
3137
msgid "OTHER_BRANCH may be local or remote."
3138
msgstr "OTHER_BRANCH puede ser local o remoto."
3139
3140
#: bzrlib/builtins.py:4744
3141
msgid ""
3142
"To filter on a range of revisions, you can use the command -r begin..end\n"
3143
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3144
"also valid.\n"
3145
" \n"
3146
":Exit values:\n"
3147
" 1 - some missing revisions\n"
3148
" 0 - no missing revisions"
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:4754
3152
msgid ""
3153
" Determine the missing revisions between this and the branch at the\n"
3154
" remembered pull location::"
3155
msgstr ""
3156
3157
#: bzrlib/builtins.py:4757
3158
msgid " bzr missing"
3159
msgstr " bzr missing"
3160
3161
#: bzrlib/builtins.py:4759
3162
msgid " Determine the missing revisions between this and another branch::"
3163
msgstr " Determina las revisiones perdidas entre esta y otra rama::"
3164
3165
#: bzrlib/builtins.py:4761
3166
msgid " bzr missing http://server/branch"
3167
msgstr " bzr missing http://server/branch"
3168
3169
#: bzrlib/builtins.py:4763
3170
msgid ""
3171
" Determine the missing revisions up to a specific revision on the other\n"
3172
" branch::"
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:4766
3176
msgid " bzr missing -r ..-10"
3177
msgstr " bzr missing -r ..-10"
3178
3179
#: bzrlib/builtins.py:4768
3180
msgid ""
3181
" Determine the missing revisions up to a specific revision on this\n"
3182
" branch::"
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:4771
3186
msgid " bzr missing --my-revision ..-10"
3187
msgstr " bzr missing --my-revision ..-10"
3188
3189
#: bzrlib/builtins.py:4778
3190
msgid "Reverse the order of revisions."
3191
msgstr "Revierte el orden de las revisiones."
3192
3193
#: bzrlib/builtins.py:4780
3194
msgid "Display changes in the local branch only."
3195
msgstr "Muestra cambios solo en la rama local."
3196
3197
#: bzrlib/builtins.py:4781
3198
msgid "Same as --mine-only."
3199
msgstr "Lo mismo que --mine-only."
3200
3201
#: bzrlib/builtins.py:4783
3202
msgid "Display changes in the remote branch only."
3203
msgstr "Muestra cambios solo en la rama remota."
3204
3205
#: bzrlib/builtins.py:4784
3206
msgid "Same as --theirs-only."
3207
msgstr "Lo mismo que --theirs-only."
3208
3209
#: bzrlib/builtins.py:4789
3210
msgid ""
3211
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3212
"details."
3213
msgstr ""
3214
"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
3215
"tener más detalles."
3216
3217
#: bzrlib/builtins.py:4793
3218
msgid ""
3219
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3220
"details."
3221
msgstr ""
3222
"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
3223
"para tener más detalles."
3224
3225
#: bzrlib/builtins.py:4796
3226
msgid "Show all revisions in addition to the mainline ones."
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:4850
3230
msgid "No peer location known or specified."
3231
msgstr "No hay ubicación del par conocida o especificada."
3232
3233
#: bzrlib/builtins.py:4854
3234
msgid "Using saved parent location: {0}\n"
3235
msgstr "Usar ubicación padre guardada: {0}\n"
3236
3237
#: bzrlib/builtins.py:4887
3238
#, python-format
3239
msgid "You have %d extra revision:\n"
3240
msgid_plural "You have %d extra revisions:\n"
3241
msgstr[0] "Tiene %d revisión extra:\n"
3242
msgstr[1] "Tiene %d revisiones extra:\n"
3243
3244
#: bzrlib/builtins.py:4903
3245
#, python-format
3246
msgid "You are missing %d revision:\n"
3247
msgid_plural "You are missing %d revisions:\n"
3248
msgstr[0] "Tiene %d revisión perdida:\n"
3249
msgstr[1] "Tiene %d revisiones perdidas:\n"
3250
3251
#: bzrlib/builtins.py:4915
3252
msgid "This branch has no new revisions.\n"
3253
msgstr "Esta rama no tiene revisiones.\n"
3254
3255
#: bzrlib/builtins.py:4918
3256
msgid "Other branch has no new revisions.\n"
3257
msgstr "Otra rama no tiene revisiones nuevas.\n"
3258
3259
#: bzrlib/builtins.py:4923
3260
msgid "Branches are up to date.\n"
3261
msgstr "La rama está actualizada:\n"
3262
3263
#: bzrlib/builtins.py:4934
3264
msgid "Compress the data within a repository."
3265
msgstr "Comprime los datos en un repositorio."
3266
3267
#: bzrlib/builtins.py:4936
3268
msgid ""
3269
"This operation compresses the data within a bazaar repository. As\n"
3270
"bazaar supports automatic packing of repository, this operation is\n"
3271
"normally not required to be done manually."
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:4940
3275
msgid ""
3276
"During the pack operation, bazaar takes a backup of existing repository\n"
3277
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3278
"automatically when it is safe to do so. To save disk space by removing\n"
3279
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3280
"used."
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:4946
3284
msgid ""
3285
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3286
"during or immediately after repacking, you may be left with a state\n"
3287
"where the deletion has been written to disk but the new packs have not\n"
3288
"been. In this case the repository may be unusable."
3289
msgstr ""
3290
3291
#: bzrlib/builtins.py:4955
3292
msgid "Delete obsolete packs to save disk space."
3293
msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
3294
3295
#: bzrlib/builtins.py:4969
3296
msgid "List the installed plugins."
3297
msgstr "Lista los complementos instalados."
3298
3299
#: bzrlib/builtins.py:4971
3300
msgid ""
3301
"This command displays the list of installed plugins including\n"
3302
"version of plugin and a short description of each."
3303
msgstr ""
3304
"Esta orden muestra la lista de complementos instalados incluyendo\n"
3305
"versión del complemento y una breve descripción de cada uno."
3306
3307
#: bzrlib/builtins.py:4974
3308
msgid "--verbose shows the path where each plugin is located."
3309
msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
3310
3311
#: bzrlib/builtins.py:4976
3312
msgid ""
3313
"A plugin is an external component for Bazaar that extends the\n"
3314
"revision control system, by adding or replacing code in Bazaar.\n"
3315
"Plugins can do a variety of things, including overriding commands,\n"
3316
"adding new commands, providing additional network transports and\n"
3317
"customizing log output."
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:4982
3321
msgid ""
3322
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3323
"for further information on plugins including where to find them and how to\n"
3324
"install them. Instructions are also provided there on how to write new\n"
3325
"plugins using the Python programming language."
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:4998
3329
msgid "Show testament (signing-form) of a revision."
3330
msgstr ""
3331
3332
#: bzrlib/builtins.py:5001
3333
msgid "Produce long-format testament."
3334
msgstr "Produce testamento en formato largo."
3335
3336
#: bzrlib/builtins.py:5003
3337
msgid "Produce a strict-format testament."
3338
msgstr "Produce testamento en formato estricto."
3339
3340
#: bzrlib/builtins.py:5029
3341
msgid "Show the origin of each line in a file."
3342
msgstr "Muestra el origen de cada línea en un archivo"
3343
3344
#: bzrlib/builtins.py:5031
3345
msgid ""
3346
"This prints out the given file with an annotation on the left side\n"
3347
"indicating which revision, author and date introduced the change."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5034
3351
msgid ""
3352
"If the origin is the same for a run of consecutive lines, it is\n"
3353
"shown only at the top, unless the --all option is given."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5042
3357
msgid "Show annotations on all lines."
3358
msgstr "Muestra anotaciones en todas las líneas."
3359
3360
#: bzrlib/builtins.py:5043
3361
msgid "Show commit date in annotations."
3362
msgstr "Muestra la fecha de ejecución en anotaciones."
3363
3364
#: bzrlib/builtins.py:5130
3365
msgid "Cannot sign a range of non-revision-history revisions"
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5142
3369
msgid "Please supply either one revision, or a range."
3370
msgstr "Proporcione una revisión o un rango."
3371
3372
#: bzrlib/builtins.py:5146
3373
msgid ""
3374
"Convert the current branch into a checkout of the supplied branch.\n"
3375
"If no branch is supplied, rebind to the last bound location."
3376
msgstr ""
3377
3378
#: bzrlib/builtins.py:5149
3379
msgid ""
3380
"Once converted into a checkout, commits must succeed on the master branch\n"
3381
"before they will be applied to the local branch."
3382
msgstr ""
3383
3384
#: bzrlib/builtins.py:5152
3385
msgid ""
3386
"Bound branches use the nickname of its master branch unless it is set\n"
3387
"locally, in which case binding will update the local nickname to be\n"
3388
"that of the master."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5167
3392
msgid "No location supplied. This format does not remember old locations."
3393
msgstr ""
3394
"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
3395
3396
#: bzrlib/builtins.py:5172
3397
msgid "Branch is already bound"
3398
msgstr "La rama ya está asociada"
3399
3400
#: bzrlib/builtins.py:5174
3401
msgid "No location supplied and no previous location known"
3402
msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
3403
3404
#: bzrlib/builtins.py:5180
3405
msgid "These branches have diverged. Try merging, and then bind again."
3406
msgstr ""
3407
"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
3408
3409
#: bzrlib/builtins.py:5187
3410
msgid "Convert the current checkout into a regular branch."
3411
msgstr "Convertir la comprobación actual en una rama regular."
3412
3413
#: bzrlib/builtins.py:5189
3414
msgid ""
3415
"After unbinding, the local branch is considered independent and subsequent\n"
3416
"commits will be local only."
3417
msgstr ""
3418
3419
#: bzrlib/builtins.py:5200
3420
msgid "Local branch is not bound"
3421
msgstr "La rama local no está vinculada"
3422
3423
#: bzrlib/builtins.py:5204
3424
msgid "Remove the last committed revision."
3425
msgstr "Elimina la última revisión ejecutada."
3426
3427
#: bzrlib/builtins.py:5206
3428
msgid ""
3429
"--verbose will print out what is being removed.\n"
3430
"--dry-run will go through all the motions, but not actually\n"
3431
"remove anything."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5210
3435
msgid ""
3436
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3437
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3438
"branch at revision 15."
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:5214
3442
msgid ""
3443
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3444
"it may make is to restore any pending merges that were present before\n"
3445
"the commit."
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5225
3449
msgid "Don't actually make changes."
3450
msgstr "En relaidad no hace cambios."
3451
3452
#: bzrlib/builtins.py:5226
3453
msgid "Say yes to all questions."
3454
msgstr "Decir sí a todas las preguntas."
3455
3456
#: bzrlib/builtins.py:5228
3457
msgid "Keep tags that point to removed revisions."
3458
msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
3459
3460
#: bzrlib/builtins.py:5230
3461
msgid "Only remove the commits from the local branch when in a checkout."
3462
msgstr ""
3463
"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
3464
3465
#: bzrlib/builtins.py:5279
3466
msgid "No revisions to uncommit.\n"
3467
msgstr "No hay revisiones para desejecutar.\n"
3468
3469
#: bzrlib/builtins.py:5294
3470
msgid "Dry-run, pretending to remove the above revisions.\n"
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5297
3474
msgid "The above revision(s) will be removed.\n"
3475
msgstr "Las revisiones de arriba se eliminarán.\n"
3476
3477
#: bzrlib/builtins.py:5301
3478
msgid "Uncommit these revisions"
3479
msgstr "Desejecutar estas revisiones"
3480
3481
#: bzrlib/builtins.py:5304
3482
msgid "Canceled\n"
3483
msgstr "Cancelado\n"
3484
3485
#: bzrlib/builtins.py:5311
3486
#, python-format
3487
msgid ""
3488
"You can restore the old tip by running:\n"
3489
" bzr pull . -r revid:%s\n"
3490
msgstr ""
3491
"Puede restaurar el consejo antiguo ejecutando:\n"
3492
" bzr pull . -r revid:%s\n"
3493
3494
#: bzrlib/builtins.py:5316
3495
msgid "Break a dead lock."
3496
msgstr "Romper un bloqueo."
3497
3498
#: bzrlib/builtins.py:5318
3499
msgid ""
3500
"This command breaks a lock on a repository, branch, working directory or\n"
3501
"config file."
3502
msgstr ""
3503
"Esta orden rompe un bloqueo en un repositorio, rama, directorio de trabajo "
3504
"o\n"
3505
"archivo de configuración."
3506
3507
#: bzrlib/builtins.py:5321
3508
msgid ""
3509
"CAUTION: Locks should only be broken when you are sure that the process\n"
3510
"holding the lock has been stopped."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5324
3514
msgid ""
3515
"You can get information on what locks are open via the 'bzr info\n"
3516
"[location]' command."
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5327
3520
msgid ""
3521
":Examples:\n"
3522
" bzr break-lock\n"
3523
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3524
" bzr break-lock --conf ~/.bazaar"
3525
msgstr ""
3526
":Ejemplos:\n"
3527
" bzr break-lock\n"
3528
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3529
" bzr break-lock --conf ~/.bazaar"
3530
3531
#: bzrlib/builtins.py:5336
3532
msgid "LOCATION is the directory where the config lock is."
3533
msgstr ""
3534
3535
#: bzrlib/builtins.py:5338
3536
msgid "Do not ask for confirmation before breaking the lock."
3537
msgstr "No pedir confirmación antes de romper el bloqueo."
3538
3539
#: bzrlib/builtins.py:5373
3540
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3541
msgstr ""
3542
3543
#: bzrlib/builtins.py:5374
3544
msgid "Run the bzr server."
3545
msgstr "Ejecutar el servidor bzr."
3546
3547
#: bzrlib/builtins.py:5380
3548
msgid "Serve on stdin/out for use from inetd or sshd."
3549
msgstr ""
3550
3551
#: bzrlib/builtins.py:5381
3552
msgid "protocol"
3553
msgstr "protocolo"
3554
3555
#: bzrlib/builtins.py:5382
3556
msgid "Protocol to serve."
3557
msgstr "Protocolo a servir."
3558
3559
#: bzrlib/builtins.py:5386
3560
msgid ""
3561
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3562
"Passing 0 as the port number will result in a dynamically allocated port. "
3563
"The default port depends on the protocol."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5392
3567
msgid "Serve contents of this directory."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5394
3571
msgid ""
3572
"By default the server is a readonly server. Supplying --allow-writes "
3573
"enables write access to the contents of the served directory and below. "
3574
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3575
"of external authentication is arranged supplying this option leads to global "
3576
"uncontrolled write access to your file system."
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:5403
3580
msgid "Override the default idle client timeout (5min)."
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5453
3584
msgid "Combine a tree into its containing tree."
3585
msgstr "Combina un árbol en su árbol contenedor."
3586
3587
#: bzrlib/builtins.py:5455
3588
msgid "This command requires the target tree to be in a rich-root format."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5457
3592
msgid ""
3593
"The TREE argument should be an independent tree, inside another tree, but\n"
3594
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3595
"running \"bzr branch\" with the target inside a tree.)"
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5461
3599
msgid ""
3600
"The result is a combined tree, with the subtree no longer an independent\n"
3601
"part. This is marked as a merge of the subtree into the containing tree,\n"
3602
"and all history is preserved."
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5479
3606
#, python-format
3607
msgid ""
3608
"Can't join trees because %s doesn't support rich root data.\n"
3609
"You can use bzr upgrade on the repository."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3613
msgid "Cannot join {0}. {1}"
3614
msgstr "No se puede unir {0}. {1}"
3615
3616
#: bzrlib/builtins.py:5499
3617
msgid "Split a subdirectory of a tree into a separate tree."
3618
msgstr "Divide un subdirectorio de un árbol en un árbol separado."
3619
3620
#: bzrlib/builtins.py:5501
3621
msgid ""
3622
"This command will produce a target tree in a format that supports\n"
3623
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3624
"converted into earlier formats like 'dirstate-tags'."
3625
msgstr ""
3626
3627
#: bzrlib/builtins.py:5505
3628
msgid ""
3629
"The TREE argument should be a subdirectory of a working tree. That\n"
3630
"subdirectory will be converted into an independent tree, with its own\n"
3631
"branch. Commits in the top-level tree will not apply to the new subtree."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5585
3635
msgid "No submit branch specified or known"
3636
msgstr "No se ha enviado una rama especificada o conocida"
3637
3638
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3639
msgid "No public branch specified or known"
3640
msgstr "No hay una rama especificada o conocida pública"
3641
3642
#: bzrlib/builtins.py:5598
3643
msgid "bzr merge-directive takes at most two one revision identifiers"
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5607
3647
msgid "No revisions to bundle."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5626
3651
msgid "Mail or create a merge-directive for submitting changes."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5628
3655
msgid "A merge directive provides many things needed for requesting merges:"
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5630
3659
msgid "* A machine-readable description of the merge to perform"
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5632
3663
msgid "* An optional patch that is a preview of the changes requested"
3664
msgstr ""
3665
"* Una ruta opcional que es una vista previa de los cambios requeridos"
3666
3667
#: bzrlib/builtins.py:5634
3668
msgid ""
3669
"* An optional bundle of revision data, so that the changes can be applied\n"
3670
" directly from the merge directive, without retrieving data from a\n"
3671
" branch."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5638
3675
msgid ""
3676
"`bzr send` creates a compact data set that, when applied using bzr\n"
3677
"merge, has the same effect as merging from the source branch. "
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5641
3681
msgid ""
3682
"By default the merge directive is self-contained and can be applied to any\n"
3683
"branch containing submit_branch in its ancestory without needing access to\n"
3684
"the source branch."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5645
3688
msgid ""
3689
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3690
"revisions, but only a structured request to merge from the\n"
3691
"public_location. In that case the public_branch is needed and it must be\n"
3692
"up-to-date and accessible to the recipient. The public_branch is always\n"
3693
"included if known, so that people can check it later."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:5651
3697
msgid ""
3698
"The submit branch defaults to the parent of the source branch, but can be\n"
3699
"overridden. Both submit branch and public branch will be remembered in\n"
3700
"branch.conf the first time they are used for a particular branch. The\n"
3701
"source branch defaults to that containing the working directory, but can\n"
3702
"be changed using --from."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5657
3706
msgid ""
3707
"Both the submit branch and the public branch follow the usual behavior with\n"
3708
"respect to --remember: If there is no default location set, the first send\n"
3709
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3710
"omit the location to use the default. To change the default, use\n"
3711
"--remember. The value will only be saved if the location can be accessed."
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:5663
3715
msgid ""
3716
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3717
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3718
"If a public location is known for the submit_branch, that location is used\n"
3719
"in the merge directive."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:5668
3723
msgid ""
3724
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3725
"given, in which case it is sent to a file."
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:5671
3729
msgid ""
3730
"Mail is sent using your preferred mail program. This should be transparent\n"
3731
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3732
"If the preferred client can't be found (or used), your editor will be used."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:5675
3736
msgid ""
3737
"To use a specific mail program, set the mail_client configuration option.\n"
3738
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3739
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3740
"(MacOS X's\n"
3741
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3742
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3743
"add\n"
3744
"supported clients."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:5682
3748
msgid ""
3749
"If mail is being sent, a to address is required. This can be supplied\n"
3750
"either on the commandline, by setting the submit_to configuration\n"
3751
"option in the branch itself or the child_submit_to configuration option\n"
3752
"in the submit branch."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5687
3756
msgid ""
3757
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3758
"and\n"
3759
"merge directive format 2. It is significantly faster and smaller than\n"
3760
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3761
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3762
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:5693
3766
msgid ""
3767
"The merge directives created by bzr send may be applied using bzr merge or\n"
3768
"bzr pull by specifying a file containing a merge directive as the location."
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:5696
3772
msgid ""
3773
"bzr send makes extensive use of public locations to map local locations "
3774
"into\n"
3775
"URLs that can be used by other people. See `bzr help configuration` to\n"
3776
"set them, and use `bzr info` to display them."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:5720
3780
msgid "Write merge directive to this file or directory; use - for stdout."
3781
msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
3782
3783
#: bzrlib/builtins.py:5724
3784
msgid ""
3785
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3786
"strict disables the check."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:5726
3790
msgid "Mail the request to this address."
3791
msgstr "Enviar por correo la petición a esta dirección"
3792
3793
#: bzrlib/builtins.py:5730
3794
msgid "Body for the email."
3795
msgstr "Cuerpo para el correo."
3796
3797
#: bzrlib/builtins.py:5783
3798
msgid "Do not include a bundle in the merge directive."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:5784
3802
msgid "Do not include a preview patch in the merge directive."
3803
msgstr "No incluir una ruta de vista previa en la directiva de fusión."
3804
3805
#: bzrlib/builtins.py:5787
3806
msgid "Remember submit and public branch."
3807
msgstr "Recordar el envío y la rama pública."
3808
3809
#: bzrlib/builtins.py:5789
3810
msgid ""
3811
"Branch to generate the submission from, rather than the one containing the "
3812
"working directory."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3816
msgid "format"
3817
msgstr "formato"
3818
3819
#: bzrlib/builtins.py:5800
3820
msgid "Use the specified output format."
3821
msgstr "Usar el formato de salida especificado."
3822
3823
#: bzrlib/builtins.py:5822
3824
msgid "Create, remove or modify a tag naming a revision."
3825
msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
3826
3827
#: bzrlib/builtins.py:5824
3828
msgid ""
3829
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3830
"(--revision) option can be given -rtag:X, where X is any previously\n"
3831
"created tag."
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:5828
3835
msgid ""
3836
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3837
"along when you branch, push, pull or merge."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5831
3841
msgid ""
3842
"It is an error to give a tag name that already exists unless you pass\n"
3843
"--force, in which case the tag is moved to point to the new revision."
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:5834
3847
msgid ""
3848
"To rename a tag (change the name but keep it on the same revsion), run "
3849
"``bzr\n"
3850
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:5837
3854
msgid ""
3855
"If no tag name is specified it will be determined through the \n"
3856
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3857
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3858
"details."
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:5847
3862
msgid "Delete this tag rather than placing it."
3863
msgstr "Eliminar esta etiqueta en lugar de colocarla."
3864
3865
#: bzrlib/builtins.py:5850
3866
msgid "Branch in which to place the tag."
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:5852
3870
msgid "Replace existing tags."
3871
msgstr "Reemplazar las etiquetas existentes."
3872
3873
#: bzrlib/builtins.py:5867
3874
msgid "No tag specified to delete."
3875
msgstr "No hay etiquetas especificadas para eliminar."
3876
3877
#: bzrlib/builtins.py:5869
3878
#, python-format
3879
msgid "Deleted tag %s."
3880
msgstr "Etiqueta%s eliminada."
3881
3882
#: bzrlib/builtins.py:5883
3883
msgid "Please specify a tag name."
3884
msgstr "Especifique un nombre de etiqueta."
3885
3886
#: bzrlib/builtins.py:5891
3887
#, python-format
3888
msgid "Tag %s already exists for that revision."
3889
msgstr "La etiqueta %s existe para esta revisión."
3890
3891
#: bzrlib/builtins.py:5895
3892
#, python-format
3893
msgid "Created tag %s."
3894
msgstr "Etiqueta %s creada."
3895
3896
#: bzrlib/builtins.py:5897
3897
#, python-format
3898
msgid "Updated tag %s."
3899
msgstr "Etiqueta actualizada %s."
3900
3901
#: bzrlib/builtins.py:5901
3902
msgid "List tags."
3903
msgstr "Listar etiquetas."
3904
3905
#: bzrlib/builtins.py:5903
3906
msgid ""
3907
"This command shows a table of tag names and the revisions they reference."
3908
msgstr ""
3909
3910
#: bzrlib/builtins.py:5909
3911
msgid "Branch whose tags should be displayed."
3912
msgstr "Rama cuyas etiquetas se deben mostrar."
3913
3914
#: bzrlib/builtins.py:5911
3915
msgid "Sort tags by different criteria."
3916
msgstr "Ordenar etiquetas con diferentes criterios."
3917
3918
#: bzrlib/builtins.py:5911
3919
msgid "Sorting"
3920
msgstr "Ordenación"
3921
3922
#: bzrlib/builtins.py:5980
3923
msgid "Reconfigure the type of a bzr directory."
3924
msgstr "Reconfigura el tipo de un directorio bzr."
3925
3926
#: bzrlib/builtins.py:5982
3927
msgid "A target configuration must be specified."
3928
msgstr "Se debe especificar una configuración objetivo."
3929
3930
#: bzrlib/builtins.py:5984
3931
msgid ""
3932
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3933
"The order of preference is\n"
3934
"1. For a lightweight checkout, the current bound location.\n"
3935
"2. For branches that used to be checkouts, the previously-bound location.\n"
3936
"3. The push location.\n"
3937
"4. The parent location.\n"
3938
"If none of these is available, --bind-to must be specified."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:5998
3942
msgid "Tree type"
3943
msgstr "Tipo de árbol"
3944
3945
#: bzrlib/builtins.py:5999
3946
msgid "The relation between branch and tree."
3947
msgstr "La relación entre rama y árbol."
3948
3949
#: bzrlib/builtins.py:6001
3950
msgid "Reconfigure to be an unbound branch with no working tree."
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6002
3954
msgid "Reconfigure to be an unbound branch with a working tree."
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6003
3958
msgid "Reconfigure to be a bound branch with a working tree."
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6004
3962
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6009
3966
msgid "Repository type"
3967
msgstr "Tipo de repositorio"
3968
3969
#: bzrlib/builtins.py:6010
3970
msgid "Location fo the repository."
3971
msgstr "Ubicación en el repositorio."
3972
3973
#: bzrlib/builtins.py:6012
3974
msgid ""
3975
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:6014
3979
msgid "Reconfigure to use a shared repository."
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:6018
3983
msgid "Trees in Repository"
3984
msgstr "Árboles en el repositorio"
3985
3986
#: bzrlib/builtins.py:6019
3987
msgid "Whether new branches in the repository have trees."
3988
msgstr "Si las ramas nuevas en el repositorio tienen árboles."
3989
3990
#: bzrlib/builtins.py:6021
3991
msgid ""
3992
"Reconfigure repository to create working trees on branches by default."
3993
msgstr ""
3994
3995
#: bzrlib/builtins.py:6023
3996
msgid ""
3997
"Reconfigure repository to not create working trees on branches by default."
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6026
4001
msgid "Branch to bind checkout to."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6028
4005
msgid "Perform reconfiguration even if local changes will be lost."
4006
msgstr ""
4007
"Realizar reconfiguración incluso si se han perdido los cambios locales."
4008
4009
#: bzrlib/builtins.py:6031
4010
msgid "Reconfigure a branch to be stacked on another branch."
4011
msgstr "Reconfigurar una rama para apilarla en otra rama."
4012
4013
#: bzrlib/builtins.py:6035
4014
msgid ""
4015
"Reconfigure a branch to be unstacked. This may require copying substantial "
4016
"data into it."
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:6045
4020
msgid "Can't use both --stacked-on and --unstacked"
4021
msgstr "No se pueden usar ambos --stacked-on y --unstacked"
4022
4023
#: bzrlib/builtins.py:6059
4024
msgid "No target configuration specified"
4025
msgstr "No se ha especificado una configuración objetivo"
4026
4027
#: bzrlib/builtins.py:6094
4028
msgid "Set the branch of a checkout and update."
4029
msgstr "Establezca la rama de una comprobación y actualización."
4030
4031
#: bzrlib/builtins.py:6096
4032
msgid ""
4033
"For lightweight checkouts, this changes the branch being referenced.\n"
4034
"For heavyweight checkouts, this checks that there are no local commits\n"
4035
"versus the current bound branch, then it makes the local branch a mirror\n"
4036
"of the new location and binds to it."
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6101
4040
msgid ""
4041
"In both cases, the working tree is updated and uncommitted changes\n"
4042
"are merged. The user can commit or revert these as they desire."
4043
msgstr ""
4044
4045
#: bzrlib/builtins.py:6104
4046
msgid "Pending merges need to be committed or reverted before using switch."
4047
msgstr ""
4048
4049
#: bzrlib/builtins.py:6106
4050
msgid ""
4051
"The path to the branch to switch to can be specified relative to the parent\n"
4052
"directory of the current branch. For example, if you are currently in a\n"
4053
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4054
"/path/to/newbranch."
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6111
4058
msgid ""
4059
"Bound branches use the nickname of its master branch unless it is set\n"
4060
"locally, in which case switching will update the local nickname to be\n"
4061
"that of the master."
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6119
4065
msgid "Switch even if local commits will be lost."
4066
msgstr "Cambiar incluso si las ejecuciones se han perdido."
4067
4068
#: bzrlib/builtins.py:6122
4069
msgid "Create the target branch from this one before switching to it."
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6134
4073
msgid "You must supply either a revision or a location"
4074
msgstr "Debe especificar una revisión o una ubicación"
4075
4076
#: bzrlib/builtins.py:6145
4077
msgid "cannot create branch without source branch"
4078
msgstr "no se puede crear una rama sin rama origen"
4079
4080
#: bzrlib/builtins.py:6209
4081
msgid "Manage filtered views."
4082
msgstr "Gestionar vistas filtradas."
4083
4084
#: bzrlib/builtins.py:6211
4085
msgid ""
4086
"Views provide a mask over the tree so that users can focus on\n"
4087
"a subset of a tree when doing their work. After creating a view,\n"
4088
"commands that support a list of files - status, diff, commit, etc -\n"
4089
"effectively have that list of files implicitly given each time.\n"
4090
"An explicit list of files can still be given but those files\n"
4091
"must be within the current view."
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6218
4095
msgid ""
4096
"In most cases, a view has a short life-span: it is created to make\n"
4097
"a selected change and is deleted once that change is committed.\n"
4098
"At other times, you may wish to create one or more named views\n"
4099
"and switch between them."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6223
4103
msgid ""
4104
"To disable the current view without deleting it, you can switch to\n"
4105
"the pseudo view called ``off``. This can be useful when you need\n"
4106
"to see the whole tree for an operation or two (e.g. merge) but\n"
4107
"want to switch back to your view after that."
4108
msgstr ""
4109
4110
#: bzrlib/builtins.py:6228
4111
msgid ""
4112
":Examples:\n"
4113
" To define the current view::"
4114
msgstr ""
4115
":Ejemplos:\n"
4116
" Para definir la vista actual::"
4117
4118
#: bzrlib/builtins.py:6231
4119
msgid " bzr view file1 dir1 ..."
4120
msgstr " bzr view file1 dir1 ..."
4121
4122
#: bzrlib/builtins.py:6233
4123
msgid " To list the current view::"
4124
msgstr " Para listar la vista actual::"
4125
4126
#: bzrlib/builtins.py:6235
4127
msgid " bzr view"
4128
msgstr " vista bzr"
4129
4130
#: bzrlib/builtins.py:6237
4131
msgid " To delete the current view::"
4132
msgstr " Para eliminar la vista actual::"
4133
4134
#: bzrlib/builtins.py:6239
4135
msgid " bzr view --delete"
4136
msgstr " bzr view --delete"
4137
4138
#: bzrlib/builtins.py:6241
4139
msgid " To disable the current view without deleting it::"
4140
msgstr " Para desactivar la vista actual sin eliminarla::"
4141
4142
#: bzrlib/builtins.py:6243
4143
msgid " bzr view --switch off"
4144
msgstr " bzr view --switch off"
4145
4146
#: bzrlib/builtins.py:6245
4147
msgid " To define a named view and switch to it::"
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6247
4151
msgid " bzr view --name view-name file1 dir1 ..."
4152
msgstr " bzr view --name view-name file1 dir1 ..."
4153
4154
#: bzrlib/builtins.py:6249
4155
msgid " To list a named view::"
4156
msgstr " Para lista la vista nombrada::"
4157
4158
#: bzrlib/builtins.py:6251
4159
msgid " bzr view --name view-name"
4160
msgstr " bzr view --name view-name"
4161
4162
#: bzrlib/builtins.py:6253
4163
msgid " To delete a named view::"
4164
msgstr " Para eliminar una vista nombrada::"
4165
4166
#: bzrlib/builtins.py:6255
4167
msgid " bzr view --name view-name --delete"
4168
msgstr " bzr view --name view-name --delete"
4169
4170
#: bzrlib/builtins.py:6257
4171
msgid " To switch to a named view::"
4172
msgstr " Para cambiar a una vista nombrada::"
4173
4174
#: bzrlib/builtins.py:6259
4175
msgid " bzr view --switch view-name"
4176
msgstr " bzr view --switch view-name"
4177
4178
#: bzrlib/builtins.py:6261
4179
msgid " To list all views defined::"
4180
msgstr " Para listar todas las vistas definidas::"
4181
4182
#: bzrlib/builtins.py:6263
4183
msgid " bzr view --all"
4184
msgstr " bzr view --all"
4185
4186
#: bzrlib/builtins.py:6265
4187
msgid " To delete all views::"
4188
msgstr " Para eliminar todas las vistas::"
4189
4190
#: bzrlib/builtins.py:6267
4191
msgid " bzr view --delete --all"
4192
msgstr " bzr view --delete --all"
4193
4194
#: bzrlib/builtins.py:6274
4195
msgid "Apply list or delete action to all views."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6277
4199
msgid "Delete the view."
4200
msgstr "Eliminar la vista."
4201
4202
#: bzrlib/builtins.py:6280
4203
msgid "Name of the view to define, list or delete."
4204
msgstr "Nombre de la vista a definir, listar o eliminar."
4205
4206
#: bzrlib/builtins.py:6284
4207
msgid "Name of the view to switch to."
4208
msgstr "Nombre de la vista a la que cambiar."
4209
4210
#: bzrlib/builtins.py:6303
4211
msgid "Both --delete and a file list specified"
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6306
4215
msgid "Both --delete and --switch specified"
4216
msgstr "Ambos --delete y --switch especificados"
4217
4218
#: bzrlib/builtins.py:6309
4219
msgid "Deleted all views.\n"
4220
msgstr "Eliminar todas las vistas.\n"
4221
4222
#: bzrlib/builtins.py:6311
4223
msgid "No current view to delete"
4224
msgstr "No hay vista para eliminar"
4225
4226
#: bzrlib/builtins.py:6314
4227
#, python-format
4228
msgid "Deleted '%s' view.\n"
4229
msgstr "Vista «%s» eliminada.\n"
4230
4231
#: bzrlib/builtins.py:6318
4232
msgid "Both --switch and a file list specified"
4233
msgstr ""
4234
4235
#: bzrlib/builtins.py:6321
4236
msgid "Both --switch and --all specified"
4237
msgstr "Ambos --switch y --all especificados"
4238
4239
#: bzrlib/builtins.py:6324
4240
msgid "No current view to disable"
4241
msgstr "No hay vista actual que desactivar"
4242
4243
#: bzrlib/builtins.py:6326
4244
#, python-format
4245
msgid "Disabled '%s' view.\n"
4246
msgstr "Vista «%s» desactivada.\n"
4247
4248
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4249
msgid "Using '{0}' view: {1}\n"
4250
msgstr "Usar «{0}» vista: {1}\n"
4251
4252
#: bzrlib/builtins.py:6333
4253
msgid "Views defined:\n"
4254
msgstr "Vistas definidas:\n"
4255
4256
#: bzrlib/builtins.py:6342
4257
msgid "No views defined.\n"
4258
msgstr "No hay vista definida.\n"
4259
4260
#: bzrlib/builtins.py:6349
4261
msgid "Cannot change the 'off' pseudo view"
4262
msgstr ""
4263
4264
#: bzrlib/builtins.py:6357
4265
msgid "No current view.\n"
4266
msgstr "No hay vista actual.\n"
4267
4268
#: bzrlib/builtins.py:6360
4269
msgid "'{0}' view is: {1}\n"
4270
msgstr "«{0}» vista es: {1}\n"
4271
4272
#: bzrlib/builtins.py:6380
4273
msgid " <no hooks installed>\n"
4274
msgstr ""
4275
4276
#: bzrlib/builtins.py:6384
4277
msgid "Remove a branch."
4278
msgstr "Eliminar una rama."
4279
4280
#: bzrlib/builtins.py:6386
4281
msgid ""
4282
"This will remove the branch from the specified location but \n"
4283
"will keep any working tree or repository in place."
4284
msgstr ""
4285
4286
#: bzrlib/builtins.py:6391
4287
msgid " Remove the branch at repo/trunk::"
4288
msgstr " Eliminar la rama en repo/trunk::"
4289
4290
#: bzrlib/builtins.py:6393
4291
msgid " bzr remove-branch repo/trunk"
4292
msgstr " bzr remove-branch repo/trunk"
4293
4294
#: bzrlib/builtins.py:6408
4295
msgid "Plaintext diff output."
4296
msgstr ""
4297
4298
#: bzrlib/builtins.py:6409
4299
msgid "Temporarily set aside some changes from the current tree."
4300
msgstr ""
4301
4302
#: bzrlib/builtins.py:6411
4303
msgid ""
4304
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4305
"ie. out of the way, until a later time when you can bring them back from\n"
4306
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4307
"your working tree, and so they aren't propagated along with your branch nor\n"
4308
"will they survive its deletion."
4309
msgstr ""
4310
4311
#: bzrlib/builtins.py:6417
4312
msgid "If shelve --list is specified, previously-shelved changes are listed."
4313
msgstr ""
4314
4315
#: bzrlib/builtins.py:6419
4316
msgid ""
4317
"Shelve is intended to help separate several sets of changes that have\n"
4318
"been inappropriately mingled. If you just want to get rid of all changes\n"
4319
"and you don't need to restore them later, use revert. If you want to\n"
4320
"shelve all text changes at once, use shelve --all."
4321
msgstr ""
4322
4323
#: bzrlib/builtins.py:6424
4324
msgid ""
4325
"If filenames are specified, only the changes to those files will be\n"
4326
"shelved. Other files will be left untouched."
4327
msgstr ""
4328
4329
#: bzrlib/builtins.py:6427
4330
msgid ""
4331
"If a revision is specified, changes since that revision will be shelved."
4332
msgstr ""
4333
"Si se especifica una revisión, los cambios realizados desde esta revisión "
4334
"serán archivados."
4335
4336
#: bzrlib/builtins.py:6429
4337
msgid ""
4338
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4339
"restore the most recently shelved changes."
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6432
4343
msgid ""
4344
"For complicated changes, it is possible to edit the changes in a separate\n"
4345
"editor program to decide what the file remaining in the working copy\n"
4346
"should look like. To do this, add the configuration option"
4347
msgstr ""
4348
4349
#: bzrlib/builtins.py:6436
4350
msgid " change_editor = PROGRAM @new_path @old_path"
4351
msgstr ""
4352
4353
#: bzrlib/builtins.py:6438
4354
msgid ""
4355
"where @new_path is replaced with the path of the new version of the \n"
4356
"file and @old_path is replaced with the path of the old version of \n"
4357
"the file. The PROGRAM should save the new file with the desired \n"
4358
"contents of the file in the working tree.\n"
4359
" "
4360
msgstr ""
4361
4362
#: bzrlib/builtins.py:6450
4363
msgid "Shelve all changes."
4364
msgstr "Guardar todos los cambios."
4365
4366
#: bzrlib/builtins.py:6452
4367
msgid "Method to use for writing diffs."
4368
msgstr "Método a usar para escribir diferencias."
4369
4370
#: bzrlib/builtins.py:6452
4371
msgid "writer"
4372
msgstr "escritor"
4373
4374
#: bzrlib/builtins.py:6456
4375
msgid "List shelved changes."
4376
msgstr "Listar cambios guardados."
4377
4378
#: bzrlib/builtins.py:6458
4379
msgid "Destroy removed changes instead of shelving them."
4380
msgstr "Destruir cambios eliminados en vez de guardarlos."
4381
4382
#: bzrlib/builtins.py:6487
4383
msgid "No shelved changes."
4384
msgstr "No ha cambios guardados."
4385
4386
#: bzrlib/builtins.py:6498
4387
msgid "Restore shelved changes."
4388
msgstr "Restaurar cambios guardados."
4389
4390
#: bzrlib/builtins.py:6500
4391
msgid ""
4392
"By default, the most recently shelved changes are restored. However if you\n"
4393
"specify a shelf by id those changes will be restored instead. This works\n"
4394
"best when the changes don't depend on each other."
4395
msgstr ""
4396
4397
#: bzrlib/builtins.py:6509
4398
msgid "The action to perform."
4399
msgstr "La acción a realizar."
4400
4401
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4402
msgid "action"
4403
msgstr "acción"
4404
4405
#: bzrlib/builtins.py:6511
4406
msgid "Apply changes and remove from the shelf."
4407
msgstr ""
4408
4409
#: bzrlib/builtins.py:6512
4410
msgid "Show changes, but do not apply or remove them."
4411
msgstr ""
4412
4413
#: bzrlib/builtins.py:6513
4414
msgid ""
4415
"Instead of unshelving the changes, show the diff that would result from "
4416
"unshelving."
4417
msgstr ""
4418
4419
#: bzrlib/builtins.py:6515
4420
msgid "Delete changes without applying them."
4421
msgstr ""
4422
4423
#: bzrlib/builtins.py:6516
4424
msgid "Apply changes but don't delete them."
4425
msgstr ""
4426
4427
#: bzrlib/builtins.py:6531
4428
msgid "Remove unwanted files from working tree."
4429
msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
4430
4431
#: bzrlib/builtins.py:6533
4432
msgid ""
4433
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4434
"files are never deleted."
4435
msgstr ""
4436
4437
#: bzrlib/builtins.py:6536
4438
msgid ""
4439
"Another class is 'detritus', which includes files emitted by bzr during\n"
4440
"normal operations and selftests. (The value of these files decreases with\n"
4441
"time.)"
4442
msgstr ""
4443
4444
#: bzrlib/builtins.py:6540
4445
msgid ""
4446
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4447
"flags are respected, and may be combined."
4448
msgstr ""
4449
4450
#: bzrlib/builtins.py:6543
4451
msgid "To check what clean-tree will do, use --dry-run."
4452
msgstr ""
4453
4454
#: bzrlib/builtins.py:6546
4455
msgid "Delete all ignored files."
4456
msgstr "Eliminar todos los archivos ignorados."
4457
4458
#: bzrlib/builtins.py:6547
4459
msgid ""
4460
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4461
msgstr ""
4462
4463
#: bzrlib/builtins.py:6550
4464
msgid "Delete files unknown to bzr (default)."
4465
msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
4466
4467
#: bzrlib/builtins.py:6551
4468
msgid "Show files to delete instead of deleting them."
4469
msgstr "Mostrar archivos a eliminar en vez de eliminarles."
4470
4471
#: bzrlib/builtins.py:6553
4472
msgid "Do not prompt before deleting."
4473
msgstr "No preguntar antes de eliminar."
4474
4475
#: bzrlib/bundle/__init__.py:59
4476
msgid "A directory cannot be a bundle"
4477
msgstr ""
4478
4479
#: bzrlib/bundle/apply_bundle.py:40
4480
msgid "Install revisions"
4481
msgstr ""
4482
4483
#: bzrlib/bundle/commands.py:64
4484
msgid "--verbose requires a merge directive"
4485
msgstr ""
4486
4487
#: bzrlib/bundle/commands.py:67
4488
msgid "Bundle format not supported"
4489
msgstr ""
4490
4491
#: bzrlib/bundle/commands.py:77
4492
msgid "Records\n"
4493
msgstr ""
4494
4495
#: bzrlib/bundle/commands.py:81
4496
msgid "{0}: {1} ({2} multiparent)\n"
4497
msgstr ""
4498
4499
#: bzrlib/bundle/commands.py:83
4500
#, python-format
4501
msgid "unique files: %d\n"
4502
msgstr ""
4503
4504
#: bzrlib/bundle/commands.py:92
4505
msgid "Revisions\n"
4506
msgstr ""
4507
4508
#: bzrlib/bundle/commands.py:93
4509
#, python-format
4510
msgid "nicks: %s\n"
4511
msgstr ""
4512
4513
#: bzrlib/bundle/commands.py:95
4514
#, python-format
4515
msgid ""
4516
"committers: \n"
4517
"%s\n"
4518
msgstr ""
4519
4520
#: bzrlib/bundle/commands.py:103
4521
msgid "Decoded contents\n"
4522
msgstr ""
4523
4524
#: bzrlib/bundle/serializer/v4.py:327
4525
#, python-format
4526
msgid "Bundling %d revision."
4527
msgid_plural "Bundling %d revisions."
4528
msgstr[0] ""
4529
msgstr[1] ""
4530
4531
#: bzrlib/bzrdir.py:489
4532
msgid ""
4533
"making backup of {0}\n"
4534
" to {1}"
4535
msgstr ""
4536
"haciendo respaldo de {0}\n"
4537
" a {1}"
4538
4539
#: bzrlib/bzrdir.py:512
4540
msgid "renamed {0} to {1}"
4541
msgstr "renombrado {0} a {1}"
4542
4543
#: bzrlib/bzrdir.py:1663
4544
#, python-format
4545
msgid ""
4546
"Source repository format does not support stacking, using format:\n"
4547
" %s"
4548
msgstr ""
4549
4550
#: bzrlib/bzrdir.py:1683
4551
#, python-format
4552
msgid ""
4553
"Source branch format does not support stacking, using format:\n"
4554
" %s"
4555
msgstr ""
4556
4557
#: bzrlib/bzrdir.py:1829
4558
msgid "starting repository conversion"
4559
msgstr "iniciar conversión de repositorio"
4560
4561
#: bzrlib/bzrdir.py:2058
4562
msgid "Using default stacking branch {0} at {1}"
4563
msgstr ""
4564
4565
#: bzrlib/check.py:108
4566
msgid "check"
4567
msgstr "marcar"
4568
4569
#: bzrlib/check.py:110
4570
msgid "checking revisions"
4571
msgstr "marcar revisiones"
4572
4573
#: bzrlib/check.py:112
4574
msgid "checking commit contents"
4575
msgstr ""
4576
4577
#: bzrlib/check.py:114
4578
msgid "checking file graphs"
4579
msgstr ""
4580
4581
#: bzrlib/check.py:118
4582
msgid "checking branches and trees"
4583
msgstr ""
4584
4585
#: bzrlib/check.py:205
4586
msgid "checked repository {0} format {1}"
4587
msgstr ""
4588
4589
#: bzrlib/check.py:208
4590
#, python-format
4591
msgid "%6d revisions"
4592
msgstr "%6d revisiones"
4593
4594
#: bzrlib/check.py:209
4595
#, python-format
4596
msgid "%6d file-ids"
4597
msgstr ""
4598
4599
#: bzrlib/check.py:211
4600
#, python-format
4601
msgid "%6d unreferenced text versions"
4602
msgstr "%6d versiones de texto no referenciadas"
4603
4604
#: bzrlib/check.py:215
4605
msgid "unreferenced version: {{{0}}} in {1}"
4606
msgstr "versión no referenciada: {{{0}}} en {1}"
4607
4608
#: bzrlib/check.py:218
4609
#, python-format
4610
msgid "%6d revisions are missing inventory_sha1"
4611
msgstr ""
4612
4613
#: bzrlib/check.py:221
4614
#, python-format
4615
msgid "%6d revisions are mentioned but not present"
4616
msgstr ""
4617
4618
#: bzrlib/check.py:224
4619
#, python-format
4620
msgid "%6d ghost revisions"
4621
msgstr ""
4622
4623
#: bzrlib/check.py:229
4624
#, python-format
4625
msgid "%6d revisions missing parents in ancestry"
4626
msgstr ""
4627
4628
#: bzrlib/check.py:233
4629
#, python-format
4630
msgid " %s should be in the ancestry for:"
4631
msgstr ""
4632
4633
#: bzrlib/check.py:237
4634
#, python-format
4635
msgid "%6d inconsistent parents"
4636
msgstr "%6d padres inconsistentes"
4637
4638
#: bzrlib/check.py:241
4639
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4640
msgstr ""
4641
4642
#: bzrlib/check.py:247
4643
#, python-format
4644
msgid "%6d revisions have incorrect parents in the revision index"
4645
msgstr ""
4646
4647
#: bzrlib/check.py:253
4648
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4649
msgstr ""
4650
4651
#: bzrlib/check.py:267
4652
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4653
msgstr ""
4654
4655
#: bzrlib/check.py:296
4656
msgid ""
4657
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4658
"{{{4}}}"
4659
msgstr ""
4660
4661
#: bzrlib/check.py:354
4662
#, python-format
4663
msgid "Checking branch at '%s'."
4664
msgstr "Comprobando rama en «%s»."
4665
4666
#: bzrlib/check.py:374
4667
#, python-format
4668
msgid "Checking working tree at '%s'."
4669
msgstr "Comprobando árbol de trabajo en «%s»."
4670
4671
#: bzrlib/check.py:427 bzrlib/check.py:441
4672
msgid "No branch found at specified location."
4673
msgstr "No se ha encontrado rama en la ubicación especificada."
4674
4675
#: bzrlib/check.py:429 bzrlib/check.py:439
4676
msgid "No working tree found at specified location."
4677
msgstr "No se ha encontrado árbol de trabajo en la ubicación especificada."
4678
4679
#: bzrlib/check.py:432
4680
#, python-format
4681
msgid "Checking repository at '%s'."
4682
msgstr "Comprobando repositorio en «%s»."
4683
4684
#: bzrlib/check.py:443
4685
msgid "No repository found at specified location."
4686
msgstr "No se ha encontrado repositorio en la ubicación especificada."
4687
4688
#: bzrlib/clean_tree.py:63
4689
msgid "Nothing to delete."
4690
msgstr "Nada que eliminar."
4691
4692
#: bzrlib/clean_tree.py:68
4693
msgid "Are you sure you wish to delete these"
4694
msgstr ""
4695
4696
#: bzrlib/clean_tree.py:70
4697
msgid "Canceled"
4698
msgstr ""
4699
4700
#: bzrlib/clean_tree.py:107
4701
#, python-format
4702
msgid "unable to remove %s"
4703
msgstr "imposible eliminar %s"
4704
4705
#: bzrlib/clean_tree.py:111
4706
msgid "deleting paths:"
4707
msgstr "eliminar rutas:"
4708
4709
#: bzrlib/clean_tree.py:125
4710
msgid "unable to remove \"{0}\": {1}."
4711
msgstr "imposible eliminar «{0}»: {1}."
4712
4713
#: bzrlib/clean_tree.py:130
4714
msgid "No files deleted."
4715
msgstr "No hay archivos eliminados."
4716
4717
#: bzrlib/cmd_version_info.py:47
4718
msgid "No known version info format {0}. Supported types are: {1}"
4719
msgstr ""
4720
4721
#: bzrlib/cmd_version_info.py:52
4722
msgid "Version info in Custom template-based format."
4723
msgstr ""
4724
4725
#: bzrlib/cmd_version_info.py:52
4726
msgid "Version info in Python format."
4727
msgstr ""
4728
4729
#: bzrlib/cmd_version_info.py:52
4730
msgid "Version info in RIO (simple text) format (default)."
4731
msgstr ""
4732
4733
#: bzrlib/cmd_version_info.py:53
4734
msgid "Show version information about this tree."
4735
msgstr "Mostrar la información de la versión acerca de este árbol."
4736
4737
#: bzrlib/cmd_version_info.py:55
4738
msgid ""
4739
"You can use this command to add information about version into\n"
4740
"source code of an application. The output can be in one of the\n"
4741
"supported formats or in a custom format based on a template."
4742
msgstr ""
4743
4744
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4745
#: en/help_topics/configuration.txt:710
4746
msgid "For example::"
4747
msgstr "Por ejemplo::"
4748
4749
#: bzrlib/cmd_version_info.py:61
4750
msgid ""
4751
" bzr version-info --custom \\\n"
4752
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4753
msgstr ""
4754
4755
#: bzrlib/cmd_version_info.py:64
4756
msgid ""
4757
"will produce a C header file with formatted string containing the\n"
4758
"current revision number. Other supported variables in templates are:"
4759
msgstr ""
4760
4761
#: bzrlib/cmd_version_info.py:67
4762
msgid ""
4763
" * {date} - date of the last revision\n"
4764
" * {build_date} - current date\n"
4765
" * {revno} - revision number\n"
4766
" * {revision_id} - revision id\n"
4767
" * {branch_nick} - branch nickname\n"
4768
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4769
" otherwise 1"
4770
msgstr ""
4771
4772
#: bzrlib/cmd_version_info.py:77
4773
msgid "Select the output format."
4774
msgstr "Seleccionar el formato de salida."
4775
4776
#: bzrlib/cmd_version_info.py:81
4777
msgid "Include all possible information."
4778
msgstr "Incluir toda la información posible."
4779
4780
#: bzrlib/cmd_version_info.py:82
4781
msgid "Check if tree is clean."
4782
msgstr "Comprobar si el árbol está limpio."
4783
4784
#: bzrlib/cmd_version_info.py:84
4785
msgid "Include the revision-history."
4786
msgstr ""
4787
4788
#: bzrlib/cmd_version_info.py:86
4789
msgid "Include the last revision for each file."
4790
msgstr ""
4791
4792
#: bzrlib/cmd_version_info.py:87
4793
msgid "Template for the output."
4794
msgstr "Plantilla para la salida."
4795
4796
#: bzrlib/cmd_version_info.py:101
4797
msgid "bzr version-info --revision takes exactly one revision specifier"
4798
msgstr ""
4799
4800
#: bzrlib/commands.py:228
4801
#, python-format
4802
msgid "unknown command \"%s\""
4803
msgstr "orden «%s» desconocida"
4804
4805
#: bzrlib/commands.py:475
4806
msgid "No help for this command."
4807
msgstr "No hay ayuda para esta orden."
4808
4809
#: bzrlib/commands.py:488
4810
#, python-format
4811
msgid ":Purpose: %s\n"
4812
msgstr ":Propósito: %s\n"
4813
4814
#: bzrlib/commands.py:490
4815
#, python-format
4816
msgid ""
4817
":Usage:\n"
4818
"%s\n"
4819
msgstr ""
4820
":Uso:\n"
4821
"%s\n"
4822
4823
#: bzrlib/commands.py:492
4824
#, python-format
4825
msgid ":Usage: %s\n"
4826
msgstr ":Uso: %s\n"
4827
4828
#: bzrlib/commands.py:511
4829
#, python-format
4830
msgid ":Options:%s"
4831
msgstr ":Opciones:%s"
4832
4833
#: bzrlib/commands.py:522
4834
#, python-format
4835
msgid ""
4836
":Description:\n"
4837
" %s\n"
4838
"\n"
4839
msgstr ""
4840
":Descripción:\n"
4841
" %s\n"
4842
"\n"
4843
4844
#: bzrlib/commands.py:532
4845
#, python-format
4846
msgid ""
4847
"See bzr help %s for more details and examples.\n"
4848
"\n"
4849
msgstr ""
4850
4851
#: bzrlib/commands.py:537
4852
msgid ":Aliases: "
4853
msgstr ":Alias: "
4854
4855
#: bzrlib/commands.py:541
4856
#, python-format
4857
msgid ":From: plugin \"%s\"\n"
4858
msgstr ":Desde: complemento «%s»\n"
4859
4860
#: bzrlib/commands.py:553
4861
msgid ":doc:`{0} <{1}-help>`"
4862
msgstr ":doc:`{0} <{1}-help>`"
4863
4864
#: bzrlib/commands.py:557
4865
#, python-format
4866
msgid ":See also: %s"
4867
msgstr ":Vea también: %s"
4868
4869
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4870
msgid "Only ASCII permitted in option names"
4871
msgstr "Solo se permiten nombres de opción en ASCII"
4872
4873
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4874
msgid "command {0!r} needs one or more {1}"
4875
msgstr "la orden {0!r} necesita una o más {1}"
4876
4877
#: bzrlib/commands.py:857
4878
msgid "command {0!r} requires argument {1}"
4879
msgstr "la orden {0!r} necesita un argumento {1}"
4880
4881
#: bzrlib/commands.py:864
4882
msgid "extra argument to command {0}: {1}"
4883
msgstr ""
4884
4885
#: bzrlib/commands.py:961
4886
#, python-format
4887
msgid "Profile data written to \"%s\"."
4888
msgstr "Datos de perfil escritos en «%s»"
4889
4890
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4891
msgid "added"
4892
msgstr "añadido"
4893
4894
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4895
msgid "modified"
4896
msgstr "modificado"
4897
4898
#: bzrlib/commit.py:131
4899
#, python-format
4900
msgid "Committing%s"
4901
msgstr ""
4902
4903
#: bzrlib/commit.py:134
4904
#, python-format
4905
msgid "Committed revision %d."
4906
msgstr ""
4907
4908
#: bzrlib/commit.py:143
4909
#, python-format
4910
msgid "deleted %s"
4911
msgstr "eliminado %s"
4912
4913
#: bzrlib/commit.py:146
4914
#, python-format
4915
msgid "missing %s"
4916
msgstr "falta %s"
4917
4918
#: bzrlib/commit.py:511
4919
msgid ""
4920
"Conflicting tags in bound branch:\n"
4921
"{0}"
4922
msgstr ""
4923
4924
#: bzrlib/commit.py:742
4925
msgid "renamed"
4926
msgstr "renombrado"
4927
4928
#: bzrlib/commit.py:977
4929
msgid "unchanged"
4930
msgstr "sin cambios"
4931
4932
#: bzrlib/commit.py:999
4933
msgid "{0} [{1}] - Stage"
4934
msgstr ""
4935
4936
#: bzrlib/commit.py:1002
4937
#, python-format
4938
msgid "%s - Stage"
4939
msgstr ""
4940
4941
#: bzrlib/commit_signature_commands.py:36
4942
msgid "Sign all commits by a given committer."
4943
msgstr ""
4944
4945
#: bzrlib/commit_signature_commands.py:38
4946
msgid ""
4947
"If location is not specified the local tree is used.\n"
4948
"If committer is not specified the default committer is used."
4949
msgstr ""
4950
4951
#: bzrlib/commit_signature_commands.py:41
4952
msgid "This does not sign commits that already have signatures."
4953
msgstr ""
4954
4955
#: bzrlib/commit_signature_commands.py:49
4956
msgid ""
4957
"Don't actually sign anything, just print the revisions that would be signed."
4958
msgstr ""
4959
4960
#: bzrlib/commit_signature_commands.py:103
4961
msgid "Verify all commit signatures."
4962
msgstr "Verificar todas las firmas de ejecución."
4963
4964
#: bzrlib/commit_signature_commands.py:105
4965
msgid ""
4966
"Verifies that all commits in the branch are signed by known GnuPG keys."
4967
msgstr ""
4968
4969
#: bzrlib/commit_signature_commands.py:110
4970
msgid ""
4971
"Comma separated list of GPG key patterns which are acceptable for "
4972
"verification."
4973
msgstr ""
4974
4975
#: bzrlib/commit_signature_commands.py:147
4976
msgid "Cannot verify a range of non-revision-history revisions"
4977
msgstr ""
4978
4979
#: bzrlib/commit_signature_commands.py:168
4980
msgid "All commits signed with verifiable keys"
4981
msgstr ""
4982
4983
#: bzrlib/config.py:475
4984
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4985
msgstr ""
4986
4987
#: bzrlib/config.py:2499
4988
msgid "{0} is not an SI unit."
4989
msgstr ""
4990
4991
#: bzrlib/config.py:2956
4992
msgid ""
4993
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4994
"will be saved."
4995
msgstr ""
4996
4997
#: bzrlib/config.py:3100
4998
#, python-format
4999
msgid "Invalid '%s', should be of the form 'name=value'"
5000
msgstr ""
5001
5002
#: bzrlib/config.py:3969
5003
msgid "Display, set or remove a configuration option."
5004
msgstr ""
5005
5006
#: bzrlib/config.py:3971
5007
msgid "Display the active value for a given option."
5008
msgstr ""
5009
5010
#: bzrlib/config.py:3973
5011
msgid ""
5012
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5013
"matching options are displayed mentioning their scope. The active value\n"
5014
"that bzr will take into account is the first one displayed for each option."
5015
msgstr ""
5016
5017
#: bzrlib/config.py:3977
5018
msgid "If no NAME is given, --all .* is implied."
5019
msgstr ""
5020
5021
#: bzrlib/config.py:3979
5022
msgid ""
5023
"Setting a value is achieved by using name=value without spaces. The value\n"
5024
"is set in the most relevant scope and can be checked by displaying the\n"
5025
"option again."
5026
msgstr ""
5027
5028
#: bzrlib/config.py:3991
5029
msgid "Reduce the scope to the specified configuration file."
5030
msgstr ""
5031
5032
#: bzrlib/config.py:3995
5033
msgid "Display all the defined values for the matching options."
5034
msgstr ""
5035
5036
#: bzrlib/config.py:3997
5037
msgid "Remove the option from the configuration file."
5038
msgstr ""
5039
5040
#: bzrlib/conflicts.py:50
5041
msgid "List files with conflicts."
5042
msgstr ""
5043
5044
#: bzrlib/conflicts.py:57
5045
msgid ""
5046
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5047
"is supplied, the pathnames of files with text conflicts are listed,\n"
5048
"instead. (This is useful for editing all files with text conflicts.)"
5049
msgstr ""
5050
5051
#: bzrlib/conflicts.py:61
5052
msgid "Use bzr resolve when you have fixed a problem."
5053
msgstr ""
5054
5055
#: bzrlib/conflicts.py:66
5056
msgid "List paths of files with text conflicts."
5057
msgstr ""
5058
5059
#: bzrlib/conflicts.py:85
5060
msgid "Marks the conflict as resolved."
5061
msgstr ""
5062
5063
#: bzrlib/conflicts.py:88
5064
msgid "Resolve the conflict preserving the version in the working tree."
5065
msgstr ""
5066
5067
#: bzrlib/conflicts.py:91
5068
msgid "Resolve the conflict taking the merged version into account."
5069
msgstr ""
5070
5071
#: bzrlib/conflicts.py:98
5072
msgid "How to resolve the conflict."
5073
msgstr ""
5074
5075
#: bzrlib/conflicts.py:104
5076
msgid "Mark a conflict as resolved."
5077
msgstr ""
5078
5079
#: bzrlib/conflicts.py:111
5080
msgid ""
5081
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5082
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5083
"as\n"
5084
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5085
msgstr ""
5086
5087
#: bzrlib/conflicts.py:119
5088
msgid "Resolve all conflicts in this tree."
5089
msgstr "Resolver todos los conflictos es este árbol."
5090
5091
#: bzrlib/conflicts.py:126
5092
msgid "If --all is specified, no FILE may be provided"
5093
msgstr ""
5094
5095
#: bzrlib/conflicts.py:151
5096
#, python-format
5097
msgid "%d conflict auto-resolved."
5098
msgid_plural "%d conflicts auto-resolved."
5099
msgstr[0] ""
5100
msgstr[1] ""
5101
5102
#: bzrlib/conflicts.py:154
5103
msgid "Remaining conflicts:"
5104
msgstr "Mantener conflictos:"
5105
5106
#: bzrlib/conflicts.py:159
5107
msgid "All conflicts resolved."
5108
msgstr "Todos los conflictos resueltos."
5109
5110
#: bzrlib/conflicts.py:168
5111
msgid "{0} conflict resolved, {1} remaining"
5112
msgid_plural "{0} conflicts resolved, {1} remaining"
5113
msgstr[0] ""
5114
msgstr[1] ""
5115
5116
#: bzrlib/controldir.py:698
5117
msgid "{0} is{1} redirected to {2}"
5118
msgstr "{0} es{1} redirigido a {2}"
5119
5120
#: bzrlib/diff.py:399
5121
#, python-format
5122
msgid "*** Ignoring files outside view. View is %s"
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:157
5126
msgid "The tree builder is already building a tree."
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:178
5130
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:197
5134
msgid ""
5135
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5136
"versions \"%(minimum)s\" to \"%(current)s\"."
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:209
5140
msgid "The transport '%(transport)s' is only accessible within this process."
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:227
5144
msgid "Invalid revision number %(revno)s"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:236
5148
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:247
5152
msgid "Reserved revision-id {%(revision_id)s}"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:261
5156
msgid "There is no public branch set for \"%(branch_url)s\"."
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:271
5160
msgid ""
5161
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5162
"obtain a list of topics."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:280
5166
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:290
5170
msgid ""
5171
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:299
5175
msgid "The branch '%(branch)s' is not stacked."
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:313
5179
msgid "No WorkingTree exists for \"%(base)s\"."
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:322
5183
msgid "Not currently building a tree."
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:327
5187
msgid "%(url)s is not a local path."
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:355
5191
msgid "%(not_locked)r is not write locked but needs to be."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:363
5195
msgid "Error in command line options"
5196
msgstr "Error en las opciones de la línea de órdenes"
5197
5198
#: bzrlib/errors.py:368
5199
msgid "%(value)s is not an index of type %(_type)s."
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:378
5203
msgid "Error in data for index %(value)s."
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:387
5207
msgid "The key '%(key)s' is already in index '%(index)s'."
5208
msgstr ""
5209
5210
#: bzrlib/errors.py:397
5211
msgid "The key '%(key)s' is not a valid key."
5212
msgstr ""
5213
5214
#: bzrlib/errors.py:406
5215
msgid "Could not parse options for index %(value)s."
5216
msgstr ""
5217
5218
#: bzrlib/errors.py:415
5219
msgid "The value '%(value)s' is not a valid value."
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:443
5223
msgid "Generic path error: %(path)r%(extra)s)"
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:456
5227
msgid "No such file: %(path)r%(extra)s"
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:461
5231
msgid "File exists: %(path)r%(extra)s"
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:467
5235
msgid ""
5236
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5237
"after to tell bzr about a rename that has already happened)%(extra)s"
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:483
5241
msgid "\"%(path)s\" is not a directory %(extra)s"
5242
msgstr ""
5243
5244
#: bzrlib/errors.py:488
5245
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:493
5249
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:498
5253
msgid "Hard-linking \"%(path)s\" is not supported"
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:513
5257
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:518
5261
msgid "Permission denied: \"%(path)s\"%(extra)s"
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:523
5265
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:528
5269
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:539
5273
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5274
msgstr ""
5275
5276
#: bzrlib/errors.py:561
5277
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:571
5281
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:579
5285
msgid ""
5286
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5287
"upgrade the branch to permit branch stacking."
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:590
5291
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:600
5295
msgid ""
5296
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5297
"need to upgrade the repository to permit branch stacking."
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:611
5301
msgid "Error reading from %(path)r."
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:630
5305
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:646
5309
msgid "Path \"%(path)s\" is not unicode normalized"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:654
5313
msgid "Not a branch: \"%(path)s\"%(detail)s."
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:696
5317
msgid "No submit branch available for branch \"%(path)s\""
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:705
5321
msgid "Already a branch: \"%(path)s\"."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:711
5325
msgid ""
5326
"Directory contains a branch, but no working tree (use bzr checkout if you "
5327
"wish to build a working tree): \"%(path)s\""
5328
msgstr ""
5329
5330
#: bzrlib/errors.py:716
5331
msgid ""
5332
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:726
5336
msgid ""
5337
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:736
5341
msgid "No repository present: \"%(path)s\""
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:743
5345
msgid ""
5346
"Unsupported branch format: %(format)s\n"
5347
"Please run 'bzr upgrade'"
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:749
5351
msgid "Unknown %(kind)s format: %(format)r"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:758
5355
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:768
5359
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:783
5363
msgid ""
5364
"%(target)s\n"
5365
"is not compatible with\n"
5366
"%(source)s\n"
5367
"%(details)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:799
5371
msgid "Revision is not compatible with %(repo_format)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:809
5375
msgid "%(context_info)s%(path)s is already versioned."
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:830
5379
msgid "%(context_info)s%(path)s is not versioned."
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:851
5383
msgid "Path(s) are not versioned: %(paths_as_string)s"
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:862
5387
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:881
5391
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:889
5395
msgid ""
5396
"Filename %(filename)r is not valid in your current filesystem encoding "
5397
"%(fs_encoding)s"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:900
5401
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:918
5405
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:957
5409
msgid "Cannot lock %(lock)s: %(why)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:967
5413
msgid ""
5414
"A transaction related operation was attempted after the transaction finished."
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:994
5418
msgid "Cannot lock: transport is read only: %(transport)s"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1002
5422
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1013
5426
msgid ""
5427
"Lock was broken while still open: %(lock)s - check storage consistency!"
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1024
5431
msgid ""
5432
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5433
"%(holder)r, wanted to break %(target)r"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1036
5437
msgid ""
5438
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5439
"Use 'bzr break-lock' to clear it"
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:1049
5443
msgid "Lock not held: %(lock)s"
5444
msgstr ""
5445
5446
#: bzrlib/errors.py:1078
5447
msgid "No changes to commit"
5448
msgstr "No hay cambios que ejecutar."
5449
5450
#: bzrlib/errors.py:1083
5451
msgid ""
5452
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:1093
5456
msgid ""
5457
"Excluding paths during commit is not supported by repository at "
5458
"%(repository)r."
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1102
5462
msgid ""
5463
"The specified commit message contains characters unsupported by the current "
5464
"encoding."
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1108
5468
msgid "Upgrade URL cannot work with readonly URLs."
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1113
5472
msgid "The branch format %(format)s is already at the most recent format."
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1136
5476
msgid "Option --change does not accept revision ranges"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1141
5480
msgid "No namespace registered for string: %(spec)r"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1160
5484
msgid ""
5485
"Requested revision: '%(spec)s' does not exist in branch: "
5486
"%(branch_url)s%(extra)s"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1174
5490
msgid ""
5491
"Operation denied because it would change the main history, which is not "
5492
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1185
5496
msgid ""
5497
"These branches have diverged. Use the missing command to see how.\n"
5498
"Use the merge command to reconcile them."
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1205
5502
msgid ""
5503
"Branches have no common ancestor, and no merge base revision was specified."
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:1211
5507
msgid ""
5508
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1217
5512
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1226
5516
msgid ""
5517
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1235
5521
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1244
5525
msgid "Branch %(branch)s has no commits."
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1262
5529
msgid ""
5530
"Bound branch %(branch)s is out of date with master branch "
5531
"%(master)s.%(extra_help)s"
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:1274
5535
msgid ""
5536
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5537
"bound to %(remote)s."
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1286
5541
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1295
5545
msgid ""
5546
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5547
"%(error)s"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:1307
5551
msgid "Error in processing weave: %(msg)s"
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:1316
5555
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:1327
5559
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:1337
5563
msgid "Weave invariant violated: %(what)s"
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:1346
5567
msgid "Parents are mismatched between two revisions. %(msg)s"
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:1368
5571
msgid ""
5572
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5573
"%(weave_b)s"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:1380
5577
msgid "Versioned file error"
5578
msgstr "Error en el archivo versiondao"
5579
5580
#: bzrlib/errors.py:1385
5581
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:1395
5585
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:1405
5589
msgid "Text did not match its checksum: %(msg)s"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:1531
5593
msgid "Export format %(format)r not supported"
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:1540
5597
msgid "Transport error: %(msg)s %(orig_error)s"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:1566
5601
msgid "Generic bzr smart protocol error: %(details)s"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:1574
5605
msgid "Received bad protocol version marker: %(marker)r"
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:1606
5609
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:1611
5613
msgid "Connection error: %(msg)s %(orig_error)s"
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:1616
5617
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:1637
5621
msgid "Connection closed: %(msg)s %(orig_error)s"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:1642
5625
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:1647
5629
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:1657
5633
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:1672
5637
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:1686
5641
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:1694
5645
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:1703
5649
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:1717
5653
msgid "Too many redirections"
5654
msgstr "Demasiadas redirecciones"
5655
5656
#: bzrlib/errors.py:1722
5657
msgid "Working tree has conflicts."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:1726
5661
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:1735
5665
msgid ""
5666
"Error(s) parsing config file %(filename)s:\n"
5667
"%(errors)s"
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:1746
5671
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:1754
5675
msgid "%(username)r does not seem to contain a reasonable email address"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:1763
5679
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:1771
5683
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:1779
5687
msgid "Unable to import library \"%(library)s\": %(error)s"
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:1787
5691
msgid "python-gpgme is not installed, it is needed to verify signatures"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:1795
5695
msgid ""
5696
"The working tree for %(basedir)s has changed since the last commit, but "
5697
"weave merge requires that it be unchanged"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:1805
5701
msgid ""
5702
"Can't reprocess and show base, because reprocessing obscures the "
5703
"relationship of conflicting lines to the base"
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:1811
5707
msgid "Cycle in graph %(graph)r"
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:1839
5711
msgid "File %(filename)s is not conflicted."
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:1861
5715
msgid "No bundle was found in \"%(filename)s\"."
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:1870
5719
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:1880
5723
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:1893
5727
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:1903
5731
msgid "Key %(key)s is already present in map"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:1908
5735
msgid "The prefix %(prefix)s is in the help search path twice."
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:1918
5739
msgid ""
5740
"No final name for trans_id %(trans_id)r\n"
5741
"file-id: %(file_id)r\n"
5742
"root trans-id: %(root_trans_id)r\n"
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:1950
5746
msgid "Attempt to reuse a transform that has already been applied."
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:1955
5750
msgid "Moving the root directory is not supported at this time"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:1960
5754
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:1971
5758
msgid ""
5759
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:2007
5763
msgid ""
5764
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2037
5768
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2045
5772
msgid "Nothing to merge."
5773
msgstr "Nada a fusionar."
5774
5775
#: bzrlib/errors.py:2050
5776
msgid "Format %(format)s cannot be initialised by this version of bzr."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2059
5780
msgid ""
5781
"Cannot convert from format %(from_format)s to format %(format)s. "
5782
"%(problem)s"
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2071
5786
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2079
5790
msgid "%(exe_name)s could not be found on this machine"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2087
5794
msgid "Diff is not installed on this machine: %(msg)s"
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2095
5798
msgid "Diff3 is not installed on this machine."
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2101
5802
msgid "The content being inserted is already present."
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2106
5806
msgid ""
5807
"This tree contains left-over files from a failed operation.\n"
5808
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5809
"to\n"
5810
" keep, and delete it when you are done."
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2117
5814
msgid ""
5815
"This tree contains left-over files from a failed operation.\n"
5816
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5817
" wish to keep, and delete it when you are done."
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:2127
5821
msgid ""
5822
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5823
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5824
"to\n"
5825
" keep, and delete it when you are done."
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2138
5829
msgid ""
5830
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5831
"examine %(pending_deletion)s to see if it contains any files you wish to "
5832
"keep, and delete it when you are done."
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:2148
5836
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2162
5840
msgid ""
5841
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2175
5845
msgid "Error in merge modified format"
5846
msgstr "Error en el formato modificado de fusión"
5847
5848
#: bzrlib/errors.py:2180
5849
msgid "Format error in conflict listings"
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2184
5853
msgid ""
5854
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5855
"Error: %(description)s"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2195
5859
msgid ""
5860
"An error has been detected in the repository %(repo_path)s.\n"
5861
"Please run bzr reconcile on this repository."
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2206
5865
msgid ""
5866
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5867
"reason: %(reason)s"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2219
5871
msgid ""
5872
"An inconsistent delta was supplied: %(delta)r\n"
5873
"reason: %(reason)s"
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:2231
5877
msgid "To use this feature you must upgrade your branch at %(path)s."
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2240
5881
msgid "To use this feature you must upgrade your repository at %(path)s."
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:2245
5885
msgid ""
5886
"To use this feature you must upgrade your branch at %(path)s to a format "
5887
"which supports rich roots."
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2251
5891
msgid "Cannot perform local-only commits on unbound branches."
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2256
5895
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2277
5899
msgid "Ghost tags not supported by format %(format)r."
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2285
5903
msgid "File is binary but should be text."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2290
5907
msgid "The path %(path)s is not permitted on this platform"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2299
5911
msgid ""
5912
"Testament did not match expected value.\n"
5913
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5914
" {%(measured)s}"
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2311
5918
msgid "Not a bzr revision-bundle: %(text)r"
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2320
5922
msgid "Bad bzr revision-bundle: %(text)r"
5923
msgstr ""
5924
5925
#: bzrlib/errors.py:2329
5926
msgid "Malformed bzr revision-bundle header: %(text)r"
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2334
5930
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2339
5934
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2344
5938
msgid "End of line marker was not \\n in bzr revision-bundle"
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2354
5942
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2364
5946
msgid "Root class for inventory serialization errors"
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2368
5950
msgid ""
5951
"The inventory was not in the expected format:\n"
5952
" %(msg)s"
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2377
5956
msgid "This operation requires rich root data storage"
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2390
5960
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2399
5964
msgid ""
5965
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5966
"variable."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2406
5970
msgid ""
5971
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5972
"ghost at {%(ghost_revision_id)s}"
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2416
5976
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:2467
5980
msgid ""
5981
"A merge directive must provide either a bundle or a public branch location."
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2474
5985
msgid "Bad merge directive payload %(start)r"
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2484
5989
msgid "Preview patch does not match requested changes."
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2490
5993
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2500
5997
msgid ""
5998
"Your branch does not have all of the revisions required in order to merge "
5999
"this merge directive and the target location specified in the merge "
6000
"directive is not a branch: %(location)s."
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:2512
6004
msgid "Unsupported entry kind %(kind)s"
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2520
6008
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2530
6012
msgid "Subsume target %(other_tree)s needs to be upgraded."
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:2549
6016
msgid "No such tag: %(tag_name)s"
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:2557
6020
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:2566
6024
msgid "Tag %(tag_name)s already exists."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:2574
6028
msgid ""
6029
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6030
"bugs\" for more information on this feature."
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:2584
6034
msgid ""
6035
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:2594
6039
msgid ""
6040
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:2604
6044
msgid "Invalid line in bugs property: '%(line)s'"
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:2612
6048
msgid "Invalid bug status: '%(status)s'"
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:2620
6052
msgid "Could not understand response from smart server: %(response_tuple)r"
6053
msgstr ""
6054
6055
#: bzrlib/errors.py:2659
6056
msgid "Server sent an unexpected error: %(error_tuple)r"
6057
msgstr "El servidor envió un error inesperado: %(error_tuple)r"
6058
6059
#: bzrlib/errors.py:2678
6060
msgid "Unrecognised container format: %(container_format)r"
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:2686
6064
msgid "Unexpected end of container stream"
6065
msgstr "Final inesperado del flujo del contenedor"
6066
6067
#: bzrlib/errors.py:2691
6068
msgid "Unknown record type: %(record_type)r"
6069
msgstr "Tipo de registro inesperado: %(record_type)r"
6070
6071
#: bzrlib/errors.py:2699
6072
msgid "Invalid record: %(reason)s"
6073
msgstr "Registro inesperado: %(reason)s"
6074
6075
#: bzrlib/errors.py:2707
6076
msgid "Container has data after end marker: %(excess)r"
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:2715
6080
msgid "Container has multiple records with the same name: %(name)s"
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:2728
6084
msgid "Corrupt or incompatible data stream: %(reason)s"
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:2736
6088
msgid "SMTP error: %(error)s"
6089
msgstr "Error SMTP: %(error)s"
6090
6091
#: bzrlib/errors.py:2744
6092
msgid "No message supplied."
6093
msgstr "No se ha proporcionado mensaje."
6094
6095
#: bzrlib/errors.py:2749
6096
msgid "No mail-to address (--mail-to) or output (-o) specified."
6097
msgstr ""
6098
"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
6099
"o)."
6100
6101
#: bzrlib/errors.py:2754
6102
msgid "Unknown mail client: %(mail_client)s"
6103
msgstr "Correo de cliente desconocido: %(mail_client)s"
6104
6105
#: bzrlib/errors.py:2762
6106
msgid ""
6107
"Unable to find mail client with the following names: "
6108
"%(mail_command_list_string)s"
6109
msgstr ""
6110
6111
#: bzrlib/errors.py:2772
6112
msgid "SMTP connection to %(host)s refused"
6113
msgstr "Las conexiones SMTP a %(host)s se han rechazado"
6114
6115
#: bzrlib/errors.py:2781
6116
msgid "Please specify smtp_server. No server at default %(host)s."
6117
msgstr ""
6118
6119
#: bzrlib/errors.py:2795
6120
msgid ""
6121
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6122
"reconfigure."
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:2807
6126
msgid "'%(display_url)s' is already a branch."
6127
msgstr "«%(display_url)s» ya es una la rama."
6128
6129
#: bzrlib/errors.py:2812
6130
msgid "'%(display_url)s' is already a tree."
6131
msgstr "«%(display_url)s» ya es un árbol."
6132
6133
#: bzrlib/errors.py:2817
6134
msgid "'%(display_url)s' is already a checkout."
6135
msgstr "«%(display_url)s» ya es una comprobación."
6136
6137
#: bzrlib/errors.py:2822
6138
msgid "'%(display_url)s' is already a lightweight checkout."
6139
msgstr "«%(display_url)s» ya es una comprobación ligera."
6140
6141
#: bzrlib/errors.py:2827
6142
msgid "'%(display_url)s' is already using a shared repository."
6143
msgstr "«%(display_url)s» ya está usando un repositorio compartido."
6144
6145
#: bzrlib/errors.py:2832
6146
msgid "'%(display_url)s' is already standalone."
6147
msgstr "«%(display_url)s» ya es autónomo."
6148
6149
#: bzrlib/errors.py:2837
6150
msgid "Shared repository '%(display_url)s' already creates working trees."
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:2843
6154
msgid ""
6155
"Shared repository '%(display_url)s' already doesn't create working trees."
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2849
6159
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:2854
6163
msgid "No location could be found to bind to at %(display_url)s."
6164
msgstr "No se encontró ubicación a donde vincular %(display_url)s."
6165
6166
#: bzrlib/errors.py:2859
6167
msgid ""
6168
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6169
"status).%(more)s"
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:2878
6173
msgid ""
6174
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6175
"list).%(more)s"
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:2884
6179
msgid "Variable {%(name)s} is not available."
6180
msgstr "La variable {%(name)s} no está disponible."
6181
6182
#: bzrlib/errors.py:2892
6183
msgid "No template specified."
6184
msgstr "No se ha especificado una plantilla."
6185
6186
#: bzrlib/errors.py:2897
6187
msgid "Unable to create symlink %(path_str)son this platform"
6188
msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
6189
6190
#: bzrlib/errors.py:2912
6191
msgid ""
6192
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6193
"\"original\", \"local\"."
6194
msgstr ""
6195
"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
6196
"«original», «local»."
6197
6198
#: bzrlib/errors.py:2946
6199
msgid ""
6200
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6201
msgstr ""
6202
6203
#: bzrlib/errors.py:2958
6204
msgid "The \"%(config_id)s\" configuration does not exist."
6205
msgstr ""
6206
6207
#: bzrlib/errors.py:2966
6208
msgid "The \"%(option_name)s\" configuration option does not exist."
6209
msgstr ""
6210
6211
#: bzrlib/errors.py:2974
6212
msgid "The alias \"%(alias_name)s\" does not exist."
6213
msgstr ""
6214
6215
#: bzrlib/errors.py:2988
6216
msgid "\"%(alias_name)s\" is not a valid location alias."
6217
msgstr ""
6218
6219
#: bzrlib/errors.py:2996
6220
msgid "No %(alias_name)s location assigned."
6221
msgstr ""
6222
6223
#: bzrlib/errors.py:3004
6224
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6225
msgstr ""
6226
6227
#: bzrlib/errors.py:3014
6228
msgid "Unknown rules detected: %(unknowns_str)s."
6229
msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
6230
6231
#: bzrlib/errors.py:3025
6232
msgid "Tip change rejected: %(msg)s"
6233
msgstr ""
6234
6235
#: bzrlib/errors.py:3033
6236
msgid "Shelf corrupt."
6237
msgstr ""
6238
6239
#: bzrlib/errors.py:3038
6240
msgid "Corruption while decompressing repository file%(orig_error)s"
6241
msgstr ""
6242
6243
#: bzrlib/errors.py:3050
6244
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6245
msgstr ""
6246
6247
#: bzrlib/errors.py:3058
6248
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6249
msgstr ""
6250
6251
#: bzrlib/errors.py:3066
6252
msgid ""
6253
"An attempt to access a url outside the server jail was made: '%(url)s'."
6254
msgstr ""
6255
6256
#: bzrlib/errors.py:3074
6257
msgid "The user aborted the operation."
6258
msgstr "El usuario abortó la operación."
6259
6260
#: bzrlib/errors.py:3079
6261
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6262
msgstr ""
6263
6264
#: bzrlib/errors.py:3089
6265
msgid "No such view: %(view_name)s."
6266
msgstr ""
6267
6268
#: bzrlib/errors.py:3099
6269
msgid ""
6270
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6271
"to a later format."
6272
msgstr ""
6273
6274
#: bzrlib/errors.py:3108
6275
msgid ""
6276
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6277
msgstr ""
6278
6279
#: bzrlib/errors.py:3175
6280
msgid "%(bzrdir)r does not support co-located branches."
6281
msgstr ""
6282
6283
#: bzrlib/errors.py:3181
6284
msgid ""
6285
"Unable to determine your name.\n"
6286
"Please, set your name with the 'whoami' command.\n"
6287
"E.g. bzr whoami \"Your Name <name@example.com>\""
6288
msgstr ""
6289
6290
#: bzrlib/errors.py:3190
6291
msgid "Invalid pattern(s) found. %(msg)s"
6292
msgstr "Se encontró un patrón inválido. %(msg)s"
6293
6294
#: bzrlib/errors.py:3198
6295
msgid ""
6296
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6297
"unbind` to fix."
6298
msgstr ""
6299
6300
#: bzrlib/errors.py:3209
6301
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6302
msgstr ""
6303
6304
#: bzrlib/errors.py:3218
6305
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6306
msgstr ""
6307
6308
#: bzrlib/errors.py:3227
6309
msgid ""
6310
"No compatible object available for operations from %(source)r to %(target)r."
6311
msgstr ""
6312
6313
#: bzrlib/errors.py:3237
6314
msgid ""
6315
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6316
"%(arguments)s."
6317
msgstr ""
6318
6319
#: bzrlib/errors.py:3247
6320
msgid ""
6321
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6322
"format %(format)r"
6323
msgstr ""
6324
6325
#: bzrlib/errors.py:3259
6326
msgid ""
6327
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6328
"plugin."
6329
msgstr ""
6330
6331
#: bzrlib/errors.py:3272
6332
msgid "Binary files section encountered."
6333
msgstr ""
6334
6335
#: bzrlib/errors.py:3280
6336
msgid ""
6337
"Malformed patch header. %(desc)s\n"
6338
"%(line)r"
6339
msgstr ""
6340
6341
#: bzrlib/errors.py:3289
6342
msgid ""
6343
"Malformed hunk header. %(desc)s\n"
6344
"%(line)r"
6345
msgstr ""
6346
6347
#: bzrlib/errors.py:3298
6348
msgid ""
6349
"Malformed line. %(desc)s\n"
6350
"%(line)r"
6351
msgstr ""
6352
6353
#: bzrlib/errors.py:3308
6354
msgid ""
6355
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6356
"but patch says it should be \"%(patch_line)s\""
6357
msgstr ""
6358
6359
#: bzrlib/errors.py:3319
6360
msgid "The feature %(feature)s has already been registered."
6361
msgstr ""
6362
6363
#: bzrlib/export_pot.py:252
6364
#, python-format
6365
msgid "Exporting messages from builtin command: %s"
6366
msgstr ""
6367
6368
#: bzrlib/export_pot.py:271
6369
msgid "Exporting messages from plugin command: {0} in {1}"
6370
msgstr ""
6371
6372
#: bzrlib/export_pot.py:292
6373
#, python-format
6374
msgid "Exporting message from error: %s"
6375
msgstr "Exportando mensaje del error: %s"
6376
6377
#: bzrlib/fetch.py:98
6378
msgid "Finding revisions"
6379
msgstr "Buscando revisiones"
6380
6381
#: bzrlib/fetch.py:103
6382
msgid "Fetching revisions"
6383
msgstr "Obteniendo revisiones"
6384
6385
#: bzrlib/foreign.py:262
6386
msgid "Push into a different VCS without any custom bzr metadata."
6387
msgstr ""
6388
6389
#: bzrlib/foreign.py:264
6390
msgid ""
6391
"This will afterwards rebase the local branch on the remote\n"
6392
"branch unless the --no-rebase option is used, in which case \n"
6393
"the two branches will be out of sync after the push. "
6394
msgstr ""
6395
6396
#: bzrlib/foreign.py:277
6397
msgid "Do not rebase after push."
6398
msgstr ""
6399
6400
#: bzrlib/foreign.py:311
6401
#, python-format
6402
msgid "Using saved location: %s\n"
6403
msgstr "Usando las ubicaciones guardadas: %s\n"
6404
6405
#: bzrlib/foreign.py:321
6406
msgid ""
6407
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6408
"regular push."
6409
msgstr ""
6410
6411
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6412
msgid "{0} commits with valid signatures"
6413
msgstr "{0} ejecuciones con firmas válidas"
6414
6415
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6416
msgid "{0} commit with unknown key"
6417
msgid_plural "{0} commits with unknown keys"
6418
msgstr[0] "{0} ejecución con clave desconocida"
6419
msgstr[1] "{0} ejecuciones con claves desconocidas"
6420
6421
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6422
msgid "{0} commit not valid"
6423
msgid_plural "{0} commits not valid"
6424
msgstr[0] "{0} ejecución inválida"
6425
msgstr[1] "{0} ejecuciones inválidas"
6426
6427
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6428
msgid "{0} commit not signed"
6429
msgid_plural "{0} commits not signed"
6430
msgstr[0] "{0} ejecución no firmada"
6431
msgstr[1] "{0} ejecuciones no firmadas"
6432
6433
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6434
msgid "{0} commit with key now expired"
6435
msgid_plural "{0} commits with key now expired"
6436
msgstr[0] ""
6437
msgstr[1] ""
6438
6439
#: bzrlib/gpg.py:343
6440
msgid "No GnuPG key results for pattern: {0}"
6441
msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
6442
6443
#: bzrlib/gpg.py:386
6444
msgid "{0} signed {1} commit"
6445
msgid_plural "{0} signed {1} commits"
6446
msgstr[0] ""
6447
msgstr[1] ""
6448
6449
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6450
msgid "{0} commit by author {1}"
6451
msgid_plural "{0} commits by author {1}"
6452
msgstr[0] ""
6453
msgstr[1] ""
6454
6455
#: bzrlib/gpg.py:433
6456
msgid "Unknown key {0} signed {1} commit"
6457
msgid_plural "Unknown key {0} signed {1} commits"
6458
msgstr[0] ""
6459
msgstr[1] ""
6460
6461
#: bzrlib/gpg.py:452
6462
msgid "{0} commit by author {1} with key {2} now expired"
6463
msgid_plural "{0} commits by author {1} with key {2} now expired"
6464
msgstr[0] ""
6465
msgstr[1] ""
6466
6467
#: bzrlib/groupcompress.py:1739
6468
#, python-format
6469
msgid "Insert claimed random_id=True, but then inserted %r two times"
6470
msgstr ""
6471
6472
#: bzrlib/hooks.py:331
6473
#, python-format
6474
msgid "Introduced in: %s"
6475
msgstr ""
6476
6477
#: bzrlib/hooks.py:334
6478
#, python-format
6479
msgid "Deprecated in: %s"
6480
msgstr ""
6481
6482
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6483
msgid "Walking content"
6484
msgstr ""
6485
6486
#: bzrlib/knit.py:3330
6487
msgid "annotating"
6488
msgstr "anotar"
6489
6490
#: bzrlib/lock.py:548
6491
msgid "{0!r} was {1} locked again"
6492
msgstr ""
6493
6494
#: bzrlib/lockdir.py:321
6495
#, python-format
6496
msgid "error removing pending lock: %s"
6497
msgstr ""
6498
6499
#: bzrlib/lockdir.py:616
6500
msgid "Unable to obtain"
6501
msgstr ""
6502
6503
#: bzrlib/lockdir.py:618
6504
msgid "Lock owner changed for"
6505
msgstr ""
6506
6507
#: bzrlib/lockdir.py:620
6508
msgid "{0} lock {1} {2}."
6509
msgstr ""
6510
6511
#: bzrlib/lockdir.py:627
6512
#, python-format
6513
msgid "Will continue to try until %s, unless you press Ctrl-C."
6514
msgstr ""
6515
6516
#: bzrlib/lockdir.py:629
6517
msgid "See \"bzr help break-lock\" for more."
6518
msgstr ""
6519
6520
#: bzrlib/lockdir.py:739
6521
#, python-format
6522
msgid ""
6523
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6524
msgstr ""
6525
6526
#: bzrlib/log.py:572
6527
msgid "--exclude-common-ancestry requires two different revisions"
6528
msgstr "--exclude-common-ancestry requiere dos revisiones diferentes"
6529
6530
#: bzrlib/log.py:574
6531
#, python-format
6532
msgid "invalid direction %r"
6533
msgstr "dirección %r inválida"
6534
6535
#: bzrlib/log.py:662
6536
msgid "Start revision not found in history of end revision."
6537
msgstr ""
6538
6539
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6540
msgid "Logging revision 0 is invalid."
6541
msgstr ""
6542
6543
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6544
msgid "Start revision must be older than the end revision."
6545
msgstr "El inicio de la revisión debe ser anterior al final."
6546
6547
#: bzrlib/log.py:1827
6548
#, python-format
6549
msgid "unknown log formatter: %r"
6550
msgstr ""
6551
6552
#: bzrlib/log.py:2123
6553
msgid "fixes bug"
6554
msgid_plural "fixes bugs"
6555
msgstr[0] "error areglado"
6556
msgstr[1] "errores arreglados"
6557
6558
#: bzrlib/merge.py:689
6559
msgid "All changes applied successfully."
6560
msgstr "Cambios aplicados con éxito."
6561
6562
#: bzrlib/merge.py:691
6563
#, python-format
6564
msgid "%d conflicts encountered."
6565
msgstr "%d conflictos encontrados."
6566
6567
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6568
msgid "Preparing file merge"
6569
msgstr ""
6570
6571
#: bzrlib/multiparent.py:426
6572
msgid "Importing revisions"
6573
msgstr "Importar revisiones"
6574
6575
#: bzrlib/option.py:526
6576
msgid "Show help message."
6577
msgstr "Mostrar mensaje de ayuda."
6578
6579
#: bzrlib/option.py:528
6580
msgid "Only display errors and warnings."
6581
msgstr "Mostrar solo errores y avisos."
6582
6583
#: bzrlib/option.py:531
6584
msgid "Show usage message and options."
6585
msgstr "Mostrar mensaje de uso y opciones."
6586
6587
#: bzrlib/option.py:533
6588
msgid "Display more information."
6589
msgstr "Mostrar más información."
6590
6591
#: bzrlib/option.py:541
6592
msgid ""
6593
"Select changes introduced by the specified revision. See also \"help "
6594
"revisionspec\"."
6595
msgstr ""
6596
6597
#: bzrlib/option.py:543
6598
msgid "Branch to operate on, instead of working directory."
6599
msgstr ""
6600
6601
#: bzrlib/option.py:545
6602
msgid "Detailed log format."
6603
msgstr ""
6604
6605
#: bzrlib/option.py:545
6606
msgid "Format used by GNU ChangeLog files."
6607
msgstr ""
6608
6609
#: bzrlib/option.py:545
6610
msgid "Log format with one line per revision."
6611
msgstr ""
6612
6613
#: bzrlib/option.py:545
6614
msgid "Moderately short log format."
6615
msgstr ""
6616
6617
#: bzrlib/option.py:545
6618
msgid "Use specified log format."
6619
msgstr "Usar el formato de registro especificado."
6620
6621
#: bzrlib/option.py:547
6622
msgid "Log format"
6623
msgstr "Formato de registro"
6624
6625
#: bzrlib/option.py:549
6626
msgid "LCA-newness merge."
6627
msgstr ""
6628
6629
#: bzrlib/option.py:549
6630
msgid "Merge using external diff3."
6631
msgstr ""
6632
6633
#: bzrlib/option.py:549
6634
msgid "Native diff3-style merge."
6635
msgstr ""
6636
6637
#: bzrlib/option.py:549
6638
msgid "Select a particular merge algorithm."
6639
msgstr "Seleccionar un algoritmo de fusión particular."
6640
6641
#: bzrlib/option.py:549
6642
msgid "Weave-based merge."
6643
msgstr ""
6644
6645
#: bzrlib/option.py:551
6646
msgid "Merge algorithm"
6647
msgstr "Algoritmo de fusión"
6648
6649
#: bzrlib/option.py:554
6650
msgid "Message string."
6651
msgstr "Cadena de mensaje."
6652
6653
#: bzrlib/option.py:556
6654
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6655
msgstr ""
6656
6657
#: bzrlib/option.py:558
6658
msgid "Ignore differences between branches and overwrite unconditionally."
6659
msgstr ""
6660
6661
#: bzrlib/option.py:560
6662
msgid "Remember the specified location as a default."
6663
msgstr "Recordar la ubicación especificada como predeterminada."
6664
6665
#: bzrlib/option.py:562
6666
msgid "Reprocess to reduce spurious conflicts."
6667
msgstr "Reprocesar para reducir los conflictos espurios."
6668
6669
#: bzrlib/option.py:566
6670
msgid "See \"help revisionspec\" for details."
6671
msgstr "Consulte «help revisionspec» para obtener más detalles."
6672
6673
#: bzrlib/option.py:568
6674
msgid "Show internal object ids."
6675
msgstr "Mostrar las id de los objetos internos."
6676
6677
#: bzrlib/option.py:571
6678
msgid "Display timezone as local, original, or utc."
6679
msgstr ""
6680
6681
#: bzrlib/osutils.py:100
6682
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6683
msgstr ""
6684
6685
#: bzrlib/osutils.py:220
6686
msgid "lstat/stat of ({0!r}): {1!r}"
6687
msgstr "lstat/stat de ({0!r}): {1!r}"
6688
6689
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6690
#, python-format
6691
msgid "sorry, %r not allowed in path"
6692
msgstr ""
6693
6694
#: bzrlib/osutils.py:1226
6695
#, python-format
6696
msgid "%r is too short to calculate a relative path"
6697
msgstr ""
6698
6699
#: bzrlib/plugin.py:143
6700
#, python-format
6701
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6702
msgstr ""
6703
6704
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6705
msgid "Enable completions for the selected plugin (default: all plugins)"
6706
msgstr ""
6707
6708
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6709
msgid "Generate a shell function for bash command line completion."
6710
msgstr ""
6711
6712
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6713
msgid ""
6714
"This command generates a shell function which can be used by bash to\n"
6715
"automatically complete the currently typed command when the user presses\n"
6716
"the completion key (usually tab)."
6717
msgstr ""
6718
6719
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6720
msgid ""
6721
"Commonly used like this:\n"
6722
" eval \"`bzr bash-completion`\""
6723
msgstr ""
6724
6725
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6726
msgid "Name of the generated function (default: _bzr)"
6727
msgstr "Nombre de la función generada (predeterminado: _bzr)"
6728
6729
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6730
msgid "Generate only the shell function, don't enable it"
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:81
6734
msgid "Register a branch with launchpad.net."
6735
msgstr "Registrar una rama con launchpad.net."
6736
6737
#: bzrlib/plugins/launchpad/__init__.py:83
6738
msgid ""
6739
"This command lists a bzr branch in the directory of branches on\n"
6740
"launchpad.net. Registration allows the branch to be associated with\n"
6741
"bugs or specifications."
6742
msgstr ""
6743
6744
#: bzrlib/plugins/launchpad/__init__.py:87
6745
msgid ""
6746
"Before using this command you must register the project to which the\n"
6747
"branch belongs, and create an account for yourself on launchpad.net."
6748
msgstr ""
6749
6750
#: bzrlib/plugins/launchpad/__init__.py:90
6751
msgid ""
6752
"arguments:\n"
6753
" public_url: The publicly visible url for the branch to register.\n"
6754
" This must be an http or https url (which Launchpad can read\n"
6755
" from to access the branch). Local file urls, SFTP urls, and\n"
6756
" bzr+ssh urls will not work.\n"
6757
" If no public_url is provided, bzr will use the configured\n"
6758
" public_url if there is one for the current branch, and\n"
6759
" otherwise error."
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/__init__.py:99
6763
msgid ""
6764
"example:\n"
6765
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6766
" --project fooproject"
6767
msgstr ""
6768
6769
#: bzrlib/plugins/launchpad/__init__.py:106
6770
msgid "Launchpad project short name to associate with the branch."
6771
msgstr "Nombre corto del proyecto de Launchpad para asociar con la rama."
6772
6773
#: bzrlib/plugins/launchpad/__init__.py:113
6774
msgid ""
6775
"Short name for the branch; by default taken from the last component of the "
6776
"url."
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/__init__.py:117
6780
msgid "One-sentence description of the branch."
6781
msgstr ""
6782
6783
#: bzrlib/plugins/launchpad/__init__.py:120
6784
msgid "Longer description of the purpose or contents of the branch."
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/__init__.py:123
6788
msgid "Branch author's email address, if not yourself."
6789
msgstr ""
6790
6791
#: bzrlib/plugins/launchpad/__init__.py:126
6792
msgid "The bug this branch fixes."
6793
msgstr "El error que arregla esta rama."
6794
6795
#: bzrlib/plugins/launchpad/__init__.py:129
6796
msgid "Prepare the request but don't actually send it."
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/__init__.py:151
6800
msgid ""
6801
"register-branch requires a public branch url - see bzr help register-branch."
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/__init__.py:159
6805
msgid "--product is deprecated; please use --project."
6806
msgstr ""
6807
6808
#: bzrlib/plugins/launchpad/__init__.py:191
6809
msgid "Open a Launchpad branch page in your web browser."
6810
msgstr "Abrir una página de rama de Launchpad en su navegador web."
6811
6812
#: bzrlib/plugins/launchpad/__init__.py:196
6813
msgid "Do not actually open the browser. Just say the URL we would use."
6814
msgstr ""
6815
6816
#: bzrlib/plugins/launchpad/__init__.py:231
6817
#, python-format
6818
msgid "Opening %s in web browser"
6819
msgstr ""
6820
6821
#: bzrlib/plugins/launchpad/__init__.py:241
6822
msgid "Show or set the Launchpad user ID."
6823
msgstr "Mostrar o establecer el ID de usuario de Launchpad."
6824
6825
#: bzrlib/plugins/launchpad/__init__.py:243
6826
msgid ""
6827
"When communicating with Launchpad, some commands need to know your\n"
6828
"Launchpad user ID. This command can be used to set or show the\n"
6829
"user ID that Bazaar will use for such communication."
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/__init__.py:247
6833
msgid ""
6834
":Examples:\n"
6835
" Show the Launchpad ID of the current user::"
6836
msgstr ""
6837
6838
#: bzrlib/plugins/launchpad/__init__.py:250
6839
msgid " bzr launchpad-login"
6840
msgstr " bzr launchpad-login"
6841
6842
#: bzrlib/plugins/launchpad/__init__.py:252
6843
msgid " Set the Launchpad ID of the current user to 'bob'::"
6844
msgstr ""
6845
6846
#: bzrlib/plugins/launchpad/__init__.py:254
6847
msgid " bzr launchpad-login bob"
6848
msgstr " bzr launchpad-login bob"
6849
6850
#: bzrlib/plugins/launchpad/__init__.py:261
6851
msgid "Don't check that the user name is valid."
6852
msgstr "No comprueba que el nombre de usuario sea válido."
6853
6854
#: bzrlib/plugins/launchpad/__init__.py:276
6855
#: bzrlib/plugins/launchpad/__init__.py:287
6856
msgid "Launchpad user ID exists and has SSH keys.\n"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/launchpad/__init__.py:279
6860
msgid "No Launchpad user ID configured.\n"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/launchpad/__init__.py:290
6864
#, python-format
6865
msgid "Launchpad user ID set to '%s'.\n"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/launchpad/__init__.py:298
6869
msgid "Ask Launchpad to mirror a branch now."
6870
msgstr ""
6871
6872
#: bzrlib/plugins/launchpad/__init__.py:318
6873
msgid "Propose merging a branch on Launchpad."
6874
msgstr ""
6875
6876
#: bzrlib/plugins/launchpad/__init__.py:320
6877
msgid ""
6878
"This will open your usual editor to provide the initial comment. When it\n"
6879
"has created the proposal, it will open it in your default web browser."
6880
msgstr ""
6881
6882
#: bzrlib/plugins/launchpad/__init__.py:323
6883
msgid ""
6884
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6885
"is not supplied, the remembered submit branch will be used. If no submit\n"
6886
"branch is remembered, the development focus will be used."
6887
msgstr ""
6888
6889
#: bzrlib/plugins/launchpad/__init__.py:327
6890
msgid ""
6891
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6892
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6893
"The parameter the launchpad account name of the desired reviewer. This\n"
6894
"may optionally be followed by '=' and the review type. For example:"
6895
msgstr ""
6896
6897
#: bzrlib/plugins/launchpad/__init__.py:332
6898
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6899
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
6900
6901
#: bzrlib/plugins/launchpad/__init__.py:334
6902
msgid ""
6903
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6904
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6905
msgstr ""
6906
6907
#: bzrlib/plugins/launchpad/__init__.py:339
6908
msgid "Propose the merge on staging."
6909
msgstr ""
6910
6911
#: bzrlib/plugins/launchpad/__init__.py:341
6912
msgid "Commit message."
6913
msgstr "Mensaje de ejecución."
6914
6915
#: bzrlib/plugins/launchpad/__init__.py:343
6916
msgid "Mark the proposal as approved immediately."
6917
msgstr "Marcar el propuesto como aprobado inmediatamente."
6918
6919
#: bzrlib/plugins/launchpad/__init__.py:345
6920
msgid "Requested reviewer and optional type."
6921
msgstr "Revisor solicitado y tipo opcional."
6922
6923
#: bzrlib/plugins/launchpad/__init__.py:382
6924
msgid "Find the proposal to merge this revision."
6925
msgstr "Buscar el propuesto para fusionar esta revisión."
6926
6927
#: bzrlib/plugins/launchpad/__init__.py:384
6928
msgid ""
6929
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6930
"This works only if the selected branch was the merge proposal target, and\n"
6931
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6932
"are opened in a web browser."
6933
msgstr ""
6934
6935
#: bzrlib/plugins/launchpad/__init__.py:389
6936
msgid ""
6937
"Any revision involved in the merge may be specified-- the revision in\n"
6938
"which the merge was performed, or one of the revisions that was merged."
6939
msgstr ""
6940
6941
#: bzrlib/plugins/launchpad/__init__.py:392
6942
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6943
msgstr ""
6944
6945
#: bzrlib/plugins/launchpad/__init__.py:394
6946
msgid " bzr lp-find-proposal -r annotate:README:1"
6947
msgstr " bzr lp-find-proposal -r annotate:README:1"
6948
6949
#: bzrlib/plugins/launchpad/__init__.py:409
6950
msgid "No review found."
6951
msgstr ""
6952
6953
#: bzrlib/plugins/launchpad/__init__.py:410
6954
#, python-format
6955
msgid "%d proposals(s) found."
6956
msgstr ""
6957
6958
#: bzrlib/plugins/launchpad/__init__.py:420
6959
msgid "Finding revision-id"
6960
msgstr ""
6961
6962
#: bzrlib/plugins/launchpad/__init__.py:427
6963
msgid "Finding merge"
6964
msgstr ""
6965
6966
#: bzrlib/plugins/launchpad/__init__.py:432
6967
msgid "Finding revno"
6968
msgstr ""
6969
6970
#: bzrlib/plugins/launchpad/__init__.py:437
6971
msgid "Finding Launchpad branch"
6972
msgstr ""
6973
6974
#: bzrlib/plugins/launchpad/__init__.py:440
6975
msgid "Finding proposals"
6976
msgstr ""
6977
6978
#: bzrlib/plugins/launchpad/account.py:66
6979
msgid "Setting ssh/sftp usernames for launchpad.net."
6980
msgstr ""
6981
6982
#: bzrlib/plugins/launchpad/lp_api.py:241
6983
#: bzrlib/plugins/launchpad/lp_api.py:246
6984
#, python-format
6985
msgid "%s is not registered on Launchpad"
6986
msgstr ""
6987
6988
#: bzrlib/plugins/launchpad/lp_api.py:256
6989
#, python-format
6990
msgid "%s has no development focus."
6991
msgstr ""
6992
6993
#: bzrlib/plugins/launchpad/lp_api.py:261
6994
#, python-format
6995
msgid "development focus %s has no branch."
6996
msgstr ""
6997
6998
#: bzrlib/plugins/launchpad/lp_api.py:266
6999
#, python-format
7000
msgid "source package %s has no branch."
7001
msgstr ""
7002
7003
#: bzrlib/plugins/launchpad/lp_api.py:270
7004
#, python-format
7005
msgid "%s has no associated product or source package."
7006
msgstr ""
7007
7008
#: bzrlib/plugins/launchpad/lp_api.py:282
7009
#, python-format
7010
msgid "%s is already up-to-date."
7011
msgstr ""
7012
7013
#: bzrlib/plugins/launchpad/lp_api.py:289
7014
#, python-format
7015
msgid "Pushing to %s"
7016
msgstr ""
7017
7018
#: bzrlib/plugins/launchpad/lp_directory.py:170
7019
msgid ""
7020
"resolution for {0}\n"
7021
" local: {1}\n"
7022
" remote: {2}"
7023
msgstr ""
7024
7025
#: bzrlib/plugins/launchpad/lp_propose.py:149
7026
#, python-format
7027
msgid "There is already a branch merge proposal: %s"
7028
msgstr ""
7029
7030
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7031
msgid "pb parameter to convert() is deprecated"
7032
msgstr ""
7033
7034
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7035
msgid "starting upgrade from format 4 to 5"
7036
msgstr ""
7037
7038
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7039
msgid "note: upgrade may be faster if all store files are ungzipped first"
7040
msgstr ""
7041
7042
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7043
msgid "converting revision"
7044
msgstr ""
7045
7046
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7047
msgid "upgraded to weaves:"
7048
msgstr ""
7049
7050
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7051
#, python-format
7052
msgid "%6d revisions and inventories"
7053
msgstr ""
7054
7055
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7056
#, python-format
7057
msgid "%6d revisions not present"
7058
msgstr ""
7059
7060
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7061
#, python-format
7062
msgid "%6d texts"
7063
msgstr ""
7064
7065
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7066
msgid "writing weave"
7067
msgstr ""
7068
7069
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7070
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7071
msgid "inventory"
7072
msgstr ""
7073
7074
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7075
msgid "write revision"
7076
msgstr ""
7077
7078
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7079
msgid "loading revision"
7080
msgstr ""
7081
7082
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7083
#, python-format
7084
msgid "revision {%s} not present in branch; will be converted as a ghost"
7085
msgstr ""
7086
7087
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7088
msgid "starting upgrade from format 5 to 6"
7089
msgstr ""
7090
7091
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7092
#, python-format
7093
msgid "adding prefixes to %s"
7094
msgstr ""
7095
7096
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7097
msgid "starting upgrade from format 6 to metadir"
7098
msgstr ""
7099
7100
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7101
msgid "Removing ancestry.weave"
7102
msgstr ""
7103
7104
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7105
msgid "Finding branch files"
7106
msgstr ""
7107
7108
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7109
msgid "Upgrading repository"
7110
msgstr ""
7111
7112
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7113
msgid "Upgrading branch"
7114
msgstr ""
7115
7116
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7117
msgid "No working tree."
7118
msgstr ""
7119
7120
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7121
msgid "Upgrading working tree"
7122
msgstr ""
7123
7124
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7125
#, python-format
7126
msgid "Make %s lock"
7127
msgstr ""
7128
7129
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7130
#, python-format
7131
msgid "Moving %s"
7132
msgstr ""
7133
7134
#: bzrlib/push.py:56
7135
msgid "Created new branch."
7136
msgstr "Rama nueva creada."
7137
7138
#: bzrlib/push.py:98
7139
#, python-format
7140
msgid ""
7141
"Target directory %s already contains a .bzr directory, but it is not valid."
7142
msgstr ""
7143
7144
#: bzrlib/push.py:101
7145
#, python-format
7146
msgid ""
7147
"Target directory %s already exists, but does not have a .bzr directory. "
7148
"Supply --use-existing-dir to push there anyway."
7149
msgstr ""
7150
7151
#: bzrlib/push.py:122
7152
#, python-format
7153
msgid "Too many redirections trying to make %s."
7154
msgstr ""
7155
7156
#: bzrlib/push.py:147
7157
msgid ""
7158
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7159
"information."
7160
msgstr ""
7161
7162
#: bzrlib/push.py:151
7163
#, python-format
7164
msgid ""
7165
"It is not possible to losslessly push to %s. You may want to use dpush "
7166
"instead."
7167
msgstr ""
7168
7169
#: bzrlib/push.py:157
7170
#, python-format
7171
msgid ""
7172
"At %s you have a valid .bzr control directory, but not a branch or "
7173
"repository. This is an unsupported configuration. Please move the target "
7174
"directory out of the way and try again."
7175
msgstr ""
7176
7177
#: bzrlib/reconcile.py:97
7178
#, python-format
7179
msgid "Reconciling branch %s"
7180
msgstr "Reconciliando rama %s"
7181
7182
#: bzrlib/reconcile.py:103
7183
#, python-format
7184
msgid "Reconciling repository %s"
7185
msgstr "Reconciliando repositorio %s"
7186
7187
#: bzrlib/reconcile.py:105
7188
msgid "Reconciling repository"
7189
msgstr "Reconciliando repositorio"
7190
7191
#: bzrlib/reconcile.py:111
7192
#, python-format
7193
msgid "%s cannot canonicalize CHKs."
7194
msgstr ""
7195
7196
#: bzrlib/reconcile.py:119
7197
msgid "Reconcile aborted: revision index has inconsistent parents."
7198
msgstr ""
7199
7200
#: bzrlib/reconcile.py:121
7201
msgid "Run \"bzr check\" for more details."
7202
msgstr ""
7203
7204
#: bzrlib/reconcile.py:123
7205
msgid "Reconciliation complete."
7206
msgstr "Reconciliación completa."
7207
7208
#: bzrlib/reconcile.py:166
7209
msgid "Fixing last revision info {0} => {1}"
7210
msgstr ""
7211
7212
#: bzrlib/reconcile.py:173
7213
msgid "revision_history ok."
7214
msgstr ""
7215
7216
#: bzrlib/reconcile.py:234
7217
msgid "Reading inventory data"
7218
msgstr "Leyendo los datos de inventario"
7219
7220
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7221
msgid "Inventory ok."
7222
msgstr ""
7223
7224
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7225
msgid "Backing up inventory"
7226
msgstr "Respaldando inventario"
7227
7228
#: bzrlib/reconcile.py:258
7229
msgid "Backup inventory created."
7230
msgstr ""
7231
7232
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7233
msgid "Writing weave"
7234
msgstr ""
7235
7236
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7237
msgid "Inventory regenerated."
7238
msgstr "Inventario regenerado."
7239
7240
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7241
msgid "Reading indexes"
7242
msgstr "Leyendo índices"
7243
7244
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7245
msgid "Checking unused inventories"
7246
msgstr ""
7247
7248
#: bzrlib/reconcile.py:388
7249
msgid "Backup Inventory created"
7250
msgstr ""
7251
7252
#: bzrlib/reconcile.py:446
7253
msgid "Fixing text parents"
7254
msgstr ""
7255
7256
#: bzrlib/reconfigure.py:54
7257
msgid "{0} is now stacked on {1}\n"
7258
msgstr "{0} está ahora apilado en {1}\n"
7259
7260
#: bzrlib/reconfigure.py:69
7261
#, python-format
7262
msgid "%s is now not stacked\n"
7263
msgstr ""
7264
7265
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7266
#, python-format
7267
msgid "bzr: ERROR (ignored): %s"
7268
msgstr "bzr: ERROR (ignorado): %s"
7269
7270
#: bzrlib/remote.py:2493
7271
msgid "Copying repository content as tarball..."
7272
msgstr ""
7273
7274
#: bzrlib/rename_map.py:69
7275
msgid "Calculating hashes"
7276
msgstr "Calculando hashes"
7277
7278
#: bzrlib/rename_map.py:107
7279
msgid "Determining hash hits"
7280
msgstr ""
7281
7282
#: bzrlib/rename_map.py:242
7283
msgid "{0} => {1}"
7284
msgstr "{0} => {1}"
7285
7286
#: bzrlib/repository.py:1787
7287
msgid "Moving repository to repository.backup"
7288
msgstr ""
7289
7290
#: bzrlib/repository.py:1794
7291
msgid "Creating new repository"
7292
msgstr "Creando repositorio nuevo"
7293
7294
#: bzrlib/repository.py:1799
7295
msgid "Copying content"
7296
msgstr "Copiar contenido"
7297
7298
#: bzrlib/repository.py:1803
7299
msgid "Deleting old repository content"
7300
msgstr ""
7301
7302
#: bzrlib/repository.py:1805
7303
msgid "repository converted"
7304
msgstr "repositorio convertido"
7305
7306
#: bzrlib/revisionspec.py:903
7307
msgid "Using {0} {1}"
7308
msgstr "Usando {0} {1}"
7309
7310
#: bzrlib/send.py:58
7311
#, python-format
7312
msgid "Mail client \"%s\" does not support specifying body"
7313
msgstr ""
7314
7315
#: bzrlib/send.py:62
7316
msgid "--remember requires a branch to be specified."
7317
msgstr ""
7318
7319
#: bzrlib/send.py:77
7320
msgid "No submit branch known or specified"
7321
msgstr ""
7322
7323
#: bzrlib/send.py:80
7324
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7325
msgstr ""
7326
7327
#: bzrlib/send.py:98
7328
#, python-format
7329
msgid "No such send format '%s'."
7330
msgstr ""
7331
7332
#: bzrlib/send.py:114
7333
msgid "bzr send takes at most two one revision identifiers"
7334
msgstr ""
7335
7336
#: bzrlib/send.py:127
7337
msgid "No revisions to submit."
7338
msgstr "No hay revisiones para enviar."
7339
7340
#: bzrlib/send.py:139
7341
msgid ""
7342
"- not supported for merge directives that use more than one output file."
7343
msgstr ""
7344
7345
#: bzrlib/send.py:185
7346
msgid "Format 0.9 does not permit bundle with no patch"
7347
msgstr ""
7348
7349
#: bzrlib/shelf_ui.py:46
7350
#, python-format
7351
msgid "Shelve adding file \"%(path)s\"?"
7352
msgstr ""
7353
7354
#: bzrlib/shelf_ui.py:47
7355
msgid "Shelve binary changes?"
7356
msgstr ""
7357
7358
#: bzrlib/shelf_ui.py:48
7359
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7360
msgstr ""
7361
7362
#: bzrlib/shelf_ui.py:50
7363
#, python-format
7364
msgid "Shelve removing file \"%(path)s\"?"
7365
msgstr ""
7366
7367
#: bzrlib/shelf_ui.py:51
7368
#, python-format
7369
msgid "Shelve %d change(s)?"
7370
msgstr ""
7371
7372
#: bzrlib/shelf_ui.py:52
7373
msgid "Shelve?"
7374
msgstr "¿Arrinconar?"
7375
7376
#: bzrlib/shelf_ui.py:53
7377
#, python-format
7378
msgid ""
7379
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7380
msgstr ""
7381
7382
#: bzrlib/shelf_ui.py:55
7383
#, python-format
7384
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7385
msgstr ""
7386
7387
#: bzrlib/shelf_ui.py:70
7388
#, python-format
7389
msgid "Changes shelved with id \"%d\"."
7390
msgstr ""
7391
7392
#: bzrlib/shelf_ui.py:74
7393
msgid "Selected changes destroyed."
7394
msgstr "Cambios seleccionados destruidos."
7395
7396
#: bzrlib/shelf_ui.py:78
7397
msgid "Selected changes:"
7398
msgstr "Cambios seleccionados:"
7399
7400
#: bzrlib/shelf_ui.py:98
7401
#, python-format
7402
msgid "Delete file \"%(path)s\"?"
7403
msgstr "¿Eliminar archivo «%(path)s»?"
7404
7405
#: bzrlib/shelf_ui.py:99
7406
msgid "Apply binary changes?"
7407
msgstr "¿Aplicar cambios binarios?"
7408
7409
#: bzrlib/shelf_ui.py:100
7410
#, python-format
7411
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7412
msgstr ""
7413
7414
#: bzrlib/shelf_ui.py:102
7415
#, python-format
7416
msgid "Add file \"%(path)s\"?"
7417
msgstr "¿Añadir archivo «%(path)s»?"
7418
7419
#: bzrlib/shelf_ui.py:103
7420
#, python-format
7421
msgid "Apply %d change(s)?"
7422
msgstr "¿Aplicar %d cambio(s)?"
7423
7424
#: bzrlib/shelf_ui.py:104
7425
msgid "Apply change?"
7426
msgstr "¿Aplicar cambio?"
7427
7428
#: bzrlib/shelf_ui.py:105
7429
#, python-format
7430
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7431
msgstr ""
7432
7433
#: bzrlib/shelf_ui.py:107
7434
#, python-format
7435
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7436
msgstr ""
7437
7438
#: bzrlib/shelf_ui.py:402
7439
msgid "No changes are shelved."
7440
msgstr "No se han arrinconado cambios."
7441
7442
#: bzrlib/shelf_ui.py:460
7443
#, python-format
7444
msgid "Using changes with id \"%d\"."
7445
msgstr ""
7446
7447
#: bzrlib/shelf_ui.py:464
7448
#, python-format
7449
msgid "Message: %s"
7450
msgstr "Mensaje: %s"
7451
7452
#: bzrlib/shelf_ui.py:476
7453
#, python-format
7454
msgid "Deleted changes with id \"%d\"."
7455
msgstr ""
7456
7457
#: bzrlib/smart/medium.py:714
7458
msgid "HPSS calls: {0} ({1} vfs) {2}"
7459
msgstr ""
7460
7461
#: bzrlib/smart/server.py:169
7462
msgid "Requested to stop gracefully"
7463
msgstr ""
7464
7465
#: bzrlib/smart/server.py:179
7466
#, python-format
7467
msgid "Waiting for %d client(s) to finish"
7468
msgstr ""
7469
7470
#: bzrlib/smart/server.py:185
7471
#, python-format
7472
msgid "Still waiting for %d client(s) to finish"
7473
msgstr ""
7474
7475
#: bzrlib/smart/server.py:219
7476
#, python-format
7477
msgid "listening socket error: %s"
7478
msgstr ""
7479
7480
#: bzrlib/smart/server.py:452
7481
#, python-format
7482
msgid "listening on port: %s"
7483
msgstr ""
7484
7485
#: bzrlib/switch.py:69
7486
msgid "Pending merges must be committed or reverted before using switch."
7487
msgstr ""
7488
7489
#: bzrlib/switch.py:96
7490
msgid ""
7491
"Cannot switch as local commits found in the checkout. Commit these to the "
7492
"bound branch or use --force to throw them away."
7493
msgstr ""
7494
7495
#: bzrlib/switch.py:101
7496
#, python-format
7497
msgid ""
7498
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7499
"anyway, use --force."
7500
msgstr ""
7501
7502
#: bzrlib/switch.py:110
7503
msgid "Cannot switch a branch, only a checkout."
7504
msgstr ""
7505
7506
#: bzrlib/switch.py:146
7507
#, python-format
7508
msgid "Tree is up to date at revision %d."
7509
msgstr ""
7510
7511
#: bzrlib/switch.py:152
7512
#, python-format
7513
msgid "Updated to revision %d."
7514
msgstr ""
7515
7516
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7517
msgid "Apply phase"
7518
msgstr "Aplicar fase"
7519
7520
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7521
msgid "removing file"
7522
msgstr "eliminar archivo"
7523
7524
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7525
msgid "adding file"
7526
msgstr "añadiendo archivo"
7527
7528
#: bzrlib/transform.py:2587
7529
msgid "Building tree"
7530
msgstr "Construyendo árbol"
7531
7532
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7533
msgid "Adding file contents"
7534
msgstr "Añadiendo contenidos de archivo"
7535
7536
#: bzrlib/transform.py:3024
7537
msgid "Resolution pass"
7538
msgstr ""
7539
7540
#: bzrlib/transport/ftp/_gssapi.py:88
7541
#, python-format
7542
msgid "Authenticated as %s"
7543
msgstr ""
7544
7545
#: bzrlib/tree.py:634
7546
msgid "*** {0} content-filter: {1} => {2!r}"
7547
msgstr ""
7548
7549
#: bzrlib/upgrade.py:77
7550
#, python-format
7551
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7552
msgstr ""
7553
7554
#: bzrlib/upgrade.py:100
7555
#, python-format
7556
msgid "cannot upgrade from bzrdir format %s"
7557
msgstr ""
7558
7559
#: bzrlib/upgrade.py:103
7560
#, python-format
7561
msgid "starting upgrade of %s"
7562
msgstr ""
7563
7564
#: bzrlib/upgrade.py:110
7565
msgid "finished"
7566
msgstr ""
7567
7568
#: bzrlib/upgrade.py:120
7569
msgid "Deleting backup.bzr"
7570
msgstr ""
7571
7572
#: bzrlib/upgrade.py:151
7573
msgid ""
7574
"\n"
7575
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7576
msgstr ""
7577
7578
#: bzrlib/upgrade.py:208
7579
#, python-format
7580
msgid "Found %d dependent branches - upgrading ..."
7581
msgstr ""
7582
7583
#: bzrlib/upgrade.py:276
7584
msgid "Upgrading bzrdirs"
7585
msgstr "Actualizando bzrdirs"
7586
7587
#: bzrlib/upgrade.py:282
7588
#, python-format
7589
msgid "Upgrading %s"
7590
msgstr "Actualizando %s"
7591
7592
#: bzrlib/upgrade.py:283
7593
msgid "Upgrading {0} {1} ..."
7594
msgstr "Actualizando {0} {1} ..."
7595
7596
#: bzrlib/upgrade.py:301
7597
msgid "Removing backup ..."
7598
msgstr ""
7599
7600
#: bzrlib/upgrade.py:305
7601
msgid "failed to clean-up {0}: {1}"
7602
msgstr ""
7603
7604
#: bzrlib/vf_repository.py:1090
7605
msgid "inventories"
7606
msgstr ""
7607
7608
#: bzrlib/vf_repository.py:1116
7609
msgid "texts"
7610
msgstr "textos"
7611
7612
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7613
msgid "Calculating text parents"
7614
msgstr ""
7615
7616
#: bzrlib/vf_repository.py:1706
7617
msgid "Fetch texts"
7618
msgstr ""
7619
7620
#: bzrlib/vf_repository.py:2535
7621
msgid "loading text store"
7622
msgstr ""
7623
7624
#: bzrlib/vf_repository.py:2541
7625
msgid "checking text graph"
7626
msgstr ""
7627
7628
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7629
#: bzrlib/vf_repository.py:3124
7630
msgid "Transferring revisions"
7631
msgstr ""
7632
7633
#: bzrlib/win32utils.py:146
7634
msgid "Failed to GetProcessMemoryInfo()"
7635
msgstr ""
7636
7637
#: bzrlib/win32utils.py:167
7638
msgid "Cannot debug memory on win32 without ctypes or win32process"
7639
msgstr ""
7640
7641
#: bzrlib/win32utils.py:172
7642
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7643
msgstr ""
7644
7645
#: bzrlib/win32utils.py:180
7646
#, python-format
7647
msgid "WorkingSize %8d KiB"
7648
msgstr ""
7649
7650
#: bzrlib/win32utils.py:181
7651
#, python-format
7652
msgid "PeakWorking %8d KiB"
7653
msgstr ""
7654
7655
#: bzrlib/win32utils.py:182
7656
#, python-format
7657
msgid "PagefileUsage %8d KiB"
7658
msgstr ""
7659
7660
#: bzrlib/win32utils.py:183
7661
#, python-format
7662
msgid "PeakPagefileUsage %8d KiB"
7663
msgstr ""
7664
7665
#: bzrlib/win32utils.py:185
7666
#, python-format
7667
msgid "PrivateUsage %8d KiB"
7668
msgstr ""
7669
7670
#: bzrlib/win32utils.py:186
7671
#, python-format
7672
msgid "PageFaultCount %8d"
7673
msgstr ""
7674
7675
#: bzrlib/workingtree.py:1478
7676
msgid "Rerun update after fixing the conflicts."
7677
msgstr ""
7678
7679
#: dummy/help_topics/authentication/summary.txt:1
7680
msgid "Information on configuring authentication"
7681
msgstr ""
7682
7683
#: dummy/help_topics/basic/detail.txt:1
7684
msgid ""
7685
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7686
"http://bazaar.canonical.com/"
7687
msgstr ""
7688
7689
#: dummy/help_topics/basic/detail.txt:4
7690
msgid ""
7691
"Basic commands:\n"
7692
" bzr init makes this directory a versioned branch\n"
7693
" bzr branch make a copy of another branch"
7694
msgstr ""
7695
7696
#: dummy/help_topics/basic/detail.txt:8
7697
msgid ""
7698
" bzr add make files or directories versioned\n"
7699
" bzr ignore ignore a file or pattern\n"
7700
" bzr mv move or rename a versioned file"
7701
msgstr ""
7702
7703
#: dummy/help_topics/basic/detail.txt:12
7704
msgid ""
7705
" bzr status summarize changes in working copy\n"
7706
" bzr diff show detailed diffs"
7707
msgstr ""
7708
7709
#: dummy/help_topics/basic/detail.txt:15
7710
msgid ""
7711
" bzr merge pull in changes from another branch\n"
7712
" bzr commit save some or all changes\n"
7713
" bzr send send changes via email"
7714
msgstr ""
7715
7716
#: dummy/help_topics/basic/detail.txt:19
7717
msgid ""
7718
" bzr log show history of changes\n"
7719
" bzr check validate storage"
7720
msgstr ""
7721
" bzr log muestra el historial de cambios\n"
7722
" bzr check valida el almacenamiento"
7723
7724
#: dummy/help_topics/basic/detail.txt:22
7725
msgid ""
7726
" bzr help init more help on e.g. init command\n"
7727
" bzr help commands list all commands\n"
7728
" bzr help topics list all help topics\n"
7729
msgstr ""
7730
7731
#: dummy/help_topics/basic/summary.txt:1
7732
msgid "Basic commands"
7733
msgstr "Órdenes básicas"
7734
7735
#: dummy/help_topics/branches/detail.txt:1
7736
msgid "Branches"
7737
msgstr "Ramas"
7738
7739
#: dummy/help_topics/branches/detail.txt:3
7740
msgid ""
7741
"A branch consists of the state of a project, including all of its\n"
7742
"history. All branches have a repository associated (which is where the\n"
7743
"branch history is stored), but multiple branches may share the same\n"
7744
"repository (a shared repository). Branches can be copied and merged."
7745
msgstr ""
7746
7747
#: dummy/help_topics/branches/detail.txt:8
7748
msgid ""
7749
"In addition, one branch may be bound to another one. Binding to another\n"
7750
"branch indicates that commits which happen in this branch must also \n"
7751
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7752
"commits when the two branches are out of date. In order for a commit \n"
7753
"to succeed, it may be necessary to update the current branch using \n"
7754
"``bzr update``."
7755
msgstr ""
7756
7757
#: dummy/help_topics/branches/detail.txt:15
7758
#: dummy/help_topics/checkouts/detail.txt:66
7759
#: dummy/help_topics/repositories/detail.txt:36
7760
msgid "Related commands::"
7761
msgstr "Órdenes relacionadas"
7762
7763
#: dummy/help_topics/branches/detail.txt:17
7764
msgid ""
7765
" init Change a directory into a versioned branch.\n"
7766
" branch Create a new branch that is a copy of an existing branch.\n"
7767
" merge Perform a three-way merge.\n"
7768
" bind Bind a branch to another one.\n"
7769
msgstr ""
7770
7771
#: dummy/help_topics/branches/summary.txt:1
7772
msgid "Information on what a branch is"
7773
msgstr ""
7774
7775
#: dummy/help_topics/bugs/summary.txt:1
7776
msgid "Bug tracker settings"
7777
msgstr "Configuración del seguimiento de errores"
7778
7779
#: dummy/help_topics/checkouts/detail.txt:1
7780
msgid "Checkouts"
7781
msgstr "Comrpobaciones"
7782
7783
#: dummy/help_topics/checkouts/detail.txt:3
7784
msgid ""
7785
"Checkouts are source trees that are connected to a branch, so that when\n"
7786
"you commit in the source tree, the commit goes into that branch. They\n"
7787
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7788
"Bazaar's decentralized features until you want them. Using checkouts\n"
7789
"with shared repositories is very similar to working with SVN or CVS, but\n"
7790
"doesn't have the same restrictions. And using checkouts still allows\n"
7791
"others working on the project to use whatever workflow they like."
7792
msgstr ""
7793
7794
#: dummy/help_topics/checkouts/detail.txt:11
7795
msgid ""
7796
"A checkout is created with the bzr checkout command (see \"help "
7797
"checkout\").\n"
7798
"You pass it a reference to another branch, and it will create a local copy\n"
7799
"for you that still contains a reference to the branch you created the\n"
7800
"checkout from (the master branch). Then if you make any commits they will "
7801
"be\n"
7802
"made on the other branch first. This creates an instant mirror of your work, "
7803
"or\n"
7804
"facilitates lockstep development, where each developer is working together,\n"
7805
"continuously integrating the changes of others."
7806
msgstr ""
7807
7808
#: dummy/help_topics/checkouts/detail.txt:19
7809
msgid ""
7810
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7811
"you have the full history locally. As you have a first class branch you "
7812
"can\n"
7813
"also commit locally if you want, for instance due to the temporary loss af "
7814
"a\n"
7815
"network connection. Use the --local option to commit to do this. All the "
7816
"local\n"
7817
"commits will then be made on the master branch the next time you do a non-"
7818
"local\n"
7819
"commit."
7820
msgstr ""
7821
7822
#: dummy/help_topics/checkouts/detail.txt:26
7823
msgid ""
7824
"If you are using a checkout from a shared branch you will periodically want "
7825
"to\n"
7826
"pull in all the changes made by others. This is done using the \"update\"\n"
7827
"command. The changes need to be applied before any non-local commit, but\n"
7828
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7829
"command when needed."
7830
msgstr ""
7831
7832
#: dummy/help_topics/checkouts/detail.txt:32
7833
msgid ""
7834
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7835
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7836
"SVN checkout in that it is not a first class branch, it mainly consists of "
7837
"the\n"
7838
"working tree. This means that any history operations must query the master\n"
7839
"branch, which could be slow if a network connection is involved. Also, as "
7840
"you\n"
7841
"don't have a local branch, then you cannot commit locally."
7842
msgstr ""
7843
7844
#: dummy/help_topics/checkouts/detail.txt:39
7845
msgid ""
7846
"Lightweight checkouts work best when you have fast reliable access to the\n"
7847
"master branch. This means that if the master branch is on the same disk or "
7848
"LAN\n"
7849
"a lightweight checkout will be faster than a heavyweight one for any "
7850
"commands\n"
7851
"that modify the revision history (as only one copy of the branch needs to\n"
7852
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7853
"that uses the history but does not change it, but if the master branch is "
7854
"on\n"
7855
"the same disk then there won't be a noticeable difference."
7856
msgstr ""
7857
7858
#: dummy/help_topics/checkouts/detail.txt:47
7859
msgid ""
7860
"Another possible use for a checkout is to use it with a treeless repository\n"
7861
"containing your branches, where you maintain only one working tree by\n"
7862
"switching the master branch that the checkout points to when you want to\n"
7863
"work on a different branch."
7864
msgstr ""
7865
7866
#: dummy/help_topics/checkouts/detail.txt:52
7867
msgid ""
7868
"Obviously to commit on a checkout you need to be able to write to the "
7869
"master\n"
7870
"branch. This means that the master branch must be accessible over a "
7871
"writeable\n"
7872
"protocol , such as sftp://, and that you have write permissions at the "
7873
"other\n"
7874
"end. Checkouts also work on the local file system, so that all that matters "
7875
"is\n"
7876
"file permissions."
7877
msgstr ""
7878
7879
#: dummy/help_topics/checkouts/detail.txt:58
7880
msgid ""
7881
"You can change the master of a checkout by using the \"switch\" command "
7882
"(see\n"
7883
"\"help switch\"). This will change the location that the commits are sent "
7884
"to.\n"
7885
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7886
"checkout. If you would like to convert your heavy checkout into a normal\n"
7887
"branch so that every commit is local, you can use the \"unbind\" command. To "
7888
"see\n"
7889
"whether or not a branch is bound or not you can use the \"info\" command. If "
7890
"the\n"
7891
"branch is bound it will tell you the location of the bound branch."
7892
msgstr ""
7893
7894
#: dummy/help_topics/checkouts/detail.txt:68
7895
msgid ""
7896
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7897
" checkout\n"
7898
" update Pull any changes in the master branch in to your checkout\n"
7899
" commit Make a commit that is sent to the master branch. If you have\n"
7900
" a heavy checkout then the --local option will commit to the\n"
7901
" checkout without sending the commit to the master\n"
7902
" switch Change the master branch that the commits in the checkout "
7903
"will\n"
7904
" be sent to\n"
7905
" bind Turn a standalone branch into a heavy checkout so that any\n"
7906
" commits will be sent to the master branch\n"
7907
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7908
" commits are only made locally\n"
7909
" info Displays whether a branch is bound or unbound. If the branch "
7910
"is\n"
7911
" bound, then it will also display the location of the bound "
7912
"branch\n"
7913
msgstr ""
7914
7915
#: dummy/help_topics/checkouts/summary.txt:1
7916
msgid "Information on what a checkout is"
7917
msgstr "información sobre lo que es una comprobación"
7918
7919
#: dummy/help_topics/commands/summary.txt:1
7920
msgid "Basic help for all commands"
7921
msgstr "Ayuda básica para todas las órdenes"
7922
7923
#: dummy/help_topics/configuration/summary.txt:1
7924
msgid "Details on the configuration settings available"
7925
msgstr "Detalles de las configuraciones disponibles"
7926
7927
#: dummy/help_topics/conflict-types/summary.txt:1
7928
msgid "Types of conflicts and what to do about them"
7929
msgstr "Tipos de conflicto y qué hacer con ellos"
7930
7931
#: dummy/help_topics/content-filters/summary.txt:1
7932
msgid "Conversion of content into/from working trees"
7933
msgstr ""
7934
7935
#: dummy/help_topics/criss-cross/detail.txt:1
7936
msgid "Criss-Cross"
7937
msgstr ""
7938
7939
#: dummy/help_topics/criss-cross/detail.txt:3
7940
msgid ""
7941
"A criss-cross in the branch history can cause the default merge technique\n"
7942
"to emit more conflicts than would normally be expected."
7943
msgstr ""
7944
7945
#: dummy/help_topics/criss-cross/detail.txt:6
7946
msgid ""
7947
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7948
"give\n"
7949
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7950
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7951
msgstr ""
7952
7953
#: dummy/help_topics/criss-cross/detail.txt:10
7954
msgid ""
7955
"Criss-crosses occur in a branch's history if two branches merge the same "
7956
"thing\n"
7957
"and then merge one another, or if two branches merge one another at the "
7958
"same\n"
7959
"time. They can be avoided by having each branch only merge from or into a\n"
7960
"designated central branch (a \"star topology\")."
7961
msgstr ""
7962
7963
#: dummy/help_topics/criss-cross/detail.txt:15
7964
msgid ""
7965
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7966
"default\n"
7967
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7968
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7969
"differences between THIS and OTHER are due to one side adding lines, or\n"
7970
"from another side removing lines."
7971
msgstr ""
7972
7973
#: dummy/help_topics/criss-cross/detail.txt:21
7974
msgid ""
7975
"Criss-crosses mean there is no good choice for a base. Selecting the "
7976
"recent\n"
7977
"merge points could cause one side's changes to be silently discarded.\n"
7978
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7979
"are emitted."
7980
msgstr ""
7981
7982
#: dummy/help_topics/criss-cross/detail.txt:26
7983
msgid ""
7984
"The ``weave`` merge type is not affected by this problem because it uses\n"
7985
"line-origin detection instead of a basis revision to determine the cause of\n"
7986
"differences.\n"
7987
msgstr ""
7988
7989
#: dummy/help_topics/criss-cross/summary.txt:1
7990
msgid "Information on criss-cross merging"
7991
msgstr ""
7992
7993
#: dummy/help_topics/current-formats/summary.txt:1
7994
msgid "Current storage formats"
7995
msgstr ""
7996
7997
#: dummy/help_topics/debug-flags/summary.txt:1
7998
msgid "Options to show or record debug information"
7999
msgstr "Opciones para mostrar o grabar información de depuración"
8000
8001
#: dummy/help_topics/diverged-branches/summary.txt:1
8002
msgid "How to fix diverged branches"
8003
msgstr ""
8004
8005
#: dummy/help_topics/env-variables/detail.txt:1
8006
msgid "Environment Variables"
8007
msgstr "Variables de entorno"
8008
8009
#: dummy/help_topics/env-variables/detail.txt:3
8010
msgid ""
8011
"=================== "
8012
"===========================================================\n"
8013
"BZRPATH Path where bzr is to look for shell plugin external\n"
8014
" commands.\n"
8015
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8016
"EMAIL E-Mail address of the user.\n"
8017
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8018
"EDITOR Editor for editing commit messages.\n"
8019
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8020
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8021
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8022
"BZR_PLUGIN_PATH.\n"
8023
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8024
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8025
"and\n"
8026
" HOME.\n"
8027
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8028
"URLs).\n"
8029
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8030
"sshcorp,\n"
8031
" plink or lsh.\n"
8032
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8033
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8034
"BZR_COLUMNS Override implicit terminal width.\n"
8035
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8036
"(selftest)\n"
8037
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8038
"'text'.\n"
8039
"BZR_PDB Control whether to launch a debugger on error.\n"
8040
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8041
" breakin debugger.\n"
8042
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8043
"(instead\n"
8044
" of char-based).\n"
8045
"=================== "
8046
"===========================================================\n"
8047
msgstr ""
8048
8049
#: dummy/help_topics/env-variables/summary.txt:1
8050
msgid "Environment variable names and values"
8051
msgstr "Nombres y valores de variables de entorno"
8052
8053
#: dummy/help_topics/eol/summary.txt:1
8054
msgid "Information on end-of-line handling"
8055
msgstr ""
8056
8057
#: dummy/help_topics/files/detail.txt:1
8058
msgid "Files"
8059
msgstr "Archivos"
8060
8061
#: dummy/help_topics/files/detail.txt:3
8062
msgid ""
8063
":On Unix: ~/.bazaar/bazaar.conf\n"
8064
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8065
"bazaar\\\\2.0\\\\bazaar.conf"
8066
msgstr ""
8067
8068
#: dummy/help_topics/files/detail.txt:6
8069
msgid ""
8070
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8071
"used to define general configuration that will be applied everywhere.\n"
8072
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8073
"commonly used options."
8074
msgstr ""
8075
8076
#: dummy/help_topics/files/detail.txt:11
8077
msgid "A typical config file might look something like::"
8078
msgstr ""
8079
8080
#: dummy/help_topics/files/detail.txt:13
8081
msgid ""
8082
" [DEFAULT]\n"
8083
" email=John Doe <jdoe@isp.com>"
8084
msgstr ""
8085
8086
#: dummy/help_topics/files/detail.txt:16
8087
msgid ""
8088
" [ALIASES]\n"
8089
" commit = commit --strict\n"
8090
" log10 = log --short -r -10..-1\n"
8091
msgstr ""
8092
" [ALIASES]\n"
8093
" commit = commit --strict\n"
8094
" log10 = log --short -r -10..-1\n"
8095
8096
#: dummy/help_topics/files/summary.txt:1
8097
msgid "Information on configuration and log files"
8098
msgstr "Información sobre configuración y archivos de registro"
8099
8100
#: dummy/help_topics/formats/detail.txt:1
8101
msgid "Storage Formats"
8102
msgstr "Formatos de almacenamiento"
8103
8104
#: dummy/help_topics/formats/detail.txt:3
8105
msgid ""
8106
"To ensure that older clients do not access data incorrectly,\n"
8107
"Bazaar's policy is to introduce a new storage format whenever\n"
8108
"new features requiring new metadata are added. New storage\n"
8109
"formats may also be introduced to improve performance and\n"
8110
"scalability."
8111
msgstr ""
8112
8113
#: dummy/help_topics/formats/detail.txt:9
8114
msgid ""
8115
"The newest format, 2a, is highly recommended. If your\n"
8116
"project is not using 2a, then you should suggest to the\n"
8117
"project owner to upgrade."
8118
msgstr ""
8119
8120
#: dummy/help_topics/formats/detail.txt:13
8121
msgid ""
8122
"\n"
8123
".. note::"
8124
msgstr ""
8125
"\n"
8126
".. nota::"
8127
8128
#: dummy/help_topics/formats/detail.txt:16
8129
msgid ""
8130
" Some of the older formats have two variants:\n"
8131
" a plain one and a rich-root one. The latter include an additional\n"
8132
" field about the root of the tree. There is no performance cost\n"
8133
" for using a rich-root format but you cannot easily merge changes\n"
8134
" from a rich-root format into a plain format. As a consequence,\n"
8135
" moving a project to a rich-root format takes some co-ordination\n"
8136
" in that all contributors need to upgrade their repositories\n"
8137
" around the same time. 2a and all future formats will be\n"
8138
" implicitly rich-root."
8139
msgstr ""
8140
8141
#: dummy/help_topics/formats/detail.txt:26
8142
msgid ""
8143
"See :doc:`current-formats-help` for the complete list of\n"
8144
"currently supported formats. See :doc:`other-formats-help` for\n"
8145
"descriptions of any available experimental and deprecated formats.\n"
8146
msgstr ""
8147
8148
#: dummy/help_topics/formats/summary.txt:1
8149
msgid "Information on choosing a storage format"
8150
msgstr "Información para escoger un formato de almacenamiento"
8151
8152
#: dummy/help_topics/global-options/detail.txt:1
8153
msgid "Global Options"
8154
msgstr "Opciones globales"
8155
8156
#: dummy/help_topics/global-options/detail.txt:3
8157
msgid ""
8158
"These options may be used with any command, and may appear in front of any\n"
8159
"command. (e.g. ``bzr --profile help``)."
8160
msgstr ""
8161
8162
#: dummy/help_topics/global-options/detail.txt:6
8163
msgid ""
8164
"--version Print the version number. Must be supplied before the "
8165
"command.\n"
8166
"--no-aliases Do not process command aliases when running this command.\n"
8167
"--builtin Use the built-in version of a command, not the plugin "
8168
"version.\n"
8169
" This does not suppress other plugin effects.\n"
8170
"--no-plugins Do not process any plugins.\n"
8171
"--no-l10n Do not translate messages.\n"
8172
"--concurrency Number of processes that can be run concurrently (selftest)."
8173
msgstr ""
8174
8175
#: dummy/help_topics/global-options/detail.txt:14
8176
msgid ""
8177
"--profile Profile execution using the hotshot profiler.\n"
8178
"--lsprof Profile execution using the lsprof profiler.\n"
8179
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8180
" results to a specified file. If the filename ends with "
8181
"\".txt\",\n"
8182
" text format will be used. If the filename either starts "
8183
"with\n"
8184
" \"callgrind.out\" or end with \".callgrind\", the output will "
8185
"be\n"
8186
" formatted for use with KCacheGrind. Otherwise, the output\n"
8187
" will be a pickle.\n"
8188
"--coverage Generate line coverage report in the specified directory."
8189
msgstr ""
8190
8191
#: dummy/help_topics/global-options/detail.txt:24
8192
msgid ""
8193
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8194
"for\n"
8195
" the duration of the command. This can be used multiple times "
8196
"if\n"
8197
" several options need to be overridden."
8198
msgstr ""
8199
8200
#: dummy/help_topics/global-options/detail.txt:28
8201
msgid ""
8202
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8203
"information on profiling."
8204
msgstr ""
8205
"Visite http://doc.bazaar.canonical.com/developers/profiling.html para tener\n"
8206
"más información del perfilado."
8207
8208
#: dummy/help_topics/global-options/detail.txt:31
8209
msgid ""
8210
"A number of debug flags are also available to assist troubleshooting and\n"
8211
"development. See :doc:`debug-flags-help`.\n"
8212
msgstr ""
8213
8214
#: dummy/help_topics/global-options/summary.txt:1
8215
msgid "Options that control how Bazaar runs"
8216
msgstr "Opciones que controlan como se ejecuta Bazaar"
8217
8218
#: dummy/help_topics/hidden-commands/summary.txt:1
8219
msgid "All hidden commands"
8220
msgstr "Todas las órdenes ocultas"
8221
8222
#: dummy/help_topics/hooks/summary.txt:1
8223
msgid "Points at which custom processing can be added"
8224
msgstr ""
8225
8226
#: dummy/help_topics/launchpad/detail.txt:1
8227
msgid "Integration with Launchpad.net"
8228
msgstr "Integración con Launchpad.net"
8229
8230
#: dummy/help_topics/launchpad/detail.txt:3
8231
msgid ""
8232
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8233
"specification tracking."
8234
msgstr ""
8235
8236
#: dummy/help_topics/launchpad/detail.txt:6
8237
msgid ""
8238
"The bzr client (through the plugin called 'launchpad') has special\n"
8239
"features to communicate with Launchpad:"
8240
msgstr ""
8241
8242
#: dummy/help_topics/launchpad/detail.txt:9
8243
msgid ""
8244
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8245
"This\n"
8246
" is then used by the 'lp:' transport to download your branches using\n"
8247
" bzr+ssh://."
8248
msgstr ""
8249
8250
#: dummy/help_topics/launchpad/detail.txt:13
8251
msgid ""
8252
" * The 'lp:' transport uses Launchpad as a directory service: for "
8253
"example\n"
8254
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8255
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8256
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8257
msgstr ""
8258
8259
#: dummy/help_topics/launchpad/detail.txt:18
8260
msgid ""
8261
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8262
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8263
"lp:12345'\n"
8264
" will record a revision property that marks that revision as fixing\n"
8265
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8266
" automatically be linked to the bug report."
8267
msgstr ""
8268
8269
#: dummy/help_topics/launchpad/detail.txt:24
8270
msgid ""
8271
" * The register-branch command tells Launchpad about the url of a\n"
8272
" public branch. Launchpad will then mirror the branch, display\n"
8273
" its contents and allow it to be attached to bugs and other\n"
8274
" objects."
8275
msgstr ""
8276
8277
#: dummy/help_topics/launchpad/detail.txt:29
8278
msgid "For more information see http://help.launchpad.net/\n"
8279
msgstr ""
8280
8281
#: dummy/help_topics/launchpad/summary.txt:1
8282
msgid "Using Bazaar with Launchpad.net"
8283
msgstr "Usar Bazaar con Launchpad.net"
8284
8285
#: dummy/help_topics/location-alias/summary.txt:1
8286
msgid "Aliases for remembered locations"
8287
msgstr "Alias para recordar ubicaciones"
8288
8289
#: dummy/help_topics/log-formats/summary.txt:1
8290
msgid "Details on the logging formats available"
8291
msgstr "Detalles sobre los formatos de acceso disponibles"
8292
8293
#: dummy/help_topics/other-formats/summary.txt:1
8294
msgid "Experimental and deprecated storage formats"
8295
msgstr "Formatos de almacenamiento experimentales y obsoletos"
8296
8297
#: dummy/help_topics/patterns/summary.txt:1
8298
msgid "Information on the pattern syntax"
8299
msgstr "Información de la sintaxis de patrones"
8300
8301
#: dummy/help_topics/repositories/detail.txt:1
8302
msgid "Repositories"
8303
msgstr "Repositorios"
8304
8305
#: dummy/help_topics/repositories/detail.txt:3
8306
msgid ""
8307
"Repositories in Bazaar are where committed information is stored. There is\n"
8308
"a repository associated with every branch."
8309
msgstr ""
8310
8311
#: dummy/help_topics/repositories/detail.txt:6
8312
msgid ""
8313
"Repositories are a form of database. Bzr will usually maintain this for\n"
8314
"good performance automatically, but in some situations (e.g. when doing\n"
8315
"very many commits in a short time period) you may want to ask bzr to\n"
8316
"optimise the database indices. This can be done by the 'bzr pack' command."
8317
msgstr ""
8318
8319
#: dummy/help_topics/repositories/detail.txt:11
8320
msgid ""
8321
"By default just running 'bzr init' will create a repository within the new\n"
8322
"branch but it is possible to create a shared repository which allows "
8323
"multiple\n"
8324
"branches to share their information in the same location. When a new branch "
8325
"is\n"
8326
"created it will first look to see if there is a containing shared repository "
8327
"it\n"
8328
"can use."
8329
msgstr ""
8330
8331
#: dummy/help_topics/repositories/detail.txt:17
8332
msgid ""
8333
"When two branches of the same project share a repository, there is\n"
8334
"generally a large space saving. For some operations (e.g. branching\n"
8335
"within the repository) this translates in to a large time saving."
8336
msgstr ""
8337
8338
#: dummy/help_topics/repositories/detail.txt:21
8339
msgid ""
8340
"To create a shared repository use the init-repository command (or the alias\n"
8341
"init-repo). This command takes the location of the repository to create. "
8342
"This\n"
8343
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8344
"which contains a shared repository. Any new branches that are created in "
8345
"this\n"
8346
"directory will then use it for storage."
8347
msgstr ""
8348
8349
#: dummy/help_topics/repositories/detail.txt:27
8350
msgid ""
8351
"It is a good idea to create a repository whenever you might create more\n"
8352
"than one branch of a project. This is true for both working areas where you\n"
8353
"are doing the development, and any server areas that you use for hosting\n"
8354
"projects. In the latter case, it is common to want branches without working\n"
8355
"trees. Since the files in the branch will not be edited directly there is "
8356
"no\n"
8357
"need to use up disk space for a working tree. To create a repository in "
8358
"which\n"
8359
"the branches will not have working trees pass the '--no-trees' option to\n"
8360
"'init-repository'."
8361
msgstr ""
8362
8363
#: dummy/help_topics/repositories/detail.txt:38
8364
msgid ""
8365
" init-repository Create a shared repository. Use --no-trees to create "
8366
"one\n"
8367
" in which new branches won't get a working tree.\n"
8368
msgstr ""
8369
8370
#: dummy/help_topics/repositories/summary.txt:1
8371
msgid "Basic information on shared repositories."
8372
msgstr "Información básica de los repositorios compartidos."
8373
8374
#: dummy/help_topics/revisionspec/summary.txt:1
8375
msgid "Explain how to use --revision"
8376
msgstr "Explicar cómo se usa --revision"
8377
8378
#: dummy/help_topics/rules/summary.txt:1
8379
msgid "Information on defining rule-based preferences"
8380
msgstr ""
8381
8382
#: dummy/help_topics/standalone-trees/detail.txt:1
8383
msgid "Standalone Trees"
8384
msgstr "Áboles autónomos"
8385
8386
#: dummy/help_topics/standalone-trees/detail.txt:3
8387
msgid ""
8388
"A standalone tree is a working tree with an associated repository. It\n"
8389
"is an independently usable branch, with no dependencies on any other.\n"
8390
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8391
"an existing project under version control."
8392
msgstr ""
8393
8394
#: dummy/help_topics/standalone-trees/detail.txt:8
8395
msgid "Related Commands::"
8396
msgstr "Órdenes relacionadas::"
8397
8398
#: dummy/help_topics/standalone-trees/detail.txt:10
8399
msgid " init Make a directory into a versioned branch.\n"
8400
msgstr ""
8401
8402
#: dummy/help_topics/standalone-trees/summary.txt:1
8403
msgid "Information on what a standalone tree is"
8404
msgstr "Información sobre lo que es un árbol autónomo"
8405
8406
#: dummy/help_topics/standard-options/detail.txt:1
8407
msgid "Standard Options"
8408
msgstr "Opciones estándar"
8409
8410
#: dummy/help_topics/standard-options/detail.txt:3
8411
msgid "Standard options are legal for all commands."
8412
msgstr "Las opciones estándar son legales para todas las órdenes."
8413
8414
#: dummy/help_topics/standard-options/detail.txt:5
8415
msgid ""
8416
"--help, -h Show help message.\n"
8417
"--verbose, -v Display more information.\n"
8418
"--quiet, -q Only display errors and warnings."
8419
msgstr ""
8420
8421
#: dummy/help_topics/standard-options/detail.txt:9
8422
msgid "Unlike global options, standard options can be used in aliases.\n"
8423
msgstr ""
8424
8425
#: dummy/help_topics/standard-options/summary.txt:1
8426
msgid "Options that can be used with any command"
8427
msgstr "Opciones que se pueden usar con cualquier orden"
8428
8429
#: dummy/help_topics/status-flags/detail.txt:1
8430
msgid "Status Flags"
8431
msgstr "Marcas de estado"
8432
8433
#: dummy/help_topics/status-flags/detail.txt:3
8434
msgid ""
8435
"Status flags are used to summarise changes to the working tree in a concise\n"
8436
"manner. They are in the form::"
8437
msgstr ""
8438
8439
#: dummy/help_topics/status-flags/detail.txt:6
8440
msgid " xxx <filename>"
8441
msgstr " xxx <nombre de archivo>"
8442
8443
#: dummy/help_topics/status-flags/detail.txt:8
8444
msgid "where the columns' meanings are as follows."
8445
msgstr "donde los significados de las columnas son los siguientes"
8446
8447
#: dummy/help_topics/status-flags/detail.txt:10
8448
msgid "Column 1 - versioning/renames::"
8449
msgstr ""
8450
8451
#: dummy/help_topics/status-flags/detail.txt:12
8452
msgid ""
8453
" + File versioned\n"
8454
" - File unversioned\n"
8455
" R File renamed\n"
8456
" ? File unknown\n"
8457
" X File nonexistent (and unknown to bzr)\n"
8458
" C File has conflicts\n"
8459
" P Entry for a pending merge (not a file)"
8460
msgstr ""
8461
8462
#: dummy/help_topics/status-flags/detail.txt:20
8463
msgid "Column 2 - contents::"
8464
msgstr "Columna 2 - contenidos::"
8465
8466
#: dummy/help_topics/status-flags/detail.txt:22
8467
msgid ""
8468
" N File created\n"
8469
" D File deleted\n"
8470
" K File kind changed\n"
8471
" M File modified"
8472
msgstr ""
8473
8474
#: dummy/help_topics/status-flags/detail.txt:27
8475
msgid "Column 3 - execute::"
8476
msgstr ""
8477
8478
#: dummy/help_topics/status-flags/detail.txt:29
8479
msgid " * The execute bit was changed\n"
8480
msgstr ""
8481
8482
#: dummy/help_topics/status-flags/summary.txt:1
8483
msgid "Help on status flags"
8484
msgstr "Ayuda sobre marcas de estado"
8485
8486
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8487
msgid "Branches Out of Sync"
8488
msgstr "Ramas sin sincronización"
8489
8490
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8491
msgid ""
8492
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8493
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8494
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8495
"have the same last revision as the new reference branch for the lightweight\n"
8496
"checkout, data could be lost, so Bazaar refuses."
8497
msgstr ""
8498
8499
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8500
msgid "How you deal with this depends on *why* the branches are out of sync."
8501
msgstr ""
8502
8503
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8504
msgid ""
8505
"If you have a checkout and have done local commits, you can get back in "
8506
"sync\n"
8507
"by running \"bzr update\" (and possibly \"bzr commit\")."
8508
msgstr ""
8509
8510
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8511
msgid ""
8512
"If you have a branch and the remote branch is out-of-date, you can push\n"
8513
"the local changes using \"bzr push\". If the local branch is out of date, "
8514
"you\n"
8515
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8516
"commit\n"
8517
"and then push your changes. If you decide that some of the changes aren't\n"
8518
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8519
msgstr ""
8520
8521
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8522
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8523
msgstr ""
8524
8525
#: dummy/help_topics/topics/summary.txt:1
8526
msgid "Topics list"
8527
msgstr "Lista de temas"
8528
8529
#: dummy/help_topics/url-special-chars/summary.txt:1
8530
msgid "Special character handling in URLs"
8531
msgstr ""
8532
8533
#: dummy/help_topics/urlspec/summary.txt:1
8534
msgid "Supported transport protocols"
8535
msgstr "Protocolos de transporte permitidos"
8536
8537
#: dummy/help_topics/working-trees/detail.txt:1
8538
msgid "Working Trees"
8539
msgstr "Árboles de trabajo"
8540
8541
#: dummy/help_topics/working-trees/detail.txt:3
8542
msgid ""
8543
"A working tree is the contents of a branch placed on disk so that you can\n"
8544
"see the files and edit them. The working tree is where you make changes to "
8545
"a\n"
8546
"branch, and when you commit the current state of the working tree is the\n"
8547
"snapshot that is recorded in the commit."
8548
msgstr ""
8549
8550
#: dummy/help_topics/working-trees/detail.txt:8
8551
msgid ""
8552
"When you push a branch to a remote system, a working tree will not be\n"
8553
"created. If one is already present the files will not be updated. The\n"
8554
"branch information will be updated and the working tree will be marked\n"
8555
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8556
"may be uncommitted changes or the update may cause content conflicts that "
8557
"are\n"
8558
"difficult to deal with remotely."
8559
msgstr ""
8560
8561
#: dummy/help_topics/working-trees/detail.txt:15
8562
msgid ""
8563
"If you have a branch with no working tree you can use the 'checkout' "
8564
"command\n"
8565
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8566
"will\n"
8567
"create the working tree. If the branch is updated remotely, you can update "
8568
"the\n"
8569
"working tree by running 'bzr update' in that directory."
8570
msgstr ""
8571
8572
#: dummy/help_topics/working-trees/detail.txt:20
8573
msgid ""
8574
"If you have a branch with a working tree that you do not want the 'remove-"
8575
"tree'\n"
8576
"command will remove the tree if it is safe. This can be done to avoid the\n"
8577
"warning about the remote working tree not being updated when pushing to the\n"
8578
"branch. It can also be useful when working with a '--no-trees' repository\n"
8579
"(see 'bzr help repositories')."
8580
msgstr ""
8581
8582
#: dummy/help_topics/working-trees/detail.txt:26
8583
msgid ""
8584
"If you want to have a working tree on a remote machine that you push to you\n"
8585
"can either run 'bzr update' in the remote branch after each push, or use "
8586
"some\n"
8587
"other method to update the tree during the push. There is an 'rspush' "
8588
"plugin\n"
8589
"that will update the working tree using rsync as well as doing a push. "
8590
"There\n"
8591
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8592
"SSH\n"
8593
"after each push."
8594
msgstr ""
8595
8596
#: dummy/help_topics/working-trees/detail.txt:33
8597
msgid "Useful commands::"
8598
msgstr "Órdenes útiles::"
8599
8600
#: dummy/help_topics/working-trees/detail.txt:35
8601
msgid ""
8602
" checkout Create a working tree when a branch does not have one.\n"
8603
" remove-tree Removes the working tree from a branch when it is safe to do "
8604
"so.\n"
8605
" update When a working tree is out of sync with its associated "
8606
"branch\n"
8607
" this will update the tree to match the branch.\n"
8608
msgstr ""
8609
8610
#: dummy/help_topics/working-trees/summary.txt:1
8611
msgid "Information on working trees"
8612
msgstr "Información en árboles de trabajo"
8613
8614
#: en/help_topics/authentication.txt:1
8615
msgid ""
8616
"Authentication Settings\n"
8617
"======================="
8618
msgstr ""
8619
"Configuración de la autenticación\n"
8620
"==========================="
8621
8622
#: en/help_topics/authentication.txt:4
8623
msgid ""
8624
"\n"
8625
"Intent\n"
8626
"------"
8627
msgstr ""
8628
"\n"
8629
"Intento\n"
8630
"-----------"
8631
8632
#: en/help_topics/authentication.txt:8
8633
msgid ""
8634
"Many different authentication policies can be described in the\n"
8635
"``authentication.conf`` file but a particular user should need only a few\n"
8636
"definitions to cover his needs without having to specify a user and a "
8637
"password\n"
8638
"for every branch he uses."
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:13
8642
msgid ""
8643
"The definitions found in this file are used to find the credentials to use "
8644
"for\n"
8645
"a given url. The same credentials can generally be used for as many branches "
8646
"as\n"
8647
"possible by grouping their declaration around the remote servers that need\n"
8648
"them. It's even possible to declare credentials that will be used by "
8649
"different\n"
8650
"servers."
8651
msgstr ""
8652
8653
#: en/help_topics/authentication.txt:19
8654
msgid ""
8655
"The intent is to make this file as small as possible to minimize maintenance."
8656
msgstr ""
8657
"El intento es hacer este archivo tan pequeño como sea posible para minimizar "
8658
"el mantenimiento."
8659
8660
#: en/help_topics/authentication.txt:21
8661
msgid ""
8662
"Once the relevant credentials are declared in this file you may use branch "
8663
"urls\n"
8664
"without embedding passwords (security hazard) or even users (enabling "
8665
"sharing\n"
8666
"of your urls with others)."
8667
msgstr ""
8668
8669
#: en/help_topics/authentication.txt:25
8670
msgid "Instead of using::"
8671
msgstr "en vez de usar::"
8672
8673
#: en/help_topics/authentication.txt:27
8674
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8675
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8676
8677
#: en/help_topics/authentication.txt:29
8678
msgid "you simply use::"
8679
msgstr "simplemente use::"
8680
8681
#: en/help_topics/authentication.txt:31
8682
msgid " bzr branch ftp://host.com/path/to/my/branch"
8683
msgstr " bzr branch ftp://host.com/path/to/my/branch"
8684
8685
#: en/help_topics/authentication.txt:33
8686
msgid ""
8687
"provided you have created the following ``authentication.conf`` file::"
8688
msgstr ""
8689
8690
#: en/help_topics/authentication.txt:35
8691
msgid ""
8692
" [myprojects]\n"
8693
" scheme=ftp\n"
8694
" host=host.com\n"
8695
" user=joe\n"
8696
" password=secret\n"
8697
" "
8698
msgstr ""
8699
" [misproyectos]\n"
8700
" scheme=ftp\n"
8701
" host=host.com\n"
8702
" user=juan\n"
8703
" password=secreta\n"
8704
" "
8705
8706
#: en/help_topics/authentication.txt:42
8707
msgid ""
8708
"Authentication definitions\n"
8709
"--------------------------"
8710
msgstr ""
8711
"Definiciones de autenticación\n"
8712
"--------------------------"
8713
8714
#: en/help_topics/authentication.txt:45
8715
msgid ""
8716
"There are two kinds of authentication used by the various schemes supported "
8717
"by\n"
8718
"bzr:"
8719
msgstr ""
8720
8721
#: en/help_topics/authentication.txt:48
8722
msgid "1. user and password"
8723
msgstr "1. usuario y contraseña"
8724
8725
#: en/help_topics/authentication.txt:50
8726
msgid ""
8727
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8728
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8729
"ssh agents are a better, more secure solution. So we have chosen to not "
8730
"provide\n"
8731
"our own less secure method."
8732
msgstr ""
8733
8734
#: en/help_topics/authentication.txt:55
8735
msgid "2. user, realm and password"
8736
msgstr "2. usuario, reino y contraseña"
8737
8738
#: en/help_topics/authentication.txt:57
8739
msgid ""
8740
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8741
"against a host. But, by using ``.htaccess`` files, for example, it is "
8742
"possible\n"
8743
"to define several (``user, realm, password``) for a given ``host``. So what "
8744
"is\n"
8745
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8746
"is\n"
8747
"not taken into account in the definitions, but will displayed if bzr "
8748
"prompts\n"
8749
"you for a password."
8750
msgstr ""
8751
8752
#: en/help_topics/authentication.txt:64
8753
msgid ""
8754
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8755
"specifying the appropriate port."
8756
msgstr ""
8757
8758
#: en/help_topics/authentication.txt:67
8759
msgid ""
8760
"To take all schemes into account, the password will be deduced from a set "
8761
"of\n"
8762
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8763
"``user``,\n"
8764
"``password``)."
8765
msgstr ""
8766
8767
#: en/help_topics/authentication.txt:71
8768
msgid ""
8769
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8770
"used\n"
8771
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8772
"``ssh``\n"
8773
" should be used instead since this is the real scheme regarding\n"
8774
" authentication,"
8775
msgstr ""
8776
8777
#: en/help_topics/authentication.txt:76
8778
msgid " * ``host``: can be empty (to act as a default for any host),"
8779
msgstr ""
8780
8781
#: en/help_topics/authentication.txt:78
8782
msgid ""
8783
" * ``port`` can be empty (useful when an host provides several servers for "
8784
"the\n"
8785
" same scheme), only numerical values are allowed, this should be used "
8786
"only\n"
8787
" when the server uses a port different than the scheme standard port,"
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:82
8791
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8792
msgstr ""
8793
8794
#: en/help_topics/authentication.txt:84
8795
msgid ""
8796
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8797
" ``getpass.get_user()``),"
8798
msgstr ""
8799
8800
#: en/help_topics/authentication.txt:87
8801
msgid ""
8802
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8803
" password."
8804
msgstr ""
8805
8806
#: en/help_topics/authentication.txt:90
8807
msgid ""
8808
"Multiple definitions can be provided and, for a given URL, bzr will select "
8809
"a\n"
8810
"(``user`` [, ``password``]) based on the following rules :"
8811
msgstr ""
8812
8813
#: en/help_topics/authentication.txt:93
8814
msgid " 1. the first match wins,"
8815
msgstr " 1. la primera coincidencia gana,"
8816
8817
#: en/help_topics/authentication.txt:95
8818
msgid " 2. empty fields match everything,"
8819
msgstr " 2. los campos vacíos coinciden siempre,"
8820
8821
#: en/help_topics/authentication.txt:97
8822
msgid ""
8823
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8824
msgstr ""
8825
" 3. «scheme» coincide incluso si los decoradores se han usado en el URL "
8826
"solicitado,"
8827
8828
#: en/help_topics/authentication.txt:99
8829
msgid ""
8830
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8831
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8832
"``projectbzr.sf.net``\n"
8833
" will not match ``bzr.sf.net``)."
8834
msgstr ""
8835
8836
#: en/help_topics/authentication.txt:103
8837
msgid ""
8838
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8839
msgstr ""
8840
8841
#: en/help_topics/authentication.txt:105
8842
msgid ""
8843
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8844
"above,\n"
8845
" empty paths will match any provided path)."
8846
msgstr ""
8847
8848
#: en/help_topics/authentication.txt:110
8849
msgid ""
8850
"File format\n"
8851
"-----------"
8852
msgstr ""
8853
"Formato de archivo\n"
8854
"------------------"
8855
8856
#: en/help_topics/authentication.txt:113
8857
msgid ""
8858
"The general rules for :doc:`configuration files <configuration-help>`\n"
8859
"apply except for the variable policies."
8860
msgstr ""
8861
8862
#: en/help_topics/authentication.txt:116
8863
msgid "Each section describes an authentication definition."
8864
msgstr "Cada sección describe una definición de autenticación."
8865
8866
#: en/help_topics/authentication.txt:118
8867
msgid ""
8868
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8869
"reserved\n"
8870
"and should appear as the *last* section."
8871
msgstr ""
8872
8873
#: en/help_topics/authentication.txt:121
8874
msgid "Each section should define:"
8875
msgstr "Cada sección debe definir:"
8876
8877
#: en/help_topics/authentication.txt:123
8878
msgid "* ``user``: the login to be used,"
8879
msgstr "* «user»: el acceso a usar,"
8880
8881
#: en/help_topics/authentication.txt:125
8882
msgid "Each section could define:"
8883
msgstr "Cada sección puede definir:"
8884
8885
#: en/help_topics/authentication.txt:127
8886
msgid "* ``host``: the remote server,"
8887
msgstr "* «host»: el servidor remoto,"
8888
8889
#: en/help_topics/authentication.txt:129
8890
msgid "* ``port``: the port the server is listening,"
8891
msgstr "* «port»: el puerto en el que escucha el servidor,"
8892
8893
#: en/help_topics/authentication.txt:131
8894
msgid "* ``path``: the branch location,"
8895
msgstr "* «path»: la ubicación de la rama,"
8896
8897
#: en/help_topics/authentication.txt:133
8898
msgid "* ``password``: the password."
8899
msgstr "* «password»: la contraseña."
8900
8901
#: en/help_topics/authentication.txt:135
8902
msgid ""
8903
"\n"
8904
"Examples\n"
8905
"--------"
8906
msgstr ""
8907
"\n"
8908
"Ejemplos\n"
8909
"--------"
8910
8911
#: en/help_topics/authentication.txt:139
8912
msgid ""
8913
"\n"
8914
"Personal projects hosted outside\n"
8915
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8916
msgstr ""
8917
8918
#: en/help_topics/authentication.txt:143
8919
msgid ""
8920
"All connections are done with the same ``user`` (the remote one for which "
8921
"the\n"
8922
"default bzr one is not appropriate) and the password is always prompted "
8923
"with\n"
8924
"some exceptions::"
8925
msgstr ""
8926
8927
#: en/help_topics/authentication.txt:147
8928
msgid ""
8929
" # Pet projects on hobby.net\n"
8930
" [hobby]\n"
8931
" host=r.hobby.net\n"
8932
" user=jim\n"
8933
" password=obvious1234\n"
8934
" \n"
8935
" # Home server\n"
8936
" [home]\n"
8937
" scheme=https\n"
8938
" host=home.net\n"
8939
" user=joe\n"
8940
" password=1essobV10us\n"
8941
" \n"
8942
" [DEFAULT]\n"
8943
" # Our local user is barbaz, on all remote sites we're known as "
8944
"foobar\n"
8945
" user=foobar"
8946
msgstr ""
8947
" # Proyecto de mascotas para hobby.net\n"
8948
" [hobby]\n"
8949
" host=r.hobby.net\n"
8950
" user=jaime\n"
8951
" password=obvia1234\n"
8952
" \n"
8953
" # Home server\n"
8954
" [home]\n"
8955
" scheme=https\n"
8956
" host=home.net\n"
8957
" user=juan\n"
8958
" password=1essobV10us\n"
8959
" \n"
8960
" [DEFAULT]\n"
8961
" # Nuestro usuario local es barbaz, en todos los sitios remotos se "
8962
"conoce como foobar\n"
8963
" user=foobar"
8964
8965
#: en/help_topics/authentication.txt:164
8966
msgid ""
8967
"\n"
8968
"Source hosting provider\n"
8969
"~~~~~~~~~~~~~~~~~~~~~~~"
8970
msgstr ""
8971
"\n"
8972
"Proveedor del albergue de origen\n"
8973
"~~~~~~~~~~~~~~~~~~~~~~~~~~"
8974
8975
#: en/help_topics/authentication.txt:168
8976
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8977
msgstr ""
8978
"En el dominio shp.net (ficticio) cada proyecto tiene su propio sitio::"
8979
8980
#: en/help_topics/authentication.txt:170
8981
msgid ""
8982
" [shpnet domain]\n"
8983
" # we use sftp, but ssh is the scheme used for authentication\n"
8984
" scheme=ssh\n"
8985
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8986
" host=.shp.net\n"
8987
" user=joe\n"
8988
" # bzr don't support supplying a password for sftp,\n"
8989
" # consider using an ssh agent if you don't want to supply\n"
8990
" # a password interactively. (pageant, ssh-agent, etc)"
8991
msgstr ""
8992
8993
#: en/help_topics/authentication.txt:180
8994
msgid ""
8995
"HTTPS, SFTP servers and their proxy\n"
8996
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8997
msgstr ""
8998
"HTTPS, servidores SFTP y su proxy\n"
8999
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9000
9001
#: en/help_topics/authentication.txt:183
9002
msgid ""
9003
"At company.com, the server hosting release and integration branches is "
9004
"behind a\n"
9005
"proxy, and the two branches use different authentication policies::"
9006
msgstr ""
9007
9008
#: en/help_topics/authentication.txt:186
9009
msgid ""
9010
" [reference code]\n"
9011
" scheme=https\n"
9012
" host=dev.company.com\n"
9013
" path=/dev\n"
9014
" user=user1\n"
9015
" password=pass1"
9016
msgstr ""
9017
" [reference code]\n"
9018
" scheme=https\n"
9019
" host=dev.company.com\n"
9020
" path=/dev\n"
9021
" user=user1\n"
9022
" password=pass1"
9023
9024
#: en/help_topics/authentication.txt:193
9025
msgid ""
9026
" # development branches on dev server\n"
9027
" [dev]\n"
9028
" scheme=ssh # bzr+ssh and sftp are available here\n"
9029
" host=dev.company.com\n"
9030
" path=/dev/integration\n"
9031
" user=user2\n"
9032
" \n"
9033
" # proxy\n"
9034
" [proxy]\n"
9035
" scheme=http\n"
9036
" host=proxy.company.com\n"
9037
" port=3128\n"
9038
" user=proxyuser1\n"
9039
" password=proxypass1"
9040
msgstr ""
9041
9042
#: en/help_topics/authentication.txt:208
9043
msgid ""
9044
"\n"
9045
"Planned enhancements\n"
9046
"--------------------"
9047
msgstr ""
9048
"\n"
9049
"Mejoras planificadas\n"
9050
"--------------------"
9051
9052
#: en/help_topics/authentication.txt:212
9053
msgid ""
9054
"The following are not yet implemented but planned as parts of a work in\n"
9055
"progress:"
9056
msgstr ""
9057
9058
#: en/help_topics/authentication.txt:215
9059
msgid "* add a ``password_encoding`` field allowing:"
9060
msgstr ""
9061
9062
#: en/help_topics/authentication.txt:217
9063
msgid ""
9064
" - storing the passwords in various obfuscating encodings (base64 for one),"
9065
msgstr ""
9066
9067
#: en/help_topics/authentication.txt:219
9068
msgid " - delegate password storage to plugins (.netrc for example)."
9069
msgstr ""
9070
9071
#: en/help_topics/authentication.txt:221
9072
msgid ""
9073
"* update the credentials when the user is prompted for user or password,"
9074
msgstr ""
9075
9076
#: en/help_topics/authentication.txt:223
9077
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9078
msgstr "* añadri un campo «verify_certificates» para «HTTPS»."
9079
9080
#: en/help_topics/authentication.txt:225
9081
msgid ""
9082
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9083
"but\n"
9084
"ignored in the actual implementation.\n"
9085
msgstr ""
9086
9087
#: en/help_topics/bugs.txt:1
9088
msgid "Bug Tracker Settings"
9089
msgstr "Configuración del seguimiento de errores"
9090
9091
#: en/help_topics/bugs.txt:3
9092
msgid ""
9093
"When making a commit, metadata about bugs fixed by that change can be\n"
9094
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9095
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9096
"(The only ``status`` value currently supported is ``fixed.``)"
9097
msgstr ""
9098
9099
#: en/help_topics/bugs.txt:8
9100
msgid ""
9101
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9102
"identifier\n"
9103
"rather than a full URL. This looks like::"
9104
msgstr ""
9105
9106
#: en/help_topics/bugs.txt:11
9107
msgid " bzr commit --fixes <tracker>:<id>"
9108
msgstr " bzr commit --fixes <tracker>:<id>"
9109
9110
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9111
msgid "or::"
9112
msgstr "o::"
9113
9114
#: en/help_topics/bugs.txt:15
9115
msgid " bzr commit --fixes <id>"
9116
msgstr " bzr commit --fixes <id>"
9117
9118
#: en/help_topics/bugs.txt:17
9119
msgid ""
9120
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9121
"the\n"
9122
"identifier for that bug within the bugtracker, usually the bug number.\n"
9123
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9124
"or global configuration is used."
9125
msgstr ""
9126
9127
#: en/help_topics/bugs.txt:22
9128
msgid ""
9129
"Bazaar knows about a few bug trackers that have many users. If\n"
9130
"you use one of these bug trackers then there is no setup required to\n"
9131
"use this feature, you just need to know the tracker identifier to use.\n"
9132
"These are the bugtrackers that are built in:"
9133
msgstr ""
9134
9135
#: en/help_topics/bugs.txt:27
9136
msgid ""
9137
" ============================ ============ ============\n"
9138
" URL Abbreviation Example\n"
9139
" ============================ ============ ============\n"
9140
" https://bugs.launchpad.net/ lp lp:12345\n"
9141
" http://bugs.debian.org/ deb deb:12345\n"
9142
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9143
" ============================ ============ ============"
9144
msgstr ""
9145
" ============================ ============ ============\n"
9146
" URL Ejemplo de abreviatura\n"
9147
" ============================ ============ ============\n"
9148
" https://bugs.launchpad.net/ lp lp:12345\n"
9149
" http://bugs.debian.org/ deb deb:12345\n"
9150
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9151
" ============================ ============ ============"
9152
9153
#: en/help_topics/bugs.txt:35
9154
msgid ""
9155
"For the bug trackers not listed above configuration is required.\n"
9156
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9157
"is built in, along with a template mechanism for other bugtrackers with\n"
9158
"simple URL schemes. If your bug tracker can't be described by one\n"
9159
"of the schemes described below then you can write a plugin to support\n"
9160
"it."
9161
msgstr ""
9162
9163
#: en/help_topics/bugs.txt:42
9164
msgid ""
9165
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9166
"variable which contains the base URL of the bug tracker. These options\n"
9167
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9168
"configuration section in ``locations.conf``. You can set up these values\n"
9169
"for each of the projects you work on."
9170
msgstr ""
9171
9172
#: en/help_topics/bugs.txt:48
9173
msgid ""
9174
"Note: As you provide a short name for each tracker, you can specify one or\n"
9175
"more bugs in one or more trackers at commit time if you wish."
9176
msgstr ""
9177
9178
#: en/help_topics/bugs.txt:51
9179
msgid ""
9180
"Launchpad\n"
9181
"---------"
9182
msgstr ""
9183
"Launchpad\n"
9184
"---------"
9185
9186
#: en/help_topics/bugs.txt:54
9187
msgid ""
9188
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9189
msgstr ""
9190
"Use «bzr commit --fixes lp:2»» para grabar que esta ejecución arregla el "
9191
"error 2."
9192
9193
#: en/help_topics/bugs.txt:56
9194
msgid ""
9195
"bugzilla_<tracker>_url\n"
9196
"----------------------"
9197
msgstr ""
9198
"bugzilla_<tracker>_url\n"
9199
"----------------------"
9200
9201
#: en/help_topics/bugs.txt:59
9202
msgid ""
9203
"If present, the location of the Bugzilla bug tracker referred to by\n"
9204
"<tracker>. This option can then be used together with ``bzr commit\n"
9205
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9206
"example::"
9207
msgstr ""
9208
9209
#: en/help_topics/bugs.txt:64
9210
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9211
msgstr " bugzilla_squid_url = http://bugs.squid-cache.org"
9212
9213
#: en/help_topics/bugs.txt:66
9214
msgid ""
9215
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9216
"fixed."
9217
msgstr ""
9218
9219
#: en/help_topics/bugs.txt:69
9220
msgid ""
9221
"trac_<tracker>_url\n"
9222
"------------------"
9223
msgstr ""
9224
"trac_<tracker>_url\n"
9225
"------------------"
9226
9227
#: en/help_topics/bugs.txt:72
9228
msgid ""
9229
"If present, the location of the Trac instance referred to by\n"
9230
"<tracker>. This option can then be used together with ``bzr commit\n"
9231
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9232
"example::"
9233
msgstr ""
9234
9235
#: en/help_topics/bugs.txt:77
9236
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9237
msgstr " trac_twisted_url = http://www.twistedmatrix.com/trac"
9238
9239
#: en/help_topics/bugs.txt:79
9240
msgid ""
9241
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9242
"as\n"
9243
"fixed."
9244
msgstr ""
9245
9246
#: en/help_topics/bugs.txt:82
9247
msgid ""
9248
"bugtracker_<tracker>_url\n"
9249
"------------------------"
9250
msgstr ""
9251
"bugtracker_<tracker>_url\n"
9252
"------------------------"
9253
9254
#: en/help_topics/bugs.txt:85
9255
msgid ""
9256
"If present, the location of a generic bug tracker instance referred to by\n"
9257
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9258
"which will be replaced by a specific bug ID. This option can then be used\n"
9259
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9260
"fixed by that commit. For example::"
9261
msgstr ""
9262
9263
#: en/help_topics/bugs.txt:91
9264
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9265
msgstr " bugtracker_python_url = http://bugs.python.org/issue{id}"
9266
9267
#: en/help_topics/bugs.txt:93
9268
msgid ""
9269
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9270
"Roundup bug tracker as fixed, or::"
9271
msgstr ""
9272
9273
#: en/help_topics/bugs.txt:96
9274
msgid ""
9275
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9276
msgstr ""
9277
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9278
9279
#: en/help_topics/bugs.txt:98
9280
msgid ""
9281
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9282
"RT bug tracker as fixed, or::"
9283
msgstr ""
9284
9285
#: en/help_topics/bugs.txt:101
9286
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9287
msgstr " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9288
9289
#: en/help_topics/bugs.txt:103
9290
msgid ""
9291
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9292
"1234\n"
9293
"in Hudson's JIRA bug tracker as fixed.\n"
9294
msgstr ""
9295
9296
#: en/help_topics/commands.txt:1
9297
msgid ""
9298
"add Add specified files or directories.\n"
9299
"alias Set/unset and display aliases.\n"
9300
"annotate Show the origin of each line in a file.\n"
9301
"bash-completion Generate a shell function for bash command line "
9302
"completion.\n"
9303
" [bash_completion]\n"
9304
"bind Convert the current branch into a checkout of the "
9305
"supplied\n"
9306
" branch.\n"
9307
"branch Create a new branch that is a copy of an existing branch.\n"
9308
"branches List the branches available at the current location.\n"
9309
"break-lock Break a dead lock.\n"
9310
"cat Write the contents of a file as of a given revision to\n"
9311
" standard output.\n"
9312
"check Validate working tree structure, branch consistency and\n"
9313
" repository history.\n"
9314
"checkout Create a new checkout of an existing branch.\n"
9315
"clean-tree Remove unwanted files from working tree.\n"
9316
"commit Commit changes into a new revision.\n"
9317
"config Display, set or remove a configuration option.\n"
9318
"conflicts List files with conflicts.\n"
9319
"deleted List files deleted in the working tree.\n"
9320
"diff Show differences in the working tree, between revisions "
9321
"or\n"
9322
" branches.\n"
9323
"dpush Push into a different VCS without any custom bzr "
9324
"metadata.\n"
9325
"export Export current or past revision to a destination directory "
9326
"or\n"
9327
" archive.\n"
9328
"help Show help on a command or other topic.\n"
9329
"ignore Ignore specified files or patterns.\n"
9330
"ignored List ignored files and the patterns that matched them.\n"
9331
"info Show information about a working tree, branch or "
9332
"repository.\n"
9333
"init Make a directory into a versioned branch.\n"
9334
"init-repository Create a shared repository for branches to share storage\n"
9335
" space.\n"
9336
"join Combine a tree into its containing tree.\n"
9337
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9338
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9339
"launchpad-open Open a Launchpad branch page in your web browser. "
9340
"[launchpad]\n"
9341
"log Show historical log for a branch or subset of a branch.\n"
9342
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9343
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9344
"ls List files in a tree.\n"
9345
"merge Perform a three-way merge.\n"
9346
"missing Show unmerged/unpulled revisions between two branches.\n"
9347
"mkdir Create a new versioned directory.\n"
9348
"mv Move or rename a file.\n"
9349
"nick Print or set the branch nickname.\n"
9350
"pack Compress the data within a repository.\n"
9351
"plugins List the installed plugins.\n"
9352
"pull Turn this branch into a mirror of another branch.\n"
9353
"push Update a mirror of this branch.\n"
9354
"reconcile Reconcile bzr metadata in a branch.\n"
9355
"reconfigure Reconfigure the type of a bzr directory.\n"
9356
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9357
"remerge Redo a merge.\n"
9358
"remove Remove files or directories.\n"
9359
"remove-branch Remove a branch.\n"
9360
"remove-tree Remove the working tree from a given branch/checkout.\n"
9361
"renames Show list of renamed files.\n"
9362
"resolve Mark a conflict as resolved.\n"
9363
"revert Revert files to a previous revision.\n"
9364
"revno Show current revision number.\n"
9365
"root Show the tree root directory.\n"
9366
"send Mail or create a merge-directive for submitting changes.\n"
9367
"serve Run the bzr server.\n"
9368
"shelve Temporarily set aside some changes from the current tree.\n"
9369
"sign-my-commits Sign all commits by a given committer.\n"
9370
"split Split a subdirectory of a tree into a separate tree.\n"
9371
"status Display status summary.\n"
9372
"switch Set the branch of a checkout and update.\n"
9373
"tag Create, remove or modify a tag naming a revision.\n"
9374
"tags List tags.\n"
9375
"testament Show testament (signing-form) of a revision.\n"
9376
"unbind Convert the current checkout into a regular branch.\n"
9377
"uncommit Remove the last committed revision.\n"
9378
"unshelve Restore shelved changes.\n"
9379
"update Update a working tree to a new revision.\n"
9380
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9381
" format.\n"
9382
"verify-signatures Verify all commit signatures.\n"
9383
"version Show version of bzr.\n"
9384
"version-info Show version information about this tree.\n"
9385
"view Manage filtered views.\n"
9386
"whoami Show or set bzr user id.\n"
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:1
9390
msgid ""
9391
"Configuration Settings\n"
9392
"======================="
9393
msgstr ""
9394
"Configuración\n"
9395
"============="
9396
9397
#: en/help_topics/configuration.txt:4
9398
msgid ""
9399
"Environment settings\n"
9400
"---------------------"
9401
msgstr ""
9402
"Configuración de entrono\n"
9403
"---------------------"
9404
9405
#: en/help_topics/configuration.txt:7
9406
msgid ""
9407
"While most configuration is handled by configuration files, some options\n"
9408
"which may be semi-permanent can also be controlled through the environment."
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:10
9412
msgid ""
9413
"BZR_EMAIL\n"
9414
"~~~~~~~~~"
9415
msgstr ""
9416
"BZR_EMAIL\n"
9417
"~~~~~~~~~"
9418
9419
#: en/help_topics/configuration.txt:13
9420
msgid "Override the email id used by Bazaar. Typical format::"
9421
msgstr ""
9422
9423
#: en/help_topics/configuration.txt:15
9424
msgid " \"John Doe <jdoe@example.com>\""
9425
msgstr " \"Juan Dado <jdado@ejemplo.com>\""
9426
9427
#: en/help_topics/configuration.txt:17
9428
msgid "See also the ``email`` configuration option."
9429
msgstr "Vea también las opciones de configuración de «email»"
9430
9431
#: en/help_topics/configuration.txt:19
9432
msgid ""
9433
"BZR_PROGRESS_BAR\n"
9434
"~~~~~~~~~~~~~~~~"
9435
msgstr ""
9436
"BZR_PROGRESS_BAR\n"
9437
"~~~~~~~~~~~~~~~~"
9438
9439
#: en/help_topics/configuration.txt:22
9440
msgid ""
9441
"Override the progress display. Possible values are \"none\" or \"text\". "
9442
"If\n"
9443
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9444
"draws\n"
9445
"the ordinary command line progress bar."
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:26
9449
msgid ""
9450
"BZR_SIGQUIT_PDB\n"
9451
"~~~~~~~~~~~~~~~"
9452
msgstr ""
9453
"BZR_SIGQUIT_PDB\n"
9454
"~~~~~~~~~~~~~~~"
9455
9456
#: en/help_topics/configuration.txt:29
9457
msgid ""
9458
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9459
msgstr ""
9460
9461
#: en/help_topics/configuration.txt:31
9462
msgid ""
9463
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9464
"* 1 = Invoke breakin debugger (default)"
9465
msgstr ""
9466
9467
#: en/help_topics/configuration.txt:34
9468
msgid ""
9469
"BZR_HOME\n"
9470
"~~~~~~~~"
9471
msgstr ""
9472
"BZR_HOME\n"
9473
"~~~~~~~~"
9474
9475
#: en/help_topics/configuration.txt:37
9476
msgid "Override the home directory used by Bazaar."
9477
msgstr "Sobrescribe el directorio de inicio usado por Bazaar."
9478
9479
#: en/help_topics/configuration.txt:39
9480
msgid ""
9481
"BZR_SSH\n"
9482
"~~~~~~~"
9483
msgstr ""
9484
"BZR_SSH\n"
9485
"~~~~~~~"
9486
9487
#: en/help_topics/configuration.txt:42
9488
msgid "Select a different SSH implementation."
9489
msgstr "Seleccione una implementación SSH diferente."
9490
9491
#: en/help_topics/configuration.txt:44
9492
msgid ""
9493
"BZR_PDB\n"
9494
"~~~~~~~"
9495
msgstr ""
9496
"BZR_PDB\n"
9497
"~~~~~~~"
9498
9499
#: en/help_topics/configuration.txt:47
9500
msgid "Control whether to launch a debugger on error."
9501
msgstr "Controla si lanzar un depurador para el error."
9502
9503
#: en/help_topics/configuration.txt:49
9504
msgid ""
9505
"* 0 = Standard behavior\n"
9506
"* 1 = Launch debugger"
9507
msgstr ""
9508
"* 0 = Comportamiento estándar\n"
9509
"* 1 = Lanzar depurador"
9510
9511
#: en/help_topics/configuration.txt:52
9512
msgid ""
9513
"BZR_REMOTE_PATH\n"
9514
"~~~~~~~~~~~~~~~"
9515
msgstr ""
9516
"BZR_REMOTE_PATH\n"
9517
"~~~~~~~~~~~~~~~"
9518
9519
#: en/help_topics/configuration.txt:55
9520
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9521
msgstr ""
9522
9523
#: en/help_topics/configuration.txt:57
9524
msgid "See also the ``bzr_remote_path`` configuration option."
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:59
9528
msgid ""
9529
"BZR_EDITOR\n"
9530
"~~~~~~~~~~"
9531
msgstr ""
9532
"BZR_EDITOR\n"
9533
"~~~~~~~~~~"
9534
9535
#: en/help_topics/configuration.txt:62
9536
msgid "Path to the editor Bazaar should use for commit messages, etc."
9537
msgstr ""
9538
9539
#: en/help_topics/configuration.txt:64
9540
msgid ""
9541
"BZR_LOG\n"
9542
"~~~~~~~"
9543
msgstr ""
9544
"BZR_LOG\n"
9545
"~~~~~~~"
9546
9547
#: en/help_topics/configuration.txt:67
9548
msgid ""
9549
"Location of the Bazaar log file. You can check the current location by\n"
9550
"running ``bzr version``."
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:70
9554
msgid ""
9555
"The log file contains debug information that is useful for diagnosing or\n"
9556
"reporting problems with Bazaar."
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:73
9560
msgid ""
9561
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9562
"will disable logging."
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:76
9566
msgid ""
9567
"\n"
9568
"BZR_PLUGIN_PATH\n"
9569
"~~~~~~~~~~~~~~~"
9570
msgstr ""
9571
"\n"
9572
"BZR_PLUGIN_PATH\n"
9573
"~~~~~~~~~~~~~~~"
9574
9575
#: en/help_topics/configuration.txt:80
9576
msgid ""
9577
"The path to the plugins directory that Bazaar should use.\n"
9578
"If not set, Bazaar will search for plugins in:"
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:83
9582
msgid ""
9583
"* the user specific plugin directory (containing the ``user`` plugins),"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:85
9587
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9588
msgstr "* el directorio bzrlib (contiene los complementos «core»),"
9589
9590
#: en/help_topics/configuration.txt:87
9591
msgid ""
9592
"* the site specific plugin directory if applicable (containing\n"
9593
" the ``site`` plugins)."
9594
msgstr ""
9595
9596
#: en/help_topics/configuration.txt:90
9597
msgid ""
9598
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9599
"the way the plugin are searched. "
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:93
9603
msgid ""
9604
"As for the ``PATH`` variables, if multiple directories are\n"
9605
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9606
"platform specific appropriate character (':' on Unix,\n"
9607
"';' on windows)"
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:98
9611
msgid ""
9612
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9613
"in ``user``. However it will continue to search in ``core`` and\n"
9614
"``site`` unless they are explicitly removed."
9615
msgstr ""
9616
9617
#: en/help_topics/configuration.txt:102
9618
msgid ""
9619
"If you need to change the order or remove one of these\n"
9620
"directories, you should use special values:"
9621
msgstr ""
9622
9623
#: en/help_topics/configuration.txt:105
9624
msgid ""
9625
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9626
" path from the default values,"
9627
msgstr ""
9628
"* «-user», «-core», «-site» eliminarán las correspondientes\n"
9629
" rutas de los valores predeterminados,"
9630
9631
#: en/help_topics/configuration.txt:108
9632
msgid ""
9633
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9634
" before the remaining default values (and also remove it from\n"
9635
" the default values)."
9636
msgstr ""
9637
9638
#: en/help_topics/configuration.txt:112
9639
msgid ""
9640
"Note that the special values 'user', 'core' and 'site' should be\n"
9641
"used literally, they will be substituted by the corresponding,\n"
9642
"platform specific, values."
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:116
9646
msgid ""
9647
"The examples below use ':' as the separator, windows users\n"
9648
"should use ';'."
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:119
9652
msgid "Overriding the default user plugin directory::"
9653
msgstr ""
9654
"Sobrescribiendo el directorio de complemento de usuario predeterminado::"
9655
9656
#: en/help_topics/configuration.txt:121
9657
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9658
msgstr " BZR_PLUGIN_PATH='/ruta/a/mis/otros/complementos'"
9659
9660
#: en/help_topics/configuration.txt:123
9661
msgid "Disabling the site directory while retaining the user directory::"
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:125
9665
msgid " BZR_PLUGIN_PATH='-site:+user'"
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:127
9669
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:129
9673
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9674
msgstr " BZR_PLUGIN_PATH='-user:-core:-site'"
9675
9676
#: en/help_topics/configuration.txt:131
9677
msgid "Overriding the default site plugin directory::"
9678
msgstr "Sobrescribe el directorio de complemento de sitio predeterminado::"
9679
9680
#: en/help_topics/configuration.txt:133
9681
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9682
msgstr " BZR_PLUGIN_PATH='/ruta/a/mi/sitiode/complementos:-sitio':+usuario"
9683
9684
#: en/help_topics/configuration.txt:135
9685
msgid ""
9686
"BZR_DISABLE_PLUGINS\n"
9687
"~~~~~~~~~~~~~~~~~~~"
9688
msgstr ""
9689
"BZR_DISABLE_PLUGINS\n"
9690
"~~~~~~~~~~~~~~~~~~~"
9691
9692
#: en/help_topics/configuration.txt:138
9693
msgid ""
9694
"Under special circumstances (mostly when trying to diagnose a\n"
9695
"bug), it's better to disable a plugin (or several) rather than\n"
9696
"uninstalling them completely. Such plugins can be specified in\n"
9697
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9698
msgstr ""
9699
9700
#: en/help_topics/configuration.txt:143
9701
msgid ""
9702
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9703
"will raise an import error if they are explicitly imported (by\n"
9704
"another plugin that depends on them for example)."
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:147
9708
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9709
msgstr "Desactivar «myplugin» y «yourplugin» se consigue::"
9710
9711
#: en/help_topics/configuration.txt:149
9712
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9713
msgstr " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9714
9715
#: en/help_topics/configuration.txt:151
9716
msgid ""
9717
"BZR_PLUGINS_AT\n"
9718
"~~~~~~~~~~~~~~"
9719
msgstr ""
9720
"BZR_PLUGINS_AT\n"
9721
"~~~~~~~~~~~~~~"
9722
9723
#: en/help_topics/configuration.txt:154
9724
msgid ""
9725
"When adding a new feature or working on a bug in a plugin,\n"
9726
"developers often need to use a specific version of a given\n"
9727
"plugin. Since python requires that the directory containing the\n"
9728
"code is named like the plugin itself this make it impossible to\n"
9729
"use arbitrary directory names (using a two-level directory scheme\n"
9730
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9731
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9732
msgstr ""
9733
9734
#: en/help_topics/configuration.txt:162
9735
msgid ""
9736
"Plugins specified in this environment variable takes precedence\n"
9737
"over the ones in ``BZR_PLUGIN_PATH``."
9738
msgstr ""
9739
9740
#: en/help_topics/configuration.txt:165
9741
msgid ""
9742
"The variable specified a list of ``plugin_name@plugin path``,\n"
9743
"``plugin_name`` being the name of the plugin as it appears in\n"
9744
"python module paths, ``plugin_path`` being the path to the\n"
9745
"directory containing the plugin code itself\n"
9746
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9747
"separator, use ';' on windows."
9748
msgstr ""
9749
9750
#: en/help_topics/configuration.txt:172
9751
msgid ""
9752
"Example:\n"
9753
"~~~~~~~~"
9754
msgstr ""
9755
"Ejemplo:\n"
9756
"~~~~~~~~"
9757
9758
#: en/help_topics/configuration.txt:175
9759
msgid ""
9760
"Using a specific version of ``myplugin``:\n"
9761
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:178
9765
msgid ""
9766
"BZRPATH\n"
9767
"~~~~~~~"
9768
msgstr ""
9769
"BZRPATH\n"
9770
"~~~~~~~"
9771
9772
#: en/help_topics/configuration.txt:181
9773
msgid "The path where Bazaar should look for shell plugin external commands."
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:183
9777
msgid ""
9778
"\n"
9779
"http_proxy, https_proxy\n"
9780
"~~~~~~~~~~~~~~~~~~~~~~~"
9781
msgstr ""
9782
"\n"
9783
"http_proxy, https_proxy\n"
9784
"~~~~~~~~~~~~~~~~~~~~~~~"
9785
9786
#: en/help_topics/configuration.txt:187
9787
msgid "Specifies the network proxy for outgoing connections, for example::"
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:189
9791
msgid ""
9792
" http_proxy=http://proxy.example.com:3128/ \n"
9793
" https_proxy=http://proxy.example.com:3128/"
9794
msgstr ""
9795
" http_proxy=http://proxy.ejemplo.com:3128/ \n"
9796
" https_proxy=http://proxy.ejemplo.com:3128/"
9797
9798
#: en/help_topics/configuration.txt:192
9799
msgid ""
9800
"\n"
9801
"Configuration files\n"
9802
"-------------------"
9803
msgstr ""
9804
"\n"
9805
"Archivos de configuración\n"
9806
"-------------------------"
9807
9808
#: en/help_topics/configuration.txt:196
9809
msgid ""
9810
"Location\n"
9811
"~~~~~~~~"
9812
msgstr ""
9813
"Ubicación\n"
9814
"~~~~~~~~"
9815
9816
#: en/help_topics/configuration.txt:199
9817
msgid ""
9818
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9819
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9820
"on\n"
9821
"Windows. (You can check the location for your system by using\n"
9822
"``bzr version``.)"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:204
9826
msgid "There are three primary configuration files in this location:"
9827
msgstr "Hay tres archivos de configuración primarios en esta ubicación:"
9828
9829
#: en/help_topics/configuration.txt:206
9830
msgid "* ``bazaar.conf`` describes default configuration options,"
9831
msgstr ""
9832
"* «bazaar.conf» describe las opciones de configuración predeterminadas,"
9833
9834
#: en/help_topics/configuration.txt:208
9835
msgid ""
9836
"* ``locations.conf`` describes configuration information for\n"
9837
" specific branch locations,"
9838
msgstr ""
9839
"* «locations.conf» describe información de configuración para\n"
9840
" ubicaciones de rama específicas,"
9841
9842
#: en/help_topics/configuration.txt:211
9843
msgid ""
9844
"* ``authentication.conf`` describes credential information for\n"
9845
" remote servers."
9846
msgstr ""
9847
"* «authentication.conf» describe información de credencial para\n"
9848
" servidores remotos."
9849
9850
#: en/help_topics/configuration.txt:214
9851
msgid ""
9852
"Each branch can also contain a configuration file that sets values specific\n"
9853
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9854
"the\n"
9855
"branch. This file is visible to all users of a branch, if you wish to "
9856
"override\n"
9857
"one of the values for a branch with a setting that is specific to you then "
9858
"you\n"
9859
"can do so in ``locations.conf``."
9860
msgstr ""
9861
9862
#: en/help_topics/configuration.txt:220
9863
msgid ""
9864
"General format\n"
9865
"~~~~~~~~~~~~~~"
9866
msgstr ""
9867
"Formato general\n"
9868
"~~~~~~~~~~~~~~~"
9869
9870
#: en/help_topics/configuration.txt:223
9871
msgid ""
9872
"An ini file has three types of contructs: section headers, section\n"
9873
"options and comments."
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:226
9877
msgid ""
9878
"Comments\n"
9879
"^^^^^^^^"
9880
msgstr ""
9881
"Commentarios\n"
9882
"^^^^^^^^^^^^"
9883
9884
#: en/help_topics/configuration.txt:229
9885
msgid ""
9886
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9887
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9888
"Bazaar when parsing ini files."
9889
msgstr ""
9890
9891
#: en/help_topics/configuration.txt:233
9892
msgid ""
9893
"Section headers\n"
9894
"^^^^^^^^^^^^^^^"
9895
msgstr ""
9896
"Cabeceras de sección\n"
9897
"^^^^^^^^^^^^^^^^^^^^"
9898
9899
#: en/help_topics/configuration.txt:236
9900
msgid ""
9901
"A section header is a word enclosed in brackets that starts at the begining\n"
9902
"of a line. A typical section header looks like this::"
9903
msgstr ""
9904
9905
#: en/help_topics/configuration.txt:239
9906
msgid " [DEFAULT]"
9907
msgstr " [PREDETERMINADO]"
9908
9909
#: en/help_topics/configuration.txt:241
9910
msgid ""
9911
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9912
"[ALIASES]. Section headers are case sensitive. The default section provides "
9913
"for\n"
9914
"setting options which can be overridden with the branch config file."
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:245
9918
msgid ""
9919
"For ``locations.conf``, the options from the section with the\n"
9920
"longest matching section header are used to the exclusion of other\n"
9921
"potentially valid section headers. A section header uses the path for\n"
9922
"the branch as the section header. Some examples include::"
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:250
9926
msgid ""
9927
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9928
" [/home/jdoe/branches/]"
9929
msgstr ""
9930
" [http://misramas.isp.com/~jdado/dirrama]\n"
9931
" [/home/jdado/ramas/]"
9932
9933
#: en/help_topics/configuration.txt:253
9934
msgid ""
9935
"\n"
9936
"Section options\n"
9937
"^^^^^^^^^^^^^^^"
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:257
9941
msgid ""
9942
"A section option resides within a section. A section option contains an\n"
9943
"option name, an equals sign and a value. For example::"
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:260
9947
msgid ""
9948
" email = John Doe <jdoe@isp.com>\n"
9949
" gpg_signing_key = Amy Pond <amy@example.com>"
9950
msgstr ""
9951
" email = Juan Dado <jdado@isp.com>\n"
9952
" gpg_signing_key = Ana Pons <ana@ejemplo.com>"
9953
9954
#: en/help_topics/configuration.txt:263
9955
msgid ""
9956
"A option can reference other options by enclosing them in curly brackets::"
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:265
9960
msgid ""
9961
" my_branch_name = feature_x\n"
9962
" my_server = bzr+ssh://example.com\n"
9963
" push_location = {my_server}/project/{my_branch_name}"
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:269
9967
msgid ""
9968
"Option policies\n"
9969
"^^^^^^^^^^^^^^^"
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:272
9973
msgid ""
9974
"Options defined in a section affect the named directory or URL plus\n"
9975
"any locations they contain. Policies can be used to change how an\n"
9976
"option value is interpreted for contained locations. Currently\n"
9977
"there are three policies available:"
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:277
9981
msgid ""
9982
" none:\n"
9983
" the value is interpreted the same for contained locations. This is\n"
9984
" the default behaviour.\n"
9985
" norecurse:\n"
9986
" the value is only used for the exact location specified by the\n"
9987
" section name.\n"
9988
" appendpath:\n"
9989
" for contained locations, any additional path components are\n"
9990
" appended to the value."
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:287
9994
msgid ""
9995
"Policies are specified by keys with names of the form "
9996
"\"<option_name>:policy\".\n"
9997
"For example, to define the push location for a tree of branches, the\n"
9998
"following could be used::"
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:291
10002
msgid ""
10003
" [/top/location]\n"
10004
" push_location = sftp://example.com/location\n"
10005
" push_location:policy = appendpath"
10006
msgstr ""
10007
" [/top/ubicacón]\n"
10008
" push_location = sftp://ejemplo.com/ubicaciñon\n"
10009
" push_location:policy = appendpath"
10010
10011
#: en/help_topics/configuration.txt:295
10012
msgid ""
10013
"With this configuration, the push location for ``/top/location/branch1``\n"
10014
"would be ``sftp://example.com/location/branch1``."
10015
msgstr ""
10016
10017
#: en/help_topics/configuration.txt:298
10018
msgid ""
10019
"Section local options\n"
10020
"^^^^^^^^^^^^^^^^^^^^^"
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:301
10024
msgid ""
10025
"Some options are defined automatically inside a given section and can be\n"
10026
"refered to in this section only. "
10027
msgstr ""
10028
10029
#: en/help_topics/configuration.txt:304
10030
msgid "For example, the ``appendpath`` policy can be used like this::"
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:306
10034
msgid ""
10035
" [/home/vila/src/bzr/bugs]\n"
10036
" mypush = lp:~vila/bzr\n"
10037
" mypush:policy=appendpath"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:310
10041
msgid "Using ``relpath`` to achieve the same result is done like this::"
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:312
10045
msgid ""
10046
" [/home/vila/src/bzr/bugs]\n"
10047
" mypush = lp:~vila/bzr/{relpath}"
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:315
10051
msgid ""
10052
"In both cases, when used in a directory like\n"
10053
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10054
msgstr ""
10055
10056
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10057
msgid ""
10058
" $ bzr config mypush\n"
10059
" lp:~vila/bzr/832013-expand-in-stack"
10060
msgstr ""
10061
10062
#: en/help_topics/configuration.txt:321
10063
msgid "Another such option is ``basename`` which can be used like this::"
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:323
10067
msgid ""
10068
" [/home/vila/src/bzr]\n"
10069
" mypush = lp:~vila/bzr/{basename}"
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:326
10073
msgid ""
10074
"When used in a directory like\n"
10075
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:332
10079
msgid ""
10080
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10081
"itself is defined as the relative path between the section name and the\n"
10082
"location it matches."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:336
10086
msgid ""
10087
"When an option is local to a Section, it cannot be referred to from option\n"
10088
"values in any other section from the same ``Store`` nor from any other\n"
10089
"``Store``."
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:340
10093
msgid ""
10094
"\n"
10095
"The main configuration file, bazaar.conf\n"
10096
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10097
msgstr ""
10098
"\n"
10099
"El archivo de configuración principal, bazaar.conf\n"
10100
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10101
10102
#: en/help_topics/configuration.txt:344
10103
msgid ""
10104
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10105
"The default section contains the default\n"
10106
"configuration options for all branches. The default section can be\n"
10107
"overriden by providing a branch-specific section in ``locations.conf``."
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:349
10111
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:351
10115
msgid ""
10116
" [DEFAULT]\n"
10117
" email = John Doe <jdoe@isp.com>\n"
10118
" editor = /usr/bin/vim\n"
10119
" create_signatures = when-required"
10120
msgstr ""
10121
" [DEFAULT]\n"
10122
" email = Juan Dado <jdado@isp.com>\n"
10123
" editor = /usr/bin/vim\n"
10124
" create_signatures = when-required"
10125
10126
#: en/help_topics/configuration.txt:356
10127
msgid ""
10128
"\n"
10129
"The branch location configuration file, locations.conf\n"
10130
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10131
msgstr ""
10132
"\n"
10133
"El archivo de ubicación de la rama, locations.conf\n"
10134
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10135
10136
#: en/help_topics/configuration.txt:360
10137
msgid ""
10138
"``locations.conf`` allows one to specify overriding settings for\n"
10139
"a specific branch. The format is almost identical to the default section in\n"
10140
"bazaar.conf with one significant change: The section header, instead of "
10141
"saying\n"
10142
"default, will be the path to a branch that you wish to override a value\n"
10143
"for. The '?' and '*' wildcards are supported::"
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:366
10147
msgid ""
10148
" [/home/jdoe/branches/nethack]\n"
10149
" email = Nethack Admin <nethack@nethack.com>"
10150
msgstr ""
10151
" [/home/jdado/ramas/nethack]\n"
10152
" email = Nethack Admin <nethack@nethack.com>"
10153
10154
#: en/help_topics/configuration.txt:369
10155
msgid ""
10156
" [http://hypothetical.site.com/branches/devel-branch]\n"
10157
" create_signatures = always"
10158
msgstr ""
10159
" [http://hypothetical.site.com/branches/devel-branch]\n"
10160
" create_signatures = always"
10161
10162
#: en/help_topics/configuration.txt:372
10163
msgid ""
10164
"The authentication configuration file, authentication.conf\n"
10165
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10166
msgstr ""
10167
"El archivo de configuración de la autenticación, authentication.conf\n"
10168
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10169
10170
#: en/help_topics/configuration.txt:375
10171
msgid ""
10172
"``authentication.conf`` allows one to specify credentials for\n"
10173
"remote servers. This can be used for all the supported transports and any "
10174
"part\n"
10175
"of bzr that requires authentication (smtp for example)."
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:379
10179
msgid ""
10180
"The syntax of the file obeys the same rules as the others except for the\n"
10181
"option policies which don't apply."
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:382
10185
msgid ""
10186
"For more information on the possible uses of the authentication "
10187
"configuration\n"
10188
"file see :doc:`authentication-help`."
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:385
10192
msgid ""
10193
"\n"
10194
"Common options\n"
10195
"--------------"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:389
10199
msgid ""
10200
"debug_flags\n"
10201
"~~~~~~~~~~~"
10202
msgstr ""
10203
"debug_flags\n"
10204
"~~~~~~~~~~~"
10205
10206
#: en/help_topics/configuration.txt:392
10207
msgid ""
10208
"A comma-separated list of debugging options to turn on. The same values\n"
10209
"can be used as with the -D command-line option (see `help global-options`).\n"
10210
"For example::"
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:396
10214
msgid " debug_flags = hpss"
10215
msgstr " debug_flags = hpss"
10216
10217
#: en/help_topics/configuration.txt:400
10218
msgid " debug_flags = hpss,evil"
10219
msgstr " debug_flags = hpss,evil"
10220
10221
#: en/help_topics/configuration.txt:402
10222
msgid ""
10223
"email\n"
10224
"~~~~~"
10225
msgstr ""
10226
"correo\n"
10227
"~~~~~"
10228
10229
#: en/help_topics/configuration.txt:405
10230
msgid ""
10231
"The email address to use when committing a branch. Typically takes the form\n"
10232
"of::"
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:408
10236
msgid " email = Full Name <account@hostname.tld>"
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:410
10240
msgid ""
10241
"editor\n"
10242
"~~~~~~"
10243
msgstr ""
10244
"editor\n"
10245
"~~~~~~"
10246
10247
#: en/help_topics/configuration.txt:413
10248
msgid ""
10249
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10250
"a commit message. This setting is trumped by the environment variable\n"
10251
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10252
"variables."
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:418
10256
msgid ""
10257
"log_format\n"
10258
"~~~~~~~~~~"
10259
msgstr ""
10260
"log_format\n"
10261
"~~~~~~~~~~"
10262
10263
#: en/help_topics/configuration.txt:421
10264
msgid ""
10265
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10266
"and ``line``. Additional formats may be provided by plugins. The default\n"
10267
"value is ``long``."
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:425
10271
msgid ""
10272
"check_signatures\n"
10273
"~~~~~~~~~~~~~~~~"
10274
msgstr ""
10275
"check_signatures\n"
10276
"~~~~~~~~~~~~~~~~"
10277
10278
#: en/help_topics/configuration.txt:428
10279
msgid ""
10280
"Reserved for future use. These options will allow a policy for branches to\n"
10281
"require signatures."
10282
msgstr ""
10283
10284
#: en/help_topics/configuration.txt:431
10285
msgid ""
10286
"require\n"
10287
" The gnupg signature for revisions must be present and must be valid."
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:434
10291
msgid ""
10292
"ignore\n"
10293
" Do not check gnupg signatures of revisions."
10294
msgstr ""
10295
10296
#: en/help_topics/configuration.txt:437
10297
msgid ""
10298
"check-available\n"
10299
" (default) If gnupg signatures for revisions are present, check them.\n"
10300
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10301
" no signature is present."
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:442
10305
msgid ""
10306
"create_signatures\n"
10307
"~~~~~~~~~~~~~~~~~"
10308
msgstr ""
10309
"create_signatures\n"
10310
"~~~~~~~~~~~~~~~~~"
10311
10312
#: en/help_topics/configuration.txt:445
10313
msgid ""
10314
"Defines the behaviour of signing revisions on commits. By default bzr will "
10315
"not\n"
10316
"sign new commits."
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:448
10320
msgid ""
10321
"always\n"
10322
" Sign every new revision that is committed. If the signing fails then "
10323
"the\n"
10324
" commit will not be made."
10325
msgstr ""
10326
10327
#: en/help_topics/configuration.txt:452
10328
msgid ""
10329
"when-required\n"
10330
" Reserved for future use."
10331
msgstr ""
10332
"when-required\n"
10333
" Reservada para uso futuro."
10334
10335
#: en/help_topics/configuration.txt:455
10336
msgid ""
10337
"never\n"
10338
" Reserved for future use."
10339
msgstr ""
10340
"never\n"
10341
" Reservada para uso futuro."
10342
10343
#: en/help_topics/configuration.txt:458
10344
msgid ""
10345
"In future it is planned that ``when-required`` will sign newly\n"
10346
"committed revisions only when the branch requires them. ``never`` will "
10347
"refuse\n"
10348
"to sign newly committed revisions, even if the branch requires signatures."
10349
msgstr ""
10350
10351
#: en/help_topics/configuration.txt:462
10352
msgid ""
10353
"dirstate.fdatasync\n"
10354
"~~~~~~~~~~~~~~~~~~"
10355
msgstr ""
10356
"dirstate.fdatasync\n"
10357
"~~~~~~~~~~~~~~~~~~"
10358
10359
#: en/help_topics/configuration.txt:465
10360
msgid ""
10361
"If true (default), working tree metadata changes are flushed through the\n"
10362
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10363
"should not be lost if the machine crashes. See also repository.fdatasync."
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:469
10367
msgid ""
10368
"gpg_signing_key\n"
10369
"~~~~~~~~~~~~~~~"
10370
msgstr ""
10371
"gpg_signing_key\n"
10372
"~~~~~~~~~~~~~~~"
10373
10374
#: en/help_topics/configuration.txt:472
10375
msgid ""
10376
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10377
"address, key fingerprint or full key ID. When unset or when set to\n"
10378
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:476
10382
msgid ""
10383
"recurse\n"
10384
"~~~~~~~"
10385
msgstr ""
10386
"recurse\n"
10387
"~~~~~~~"
10388
10389
#: en/help_topics/configuration.txt:479
10390
msgid ""
10391
"Only useful in ``locations.conf``. Defines whether or not the\n"
10392
"configuration for this section applies to subdirectories:"
10393
msgstr ""
10394
10395
#: en/help_topics/configuration.txt:482
10396
msgid ""
10397
"true\n"
10398
" (default) This section applies to subdirectories as well."
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:485
10402
msgid ""
10403
"false\n"
10404
" This section only applies to the branch at this directory and not\n"
10405
" branches below it."
10406
msgstr ""
10407
10408
#: en/help_topics/configuration.txt:489
10409
msgid ""
10410
"gpg_signing_command\n"
10411
"~~~~~~~~~~~~~~~~~~~"
10412
msgstr ""
10413
"gpg_signing_command\n"
10414
"~~~~~~~~~~~~~~~~~~~"
10415
10416
#: en/help_topics/configuration.txt:492
10417
msgid ""
10418
"(Default: \"gpg\"). Which program should be used to sign and check "
10419
"revisions.\n"
10420
"For example::"
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:495
10424
msgid " gpg_signing_command = /usr/bin/gnpg"
10425
msgstr " gpg_signing_command = /usr/bin/gnpg"
10426
10427
#: en/help_topics/configuration.txt:497
10428
msgid ""
10429
"The specified command must accept the options \"--clearsign\" and \"-u "
10430
"<email>\"."
10431
msgstr ""
10432
"La orden especificada puede aceptar las opciones «--clearsign» y «-u "
10433
"<correo>»."
10434
10435
#: en/help_topics/configuration.txt:499
10436
msgid ""
10437
"bzr_remote_path\n"
10438
"~~~~~~~~~~~~~~~"
10439
msgstr ""
10440
"bzr_remote_path\n"
10441
"~~~~~~~~~~~~~~~"
10442
10443
#: en/help_topics/configuration.txt:502
10444
msgid ""
10445
"(Default: \"bzr\"). The path to the command that should be used to run the "
10446
"smart\n"
10447
"server for bzr. This value may only be specified in locations.conf, because:"
10448
msgstr ""
10449
10450
#: en/help_topics/configuration.txt:505
10451
msgid ""
10452
"- it's needed before branch.conf is accessible\n"
10453
"- allowing remote branch.conf files to specify commands would be a security\n"
10454
" risk"
10455
msgstr ""
10456
10457
#: en/help_topics/configuration.txt:509
10458
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10459
msgstr ""
10460
10461
#: en/help_topics/configuration.txt:511
10462
msgid ""
10463
"smtp_server\n"
10464
"~~~~~~~~~~~"
10465
msgstr ""
10466
"smtp_server\n"
10467
"~~~~~~~~~~~"
10468
10469
#: en/help_topics/configuration.txt:514
10470
msgid ""
10471
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10472
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10473
msgstr ""
10474
10475
#: en/help_topics/configuration.txt:517
10476
msgid ""
10477
"smtp_username, smtp_password\n"
10478
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10479
msgstr ""
10480
"smtp_username, smtp_password\n"
10481
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10482
10483
#: en/help_topics/configuration.txt:520
10484
msgid ""
10485
"User and password to authenticate to the SMTP server. If smtp_username\n"
10486
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10487
"These settings are only needed if the SMTP server requires authentication\n"
10488
"to send mail."
10489
msgstr ""
10490
10491
#: en/help_topics/configuration.txt:525
10492
msgid ""
10493
"locks.steal_dead\n"
10494
"~~~~~~~~~~~~~~~~"
10495
msgstr ""
10496
"locks.steal_dead\n"
10497
"~~~~~~~~~~~~~~~~"
10498
10499
#: en/help_topics/configuration.txt:528
10500
msgid ""
10501
"If set to true, bzr will automatically break locks held by processes from\n"
10502
"the same machine and user that are no longer alive. Otherwise, it will\n"
10503
"print a message and you can break the lock manually, if you are satisfied\n"
10504
"the object is no longer in use."
10505
msgstr ""
10506
10507
#: en/help_topics/configuration.txt:533
10508
msgid ""
10509
"mail_client\n"
10510
"~~~~~~~~~~~"
10511
msgstr ""
10512
"mail_client\n"
10513
"~~~~~~~~~~~"
10514
10515
#: en/help_topics/configuration.txt:536
10516
msgid ""
10517
"A mail client to use for sending merge requests.\n"
10518
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10519
"it\n"
10520
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10521
"``editor``."
10522
msgstr ""
10523
10524
#: en/help_topics/configuration.txt:541
10525
msgid "Supported values for specific clients:"
10526
msgstr "Valores permitidos para clientes específicos:"
10527
10528
#: en/help_topics/configuration.txt:543
10529
msgid ""
10530
":claws: Use Claws. This skips a dialog for attaching files.\n"
10531
":evolution: Use Evolution.\n"
10532
":kmail: Use KMail.\n"
10533
":mutt: Use Mutt.\n"
10534
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10535
"1.5,\n"
10536
" this works around some bugs that xdg-email doesn't handle."
10537
msgstr ""
10538
10539
#: en/help_topics/configuration.txt:550
10540
msgid "Supported generic values are:"
10541
msgstr "Los valores genéricos permitidos son:"
10542
10543
#: en/help_topics/configuration.txt:552
10544
msgid ""
10545
":default: See above.\n"
10546
":editor: Use your editor to compose the merge request. This also uses\n"
10547
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10548
" smtp_username and smtp_password.\n"
10549
":mapi: Use your preferred e-mail client on Windows.\n"
10550
":xdg-email: Use xdg-email to run your preferred mail program"
10551
msgstr ""
10552
10553
#: en/help_topics/configuration.txt:559
10554
msgid ""
10555
"repository.fdatasync\n"
10556
"~~~~~~~~~~~~~~~~~~~~"
10557
msgstr ""
10558
"repository.fdatasync\n"
10559
"~~~~~~~~~~~~~~~~~~~~"
10560
10561
#: en/help_topics/configuration.txt:562
10562
msgid ""
10563
"If true (default), repository changes are flushed through the OS buffers\n"
10564
"to physical disk. This is somewhat slower, but means data should not be\n"
10565
"lost if the machine crashes. See also dirstate.fdatasync."
10566
msgstr ""
10567
10568
#: en/help_topics/configuration.txt:566
10569
msgid ""
10570
"submit_branch\n"
10571
"~~~~~~~~~~~~~"
10572
msgstr ""
10573
"submit_branch\n"
10574
"~~~~~~~~~~~~~"
10575
10576
#: en/help_topics/configuration.txt:569
10577
msgid ""
10578
"The branch you intend to submit your current work to. This is "
10579
"automatically\n"
10580
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10581
"This\n"
10582
"should usually be set on a per-branch or per-location basis."
10583
msgstr ""
10584
10585
#: en/help_topics/configuration.txt:573
10586
msgid ""
10587
"public_branch\n"
10588
"~~~~~~~~~~~~~"
10589
msgstr ""
10590
"public_branch\n"
10591
"~~~~~~~~~~~~~"
10592
10593
#: en/help_topics/configuration.txt:576
10594
msgid ""
10595
"A publically-accessible version of this branch (implying that this version "
10596
"is\n"
10597
"not publically-accessible). Used (and set) by ``bzr send``."
10598
msgstr ""
10599
10600
#: en/help_topics/configuration.txt:579
10601
msgid ""
10602
"suppress_warnings\n"
10603
"~~~~~~~~~~~~~~~~~"
10604
msgstr ""
10605
"suppress_warnings\n"
10606
"~~~~~~~~~~~~~~~~~"
10607
10608
#: en/help_topics/configuration.txt:582
10609
msgid ""
10610
"A list of strings, each string represent a warning that can be emitted by\n"
10611
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10612
msgstr ""
10613
10614
#: en/help_topics/configuration.txt:585
10615
msgid "Valid values:"
10616
msgstr "valores válidos:"
10617
10618
#: en/help_topics/configuration.txt:587
10619
msgid ""
10620
"* ``format_deprecation``:\n"
10621
" whether the format deprecation warning is shown on repositories that "
10622
"are\n"
10623
" using deprecated formats."
10624
msgstr ""
10625
10626
#: en/help_topics/configuration.txt:591
10627
msgid ""
10628
"default_format\n"
10629
"~~~~~~~~~~~~~~"
10630
msgstr ""
10631
"default_format\n"
10632
"~~~~~~~~~~~~~~"
10633
10634
#: en/help_topics/configuration.txt:594
10635
msgid ""
10636
"A format name for the default format used when creating branches. See "
10637
"``bzr\n"
10638
"help formats`` for possible values."
10639
msgstr ""
10640
10641
#: en/help_topics/configuration.txt:597
10642
msgid ""
10643
"\n"
10644
"Unicode options\n"
10645
"---------------"
10646
msgstr ""
10647
"\n"
10648
"Opciones Unicode\n"
10649
"---------------"
10650
10651
#: en/help_topics/configuration.txt:601
10652
msgid ""
10653
"output_encoding\n"
10654
"~~~~~~~~~~~~~~~"
10655
msgstr ""
10656
"output_encoding\n"
10657
"~~~~~~~~~~~~~~~"
10658
10659
#: en/help_topics/configuration.txt:604
10660
msgid ""
10661
"A Python unicode encoding name for text output from bzr, such as log\n"
10662
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10663
"is the terminal encoding prefered by the operating system."
10664
msgstr ""
10665
10666
#: en/help_topics/configuration.txt:608
10667
msgid ""
10668
"\n"
10669
"Branch type specific options\n"
10670
"----------------------------"
10671
msgstr ""
10672
"\n"
10673
"Opciones específicas del tipo de rama\n"
10674
"-----------------------------------------------------------"
10675
10676
#: en/help_topics/configuration.txt:612
10677
msgid ""
10678
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10679
"later format. They\n"
10680
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10681
"manually set in ``locations.conf`` or ``bazaar.conf``."
10682
msgstr ""
10683
10684
#: en/help_topics/configuration.txt:617
10685
msgid ""
10686
"append_revisions_only\n"
10687
"~~~~~~~~~~~~~~~~~~~~~"
10688
msgstr ""
10689
"append_revisions_only\n"
10690
"~~~~~~~~~~~~~~~~~~~~~"
10691
10692
#: en/help_topics/configuration.txt:620
10693
msgid ""
10694
"If set to \"True\" then revisions can only be appended to the log, not\n"
10695
"removed. A branch with this setting enabled can only pull from another\n"
10696
"branch if the other branch's log is a longer version of its own. This is\n"
10697
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10698
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10699
"compatibility with previous bzr versions (older than 2.2)."
10700
msgstr ""
10701
10702
#: en/help_topics/configuration.txt:627
10703
msgid ""
10704
"parent_location\n"
10705
"~~~~~~~~~~~~~~~"
10706
msgstr ""
10707
"parent_location\n"
10708
"~~~~~~~~~~~~~~~"
10709
10710
#: en/help_topics/configuration.txt:630
10711
msgid ""
10712
"If present, the location of the default branch for pull or merge. This "
10713
"option\n"
10714
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10715
"--remember``."
10716
msgstr ""
10717
10718
#: en/help_topics/configuration.txt:634
10719
msgid ""
10720
"push_location\n"
10721
"~~~~~~~~~~~~~"
10722
msgstr ""
10723
"push_location\n"
10724
"~~~~~~~~~~~~~"
10725
10726
#: en/help_topics/configuration.txt:637
10727
msgid ""
10728
"If present, the location of the default branch for push. This option\n"
10729
"is normally set by the first ``push`` or ``push --remember``."
10730
msgstr ""
10731
10732
#: en/help_topics/configuration.txt:640
10733
msgid ""
10734
"push_strict\n"
10735
"~~~~~~~~~~~"
10736
msgstr ""
10737
"push_strict\n"
10738
"~~~~~~~~~~~"
10739
10740
#: en/help_topics/configuration.txt:643
10741
msgid ""
10742
"If present, defines the ``--strict`` option default value for checking\n"
10743
"uncommitted changes before pushing."
10744
msgstr ""
10745
10746
#: en/help_topics/configuration.txt:646
10747
msgid ""
10748
"dpush_strict\n"
10749
"~~~~~~~~~~~~"
10750
msgstr ""
10751
"dpush_strict\n"
10752
"~~~~~~~~~~~~"
10753
10754
#: en/help_topics/configuration.txt:649
10755
msgid ""
10756
"If present, defines the ``--strict`` option default value for checking\n"
10757
"uncommitted changes before pushing into a different VCS without any\n"
10758
"custom bzr metadata."
10759
msgstr ""
10760
10761
#: en/help_topics/configuration.txt:653
10762
msgid ""
10763
"bound_location\n"
10764
"~~~~~~~~~~~~~~"
10765
msgstr ""
10766
"bound_location\n"
10767
"~~~~~~~~~~~~~~"
10768
10769
#: en/help_topics/configuration.txt:656
10770
msgid ""
10771
"The location that commits should go to when acting as a checkout.\n"
10772
"This option is normally set by ``bind``."
10773
msgstr ""
10774
10775
#: en/help_topics/configuration.txt:659
10776
msgid ""
10777
"bound\n"
10778
"~~~~~"
10779
msgstr ""
10780
"bound\n"
10781
"~~~~~"
10782
10783
#: en/help_topics/configuration.txt:662
10784
msgid ""
10785
"If set to \"True\", the branch should act as a checkout, and push each "
10786
"commit to\n"
10787
"the bound_location. This option is normally set by ``bind``/``unbind``."
10788
msgstr ""
10789
10790
#: en/help_topics/configuration.txt:665
10791
msgid ""
10792
"send_strict\n"
10793
"~~~~~~~~~~~"
10794
msgstr ""
10795
"send_strict\n"
10796
"~~~~~~~~~"
10797
10798
#: en/help_topics/configuration.txt:668
10799
msgid ""
10800
"If present, defines the ``--strict`` option default value for checking\n"
10801
"uncommitted changes before sending a merge directive."
10802
msgstr ""
10803
10804
#: en/help_topics/configuration.txt:671
10805
msgid ""
10806
"add.maximum_file_size\n"
10807
"~~~~~~~~~~~~~~~~~~~~~"
10808
msgstr ""
10809
"add.maximum_file_size\n"
10810
"~~~~~~~~~~~~~~~~~~~"
10811
10812
#: en/help_topics/configuration.txt:674
10813
msgid ""
10814
"Defines the maximum file size the command line \"add\" operation will allow\n"
10815
"in recursive mode, with files larger than this value being skipped. You may "
10816
"\n"
10817
"specify this value as an integer (in which case it is interpreted as bytes), "
10818
"\n"
10819
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10820
"0 \n"
10821
"will disable skipping."
10822
msgstr ""
10823
10824
#: en/help_topics/configuration.txt:680
10825
msgid ""
10826
"External Merge Tools\n"
10827
"--------------------"
10828
msgstr ""
10829
"Herramientas de fusión externas\n"
10830
"----------------------------------------------------"
10831
10832
#: en/help_topics/configuration.txt:683
10833
msgid ""
10834
"bzr.mergetool.<name>\n"
10835
"~~~~~~~~~~~~~~~~~~~~"
10836
msgstr ""
10837
"bzr.mergetool.<nombre>\n"
10838
"~~~~~~~~~~~~~~~~~~~"
10839
10840
#: en/help_topics/configuration.txt:686
10841
msgid ""
10842
"Defines an external merge tool called <name> with the given command-line.\n"
10843
"Arguments containing spaces should be quoted using single or double quotes. "
10844
"The\n"
10845
"executable may omit its path if it can be found on the PATH."
10846
msgstr ""
10847
10848
#: en/help_topics/configuration.txt:690
10849
msgid ""
10850
"The following markers can be used in the command-line to substitute "
10851
"filenames\n"
10852
"involved in the merge conflict::"
10853
msgstr ""
10854
10855
#: en/help_topics/configuration.txt:693
10856
msgid ""
10857
" {base} file.BASE\n"
10858
" {this} file.THIS\n"
10859
" {other} file.OTHER\n"
10860
" {result} output file\n"
10861
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10862
"merge\n"
10863
" succeeds."
10864
msgstr ""
10865
10866
#: en/help_topics/configuration.txt:702
10867
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10868
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {este} {otro} -o {resultado}"
10869
10870
#: en/help_topics/configuration.txt:704
10871
msgid ""
10872
"bzr.default_mergetool\n"
10873
"~~~~~~~~~~~~~~~~~~~~~"
10874
msgstr ""
10875
"bzr.default_mergetool\n"
10876
"~~~~~~~~~~~~~~~~~~"
10877
10878
#: en/help_topics/configuration.txt:707
10879
msgid ""
10880
"Specifies which external merge tool (as defined above) should be selected "
10881
"by\n"
10882
"default in tools such as ``bzr qconflicts``."
10883
msgstr ""
10884
10885
#: en/help_topics/configuration.txt:712
10886
msgid " bzr.default_mergetool = kdiff3\n"
10887
msgstr " bzr.default_mergetool = kdiff3\n"
10888
10889
#: en/help_topics/conflict-types.txt:1
10890
msgid ""
10891
"Conflict Types\n"
10892
"=============="
10893
msgstr ""
10894
"Tipos de conflicto\n"
10895
"=================="
10896
10897
#: en/help_topics/conflict-types.txt:4
10898
msgid ""
10899
"Some operations, like merge, revert and pull, modify the contents of your\n"
10900
"working tree. These modifications are programmatically generated, and so "
10901
"they\n"
10902
"may conflict with the current state of your working tree. "
10903
msgstr ""
10904
10905
#: en/help_topics/conflict-types.txt:8
10906
msgid ""
10907
"When conflicts are present in your working tree (as shown by ``bzr\n"
10908
"conflicts``), you should resolve them and then inform bzr that the "
10909
"conflicts\n"
10910
"have been resolved."
10911
msgstr ""
10912
10913
#: en/help_topics/conflict-types.txt:12
10914
msgid ""
10915
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10916
"should resolve them is not the one responsible for their occurrence, as is "
10917
"the\n"
10918
"case when merging other people's work or because some conflicts are "
10919
"presented\n"
10920
"in a way that is not easy to understand."
10921
msgstr ""
10922
10923
#: en/help_topics/conflict-types.txt:17
10924
msgid ""
10925
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10926
"conflict if and only if there's an actual conceptual conflict in the source\n"
10927
"tree. Because Bazaar doesn't understand the real meaning of the files "
10928
"being\n"
10929
"versioned, it can, when faced with ambiguities, fall short in either "
10930
"direction\n"
10931
"trying to resolve the conflict itself. Many kinds of changes can be "
10932
"combined\n"
10933
"programmatically, but sometimes only a human can determine the right thing "
10934
"to\n"
10935
"do."
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:25
10939
msgid ""
10940
"When Bazaar generates a conflict, it adds information into the working tree "
10941
"to\n"
10942
"present the conflicting versions, and it's up to you to find the correct\n"
10943
"resolution."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:29
10947
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10948
msgstr ""
10949
10950
#: en/help_topics/conflict-types.txt:31
10951
msgid ""
10952
"1. Modify the working tree content so that the conflicted item is now in "
10953
"the\n"
10954
" state you want to keep, then"
10955
msgstr ""
10956
10957
#: en/help_topics/conflict-types.txt:34
10958
msgid ""
10959
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10960
" remaining generated information (``bzr resolve <item>``)."
10961
msgstr ""
10962
10963
#: en/help_topics/conflict-types.txt:37
10964
msgid ""
10965
"For most conflict types, there are some obvious ways to modify the working\n"
10966
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10967
"itself already made a choice, when possible."
10968
msgstr ""
10969
10970
#: en/help_topics/conflict-types.txt:41
10971
msgid ""
10972
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10973
"different ways to resolve the conflict."
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:44
10977
msgid ""
10978
"Each type of conflict is explained below, and the action which must be done "
10979
"to\n"
10980
"resolve the conflict is outlined."
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:47
10984
msgid ""
10985
"Various actions are available depending on the kind of conflict, for some "
10986
"of\n"
10987
"these actions, Bazaar can provide some help. In the end you should at least\n"
10988
"inform Bazaar that you're done with the conflict with::"
10989
msgstr ""
10990
10991
#: en/help_topics/conflict-types.txt:51
10992
msgid " ``bzr resolve FILE --action=done'"
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:53
10996
msgid ""
10997
"Note that this is the default action when a single file is involved so you "
10998
"can\n"
10999
"simply use::"
11000
msgstr ""
11001
11002
#: en/help_topics/conflict-types.txt:56
11003
msgid " ``bzr resolve FILE``"
11004
msgstr " «bzr resolve ARCHIVO»"
11005
11006
#: en/help_topics/conflict-types.txt:58
11007
msgid "See ``bzr help resolve`` for more details."
11008
msgstr "Vea «bzr help resolve» para tener más detalles."
11009
11010
#: en/help_topics/conflict-types.txt:60
11011
msgid ""
11012
"Text conflicts\n"
11013
"--------------"
11014
msgstr ""
11015
"Conflictos de texto\n"
11016
"------------------------------"
11017
11018
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11019
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11020
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11021
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11022
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11023
msgid "Typical message::"
11024
msgstr "Mensaje típico::"
11025
11026
#: en/help_topics/conflict-types.txt:65
11027
msgid " Text conflict in FILE"
11028
msgstr " Conflictos de texto en ARCHIVO"
11029
11030
#: en/help_topics/conflict-types.txt:67
11031
msgid ""
11032
"These are produced when a text merge cannot completely reconcile two sets "
11033
"of\n"
11034
"text changes. Bazaar will emit files for each version with the extensions\n"
11035
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11036
"tree,\n"
11037
"i.e. the tree that you are merging changes into. OTHER is the version that "
11038
"you\n"
11039
"are merging into the target. BASE is an older version that is used as a "
11040
"basis\n"
11041
"for comparison."
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:74
11045
msgid ""
11046
"In the main copy of the file, Bazaar will include all the changes that it\n"
11047
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11048
"\"herringbone\" markers like ``<<<<<<<``."
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:78
11052
msgid ""
11053
"Say the initial text is \"The project leader released it.\", and THIS "
11054
"modifies it\n"
11055
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11056
"leader\n"
11057
"released Bazaar.\" A conflict would look like this::"
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:82
11061
msgid ""
11062
" <<<<<<< TREE\n"
11063
" Martin Pool released it.\n"
11064
" =======\n"
11065
" The project leader released Bazaar.\n"
11066
" >>>>>>> MERGE-SOURCE"
11067
msgstr ""
11068
" <<<<<<< TREE\n"
11069
" Martin Pool released it.\n"
11070
" =======\n"
11071
" The project leader released Bazaar.\n"
11072
" >>>>>>> MERGE-SOURCE"
11073
11074
#: en/help_topics/conflict-types.txt:88
11075
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11076
msgstr "La resolución correcta debería ser «Martin Pool released Bazaar.»"
11077
11078
#: en/help_topics/conflict-types.txt:90
11079
msgid ""
11080
"You can handle text conflicts either by editing the main copy of the file,\n"
11081
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11082
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11083
"set of changes over the other (but see below when you encounter these\n"
11084
"cases). More often, the two sets of changes must be intelligently combined."
11085
msgstr ""
11086
11087
#: en/help_topics/conflict-types.txt:96
11088
msgid ""
11089
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11090
"you are done editing, the file should look like it never had a conflict, and "
11091
"be\n"
11092
"ready to commit."
11093
msgstr ""
11094
11095
#: en/help_topics/conflict-types.txt:100
11096
msgid ""
11097
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11098
"Bazaar will auto-detect which conflicts you have resolved."
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:103
11102
msgid ""
11103
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11104
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11105
"working tree."
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:107
11109
msgid ""
11110
"\n"
11111
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11112
"resolve`` with one of the following actions:"
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:111
11116
msgid ""
11117
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11118
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11119
msgstr ""
11120
11121
#: en/help_topics/conflict-types.txt:114
11122
msgid ""
11123
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11124
"modifications will be taken into account."
11125
msgstr ""
11126
11127
#: en/help_topics/conflict-types.txt:117
11128
msgid ""
11129
"Content conflicts\n"
11130
"-----------------"
11131
msgstr ""
11132
"Conflictos de contenido\n"
11133
"-------------------------------------"
11134
11135
#: en/help_topics/conflict-types.txt:122
11136
msgid " Contents conflict in FILE"
11137
msgstr " Conflictos de contenido en ARCHIVO"
11138
11139
#: en/help_topics/conflict-types.txt:124
11140
msgid ""
11141
"This conflict happens when there are conflicting changes in the working "
11142
"tree\n"
11143
"and the merge source, but the conflicted items are not text files. They "
11144
"may\n"
11145
"be binary files, or symlinks, or directories. It can even happen with "
11146
"files\n"
11147
"that are deleted on one side, and modified on the other."
11148
msgstr ""
11149
11150
#: en/help_topics/conflict-types.txt:129
11151
msgid ""
11152
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11153
"be\n"
11154
"regular files, symlinks or directories). But it will not include a \"main "
11155
"copy\"\n"
11156
"of the file with herringbone conflict markers. It will appear that the "
11157
"\"main\n"
11158
"copy\" has been renamed to THIS or OTHER."
11159
msgstr ""
11160
11161
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11162
msgid ""
11163
"To resolve that kind of conflict, you should rebuild FILE from either "
11164
"version\n"
11165
"or a combination of both."
11166
msgstr ""
11167
11168
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11169
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11170
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11171
#: en/help_topics/conflict-types.txt:361
11172
msgid "``bzr resolve`` recognizes the following actions:"
11173
msgstr "«bzr resolve» reconoce las siguientes acciones:"
11174
11175
#: en/help_topics/conflict-types.txt:139
11176
msgid ""
11177
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11178
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11179
"* ``--action=done`` will just mark the conflict as resolved."
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:143
11183
msgid ""
11184
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11185
"and\n"
11186
"``.OTHER`` files if they are still present in the working tree."
11187
msgstr ""
11188
11189
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11190
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11191
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11192
#: en/help_topics/conflict-types.txt:369
11193
msgid ""
11194
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11195
msgstr ""
11196
"Bazaar no puede detectar automáticamente cuando se han resuelto conflictos "
11197
"de esta clase."
11198
11199
#: en/help_topics/conflict-types.txt:148
11200
msgid ""
11201
"Tag conflicts\n"
11202
"-------------"
11203
msgstr ""
11204
"Conflicto de etiquetas\n"
11205
"-----------------------------------"
11206
11207
#: en/help_topics/conflict-types.txt:153
11208
msgid ""
11209
" Conflicting tags:\n"
11210
" version-0.1"
11211
msgstr ""
11212
11213
#: en/help_topics/conflict-types.txt:156
11214
msgid ""
11215
"When pulling from or pushing to another branch, Bazaar informs you about "
11216
"tags\n"
11217
"that conflict between the two branches; that is the same tag points to two\n"
11218
"different revisions. You need not resolve these conflicts, but subsequent\n"
11219
"uses of pull or push will result in the same message."
11220
msgstr ""
11221
11222
#: en/help_topics/conflict-types.txt:161
11223
msgid ""
11224
"To resolve the conflict, you must apply the correct tags to either the "
11225
"target\n"
11226
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11227
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11228
"target branch's tags match the source branch, then in the target branch do\n"
11229
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11230
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11231
"source\n"
11232
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11233
"favor of the target branch, you need to similarly use ``tag --force`` in "
11234
"the\n"
11235
"source branch. (Note that pulling or pushing using --overwrite will "
11236
"overwrite\n"
11237
"all tags as well.)"
11238
msgstr ""
11239
11240
#: en/help_topics/conflict-types.txt:172
11241
msgid ""
11242
"Duplicate paths\n"
11243
"---------------"
11244
msgstr ""
11245
"Rutas duplicadas\n"
11246
"--------------------------"
11247
11248
#: en/help_topics/conflict-types.txt:177
11249
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11250
msgstr ""
11251
11252
#: en/help_topics/conflict-types.txt:179
11253
msgid ""
11254
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11255
"already been used. The existing file will be renamed to \"FILE.moved\". "
11256
msgstr ""
11257
11258
#: en/help_topics/conflict-types.txt:187
11259
msgid ""
11260
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11261
"FILE``,\n"
11262
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11263
"* ``--action=done`` will just mark the conflict as resolved."
11264
msgstr ""
11265
11266
#: en/help_topics/conflict-types.txt:191
11267
msgid ""
11268
"Note that you must get rid of FILE.moved before using ``--action=done``."
11269
msgstr ""
11270
11271
#: en/help_topics/conflict-types.txt:195
11272
msgid ""
11273
"Unversioned parent\n"
11274
"------------------"
11275
msgstr ""
11276
"Padre sin versión\n"
11277
"--------------------------"
11278
11279
#: en/help_topics/conflict-types.txt:200
11280
msgid ""
11281
" Conflict because FILE is not versioned, but has versioned children."
11282
msgstr ""
11283
11284
#: en/help_topics/conflict-types.txt:202
11285
msgid ""
11286
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11287
"not\n"
11288
"versioned. This happens when the directory has been deleted in the target,\n"
11289
"but has a new child in the source, or vice versa. In this situation, "
11290
"Bazaar\n"
11291
"will version the parent directory as well. Resolving this issue depends\n"
11292
"very much on the particular scenario. You may wish to rename or delete "
11293
"either\n"
11294
"the file or the directory. When you are satisfied, you can run \"bzr "
11295
"resolve\n"
11296
"FILE\" to mark the conflict as resolved."
11297
msgstr ""
11298
11299
#: en/help_topics/conflict-types.txt:210
11300
msgid ""
11301
"Missing parent\n"
11302
"--------------"
11303
msgstr ""
11304
"Falta el padre\n"
11305
"---------------------"
11306
11307
#: en/help_topics/conflict-types.txt:215
11308
msgid " Conflict adding files to FILE. Created directory."
11309
msgstr ""
11310
11311
#: en/help_topics/conflict-types.txt:217
11312
msgid ""
11313
"This happens when a directory has been deleted in the target, but has new\n"
11314
"children in the source. This is similar to the \"unversioned parent\" "
11315
"conflict,\n"
11316
"except that the parent directory does not *exist*, instead of just being\n"
11317
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11318
"Resolving this issue depends very much on the particular scenario."
11319
msgstr ""
11320
11321
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11322
msgid ""
11323
"To resolve that kind of conflict, you should either remove or rename the\n"
11324
"children or the directory or a combination of both."
11325
msgstr ""
11326
11327
#: en/help_topics/conflict-types.txt:228
11328
msgid ""
11329
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11330
" children,\n"
11331
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11332
"children\n"
11333
" and restoring the directory,\n"
11334
"* ``--action=done`` will just mark the conflict as resolved."
11335
msgstr ""
11336
11337
#: en/help_topics/conflict-types.txt:236
11338
msgid ""
11339
"Deleting parent\n"
11340
"---------------"
11341
msgstr ""
11342
"Eliminando padre\n"
11343
"---------------------------"
11344
11345
#: en/help_topics/conflict-types.txt:241
11346
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11347
msgstr ""
11348
11349
#: en/help_topics/conflict-types.txt:243
11350
msgid ""
11351
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11352
"source, but has new children in the target (either because a directory\n"
11353
"deletion is merged or because the merge introduce new children). Bazaar\n"
11354
"will retain the directory. Resolving this issue depends very much on the\n"
11355
"particular scenario."
11356
msgstr ""
11357
11358
#: en/help_topics/conflict-types.txt:254
11359
msgid ""
11360
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11361
"directory,"
11362
msgstr ""
11363
11364
#: en/help_topics/conflict-types.txt:256
11365
msgid ""
11366
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11367
" children,"
11368
msgstr ""
11369
11370
#: en/help_topics/conflict-types.txt:259
11371
msgid "* ``--action=done`` will just mark the conflict as resolved."
11372
msgstr ""
11373
11374
#: en/help_topics/conflict-types.txt:261
11375
msgid ""
11376
"Note that when merging a directory deletion, if unversioned files are\n"
11377
"present, they become potential orphans has they don't have a directory\n"
11378
"parent anymore."
11379
msgstr ""
11380
11381
#: en/help_topics/conflict-types.txt:265
11382
msgid ""
11383
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11384
"setting the ``bzr.transform.orphan_policy`` configuration option."
11385
msgstr ""
11386
11387
#: en/help_topics/conflict-types.txt:268
11388
msgid "There are two possible values for this option:"
11389
msgstr "Hay dos posibles valores para esta opción:"
11390
11391
#: en/help_topics/conflict-types.txt:270
11392
msgid ""
11393
"* ``conflict`` (the default): will leave the orphans in place and\n"
11394
" generate a conflicts,"
11395
msgstr ""
11396
11397
#: en/help_topics/conflict-types.txt:273
11398
msgid ""
11399
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11400
"root\n"
11401
" of the working tree with names like ``<file>.~#~``."
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:278
11405
msgid ""
11406
"Path conflict\n"
11407
"-------------"
11408
msgstr ""
11409
"Conflicto de ruta\n"
11410
"--------------------------"
11411
11412
#: en/help_topics/conflict-types.txt:283
11413
msgid " Path conflict: PATH1 / PATH2"
11414
msgstr ""
11415
11416
#: en/help_topics/conflict-types.txt:285
11417
msgid ""
11418
"This happens when the source and target have each modified the name or "
11419
"parent\n"
11420
"directory of a file. Bazaar will use the path elements from the source."
11421
msgstr ""
11422
11423
#: en/help_topics/conflict-types.txt:288
11424
msgid ""
11425
"To resolve that kind of conflict, you just have to decide what name should "
11426
"be\n"
11427
"retained for the file involved."
11428
msgstr ""
11429
11430
#: en/help_topics/conflict-types.txt:293
11431
msgid ""
11432
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11433
" issuing ``bzr mv PATH2 PATH1``,\n"
11434
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11435
"``PATH2``,\n"
11436
"* ``--action=done`` will just mark the conflict as resolved."
11437
msgstr ""
11438
11439
#: en/help_topics/conflict-types.txt:300
11440
msgid ""
11441
"Parent loop\n"
11442
"-----------"
11443
msgstr ""
11444
11445
#: en/help_topics/conflict-types.txt:305
11446
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11447
msgstr ""
11448
11449
#: en/help_topics/conflict-types.txt:307
11450
msgid ""
11451
"This happens when the source and the target have each moved directories, so\n"
11452
"that, if the change could be applied, a directory would be contained by "
11453
"itself.\n"
11454
"For example::"
11455
msgstr ""
11456
11457
#: en/help_topics/conflict-types.txt:311
11458
msgid ""
11459
" $ bzr init\n"
11460
" $ bzr mkdir white\n"
11461
" $ bzr mkdir black\n"
11462
" $ bzr commit -m \"BASE\"\n"
11463
" $ bzr branch . ../other\n"
11464
" $ bzr mv white black\n"
11465
" $ bzr commit -m \"THIS\"\n"
11466
" $ bzr mv ../other/black ../other/white\n"
11467
" $ bzr commit ../other -m \"OTHER\"\n"
11468
" $ bzr merge ../other"
11469
msgstr ""
11470
" $ bzr init\n"
11471
" $ bzr mkdir white\n"
11472
" $ bzr mkdir black\n"
11473
" $ bzr commit -m \"BASE\"\n"
11474
" $ bzr branch . ../other\n"
11475
" $ bzr mv white black\n"
11476
" $ bzr commit -m \"THIS\"\n"
11477
" $ bzr mv ../other/black ../other/white\n"
11478
" $ bzr commit ../other -m \"OTHER\"\n"
11479
" $ bzr merge ../other"
11480
11481
#: en/help_topics/conflict-types.txt:322
11482
msgid ""
11483
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11484
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11485
"name should be retained for the directories involved."
11486
msgstr ""
11487
11488
#: en/help_topics/conflict-types.txt:328
11489
msgid ""
11490
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11491
"\n"
11492
" in ``black``,\n"
11493
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11494
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11495
"* ``--action=done`` will just mark the conflict as resolved."
11496
msgstr ""
11497
11498
#: en/help_topics/conflict-types.txt:336
11499
msgid ""
11500
"Non-directory parent\n"
11501
"--------------------"
11502
msgstr ""
11503
11504
#: en/help_topics/conflict-types.txt:341
11505
msgid ""
11506
" Conflict: foo.new is not a directory, but has files in it.\n"
11507
" Created directory."
11508
msgstr ""
11509
11510
#: en/help_topics/conflict-types.txt:344
11511
msgid ""
11512
"This happens when one side has added files to a directory, and the other "
11513
"side\n"
11514
"has changed the directory into a file or symlink. For example::"
11515
msgstr ""
11516
11517
#: en/help_topics/conflict-types.txt:347
11518
msgid ""
11519
" $ bzr init\n"
11520
" $ bzr mkdir foo\n"
11521
" $ bzr commit -m \"BASE\"\n"
11522
" $ bzr branch . ../other\n"
11523
" $ rmdir foo\n"
11524
" $ touch foo\n"
11525
" $ bzr commit -m \"THIS\"\n"
11526
" $ bzr mkdir ../other/foo/bar\n"
11527
" $ bzr commit ../other -m \"OTHER\"\n"
11528
" $ bzr merge ../other"
11529
msgstr ""
11530
" $ bzr init\n"
11531
" $ bzr mkdir foo\n"
11532
" $ bzr commit -m \"BASE\"\n"
11533
" $ bzr branch . ../other\n"
11534
" $ rmdir foo\n"
11535
" $ touch foo\n"
11536
" $ bzr commit -m \"THIS\"\n"
11537
" $ bzr mkdir ../other/foo/bar\n"
11538
" $ bzr commit ../other -m \"OTHER\"\n"
11539
" $ bzr merge ../other"
11540
11541
#: en/help_topics/conflict-types.txt:358
11542
msgid ""
11543
"To resolve that kind of conflict, you have to decide what name should be\n"
11544
"retained for the file, directory or symlink involved."
11545
msgstr ""
11546
11547
#: en/help_topics/conflict-types.txt:363
11548
msgid ""
11549
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11550
" ``bzr add foo``,\n"
11551
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11552
" ``bzr mv foo.new foo``,\n"
11553
"* ``--action=done`` will just mark the conflict as resolved."
11554
msgstr ""
11555
11556
#: en/help_topics/conflict-types.txt:371
11557
msgid ""
11558
"MalformedTransform\n"
11559
"------------------"
11560
msgstr ""
11561
11562
#: en/help_topics/conflict-types.txt:374
11563
msgid ""
11564
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11565
"exception. This means that Bazaar encountered a filesystem conflict that it "
11566
"was\n"
11567
"unable to resolve. This usually indicates a bug. Please let us know if "
11568
"you\n"
11569
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11570
msgstr ""
11571
11572
#: en/help_topics/content-filters.txt:1
11573
msgid ""
11574
"Content Filters\n"
11575
"==============="
11576
msgstr ""
11577
11578
#: en/help_topics/content-filters.txt:4
11579
msgid ""
11580
"Content formats\n"
11581
"---------------"
11582
msgstr ""
11583
11584
#: en/help_topics/content-filters.txt:7
11585
msgid ""
11586
"Bazaar's content filtering allows you to store files in a different\n"
11587
"format from the copy in your working tree. This lets you, or your\n"
11588
"co-developers, use Windows development tools that expect CRLF files\n"
11589
"on projects that use other line-ending conventions. Among other things,\n"
11590
"content filters also let Unix developers more easily work on projects\n"
11591
"using Windows line-ending conventions, keyword expansion/compression,\n"
11592
"and trailing spaces on lines in text files to be implicitly stripped\n"
11593
"when committed."
11594
msgstr ""
11595
11596
#: en/help_topics/content-filters.txt:16
11597
msgid "To generalize, there are two content formats supported by Bazaar:"
11598
msgstr "Generalizando, hay dos formatos de contenido permitidos por Bazaar:"
11599
11600
#: en/help_topics/content-filters.txt:18
11601
msgid ""
11602
"* a canonical format - how files are stored internally\n"
11603
"* a convenience format - how files are created in a working tree."
11604
msgstr ""
11605
11606
#: en/help_topics/content-filters.txt:21
11607
msgid ""
11608
"\n"
11609
"Format conversion\n"
11610
"-----------------"
11611
msgstr ""
11612
"\n"
11613
"Conversión de formato\n"
11614
"------------------------------------"
11615
11616
#: en/help_topics/content-filters.txt:25
11617
msgid ""
11618
"The conversion between these formats is done by content filters.\n"
11619
"A content filter has two parts:"
11620
msgstr ""
11621
11622
#: en/help_topics/content-filters.txt:28
11623
msgid ""
11624
"* a read converter - converts from convenience to canonical format\n"
11625
"* a write converter - converts from canonical to convenience format."
11626
msgstr ""
11627
11628
#: en/help_topics/content-filters.txt:31
11629
msgid ""
11630
"Many of these converters will provide *round-trip* conversion,\n"
11631
"i.e. applying the read converter followed by the write converter\n"
11632
"gives back the original content. However, others may provide an\n"
11633
"asymmetric conversion. For example, a read converter might strip\n"
11634
"trailing whitespace off lines in source code while the matching\n"
11635
"write converter might pass content through unchanged."
11636
msgstr ""
11637
11638
#: en/help_topics/content-filters.txt:38
11639
msgid ""
11640
"\n"
11641
"Enabling content filters\n"
11642
"------------------------"
11643
msgstr ""
11644
"\n"
11645
"Activar filtros de contenido\n"
11646
"--------------------------------------------"
11647
11648
#: en/help_topics/content-filters.txt:42
11649
msgid ""
11650
"Content filters are typically provided by plugins, so the first step\n"
11651
"in using them is to install the relevant plugins and read their\n"
11652
"documentation. Some plugins may be very specific about which files\n"
11653
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11654
"In other cases, the plugin may leave it in the user's hands to\n"
11655
"define which files are to be filtered. This is typically done\n"
11656
"using rule-based preferences. See ``bzr help rules`` for general\n"
11657
"information about defining these."
11658
msgstr ""
11659
11660
#: en/help_topics/content-filters.txt:51
11661
msgid ""
11662
"\n"
11663
"Impact on commands\n"
11664
"------------------"
11665
msgstr ""
11666
"\n"
11667
"Impacto en las órdenes\n"
11668
"------------------------------------"
11669
11670
#: en/help_topics/content-filters.txt:55
11671
msgid ""
11672
"Read converters are only applied to commands that read content from\n"
11673
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11674
"will apply read converters to files in the working tree, then compare\n"
11675
"the results to the content last committed."
11676
msgstr ""
11677
11678
#: en/help_topics/content-filters.txt:60
11679
msgid ""
11680
"Write converters are only applied by commands that **create files in a\n"
11681
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11682
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11683
"respectively."
11684
msgstr ""
11685
11686
#: en/help_topics/content-filters.txt:65
11687
msgid ""
11688
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11689
"comitting files. If this makes sense for a given plugin providing\n"
11690
"a content filter, the plugin can usually achieve this effect by using a\n"
11691
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11692
"for more information on hooks."
11693
msgstr ""
11694
11695
#: en/help_topics/content-filters.txt:71
11696
msgid ""
11697
"\n"
11698
"Refreshing your working tree\n"
11699
"----------------------------"
11700
msgstr ""
11701
"\n"
11702
"Actualizar su árbol de trabajo\n"
11703
"----------------------------------------------"
11704
11705
#: en/help_topics/content-filters.txt:75
11706
msgid ""
11707
"For performance reasons, Bazaar caches the timestamps of files in\n"
11708
"a working tree, and assumes files are unchanged if their timestamps\n"
11709
"match the cached values. As a consequence, there are times when\n"
11710
"you may need to explicitly ask for content filtering to be reapplied\n"
11711
"in one or both directions, e.g. after installing or reconfiguring\n"
11712
"plugins providing it."
11713
msgstr ""
11714
11715
#: en/help_topics/content-filters.txt:82
11716
msgid "Here are some general guidelines for doing this:"
11717
msgstr "Aquí hay algunas directrices para hacer esto:"
11718
11719
#: en/help_topics/content-filters.txt:84
11720
msgid ""
11721
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11722
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11723
" relevant read converters and compare the end result with the\n"
11724
" canonical format."
11725
msgstr ""
11726
11727
#: en/help_topics/content-filters.txt:89
11728
msgid ""
11729
" * To reapply write converters, ensure there are no local changes,\n"
11730
" delete the relevant files and run ``bzr revert`` on those files."
11731
msgstr ""
11732
11733
#: en/help_topics/content-filters.txt:92
11734
msgid ""
11735
"Note: In the future, it is likely that additional options will be added\n"
11736
"to commands to make this refreshing process faster and safer.\n"
11737
msgstr ""
11738
11739
#: en/help_topics/current-formats.txt:1
11740
msgid "Current Storage Formats"
11741
msgstr "Formatos de almacenamiento actual"
11742
11743
#: en/help_topics/current-formats.txt:3
11744
msgid ""
11745
":2a:\n"
11746
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11747
" compress storage. Provides rich roots which are a one-way\n"
11748
" transition."
11749
msgstr ""
11750
11751
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11752
msgid ""
11753
"\n"
11754
"See :doc:`formats-help` for more about storage formats."
11755
msgstr ""
11756
11757
#: en/help_topics/debug-flags.txt:1
11758
msgid ""
11759
"Debug Flags\n"
11760
"==========="
11761
msgstr ""
11762
"Marcas de depuración\n"
11763
"================="
11764
11765
#: en/help_topics/debug-flags.txt:4
11766
msgid ""
11767
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11768
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11769
msgstr ""
11770
11771
#: en/help_topics/debug-flags.txt:7
11772
msgid ""
11773
"-Dauth Trace authentication sections used.\n"
11774
"-Dbytes Print out how many bytes were transferred\n"
11775
"-Ddirstate Trace dirstate activity (verbose!)\n"
11776
"-Derror Instead of normal error handling, always print a "
11777
"traceback\n"
11778
" on error.\n"
11779
"-Devil Capture call sites that do expensive or badly-scaling\n"
11780
" operations.\n"
11781
"-Dfetch Trace history copying between repositories.\n"
11782
"-Dfilters Emit information for debugging content filtering.\n"
11783
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11784
"fetch.\n"
11785
"-Dgraph Trace graph traversal.\n"
11786
"-Dhashcache Log every time a working file is read to determine its "
11787
"hash.\n"
11788
"-Dhooks Trace hook execution.\n"
11789
"-Dhpss Trace smart protocol requests and responses.\n"
11790
"-Dhpssdetail More hpss details.\n"
11791
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11792
"-Dhttp Trace http connections, requests and responses.\n"
11793
"-Dindex Trace major index operations.\n"
11794
"-Dknit Trace knit operations.\n"
11795
"-Dlock Trace when lockdir locks are taken or released.\n"
11796
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11797
" retrying the request.\n"
11798
"-Dprogress Trace progress bar operations.\n"
11799
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11800
"-Dmerge Emit information for debugging merges.\n"
11801
"-Dno_apport Don't use apport to report crashes.\n"
11802
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11803
"-Dpack Emit information about pack operations.\n"
11804
"-Drelock Emit a message every time a branch or repository object "
11805
"is\n"
11806
" unlocked then relocked the same way.\n"
11807
"-Dsftp Trace SFTP internals.\n"
11808
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11809
"expected\n"
11810
"-Dstream Trace fetch streams.\n"
11811
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11812
"portable\n"
11813
" manner.\n"
11814
"-Dunlock Some errors during unlock are treated as warnings.\n"
11815
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11816
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11817
"appropriate\n"
11818
" for the format, even for non-local fetches.\n"
11819
msgstr ""
11820
11821
#: en/help_topics/diverged-branches.txt:1
11822
msgid ""
11823
"Diverged Branches\n"
11824
"================="
11825
msgstr ""
11826
"Ramas con divergencia\n"
11827
"=================="
11828
11829
#: en/help_topics/diverged-branches.txt:4
11830
msgid ""
11831
"When Bazaar tries to push one branch onto another, it requires that the\n"
11832
"destination branch must be ready to receive the source branch. If this "
11833
"isn't\n"
11834
"the case, then we say that the branches have ``diverged``. Branches are\n"
11835
"considered diverged if the destination branch's most recent commit is one "
11836
"that\n"
11837
"has not been merged (directly or indirectly) by the source branch. To "
11838
"recover\n"
11839
"from diverged branches, one must merge the missing revisions into the "
11840
"source\n"
11841
"branch."
11842
msgstr ""
11843
11844
#: en/help_topics/diverged-branches.txt:12
11845
msgid ""
11846
"This situation commonly arises when using a centralized workflow with local\n"
11847
"commits. If someone else has committed new work to the mainline since your\n"
11848
"last pull and you have local commits that have not yet been pushed to the\n"
11849
"mainline, then your local branch and the mainline have diverged."
11850
msgstr ""
11851
11852
#: en/help_topics/diverged-branches.txt:17
11853
msgid ""
11854
"Discovering What Has Diverged\n"
11855
"-----------------------------"
11856
msgstr ""
11857
11858
#: en/help_topics/diverged-branches.txt:20
11859
msgid ""
11860
"The ``bzr missing`` command is used to find out what revisions are in "
11861
"another\n"
11862
"branch that are not present in the current branch, and vice-versa. It shows "
11863
"a\n"
11864
"summary of which extra revisions exist in each branch. If you want to see "
11865
"the\n"
11866
"precise effects of those revisions, you can use ``bzr diff --"
11867
"old=other_branch``\n"
11868
"to show the differences between other_branch and your current branch."
11869
msgstr ""
11870
11871
#: en/help_topics/diverged-branches.txt:26
11872
msgid ""
11873
"A Solution\n"
11874
"----------"
11875
msgstr ""
11876
"Una solución\n"
11877
"------------"
11878
11879
#: en/help_topics/diverged-branches.txt:29
11880
msgid ""
11881
"The solution is to merge the revisions from the mainline into your local\n"
11882
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11883
"mainline. This merge may result in conflicts if the other developer's "
11884
"changes\n"
11885
"overlap with your changes. These conflicts should be resolved before\n"
11886
"continuing. After any conflicts have been resolved, or even if there were "
11887
"no\n"
11888
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11889
"to your local branch. This requirement gives you an opportunity to test "
11890
"the\n"
11891
"resulting working tree for correctness, since the merged revisions could "
11892
"have\n"
11893
"made arbitrary changes. After testing, you should commit the merge using\n"
11894
"``bzr commit``. This clears up the diverged branches situation. Your "
11895
"local\n"
11896
"branch can now be pushed to the mainline.\n"
11897
msgstr ""
11898
11899
#: en/help_topics/eol.txt:1
11900
msgid ""
11901
"End of Line Conversion\n"
11902
"======================"
11903
msgstr ""
11904
"Conversión de fin de línea\n"
11905
"====================="
11906
11907
#: en/help_topics/eol.txt:4
11908
msgid ""
11909
"EOL conversion is provided as a content filter where Bazaar internally\n"
11910
"stores a canonical format but outputs a convenience format. See\n"
11911
"``bzr help content-filters`` for general information about using these."
11912
msgstr ""
11913
11914
#: en/help_topics/eol.txt:8
11915
msgid ""
11916
"Note: Content filtering is only supported in recently added formats,\n"
11917
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11918
"in a recent format. (Just setting the format on the repository\n"
11919
"is not enough.) If content filtering does not appear to be working, use\n"
11920
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11921
"or later."
11922
msgstr ""
11923
11924
#: en/help_topics/eol.txt:15
11925
msgid ""
11926
"EOL conversion needs to be enabled for selected file patterns using\n"
11927
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11928
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11929
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11930
"supported in a future verison of Bazaar."
11931
msgstr ""
11932
11933
#: en/help_topics/eol.txt:21
11934
msgid ""
11935
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11936
"(If a value is not set, ``exact`` is the default.)"
11937
msgstr ""
11938
11939
#: en/help_topics/eol.txt:24
11940
msgid ""
11941
" ========== ===================================== ======================\n"
11942
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11943
" ========== ===================================== ======================\n"
11944
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11945
" ---------- ------------------------------------- ----------------------\n"
11946
" ``lf`` ``lf`` ``lf``\n"
11947
" ---------- ------------------------------------- ----------------------\n"
11948
" ``crlf`` ``crlf`` ``lf``\n"
11949
" ---------- ------------------------------------- ----------------------\n"
11950
" ``exact`` No conversion Exactly as in file\n"
11951
" ========== ===================================== ======================"
11952
msgstr ""
11953
11954
#: en/help_topics/eol.txt:36
11955
msgid ""
11956
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11957
"byte is detected in the file."
11958
msgstr ""
11959
11960
#: en/help_topics/eol.txt:39
11961
msgid ""
11962
"For users working on a cross-platform project, here is a suggested rule\n"
11963
"to use as a starting point::"
11964
msgstr ""
11965
11966
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11967
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11968
msgid ""
11969
" [name *]\n"
11970
" eol = native"
11971
msgstr ""
11972
11973
#: en/help_topics/eol.txt:45
11974
msgid ""
11975
"If you have binary files that do not contain a null byte though, be\n"
11976
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11977
"by giving more explicit patterns earlier in the rules file. For example::"
11978
msgstr ""
11979
11980
#: en/help_topics/eol.txt:49
11981
msgid ""
11982
" [name *.png]\n"
11983
" eol = exact"
11984
msgstr ""
11985
11986
#: en/help_topics/eol.txt:55
11987
msgid ""
11988
"If your working tree is on a network drive shared by users on different\n"
11989
"operating systems, you typically want to force certain conventions for\n"
11990
"certain files. In that way, if a file is created with the wrong line\n"
11991
"endings or line endings get mixed during editing, it gets committed\n"
11992
"correctly and gets checked out correctly. For example::"
11993
msgstr ""
11994
11995
#: en/help_topics/eol.txt:61
11996
msgid ""
11997
" [name *.bat]\n"
11998
" eol = crlf"
11999
msgstr ""
12000
12001
#: en/help_topics/eol.txt:64
12002
msgid ""
12003
" [name *.sh]\n"
12004
" eol = lf"
12005
msgstr ""
12006
12007
#: en/help_topics/eol.txt:70
12008
msgid ""
12009
"If you take the care to create files with their required endings, you can\n"
12010
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12011
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12012
"introducing mixed line endings will be corrected during commit for files\n"
12013
"with those settings."
12014
msgstr ""
12015
12016
#: en/help_topics/eol.txt:76
12017
msgid ""
12018
"If you have sample test data that deliberately has text files with mixed\n"
12019
"newline conventions, you can ask for those to be left alone like this::"
12020
msgstr ""
12021
12022
#: en/help_topics/eol.txt:79
12023
msgid ""
12024
" [name test_data/]\n"
12025
" eol = exact"
12026
msgstr ""
12027
12028
#: en/help_topics/eol.txt:85
12029
msgid ""
12030
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12031
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12032
"of content analysis to detect binary files for commands like ``diff``.\n"
12033
"In the future, a ``binary = true`` rule may be added but it is not\n"
12034
"supported yet.)"
12035
msgstr ""
12036
12037
#: en/help_topics/eol.txt:91
12038
msgid ""
12039
"If you have an existing repository with text files already stored using\n"
12040
"Windows newline conventions (``crlf``), then you may want to keep using "
12041
"that\n"
12042
"convention in the repository. Forcing certain files to this convention\n"
12043
"may also help users who do not have rules configured. To do this, set\n"
12044
"``eol`` to one of the values below."
12045
msgstr ""
12046
12047
#: en/help_topics/eol.txt:97
12048
msgid ""
12049
" ============================ ======================== "
12050
"======================\n"
12051
" Value Checkout end-of-lines as Commit end-of-lines "
12052
"as\n"
12053
" ============================ ======================== "
12054
"======================\n"
12055
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12056
" ``lf`` otherwise\n"
12057
" ---------------------------- ------------------------ ----------------------"
12058
"\n"
12059
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12060
" ---------------------------- ------------------------ ----------------------"
12061
"\n"
12062
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12063
" ============================ ======================== ======================"
12064
msgstr ""
12065
12066
#: en/help_topics/eol.txt:108
12067
msgid ""
12068
"For users working on an existing project that uses Windows newline\n"
12069
"conventions in their Bazaar repository, this rule is suggested as a\n"
12070
"starting point::"
12071
msgstr ""
12072
12073
#: en/help_topics/eol.txt:112
12074
msgid ""
12075
" [name *]\n"
12076
" eol = native-with-crlf-in-repo"
12077
msgstr ""
12078
12079
#: en/help_topics/eol.txt:115
12080
msgid ""
12081
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12082
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12083
"``crlf`` and ``exact``."
12084
msgstr ""
12085
12086
#: en/help_topics/eol.txt:119
12087
msgid ""
12088
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12089
"never reject files because a given line ending or mixed line endings\n"
12090
"are found. A precommit hook should be used if you wish to validate\n"
12091
"(and not just convert) content before committing.\n"
12092
msgstr ""
12093
12094
#: en/help_topics/hidden-commands.txt:1
12095
msgid ""
12096
"added List files added in working tree.\n"
12097
"ancestry List all revisions merged into this branch.\n"
12098
"assert-fail Test reporting of assertion failures\n"
12099
"bundle-info Output interesting stats about a bundle\n"
12100
"bundle-revisions Create a merge-directive for submitting changes.\n"
12101
"cat-revision Write out metadata for a revision.\n"
12102
"dump-btree Dump the contents of a btree index file to stdout.\n"
12103
"export-pot Export command helps and error messages in po format.\n"
12104
"file-id Print file_id of a particular file or directory.\n"
12105
"file-path Print path of file_ids to a file or directory.\n"
12106
"find-merge-base Find and print a base revision for merging two "
12107
"branches.\n"
12108
"hooks Show hooks.\n"
12109
"inventory Show inventory of the current working copy or a "
12110
"revision.\n"
12111
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12112
"lookup-revision Lookup the revision-id from a revision-number\n"
12113
"merge-directive Generate a merge directive for auto-merge tools.\n"
12114
"modified List files modified in working tree.\n"
12115
"re-sign Create a digital signature for an existing revision.\n"
12116
"reference list, view and set branch locations for nested trees.\n"
12117
"relpath Show path of a file relative to root\n"
12118
"repair-workingtree Reset the working tree state file.\n"
12119
"revision-history Display the list of revision ids on a branch.\n"
12120
"revision-info Show revision number and revision id for a given "
12121
"revision\n"
12122
" identifier.\n"
12123
"rocks Statement of optimism.\n"
12124
"selftest Run internal test suite.\n"
12125
"shell-complete Show appropriate completions for context.\n"
12126
"test-script Run a shell-like test from a file.\n"
12127
"touching-revisions Return revision-ids which affected a particular file.\n"
12128
"unknowns List unknown files.\n"
12129
"wait-until-signalled Test helper for\n"
12130
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:1
12134
msgid ""
12135
"\n"
12136
"Hooks\n"
12137
"====="
12138
msgstr ""
12139
"\n"
12140
"Ganchos\n"
12141
"======="
12142
12143
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12144
msgid ""
12145
"Introduction\n"
12146
"------------"
12147
msgstr ""
12148
"Introducción\n"
12149
"------------"
12150
12151
#: en/help_topics/hooks.txt:8
12152
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12153
msgstr ""
12154
12155
#: en/help_topics/hooks.txt:10
12156
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:12
12160
msgid ""
12161
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:14
12165
msgid ""
12166
"The class that contains each hook is given before the hooks it supplies. "
12167
"For\n"
12168
"instance, BranchHooks as the class is the hooks class for\n"
12169
"`bzrlib.branch.Branch.hooks`."
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:18
12173
msgid ""
12174
"Each description also indicates whether the hook runs on the client (the\n"
12175
"machine where bzr was invoked) or the server (the machine addressed by\n"
12176
"the branch URL). These may be, but are not necessarily, the same machine."
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:22
12180
msgid ""
12181
"Plugins (including hooks) are run on the server if all of these is true:"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:24
12185
msgid ""
12186
" * The connection is via a smart server (accessed with a URL starting with\n"
12187
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12188
"\"http://\"\n"
12189
" URL when a smart server is available via HTTP)."
12190
msgstr ""
12191
12192
#: en/help_topics/hooks.txt:28
12193
msgid ""
12194
" * The hook is either server specific or part of general infrastructure "
12195
"rather\n"
12196
" than client specific code (such as commit)."
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:31
12200
msgid ""
12201
"\n"
12202
"BranchHooks\n"
12203
"-----------"
12204
msgstr ""
12205
"\n"
12206
"BranchHooks\n"
12207
"-----------"
12208
12209
#: en/help_topics/hooks.txt:35
12210
msgid ""
12211
"automatic_tag_name\n"
12212
"~~~~~~~~~~~~~~~~~~"
12213
msgstr ""
12214
"automatic_tag_name\n"
12215
"~~~~~~~~~~~~~~~~~~"
12216
12217
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12218
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12219
msgid "Introduced in: 2.2"
12220
msgstr "Introducido en: 2.2"
12221
12222
#: en/help_topics/hooks.txt:40
12223
msgid ""
12224
"Called to determine an automatic tag name for a revision.\n"
12225
"automatic_tag_name is called with (branch, revision_id) and should\n"
12226
"return a tag name or None if no tag name could be determined. The\n"
12227
"first non-None tag name returned will be used."
12228
msgstr ""
12229
12230
#: en/help_topics/hooks.txt:45
12231
msgid ""
12232
"open\n"
12233
"~~~~"
12234
msgstr ""
12235
"open\n"
12236
"~~~~"
12237
12238
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12239
#: en/help_topics/hooks.txt:304
12240
msgid "Introduced in: 1.8"
12241
msgstr "Introducido en: 1.8"
12242
12243
#: en/help_topics/hooks.txt:50
12244
msgid ""
12245
"Called with the Branch object that has been opened after a branch is\n"
12246
"opened."
12247
msgstr ""
12248
12249
#: en/help_topics/hooks.txt:53
12250
msgid ""
12251
"post_branch_init\n"
12252
"~~~~~~~~~~~~~~~~"
12253
msgstr ""
12254
"post_branch_init\n"
12255
"~~~~~~~~~~~~~~~~"
12256
12257
#: en/help_topics/hooks.txt:58
12258
msgid ""
12259
"Called after new branch initialization completes. post_branch_init is\n"
12260
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12261
"branch and checkout (both heavyweight and lightweight) will all\n"
12262
"trigger this hook."
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:63
12266
msgid ""
12267
"post_change_branch_tip\n"
12268
"~~~~~~~~~~~~~~~~~~~~~~"
12269
msgstr ""
12270
"post_change_branch_tip\n"
12271
"~~~~~~~~~~~~~~~~~~~~~~"
12272
12273
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
12274
msgid "Introduced in: 1.4"
12275
msgstr "Introducido en: 1.4"
12276
12277
#: en/help_topics/hooks.txt:68
12278
msgid ""
12279
"Called in bzr client and server after a change to the tip of a branch\n"
12280
"is made. post_change_branch_tip is called with a\n"
12281
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12282
"uncommit will all trigger this hook."
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12286
msgid ""
12287
"post_commit\n"
12288
"~~~~~~~~~~~"
12289
msgstr ""
12290
"post_commit\n"
12291
"~~~~~~~~~~~"
12292
12293
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12294
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12295
#: en/help_topics/hooks.txt:145
12296
msgid "Introduced in: 0.15"
12297
msgstr "Introducido en: 0.15"
12298
12299
#: en/help_topics/hooks.txt:78
12300
msgid ""
12301
"Called in the bzr client after a commit has completed. post_commit is\n"
12302
"called with (local, master, old_revno, old_revid, new_revno,\n"
12303
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12304
"branch."
12305
msgstr ""
12306
12307
#: en/help_topics/hooks.txt:83
12308
msgid ""
12309
"post_pull\n"
12310
"~~~~~~~~~"
12311
msgstr ""
12312
"post_pull\n"
12313
"~~~~~~~~~"
12314
12315
#: en/help_topics/hooks.txt:88
12316
msgid ""
12317
"Called after a pull operation completes. post_pull is called with a\n"
12318
"bzrlib.branch.PullResult object and only runs in the bzr client."
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:91
12322
msgid ""
12323
"post_push\n"
12324
"~~~~~~~~~"
12325
msgstr ""
12326
"post_push\n"
12327
"~~~~~~~~~"
12328
12329
#: en/help_topics/hooks.txt:96
12330
msgid ""
12331
"Called after a push operation completes. post_push is called with a\n"
12332
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:99
12336
msgid ""
12337
"post_switch\n"
12338
"~~~~~~~~~~~"
12339
msgstr ""
12340
"post_switch\n"
12341
"~~~~~~~~~~~"
12342
12343
#: en/help_topics/hooks.txt:104
12344
msgid ""
12345
"Called after a checkout switches branch. post_switch is called with a\n"
12346
"bzrlib.branch.SwitchHookParams."
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:107
12350
msgid ""
12351
"post_uncommit\n"
12352
"~~~~~~~~~~~~~"
12353
msgstr ""
12354
"post_uncommit\n"
12355
"~~~~~~~~~~~~~"
12356
12357
#: en/help_topics/hooks.txt:112
12358
msgid ""
12359
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12360
"called with (local, master, old_revno, old_revid, new_revno,\n"
12361
"new_revid) where local is the local branch or None, master is the\n"
12362
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12363
"of None."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:118
12367
msgid ""
12368
"pre_change_branch_tip\n"
12369
"~~~~~~~~~~~~~~~~~~~~~"
12370
msgstr ""
12371
"pre_change_branch_tip\n"
12372
"~~~~~~~~~~~~~~~~~~~~~"
12373
12374
#: en/help_topics/hooks.txt:121
12375
msgid "Introduced in: 1.6"
12376
msgstr "Introducido en: 1.6"
12377
12378
#: en/help_topics/hooks.txt:123
12379
msgid ""
12380
"Called in bzr client and server before a change to the tip of a branch\n"
12381
"is made. pre_change_branch_tip is called with a\n"
12382
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12383
"uncommit will all trigger this hook."
12384
msgstr ""
12385
12386
#: en/help_topics/hooks.txt:128
12387
msgid ""
12388
"pre_commit\n"
12389
"~~~~~~~~~~"
12390
msgstr ""
12391
"pre_commit\n"
12392
"~~~~~~~~~~"
12393
12394
#: en/help_topics/hooks.txt:131
12395
msgid "Introduced in: 0.91"
12396
msgstr "Introducido en: 0.91"
12397
12398
#: en/help_topics/hooks.txt:133
12399
msgid ""
12400
"Called after a commit is calculated but before it is completed.\n"
12401
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12402
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12403
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12404
"TreeDelta object describing changes from the basis revision. hooks\n"
12405
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12406
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12407
"tree."
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:142
12411
msgid ""
12412
"set_rh\n"
12413
"~~~~~~"
12414
msgstr ""
12415
"set_rh\n"
12416
"~~~~~~"
12417
12418
#: en/help_topics/hooks.txt:147
12419
msgid ""
12420
"Invoked whenever the revision history has been set via\n"
12421
"set_revision_history. The api signature is (branch, revision_history),\n"
12422
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12423
"for bzr to trigger, a better hook to use is\n"
12424
"Branch.post_change_branch_tip."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:153
12428
msgid ""
12429
"transform_fallback_location\n"
12430
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12431
msgstr ""
12432
"transform_fallback_location\n"
12433
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12434
12435
#: en/help_topics/hooks.txt:156
12436
msgid "Introduced in: 1.9"
12437
msgstr "Introducido en: 1.9"
12438
12439
#: en/help_topics/hooks.txt:158
12440
msgid ""
12441
"Called when a stacked branch is activating its fallback locations.\n"
12442
"transform_fallback_location is called with (branch, url), and should\n"
12443
"return a new url. Returning the same url allows it to be used as-is,\n"
12444
"returning a different one can be used to cause the branch to stack on\n"
12445
"a closer copy of that fallback_location. Note that the branch cannot\n"
12446
"have history accessing methods called on it during this hook because\n"
12447
"the fallback locations have not been activated. When there are\n"
12448
"multiple hooks installed for transform_fallback_location, all are\n"
12449
"called with the url returned from the previous hook.The order is\n"
12450
"however undefined."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:169
12454
msgid ""
12455
"CommandHooks\n"
12456
"------------"
12457
msgstr ""
12458
"CommandHooks\n"
12459
"------------"
12460
12461
#: en/help_topics/hooks.txt:172
12462
msgid ""
12463
"extend_command\n"
12464
"~~~~~~~~~~~~~~"
12465
msgstr ""
12466
"extend_command\n"
12467
"~~~~~~~~~~~~~~"
12468
12469
#: en/help_topics/hooks.txt:175
12470
msgid "Introduced in: 1.13"
12471
msgstr "Introducido en: 1.13"
12472
12473
#: en/help_topics/hooks.txt:177
12474
msgid ""
12475
"Called after creating a command object to allow modifications such as\n"
12476
"adding or removing options, docs etc. Called with the new\n"
12477
"bzrlib.commands.Command object."
12478
msgstr ""
12479
12480
#: en/help_topics/hooks.txt:181
12481
msgid ""
12482
"get_command\n"
12483
"~~~~~~~~~~~"
12484
msgstr ""
12485
"get_command\n"
12486
"~~~~~~~~~~~"
12487
12488
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12489
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12490
msgid "Introduced in: 1.17"
12491
msgstr "Introducido en: 1.17"
12492
12493
#: en/help_topics/hooks.txt:186
12494
msgid ""
12495
"Called when creating a single command. Called with (cmd_or_None,\n"
12496
"command_name). get_command should either return the cmd_or_None\n"
12497
"parameter, or a replacement Command object that should be used for the\n"
12498
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12499
"Many users will prefer to use bzrlib.commands.register_command or\n"
12500
"plugin_cmds.register_lazy."
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:193
12504
msgid ""
12505
"get_missing_command\n"
12506
"~~~~~~~~~~~~~~~~~~~"
12507
msgstr ""
12508
"get_missing_command\n"
12509
"~~~~~~~~~~~~~~~~~~~"
12510
12511
#: en/help_topics/hooks.txt:198
12512
msgid ""
12513
"Called when creating a single command if no command could be found.\n"
12514
"Called with (command_name). get_missing_command should either return\n"
12515
"None, or a Command object to be used for the command."
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:202
12519
msgid ""
12520
"list_commands\n"
12521
"~~~~~~~~~~~~~"
12522
msgstr ""
12523
"list_commands\n"
12524
"~~~~~~~~~~~~~"
12525
12526
#: en/help_topics/hooks.txt:207
12527
msgid ""
12528
"Called when enumerating commands. Called with a set of cmd_name\n"
12529
"strings for all the commands found so far. This set is safe to mutate\n"
12530
"- e.g. to remove a command. list_commands should return the updated\n"
12531
"set of command names."
12532
msgstr ""
12533
12534
#: en/help_topics/hooks.txt:212
12535
msgid ""
12536
"_ConfigHooks\n"
12537
"------------"
12538
msgstr ""
12539
"_ConfigHooks\n"
12540
"------------"
12541
12542
#: en/help_topics/hooks.txt:215
12543
msgid ""
12544
"get\n"
12545
"~~~"
12546
msgstr ""
12547
"get\n"
12548
"~~~"
12549
12550
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12551
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12552
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12553
#: en/help_topics/hooks.txt:427
12554
msgid "Introduced in: 2.4"
12555
msgstr "Introducido en: 2.4"
12556
12557
#: en/help_topics/hooks.txt:220
12558
msgid ""
12559
"Invoked when a config option is read. The signature is (stack, name,\n"
12560
"value)."
12561
msgstr ""
12562
12563
#: en/help_topics/hooks.txt:223
12564
msgid ""
12565
"load\n"
12566
"~~~~"
12567
msgstr ""
12568
"load\n"
12569
"~~~~"
12570
12571
#: en/help_topics/hooks.txt:228
12572
msgid "Invoked when a config store is loaded. The signature is (store)."
12573
msgstr ""
12574
12575
#: en/help_topics/hooks.txt:230
12576
msgid ""
12577
"remove\n"
12578
"~~~~~~"
12579
msgstr ""
12580
"remove\n"
12581
"~~~~~~"
12582
12583
#: en/help_topics/hooks.txt:235
12584
msgid ""
12585
"Invoked when a config option is removed. The signature is (stack,\n"
12586
"name)."
12587
msgstr ""
12588
12589
#: en/help_topics/hooks.txt:238
12590
msgid ""
12591
"save\n"
12592
"~~~~"
12593
msgstr ""
12594
"save\n"
12595
"~~~~"
12596
12597
#: en/help_topics/hooks.txt:243
12598
msgid "Invoked when a config store is saved. The signature is (store)."
12599
msgstr ""
12600
12601
#: en/help_topics/hooks.txt:245
12602
msgid ""
12603
"set\n"
12604
"~~~"
12605
msgstr ""
12606
"set\n"
12607
"~~~"
12608
12609
#: en/help_topics/hooks.txt:250
12610
msgid ""
12611
"Invoked when a config option is set. The signature is (stack, name,\n"
12612
"value)."
12613
msgstr ""
12614
12615
#: en/help_topics/hooks.txt:253
12616
msgid ""
12617
"ControlDirHooks\n"
12618
"---------------"
12619
msgstr ""
12620
12621
#: en/help_topics/hooks.txt:256
12622
msgid ""
12623
"post_repo_init\n"
12624
"~~~~~~~~~~~~~~"
12625
msgstr ""
12626
"post_repo_init\n"
12627
"~~~~~~~~~~~~~~"
12628
12629
#: en/help_topics/hooks.txt:261
12630
msgid ""
12631
"Invoked after a repository has been initialized. post_repo_init is\n"
12632
"called with a bzrlib.controldir.RepoInitHookParams."
12633
msgstr ""
12634
12635
#: en/help_topics/hooks.txt:264
12636
msgid ""
12637
"pre_open\n"
12638
"~~~~~~~~"
12639
msgstr ""
12640
"pre_open\n"
12641
"~~~~~~~~"
12642
12643
#: en/help_topics/hooks.txt:267
12644
msgid "Introduced in: 1.14"
12645
msgstr "Introducido en: 1.14"
12646
12647
#: en/help_topics/hooks.txt:269
12648
msgid ""
12649
"Invoked before attempting to open a ControlDir with the transport that\n"
12650
"the open will use."
12651
msgstr ""
12652
12653
#: en/help_topics/hooks.txt:272
12654
msgid ""
12655
"InfoHooks\n"
12656
"---------"
12657
msgstr ""
12658
"InfoHooks\n"
12659
"---------"
12660
12661
#: en/help_topics/hooks.txt:275
12662
msgid ""
12663
"repository\n"
12664
"~~~~~~~~~~"
12665
msgstr ""
12666
"repository\n"
12667
"~~~~~~~~~~"
12668
12669
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12670
#: en/help_topics/hooks.txt:505
12671
msgid "Introduced in: 1.15"
12672
msgstr "Introducido en: 1.15"
12673
12674
#: en/help_topics/hooks.txt:280
12675
msgid ""
12676
"Invoked when displaying the statistics for a repository. repository is\n"
12677
"called with a statistics dictionary as returned by the repository and\n"
12678
"a file-like object to write to."
12679
msgstr ""
12680
12681
#: en/help_topics/hooks.txt:284
12682
msgid ""
12683
"LockHooks\n"
12684
"---------"
12685
msgstr ""
12686
"LockHooks\n"
12687
"---------"
12688
12689
#: en/help_topics/hooks.txt:287
12690
msgid ""
12691
"lock_acquired\n"
12692
"~~~~~~~~~~~~~"
12693
msgstr ""
12694
"lock_acquired\n"
12695
"~~~~~~~~~~~~~"
12696
12697
#: en/help_topics/hooks.txt:292
12698
msgid ""
12699
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12700
msgstr ""
12701
12702
#: en/help_topics/hooks.txt:294
12703
msgid ""
12704
"lock_broken\n"
12705
"~~~~~~~~~~~"
12706
msgstr ""
12707
"lock_broken\n"
12708
"~~~~~~~~~~~"
12709
12710
#: en/help_topics/hooks.txt:299
12711
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12712
msgstr ""
12713
12714
#: en/help_topics/hooks.txt:301
12715
msgid ""
12716
"lock_released\n"
12717
"~~~~~~~~~~~~~"
12718
msgstr ""
12719
"lock_released\n"
12720
"~~~~~~~~~~~~~"
12721
12722
#: en/help_topics/hooks.txt:306
12723
msgid ""
12724
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12725
msgstr ""
12726
12727
#: en/help_topics/hooks.txt:308
12728
msgid ""
12729
"MergeHooks\n"
12730
"----------"
12731
msgstr ""
12732
"MergeHooks\n"
12733
"----------"
12734
12735
#: en/help_topics/hooks.txt:311
12736
msgid ""
12737
"merge_file_content\n"
12738
"~~~~~~~~~~~~~~~~~~"
12739
msgstr ""
12740
"merge_file_content\n"
12741
"~~~~~~~~~~~~~~~~~~"
12742
12743
#: en/help_topics/hooks.txt:314
12744
msgid "Introduced in: 2.1"
12745
msgstr "Introducido en: 2.1"
12746
12747
#: en/help_topics/hooks.txt:316
12748
msgid ""
12749
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12750
"object when starting a merge. Should return either None or a subclass\n"
12751
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12752
"called per file that needs to be merged (including when one side has\n"
12753
"deleted the file and the other has changed it). See the\n"
12754
"AbstractPerFileMerger API docs for details on how it is used by merge."
12755
msgstr ""
12756
12757
#: en/help_topics/hooks.txt:323
12758
msgid ""
12759
"post_merge\n"
12760
"~~~~~~~~~~"
12761
msgstr ""
12762
12763
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12764
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12765
msgid "Introduced in: 2.5"
12766
msgstr ""
12767
12768
#: en/help_topics/hooks.txt:328
12769
msgid ""
12770
"Called after a merge. Receives a Merger object as the single argument.\n"
12771
"The return value is ignored."
12772
msgstr ""
12773
12774
#: en/help_topics/hooks.txt:331
12775
msgid ""
12776
"pre_merge\n"
12777
"~~~~~~~~~"
12778
msgstr ""
12779
12780
#: en/help_topics/hooks.txt:336
12781
msgid ""
12782
"Called before a merge. Receives a Merger object as the single\n"
12783
"argument."
12784
msgstr ""
12785
12786
#: en/help_topics/hooks.txt:339
12787
msgid ""
12788
"MergeDirectiveHooks\n"
12789
"-------------------"
12790
msgstr ""
12791
"MergeDirectiveHooks\n"
12792
"-------------------"
12793
12794
#: en/help_topics/hooks.txt:342
12795
msgid ""
12796
"merge_request_body\n"
12797
"~~~~~~~~~~~~~~~~~~"
12798
msgstr ""
12799
"merge_request_body\n"
12800
"~~~~~~~~~~~~~~~~~~"
12801
12802
#: en/help_topics/hooks.txt:345
12803
msgid "Introduced in: 1.15.0"
12804
msgstr "Introducido en: 1.15.0"
12805
12806
#: en/help_topics/hooks.txt:347
12807
msgid ""
12808
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12809
"request. Callbacks must return a body. If more than one callback is\n"
12810
"registered, the output of one callback is provided to the next."
12811
msgstr ""
12812
12813
#: en/help_topics/hooks.txt:351
12814
msgid ""
12815
"MessageEditorHooks\n"
12816
"------------------"
12817
msgstr ""
12818
"MessageEditorHooks\n"
12819
"------------------"
12820
12821
#: en/help_topics/hooks.txt:354
12822
msgid ""
12823
"commit_message_template\n"
12824
"~~~~~~~~~~~~~~~~~~~~~~~"
12825
msgstr ""
12826
"commit_message_template\n"
12827
"~~~~~~~~~~~~~~~~~~~~~~~"
12828
12829
#: en/help_topics/hooks.txt:357
12830
msgid "Introduced in: 1.10"
12831
msgstr "Introducido en: 1.10"
12832
12833
#: en/help_topics/hooks.txt:359
12834
msgid ""
12835
"Called when a commit message is being generated.\n"
12836
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12837
"and the message that is known so far. commit_message_template must\n"
12838
"return a new message to use (which could be the same as it was given).\n"
12839
"When there are multiple hooks registered for commit_message_template,\n"
12840
"they are chained with the result from the first passed into the\n"
12841
"second, and so on."
12842
msgstr ""
12843
12844
#: en/help_topics/hooks.txt:367
12845
msgid ""
12846
"set_commit_message\n"
12847
"~~~~~~~~~~~~~~~~~~"
12848
msgstr ""
12849
"set_commit_message\n"
12850
"~~~~~~~~~~~~~~~~~~"
12851
12852
#: en/help_topics/hooks.txt:372
12853
msgid ""
12854
"Set a fixed commit message. set_commit_message is called with the\n"
12855
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12856
"properties by editing commit.builder._revprops) and the message so\n"
12857
"far. set_commit_message must return the message to use or None if it\n"
12858
"should use the message editor as normal."
12859
msgstr ""
12860
12861
#: en/help_topics/hooks.txt:378
12862
msgid ""
12863
"MutableTreeHooks\n"
12864
"----------------"
12865
msgstr ""
12866
"MutableTreeHooks\n"
12867
"----------------"
12868
12869
#: en/help_topics/hooks.txt:381
12870
msgid ""
12871
"post_build_tree\n"
12872
"~~~~~~~~~~~~~~~"
12873
msgstr ""
12874
12875
#: en/help_topics/hooks.txt:386
12876
msgid ""
12877
"Called after a completely new tree is built. The hook is called with\n"
12878
"the tree as its only argument."
12879
msgstr ""
12880
12881
#: en/help_topics/hooks.txt:392
12882
msgid "Introduced in: 2.0"
12883
msgstr "Introducido en: 2.0"
12884
12885
#: en/help_topics/hooks.txt:394
12886
msgid ""
12887
"Called after a commit is performed on a tree. The hook is called with\n"
12888
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12889
"commit was performed on is available via the mutable_tree attribute of\n"
12890
"that object."
12891
msgstr ""
12892
12893
#: en/help_topics/hooks.txt:399
12894
msgid ""
12895
"start_commit\n"
12896
"~~~~~~~~~~~~"
12897
msgstr ""
12898
"start_commit\n"
12899
"~~~~~~~~~~~~"
12900
12901
#: en/help_topics/hooks.txt:404
12902
msgid ""
12903
"Called before a commit is performed on a tree. The start commit hook\n"
12904
"is able to change the tree before the commit takes place. start_commit\n"
12905
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12906
"being performed on."
12907
msgstr ""
12908
12909
#: en/help_topics/hooks.txt:409
12910
msgid ""
12911
"SmartClientHooks\n"
12912
"----------------"
12913
msgstr ""
12914
"SmartClientHooks\n"
12915
"----------------"
12916
12917
#: en/help_topics/hooks.txt:412
12918
msgid ""
12919
"call\n"
12920
"~~~~"
12921
msgstr ""
12922
"call\n"
12923
"~~~~"
12924
12925
#: en/help_topics/hooks.txt:415
12926
msgid "Introduced in: unknown"
12927
msgstr ""
12928
12929
#: en/help_topics/hooks.txt:417
12930
msgid ""
12931
"Called when the smart client is submitting a request to the smart\n"
12932
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12933
"Streaming request bodies, and responses, are not accessible."
12934
msgstr ""
12935
12936
#: en/help_topics/hooks.txt:421
12937
msgid ""
12938
"SmartServerHooks\n"
12939
"----------------"
12940
msgstr ""
12941
"SmartServerHooks\n"
12942
"----------------"
12943
12944
#: en/help_topics/hooks.txt:424
12945
msgid ""
12946
"server_exception\n"
12947
"~~~~~~~~~~~~~~~~"
12948
msgstr ""
12949
"server_exception\n"
12950
"~~~~~~~~~~~~~~~~"
12951
12952
#: en/help_topics/hooks.txt:429
12953
msgid ""
12954
"Called by the bzr server when an exception occurs. server_exception is\n"
12955
"called with the sys.exc_info() tuple return true for the hook if the\n"
12956
"exception has been handled, in which case the server will exit\n"
12957
"normally."
12958
msgstr ""
12959
12960
#: en/help_topics/hooks.txt:434
12961
msgid ""
12962
"server_started\n"
12963
"~~~~~~~~~~~~~~"
12964
msgstr ""
12965
"server_started\n"
12966
"~~~~~~~~~~~~~~"
12967
12968
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12969
msgid "Introduced in: 0.16"
12970
msgstr ""
12971
12972
#: en/help_topics/hooks.txt:439
12973
msgid ""
12974
"Called by the bzr server when it starts serving a directory.\n"
12975
"server_started is called with (backing urls, public url), where\n"
12976
"backing_url is a list of URLs giving the server-specific directory\n"
12977
"locations, and public_url is the public URL for the directory being\n"
12978
"served."
12979
msgstr ""
12980
12981
#: en/help_topics/hooks.txt:445
12982
msgid ""
12983
"server_started_ex\n"
12984
"~~~~~~~~~~~~~~~~~"
12985
msgstr ""
12986
"server_started_ex\n"
12987
"~~~~~~~~~~~~~~~~~"
12988
12989
#: en/help_topics/hooks.txt:450
12990
msgid ""
12991
"Called by the bzr server when it starts serving a directory.\n"
12992
"server_started is called with (backing_urls, server_obj)."
12993
msgstr ""
12994
12995
#: en/help_topics/hooks.txt:453
12996
msgid ""
12997
"server_stopped\n"
12998
"~~~~~~~~~~~~~~"
12999
msgstr ""
13000
"server_stopped\n"
13001
"~~~~~~~~~~~~~~"
13002
13003
#: en/help_topics/hooks.txt:458
13004
msgid ""
13005
"Called by the bzr server when it stops serving a directory.\n"
13006
"server_stopped is called with the same parameters as the\n"
13007
"server_started hook: (backing_urls, public_url)."
13008
msgstr ""
13009
13010
#: en/help_topics/hooks.txt:462
13011
msgid ""
13012
"StatusHooks\n"
13013
"-----------"
13014
msgstr ""
13015
"StatusHooks\n"
13016
"-----------"
13017
13018
#: en/help_topics/hooks.txt:465
13019
msgid ""
13020
"post_status\n"
13021
"~~~~~~~~~~~"
13022
msgstr ""
13023
"post_status\n"
13024
"~~~~~~~~~~~"
13025
13026
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
13027
msgid "Introduced in: 2.3"
13028
msgstr ""
13029
13030
#: en/help_topics/hooks.txt:470
13031
msgid ""
13032
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13033
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13034
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13035
"correspond to the command line options specified by the user for the\n"
13036
"status command. to_file is the output stream for writing."
13037
msgstr ""
13038
13039
#: en/help_topics/hooks.txt:476
13040
msgid ""
13041
"pre_status\n"
13042
"~~~~~~~~~~"
13043
msgstr ""
13044
"pre_status\n"
13045
"~~~~~~~~~~"
13046
13047
#: en/help_topics/hooks.txt:481
13048
msgid ""
13049
"Called with argument StatusHookParams before Bazaar displays the\n"
13050
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13051
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13052
"correspond to the command line options specified by the user for the\n"
13053
"status command. to_file is the output stream for writing."
13054
msgstr ""
13055
13056
#: en/help_topics/hooks.txt:487
13057
msgid ""
13058
"TransportHooks\n"
13059
"--------------"
13060
msgstr ""
13061
13062
#: en/help_topics/hooks.txt:490
13063
msgid ""
13064
"post_connect\n"
13065
"~~~~~~~~~~~~"
13066
msgstr ""
13067
13068
#: en/help_topics/hooks.txt:495
13069
msgid ""
13070
"Called after a new connection is established or a reconnect occurs.\n"
13071
"The sole argument passed is either the connected transport or smart\n"
13072
"medium instance."
13073
msgstr ""
13074
13075
#: en/help_topics/hooks.txt:499
13076
msgid ""
13077
"RioVersionInfoBuilderHooks\n"
13078
"--------------------------"
13079
msgstr ""
13080
"RioVersionInfoBuilderHooks\n"
13081
"--------------------------"
13082
13083
#: en/help_topics/hooks.txt:502
13084
msgid ""
13085
"revision\n"
13086
"~~~~~~~~"
13087
msgstr ""
13088
"revisión\n"
13089
"~~~~~~~~"
13090
13091
#: en/help_topics/hooks.txt:507
13092
msgid ""
13093
"Invoked when adding information about a revision to the RIO stanza\n"
13094
"that is printed. revision is called with a revision object and a RIO\n"
13095
"stanza.\n"
13096
msgstr ""
13097
13098
#: en/help_topics/location-alias.txt:1
13099
msgid ""
13100
"Location aliases\n"
13101
"================"
13102
msgstr ""
13103
"Alias de ubicación\n"
13104
"=============="
13105
13106
#: en/help_topics/location-alias.txt:4
13107
msgid ""
13108
"Bazaar defines several aliases for locations associated with a branch. "
13109
"These\n"
13110
"can be used with most commands that expect a location, such as `bzr push`."
13111
msgstr ""
13112
13113
#: en/help_topics/location-alias.txt:7
13114
msgid "The aliases are::"
13115
msgstr "Los alias son::"
13116
13117
#: en/help_topics/location-alias.txt:9
13118
msgid ""
13119
" :bound The branch this branch is bound to, for bound branches.\n"
13120
" :parent The parent of this branch.\n"
13121
" :public The public location of this branch.\n"
13122
" :push The saved location used for `bzr push` with no arguments.\n"
13123
" :submit The submit branch for this branch.\n"
13124
" :this This branch."
13125
msgstr ""
13126
13127
#: en/help_topics/location-alias.txt:16
13128
msgid "For example, to push to the parent location::"
13129
msgstr "Por ejemplo para impulsar la ubicación padre::"
13130
13131
#: en/help_topics/location-alias.txt:18
13132
msgid " bzr push :parent\n"
13133
msgstr ""
13134
13135
#: en/help_topics/log-formats.txt:1
13136
msgid ""
13137
"Log Formats\n"
13138
"==========="
13139
msgstr ""
13140
"Formatos de registro\n"
13141
"================"
13142
13143
#: en/help_topics/log-formats.txt:4
13144
msgid ""
13145
"A log format controls how information about each revision is displayed.\n"
13146
"The standard log formats are compared below::"
13147
msgstr ""
13148
13149
#: en/help_topics/log-formats.txt:7
13150
msgid ""
13151
" Feature long short line\n"
13152
" ---------------------- ------------- ------------ -------------------\n"
13153
" design goal detailed view concise view 1 revision per line\n"
13154
" committer name+email name only name only\n"
13155
" author name+email - -\n"
13156
" date-time format full date only date only\n"
13157
" commit message full full top line\n"
13158
" tags yes yes yes\n"
13159
" merges indicator - yes -\n"
13160
" status/delta optional optional -\n"
13161
" diff/patch optional optional -\n"
13162
" revision-id optional optional -\n"
13163
" branch nick yes - -\n"
13164
" foreign vcs properties yes yes -\n"
13165
" preferred levels all 1 1\n"
13166
" digital signature optional - -"
13167
msgstr ""
13168
13169
#: en/help_topics/log-formats.txt:24
13170
msgid ""
13171
"The default format is ``long``. To change this, define the ``log_format``\n"
13172
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13173
msgstr ""
13174
13175
#: en/help_topics/log-formats.txt:27
13176
msgid ""
13177
" [DEFAULT]\n"
13178
" log_format = short"
13179
msgstr ""
13180
13181
#: en/help_topics/log-formats.txt:30
13182
msgid ""
13183
"Alternatively, to change the log format used for a given query, use the\n"
13184
"--long, --short or --line options."
13185
msgstr ""
13186
13187
#: en/help_topics/log-formats.txt:33
13188
msgid ""
13189
"If one of the standard log formats does not meet your needs, additional\n"
13190
"formats can be provided by plugins.\n"
13191
msgstr ""
13192
13193
#: en/help_topics/other-formats.txt:1
13194
msgid "Other Storage Formats"
13195
msgstr "Otros formatos de almacenamiento"
13196
13197
#: en/help_topics/other-formats.txt:3
13198
msgid "Experimental formats are shown below."
13199
msgstr ""
13200
13201
#: en/help_topics/other-formats.txt:5
13202
msgid ""
13203
":development-colo:\n"
13204
" (native) The 2a format with experimental support for colocated\n"
13205
" branches."
13206
msgstr ""
13207
13208
#: en/help_topics/other-formats.txt:9
13209
msgid ""
13210
"\n"
13211
"Deprecated formats are shown below."
13212
msgstr ""
13213
13214
#: en/help_topics/other-formats.txt:12
13215
msgid ""
13216
":pack-0.92:\n"
13217
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13218
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13219
" by bzr < 0.92."
13220
msgstr ""
13221
13222
#: en/help_topics/patterns.txt:1
13223
msgid ""
13224
"Patterns\n"
13225
"========"
13226
msgstr ""
13227
"Patrones\n"
13228
"========"
13229
13230
#: en/help_topics/patterns.txt:4
13231
msgid ""
13232
"Bazaar uses patterns to match files at various times. For example,\n"
13233
"the ``add`` command skips over files that match ignore patterns\n"
13234
"and preferences can be associated with files using rule patterns.\n"
13235
"The pattern syntax is described below."
13236
msgstr ""
13237
13238
#: en/help_topics/patterns.txt:9
13239
msgid ""
13240
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13241
"slash or is a regular expression, it is compared to the whole path\n"
13242
"from the branch root. Otherwise, it is compared to only the last\n"
13243
"component of the path. To match a file only in the root directory,\n"
13244
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13245
msgstr ""
13246
13247
#: en/help_topics/patterns.txt:15
13248
msgid "Patterns may include globbing wildcards such as::"
13249
msgstr "Los patrones pueden incluir comodines globales tales como::"
13250
13251
#: en/help_topics/patterns.txt:17
13252
msgid ""
13253
" ? - Matches any single character except '/'\n"
13254
" * - Matches 0 or more characters except '/'\n"
13255
" /**/ - Matches 0 or more directories in a path\n"
13256
" [a-z] - Matches a single character from within a group of characters"
13257
msgstr ""
13258
13259
#: en/help_topics/patterns.txt:22
13260
msgid ""
13261
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13262
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13263
"expression. Regular expression patterns may not include named or\n"
13264
"numbered groups."
13265
msgstr ""
13266
13267
#: en/help_topics/patterns.txt:27
13268
msgid ""
13269
"Case insensitive ignore patterns can be specified with regular expressions\n"
13270
"by using the ``i`` (for ignore case) flag in the pattern."
13271
msgstr ""
13272
13273
#: en/help_topics/patterns.txt:30
13274
msgid ""
13275
"For example, a case insensitive match for ``foo`` may be specified as::"
13276
msgstr ""
13277
13278
#: en/help_topics/patterns.txt:32
13279
msgid " RE:(?i)foo"
13280
msgstr ""
13281
13282
#: en/help_topics/patterns.txt:34
13283
msgid ""
13284
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13285
"matched by that pattern will not be ignored."
13286
msgstr ""
13287
13288
#: en/help_topics/patterns.txt:37
13289
msgid ""
13290
".. _Python regular expressions: http://docs.python.org/library/re.html"
13291
msgstr ""
13292
13293
#: en/help_topics/revisionspec.txt:1
13294
msgid "Revision Identifiers"
13295
msgstr "Identificadores de revisión"
13296
13297
#: en/help_topics/revisionspec.txt:3
13298
msgid ""
13299
"A revision identifier refers to a specific state of a branch's history. It\n"
13300
"can be expressed in several ways. It can begin with a keyword to\n"
13301
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13302
"'before:yesterday' and 'submit:'."
13303
msgstr ""
13304
13305
#: en/help_topics/revisionspec.txt:8
13306
msgid ""
13307
"Alternately, it can be given without a keyword, in which case it will be\n"
13308
"checked as a revision number, a tag, a revision id, a date specification, or "
13309
"a\n"
13310
"branch specification, in that order. For example, 'date:today' could be\n"
13311
"written as simply 'today', though if you have a tag called 'today' that "
13312
"will\n"
13313
"be found first."
13314
msgstr ""
13315
13316
#: en/help_topics/revisionspec.txt:14
13317
msgid ""
13318
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13319
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13320
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13321
"or\n"
13322
"spaces around the '..')."
13323
msgstr ""
13324
13325
#: en/help_topics/revisionspec.txt:19
13326
msgid ""
13327
"Ranges are interpreted differently by different commands. To the \"log\" "
13328
"command,\n"
13329
"a range is a sequence of log messages, but to the \"diff\" command, the "
13330
"range\n"
13331
"denotes a change between revisions (and not a sequence of changes). In\n"
13332
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13333
"consider it\n"
13334
"to be open-ended, that is, they include one end but not the other. For "
13335
"example:\n"
13336
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13337
"3649,\n"
13338
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13339
"and\n"
13340
"3649, but not 3647."
13341
msgstr ""
13342
13343
#: en/help_topics/revisionspec.txt:28
13344
msgid "The keywords used as revision selection methods are the following:"
13345
msgstr ""
13346
"Las palabras claves usadas como métodos de selección de revisión son las "
13347
"siguientes:"
13348
13349
#: en/help_topics/revisionspec.txt:30
13350
msgid ""
13351
":revid:\n"
13352
"\tSelects a revision using the revision id.\n"
13353
":submit:\n"
13354
"\tSelects a common ancestor with the submit branch.\n"
13355
":ancestor:\n"
13356
"\tSelects a common ancestor with a second branch.\n"
13357
":date:\n"
13358
"\tSelects a revision on the basis of a datestamp.\n"
13359
":branch:\n"
13360
"\tSelects the last revision of a specified branch.\n"
13361
":tag:\n"
13362
"\tSelects a revision identified by a tag name.\n"
13363
":revno:\n"
13364
"\tSelects a revision using a number.\n"
13365
":before:\n"
13366
"\tSelects the parent of the revision specified.\n"
13367
":annotate:\n"
13368
"\tSelect the revision that last modified the specified line.\n"
13369
":mainline:\n"
13370
"\tSelect mainline revision that merged the specified revision.\n"
13371
":last:\n"
13372
"\tSelects the nth revision from the end."
13373
msgstr ""
13374
13375
#: en/help_topics/revisionspec.txt:53
13376
msgid "In addition, plugins can provide other keywords."
13377
msgstr "Además, los complementos pueden proporcionar otras palabras clave."
13378
13379
#: en/help_topics/revisionspec.txt:55
13380
msgid "A detailed description of each keyword is given below."
13381
msgstr ""
13382
"A continuación se proporciona una detallada descripción de cada palabra "
13383
"clave."
13384
13385
#: en/help_topics/revisionspec.txt:57
13386
msgid ":revid:"
13387
msgstr ":revid:"
13388
13389
#: en/help_topics/revisionspec.txt:59
13390
msgid ""
13391
" Supply a specific revision id, that can be used to specify any\n"
13392
" revision id in the ancestry of the branch.\n"
13393
" Including merges, and pending merges.\n"
13394
" Examples::"
13395
msgstr ""
13396
13397
#: en/help_topics/revisionspec.txt:64
13398
msgid ""
13399
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13400
msgstr ""
13401
" revid:aaaa@bbbb-123456789 -> Selecciona la revisión «aaaa@bbbb-"
13402
"123456789»"
13403
13404
#: en/help_topics/revisionspec.txt:66
13405
msgid ":submit:"
13406
msgstr ":submit:"
13407
13408
#: en/help_topics/revisionspec.txt:68
13409
msgid ""
13410
" Diffing against this shows all the changes that were made in this "
13411
"branch,\n"
13412
" and is a good predictor of what merge will do. The submit branch is\n"
13413
" used by the bundle and merge directive commands. If no submit branch\n"
13414
" is specified, the parent branch is used instead."
13415
msgstr ""
13416
13417
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13418
msgid ""
13419
" The common ancestor is the last revision that existed in both\n"
13420
" branches. Usually this is the branch point, but it could also be\n"
13421
" a revision that was merged."
13422
msgstr ""
13423
13424
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13425
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13426
#: en/help_topics/revisionspec.txt:153
13427
msgid " Examples::"
13428
msgstr " Ejemplos::"
13429
13430
#: en/help_topics/revisionspec.txt:79
13431
msgid " $ bzr diff -r submit:"
13432
msgstr " $ bzr diff -r submit:"
13433
13434
#: en/help_topics/revisionspec.txt:81
13435
msgid ":ancestor:"
13436
msgstr ":ancestor:"
13437
13438
#: en/help_topics/revisionspec.txt:83
13439
msgid " Supply the path to a branch to select the common ancestor."
13440
msgstr ""
13441
13442
#: en/help_topics/revisionspec.txt:89
13443
msgid ""
13444
" This is frequently used with 'diff' to return all of the changes\n"
13445
" that your branch introduces, while excluding the changes that you\n"
13446
" have not merged from the remote branch."
13447
msgstr ""
13448
13449
#: en/help_topics/revisionspec.txt:95
13450
msgid ""
13451
" ancestor:/path/to/branch\n"
13452
" $ bzr diff -r ancestor:../../mainline/branch"
13453
msgstr ""
13454
13455
#: en/help_topics/revisionspec.txt:98
13456
msgid ":date:"
13457
msgstr ":date:"
13458
13459
#: en/help_topics/revisionspec.txt:100
13460
msgid ""
13461
" Supply a datestamp to select the first revision that matches the date.\n"
13462
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13463
" Matches the first entry after a given date (either at midnight or\n"
13464
" at a specified time)."
13465
msgstr ""
13466
13467
#: en/help_topics/revisionspec.txt:105
13468
msgid " One way to display all the changes since yesterday would be::"
13469
msgstr ""
13470
13471
#: en/help_topics/revisionspec.txt:107
13472
msgid " bzr log -r date:yesterday.."
13473
msgstr ""
13474
13475
#: en/help_topics/revisionspec.txt:111
13476
msgid ""
13477
" date:yesterday -> select the first revision since "
13478
"yesterday\n"
13479
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13480
" August 14th, 2006 at 5:10pm."
13481
msgstr ""
13482
13483
#: en/help_topics/revisionspec.txt:115
13484
msgid ":branch:"
13485
msgstr ":branch:"
13486
13487
#: en/help_topics/revisionspec.txt:117
13488
msgid " Supply the path to a branch to select its last revision."
13489
msgstr ""
13490
" Suministra la ruta a una rama para seleccionar su última revisión."
13491
13492
#: en/help_topics/revisionspec.txt:121
13493
msgid " branch:/path/to/branch"
13494
msgstr " branch:/ruta/a/rama"
13495
13496
#: en/help_topics/revisionspec.txt:123
13497
msgid ":tag:"
13498
msgstr ":tag:"
13499
13500
#: en/help_topics/revisionspec.txt:125
13501
msgid " Tags are stored in the branch and created by the 'tag' command."
13502
msgstr ""
13503
13504
#: en/help_topics/revisionspec.txt:127
13505
msgid ":revno:"
13506
msgstr ":revno:"
13507
13508
#: en/help_topics/revisionspec.txt:129
13509
msgid ""
13510
" Use an integer to specify a revision in the history of the branch.\n"
13511
" Optionally a branch can be specified. A negative number will count\n"
13512
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13513
" one). If the negative number is larger than the branch's history, the\n"
13514
" first revision is returned.\n"
13515
" Examples::"
13516
msgstr ""
13517
13518
#: en/help_topics/revisionspec.txt:136
13519
msgid ""
13520
" revno:1 -> return the first revision of this branch\n"
13521
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13522
" the branch '/path/to/branch'\n"
13523
" revno:-1 -> The last revision in a branch.\n"
13524
" -2:http://other/branch -> The second to last revision in the\n"
13525
" remote branch.\n"
13526
" -1000000 -> Most likely the first revision, unless\n"
13527
" your history is very long."
13528
msgstr ""
13529
13530
#: en/help_topics/revisionspec.txt:145
13531
msgid ":before:"
13532
msgstr ":before:"
13533
13534
#: en/help_topics/revisionspec.txt:147
13535
msgid ""
13536
" Supply any revision spec to return the parent of that revision. This "
13537
"is\n"
13538
" mostly useful when inspecting revisions that are not in the revision "
13539
"history\n"
13540
" of a branch."
13541
msgstr ""
13542
13543
#: en/help_topics/revisionspec.txt:151
13544
msgid ""
13545
" It is an error to request the parent of the null revision (before:0)."
13546
msgstr ""
13547
13548
#: en/help_topics/revisionspec.txt:155
13549
msgid ""
13550
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13551
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13552
" aaaa@bbbb-1234567890\n"
13553
" bzr diff -r before:1913..1913\n"
13554
" -> Find the changes between revision 1913 and its parent "
13555
"(1912).\n"
13556
" (What changes did revision 1913 introduce).\n"
13557
" This is equivalent to: bzr diff -c 1913"
13558
msgstr ""
13559
13560
#: en/help_topics/revisionspec.txt:163
13561
msgid ":annotate:"
13562
msgstr ":annotate:"
13563
13564
#: en/help_topics/revisionspec.txt:165
13565
msgid ""
13566
" Select the revision that last modified the specified line. Line is\n"
13567
" specified as path:number. Path is a relative path to the file. "
13568
"Numbers\n"
13569
" start at 1, and are relative to the current version, not the last-\n"
13570
" committed version of the file."
13571
msgstr ""
13572
13573
#: en/help_topics/revisionspec.txt:170
13574
msgid ":mainline:"
13575
msgstr ":mainline:"
13576
13577
#: en/help_topics/revisionspec.txt:172
13578
msgid ""
13579
" Select the revision that merged the specified revision into mainline."
13580
msgstr ""
13581
13582
#: en/help_topics/revisionspec.txt:174
13583
msgid ":last:"
13584
msgstr ":last:"
13585
13586
#: en/help_topics/revisionspec.txt:176
13587
msgid ""
13588
" Supply a positive number to get the nth revision from the end.\n"
13589
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13590
" Examples::"
13591
msgstr ""
13592
13593
#: en/help_topics/revisionspec.txt:180
13594
msgid ""
13595
" last:1 -> return the last revision\n"
13596
" last:3 -> return the revision 2 before the end.\n"
13597
msgstr ""
13598
" last:1 -> devuelve la última revisión\n"
13599
" last:3 -> devuelve la revisión 2 antes del final.\n"
13600
13601
#: en/help_topics/rules.txt:1
13602
msgid ""
13603
"Rules\n"
13604
"====="
13605
msgstr ""
13606
"Reglas\n"
13607
"======"
13608
13609
#: en/help_topics/rules.txt:7
13610
msgid ""
13611
"Rules are defined in ini file format where the sections are file glob\n"
13612
"patterns and the contents of each section are the preferences for files\n"
13613
"matching that pattern(s). For example::"
13614
msgstr ""
13615
13616
#: en/help_topics/rules.txt:11
13617
msgid ""
13618
" [name *.bat]\n"
13619
" eol = native"
13620
msgstr ""
13621
13622
#: en/help_topics/rules.txt:14
13623
msgid ""
13624
" [name *.html *.xml]\n"
13625
" keywords = xml_escape"
13626
msgstr ""
13627
" [name *.html *.xml]\n"
13628
" keywords = xml_escape"
13629
13630
#: en/help_topics/rules.txt:17
13631
msgid ""
13632
"Preferences like these are useful for commands and plugins wishing to\n"
13633
"provide custom behaviour for selected files. For more information on \n"
13634
"end of line conversion see :doc:`eol-help`.\n"
13635
"Keyword support is provided by the `keywords plugin\n"
13636
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13637
msgstr ""
13638
13639
#: en/help_topics/rules.txt:23
13640
msgid ""
13641
"Files\n"
13642
"-----"
13643
msgstr ""
13644
"Archivos\n"
13645
"--------"
13646
13647
#: en/help_topics/rules.txt:26
13648
msgid ""
13649
"Default rules for all branches are defined in the optional file\n"
13650
"``BZR_HOME/rules``. "
13651
msgstr ""
13652
13653
#: en/help_topics/rules.txt:29
13654
msgid ""
13655
"Rule Patterns\n"
13656
"-------------"
13657
msgstr ""
13658
"Patrones de regla\n"
13659
"----------------------------"
13660
13661
#: en/help_topics/rules.txt:32
13662
msgid ""
13663
"Patterns are ordered and searching stops as soon as one matches.\n"
13664
"As a consequence, more explicit patterns should be placed towards\n"
13665
"the top of the file. Rule patterns use exactly the same conventions\n"
13666
"as ignore patterns. See :doc:`patterns-help` for details."
13667
msgstr ""
13668
13669
#: en/help_topics/rules.txt:37
13670
msgid ".. note::"
13671
msgstr ".. nota::"
13672
13673
#: en/help_topics/rules.txt:39
13674
msgid ""
13675
" Patterns containing square brackets or spaces should be\n"
13676
" surrounded in quotes to ensure they are correctly parsed.\n"
13677
msgstr ""
13678
13679
#: en/help_topics/topics.txt:1
13680
msgid ""
13681
"authentication Information on configuring authentication\n"
13682
"basic Basic commands\n"
13683
"branches Information on what a branch is\n"
13684
"bugs Bug tracker settings\n"
13685
"checkouts Information on what a checkout is\n"
13686
"commands Basic help for all commands\n"
13687
"configuration Details on the configuration settings available\n"
13688
"conflict-types Types of conflicts and what to do about them\n"
13689
"content-filters Conversion of content into/from working trees\n"
13690
"criss-cross Information on criss-cross merging\n"
13691
"current-formats Current storage formats\n"
13692
"debug-flags Options to show or record debug information\n"
13693
"diverged-branches How to fix diverged branches\n"
13694
"env-variables Environment variable names and values\n"
13695
"eol Information on end-of-line handling\n"
13696
"files Information on configuration and log files\n"
13697
"formats Information on choosing a storage format\n"
13698
"global-options Options that control how Bazaar runs\n"
13699
"hidden-commands All hidden commands\n"
13700
"hooks Points at which custom processing can be added\n"
13701
"launchpad Using Bazaar with Launchpad.net\n"
13702
"location-alias Aliases for remembered locations\n"
13703
"log-formats Details on the logging formats available\n"
13704
"other-formats Experimental and deprecated storage formats\n"
13705
"patterns Information on the pattern syntax\n"
13706
"repositories Basic information on shared repositories.\n"
13707
"revisionspec Explain how to use --revision\n"
13708
"rules Information on defining rule-based preferences\n"
13709
"standalone-trees Information on what a standalone tree is\n"
13710
"standard-options Options that can be used with any command\n"
13711
"status-flags Help on status flags\n"
13712
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13713
"topics Topics list\n"
13714
"url-special-chars Special character handling in URLs\n"
13715
"urlspec Supported transport protocols\n"
13716
"working-trees Information on working trees\n"
13717
msgstr ""
13718
13719
#: en/help_topics/url-special-chars.txt:1
13720
msgid ""
13721
"Special character handling in URLs\n"
13722
"=================================="
13723
msgstr ""
13724
13725
#: en/help_topics/url-special-chars.txt:4
13726
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13727
msgstr ""
13728
13729
#: en/help_topics/url-special-chars.txt:6
13730
msgid " * Fully qualified URLs"
13731
msgstr ""
13732
13733
#: en/help_topics/url-special-chars.txt:8
13734
msgid " * File system paths, relative or absolute"
13735
msgstr " * Rutas de sistemas de archivo, relativas o absolutas"
13736
13737
#: en/help_topics/url-special-chars.txt:10
13738
msgid ""
13739
"Internally bzr treats all locations as URLs. For any file system paths\n"
13740
"that are specified it will automatically determine the appropriate URL\n"
13741
"representation, and escape special characters where necessary."
13742
msgstr ""
13743
13744
#: en/help_topics/url-special-chars.txt:14
13745
msgid ""
13746
"There are a few characters which have special meaning in URLs and need "
13747
"careful\n"
13748
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13749
"value in URLs. Any non-ASCII characters in a file path will automatically "
13750
"be\n"
13751
"urlencoded when the path is converted to a URL."
13752
msgstr ""
13753
13754
#: en/help_topics/url-special-chars.txt:19
13755
msgid ""
13756
"URLs represent non-ASCII characters in an encoding defined by the server, "
13757
"but\n"
13758
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13759
"be\n"
13760
"generous in what it accepts as a URL and to print them in a way that\n"
13761
"will be readable."
13762
msgstr ""
13763
13764
#: en/help_topics/url-special-chars.txt:24
13765
msgid ""
13766
"For example, if you have a directory named '/tmp/%2False' these are all "
13767
"valid\n"
13768
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13769
"slash)::"
13770
msgstr ""
13771
13772
#: en/help_topics/url-special-chars.txt:27
13773
msgid ""
13774
" cd /tmp\n"
13775
" bzr log /tmp/%2False\n"
13776
" bzr log %2False\n"
13777
" bzr log file:///tmp/%252False\n"
13778
" bzr log file://localhost/tmp/%252False\n"
13779
" bzr log file:%252False"
13780
msgstr ""
13781
" cd /tmp\n"
13782
" bzr log /tmp/%2False\n"
13783
" bzr log %2False\n"
13784
" bzr log file:///tmp/%252False\n"
13785
" bzr log file://localhost/tmp/%252False\n"
13786
" bzr log file:%252False"
13787
13788
#: en/help_topics/url-special-chars.txt:34
13789
msgid "These are valid but do not refer to the same file::"
13790
msgstr "Estas son válidas pero no se refieren al mismo archivo::"
13791
13792
#: en/help_topics/url-special-chars.txt:36
13793
msgid ""
13794
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13795
" bzr log %252False (refers to a file called /tmp/%252False)"
13796
msgstr ""
13797
" bzr log file:///tmp/%2Falso (se refiere al archivo llamado /tmp/\\/also)\n"
13798
" bzr log %252Falso (se refiere al archivo llamado /tmp/%252Falso)"
13799
13800
#: en/help_topics/url-special-chars.txt:39
13801
msgid ""
13802
"Comma also has special meaning in URLs, because it denotes `segment "
13803
"parameters`_"
13804
msgstr ""
13805
13806
#: en/help_topics/url-special-chars.txt:41
13807
msgid ""
13808
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13809
msgstr ""
13810
13811
#: en/help_topics/url-special-chars.txt:43
13812
msgid ""
13813
"Comma is also special in any file system paths that are specified. To use a "
13814
"literal\n"
13815
"comma in a file system path, specify a URL and URL encode the comma::"
13816
msgstr ""
13817
13818
#: en/help_topics/url-special-chars.txt:46
13819
msgid ""
13820
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13821
"\"branch\" set to \"bla\"\n"
13822
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13823
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13824
"\"branch\" set to \"bla\"\n"
13825
msgstr ""
13826
13827
#: en/help_topics/urlspec.txt:1
13828
msgid "URL Identifiers"
13829
msgstr "Identificadores de URL"
13830
13831
#: en/help_topics/urlspec.txt:3
13832
msgid "Supported URL prefixes::"
13833
msgstr "Prefijos de URL permitidos:"
13834
13835
#: en/help_topics/urlspec.txt:5
13836
msgid ""
13837
" aftp:// Access using active FTP.\n"
13838
" bzr:// Fast access using the Bazaar smart server.\n"
13839
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13840
" file:// Access using the standard filesystem (default)\n"
13841
" ftp:// Access using passive FTP.\n"
13842
" http:// Read-only access of branches exported on the web.\n"
13843
" https:// Read-only access of branches exported on the web using "
13844
"SSL.\n"
13845
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13846
msgstr ""
13847
13848
#: en/help_topics/urlspec.txt:14
13849
msgid "Supported modifiers::"
13850
msgstr "Modificadores permitidos:"
13851
13852
#: en/help_topics/urlspec.txt:16
13853
msgid " gio+ Access using any GIO supported protocols."
13854
msgstr ""
13855
13856
#: en/help_topics/urlspec.txt:18
13857
msgid "Bazaar supports all of the standard parts within the URL::"
13858
msgstr "Bazaar permite todas las partes estándar con el URL::"
13859
13860
#: en/help_topics/urlspec.txt:20
13861
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13862
msgstr " <protocolo>://[usuario[:contraseña]@]anfitrión[:puerto]/[ruta]"
13863
13864
#: en/help_topics/urlspec.txt:22
13865
msgid "allowing URLs such as::"
13866
msgstr "permitir URL tales como:"
13867
13868
#: en/help_topics/urlspec.txt:24
13869
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13870
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13871
13872
#: en/help_topics/urlspec.txt:26
13873
msgid ""
13874
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13875
"with '~' as meaning that the rest of the path should be interpreted\n"
13876
"relative to the remote user's home directory. For example if the user\n"
13877
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13878
"shell.example.com, then::"
13879
msgstr ""
13880
13881
#: en/help_topics/urlspec.txt:32
13882
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13883
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13884
13885
#: en/help_topics/urlspec.txt:34
13886
msgid "would refer to ``/home/remote/myproject/trunk``."
13887
msgstr "re refieren a «/home/remote/myproject/trunk»."
13888
13889
#: en/help_topics/urlspec.txt:36
13890
msgid ""
13891
"Many commands that accept URLs also accept location aliases too.\n"
13892
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13893
msgstr ""
13894
"Muchas órdenes que aceptan URL también aceptan alias de ubicaciones.\n"
13895
"Vea :doc:`location-alias-help` y :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1