« back to all changes in this revision
Viewing changes to po/pt_BR.po
- browse files at revision 6093.4.72
- compare with another revision
- download diff
- download tarball
- view history from revision 6093.4.72
- Committer: Jelmer Vernooij
- Date: 2012-02-20 12:19:29 UTC
- mfrom: (6437.23.11 2.5)
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/pt_BR.po
1
# Brazilian Portuguese translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-30 16:52+0000\n"
12
"Last-Translator: Ielton Ferreira Carneiro Pinto <Unknown>\n"
13
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n > 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 04:50+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "saltar {0} (maior que {1} de {2} bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Desempilhar"
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Enviar para revisão %d."
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d tag atualizada."
39
msgstr[1] "%d tags atualizadas."
40
41
#: bzrlib/branch.py:3210
42
msgid "No new revisions or tags to push."
43
msgstr "Nenhuma revisão ou tags para enviar."
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr "Nenhuma revisão para enviar."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr "verificado o ramo {0} formato {1}"
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "erro encontrado:%s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorando arquivos fora da visualização. A visualização é %s"
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision produz exatamente o identificador da revisão"
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr "Mostrar o resumo do estado."
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Este é um relatório de arquivos desconhecidos e versionados, reportá-los\n"
78
"agrupados por estado. Estados possíveis são:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"adicionado\n"
86
" Versionado na cópia de trabalho, mas não na revisão anterior."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removido\n"
95
" Versionado na revisão anterior, mas removido ou excluído\n"
96
" na cópia de trabalho."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renomeado\n"
106
" O caminho deste arquivo foi alterado a partir da revisão anterior;\n"
107
" o texto também pode ter mudado. Isso inclui arquivos cujo\n"
108
" diretório pai foi renomeado."
109
110
#: bzrlib/builtins.py:320
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modificado\n"
116
" O texto mudou desde a versão anterior."
117
118
#: bzrlib/builtins.py:323
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"tipo alterado\n"
124
" Tipo de arquivo foi alterado (por exemplo, de arquivo para o diretório)."
125
126
#: bzrlib/builtins.py:326
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"desconhecido\n"
132
" Não versionado e não corresponde aos padrões de ignorar."
133
134
#: bzrlib/builtins.py:329
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Além disso para diretórios, links simbólicos e arquivos com um bit\n"
142
"executáve alterado, o Bazaar indica seu tipo usando um caracter\n"
143
"de fuga: '/', '@' ou '*' respectivamente. Estes adicionais podem ser\n"
144
"desativados usando a opção '--no-classify'."
145
146
#: bzrlib/builtins.py:334
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"Para ver arquivos ignorados use 'bzr ignored'. Para detalhes sobre\n"
152
"alterações em arquivos texto, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:337
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note que --short ou -S oferecem sinalizadores de status para cada item, "
161
"similar\n"
162
"ao comando status do Subversion. Para obter uma saída semelhante ao svn -q,\n"
163
"use bzr status -SV."
164
165
#: bzrlib/builtins.py:341
166
msgid ""
167
"If no arguments are specified, the status of the entire working\n"
168
"directory is shown. Otherwise, only the status of the specified\n"
169
"files or directories is reported. If a directory is given, status\n"
170
"is reported for everything inside that directory."
171
msgstr ""
172
"Se nenhum argumento for especificado, o status total do diretório\n"
173
"de trabalho é mostrado. Caso contrário, apenas o status do arquivo\n"
174
"ou diretório especificado é relatado. Se um diretório for passado, o\n"
175
"status é relatado para tudo dentro deste diretório."
176
177
#: bzrlib/builtins.py:346
178
msgid ""
179
"Before merges are committed, the pending merge tip revisions are\n"
180
"shown. To see all pending merge revisions, use the -v option.\n"
181
"To skip the display of pending merge information altogether, use\n"
182
"the no-pending option or specify a file/directory."
183
msgstr ""
184
"Antes de mesclar são enviadas, as revisões pendentes do ponto de mesclagem\n"
185
"mostrado. Para ver todas as revisões pendentes da mesclagem, use a opção -"
186
"v.\n"
187
"Para ignorar a exibição de pendência de informações e fundir completamente, "
188
"use\n"
189
"a opção no-pending ou especifique um arquivo/diretório."
190
191
#: bzrlib/builtins.py:351
192
msgid ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
msgstr ""
196
"Para comparar o diretório de trabalho com uma revisão específica,\n"
197
"passe uma simples revisão como argumento."
198
199
#: bzrlib/builtins.py:354
200
msgid ""
201
"To see which files have changed in a specific revision, or between\n"
202
"two revisions, pass a revision range to the revision argument.\n"
203
"This will produce the same results as calling 'bzr diff --summarize'."
204
msgstr ""
205
"Para ver quais arquivos foram alterados em uma revisão específica, ou entre\n"
206
"duas revisões, passe uma intervalo de revisões como argumento.\n"
207
"Isto irá produzir os mesmos resultados de 'bzr diff --summarize'."
208
209
#: bzrlib/builtins.py:363
210
msgid "Use short status indicators."
211
msgstr "Use indicadores de status curto."
212
213
#: bzrlib/builtins.py:365
214
msgid "Only show versioned files."
215
msgstr "Mostrar apenas arquivos versionados."
216
217
#: bzrlib/builtins.py:367
218
msgid "Don't show pending merges."
219
msgstr "Não mostrar mesclagens pendentes."
220
221
#: bzrlib/builtins.py:370
222
msgid "Do not mark object type using indicator."
223
msgstr "Não marque o tipo do objeto através do indicador."
224
225
#: bzrlib/builtins.py:385
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
227
msgstr ""
228
"bzr status --revision produz exatamente um ou dois especificadores de revisão"
229
230
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
231
msgid "You can only supply one of revision_id or --revision"
232
msgstr "Você só pode fornecer um entre revision_id e --revision"
233
234
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
235
msgid "You must supply either --revision or a revision_id"
236
msgstr "Você deve fornecer qualquer um entre --revision e revision_id"
237
238
#: bzrlib/builtins.py:439
239
#, python-format
240
msgid "Repository %r does not support access to raw revision texts"
241
msgstr "O repositório %r não suporta acesso a textos de revisão tipo raw"
242
243
#: bzrlib/builtins.py:450
244
msgid "The repository {0} contains no revision {1}."
245
msgstr "O repositório {0} não contém revisão {1}."
246
247
#: bzrlib/builtins.py:457
248
msgid "You cannot specify a NULL revision."
249
msgstr "Você não pode especificar uma revisão NULL."
250
251
#: bzrlib/builtins.py:549
252
msgid "Remove the working tree from a given branch/checkout."
253
msgstr ""
254
"Remover a árvore de trabalho a partir de um determinado ramo/projeto obtido."
255
256
#: bzrlib/builtins.py:551
257
msgid ""
258
"Since a lightweight checkout is little more than a working tree\n"
259
"this will refuse to run against one."
260
msgstr ""
261
262
#: bzrlib/builtins.py:554
263
msgid "To re-create the working tree, use \"bzr checkout\"."
264
msgstr "Para recriar a árvore de trabalho, use \"bzr checkout\"."
265
266
#: bzrlib/builtins.py:560
267
msgid ""
268
"Remove the working tree even if it has uncommitted or shelved changes."
269
msgstr ""
270
"Remover a árvore de trabalho, mesmo que tenha mudanças não confirmadas ou "
271
"arquivadas."
272
273
#: bzrlib/builtins.py:574
274
msgid "No working tree to remove"
275
msgstr "Nenhuma árvore de trabalho para remover"
276
277
#: bzrlib/builtins.py:576
278
msgid "You cannot remove the working tree of a remote path"
279
msgstr "Você não pode remover a árvore de trabalho de um caminho remoto"
280
281
#: bzrlib/builtins.py:585
282
msgid "You cannot remove the working tree from a lightweight checkout"
283
msgstr "Você não pode remover a árvore de trabalho de um projeto importado"
284
285
#: bzrlib/builtins.py:625
286
msgid ""
287
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
288
"instead. Use \"--force\" if you are sure you want to reset the working tree."
289
msgstr ""
290
"A árvore não parece estar corrompida. Você provavelmente vai querer usar "
291
"\"bzr reverter\" como alternativa. Use \"--force\" se você tem certeza que "
292
"deseja redefinir a árvore de trabalho."
293
294
#: bzrlib/builtins.py:636
295
msgid ""
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
"commit"
298
msgstr ""
299
", o cabeçalho parece estar corrompido, tente passar -r -1 para definir o "
300
"estado como última submissão"
301
302
#: bzrlib/builtins.py:640
303
msgid "failed to reset the tree state{0}"
304
msgstr "falhou para redefinir o estado da árvore{0}"
305
306
#: bzrlib/builtins.py:644
307
msgid "Show current revision number."
308
msgstr "Mostrar o número da revisão atual."
309
310
#: bzrlib/builtins.py:646
311
msgid "This is equal to the number of revisions on this branch."
312
msgstr "Este é equivalente ao número de revisões no ramo."
313
314
#: bzrlib/builtins.py:659
315
msgid "--tree and --revision can not be used together"
316
msgstr "--tre e --revision não podem ser usados juntos"
317
318
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
319
msgid "Tags can only be placed on a single revision, not on a range"
320
msgstr ""
321
"Tags podem apenas serem colocadas em uma revisão simples, não em um intervalo"
322
323
#: bzrlib/builtins.py:700
324
msgid "Show revno of working tree."
325
msgstr "Mostrar número de revisão da árvore de trabalho."
326
327
#: bzrlib/builtins.py:748
328
msgid "Add specified files or directories."
329
msgstr "Adicionar arquivos ou diretórios especificados."
330
331
#: bzrlib/builtins.py:750
332
msgid ""
333
"In non-recursive mode, all the named items are added, regardless\n"
334
"of whether they were previously ignored. A warning is given if\n"
335
"any of the named files are already versioned."
336
msgstr ""
337
"Em modo não-recursivo, todos os itens nomeados são adicionados, \n"
338
"independentemente de terem sido anteriormente ignorados. Um aviso \n"
339
"é dado se qualquer um dos arquivos nomeados já estiverem versionados."
340
341
#: bzrlib/builtins.py:754
342
msgid ""
343
"In recursive mode (the default), files are treated the same way\n"
344
"but the behaviour for directories is different. Directories that\n"
345
"are already versioned do not give a warning. All directories,\n"
346
"whether already versioned or not, are searched for files or\n"
347
"subdirectories that are neither versioned or ignored, and these\n"
348
"are added. This search proceeds recursively into versioned\n"
349
"directories. If no names are given '.' is assumed."
350
msgstr ""
351
"No modo recursivo (o padrão), os arquivos são tratados da mesma maneira\n"
352
"mas o comportamento é diferente para os diretórios. Os diretórios que\n"
353
"já estão versionados não dão um aviso. Todos os diretórios, já versionado \n"
354
"ou não, são pesquisados para que arquivos ou subdiretórios que não \n"
355
"são de nenhuma versão ou foram ignorados, possam ser adicionados. \n"
356
"Esta pesquisa ocorre recursivamente dentro de diretórios \n"
357
"versionados. Se nenhum nome é dado '.' é assumido."
358
359
#: bzrlib/builtins.py:762
360
msgid ""
361
"A warning will be printed when nested trees are encountered,\n"
362
"unless they are explicitly ignored."
363
msgstr ""
364
"Um alerta será impresso quando árvores aninhadas forem encontradas,\n"
365
"exceto que seja explicitamente ignorado."
366
367
#: bzrlib/builtins.py:765
368
msgid ""
369
"Therefore simply saying 'bzr add' will version all files that\n"
370
"are currently unknown."
371
msgstr ""
372
"Portanto, dizendo simplesmente 'bzr add' assumimos que a \n"
373
"versão de todos os arquivos são atualmente desconhecidas."
374
375
#: bzrlib/builtins.py:768
376
msgid ""
377
"Adding a file whose parent directory is not versioned will\n"
378
"implicitly add the parent, and so on up to the root. This means\n"
379
"you should never need to explicitly add a directory, they'll just\n"
380
"get added when you add a file in the directory."
381
msgstr ""
382
"Adicionar um arquivo cujo diretório pai não é versionado irá\n"
383
"implicitamente adicionar o diretório pai, e assim por diante até a raiz. "
384
"Isto significa\n"
385
"que você nunca precisará adicionar explicitamente um diretório, eles apenas\n"
386
"serão adicionados quando você adicionar um arquivo no diretório."
387
388
#: bzrlib/builtins.py:773
389
msgid ""
390
"--dry-run will show which files would be added, but not actually\n"
391
"add them."
392
msgstr ""
393
"--dry-run irá mostrar quais arquivos deveriam ser adicionados, mas na "
394
"verdade\n"
395
"não os adiciona."
396
397
#: bzrlib/builtins.py:776
398
msgid ""
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
"It looks up ids trying to find a matching parent directory with the\n"
401
"same filename, and then by pure path. This option is rarely needed\n"
402
"but can be useful when adding the same logical file into two\n"
403
"branches that will be merged later (without showing the two different\n"
404
"adds as a conflict). It is also useful when merging another project\n"
405
"into a subdirectory of this one."
406
msgstr ""
407
"--file-ids-from tentará usar os ids de arquivo do caminho fornecido.\n"
408
"Procura ids tentando encontrar um diretório pai correspondente com\n"
409
"o mesmo nome, e depois pelo caminho absoluto. Esta opção é raramente \n"
410
"necessária mas pode ser útil quando adicionar o mesmo arquivo lógico em \n"
411
"duas ramificações que serão mescladas mais tarde (sem mostrar as duas "
412
"adições \n"
413
"como conflitos). Isto também pode ser útil quando estiver mesclando outro \n"
414
"projeto dentro de um subdiretório deste."
415
416
#: bzrlib/builtins.py:784
417
msgid ""
418
"Any files matching patterns in the ignore list will not be added\n"
419
"unless they are explicitly mentioned."
420
msgstr ""
421
"Quaisquer arquivos correspondentes com o padrão na lista ignorar não serão "
422
"adicionados\n"
423
"a menos que eles sejam explicitamente mencionados."
424
425
#: bzrlib/builtins.py:787
426
msgid ""
427
"In recursive mode, files larger than the configuration option \n"
428
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
429
"to file size."
430
msgstr ""
431
"No modo recursivo, arquivos maiores do que a opção de configuração \n"
432
"add.maximum_file_size serão pulados. Itens nomeados nunca são pulados\n"
433
"devido ao tamanho do arquivo."
434
435
#: bzrlib/builtins.py:794
436
msgid "Don't recursively add the contents of directories."
437
msgstr "Não adiciona recursivamente o conteúdo dos diretórios."
438
439
#: bzrlib/builtins.py:800
440
msgid "Lookup file ids from this tree."
441
msgstr "Pesquisa de arquivo por ids nesta árvore"
442
443
#: bzrlib/builtins.py:836
444
msgid "ignored {0} matching \"{1}\"\n"
445
msgstr "ignorado {0} correspondente a \"{1}\"\n"
446
447
#: bzrlib/builtins.py:841
448
msgid "Create a new versioned directory."
449
msgstr "Criar um novo diretório versionado."
450
451
#: bzrlib/builtins.py:843
452
msgid "This is equivalent to creating the directory and then adding it."
453
msgstr "Isto é equivalente a criar o diretório e depois adicioná-lo."
454
455
#: bzrlib/builtins.py:850
456
msgid "No error if existing, make parent directories as needed."
457
msgstr ""
458
459
#: bzrlib/builtins.py:884
460
#, python-format
461
msgid "added %s\n"
462
msgstr "%s adicionado\n"
463
464
#: bzrlib/builtins.py:926
465
#, python-format
466
msgid "invalid kind %r specified"
467
msgstr "tipo especificado %r é inválido"
468
469
#: bzrlib/builtins.py:963
470
msgid "Move or rename a file."
471
msgstr "Mover ou renomear um arquivo."
472
473
#: bzrlib/builtins.py:965
474
msgid " bzr mv SOURCE... DESTINATION"
475
msgstr " bzr mv ORIGEM... DESTINO"
476
477
#: bzrlib/builtins.py:967
478
msgid ""
479
"If the last argument is a versioned directory, all the other names\n"
480
"are moved into it. Otherwise, there must be exactly two arguments\n"
481
"and the file is changed to a new name."
482
msgstr ""
483
"Se o último argumento é um diretório versionado, todos os outros nomes\n"
484
"são movidos para ele. Caso contrário, deve haver exatamente dois argumentos\n"
485
"e o arquivo é alterado para um novo nome."
486
487
#: bzrlib/builtins.py:971
488
msgid ""
489
"If OLDNAME does not exist on the filesystem but is versioned and\n"
490
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
491
"assumes that the file has been manually moved and only updates\n"
492
"its internal inventory to reflect that change.\n"
493
"The same is valid when moving many SOURCE files to a DESTINATION."
494
msgstr ""
495
"Se NOMEANTIGO não existe no sistema de arquivos, mas é versionado e\n"
496
"NOVONAME existe no sistema de arquivos, mas não é versionado, mv\n"
497
"assume que o arquivo foi movido manualmente e atualiza apenas\n"
498
"seu inventário interno para refletir essa mudança. O mesmo é válido \n"
499
"quando se deslocam muitos arquivos de ORIGEM para um DESTINO."
500
501
#: bzrlib/builtins.py:977
502
msgid "Files cannot be moved between branches."
503
msgstr "Os arquivos não podem ser movidos entre os ramos."
504
505
#: bzrlib/builtins.py:984
506
msgid ""
507
"Move only the bzr identifier of the file, because the file has already been "
508
"moved."
509
msgstr ""
510
"Mover apenas o identificador bzr do arquivo, porque o arquivo já foi movido."
511
512
#: bzrlib/builtins.py:986
513
msgid "Automatically guess renames."
514
msgstr "Prever que será renomeado automaticamente."
515
516
#: bzrlib/builtins.py:987
517
msgid "Avoid making changes when guessing renames."
518
msgstr "Evite fazer alterações quando prever que será renomeado."
519
520
#: bzrlib/builtins.py:996
521
msgid "--dry-run requires --auto."
522
msgstr "--dry-run requer --auto."
523
524
#: bzrlib/builtins.py:1000
525
msgid "missing file argument"
526
msgstr "falta argumento de arquivo"
527
528
#: bzrlib/builtins.py:1004
529
msgid "can not move root of branch"
530
msgstr "não é possível mover a raiz do ramo"
531
532
#: bzrlib/builtins.py:1010
533
msgid "Only one path may be specified to --auto."
534
msgstr "Apenas um caminho deve ser especificado para --auto."
535
536
#: bzrlib/builtins.py:1013
537
msgid "--after cannot be specified with --auto."
538
msgstr "--after não pode ser especificado com --auto."
539
540
#: bzrlib/builtins.py:1050
541
msgid "to mv multiple files the destination must be a versioned directory"
542
msgstr ""
543
"para mover múltiplos arquivos, o destino deve ser um diretório versionado"
544
545
#: bzrlib/builtins.py:1102
546
msgid "Turn this branch into a mirror of another branch."
547
msgstr "Transformar esse ramo em um espelho de outro ramo."
548
549
#: bzrlib/builtins.py:1104
550
msgid ""
551
"By default, this command only works on branches that have not diverged.\n"
552
"Branches are considered diverged if the destination branch's most recent \n"
553
"commit is one that has not been merged (directly or indirectly) into the \n"
554
"parent."
555
msgstr ""
556
"Por padrão, este comando só funciona em ramos não divergentes.\n"
557
"Ramos são considerados não divergentes se o ramo de destino mais \n"
558
"recentemente submetido é aquele que não foi mesclado (direta ou \n"
559
"indiretamente) para o pai."
560
561
#: bzrlib/builtins.py:1109
562
msgid ""
563
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
564
"from one into the other. Once one branch has merged, the other should\n"
565
"be able to pull it again."
566
msgstr ""
567
"Se os ramos divergiram, você pode usar 'bzr merge' para mesclar as "
568
"alterações\n"
569
"de um para o outro. Uma vez que um ramo se fundiu, o outro deve\n"
570
"ser capaz de puxá-lo novamente."
571
572
#: bzrlib/builtins.py:1113
573
msgid ""
574
"If you want to replace your local changes and just want your branch to\n"
575
"match the remote one, use pull --overwrite. This will work even if the two\n"
576
"branches have diverged."
577
msgstr ""
578
"Se você quer substituir suas alterações locais e quer apenas a sua "
579
"ramificação\n"
580
"para corresponder com a remota, use pull --overwrite. Isto funcionará mesmo "
581
"se\n"
582
"as duas ramificações divergiram."
583
584
#: bzrlib/builtins.py:1117
585
msgid ""
586
"If there is no default location set, the first pull will set it (use\n"
587
"--no-remember to avoid setting it). After that, you can omit the\n"
588
"location to use the default. To change the default, use --remember. The\n"
589
"value will only be saved if the remote location can be accessed."
590
msgstr ""
591
"Se não estiver definido a localização padrão, na primeira vez que o projeto "
592
"for puxado será definido (use \n"
593
"--no-remember para evitar isso). Após isso, você pode omitir a localização\n"
594
"para usar o padrão. Para alterar o padrão, use --remember. O valor será\n"
595
"salvo apenas se o local remoto puder ser acessado."
596
597
#: bzrlib/builtins.py:1122
598
msgid ""
599
"The --verbose option will display the revisions pulled using the log_format\n"
600
"configuration option. You can use a different format by overriding it with\n"
601
"-Olog_format=<other_format>."
602
msgstr ""
603
"A opção --verbose irá mostrar as revisões extraídas usando a opção\n"
604
"de configuração log_format. Você pode usar um formato diferente para \n"
605
"substituí-lo com -Olog_format=<outro formato>."
606
607
#: bzrlib/builtins.py:1126
608
msgid ""
609
"Note: The location can be specified either in the form of a branch,\n"
610
"or in the form of a path to a file containing a merge directive generated\n"
611
"with bzr send."
612
msgstr ""
613
"Nota: a localização pode ser especificada ou na forma de uma ramificação,\n"
614
"ou na forma de um caminho para um arquivo contendo uma diretiva\n"
615
"de mesclagem gerada com bzr send."
616
617
#: bzrlib/builtins.py:1134
618
msgid "Show logs of pulled revisions."
619
msgstr "Mostrar os logs de revisões puxadas."
620
621
#: bzrlib/builtins.py:1136
622
msgid ""
623
"Branch to pull into, rather than the one containing the working directory."
624
msgstr ""
625
"Ramificação para extrair, ao invés de uma que contém o diretório de trabalho."
626
627
#: bzrlib/builtins.py:1139
628
msgid ""
629
"Perform a local pull in a bound branch. Local pulls are not applied to the "
630
"master branch."
631
msgstr ""
632
"Realizar uma extração local em uma ramificação limite. Extrações locais não "
633
"são aplicadas na ramificação mestre."
634
635
#: bzrlib/builtins.py:1168
636
msgid "Need working tree for --show-base."
637
msgstr "Necessário a árvore de trabalho para --show-base."
638
639
#: bzrlib/builtins.py:1184
640
msgid "No pull location known or specified."
641
msgstr "Nenhuma localização de extração conhecida ou especificada"
642
643
#: bzrlib/builtins.py:1190
644
#, python-format
645
msgid "Using saved parent location: %s\n"
646
msgstr "Usando a localização pai salva: %s\n"
647
648
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
649
msgid "Cannot use -r with merge directives or bundles"
650
msgstr "Não foi possível usar -r com diretivas mescladas ou empacotadas"
651
652
#: bzrlib/builtins.py:1238
653
msgid "Update a mirror of this branch."
654
msgstr "Atualização de um espelho deste ramo."
655
656
#: bzrlib/builtins.py:1240
657
msgid ""
658
"The target branch will not have its working tree populated because this\n"
659
"is both expensive, and is not supported on remote file systems."
660
msgstr ""
661
"A ramificação alvo não terá sua árvore de trabalho populada porque isto\n"
662
"é dispendioso e não suportado em sistema de arquivos remoto."
663
664
#: bzrlib/builtins.py:1243
665
msgid ""
666
"Some smart servers or protocols *may* put the working tree in place in\n"
667
"the future."
668
msgstr ""
669
"Alguns servidores inteligentes ou protocolos * pode * colocar a árvore de "
670
"trabalho em vigor no\n"
671
"futuro."
672
673
#: bzrlib/builtins.py:1246
674
msgid ""
675
"This command only works on branches that have not diverged. Branches are\n"
676
"considered diverged if the destination branch's most recent commit is one\n"
677
"that has not been merged (directly or indirectly) by the source branch."
678
msgstr ""
679
"Este comando funcionará apenas em ramificações que não possuem divergências. "
680
"Ramificações \n"
681
"são consideradas divergentes se a ramificação de destino possui envios mais "
682
"recentes e \n"
683
"não pode ser fundida (direta ou indiretamente) pela ramificação de origem."
684
685
#: bzrlib/builtins.py:1250
686
msgid ""
687
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
688
"the other branch completely, discarding its unmerged changes."
689
msgstr ""
690
"Se ramificações estão divergentes, você pode usar 'bzr push --overwrite' "
691
"para substituir\n"
692
"a outra ramificação completamente, discartando mudanças não fundidas."
693
694
#: bzrlib/builtins.py:1253
695
msgid ""
696
"If you want to ensure you have the different changes in the other branch,\n"
697
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
698
"After that you will be able to do a push without '--overwrite'."
699
msgstr ""
700
"Se você deseja certificar-se que possui mudanças diferentes em outra "
701
"ramificação,\n"
702
"faça um merge (veja bzr help merge) a partir da outra ramificação, e envie-"
703
"o. Após isto\n"
704
"você será capaz de fazer um push sem \"'--overwrite\"."
705
706
#: bzrlib/builtins.py:1257
707
msgid ""
708
"If there is no default push location set, the first push will set it (use\n"
709
"--no-remember to avoid setting it). After that, you can omit the\n"
710
"location to use the default. To change the default, use --remember. The\n"
711
"value will only be saved if the remote location can be accessed."
712
msgstr ""
713
"Se não houver um definição de localização de envio padrão, o primeiro envio "
714
"irá ajustá-lo (use\n"
715
"--no-remember para evitar isto). Após isto você poderá omitir a\n"
716
"localização para usar o padrão. Para alterar o padrão, use --remember. O\n"
717
"valor será salvo apenas se a localização remota puder ser acessada."
718
719
#: bzrlib/builtins.py:1262
720
msgid ""
721
"The --verbose option will display the revisions pushed using the log_format\n"
722
"configuration option. You can use a different format by overriding it with\n"
723
"-Olog_format=<other_format>."
724
msgstr ""
725
"A opção --verbose irá exibir as revisões enviadas usando a opção de \n"
726
"configuração log_format. Você pode usar um formato diferente substituindo-o "
727
"\n"
728
"com -Olog_format=<outro_formato>"
729
730
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
731
msgid ""
732
"Branch to push from, rather than the one containing the working directory."
733
msgstr ""
734
"Ramo para enviar a partir de, ao invés de uma que contém o diretório de "
735
"trabalho."
736
737
#: bzrlib/builtins.py:1276
738
msgid ""
739
"By default push will fail if the target directory exists, but does not "
740
"already have a control directory. This flag will allow push to proceed."
741
msgstr ""
742
"Por padrão o envio irá falhar se o diretório de destino existir, mas não se "
743
"tem um diretório de controle. Este sinalizador permitirá que o envio "
744
"prossiga."
745
746
#: bzrlib/builtins.py:1281
747
msgid ""
748
"Create a stacked branch that references the public location of the parent "
749
"branch."
750
msgstr ""
751
"Criar uma ramificação empilhada que referencia a localização pública do ramo "
752
"pai."
753
754
#: bzrlib/builtins.py:1284
755
msgid ""
756
"Create a stacked branch that refers to another branch for the commit "
757
"history. Only the work not present in the referenced branch is included in "
758
"the branch created."
759
msgstr ""
760
"Criar uma ramificação empilhada que referencia a outro ramo do histórico de "
761
"envio. Apenas o trabalho não presente no ramo referenciado é incluído no "
762
"ramo criado."
763
764
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
765
msgid ""
766
"Refuse to push if there are uncommitted changes in the working tree, --no-"
767
"strict disables the check."
768
msgstr ""
769
"Recusa o envio se houver alterações não confirmadas na árvore de trabalho, --"
770
"no-strict desativa a verificação."
771
772
#: bzrlib/builtins.py:1292
773
msgid "Don't populate the working tree, even for protocols that support it."
774
msgstr ""
775
"Não popular a árvore de trabalho, mesmo para protocolos que o suportam."
776
777
#: bzrlib/builtins.py:1336
778
msgid "Could not determine branch to refer to."
779
msgstr "Não foi possível determinar uma ramificação a ser referenciada"
780
781
#: bzrlib/builtins.py:1345
782
#, python-format
783
msgid ""
784
"No push location known or specified. To push to the parent branch (at %s), "
785
"use 'bzr push :parent'."
786
msgstr ""
787
788
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
789
msgid "No push location known or specified."
790
msgstr "Sem local de envio conhecido ou especificado."
791
792
#: bzrlib/builtins.py:1355
793
#, python-format
794
msgid "Using saved push location: %s"
795
msgstr "Usando localização de envio salvo: %s"
796
797
#: bzrlib/builtins.py:1365
798
msgid "Create a new branch that is a copy of an existing branch."
799
msgstr "Criar um novo ramo que é uma cópia de um ramo existente."
800
801
#: bzrlib/builtins.py:1367
802
msgid ""
803
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
804
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
805
"./bar.\n"
806
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
807
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
808
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
809
"create ./foo-bar."
810
msgstr ""
811
812
#: bzrlib/builtins.py:1374
813
msgid ""
814
"To retrieve the branch as of a particular revision, supply the --revision\n"
815
"parameter, as in \"branch foo/bar -r 5\"."
816
msgstr ""
817
"Para conseguir o ramo de uma revisão em particular, forneça o parâmetro --"
818
"revision\n"
819
"como em \"branch foo/bar -r 5\"."
820
821
#: bzrlib/builtins.py:1377
822
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
823
msgstr "Os sinônimos 'clone e 'get' para esse comando são obsoletos."
824
825
#: bzrlib/builtins.py:1387
826
msgid "Create a branch without a working-tree."
827
msgstr "Criar um ramo sem uma árvore de trabalho."
828
829
#: bzrlib/builtins.py:1389
830
msgid "Switch the checkout in the current directory to the new branch."
831
msgstr "Alterar o checkout no diretório atual para o novo ramo."
832
833
#: bzrlib/builtins.py:1392
834
msgid ""
835
"Create a stacked branch referring to the source branch. The new branch will "
836
"depend on the availability of the source branch for all operations."
837
msgstr ""
838
839
#: bzrlib/builtins.py:1396
840
msgid "Do not use a shared repository, even if available."
841
msgstr "Não utilizar um repositório compartilhado, mesmo se disponível."
842
843
#: bzrlib/builtins.py:1398
844
msgid ""
845
"By default branch will fail if the target directory exists, but does not "
846
"already have a control directory. This flag will allow branch to proceed."
847
msgstr ""
848
849
#: bzrlib/builtins.py:1403
850
msgid "Bind new branch to from location."
851
msgstr "Vincular novo ramo a partir da localização."
852
853
#: bzrlib/builtins.py:1450
854
#, python-format
855
msgid "Target directory \"%s\" already exists."
856
msgstr "Diretório alvo \"%s\" já existe."
857
858
#: bzrlib/builtins.py:1462
859
#, python-format
860
msgid "Parent of \"%s\" does not exist."
861
msgstr "Pasta pai de \"%s\" não existe."
862
863
#: bzrlib/builtins.py:1481
864
msgid "The branch {0} has no revision {1}."
865
msgstr "O ramo {0} não tem revisão {1}."
866
867
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
868
#, python-format
869
msgid "Created new stacked branch referring to %s."
870
msgstr "Criado novo ramo empilhado referente a %s."
871
872
#: bzrlib/builtins.py:1500
873
#, python-format
874
msgid "Branched %d revision."
875
msgid_plural "Branched %d revisions."
876
msgstr[0] "Revisão %d ramificada."
877
msgstr[1] "Revisões %d ramificadas."
878
879
#: bzrlib/builtins.py:1505
880
#, python-format
881
msgid "New branch bound to %s"
882
msgstr "Novo ramo ligado a %s"
883
884
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
885
#, python-format
886
msgid "Switched to branch: %s"
887
msgstr "Trocado para o ramo: %s"
888
889
#: bzrlib/builtins.py:1515
890
msgid "List the branches available at the current location."
891
msgstr "Lista os ramos disponíveis na localização atual."
892
893
#: bzrlib/builtins.py:1517
894
msgid ""
895
"This command will print the names of all the branches at the current\n"
896
"location."
897
msgstr "Esse comando irá mostrar os nomes de todos os ramos no local atual."
898
899
#: bzrlib/builtins.py:1524
900
msgid ""
901
"Recursively scan for branches rather than just looking in the specified "
902
"location."
903
msgstr ""
904
"Pesquisar recursivamente por ramos ao invés de apenas procurar em um local "
905
"especificado."
906
907
#: bzrlib/builtins.py:1554
908
msgid "(default)"
909
msgstr "(padrão)"
910
911
#: bzrlib/builtins.py:1566
912
msgid "Create a new checkout of an existing branch."
913
msgstr "Criar um novo checkout de um ramo existente."
914
915
#: bzrlib/builtins.py:1568
916
msgid ""
917
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
918
"for\n"
919
"the branch found in '.'. This is useful if you have removed the working "
920
"tree\n"
921
"or if it was never created - i.e. if you pushed the branch to its current\n"
922
"location using SFTP."
923
msgstr ""
924
925
#: bzrlib/builtins.py:1573
926
msgid ""
927
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
928
"will\n"
929
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
930
"./bar.\n"
931
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
932
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
933
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
934
"create ./foo-bar."
935
msgstr ""
936
937
#: bzrlib/builtins.py:1580
938
msgid ""
939
"To retrieve the branch as of a particular revision, supply the --revision\n"
940
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
941
"immediately\n"
942
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
943
"old\n"
944
"code.)"
945
msgstr ""
946
947
#: bzrlib/builtins.py:1590
948
msgid ""
949
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
950
"the branch for every operation. Normal checkouts can perform common "
951
"operations like diff and status without such access, and also support local "
952
"commits."
953
msgstr ""
954
955
#: bzrlib/builtins.py:1597
956
msgid "Get file contents from this tree."
957
msgstr "Obter o conteúdo do arquivo desta árvore."
958
959
#: bzrlib/builtins.py:1599
960
msgid "Hard-link working tree files where possible."
961
msgstr "Use hard-link na árvore de trabalho sempre que possível."
962
963
#: bzrlib/builtins.py:1640
964
msgid ""
965
"Show list of renamed files.\n"
966
" "
967
msgstr ""
968
"Mostrar a lista de arquivos renomeados.\n"
969
" "
970
971
#: bzrlib/builtins.py:1670
972
msgid "Update a working tree to a new revision."
973
msgstr "Atualizar a árvore de trabalho para a nova revisão."
974
975
#: bzrlib/builtins.py:1672
976
msgid ""
977
"This will perform a merge of the destination revision (the tip of the\n"
978
"branch, or the specified revision) into the working tree, and then make\n"
979
"that revision the basis revision for the working tree. "
980
msgstr ""
981
982
#: bzrlib/builtins.py:1676
983
msgid ""
984
"You can use this to visit an older revision, or to update a working tree\n"
985
"that is out of date from its branch."
986
msgstr ""
987
"Você pode usar isso para visitar uma revisão antiga, ou para atualizar a "
988
"árvore de trabalho\n"
989
"que está desatualizada de seu ramo."
990
991
#: bzrlib/builtins.py:1679
992
msgid ""
993
"If there are any uncommitted changes in the tree, they will be carried\n"
994
"across and remain as uncommitted changes after the update. To discard\n"
995
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
996
"with the changes brought in by the change in basis revision."
997
msgstr ""
998
999
#: bzrlib/builtins.py:1684
1000
msgid ""
1001
"If the tree's branch is bound to a master branch, bzr will also update\n"
1002
"the branch from the master."
1003
msgstr ""
1004
"Se ramo da árvore está ligado a um ramo mestre, o bzr também atualizará\\\n"
1005
"o ramo a partir do ramo mestre."
1006
1007
#: bzrlib/builtins.py:1687
1008
msgid ""
1009
"You cannot update just a single file or directory, because each Bazaar\n"
1010
"working tree has just a single basis revision. If you want to restore a\n"
1011
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1012
"update'. If you want to restore a file to its state in a previous\n"
1013
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1014
"out the old content of that file to a new location."
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1694
1018
msgid ""
1019
"The 'dir' argument, if given, must be the location of the root of a\n"
1020
"working tree to update. By default, the working tree that contains the \n"
1021
"current working directory is used."
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1710
1025
msgid "bzr update --revision takes exactly one revision"
1026
msgstr "bzr update --revision tem exatamente uma revisão"
1027
1028
#: bzrlib/builtins.py:1718
1029
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1030
msgstr ""
1031
"bzr update só pode atualizar uma árvore inteira, e não um arquivo ou "
1032
"subdiretório."
1033
1034
#: bzrlib/builtins.py:1749
1035
msgid "Tree is up to date at revision {0} of branch {1}"
1036
msgstr "Árvore está atualizada na revisão {0} do ramo {1}"
1037
1038
#: bzrlib/builtins.py:1765
1039
#, python-format
1040
msgid ""
1041
"branch has no revision %s\n"
1042
"bzr update --revision only works for a revision in the branch history"
1043
msgstr ""
1044
"o ramo não tem revisão %s\n"
1045
"bzr update --revision só funciona para uma revisão no histórico da "
1046
"ramificação."
1047
1048
#: bzrlib/builtins.py:1771
1049
msgid "Updated to revision {0} of branch {1}"
1050
msgstr "Atualizado para a revisão {0} do ramo {1}"
1051
1052
#: bzrlib/builtins.py:1775
1053
msgid ""
1054
"Your local commits will now show as pending merges with 'bzr status', and "
1055
"can be committed with 'bzr commit'."
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:1784
1059
msgid "Show information about a working tree, branch or repository."
1060
msgstr ""
1061
"Mostrar informações sobre uma árvore de trabalho, ramo ou repositório."
1062
1063
#: bzrlib/builtins.py:1786
1064
msgid ""
1065
"This command will show all known locations and formats associated to the\n"
1066
"tree, branch or repository."
1067
msgstr ""
1068
"Esse comando irá mostrar todos os locais conhecidos e formatos associados à\n"
1069
"árvore, ramo ou repositório."
1070
1071
#: bzrlib/builtins.py:1789
1072
msgid ""
1073
"In verbose mode, statistical information is included with each report.\n"
1074
"To see extended statistic information, use a verbosity level of 2 or\n"
1075
"higher by specifying the verbose option multiple times, e.g. -vv."
1076
msgstr ""
1077
1078
#: bzrlib/builtins.py:1793
1079
msgid "Branches and working trees will also report any missing revisions."
1080
msgstr ""
1081
"Ramos e árvores de trabalho irão também reportar qualquer falta de revisão."
1082
1083
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1084
#: bzrlib/builtins.py:6442
1085
msgid ":Examples:"
1086
msgstr ":Exemplos:"
1087
1088
#: bzrlib/builtins.py:1797
1089
msgid " Display information on the format and related locations:"
1090
msgstr " Exibir informações sobre o formato e locais relacionados:"
1091
1092
#: bzrlib/builtins.py:1799
1093
msgid " bzr info"
1094
msgstr " bzr info"
1095
1096
#: bzrlib/builtins.py:1801
1097
msgid ""
1098
" Display the above together with extended format information and\n"
1099
" basic statistics (like the number of files in the working tree and\n"
1100
" number of revisions in the branch and repository):"
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:1805
1104
msgid " bzr info -v"
1105
msgstr " bzr info -v"
1106
1107
#: bzrlib/builtins.py:1807
1108
msgid " Display the above together with number of committers to the branch:"
1109
msgstr ""
1110
1111
#: bzrlib/builtins.py:1809
1112
msgid " bzr info -vv"
1113
msgstr " bzr info -vv"
1114
1115
#: bzrlib/builtins.py:1828
1116
msgid "Remove files or directories."
1117
msgstr "Remove arquivos ou diretórios."
1118
1119
#: bzrlib/builtins.py:1830
1120
msgid ""
1121
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1122
"delete them if they can easily be recovered using revert otherwise they\n"
1123
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1124
"parameters are given Bazaar will scan for files that are being tracked by\n"
1125
"Bazaar but missing in your tree and stop tracking them for you."
1126
msgstr ""
1127
1128
#: bzrlib/builtins.py:1838
1129
msgid "Only remove files that have never been committed."
1130
msgstr "Remover apenas arquivos que nunca foram enviados."
1131
1132
#: bzrlib/builtins.py:1840
1133
msgid "The file deletion mode to be used."
1134
msgstr "O modo de exclusão do arquivo a ser utilizado."
1135
1136
#: bzrlib/builtins.py:1841
1137
msgid "Deletion Strategy"
1138
msgstr "Estratégia de exclusão"
1139
1140
#: bzrlib/builtins.py:1842
1141
msgid "Backup changed files (default)."
1142
msgstr "Backup de arquivos alterados (padrão)."
1143
1144
#: bzrlib/builtins.py:1843
1145
msgid "Delete from bzr but leave the working copy."
1146
msgstr "Excluir do brz mas deixe a cópia de trabalho."
1147
1148
#: bzrlib/builtins.py:1844
1149
msgid "Don't backup changed files."
1150
msgstr "Não faça backup de arquivos alterados."
1151
1152
#: bzrlib/builtins.py:1845
1153
msgid ""
1154
"Delete all the specified files, even if they can not be recovered and even "
1155
"if they are non-empty directories. (deprecated, use no-backup)"
1156
msgstr ""
1157
"Apagar todos os arquivos especificados, mesmo que eles não possam ser "
1158
"recuperados e até mesmo se eles são diretórios não vazios. (obsoleto, use no-"
1159
"backup)"
1160
1161
#: bzrlib/builtins.py:1854
1162
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1163
msgstr ""
1164
"(A opção --force é obsoleta, preferencialmente use --no-backup no futuro.)"
1165
1166
#: bzrlib/builtins.py:1871
1167
msgid "No matching files."
1168
msgstr "Nenhum arquivo correspondente."
1169
1170
#: bzrlib/builtins.py:1932
1171
msgid "Reconcile bzr metadata in a branch."
1172
msgstr "Reconciliar metadados bzr em um ramo."
1173
1174
#: bzrlib/builtins.py:1934
1175
msgid ""
1176
"This can correct data mismatches that may have been caused by\n"
1177
"previous ghost operations or bzr upgrades. You should only\n"
1178
"need to run this command if 'bzr check' or a bzr developer\n"
1179
"advises you to run it."
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:1939
1183
msgid ""
1184
"If a second branch is provided, cross-branch reconciliation is\n"
1185
"also attempted, which will check that data like the tree root\n"
1186
"id which was not present in very early bzr versions is represented\n"
1187
"correctly in both branches."
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:1944
1191
msgid ""
1192
"At the same time it is run it may recompress data resulting in\n"
1193
"a potential saving in disk space or performance gain."
1194
msgstr ""
1195
"No mesmo tempo em que ele é executado ele pode recompactar os dados, "
1196
"resultando em\n"
1197
"num potencial ganho de espaço em disco e desempenho."
1198
1199
#: bzrlib/builtins.py:1947
1200
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1201
msgstr ""
1202
1203
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1204
msgid ""
1205
"Format for the bzr 2.0 series.\n"
1206
"Uses group-compress storage.\n"
1207
"Provides rich roots which are a one-way transition.\n"
1208
msgstr ""
1209
1210
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1211
msgid ""
1212
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1213
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1217
msgid "The 2a format with experimental support for colocated branches.\n"
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2015
1221
msgid "Make a directory into a versioned branch."
1222
msgstr "Crie um diretório em um ramo versionados."
1223
1224
#: bzrlib/builtins.py:2017
1225
msgid ""
1226
"Use this to create an empty branch, or before importing an\n"
1227
"existing project."
1228
msgstr ""
1229
"Use isso para criar um ramo vazio, ou antes de importar um\n"
1230
"projeto existente."
1231
1232
#: bzrlib/builtins.py:2020
1233
msgid ""
1234
"If there is a repository in a parent directory of the location, then\n"
1235
"the history of the branch will be stored in the repository. Otherwise\n"
1236
"init creates a standalone branch which carries its own history\n"
1237
"in the .bzr directory."
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2025
1241
msgid ""
1242
"If there is already a branch at the location but it has no working tree,\n"
1243
"the tree can be populated with 'bzr checkout'."
1244
msgstr ""
1245
1246
#: bzrlib/builtins.py:2028
1247
msgid "Recipe for importing a tree of files::"
1248
msgstr "Receita para importação de uma árvore de arquivos::"
1249
1250
#: bzrlib/builtins.py:2030
1251
msgid ""
1252
" cd ~/project\n"
1253
" bzr init\n"
1254
" bzr add .\n"
1255
" bzr status\n"
1256
" bzr commit -m \"imported project\""
1257
msgstr ""
1258
" cd ~/project\n"
1259
" bzr init\n"
1260
" bzr add .\n"
1261
" bzr status\n"
1262
" bzr commit -m \"projeto importado\""
1263
1264
#: bzrlib/builtins.py:2041
1265
msgid ""
1266
"Create the path leading up to the branch if it does not already exist."
1267
msgstr "Criar o caminho que conduz até o ramo se ele não existir."
1268
1269
#: bzrlib/builtins.py:2044
1270
msgid "Specify a format for this branch. See \"help formats\"."
1271
msgstr "Especifique um formato para esse ramo. Consulte \"help formats\"."
1272
1273
#: bzrlib/builtins.py:2052
1274
msgid ""
1275
"Never change revnos or the existing log. Append revisions to it only."
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2055
1279
msgid "Create a branch without a working tree."
1280
msgstr "Criar um ramo sem uma árvore de trabalho."
1281
1282
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1283
#, python-format
1284
msgid ""
1285
"Parent directory of %s does not exist.\n"
1286
"You may supply --create-prefix to create all leading parent directories."
1287
msgstr ""
1288
"Diretório pai de %s não existe.\n"
1289
"Você deve fornecer --create-prefix para criar todos os principais diretórios "
1290
"pai."
1291
1292
#: bzrlib/builtins.py:2109
1293
msgid ""
1294
"This branch format cannot be set to append-revisions-only. Try --default."
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2120
1298
msgid "Created a {0} (format: {1})\n"
1299
msgstr "Criou um {0} (formato: {1})\n"
1300
1301
#: bzrlib/builtins.py:2129
1302
#, python-format
1303
msgid "Using shared repository: %s\n"
1304
msgstr "Usando repositório compartilhado: %s\n"
1305
1306
#: bzrlib/builtins.py:2133
1307
msgid "Create a shared repository for branches to share storage space."
1308
msgstr ""
1309
"Criar um repositório compartilhado de ramos para dividir espaço de "
1310
"armazenamento."
1311
1312
#: bzrlib/builtins.py:2135
1313
msgid ""
1314
"New branches created under the repository directory will store their\n"
1315
"revisions in the repository, not in the branch directory. For branches\n"
1316
"with shared history, this reduces the amount of storage needed and \n"
1317
"speeds up the creation of new branches."
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2140
1321
msgid ""
1322
"If the --no-trees option is given then the branches in the repository\n"
1323
"will not have working trees by default. They will still exist as \n"
1324
"directories on disk, but they will not have separate copies of the \n"
1325
"files at a certain revision. This can be useful for repositories that\n"
1326
"store branches which are interacted with through checkouts or remote\n"
1327
"branches, such as on a server."
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2147
1331
msgid ""
1332
":Examples:\n"
1333
" Create a shared repository holding just branches::"
1334
msgstr ""
1335
":Exemplos:\n"
1336
" Cria um repositório compartilhado contendo apenas ramos::"
1337
1338
#: bzrlib/builtins.py:2150
1339
msgid ""
1340
" bzr init-repo --no-trees repo\n"
1341
" bzr init repo/trunk"
1342
msgstr ""
1343
" bzr init-repo --no-trees repo\n"
1344
" bzr init repo/trunk"
1345
1346
#: bzrlib/builtins.py:2153
1347
msgid " Make a lightweight checkout elsewhere::"
1348
msgstr " Faça um leve checkout em outro lugar::"
1349
1350
#: bzrlib/builtins.py:2155
1351
msgid ""
1352
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1353
" cd trunk-checkout\n"
1354
" (add files here)"
1355
msgstr ""
1356
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1357
" cd trunk-checkout\n"
1358
" (adicione arquivos aqui)"
1359
1360
#: bzrlib/builtins.py:2163
1361
msgid ""
1362
"Specify a format for this repository. See \"bzr help formats\" for details."
1363
msgstr ""
1364
"Especifique um formato para este repositório. Veja \"bzr help formats\" para "
1365
"detalhes."
1366
1367
#: bzrlib/builtins.py:2167
1368
msgid "Repository format"
1369
msgstr "Formato de repositório"
1370
1371
#: bzrlib/builtins.py:2169
1372
msgid "Branches in the repository will default to not having a working tree."
1373
msgstr ""
1374
"Ramos no repositório será o padrão para não ter uma árvore de trabalho."
1375
1376
#: bzrlib/builtins.py:2195
1377
msgid "Show differences in the working tree, between revisions or branches."
1378
msgstr ""
1379
"Mostrar diferenças na árvore de trabalho, entre as revisões ou ramos."
1380
1381
#: bzrlib/builtins.py:2197
1382
msgid ""
1383
"If no arguments are given, all changes for the current tree are listed.\n"
1384
"If files are given, only the changes in those files are listed.\n"
1385
"Remote and multiple branches can be compared by using the --old and\n"
1386
"--new options. If not provided, the default for both is derived from\n"
1387
"the first argument, if any, or the current tree if no arguments are\n"
1388
"given."
1389
msgstr ""
1390
1391
#: bzrlib/builtins.py:2204
1392
msgid ""
1393
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1394
"produces patches suitable for \"patch -p1\"."
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2207
1398
msgid ""
1399
"Note that when using the -r argument with a range of revisions, the\n"
1400
"differences are computed between the two specified revisions. That\n"
1401
"is, the command does not show the changes introduced by the first \n"
1402
"revision in the range. This differs from the interpretation of \n"
1403
"revision ranges used by \"bzr log\" which includes the first revision\n"
1404
"in the range."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2214
1408
msgid ""
1409
":Exit values:\n"
1410
" 1 - changed\n"
1411
" 2 - unrepresentable changes\n"
1412
" 3 - error\n"
1413
" 0 - no change"
1414
msgstr ""
1415
":Valores de saída:\n"
1416
" 1 - alterado\n"
1417
" 2 - mudanças irrepresentáveis\n"
1418
" 3 - erro\n"
1419
" 0 - Sem alteração"
1420
1421
#: bzrlib/builtins.py:2220
1422
msgid ""
1423
":Examples:\n"
1424
" Shows the difference in the working tree versus the last commit::"
1425
msgstr ""
1426
":Exemplos:\n"
1427
" Mostra a diferença da árvore de trabalho em relação a última submissão::"
1428
1429
#: bzrlib/builtins.py:2223
1430
msgid " bzr diff"
1431
msgstr " bzr diff"
1432
1433
#: bzrlib/builtins.py:2225
1434
msgid " Difference between the working tree and revision 1::"
1435
msgstr " Diferença entre a árvore de trabalho e a revisão 1::"
1436
1437
#: bzrlib/builtins.py:2227
1438
msgid " bzr diff -r1"
1439
msgstr " bzr diff -r1"
1440
1441
#: bzrlib/builtins.py:2229
1442
msgid " Difference between revision 3 and revision 1::"
1443
msgstr " Diferença entre a revisão 3 e a revisão 1::"
1444
1445
#: bzrlib/builtins.py:2231
1446
msgid " bzr diff -r1..3"
1447
msgstr " bzr diff -r1..3"
1448
1449
#: bzrlib/builtins.py:2233
1450
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1451
msgstr " Diferença entre a revisão 3 e a revisão 1 para o ramo xxx::"
1452
1453
#: bzrlib/builtins.py:2235
1454
msgid " bzr diff -r1..3 xxx"
1455
msgstr " bzr diff -r1..3 xxx"
1456
1457
#: bzrlib/builtins.py:2237
1458
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1459
msgstr ""
1460
" As alterações introduzidas pela revisão 2 (equivalente a -r1..2)::"
1461
1462
#: bzrlib/builtins.py:2239
1463
msgid " bzr diff -c2"
1464
msgstr " bzr diff -c2"
1465
1466
#: bzrlib/builtins.py:2241
1467
msgid ""
1468
" To see the changes introduced by revision X::\n"
1469
" \n"
1470
" bzr diff -cX"
1471
msgstr ""
1472
" Para ver as alterações introduzidas pela revisão X::\n"
1473
" \n"
1474
" bzr diff-cX"
1475
1476
#: bzrlib/builtins.py:2245
1477
msgid ""
1478
" Note that in the case of a merge, the -c option shows the changes\n"
1479
" compared to the left hand parent. To see the changes against\n"
1480
" another parent, use::"
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2249
1484
msgid " bzr diff -r<chosen_parent>..X"
1485
msgstr ""
1486
1487
#: bzrlib/builtins.py:2251
1488
msgid ""
1489
" The changes between the current revision and the previous revision\n"
1490
" (equivalent to -c-1 and -r-2..-1)"
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2254
1494
msgid " bzr diff -r-2.."
1495
msgstr " bzr diff -r-2.."
1496
1497
#: bzrlib/builtins.py:2256
1498
msgid " Show just the differences for file NEWS::"
1499
msgstr ""
1500
1501
#: bzrlib/builtins.py:2258
1502
msgid " bzr diff NEWS"
1503
msgstr " bzr diff NEWS"
1504
1505
#: bzrlib/builtins.py:2260
1506
msgid " Show the differences in working tree xxx for file NEWS::"
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2262
1510
msgid " bzr diff xxx/NEWS"
1511
msgstr " bzr diff xxx/NEWS"
1512
1513
#: bzrlib/builtins.py:2264
1514
msgid " Show the differences from branch xxx to this working tree:"
1515
msgstr ""
1516
1517
#: bzrlib/builtins.py:2266
1518
msgid " bzr diff --old xxx"
1519
msgstr " bzr diff --old xxx"
1520
1521
#: bzrlib/builtins.py:2268
1522
msgid " Show the differences between two branches for file NEWS::"
1523
msgstr ""
1524
1525
#: bzrlib/builtins.py:2270
1526
msgid " bzr diff --old xxx --new yyy NEWS"
1527
msgstr ""
1528
1529
#: bzrlib/builtins.py:2272
1530
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2274
1534
msgid ""
1535
" bzr diff --prefix old/:new/\n"
1536
" \n"
1537
" Show the differences using a custom diff program with options::\n"
1538
" \n"
1539
" bzr diff --using /usr/bin/diff --diff-options -wu"
1540
msgstr ""
1541
1542
#: bzrlib/builtins.py:2284
1543
msgid "Pass these options to the external diff program."
1544
msgstr ""
1545
1546
#: bzrlib/builtins.py:2287
1547
msgid ""
1548
"Set prefixes added to old and new filenames, as two values separated by a "
1549
"colon. (eg \"old/:new/\")."
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2290
1553
msgid "Branch/tree to compare from."
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2294
1557
msgid "Branch/tree to compare to."
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2300
1561
msgid "Use this command to compare files."
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2305
1565
msgid "Diff format to use."
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2307
1569
msgid "Diff format"
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2329
1573
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2333
1577
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1578
msgstr ""
1579
1580
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1581
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1582
msgid "{0} and {1} are mutually exclusive"
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2358
1586
msgid ""
1587
"List files deleted in the working tree.\n"
1588
" "
1589
msgstr ""
1590
1591
#: bzrlib/builtins.py:2436
1592
msgid "Show the tree root directory."
1593
msgstr "Mostra o diretório raiz da árvore."
1594
1595
#: bzrlib/builtins.py:2438
1596
msgid ""
1597
"The root is the nearest enclosing directory with a .bzr control\n"
1598
"directory."
1599
msgstr ""
1600
1601
#: bzrlib/builtins.py:2453
1602
msgid "The limit argument must be an integer."
1603
msgstr "O argumento de limite deve ser um inteiro."
1604
1605
#: bzrlib/builtins.py:2461
1606
msgid "The levels argument must be an integer."
1607
msgstr "O argumento de níveis deve ser um inteiro."
1608
1609
#: bzrlib/builtins.py:2466
1610
msgid "Show historical log for a branch or subset of a branch."
1611
msgstr ""
1612
1613
#: bzrlib/builtins.py:2468
1614
msgid ""
1615
"log is bzr's default tool for exploring the history of a branch.\n"
1616
"The branch to use is taken from the first parameter. If no parameters\n"
1617
"are given, the branch containing the working directory is logged.\n"
1618
"Here are some simple examples::"
1619
msgstr ""
1620
1621
#: bzrlib/builtins.py:2473
1622
msgid ""
1623
" bzr log log the current branch\n"
1624
" bzr log foo.py log a file in its branch\n"
1625
" bzr log http://server/branch log a branch on a server"
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2477
1629
msgid ""
1630
"The filtering, ordering and information shown for each revision can\n"
1631
"be controlled as explained below. By default, all revisions are\n"
1632
"shown sorted (topologically) so that newer revisions appear before\n"
1633
"older ones and descendants always appear before ancestors. If displayed,\n"
1634
"merged revisions are shown indented under the revision in which they\n"
1635
"were merged."
1636
msgstr ""
1637
1638
#: bzrlib/builtins.py:2484
1639
msgid ":Output control:"
1640
msgstr ""
1641
1642
#: bzrlib/builtins.py:2486
1643
msgid ""
1644
" The log format controls how information about each revision is\n"
1645
" displayed. The standard log formats are called ``long``, ``short``\n"
1646
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1647
" for more details on log formats."
1648
msgstr ""
1649
1650
#: bzrlib/builtins.py:2491
1651
msgid ""
1652
" The following options can be used to control what information is\n"
1653
" displayed::"
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2494
1657
msgid ""
1658
" -l N display a maximum of N revisions\n"
1659
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1660
" -v display a status summary (delta) for each revision\n"
1661
" -p display a diff (patch) for each revision\n"
1662
" --show-ids display revision-ids (and file-ids), not just revnos"
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2500
1666
msgid ""
1667
" Note that the default number of levels to display is a function of the\n"
1668
" log format. If the -n option is not used, the standard log formats show\n"
1669
" just the top level (mainline)."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2504
1673
msgid ""
1674
" Status summaries are shown using status flags like A, M, etc. To see\n"
1675
" the changes explained using words like ``added`` and ``modified``\n"
1676
" instead, use the -vv option."
1677
msgstr ""
1678
1679
#: bzrlib/builtins.py:2508
1680
msgid ":Ordering control:"
1681
msgstr ""
1682
1683
#: bzrlib/builtins.py:2510
1684
msgid ""
1685
" To display revisions from oldest to newest, use the --forward option.\n"
1686
" In most cases, using this option will have little impact on the total\n"
1687
" time taken to produce a log, though --forward does not incrementally\n"
1688
" display revisions like --reverse does when it can."
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2515
1692
msgid ":Revision filtering:"
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2517
1696
msgid ""
1697
" The -r option can be used to specify what revision or range of revisions\n"
1698
" to filter against. The various forms are shown below::"
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2520
1702
msgid ""
1703
" -rX display revision X\n"
1704
" -rX.. display revision X and later\n"
1705
" -r..Y display up to and including revision Y\n"
1706
" -rX..Y display from X to Y inclusive"
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2525
1710
msgid ""
1711
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1712
" Some common examples are given below::"
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2528
1716
msgid ""
1717
" -r-1 show just the tip\n"
1718
" -r-10.. show the last 10 mainline revisions\n"
1719
" -rsubmit:.. show what's new on this branch\n"
1720
" -rancestor:path.. show changes since the common ancestor of this\n"
1721
" branch and the one at location path\n"
1722
" -rdate:yesterday.. show changes since yesterday"
1723
msgstr ""
1724
1725
#: bzrlib/builtins.py:2535
1726
msgid ""
1727
" When logging a range of revisions using -rX..Y, log starts at\n"
1728
" revision Y and searches back in history through the primary\n"
1729
" (\"left-hand\") parents until it finds X. When logging just the\n"
1730
" top level (using -n1), an error is reported if X is not found\n"
1731
" along the way. If multi-level logging is used (-n0), X may be\n"
1732
" a nested merge revision and the log will be truncated accordingly."
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2542
1736
msgid ":Path filtering:"
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2544
1740
msgid ""
1741
" If parameters are given and the first one is not a branch, the log\n"
1742
" will be filtered to show only those revisions that changed the\n"
1743
" nominated files or directories."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2548
1747
msgid ""
1748
" Filenames are interpreted within their historical context. To log a\n"
1749
" deleted file, specify a revision range so that the file existed at\n"
1750
" the end or start of the range."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2552
1754
msgid ""
1755
" Historical context is also important when interpreting pathnames of\n"
1756
" renamed files/directories. Consider the following example:"
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2555
1760
msgid ""
1761
" * revision 1: add tutorial.txt\n"
1762
" * revision 2: modify tutorial.txt\n"
1763
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2559
1767
msgid " In this case:"
1768
msgstr " Nesse caso:"
1769
1770
#: bzrlib/builtins.py:2561
1771
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1772
msgstr ""
1773
1774
#: bzrlib/builtins.py:2563
1775
msgid ""
1776
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2565
1780
msgid ""
1781
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1782
" the original file in revision 2."
1783
msgstr ""
1784
1785
#: bzrlib/builtins.py:2568
1786
msgid ""
1787
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1788
" was no file called guide.txt in revision 2."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2571
1792
msgid ""
1793
" Renames are always followed by log. By design, there is no need to\n"
1794
" explicitly ask for this (and no way to stop logging a file back\n"
1795
" until it was last renamed)."
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2575
1799
msgid ":Other filtering:"
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2577
1803
msgid ""
1804
" The --match option can be used for finding revisions that match a\n"
1805
" regular expression in a commit message, committer, author or bug.\n"
1806
" Specifying the option several times will match any of the supplied\n"
1807
" expressions. --match-author, --match-bugs, --match-committer and\n"
1808
" --match-message can be used to only match a specific field."
1809
msgstr ""
1810
1811
#: bzrlib/builtins.py:2583
1812
msgid ":Tips & tricks:"
1813
msgstr ":Dicas & truques:"
1814
1815
#: bzrlib/builtins.py:2585
1816
msgid ""
1817
" GUI tools and IDEs are often better at exploring history than command\n"
1818
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1819
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1820
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1821
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1822
msgstr ""
1823
1824
#: bzrlib/builtins.py:2591
1825
msgid ""
1826
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1827
msgstr ""
1828
1829
#: bzrlib/builtins.py:2593
1830
msgid ""
1831
" [ALIASES]\n"
1832
" tip = log -r-1\n"
1833
" top = log -l10 --line\n"
1834
" show = log -v -p"
1835
msgstr ""
1836
" [ALIASES]\n"
1837
" tip = log -r-1\n"
1838
" top = log -l10 --line\n"
1839
" show = log -v -p"
1840
1841
#: bzrlib/builtins.py:2598
1842
msgid ""
1843
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1844
" will show the last 10 mainline revisions. To see the details of a\n"
1845
" particular revision X, ``bzr show -rX``."
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:2602
1849
msgid ""
1850
" If you are interested in looking deeper into a particular merge X,\n"
1851
" use ``bzr log -n0 -rX``."
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:2605
1855
msgid ""
1856
" ``bzr log -v`` on a branch with lots of history is currently\n"
1857
" very slow. A fix for this issue is currently under development.\n"
1858
" With or without that fix, it is recommended that a revision range\n"
1859
" be given when using the -v option."
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:2610
1863
msgid ""
1864
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1865
" used to find revisions matching user names, commit messages, etc.\n"
1866
" Among other features, this plugin can find all revisions containing\n"
1867
" a list of words but not others."
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:2615
1871
msgid ""
1872
" When exploring non-mainline history on large projects with deep\n"
1873
" history, the performance of log can be greatly improved by installing\n"
1874
" the historycache plugin. This plugin buffers historical information\n"
1875
" trading disk space for faster speed."
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:2624
1879
msgid "Show from oldest to newest."
1880
msgstr "Mostrar mais antiga para a mais recente."
1881
1882
#: bzrlib/builtins.py:2627
1883
msgid "Show files changed in each revision."
1884
msgstr "Mostrar os arquivos mudaram em cada revisão."
1885
1886
#: bzrlib/builtins.py:2633
1887
msgid "Show just the specified revision. See also \"help revisionspec\"."
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:2637
1891
msgid "What names to list as authors - first, all or committer."
1892
msgstr ""
1893
1894
#: bzrlib/builtins.py:2638
1895
msgid "Authors"
1896
msgstr ""
1897
1898
#: bzrlib/builtins.py:2643
1899
msgid "Number of levels to display - 0 for all, 1 for flat."
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:2653
1903
msgid "Limit the output to the first N revisions."
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:2658
1907
msgid "Show changes made in each revision as a patch."
1908
msgstr "Mostrar alterações feitas em cada revisão como um caminho."
1909
1910
#: bzrlib/builtins.py:2660
1911
msgid "Show merged revisions like --levels 0 does."
1912
msgstr ""
1913
1914
#: bzrlib/builtins.py:2664
1915
msgid "Do not report commits with more than one parent."
1916
msgstr ""
1917
1918
#: bzrlib/builtins.py:2666
1919
msgid ""
1920
"Display only the revisions that are not part of both ancestries (require -"
1921
"rX..Y)."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:2670
1925
msgid "Show digital signature validity."
1926
msgstr "Mostrar a validade da assinatura digital."
1927
1928
#: bzrlib/builtins.py:2673
1929
msgid "Show revisions whose properties match this expression."
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:2677
1933
msgid "Show revisions whose message matches this expression."
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:2681
1937
msgid "Show revisions whose committer matches this expression."
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:2685
1941
msgid "Show revisions whose authors match this expression."
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:2689
1945
msgid "Show revisions whose bugs match this expression."
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:2743
1949
msgid "--exclude-common-ancestry requires -r with two revisions"
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:2771
1953
#, python-format
1954
msgid "Path unknown at end or start of revision range: %s"
1955
msgstr ""
1956
1957
#: bzrlib/builtins.py:2888
1958
#, python-format
1959
msgid "bzr %s doesn't accept two revisions in different branches."
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:2904
1963
#, python-format
1964
msgid "bzr %s --revision takes one or two values."
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:2949
1968
msgid ""
1969
"List files in a tree.\n"
1970
" "
1971
msgstr ""
1972
"Lista os arquivos em uma árvore.\n"
1973
" "
1974
1975
#: bzrlib/builtins.py:2958
1976
msgid "Recurse into subdirectories."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:2960
1980
msgid "Print paths relative to the root of the branch."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:2962
1984
msgid "Print unknown files."
1985
msgstr "Imprimir arquivos desconhecidos."
1986
1987
#: bzrlib/builtins.py:2963
1988
msgid "Print versioned files."
1989
msgstr "Imprimir arquivos versionados."
1990
1991
#: bzrlib/builtins.py:2966
1992
msgid "Print ignored files."
1993
msgstr "Imprimir arquivos ignorados."
1994
1995
#: bzrlib/builtins.py:2968
1996
msgid "List entries of a particular kind: file, directory, symlink."
1997
msgstr ""
1998
1999
#: bzrlib/builtins.py:2981
2000
msgid "invalid kind specified"
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:2984
2004
msgid "Cannot set both --verbose and --null"
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:2993
2008
msgid "cannot specify both --from-root and PATH"
2009
msgstr ""
2010
2011
#: bzrlib/builtins.py:3080
2012
msgid "Ignore specified files or patterns."
2013
msgstr ""
2014
2015
#: bzrlib/builtins.py:3082
2016
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3084
2020
msgid ""
2021
"If a .bzrignore file does not exist, the ignore command\n"
2022
"will create one and add the specified files or patterns to the newly\n"
2023
"created file. The ignore command will also automatically add the \n"
2024
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2025
"the use of the ignore command will require an explicit add command."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3090
2029
msgid ""
2030
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2031
"After adding, editing or deleting that file either indirectly by\n"
2032
"using this command or directly by using an editor, be sure to commit\n"
2033
"it."
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3095
2037
msgid ""
2038
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2039
"the global ignore file can be found in the application data directory as\n"
2040
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2041
"Global ignores are not touched by this command. The global ignore file\n"
2042
"can be edited directly using an editor."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3101
2046
msgid ""
2047
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2048
"precedence over regular ignores. Such exceptions are used to specify\n"
2049
"files that should be versioned which would otherwise be ignored."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3105
2053
msgid ""
2054
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2055
"precedence over the '!' exception patterns."
2056
msgstr ""
2057
2058
#: bzrlib/builtins.py:3108
2059
msgid ""
2060
":Notes: \n"
2061
" \n"
2062
"* Ignore patterns containing shell wildcards must be quoted from\n"
2063
" the shell on Unix."
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3113
2067
msgid ""
2068
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2069
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3116
2073
msgid ""
2074
":Examples:\n"
2075
" Ignore the top level Makefile::"
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3119
2079
msgid " bzr ignore ./Makefile"
2080
msgstr " bzr ignore ./Makefile"
2081
2082
#: bzrlib/builtins.py:3121
2083
msgid " Ignore .class files in all directories...::"
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3123
2087
msgid " bzr ignore \"*.class\""
2088
msgstr " bzr ignore \"*.class\""
2089
2090
#: bzrlib/builtins.py:3125
2091
msgid " ...but do not ignore \"special.class\"::"
2092
msgstr ""
2093
2094
#: bzrlib/builtins.py:3127
2095
msgid " bzr ignore \"!special.class\""
2096
msgstr " bzr ignore \"!special.class\""
2097
2098
#: bzrlib/builtins.py:3129
2099
msgid " Ignore files whose name begins with the \"#\" character::"
2100
msgstr ""
2101
2102
#: bzrlib/builtins.py:3131
2103
msgid " bzr ignore \"RE:^#\""
2104
msgstr " bzr ignore \"RE:^#\""
2105
2106
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2107
msgid " Ignore .o files under the lib directory::"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3135
2111
msgid " bzr ignore \"lib/**/*.o\""
2112
msgstr " bzr ignore \"lib/**/*.o\""
2113
2114
#: bzrlib/builtins.py:3139
2115
msgid " bzr ignore \"RE:lib/.*\\.o\""
2116
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2117
2118
#: bzrlib/builtins.py:3141
2119
msgid " Ignore everything but the \"debian\" toplevel directory::"
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3143
2123
msgid ""
2124
" bzr ignore \"RE:(?!debian/).*\"\n"
2125
" \n"
2126
" Ignore everything except the \"local\" toplevel directory,\n"
2127
" but always ignore autosave files ending in ~, even under local/::\n"
2128
" \n"
2129
" bzr ignore \"*\"\n"
2130
" bzr ignore \"!./local\"\n"
2131
" bzr ignore \"!!*~\""
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3157
2135
msgid "Display the default ignore rules that bzr uses."
2136
msgstr ""
2137
2138
#: bzrlib/builtins.py:3169
2139
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3180
2143
#, python-format
2144
msgid "Invalid ignore pattern found. %s"
2145
msgid_plural "Invalid ignore patterns found. %s"
2146
msgstr[0] ""
2147
msgstr[1] ""
2148
2149
#: bzrlib/builtins.py:3189
2150
msgid "NAME_PATTERN should not be an absolute path"
2151
msgstr ""
2152
2153
#: bzrlib/builtins.py:3202
2154
#, python-format
2155
msgid ""
2156
"Warning: the following files are version controlled and match your ignore "
2157
"pattern:\n"
2158
"%s\n"
2159
"These files will continue to be version controlled unless you 'bzr remove' "
2160
"them.\n"
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3209
2164
msgid "List ignored files and the patterns that matched them."
2165
msgstr ""
2166
2167
#: bzrlib/builtins.py:3211
2168
msgid ""
2169
"List all the ignored files and the ignore pattern that caused the file to\n"
2170
"be ignored."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3214
2174
msgid "Alternatively, to list just the files::"
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3216
2178
msgid " bzr ls --ignored"
2179
msgstr " bzr ls --ignored"
2180
2181
#: bzrlib/builtins.py:3250
2182
#, python-format
2183
msgid "not a valid revision-number: %r"
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3257
2187
msgid ""
2188
"Export current or past revision to a destination directory or archive."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3259
2192
msgid "If no revision is specified this exports the last committed revision."
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3261
2196
msgid ""
2197
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2198
"given, try to find the format with the extension. If no extension\n"
2199
"is found exports to a directory (equivalent to --format=dir)."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3265
2203
msgid ""
2204
"If root is supplied, it will be used as the root directory inside\n"
2205
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2206
"to the exported filename. The root option has no effect for 'dir' format."
2207
msgstr ""
2208
2209
#: bzrlib/builtins.py:3269
2210
msgid ""
2211
"If branch is omitted then the branch containing the current working\n"
2212
"directory will be used."
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3272
2216
msgid ""
2217
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2218
msgstr ""
2219
2220
#: bzrlib/builtins.py:3274
2221
msgid ""
2222
" ================= =========================\n"
2223
" Supported formats Autodetected by extension\n"
2224
" ================= =========================\n"
2225
" dir (none)\n"
2226
" tar .tar\n"
2227
" tbz2 .tar.bz2, .tbz2\n"
2228
" tgz .tar.gz, .tgz\n"
2229
" zip .zip\n"
2230
" ================= ========================="
2231
msgstr ""
2232
2233
#: bzrlib/builtins.py:3288
2234
msgid "Type of file to export to."
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:3291
2238
msgid "Apply content filters to export the convenient form."
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3295
2242
msgid "Name of the root directory inside the exported file."
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3297
2246
msgid ""
2247
"Set modification time of files to that of the last revision in which it was "
2248
"changed."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3300
2252
msgid ""
2253
"Export the working tree contents rather than that of the last revision."
2254
msgstr ""
2255
2256
#: bzrlib/builtins.py:3319
2257
msgid "--uncommitted requires a working tree"
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3328
2261
#, python-format
2262
msgid "Unsupported export format: %s"
2263
msgstr ""
2264
2265
#: bzrlib/builtins.py:3332
2266
msgid ""
2267
"Write the contents of a file as of a given revision to standard output."
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3334
2271
msgid "If no revision is nominated, the last revision is used."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3336
2275
msgid ""
2276
"Note: Take care to redirect standard output when using this command on a\n"
2277
"binary file."
2278
msgstr ""
2279
2280
#: bzrlib/builtins.py:3342
2281
msgid "The path name in the old tree."
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3343
2285
msgid "Apply content filters to display the convenience form."
2286
msgstr ""
2287
2288
#: bzrlib/builtins.py:3354
2289
msgid "bzr cat --revision takes exactly one revision specifier"
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2293
msgid "{0!r} is not present in revision {1}"
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3414
2297
msgid "Commit changes into a new revision."
2298
msgstr ""
2299
2300
#: bzrlib/builtins.py:3416
2301
msgid ""
2302
"An explanatory message needs to be given for each commit. This is\n"
2303
"often done by using the --message option (getting the message from the\n"
2304
"command line) or by using the --file option (getting the message from\n"
2305
"a file). If neither of these options is given, an editor is opened for\n"
2306
"the user to enter the message. To see the changed files in the\n"
2307
"boilerplate text loaded into the editor, use the --show-diff option."
2308
msgstr ""
2309
2310
#: bzrlib/builtins.py:3423
2311
msgid ""
2312
"By default, the entire tree is committed and the person doing the\n"
2313
"commit is assumed to be the author. These defaults can be overridden\n"
2314
"as explained below."
2315
msgstr ""
2316
2317
#: bzrlib/builtins.py:3427
2318
msgid ":Selective commits:"
2319
msgstr ""
2320
2321
#: bzrlib/builtins.py:3429
2322
msgid ""
2323
" If selected files are specified, only changes to those files are\n"
2324
" committed. If a directory is specified then the directory and\n"
2325
" everything within it is committed."
2326
msgstr ""
2327
2328
#: bzrlib/builtins.py:3433
2329
msgid ""
2330
" When excludes are given, they take precedence over selected files.\n"
2331
" For example, to commit only changes within foo, but not changes\n"
2332
" within foo/bar::"
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3437
2336
msgid " bzr commit foo -x foo/bar"
2337
msgstr " bzr commit foo -x foo/bar"
2338
2339
#: bzrlib/builtins.py:3439
2340
msgid " A selective commit after a merge is not yet supported."
2341
msgstr ""
2342
2343
#: bzrlib/builtins.py:3441
2344
msgid ":Custom authors:"
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3443
2348
msgid ""
2349
" If the author of the change is not the same person as the committer,\n"
2350
" you can specify the author's name using the --author option. The\n"
2351
" name should be in the same format as a committer-id, e.g.\n"
2352
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2353
" the change you can specify the option multiple times, once for each\n"
2354
" author."
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3450
2358
msgid ":Checks:"
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3452
2362
msgid ""
2363
" A common mistake is to forget to add a new file or directory before\n"
2364
" running the commit command. The --strict option checks for unknown\n"
2365
" files and aborts the commit if any are found. More advanced pre-commit\n"
2366
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2367
" for details."
2368
msgstr ""
2369
2370
#: bzrlib/builtins.py:3458
2371
msgid ":Things to note:"
2372
msgstr ":Notas:"
2373
2374
#: bzrlib/builtins.py:3460
2375
msgid ""
2376
" If you accidentially commit the wrong changes or make a spelling\n"
2377
" mistake in the commit message say, you can use the uncommit command\n"
2378
" to undo it. See ``bzr help uncommit`` for details."
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3464
2382
msgid ""
2383
" Hooks can also be configured to run after a commit. This allows you\n"
2384
" to trigger updates to external systems like bug trackers. The --fixes\n"
2385
" option can be used to record the association between a revision and\n"
2386
" one or more bugs. See ``bzr help bugs`` for details."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3474
2390
msgid "Do not consider changes made to a given path."
2391
msgstr ""
2392
2393
#: bzrlib/builtins.py:3477
2394
msgid "Description of the new revision."
2395
msgstr "Descrição da nova revisão."
2396
2397
#: bzrlib/builtins.py:3480
2398
msgid "Commit even if nothing has changed."
2399
msgstr "Usar commit, mesmo que nada tenha mudado."
2400
2401
#: bzrlib/builtins.py:3484
2402
msgid "Take commit message from this file."
2403
msgstr ""
2404
2405
#: bzrlib/builtins.py:3486
2406
msgid "Refuse to commit if there are unknown files in the working tree."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3489
2410
msgid ""
2411
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2412
"08:00:00 +0100'."
2413
msgstr ""
2414
2415
#: bzrlib/builtins.py:3492
2416
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2417
msgstr ""
2418
2419
#: bzrlib/builtins.py:3495
2420
msgid "Set the author's name, if it's different from the committer."
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3498
2424
msgid ""
2425
"Perform a local commit in a bound branch. Local commits are not pushed to "
2426
"the master branch until a normal commit is performed."
2427
msgstr ""
2428
2429
#: bzrlib/builtins.py:3504
2430
msgid ""
2431
"When no message is supplied, show the diff along with the status summary in "
2432
"the message editor."
2433
msgstr ""
2434
2435
#: bzrlib/builtins.py:3507
2436
msgid ""
2437
"When committing to a foreign version control system do not push data that "
2438
"can not be natively represented."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3525
2442
#, python-format
2443
msgid ""
2444
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2445
"default bug tracker using the `bugtracker` option.\n"
2446
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3534
2450
#, python-format
2451
msgid ""
2452
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2453
"for more information on this feature.\n"
2454
"Commit refused."
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3543
2458
#, python-format
2459
msgid "Unrecognized bug %s. Commit refused."
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3546
2463
#, python-format
2464
msgid ""
2465
"%s\n"
2466
"Commit refused."
2467
msgstr ""
2468
2469
#: bzrlib/builtins.py:3570
2470
msgid "Could not parse --commit-time: "
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3610
2474
msgid "please specify either --message or --file"
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3639
2478
msgid "please specify a commit message with either --message or --file"
2479
msgstr ""
2480
2481
#: bzrlib/builtins.py:3642
2482
msgid ""
2483
"Empty commit message specified. Please specify a commit message with either -"
2484
"-message or --file or leave a blank message with --message \"\"."
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3662
2488
msgid ""
2489
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2490
"-unchanged to force an empty commit."
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3666
2494
msgid ""
2495
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2496
"resolve FILE\" to resolve."
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3670
2500
msgid "Commit refused because there are unknown files in the working tree."
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3673
2504
msgid ""
2505
"\n"
2506
"To commit to master branch, run update and then commit.\n"
2507
"You can also pass --local to commit to continue working disconnected."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3681
2511
msgid ""
2512
"Validate working tree structure, branch consistency and repository history."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3683
2516
msgid ""
2517
"This command checks various invariants about branch and repository storage\n"
2518
"to detect data corruption or bzr bugs."
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3686
2522
msgid ""
2523
"The working tree and branch checks will only give output if a problem is\n"
2524
"detected. The output fields of the repository check are:"
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3689
2528
msgid ""
2529
"revisions\n"
2530
" This is just the number of revisions checked. It doesn't\n"
2531
" indicate a problem."
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3693
2535
msgid ""
2536
"versionedfiles\n"
2537
" This is just the number of versionedfiles checked. It\n"
2538
" doesn't indicate a problem."
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:3697
2542
msgid ""
2543
"unreferenced ancestors\n"
2544
" Texts that are ancestors of other texts, but\n"
2545
" are not properly referenced by the revision ancestry. This is a\n"
2546
" subtle problem that Bazaar can work around."
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:3702
2550
msgid ""
2551
"unique file texts\n"
2552
" This is the total number of unique file contents\n"
2553
" seen in the checked revisions. It does not indicate a problem."
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:3706
2557
msgid ""
2558
"repeated file texts\n"
2559
" This is the total number of repeated texts seen\n"
2560
" in the checked revisions. Texts can be repeated when their file\n"
2561
" entries are modified, but the file contents are not. It does not\n"
2562
" indicate a problem."
2563
msgstr ""
2564
2565
#: bzrlib/builtins.py:3712
2566
msgid ""
2567
"If no restrictions are specified, all Bazaar data that is found at the "
2568
"given\n"
2569
"location will be checked."
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:3717
2573
msgid " Check the tree and branch at 'foo'::"
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:3719
2577
msgid " bzr check --tree --branch foo"
2578
msgstr " bzr check --tree --branch foo"
2579
2580
#: bzrlib/builtins.py:3721
2581
msgid " Check only the repository at 'bar'::"
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:3723
2585
msgid " bzr check --repo bar"
2586
msgstr " bzr check --repo bar"
2587
2588
#: bzrlib/builtins.py:3725
2589
msgid " Check everything at 'baz'::"
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:3727
2593
msgid " bzr check baz"
2594
msgstr " bzr check baz"
2595
2596
#: bzrlib/builtins.py:3733
2597
msgid "Check the branch related to the current directory."
2598
msgstr ""
2599
2600
#: bzrlib/builtins.py:3735
2601
msgid "Check the repository related to the current directory."
2602
msgstr ""
2603
2604
#: bzrlib/builtins.py:3737
2605
msgid "Check the working tree related to the current directory."
2606
msgstr ""
2607
2608
#: bzrlib/builtins.py:3751
2609
msgid "Upgrade a repository, branch or working tree to a newer format."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:3753
2613
msgid ""
2614
"When the default format has changed after a major new release of\n"
2615
"Bazaar, you may be informed during certain operations that you\n"
2616
"should upgrade. Upgrading to a newer format may improve performance\n"
2617
"or make new features available. It may however limit interoperability\n"
2618
"with older repositories or with older versions of Bazaar."
2619
msgstr ""
2620
2621
#: bzrlib/builtins.py:3759
2622
msgid ""
2623
"If you wish to upgrade to a particular format rather than the\n"
2624
"current default, that can be specified using the --format option.\n"
2625
"As a consequence, you can use the upgrade command this way to\n"
2626
"\"downgrade\" to an earlier format, though some conversions are\n"
2627
"a one way process (e.g. changing from the 1.x default to the\n"
2628
"2.x default) so downgrading is not always possible."
2629
msgstr ""
2630
2631
#: bzrlib/builtins.py:3766
2632
msgid ""
2633
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2634
"process (where # is a number). By default, this is left there on\n"
2635
"completion. If the conversion fails, delete the new .bzr directory\n"
2636
"and rename this one back in its place. Use the --clean option to ask\n"
2637
"for the backup.bzr directory to be removed on successful conversion.\n"
2638
"Alternatively, you can delete it by hand if everything looks good\n"
2639
"afterwards."
2640
msgstr ""
2641
2642
#: bzrlib/builtins.py:3774
2643
msgid ""
2644
"If the location given is a shared repository, dependent branches\n"
2645
"are also converted provided the repository converts successfully.\n"
2646
"If the conversion of a branch fails, remaining branches are still\n"
2647
"tried."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:3779
2651
msgid ""
2652
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2653
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:3787
2657
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:3791
2661
msgid "Branch format"
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:3793
2665
msgid "Remove the backup.bzr directory if successful."
2666
msgstr ""
2667
2668
#: bzrlib/builtins.py:3795
2669
msgid "Show what would be done, but don't actually do anything."
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:3810
2673
msgid "Show or set bzr user id."
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:3812
2677
msgid ""
2678
":Examples:\n"
2679
" Show the email of the current user::"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:3815
2683
msgid " bzr whoami --email"
2684
msgstr " bzr whoami --email"
2685
2686
#: bzrlib/builtins.py:3817
2687
msgid " Set the current user::"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:3819
2691
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2692
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2693
2694
#: bzrlib/builtins.py:3823
2695
msgid "Display email address only."
2696
msgstr "Mostra apenas o endereço de email."
2697
2698
#: bzrlib/builtins.py:3825
2699
msgid "Set identity for the current branch instead of globally."
2700
msgstr ""
2701
2702
#: bzrlib/builtins.py:3851
2703
msgid "--email can only be used to display existing identity"
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:3873
2707
msgid "Print or set the branch nickname."
2708
msgstr ""
2709
2710
#: bzrlib/builtins.py:3875
2711
msgid ""
2712
"If unset, the tree root directory name is used as the nickname.\n"
2713
"To print the current nickname, execute with no argument."
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:3878
2717
msgid ""
2718
"Bound branches use the nickname of its master branch unless it is set\n"
2719
"locally."
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:3898
2723
msgid "Set/unset and display aliases."
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:3900
2727
msgid ""
2728
":Examples:\n"
2729
" Show the current aliases::"
2730
msgstr ""
2731
":Exemplos:\n"
2732
" Mostra os atalhos atuais::"
2733
2734
#: bzrlib/builtins.py:3903
2735
msgid " bzr alias"
2736
msgstr " bzr alias"
2737
2738
#: bzrlib/builtins.py:3905
2739
msgid " Show the alias specified for 'll'::"
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:3907
2743
msgid " bzr alias ll"
2744
msgstr " bzr alias ll"
2745
2746
#: bzrlib/builtins.py:3909
2747
msgid " Set an alias for 'll'::"
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:3911
2751
msgid " bzr alias ll=\"log --line -r-10..-1\""
2752
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2753
2754
#: bzrlib/builtins.py:3913
2755
msgid " To remove an alias for 'll'::"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:3915
2759
msgid " bzr alias --remove ll"
2760
msgstr " bzr alias --remove ll"
2761
2762
#: bzrlib/builtins.py:3920
2763
msgid "Remove the alias."
2764
msgstr "Remove o atalho."
2765
2766
#: bzrlib/builtins.py:3938
2767
msgid "bzr alias --remove expects an alias to remove."
2768
msgstr ""
2769
2770
#: bzrlib/builtins.py:4119
2771
msgid ""
2772
"subunit not available. subunit needs to be installed to use --subunit."
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4136
2776
msgid ""
2777
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4183
2781
msgid "Show version of bzr."
2782
msgstr "Mostra a versão do bzr."
2783
2784
#: bzrlib/builtins.py:4187
2785
msgid "Print just the version number."
2786
msgstr "Mostra apenas o número da versão."
2787
2788
#: bzrlib/builtins.py:4206
2789
msgid "It sure does!\n"
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4230
2793
#, python-format
2794
msgid "merge base is revision %s\n"
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4234
2798
msgid "Perform a three-way merge."
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4236
2802
msgid ""
2803
"The source of the merge can be specified either in the form of a branch,\n"
2804
"or in the form of a path to a file containing a merge directive generated\n"
2805
"with bzr send. If neither is specified, the default is the upstream branch\n"
2806
"or the branch most recently merged using --remember. The source of the\n"
2807
"merge may also be specified in the form of a path to a file in another\n"
2808
"branch: in this case, only the modifications to that file are merged into\n"
2809
"the current working tree."
2810
msgstr ""
2811
2812
#: bzrlib/builtins.py:4244
2813
msgid ""
2814
"When merging from a branch, by default bzr will try to merge in all new\n"
2815
"work from the other branch, automatically determining an appropriate base\n"
2816
"revision. If this fails, you may need to give an explicit base."
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4248
2820
msgid ""
2821
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2822
"try to merge in all new work up to and including revision OTHER."
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:4251
2826
msgid ""
2827
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2828
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2829
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2830
"not already contain revision BASE, such a merge is commonly referred to as\n"
2831
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2832
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2833
"changes from the other branch is not stored in the commit."
2834
msgstr ""
2835
2836
#: bzrlib/builtins.py:4259
2837
msgid "Revision numbers are always relative to the source branch."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2841
msgid ""
2842
"Merge will do its best to combine the changes in two branches, but there\n"
2843
"are some kinds of problems only a human can fix. When it encounters those,\n"
2844
"it will mark a conflict. A conflict means that you need to fix something,\n"
2845
"before you can commit."
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:4266
2849
msgid ""
2850
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4268
2854
msgid ""
2855
"If there is no default branch set, the first merge will set it (use\n"
2856
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2857
"to use the default. To change the default, use --remember. The value will\n"
2858
"only be saved if the remote location can be accessed."
2859
msgstr ""
2860
2861
#: bzrlib/builtins.py:4273
2862
msgid ""
2863
"The results of the merge are placed into the destination working\n"
2864
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2865
"committed to record the result of the merge."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4277
2869
msgid ""
2870
"merge refuses to run if there are any uncommitted changes, unless\n"
2871
"--force is given. If --force is given, then the changes from the source \n"
2872
"will be merged with the current working tree, including any uncommitted\n"
2873
"changes in the tree. The --force option can also be used to create a\n"
2874
"merge revision which has more than two parents."
2875
msgstr ""
2876
2877
#: bzrlib/builtins.py:4283
2878
msgid ""
2879
"If one would like to merge changes from the working tree of the other\n"
2880
"branch without merging any committed revisions, the --uncommitted option\n"
2881
"can be given."
2882
msgstr ""
2883
2884
#: bzrlib/builtins.py:4287
2885
msgid ""
2886
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2887
"you to apply each diff hunk and file change, similar to \"shelve\"."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:4290
2891
msgid ""
2892
":Examples:\n"
2893
" To merge all new revisions from bzr.dev::"
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4293
2897
msgid " bzr merge ../bzr.dev"
2898
msgstr " bzr merge ../bzr.dev"
2899
2900
#: bzrlib/builtins.py:4295
2901
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2902
msgstr ""
2903
2904
#: bzrlib/builtins.py:4297
2905
msgid " bzr merge -r 82 ../bzr.dev"
2906
msgstr " bzr merge -r 82 ../bzr.dev"
2907
2908
#: bzrlib/builtins.py:4299
2909
msgid " To merge the changes introduced by 82, without previous changes::"
2910
msgstr ""
2911
2912
#: bzrlib/builtins.py:4301
2913
msgid " bzr merge -r 81..82 ../bzr.dev"
2914
msgstr " bzr merge -r 81..82 ../bzr.dev"
2915
2916
#: bzrlib/builtins.py:4303
2917
msgid " To apply a merge directive contained in /tmp/merge::"
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4305
2921
msgid " bzr merge /tmp/merge"
2922
msgstr " bzr merge /tmp/merge"
2923
2924
#: bzrlib/builtins.py:4307
2925
msgid ""
2926
" To create a merge revision with three parents from two branches\n"
2927
" feature1a and feature1b:"
2928
msgstr ""
2929
2930
#: bzrlib/builtins.py:4310
2931
msgid ""
2932
" bzr merge ../feature1a\n"
2933
" bzr merge ../feature1b --force\n"
2934
" bzr commit -m 'revision with three parents'"
2935
msgstr ""
2936
" bzr merge ../feature1a\n"
2937
" bzr merge ../feature1b --force\n"
2938
" bzr commit -m 'revisão com três pais'"
2939
2940
#: bzrlib/builtins.py:4322
2941
msgid "Merge even if the destination tree has uncommitted changes."
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:4328
2945
msgid ""
2946
"Apply uncommitted changes from a working copy, instead of branch changes."
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4330
2950
msgid ""
2951
"If the destination is already completely merged into the source, pull from "
2952
"the source rather than merging. When this happens, you do not need to "
2953
"commit the result."
2954
msgstr ""
2955
2956
#: bzrlib/builtins.py:4335
2957
msgid ""
2958
"Branch to merge into, rather than the one containing the working directory."
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4337
2962
msgid "Instead of merging, show a diff of the merge."
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4339
2966
msgid "Select changes interactively."
2967
msgstr "Selecione mudanças interativamente."
2968
2969
#: bzrlib/builtins.py:4361
2970
msgid ""
2971
"Merging into empty branches not currently supported, "
2972
"https://bugs.launchpad.net/bzr/+bug/308562"
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4388
2976
msgid "Cannot use --uncommitted with bundles or merge directives."
2977
msgstr ""
2978
2979
#: bzrlib/builtins.py:4399
2980
msgid "Cannot use --uncommitted and --revision at the same time."
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4419
2984
msgid "merger: "
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2988
msgid "Nothing to do."
2989
msgstr ""
2990
2991
#: bzrlib/builtins.py:4425
2992
msgid "Cannot pull individual files"
2993
msgstr "Não foi possível obter os arquivos individuais"
2994
2995
#: bzrlib/builtins.py:4433
2996
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2997
msgstr ""
2998
2999
#: bzrlib/builtins.py:4491
3000
#, python-format
3001
msgid "Show-base is not supported for this merge type. %s"
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4500
3005
#, python-format
3006
msgid "Conflict reduction is not supported for merge type %s."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4504
3010
msgid "Cannot do conflict reduction and show base."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4615
3014
msgid "No location specified or remembered"
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4617
3018
msgid "{0} remembered {1} location {2}"
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4623
3022
msgid "Redo a merge."
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:4625
3026
msgid ""
3027
"Use this if you want to try a different merge technique while resolving\n"
3028
"conflicts. Some merge techniques are better than others, and remerge\n"
3029
"lets you try different ones on different files."
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:4629
3033
msgid ""
3034
"The options for remerge have the same meaning and defaults as the ones for\n"
3035
"merge. The difference is that remerge can (only) be run when there is a\n"
3036
"pending merge, and it lets you specify particular files."
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:4633
3040
msgid ""
3041
":Examples:\n"
3042
" Re-do the merge of all conflicted files, and show the base text in\n"
3043
" conflict regions, in addition to the usual THIS and OTHER texts::"
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4637
3047
msgid " bzr remerge --show-base"
3048
msgstr " bzr remerge --show-base"
3049
3050
#: bzrlib/builtins.py:4639
3051
msgid ""
3052
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3053
" additional processing to reduce the size of conflict regions::"
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:4642
3057
msgid " bzr remerge --merge-type weave --reprocess foobar"
3058
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3059
3060
#: bzrlib/builtins.py:4649
3061
msgid "Show base revision text in conflicts."
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:4661
3065
msgid ""
3066
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3067
"merges."
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:4717
3071
msgid "Revert files to a previous revision."
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:4719
3075
msgid ""
3076
"Giving a list of files will revert only those files. Otherwise, all files\n"
3077
"will be reverted. If the revision is not specified with '--revision', the\n"
3078
"last committed revision is used."
3079
msgstr ""
3080
3081
#: bzrlib/builtins.py:4723
3082
msgid ""
3083
"To remove only some changes, without reverting to a prior version, use\n"
3084
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3085
"will remove the changes introduced by the second last commit (-2), without\n"
3086
"affecting the changes introduced by the last commit (-1). To remove\n"
3087
"certain changes on a hunk-by-hunk basis, see the shelve command."
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:4729
3091
msgid ""
3092
"By default, any files that have been manually changed will be backed up\n"
3093
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3094
"'.~#~' appended to their name, where # is a number."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4733
3098
msgid ""
3099
"When you provide files, you can use their current pathname or the pathname\n"
3100
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3101
"name. If you name a directory, all the contents of that directory will be\n"
3102
"reverted."
3103
msgstr ""
3104
3105
#: bzrlib/builtins.py:4738
3106
msgid ""
3107
"If you have newly added files since the target revision, they will be\n"
3108
"removed. If the files to be removed have been changed, backups will be\n"
3109
"created as above. Directories containing unknown files will not be\n"
3110
"deleted."
3111
msgstr ""
3112
3113
#: bzrlib/builtins.py:4743
3114
msgid ""
3115
"The working tree contains a list of revisions that have been merged but\n"
3116
"not yet committed. These revisions will be included as additional parents\n"
3117
"of the next commit. Normally, using revert clears that list as well as\n"
3118
"reverting the files. If any files are specified, revert leaves the list\n"
3119
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3120
".`` in the tree root to revert all files but keep the recorded merges,\n"
3121
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3122
"reverting any files."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4752
3126
msgid ""
3127
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3128
"changes from a branch in a single revision. To do this, perform the merge\n"
3129
"as desired. Then doing revert with the \"--forget-merges\" option will "
3130
"keep\n"
3131
"the content of the tree as it was, but it will clear the list of pending\n"
3132
"merges. The next commit will then contain all of the changes that are\n"
3133
"present in the other branch, but without any other parent revisions.\n"
3134
"Because this technique forgets where these changes originated, it may\n"
3135
"cause additional conflicts on later merges involving the same source and\n"
3136
"target branches."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:4766
3140
msgid "Do not save backups of reverted files."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:4768
3144
msgid "Remove pending merge marker, without changing any files."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:4799
3148
msgid ""
3149
"Show help on a command or other topic.\n"
3150
" "
3151
msgstr ""
3152
3153
#: bzrlib/builtins.py:4804
3154
msgid "Show help on all commands."
3155
msgstr "Mostrar ajuda sobre todos os comandos."
3156
3157
#: bzrlib/builtins.py:4833
3158
msgid "Show unmerged/unpulled revisions between two branches."
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:4835
3162
msgid "OTHER_BRANCH may be local or remote."
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:4837
3166
msgid ""
3167
"To filter on a range of revisions, you can use the command -r begin..end\n"
3168
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3169
"also valid.\n"
3170
" \n"
3171
":Exit values:\n"
3172
" 1 - some missing revisions\n"
3173
" 0 - no missing revisions"
3174
msgstr ""
3175
3176
#: bzrlib/builtins.py:4847
3177
msgid ""
3178
" Determine the missing revisions between this and the branch at the\n"
3179
" remembered pull location::"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:4850
3183
msgid " bzr missing"
3184
msgstr " bzr missing"
3185
3186
#: bzrlib/builtins.py:4852
3187
msgid " Determine the missing revisions between this and another branch::"
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:4854
3191
msgid " bzr missing http://server/branch"
3192
msgstr " bzr missing http://server/branch"
3193
3194
#: bzrlib/builtins.py:4856
3195
msgid ""
3196
" Determine the missing revisions up to a specific revision on the other\n"
3197
" branch::"
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:4859
3201
msgid " bzr missing -r ..-10"
3202
msgstr " bzr missing -r ..-10"
3203
3204
#: bzrlib/builtins.py:4861
3205
msgid ""
3206
" Determine the missing revisions up to a specific revision on this\n"
3207
" branch::"
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:4864
3211
msgid " bzr missing --my-revision ..-10"
3212
msgstr " bzr missing --my-revision ..-10"
3213
3214
#: bzrlib/builtins.py:4871
3215
msgid "Reverse the order of revisions."
3216
msgstr "Inverter a ordem das revisões"
3217
3218
#: bzrlib/builtins.py:4873
3219
msgid "Display changes in the local branch only."
3220
msgstr "Mostrar mudanças somente no ramo local."
3221
3222
#: bzrlib/builtins.py:4874
3223
msgid "Same as --mine-only."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:4876
3227
msgid "Display changes in the remote branch only."
3228
msgstr "Mostrar alterações somente no ramo remoto."
3229
3230
#: bzrlib/builtins.py:4877
3231
msgid "Same as --theirs-only."
3232
msgstr ""
3233
3234
#: bzrlib/builtins.py:4882
3235
msgid ""
3236
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3237
"details."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:4886
3241
msgid ""
3242
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3243
"details."
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:4889
3247
msgid "Show all revisions in addition to the mainline ones."
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:4943
3251
msgid "No peer location known or specified."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:4947
3255
msgid "Using saved parent location: {0}\n"
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:4980
3259
#, python-format
3260
msgid "You have %d extra revision:\n"
3261
msgid_plural "You have %d extra revisions:\n"
3262
msgstr[0] ""
3263
msgstr[1] ""
3264
3265
#: bzrlib/builtins.py:4996
3266
#, python-format
3267
msgid "You are missing %d revision:\n"
3268
msgid_plural "You are missing %d revisions:\n"
3269
msgstr[0] "Você tem %d revisão pendente:\n"
3270
msgstr[1] "Você tem %d revisões pendentes:\n"
3271
3272
#: bzrlib/builtins.py:5008
3273
msgid "This branch has no new revisions.\n"
3274
msgstr "Esse ramo não tem novas revisões.\n"
3275
3276
#: bzrlib/builtins.py:5011
3277
msgid "Other branch has no new revisions.\n"
3278
msgstr "Outro ramo não tem novas revisões.\n"
3279
3280
#: bzrlib/builtins.py:5016
3281
msgid "Branches are up to date.\n"
3282
msgstr "Ramos estão atualizados.\n"
3283
3284
#: bzrlib/builtins.py:5027
3285
msgid "Compress the data within a repository."
3286
msgstr "Comprimir os dados em um repositório."
3287
3288
#: bzrlib/builtins.py:5029
3289
msgid ""
3290
"This operation compresses the data within a bazaar repository. As\n"
3291
"bazaar supports automatic packing of repository, this operation is\n"
3292
"normally not required to be done manually."
3293
msgstr ""
3294
"Essa operação comprimi dados em um repositório bazaar. Como\n"
3295
"o bazaar fornece o empacotamento automático de repositório, essa operação\n"
3296
"normalmente não é necessária ser feito manualmente."
3297
3298
#: bzrlib/builtins.py:5033
3299
msgid ""
3300
"During the pack operation, bazaar takes a backup of existing repository\n"
3301
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3302
"automatically when it is safe to do so. To save disk space by removing\n"
3303
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3304
"used."
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5039
3308
msgid ""
3309
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3310
"during or immediately after repacking, you may be left with a state\n"
3311
"where the deletion has been written to disk but the new packs have not\n"
3312
"been. In this case the repository may be unusable."
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5048
3316
msgid "Delete obsolete packs to save disk space."
3317
msgstr "Excluir pacotes obsoletos para economizar espaço em disco."
3318
3319
#: bzrlib/builtins.py:5062
3320
msgid "List the installed plugins."
3321
msgstr "Lista os plugins instalados."
3322
3323
#: bzrlib/builtins.py:5064
3324
msgid ""
3325
"This command displays the list of installed plugins including\n"
3326
"version of plugin and a short description of each."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5067
3330
msgid "--verbose shows the path where each plugin is located."
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5069
3334
msgid ""
3335
"A plugin is an external component for Bazaar that extends the\n"
3336
"revision control system, by adding or replacing code in Bazaar.\n"
3337
"Plugins can do a variety of things, including overriding commands,\n"
3338
"adding new commands, providing additional network transports and\n"
3339
"customizing log output."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5075
3343
msgid ""
3344
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3345
"for further information on plugins including where to find them and how to\n"
3346
"install them. Instructions are also provided there on how to write new\n"
3347
"plugins using the Python programming language."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5091
3351
msgid "Show testament (signing-form) of a revision."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5094
3355
msgid "Produce long-format testament."
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5096
3359
msgid "Produce a strict-format testament."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5122
3363
msgid "Show the origin of each line in a file."
3364
msgstr "Mostra a origem de cada linha em um arquivo."
3365
3366
#: bzrlib/builtins.py:5124
3367
msgid ""
3368
"This prints out the given file with an annotation on the left side\n"
3369
"indicating which revision, author and date introduced the change."
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:5127
3373
msgid ""
3374
"If the origin is the same for a run of consecutive lines, it is\n"
3375
"shown only at the top, unless the --all option is given."
3376
msgstr ""
3377
3378
#: bzrlib/builtins.py:5135
3379
msgid "Show annotations on all lines."
3380
msgstr "Mostrar anotações em todas as linhas."
3381
3382
#: bzrlib/builtins.py:5136
3383
msgid "Show commit date in annotations."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5223
3387
msgid "Cannot sign a range of non-revision-history revisions"
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5235
3391
msgid "Please supply either one revision, or a range."
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5239
3395
msgid ""
3396
"Convert the current branch into a checkout of the supplied branch.\n"
3397
"If no branch is supplied, rebind to the last bound location."
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:5242
3401
msgid ""
3402
"Once converted into a checkout, commits must succeed on the master branch\n"
3403
"before they will be applied to the local branch."
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5245
3407
msgid ""
3408
"Bound branches use the nickname of its master branch unless it is set\n"
3409
"locally, in which case binding will update the local nickname to be\n"
3410
"that of the master."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5260
3414
msgid "No location supplied. This format does not remember old locations."
3415
msgstr ""
3416
"Sem localização fornecida. Este formato não se lembra de locais antigos."
3417
3418
#: bzrlib/builtins.py:5265
3419
msgid "Branch is already bound"
3420
msgstr "O ramo já está ligado."
3421
3422
#: bzrlib/builtins.py:5267
3423
msgid "No location supplied and no previous location known"
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:5273
3427
msgid "These branches have diverged. Try merging, and then bind again."
3428
msgstr ""
3429
3430
#: bzrlib/builtins.py:5280
3431
msgid "Convert the current checkout into a regular branch."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5282
3435
msgid ""
3436
"After unbinding, the local branch is considered independent and subsequent\n"
3437
"commits will be local only."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5293
3441
msgid "Local branch is not bound"
3442
msgstr "O ramo local náo está associado"
3443
3444
#: bzrlib/builtins.py:5297
3445
msgid "Remove the last committed revision."
3446
msgstr "Remover a última revisão submetida."
3447
3448
#: bzrlib/builtins.py:5299
3449
msgid ""
3450
"--verbose will print out what is being removed.\n"
3451
"--dry-run will go through all the motions, but not actually\n"
3452
"remove anything."
3453
msgstr ""
3454
3455
#: bzrlib/builtins.py:5303
3456
msgid ""
3457
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3458
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3459
"branch at revision 15."
3460
msgstr ""
3461
3462
#: bzrlib/builtins.py:5307
3463
msgid ""
3464
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3465
"it may make is to restore any pending merges that were present before\n"
3466
"the commit."
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5318
3470
msgid "Don't actually make changes."
3471
msgstr "Na verdade, não fazer alterações."
3472
3473
#: bzrlib/builtins.py:5319
3474
msgid "Say yes to all questions."
3475
msgstr "Diga sim para todas as questões."
3476
3477
#: bzrlib/builtins.py:5321
3478
msgid "Keep tags that point to removed revisions."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:5323
3482
msgid "Only remove the commits from the local branch when in a checkout."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5372
3486
msgid "No revisions to uncommit.\n"
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5387
3490
msgid "Dry-run, pretending to remove the above revisions.\n"
3491
msgstr ""
3492
3493
#: bzrlib/builtins.py:5390
3494
msgid "The above revision(s) will be removed.\n"
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5394
3498
msgid "Uncommit these revisions"
3499
msgstr ""
3500
3501
#: bzrlib/builtins.py:5397
3502
msgid "Canceled\n"
3503
msgstr "Cancelado\n"
3504
3505
#: bzrlib/builtins.py:5404
3506
#, python-format
3507
msgid ""
3508
"You can restore the old tip by running:\n"
3509
" bzr pull . -r revid:%s\n"
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5409
3513
msgid "Break a dead lock."
3514
msgstr ""
3515
3516
#: bzrlib/builtins.py:5411
3517
msgid ""
3518
"This command breaks a lock on a repository, branch, working directory or\n"
3519
"config file."
3520
msgstr ""
3521
3522
#: bzrlib/builtins.py:5414
3523
msgid ""
3524
"CAUTION: Locks should only be broken when you are sure that the process\n"
3525
"holding the lock has been stopped."
3526
msgstr ""
3527
3528
#: bzrlib/builtins.py:5417
3529
msgid ""
3530
"You can get information on what locks are open via the 'bzr info\n"
3531
"[location]' command."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5420
3535
msgid ""
3536
":Examples:\n"
3537
" bzr break-lock\n"
3538
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3539
" bzr break-lock --conf ~/.bazaar"
3540
msgstr ""
3541
":Exemplos:\n"
3542
" bzr break-lock\n"
3543
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3544
" bzr break-lock --conf ~/.bazaar"
3545
3546
#: bzrlib/builtins.py:5429
3547
msgid "LOCATION is the directory where the config lock is."
3548
msgstr ""
3549
3550
#: bzrlib/builtins.py:5431
3551
msgid "Do not ask for confirmation before breaking the lock."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5466
3555
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3556
msgstr ""
3557
3558
#: bzrlib/builtins.py:5467
3559
msgid "Run the bzr server."
3560
msgstr "Execute o servidor bzr."
3561
3562
#: bzrlib/builtins.py:5473
3563
msgid "Serve on stdin/out for use from inetd or sshd."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5474
3567
msgid "protocol"
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5475
3571
msgid "Protocol to serve."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5479
3575
msgid ""
3576
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3577
"Passing 0 as the port number will result in a dynamically allocated port. "
3578
"The default port depends on the protocol."
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5485
3582
msgid "Serve contents of this directory."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5487
3586
msgid ""
3587
"By default the server is a readonly server. Supplying --allow-writes "
3588
"enables write access to the contents of the served directory and below. "
3589
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3590
"of external authentication is arranged supplying this option leads to global "
3591
"uncontrolled write access to your file system."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:5496
3595
msgid "Override the default idle client timeout (5min)."
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5546
3599
msgid "Combine a tree into its containing tree."
3600
msgstr ""
3601
3602
#: bzrlib/builtins.py:5548
3603
msgid "This command requires the target tree to be in a rich-root format."
3604
msgstr ""
3605
3606
#: bzrlib/builtins.py:5550
3607
msgid ""
3608
"The TREE argument should be an independent tree, inside another tree, but\n"
3609
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3610
"running \"bzr branch\" with the target inside a tree.)"
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5554
3614
msgid ""
3615
"The result is a combined tree, with the subtree no longer an independent\n"
3616
"part. This is marked as a merge of the subtree into the containing tree,\n"
3617
"and all history is preserved."
3618
msgstr ""
3619
3620
#: bzrlib/builtins.py:5572
3621
#, python-format
3622
msgid ""
3623
"Can't join trees because %s doesn't support rich root data.\n"
3624
"You can use bzr upgrade on the repository."
3625
msgstr ""
3626
3627
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3628
msgid "Cannot join {0}. {1}"
3629
msgstr ""
3630
3631
#: bzrlib/builtins.py:5592
3632
msgid "Split a subdirectory of a tree into a separate tree."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5594
3636
msgid ""
3637
"This command will produce a target tree in a format that supports\n"
3638
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3639
"converted into earlier formats like 'dirstate-tags'."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5598
3643
msgid ""
3644
"The TREE argument should be a subdirectory of a working tree. That\n"
3645
"subdirectory will be converted into an independent tree, with its own\n"
3646
"branch. Commits in the top-level tree will not apply to the new subtree."
3647
msgstr ""
3648
3649
#: bzrlib/builtins.py:5678
3650
msgid "No submit branch specified or known"
3651
msgstr ""
3652
3653
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3654
msgid "No public branch specified or known"
3655
msgstr "Nenhum ramo público especificado ou conhecido"
3656
3657
#: bzrlib/builtins.py:5691
3658
msgid "bzr merge-directive takes at most two one revision identifiers"
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5700
3662
msgid "No revisions to bundle."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5719
3666
msgid "Mail or create a merge-directive for submitting changes."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5721
3670
msgid "A merge directive provides many things needed for requesting merges:"
3671
msgstr ""
3672
3673
#: bzrlib/builtins.py:5723
3674
msgid "* A machine-readable description of the merge to perform"
3675
msgstr ""
3676
3677
#: bzrlib/builtins.py:5725
3678
msgid "* An optional patch that is a preview of the changes requested"
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5727
3682
msgid ""
3683
"* An optional bundle of revision data, so that the changes can be applied\n"
3684
" directly from the merge directive, without retrieving data from a\n"
3685
" branch."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:5731
3689
msgid ""
3690
"`bzr send` creates a compact data set that, when applied using bzr\n"
3691
"merge, has the same effect as merging from the source branch. "
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5734
3695
msgid ""
3696
"By default the merge directive is self-contained and can be applied to any\n"
3697
"branch containing submit_branch in its ancestory without needing access to\n"
3698
"the source branch."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5738
3702
msgid ""
3703
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3704
"revisions, but only a structured request to merge from the\n"
3705
"public_location. In that case the public_branch is needed and it must be\n"
3706
"up-to-date and accessible to the recipient. The public_branch is always\n"
3707
"included if known, so that people can check it later."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:5744
3711
msgid ""
3712
"The submit branch defaults to the parent of the source branch, but can be\n"
3713
"overridden. Both submit branch and public branch will be remembered in\n"
3714
"branch.conf the first time they are used for a particular branch. The\n"
3715
"source branch defaults to that containing the working directory, but can\n"
3716
"be changed using --from."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:5750
3720
msgid ""
3721
"Both the submit branch and the public branch follow the usual behavior with\n"
3722
"respect to --remember: If there is no default location set, the first send\n"
3723
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3724
"omit the location to use the default. To change the default, use\n"
3725
"--remember. The value will only be saved if the location can be accessed."
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:5756
3729
msgid ""
3730
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3731
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3732
"If a public location is known for the submit_branch, that location is used\n"
3733
"in the merge directive."
3734
msgstr ""
3735
3736
#: bzrlib/builtins.py:5761
3737
msgid ""
3738
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3739
"given, in which case it is sent to a file."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:5764
3743
msgid ""
3744
"Mail is sent using your preferred mail program. This should be transparent\n"
3745
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3746
"If the preferred client can't be found (or used), your editor will be used."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:5768
3750
msgid ""
3751
"To use a specific mail program, set the mail_client configuration option.\n"
3752
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3753
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3754
"(MacOS X's\n"
3755
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3756
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3757
"add\n"
3758
"supported clients."
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:5775
3762
msgid ""
3763
"If mail is being sent, a to address is required. This can be supplied\n"
3764
"either on the commandline, by setting the submit_to configuration\n"
3765
"option in the branch itself or the child_submit_to configuration option\n"
3766
"in the submit branch."
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:5780
3770
msgid ""
3771
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3772
"and\n"
3773
"merge directive format 2. It is significantly faster and smaller than\n"
3774
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3775
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3776
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:5786
3780
msgid ""
3781
"The merge directives created by bzr send may be applied using bzr merge or\n"
3782
"bzr pull by specifying a file containing a merge directive as the location."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:5789
3786
msgid ""
3787
"bzr send makes extensive use of public locations to map local locations "
3788
"into\n"
3789
"URLs that can be used by other people. See `bzr help configuration` to\n"
3790
"set them, and use `bzr info` to display them."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:5813
3794
msgid "Write merge directive to this file or directory; use - for stdout."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:5817
3798
msgid ""
3799
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3800
"strict disables the check."
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:5819
3804
msgid "Mail the request to this address."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:5823
3808
msgid "Body for the email."
3809
msgstr "Corpo para o e-mail."
3810
3811
#: bzrlib/builtins.py:5876
3812
msgid "Do not include a bundle in the merge directive."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:5877
3816
msgid "Do not include a preview patch in the merge directive."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:5880
3820
msgid "Remember submit and public branch."
3821
msgstr ""
3822
3823
#: bzrlib/builtins.py:5882
3824
msgid ""
3825
"Branch to generate the submission from, rather than the one containing the "
3826
"working directory."
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3830
msgid "format"
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:5893
3834
msgid "Use the specified output format."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:5915
3838
msgid "Create, remove or modify a tag naming a revision."
3839
msgstr ""
3840
3841
#: bzrlib/builtins.py:5917
3842
msgid ""
3843
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3844
"(--revision) option can be given -rtag:X, where X is any previously\n"
3845
"created tag."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:5921
3849
msgid ""
3850
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3851
"along when you branch, push, pull or merge."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:5924
3855
msgid ""
3856
"It is an error to give a tag name that already exists unless you pass\n"
3857
"--force, in which case the tag is moved to point to the new revision."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:5927
3861
msgid ""
3862
"To rename a tag (change the name but keep it on the same revsion), run "
3863
"``bzr\n"
3864
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3865
msgstr ""
3866
3867
#: bzrlib/builtins.py:5930
3868
msgid ""
3869
"If no tag name is specified it will be determined through the \n"
3870
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3871
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3872
"details."
3873
msgstr ""
3874
3875
#: bzrlib/builtins.py:5940
3876
msgid "Delete this tag rather than placing it."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:5943
3880
msgid "Branch in which to place the tag."
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:5945
3884
msgid "Replace existing tags."
3885
msgstr "Substituir as tags existentes."
3886
3887
#: bzrlib/builtins.py:5960
3888
msgid "No tag specified to delete."
3889
msgstr "Sem tag especifica para apagar."
3890
3891
#: bzrlib/builtins.py:5962
3892
#, python-format
3893
msgid "Deleted tag %s."
3894
msgstr "Tag %s apagada."
3895
3896
#: bzrlib/builtins.py:5976
3897
msgid "Please specify a tag name."
3898
msgstr "Por favor, especifique o nome da tag."
3899
3900
#: bzrlib/builtins.py:5984
3901
#, python-format
3902
msgid "Tag %s already exists for that revision."
3903
msgstr "A tag %s já existe para aquela revisão."
3904
3905
#: bzrlib/builtins.py:5988
3906
#, python-format
3907
msgid "Created tag %s."
3908
msgstr "Tag %s criada."
3909
3910
#: bzrlib/builtins.py:5990
3911
#, python-format
3912
msgid "Updated tag %s."
3913
msgstr "Tag %s atualizada."
3914
3915
#: bzrlib/builtins.py:5994
3916
msgid "List tags."
3917
msgstr "Lista de tags."
3918
3919
#: bzrlib/builtins.py:5996
3920
msgid ""
3921
"This command shows a table of tag names and the revisions they reference."
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6002
3925
msgid "Branch whose tags should be displayed."
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6004
3929
msgid "Sort tags by different criteria."
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6004
3933
msgid "Sorting"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6073
3937
msgid "Reconfigure the type of a bzr directory."
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6075
3941
msgid "A target configuration must be specified."
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6077
3945
msgid ""
3946
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3947
"The order of preference is\n"
3948
"1. For a lightweight checkout, the current bound location.\n"
3949
"2. For branches that used to be checkouts, the previously-bound location.\n"
3950
"3. The push location.\n"
3951
"4. The parent location.\n"
3952
"If none of these is available, --bind-to must be specified."
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:6091
3956
msgid "Tree type"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:6092
3960
msgid "The relation between branch and tree."
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6094
3964
msgid "Reconfigure to be an unbound branch with no working tree."
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6095
3968
msgid "Reconfigure to be an unbound branch with a working tree."
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6096
3972
msgid "Reconfigure to be a bound branch with a working tree."
3973
msgstr ""
3974
3975
#: bzrlib/builtins.py:6097
3976
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3977
msgstr ""
3978
3979
#: bzrlib/builtins.py:6102
3980
msgid "Repository type"
3981
msgstr "Tipo de repositório"
3982
3983
#: bzrlib/builtins.py:6103
3984
msgid "Location fo the repository."
3985
msgstr "Local para o repositório."
3986
3987
#: bzrlib/builtins.py:6105
3988
msgid ""
3989
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6107
3993
msgid "Reconfigure to use a shared repository."
3994
msgstr "Reconfigurar para usar um repositório compartilhado."
3995
3996
#: bzrlib/builtins.py:6111
3997
msgid "Trees in Repository"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6112
4001
msgid "Whether new branches in the repository have trees."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6114
4005
msgid ""
4006
"Reconfigure repository to create working trees on branches by default."
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6116
4010
msgid ""
4011
"Reconfigure repository to not create working trees on branches by default."
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6119
4015
msgid "Branch to bind checkout to."
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6121
4019
msgid "Perform reconfiguration even if local changes will be lost."
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6124
4023
msgid "Reconfigure a branch to be stacked on another branch."
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6128
4027
msgid ""
4028
"Reconfigure a branch to be unstacked. This may require copying substantial "
4029
"data into it."
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6138
4033
msgid "Can't use both --stacked-on and --unstacked"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6152
4037
msgid "No target configuration specified"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6187
4041
msgid "Set the branch of a checkout and update."
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6189
4045
msgid ""
4046
"For lightweight checkouts, this changes the branch being referenced.\n"
4047
"For heavyweight checkouts, this checks that there are no local commits\n"
4048
"versus the current bound branch, then it makes the local branch a mirror\n"
4049
"of the new location and binds to it."
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6194
4053
msgid ""
4054
"In both cases, the working tree is updated and uncommitted changes\n"
4055
"are merged. The user can commit or revert these as they desire."
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6197
4059
msgid "Pending merges need to be committed or reverted before using switch."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6199
4063
msgid ""
4064
"The path to the branch to switch to can be specified relative to the parent\n"
4065
"directory of the current branch. For example, if you are currently in a\n"
4066
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4067
"/path/to/newbranch."
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:6204
4071
msgid ""
4072
"Bound branches use the nickname of its master branch unless it is set\n"
4073
"locally, in which case switching will update the local nickname to be\n"
4074
"that of the master."
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6212
4078
msgid "Switch even if local commits will be lost."
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6215
4082
msgid "Create the target branch from this one before switching to it."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6229
4086
msgid "You must supply either a revision or a location"
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6242
4090
msgid "cannot create branch without source branch"
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6262
4094
msgid "Manage filtered views."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6264
4098
msgid ""
4099
"Views provide a mask over the tree so that users can focus on\n"
4100
"a subset of a tree when doing their work. After creating a view,\n"
4101
"commands that support a list of files - status, diff, commit, etc -\n"
4102
"effectively have that list of files implicitly given each time.\n"
4103
"An explicit list of files can still be given but those files\n"
4104
"must be within the current view."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:6271
4108
msgid ""
4109
"In most cases, a view has a short life-span: it is created to make\n"
4110
"a selected change and is deleted once that change is committed.\n"
4111
"At other times, you may wish to create one or more named views\n"
4112
"and switch between them."
4113
msgstr ""
4114
4115
#: bzrlib/builtins.py:6276
4116
msgid ""
4117
"To disable the current view without deleting it, you can switch to\n"
4118
"the pseudo view called ``off``. This can be useful when you need\n"
4119
"to see the whole tree for an operation or two (e.g. merge) but\n"
4120
"want to switch back to your view after that."
4121
msgstr ""
4122
4123
#: bzrlib/builtins.py:6281
4124
msgid ""
4125
":Examples:\n"
4126
" To define the current view::"
4127
msgstr ""
4128
4129
#: bzrlib/builtins.py:6284
4130
msgid " bzr view file1 dir1 ..."
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6286
4134
msgid " To list the current view::"
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6288
4138
msgid " bzr view"
4139
msgstr " bzr view"
4140
4141
#: bzrlib/builtins.py:6290
4142
msgid " To delete the current view::"
4143
msgstr ""
4144
4145
#: bzrlib/builtins.py:6292
4146
msgid " bzr view --delete"
4147
msgstr " bzr view --delete"
4148
4149
#: bzrlib/builtins.py:6294
4150
msgid " To disable the current view without deleting it::"
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:6296
4154
msgid " bzr view --switch off"
4155
msgstr " bzr view --switch off"
4156
4157
#: bzrlib/builtins.py:6298
4158
msgid " To define a named view and switch to it::"
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6300
4162
msgid " bzr view --name view-name file1 dir1 ..."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:6302
4166
msgid " To list a named view::"
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:6304
4170
msgid " bzr view --name view-name"
4171
msgstr " bzr view --name view-name"
4172
4173
#: bzrlib/builtins.py:6306
4174
msgid " To delete a named view::"
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6308
4178
msgid " bzr view --name view-name --delete"
4179
msgstr " bzr view --name view-name --delete"
4180
4181
#: bzrlib/builtins.py:6310
4182
msgid " To switch to a named view::"
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6312
4186
msgid " bzr view --switch view-name"
4187
msgstr " bzr view --switch view-name"
4188
4189
#: bzrlib/builtins.py:6314
4190
msgid " To list all views defined::"
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6316
4194
msgid " bzr view --all"
4195
msgstr " bzr view --all"
4196
4197
#: bzrlib/builtins.py:6318
4198
msgid " To delete all views::"
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6320
4202
msgid " bzr view --delete --all"
4203
msgstr " bzr view --delete --all"
4204
4205
#: bzrlib/builtins.py:6327
4206
msgid "Apply list or delete action to all views."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6330
4210
msgid "Delete the view."
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:6333
4214
msgid "Name of the view to define, list or delete."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:6337
4218
msgid "Name of the view to switch to."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6356
4222
msgid "Both --delete and a file list specified"
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6359
4226
msgid "Both --delete and --switch specified"
4227
msgstr ""
4228
4229
#: bzrlib/builtins.py:6362
4230
msgid "Deleted all views.\n"
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6364
4234
msgid "No current view to delete"
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6367
4238
#, python-format
4239
msgid "Deleted '%s' view.\n"
4240
msgstr ""
4241
4242
#: bzrlib/builtins.py:6371
4243
msgid "Both --switch and a file list specified"
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6374
4247
msgid "Both --switch and --all specified"
4248
msgstr ""
4249
4250
#: bzrlib/builtins.py:6377
4251
msgid "No current view to disable"
4252
msgstr ""
4253
4254
#: bzrlib/builtins.py:6379
4255
#, python-format
4256
msgid "Disabled '%s' view.\n"
4257
msgstr ""
4258
4259
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4260
msgid "Using '{0}' view: {1}\n"
4261
msgstr ""
4262
4263
#: bzrlib/builtins.py:6386
4264
msgid "Views defined:\n"
4265
msgstr ""
4266
4267
#: bzrlib/builtins.py:6395
4268
msgid "No views defined.\n"
4269
msgstr ""
4270
4271
#: bzrlib/builtins.py:6402
4272
msgid "Cannot change the 'off' pseudo view"
4273
msgstr ""
4274
4275
#: bzrlib/builtins.py:6410
4276
msgid "No current view.\n"
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6413
4280
msgid "'{0}' view is: {1}\n"
4281
msgstr ""
4282
4283
#: bzrlib/builtins.py:6433
4284
msgid " <no hooks installed>\n"
4285
msgstr ""
4286
4287
#: bzrlib/builtins.py:6437
4288
msgid "Remove a branch."
4289
msgstr ""
4290
4291
#: bzrlib/builtins.py:6439
4292
msgid ""
4293
"This will remove the branch from the specified location but \n"
4294
"will keep any working tree or repository in place."
4295
msgstr ""
4296
4297
#: bzrlib/builtins.py:6444
4298
msgid " Remove the branch at repo/trunk::"
4299
msgstr ""
4300
4301
#: bzrlib/builtins.py:6446
4302
msgid " bzr remove-branch repo/trunk"
4303
msgstr ""
4304
4305
#: bzrlib/builtins.py:6461
4306
msgid "Plaintext diff output."
4307
msgstr ""
4308
4309
#: bzrlib/builtins.py:6462
4310
msgid "Temporarily set aside some changes from the current tree."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6464
4314
msgid ""
4315
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4316
"ie. out of the way, until a later time when you can bring them back from\n"
4317
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4318
"your working tree, and so they aren't propagated along with your branch nor\n"
4319
"will they survive its deletion."
4320
msgstr ""
4321
4322
#: bzrlib/builtins.py:6470
4323
msgid "If shelve --list is specified, previously-shelved changes are listed."
4324
msgstr ""
4325
4326
#: bzrlib/builtins.py:6472
4327
msgid ""
4328
"Shelve is intended to help separate several sets of changes that have\n"
4329
"been inappropriately mingled. If you just want to get rid of all changes\n"
4330
"and you don't need to restore them later, use revert. If you want to\n"
4331
"shelve all text changes at once, use shelve --all."
4332
msgstr ""
4333
4334
#: bzrlib/builtins.py:6477
4335
msgid ""
4336
"If filenames are specified, only the changes to those files will be\n"
4337
"shelved. Other files will be left untouched."
4338
msgstr ""
4339
4340
#: bzrlib/builtins.py:6480
4341
msgid ""
4342
"If a revision is specified, changes since that revision will be shelved."
4343
msgstr ""
4344
4345
#: bzrlib/builtins.py:6482
4346
msgid ""
4347
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4348
"restore the most recently shelved changes."
4349
msgstr ""
4350
4351
#: bzrlib/builtins.py:6485
4352
msgid ""
4353
"For complicated changes, it is possible to edit the changes in a separate\n"
4354
"editor program to decide what the file remaining in the working copy\n"
4355
"should look like. To do this, add the configuration option"
4356
msgstr ""
4357
4358
#: bzrlib/builtins.py:6489
4359
msgid " change_editor = PROGRAM @new_path @old_path"
4360
msgstr ""
4361
4362
#: bzrlib/builtins.py:6491
4363
msgid ""
4364
"where @new_path is replaced with the path of the new version of the \n"
4365
"file and @old_path is replaced with the path of the old version of \n"
4366
"the file. The PROGRAM should save the new file with the desired \n"
4367
"contents of the file in the working tree.\n"
4368
" "
4369
msgstr ""
4370
4371
#: bzrlib/builtins.py:6503
4372
msgid "Shelve all changes."
4373
msgstr ""
4374
4375
#: bzrlib/builtins.py:6505
4376
msgid "Method to use for writing diffs."
4377
msgstr ""
4378
4379
#: bzrlib/builtins.py:6505
4380
msgid "writer"
4381
msgstr ""
4382
4383
#: bzrlib/builtins.py:6509
4384
msgid "List shelved changes."
4385
msgstr ""
4386
4387
#: bzrlib/builtins.py:6511
4388
msgid "Destroy removed changes instead of shelving them."
4389
msgstr ""
4390
4391
#: bzrlib/builtins.py:6540
4392
msgid "No shelved changes."
4393
msgstr ""
4394
4395
#: bzrlib/builtins.py:6551
4396
msgid "Restore shelved changes."
4397
msgstr ""
4398
4399
#: bzrlib/builtins.py:6553
4400
msgid ""
4401
"By default, the most recently shelved changes are restored. However if you\n"
4402
"specify a shelf by id those changes will be restored instead. This works\n"
4403
"best when the changes don't depend on each other."
4404
msgstr ""
4405
4406
#: bzrlib/builtins.py:6562
4407
msgid "The action to perform."
4408
msgstr ""
4409
4410
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4411
msgid "action"
4412
msgstr ""
4413
4414
#: bzrlib/builtins.py:6564
4415
msgid "Apply changes and remove from the shelf."
4416
msgstr ""
4417
4418
#: bzrlib/builtins.py:6565
4419
msgid "Show changes, but do not apply or remove them."
4420
msgstr ""
4421
4422
#: bzrlib/builtins.py:6566
4423
msgid ""
4424
"Instead of unshelving the changes, show the diff that would result from "
4425
"unshelving."
4426
msgstr ""
4427
4428
#: bzrlib/builtins.py:6568
4429
msgid "Delete changes without applying them."
4430
msgstr ""
4431
4432
#: bzrlib/builtins.py:6569
4433
msgid "Apply changes but don't delete them."
4434
msgstr ""
4435
4436
#: bzrlib/builtins.py:6584
4437
msgid "Remove unwanted files from working tree."
4438
msgstr ""
4439
4440
#: bzrlib/builtins.py:6586
4441
msgid ""
4442
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4443
"files are never deleted."
4444
msgstr ""
4445
4446
#: bzrlib/builtins.py:6589
4447
msgid ""
4448
"Another class is 'detritus', which includes files emitted by bzr during\n"
4449
"normal operations and selftests. (The value of these files decreases with\n"
4450
"time.)"
4451
msgstr ""
4452
4453
#: bzrlib/builtins.py:6593
4454
msgid ""
4455
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4456
"flags are respected, and may be combined."
4457
msgstr ""
4458
4459
#: bzrlib/builtins.py:6596
4460
msgid "To check what clean-tree will do, use --dry-run."
4461
msgstr ""
4462
4463
#: bzrlib/builtins.py:6599
4464
msgid "Delete all ignored files."
4465
msgstr ""
4466
4467
#: bzrlib/builtins.py:6600
4468
msgid ""
4469
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4470
msgstr ""
4471
4472
#: bzrlib/builtins.py:6603
4473
msgid "Delete files unknown to bzr (default)."
4474
msgstr ""
4475
4476
#: bzrlib/builtins.py:6604
4477
msgid "Show files to delete instead of deleting them."
4478
msgstr ""
4479
4480
#: bzrlib/builtins.py:6606
4481
msgid "Do not prompt before deleting."
4482
msgstr ""
4483
4484
#: bzrlib/bundle/__init__.py:59
4485
msgid "A directory cannot be a bundle"
4486
msgstr ""
4487
4488
#: bzrlib/bundle/apply_bundle.py:40
4489
msgid "Install revisions"
4490
msgstr ""
4491
4492
#: bzrlib/bundle/commands.py:64
4493
msgid "--verbose requires a merge directive"
4494
msgstr ""
4495
4496
#: bzrlib/bundle/commands.py:67
4497
msgid "Bundle format not supported"
4498
msgstr ""
4499
4500
#: bzrlib/bundle/commands.py:77
4501
msgid "Records\n"
4502
msgstr ""
4503
4504
#: bzrlib/bundle/commands.py:81
4505
msgid "{0}: {1} ({2} multiparent)\n"
4506
msgstr ""
4507
4508
#: bzrlib/bundle/commands.py:83
4509
#, python-format
4510
msgid "unique files: %d\n"
4511
msgstr ""
4512
4513
#: bzrlib/bundle/commands.py:92
4514
msgid "Revisions\n"
4515
msgstr ""
4516
4517
#: bzrlib/bundle/commands.py:93
4518
#, python-format
4519
msgid "nicks: %s\n"
4520
msgstr ""
4521
4522
#: bzrlib/bundle/commands.py:95
4523
#, python-format
4524
msgid ""
4525
"committers: \n"
4526
"%s\n"
4527
msgstr ""
4528
4529
#: bzrlib/bundle/commands.py:103
4530
msgid "Decoded contents\n"
4531
msgstr ""
4532
4533
#: bzrlib/bundle/serializer/v4.py:327
4534
#, python-format
4535
msgid "Bundling %d revision."
4536
msgid_plural "Bundling %d revisions."
4537
msgstr[0] ""
4538
msgstr[1] ""
4539
4540
#: bzrlib/bzrdir.py:490
4541
msgid ""
4542
"making backup of {0}\n"
4543
" to {1}"
4544
msgstr ""
4545
4546
#: bzrlib/bzrdir.py:513
4547
msgid "renamed {0} to {1}"
4548
msgstr ""
4549
4550
#: bzrlib/bzrdir.py:1652
4551
#, python-format
4552
msgid ""
4553
"Source repository format does not support stacking, using format:\n"
4554
" %s"
4555
msgstr ""
4556
4557
#: bzrlib/bzrdir.py:1672
4558
#, python-format
4559
msgid ""
4560
"Source branch format does not support stacking, using format:\n"
4561
" %s"
4562
msgstr ""
4563
4564
#: bzrlib/bzrdir.py:1818
4565
msgid "starting repository conversion"
4566
msgstr ""
4567
4568
#: bzrlib/bzrdir.py:2039
4569
msgid "Using default stacking branch {0} at {1}"
4570
msgstr ""
4571
4572
#: bzrlib/check.py:108
4573
msgid "check"
4574
msgstr ""
4575
4576
#: bzrlib/check.py:110
4577
msgid "checking revisions"
4578
msgstr ""
4579
4580
#: bzrlib/check.py:112
4581
msgid "checking commit contents"
4582
msgstr ""
4583
4584
#: bzrlib/check.py:114
4585
msgid "checking file graphs"
4586
msgstr ""
4587
4588
#: bzrlib/check.py:118
4589
msgid "checking branches and trees"
4590
msgstr ""
4591
4592
#: bzrlib/check.py:205
4593
msgid "checked repository {0} format {1}"
4594
msgstr ""
4595
4596
#: bzrlib/check.py:208
4597
#, python-format
4598
msgid "%6d revisions"
4599
msgstr ""
4600
4601
#: bzrlib/check.py:209
4602
#, python-format
4603
msgid "%6d file-ids"
4604
msgstr ""
4605
4606
#: bzrlib/check.py:211
4607
#, python-format
4608
msgid "%6d unreferenced text versions"
4609
msgstr ""
4610
4611
#: bzrlib/check.py:215
4612
msgid "unreferenced version: {{{0}}} in {1}"
4613
msgstr ""
4614
4615
#: bzrlib/check.py:218
4616
#, python-format
4617
msgid "%6d revisions are missing inventory_sha1"
4618
msgstr ""
4619
4620
#: bzrlib/check.py:221
4621
#, python-format
4622
msgid "%6d revisions are mentioned but not present"
4623
msgstr ""
4624
4625
#: bzrlib/check.py:224
4626
#, python-format
4627
msgid "%6d ghost revisions"
4628
msgstr ""
4629
4630
#: bzrlib/check.py:229
4631
#, python-format
4632
msgid "%6d revisions missing parents in ancestry"
4633
msgstr ""
4634
4635
#: bzrlib/check.py:233
4636
#, python-format
4637
msgid " %s should be in the ancestry for:"
4638
msgstr ""
4639
4640
#: bzrlib/check.py:237
4641
#, python-format
4642
msgid "%6d inconsistent parents"
4643
msgstr ""
4644
4645
#: bzrlib/check.py:241
4646
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4647
msgstr ""
4648
4649
#: bzrlib/check.py:247
4650
#, python-format
4651
msgid "%6d revisions have incorrect parents in the revision index"
4652
msgstr ""
4653
4654
#: bzrlib/check.py:253
4655
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4656
msgstr ""
4657
4658
#: bzrlib/check.py:267
4659
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4660
msgstr ""
4661
4662
#: bzrlib/check.py:296
4663
msgid ""
4664
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4665
"{{{4}}}"
4666
msgstr ""
4667
4668
#: bzrlib/check.py:354
4669
#, python-format
4670
msgid "Checking branch at '%s'."
4671
msgstr ""
4672
4673
#: bzrlib/check.py:374
4674
#, python-format
4675
msgid "Checking working tree at '%s'."
4676
msgstr ""
4677
4678
#: bzrlib/check.py:427 bzrlib/check.py:441
4679
msgid "No branch found at specified location."
4680
msgstr ""
4681
4682
#: bzrlib/check.py:429 bzrlib/check.py:439
4683
msgid "No working tree found at specified location."
4684
msgstr ""
4685
4686
#: bzrlib/check.py:432
4687
#, python-format
4688
msgid "Checking repository at '%s'."
4689
msgstr ""
4690
4691
#: bzrlib/check.py:443
4692
msgid "No repository found at specified location."
4693
msgstr ""
4694
4695
#: bzrlib/clean_tree.py:63
4696
msgid "Nothing to delete."
4697
msgstr ""
4698
4699
#: bzrlib/clean_tree.py:68
4700
msgid "Are you sure you wish to delete these"
4701
msgstr ""
4702
4703
#: bzrlib/clean_tree.py:70
4704
msgid "Canceled"
4705
msgstr ""
4706
4707
#: bzrlib/clean_tree.py:107
4708
#, python-format
4709
msgid "unable to remove %s"
4710
msgstr ""
4711
4712
#: bzrlib/clean_tree.py:111
4713
msgid "deleting paths:"
4714
msgstr ""
4715
4716
#: bzrlib/clean_tree.py:125
4717
msgid "unable to remove \"{0}\": {1}."
4718
msgstr ""
4719
4720
#: bzrlib/clean_tree.py:130
4721
msgid "No files deleted."
4722
msgstr ""
4723
4724
#: bzrlib/cmd_version_info.py:47
4725
msgid "No known version info format {0}. Supported types are: {1}"
4726
msgstr ""
4727
4728
#: bzrlib/cmd_version_info.py:52
4729
msgid "Version info in Custom template-based format."
4730
msgstr ""
4731
4732
#: bzrlib/cmd_version_info.py:52
4733
msgid "Version info in Python format."
4734
msgstr ""
4735
4736
#: bzrlib/cmd_version_info.py:52
4737
msgid "Version info in RIO (simple text) format (default)."
4738
msgstr ""
4739
4740
#: bzrlib/cmd_version_info.py:53
4741
msgid "Show version information about this tree."
4742
msgstr ""
4743
4744
#: bzrlib/cmd_version_info.py:55
4745
msgid ""
4746
"You can use this command to add information about version into\n"
4747
"source code of an application. The output can be in one of the\n"
4748
"supported formats or in a custom format based on a template."
4749
msgstr ""
4750
4751
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4752
#: en/help_topics/configuration.txt:710
4753
msgid "For example::"
4754
msgstr ""
4755
4756
#: bzrlib/cmd_version_info.py:61
4757
msgid ""
4758
" bzr version-info --custom \\\n"
4759
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4760
msgstr ""
4761
4762
#: bzrlib/cmd_version_info.py:64
4763
msgid ""
4764
"will produce a C header file with formatted string containing the\n"
4765
"current revision number. Other supported variables in templates are:"
4766
msgstr ""
4767
4768
#: bzrlib/cmd_version_info.py:67
4769
msgid ""
4770
" * {date} - date of the last revision\n"
4771
" * {build_date} - current date\n"
4772
" * {revno} - revision number\n"
4773
" * {revision_id} - revision id\n"
4774
" * {branch_nick} - branch nickname\n"
4775
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4776
" otherwise 1"
4777
msgstr ""
4778
4779
#: bzrlib/cmd_version_info.py:77
4780
msgid "Select the output format."
4781
msgstr ""
4782
4783
#: bzrlib/cmd_version_info.py:81
4784
msgid "Include all possible information."
4785
msgstr ""
4786
4787
#: bzrlib/cmd_version_info.py:82
4788
msgid "Check if tree is clean."
4789
msgstr ""
4790
4791
#: bzrlib/cmd_version_info.py:84
4792
msgid "Include the revision-history."
4793
msgstr ""
4794
4795
#: bzrlib/cmd_version_info.py:86
4796
msgid "Include the last revision for each file."
4797
msgstr ""
4798
4799
#: bzrlib/cmd_version_info.py:87
4800
msgid "Template for the output."
4801
msgstr ""
4802
4803
#: bzrlib/cmd_version_info.py:101
4804
msgid "bzr version-info --revision takes exactly one revision specifier"
4805
msgstr ""
4806
4807
#: bzrlib/commands.py:229
4808
#, python-format
4809
msgid "unknown command \"%s\""
4810
msgstr ""
4811
4812
#: bzrlib/commands.py:476
4813
msgid "No help for this command."
4814
msgstr ""
4815
4816
#: bzrlib/commands.py:489
4817
#, python-format
4818
msgid ":Purpose: %s\n"
4819
msgstr ""
4820
4821
#: bzrlib/commands.py:491
4822
#, python-format
4823
msgid ""
4824
":Usage:\n"
4825
"%s\n"
4826
msgstr ""
4827
":Uso:\n"
4828
"%s\n"
4829
4830
#: bzrlib/commands.py:493
4831
#, python-format
4832
msgid ":Usage: %s\n"
4833
msgstr ":Uso: %s\n"
4834
4835
#: bzrlib/commands.py:512
4836
#, python-format
4837
msgid ":Options:%s"
4838
msgstr ""
4839
4840
#: bzrlib/commands.py:523
4841
#, python-format
4842
msgid ""
4843
":Description:\n"
4844
" %s\n"
4845
"\n"
4846
msgstr ""
4847
4848
#: bzrlib/commands.py:533
4849
#, python-format
4850
msgid ""
4851
"See bzr help %s for more details and examples.\n"
4852
"\n"
4853
msgstr ""
4854
4855
#: bzrlib/commands.py:538
4856
msgid ":Aliases: "
4857
msgstr ""
4858
4859
#: bzrlib/commands.py:542
4860
#, python-format
4861
msgid ":From: plugin \"%s\"\n"
4862
msgstr ""
4863
4864
#: bzrlib/commands.py:554
4865
msgid ":doc:`{0} <{1}-help>`"
4866
msgstr ""
4867
4868
#: bzrlib/commands.py:558
4869
#, python-format
4870
msgid ":See also: %s"
4871
msgstr ""
4872
4873
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4874
msgid "Only ASCII permitted in option names"
4875
msgstr ""
4876
4877
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4878
msgid "command {0!r} needs one or more {1}"
4879
msgstr ""
4880
4881
#: bzrlib/commands.py:858
4882
msgid "command {0!r} requires argument {1}"
4883
msgstr ""
4884
4885
#: bzrlib/commands.py:865
4886
msgid "extra argument to command {0}: {1}"
4887
msgstr ""
4888
4889
#: bzrlib/commands.py:962
4890
#, python-format
4891
msgid "Profile data written to \"%s\"."
4892
msgstr ""
4893
4894
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4895
msgid "added"
4896
msgstr ""
4897
4898
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4899
msgid "modified"
4900
msgstr ""
4901
4902
#: bzrlib/commit.py:131
4903
#, python-format
4904
msgid "Committing%s"
4905
msgstr ""
4906
4907
#: bzrlib/commit.py:134
4908
#, python-format
4909
msgid "Committed revision %d."
4910
msgstr ""
4911
4912
#: bzrlib/commit.py:143
4913
#, python-format
4914
msgid "deleted %s"
4915
msgstr ""
4916
4917
#: bzrlib/commit.py:146
4918
#, python-format
4919
msgid "missing %s"
4920
msgstr ""
4921
4922
#: bzrlib/commit.py:511
4923
msgid ""
4924
"Conflicting tags in bound branch:\n"
4925
"{0}"
4926
msgstr ""
4927
4928
#: bzrlib/commit.py:742
4929
msgid "renamed"
4930
msgstr ""
4931
4932
#: bzrlib/commit.py:977
4933
msgid "unchanged"
4934
msgstr ""
4935
4936
#: bzrlib/commit.py:999
4937
msgid "{0} [{1}] - Stage"
4938
msgstr ""
4939
4940
#: bzrlib/commit.py:1002
4941
#, python-format
4942
msgid "%s - Stage"
4943
msgstr ""
4944
4945
#: bzrlib/commit_signature_commands.py:36
4946
msgid "Sign all commits by a given committer."
4947
msgstr ""
4948
4949
#: bzrlib/commit_signature_commands.py:38
4950
msgid ""
4951
"If location is not specified the local tree is used.\n"
4952
"If committer is not specified the default committer is used."
4953
msgstr ""
4954
4955
#: bzrlib/commit_signature_commands.py:41
4956
msgid "This does not sign commits that already have signatures."
4957
msgstr ""
4958
4959
#: bzrlib/commit_signature_commands.py:49
4960
msgid ""
4961
"Don't actually sign anything, just print the revisions that would be signed."
4962
msgstr ""
4963
4964
#: bzrlib/commit_signature_commands.py:103
4965
msgid "Verify all commit signatures."
4966
msgstr ""
4967
4968
#: bzrlib/commit_signature_commands.py:105
4969
msgid ""
4970
"Verifies that all commits in the branch are signed by known GnuPG keys."
4971
msgstr ""
4972
4973
#: bzrlib/commit_signature_commands.py:110
4974
msgid ""
4975
"Comma separated list of GPG key patterns which are acceptable for "
4976
"verification."
4977
msgstr ""
4978
4979
#: bzrlib/commit_signature_commands.py:147
4980
msgid "Cannot verify a range of non-revision-history revisions"
4981
msgstr ""
4982
4983
#: bzrlib/commit_signature_commands.py:168
4984
msgid "All commits signed with verifiable keys"
4985
msgstr ""
4986
4987
#: bzrlib/config.py:475
4988
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4989
msgstr ""
4990
4991
#: bzrlib/config.py:2485
4992
msgid "{0} is not an SI unit."
4993
msgstr ""
4994
4995
#: bzrlib/config.py:2949
4996
msgid ""
4997
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4998
"will be saved."
4999
msgstr ""
5000
5001
#: bzrlib/config.py:3093
5002
#, python-format
5003
msgid "Invalid '%s', should be of the form 'name=value'"
5004
msgstr ""
5005
5006
#: bzrlib/config.py:3962
5007
msgid "Display, set or remove a configuration option."
5008
msgstr ""
5009
5010
#: bzrlib/config.py:3964
5011
msgid "Display the active value for a given option."
5012
msgstr ""
5013
5014
#: bzrlib/config.py:3966
5015
msgid ""
5016
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5017
"matching options are displayed mentioning their scope. The active value\n"
5018
"that bzr will take into account is the first one displayed for each option."
5019
msgstr ""
5020
5021
#: bzrlib/config.py:3970
5022
msgid "If no NAME is given, --all .* is implied."
5023
msgstr ""
5024
5025
#: bzrlib/config.py:3972
5026
msgid ""
5027
"Setting a value is achieved by using name=value without spaces. The value\n"
5028
"is set in the most relevant scope and can be checked by displaying the\n"
5029
"option again."
5030
msgstr ""
5031
5032
#: bzrlib/config.py:3984
5033
msgid "Reduce the scope to the specified configuration file."
5034
msgstr ""
5035
5036
#: bzrlib/config.py:3988
5037
msgid "Display all the defined values for the matching options."
5038
msgstr ""
5039
5040
#: bzrlib/config.py:3990
5041
msgid "Remove the option from the configuration file."
5042
msgstr ""
5043
5044
#: bzrlib/conflicts.py:50
5045
msgid "List files with conflicts."
5046
msgstr ""
5047
5048
#: bzrlib/conflicts.py:57
5049
msgid ""
5050
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5051
"is supplied, the pathnames of files with text conflicts are listed,\n"
5052
"instead. (This is useful for editing all files with text conflicts.)"
5053
msgstr ""
5054
5055
#: bzrlib/conflicts.py:61
5056
msgid "Use bzr resolve when you have fixed a problem."
5057
msgstr ""
5058
5059
#: bzrlib/conflicts.py:66
5060
msgid "List paths of files with text conflicts."
5061
msgstr ""
5062
5063
#: bzrlib/conflicts.py:85
5064
msgid "Marks the conflict as resolved."
5065
msgstr ""
5066
5067
#: bzrlib/conflicts.py:88
5068
msgid "Resolve the conflict preserving the version in the working tree."
5069
msgstr ""
5070
5071
#: bzrlib/conflicts.py:91
5072
msgid "Resolve the conflict taking the merged version into account."
5073
msgstr ""
5074
5075
#: bzrlib/conflicts.py:98
5076
msgid "How to resolve the conflict."
5077
msgstr ""
5078
5079
#: bzrlib/conflicts.py:104
5080
msgid "Mark a conflict as resolved."
5081
msgstr ""
5082
5083
#: bzrlib/conflicts.py:111
5084
msgid ""
5085
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5086
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5087
"as\n"
5088
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5089
msgstr ""
5090
5091
#: bzrlib/conflicts.py:119
5092
msgid "Resolve all conflicts in this tree."
5093
msgstr ""
5094
5095
#: bzrlib/conflicts.py:126
5096
msgid "If --all is specified, no FILE may be provided"
5097
msgstr ""
5098
5099
#: bzrlib/conflicts.py:151
5100
#, python-format
5101
msgid "%d conflict auto-resolved."
5102
msgid_plural "%d conflicts auto-resolved."
5103
msgstr[0] ""
5104
msgstr[1] ""
5105
5106
#: bzrlib/conflicts.py:154
5107
msgid "Remaining conflicts:"
5108
msgstr ""
5109
5110
#: bzrlib/conflicts.py:159
5111
msgid "All conflicts resolved."
5112
msgstr ""
5113
5114
#: bzrlib/conflicts.py:168
5115
msgid "{0} conflict resolved, {1} remaining"
5116
msgid_plural "{0} conflicts resolved, {1} remaining"
5117
msgstr[0] ""
5118
msgstr[1] ""
5119
5120
#: bzrlib/controldir.py:710
5121
msgid "{0} is{1} redirected to {2}"
5122
msgstr ""
5123
5124
#: bzrlib/diff.py:399
5125
#, python-format
5126
msgid "*** Ignoring files outside view. View is %s"
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:157
5130
msgid "The tree builder is already building a tree."
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:178
5134
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5135
msgstr ""
5136
5137
#: bzrlib/errors.py:197
5138
msgid ""
5139
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5140
"versions \"%(minimum)s\" to \"%(current)s\"."
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:209
5144
msgid "The transport '%(transport)s' is only accessible within this process."
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:227
5148
msgid "Invalid revision number %(revno)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:236
5152
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:247
5156
msgid "Reserved revision-id {%(revision_id)s}"
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:261
5160
msgid "There is no public branch set for \"%(branch_url)s\"."
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:271
5164
msgid ""
5165
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5166
"obtain a list of topics."
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:280
5170
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:290
5174
msgid ""
5175
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:299
5179
msgid "The branch '%(branch)s' is not stacked."
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:313
5183
msgid "No WorkingTree exists for \"%(base)s\"."
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:322
5187
msgid "Not currently building a tree."
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:327
5191
msgid "%(url)s is not a local path."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:355
5195
msgid "%(not_locked)r is not write locked but needs to be."
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:363
5199
msgid "Error in command line options"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:368
5203
msgid "%(value)s is not an index of type %(_type)s."
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:378
5207
msgid "Error in data for index %(value)s."
5208
msgstr ""
5209
5210
#: bzrlib/errors.py:387
5211
msgid "The key '%(key)s' is already in index '%(index)s'."
5212
msgstr ""
5213
5214
#: bzrlib/errors.py:397
5215
msgid "The key '%(key)s' is not a valid key."
5216
msgstr ""
5217
5218
#: bzrlib/errors.py:406
5219
msgid "Could not parse options for index %(value)s."
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:415
5223
msgid "The value '%(value)s' is not a valid value."
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:424
5227
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:443
5231
msgid "Generic path error: %(path)r%(extra)s)"
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:456
5235
msgid "No such file: %(path)r%(extra)s"
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:461
5239
msgid "File exists: %(path)r%(extra)s"
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:467
5243
msgid ""
5244
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5245
"after to tell bzr about a rename that has already happened)%(extra)s"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:483
5249
msgid "\"%(path)s\" is not a directory %(extra)s"
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:488
5253
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:493
5257
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:498
5261
msgid "Hard-linking \"%(path)s\" is not supported"
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:513
5265
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:518
5269
msgid "Permission denied: \"%(path)s\"%(extra)s"
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:523
5273
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5274
msgstr ""
5275
5276
#: bzrlib/errors.py:528
5277
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:539
5281
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:561
5285
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5286
msgstr ""
5287
5288
#: bzrlib/errors.py:571
5289
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5290
msgstr ""
5291
5292
#: bzrlib/errors.py:579
5293
msgid ""
5294
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5295
"upgrade the branch to permit branch stacking."
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:590
5299
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5300
msgstr ""
5301
5302
#: bzrlib/errors.py:600
5303
msgid ""
5304
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5305
"need to upgrade the repository to permit branch stacking."
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:611
5309
msgid "Error reading from %(path)r."
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:630
5313
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:646
5317
msgid "Path \"%(path)s\" is not unicode normalized"
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:654
5321
msgid "Not a branch: \"%(path)s\"%(detail)s."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:696
5325
msgid "No submit branch available for branch \"%(path)s\""
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:705
5329
msgid "A control directory already exists: \"%(path)s\"."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:710
5333
msgid "Already a branch: \"%(path)s\"."
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:715
5337
msgid "Parent branch already exists: \"%(path)s\"."
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:721
5341
msgid ""
5342
"Directory contains a branch, but no working tree (use bzr checkout if you "
5343
"wish to build a working tree): \"%(path)s\""
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:726
5347
msgid ""
5348
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5349
msgstr ""
5350
5351
#: bzrlib/errors.py:736
5352
msgid ""
5353
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:746
5357
msgid "No repository present: \"%(path)s\""
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:753
5361
msgid ""
5362
"Unsupported branch format: %(format)s\n"
5363
"Please run 'bzr upgrade'"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:759
5367
msgid "Unknown %(kind)s format: %(format)r"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:768
5371
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:778
5375
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:793
5379
msgid ""
5380
"%(target)s\n"
5381
"is not compatible with\n"
5382
"%(source)s\n"
5383
"%(details)s"
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:809
5387
msgid "Revision is not compatible with %(repo_format)s"
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:819
5391
msgid "%(context_info)s%(path)s is already versioned."
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:840
5395
msgid "%(context_info)s%(path)s is not versioned."
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:861
5399
msgid "Path(s) are not versioned: %(paths_as_string)s"
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:872
5403
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:891
5407
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:899
5411
msgid ""
5412
"Filename %(filename)r is not valid in your current filesystem encoding "
5413
"%(fs_encoding)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:910
5417
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:928
5421
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:967
5425
msgid "Cannot lock %(lock)s: %(why)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:977
5429
msgid ""
5430
"A transaction related operation was attempted after the transaction finished."
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1004
5434
msgid "Cannot lock: transport is read only: %(transport)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1012
5438
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1023
5442
msgid ""
5443
"Lock was broken while still open: %(lock)s - check storage consistency!"
5444
msgstr ""
5445
5446
#: bzrlib/errors.py:1034
5447
msgid ""
5448
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5449
"%(holder)r, wanted to break %(target)r"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1046
5453
msgid ""
5454
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5455
"Use 'bzr break-lock' to clear it"
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1059
5459
msgid "Lock not held: %(lock)s"
5460
msgstr ""
5461
5462
#: bzrlib/errors.py:1088
5463
msgid "No changes to commit"
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1093
5467
msgid ""
5468
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1103
5472
msgid ""
5473
"Excluding paths during commit is not supported by repository at "
5474
"%(repository)r."
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1112
5478
msgid ""
5479
"The specified commit message contains characters unsupported by the current "
5480
"encoding."
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1118
5484
msgid "Upgrade URL cannot work with readonly URLs."
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1123
5488
msgid "The branch format %(format)s is already at the most recent format."
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1146
5492
msgid "Option --change does not accept revision ranges"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1151
5496
msgid "No namespace registered for string: %(spec)r"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1170
5500
msgid ""
5501
"Requested revision: '%(spec)s' does not exist in branch: "
5502
"%(branch_url)s%(extra)s"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1184
5506
msgid ""
5507
"Operation denied because it would change the main history, which is not "
5508
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1195
5512
msgid ""
5513
"These branches have diverged. Use the missing command to see how.\n"
5514
"Use the merge command to reconcile them."
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:1215
5518
msgid ""
5519
"Branches have no common ancestor, and no merge base revision was specified."
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:1221
5523
msgid ""
5524
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1227
5528
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1236
5532
msgid ""
5533
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1245
5537
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1254
5541
msgid "Branch %(branch)s has no commits."
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1272
5545
msgid ""
5546
"Bound branch %(branch)s is out of date with master branch "
5547
"%(master)s.%(extra_help)s"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:1284
5551
msgid ""
5552
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5553
"bound to %(remote)s."
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1296
5557
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:1305
5561
msgid ""
5562
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5563
"%(error)s"
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:1317
5567
msgid "Error in processing weave: %(msg)s"
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:1326
5571
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:1337
5575
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:1347
5579
msgid "Weave invariant violated: %(what)s"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:1356
5583
msgid "Parents are mismatched between two revisions. %(msg)s"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:1378
5587
msgid ""
5588
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5589
"%(weave_b)s"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:1390
5593
msgid "Versioned file error"
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:1395
5597
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:1405
5601
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:1415
5605
msgid "Text did not match its checksum: %(msg)s"
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:1541
5609
msgid "Export format %(format)r not supported"
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:1550
5613
msgid "Transport error: %(msg)s %(orig_error)s"
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:1576
5617
msgid "Generic bzr smart protocol error: %(details)s"
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:1584
5621
msgid "Received bad protocol version marker: %(marker)r"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:1616
5625
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:1621
5629
msgid "Connection error: %(msg)s %(orig_error)s"
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:1626
5633
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:1647
5637
msgid "Connection closed: %(msg)s %(orig_error)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:1652
5641
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:1657
5645
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:1667
5649
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:1682
5653
msgid "Certificate error: %(error)s"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:1690
5657
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:1704
5661
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:1712
5665
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:1721
5669
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:1735
5673
msgid "Too many redirections"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:1740
5677
msgid "Working tree has conflicts."
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:1744
5681
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:1753
5685
msgid ""
5686
"Error(s) parsing config file %(filename)s:\n"
5687
"%(errors)s"
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:1763
5691
msgid ""
5692
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5693
"See ``bzr help %(name)s``"
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:1773
5697
msgid "%(username)r does not seem to contain a reasonable email address"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:1782
5701
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:1790
5705
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:1798
5709
msgid "Unable to import library \"%(library)s\": %(error)s"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:1806
5713
msgid "python-gpgme is not installed, it is needed to verify signatures"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:1814
5717
msgid ""
5718
"The working tree for %(basedir)s has changed since the last commit, but "
5719
"weave merge requires that it be unchanged"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:1824
5723
msgid ""
5724
"Can't reprocess and show base, because reprocessing obscures the "
5725
"relationship of conflicting lines to the base"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:1830
5729
msgid "Cycle in graph %(graph)r"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:1858
5733
msgid "File %(filename)s is not conflicted."
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:1880
5737
msgid "No bundle was found in \"%(filename)s\"."
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:1889
5741
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:1899
5745
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:1912
5749
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:1922
5753
msgid "Key %(key)s is already present in map"
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:1927
5757
msgid "The prefix %(prefix)s is in the help search path twice."
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:1937
5761
msgid ""
5762
"No final name for trans_id %(trans_id)r\n"
5763
"file-id: %(file_id)r\n"
5764
"root trans-id: %(root_trans_id)r\n"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:1969
5768
msgid "Attempt to reuse a transform that has already been applied."
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:1974
5772
msgid "Moving the root directory is not supported at this time"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:1979
5776
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:1990
5780
msgid ""
5781
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2026
5785
msgid ""
5786
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2056
5790
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2064
5794
msgid "Nothing to merge."
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2069
5798
msgid "Format %(format)s cannot be initialised by this version of bzr."
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2078
5802
msgid ""
5803
"Cannot convert from format %(from_format)s to format %(format)s. "
5804
"%(problem)s"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2090
5808
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2098
5812
msgid "%(exe_name)s could not be found on this machine"
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2106
5816
msgid "Diff is not installed on this machine: %(msg)s"
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:2114
5820
msgid "Diff3 is not installed on this machine."
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:2120
5824
msgid "The content being inserted is already present."
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2125
5828
msgid ""
5829
"This tree contains left-over files from a failed operation.\n"
5830
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5831
"to\n"
5832
" keep, and delete it when you are done."
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:2136
5836
msgid ""
5837
"This tree contains left-over files from a failed operation.\n"
5838
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5839
" wish to keep, and delete it when you are done."
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2146
5843
msgid ""
5844
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5845
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5846
"to\n"
5847
" keep, and delete it when you are done."
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2157
5851
msgid ""
5852
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5853
"examine %(pending_deletion)s to see if it contains any files you wish to "
5854
"keep, and delete it when you are done."
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2167
5858
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2181
5862
msgid ""
5863
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2194
5867
msgid "Error in merge modified format"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2199
5871
msgid "Format error in conflict listings"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2203
5875
msgid ""
5876
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5877
"Error: %(description)s"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2214
5881
msgid ""
5882
"An error has been detected in the repository %(repo_path)s.\n"
5883
"Please run bzr reconcile on this repository."
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2225
5887
msgid ""
5888
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5889
"reason: %(reason)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:2238
5893
msgid ""
5894
"An inconsistent delta was supplied: %(delta)r\n"
5895
"reason: %(reason)s"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2250
5899
msgid "To use this feature you must upgrade your branch at %(path)s."
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2259
5903
msgid "To use this feature you must upgrade your repository at %(path)s."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2264
5907
msgid ""
5908
"To use this feature you must upgrade your branch at %(path)s to a format "
5909
"which supports rich roots."
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2270
5913
msgid "Cannot perform local-only commits on unbound branches."
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2275
5917
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2296
5921
msgid "Ghost tags not supported by format %(format)r."
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2304
5925
msgid "File is binary but should be text."
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2309
5929
msgid "The path %(path)s is not permitted on this platform"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2318
5933
msgid ""
5934
"Testament did not match expected value.\n"
5935
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5936
" {%(measured)s}"
5937
msgstr ""
5938
5939
#: bzrlib/errors.py:2330
5940
msgid "Not a bzr revision-bundle: %(text)r"
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2339
5944
msgid "Bad bzr revision-bundle: %(text)r"
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2348
5948
msgid "Malformed bzr revision-bundle header: %(text)r"
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2353
5952
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2358
5956
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2363
5960
msgid "End of line marker was not \\n in bzr revision-bundle"
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2373
5964
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2383
5968
msgid "Root class for inventory serialization errors"
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2387
5972
msgid ""
5973
"The inventory was not in the expected format:\n"
5974
" %(msg)s"
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2396
5978
msgid "This operation requires rich root data storage"
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2409
5982
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5983
msgstr ""
5984
5985
#: bzrlib/errors.py:2418
5986
msgid ""
5987
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5988
"variable."
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:2425
5992
msgid ""
5993
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5994
"ghost at {%(ghost_revision_id)s}"
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:2435
5998
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2486
6002
msgid ""
6003
"A merge directive must provide either a bundle or a public branch location."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2493
6007
msgid "Bad merge directive payload %(start)r"
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:2503
6011
msgid "Preview patch does not match requested changes."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2509
6015
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2519
6019
msgid ""
6020
"Your branch does not have all of the revisions required in order to merge "
6021
"this merge directive and the target location specified in the merge "
6022
"directive is not a branch: %(location)s."
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:2531
6026
msgid "Unsupported entry kind %(kind)s"
6027
msgstr ""
6028
6029
#: bzrlib/errors.py:2539
6030
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:2549
6034
msgid "Subsume target %(other_tree)s needs to be upgraded."
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:2568
6038
msgid "No such tag: %(tag_name)s"
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:2576
6042
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:2585
6046
msgid "Tag %(tag_name)s already exists."
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:2593
6050
msgid ""
6051
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6052
"bugs\" for more information on this feature."
6053
msgstr ""
6054
6055
#: bzrlib/errors.py:2603
6056
msgid ""
6057
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6058
msgstr ""
6059
6060
#: bzrlib/errors.py:2613
6061
msgid ""
6062
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:2623
6066
msgid "Invalid line in bugs property: '%(line)s'"
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2631
6070
msgid "Invalid bug status: '%(status)s'"
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:2639
6074
msgid "Could not understand response from smart server: %(response_tuple)r"
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:2678
6078
msgid "Server sent an unexpected error: %(error_tuple)r"
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:2697
6082
msgid "Unrecognised container format: %(container_format)r"
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:2705
6086
msgid "Unexpected end of container stream"
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:2710
6090
msgid "Unknown record type: %(record_type)r"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2718
6094
msgid "Invalid record: %(reason)s"
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:2726
6098
msgid "Container has data after end marker: %(excess)r"
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:2734
6102
msgid "Container has multiple records with the same name: %(name)s"
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:2747
6106
msgid "Corrupt or incompatible data stream: %(reason)s"
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:2755
6110
msgid "SMTP error: %(error)s"
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:2763
6114
msgid "No message supplied."
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:2768
6118
msgid "No mail-to address (--mail-to) or output (-o) specified."
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:2773
6122
msgid "Unknown mail client: %(mail_client)s"
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:2781
6126
msgid ""
6127
"Unable to find mail client with the following names: "
6128
"%(mail_command_list_string)s"
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:2791
6132
msgid "SMTP connection to %(host)s refused"
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:2800
6136
msgid "Please specify smtp_server. No server at default %(host)s."
6137
msgstr ""
6138
6139
#: bzrlib/errors.py:2814
6140
msgid ""
6141
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6142
"reconfigure."
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:2826
6146
msgid "'%(display_url)s' is already a branch."
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:2831
6150
msgid "'%(display_url)s' is already a tree."
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:2836
6154
msgid "'%(display_url)s' is already a checkout."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:2841
6158
msgid "'%(display_url)s' is already a lightweight checkout."
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:2846
6162
msgid "'%(display_url)s' is already using a shared repository."
6163
msgstr ""
6164
6165
#: bzrlib/errors.py:2851
6166
msgid "'%(display_url)s' is already standalone."
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:2856
6170
msgid "Shared repository '%(display_url)s' already creates working trees."
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:2862
6174
msgid ""
6175
"Shared repository '%(display_url)s' already doesn't create working trees."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:2868
6179
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6180
msgstr ""
6181
6182
#: bzrlib/errors.py:2873
6183
msgid "No location could be found to bind to at %(display_url)s."
6184
msgstr ""
6185
6186
#: bzrlib/errors.py:2878
6187
msgid ""
6188
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6189
"status).%(more)s"
6190
msgstr ""
6191
6192
#: bzrlib/errors.py:2897
6193
msgid ""
6194
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6195
"list).%(more)s"
6196
msgstr ""
6197
6198
#: bzrlib/errors.py:2903
6199
msgid "Variable {%(name)s} is not available."
6200
msgstr ""
6201
6202
#: bzrlib/errors.py:2911
6203
msgid "No template specified."
6204
msgstr ""
6205
6206
#: bzrlib/errors.py:2916
6207
msgid "Unable to create symlink %(path_str)son this platform"
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:2931
6211
msgid ""
6212
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6213
"\"original\", \"local\"."
6214
msgstr ""
6215
6216
#: bzrlib/errors.py:2965
6217
msgid ""
6218
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6219
msgstr ""
6220
6221
#: bzrlib/errors.py:2977
6222
msgid "The \"%(config_id)s\" configuration does not exist."
6223
msgstr ""
6224
6225
#: bzrlib/errors.py:2985
6226
msgid "The \"%(option_name)s\" configuration option does not exist."
6227
msgstr ""
6228
6229
#: bzrlib/errors.py:2993
6230
msgid "The alias \"%(alias_name)s\" does not exist."
6231
msgstr ""
6232
6233
#: bzrlib/errors.py:3007
6234
msgid "\"%(alias_name)s\" is not a valid location alias."
6235
msgstr ""
6236
6237
#: bzrlib/errors.py:3015
6238
msgid "No %(alias_name)s location assigned."
6239
msgstr ""
6240
6241
#: bzrlib/errors.py:3023
6242
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6243
msgstr ""
6244
6245
#: bzrlib/errors.py:3033
6246
msgid "Unknown rules detected: %(unknowns_str)s."
6247
msgstr ""
6248
6249
#: bzrlib/errors.py:3044
6250
msgid "Tip change rejected: %(msg)s"
6251
msgstr ""
6252
6253
#: bzrlib/errors.py:3052
6254
msgid "Shelf corrupt."
6255
msgstr ""
6256
6257
#: bzrlib/errors.py:3057
6258
msgid "Corruption while decompressing repository file%(orig_error)s"
6259
msgstr ""
6260
6261
#: bzrlib/errors.py:3069
6262
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6263
msgstr ""
6264
6265
#: bzrlib/errors.py:3077
6266
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6267
msgstr ""
6268
6269
#: bzrlib/errors.py:3085
6270
msgid ""
6271
"An attempt to access a url outside the server jail was made: '%(url)s'."
6272
msgstr ""
6273
6274
#: bzrlib/errors.py:3093
6275
msgid "The user aborted the operation."
6276
msgstr ""
6277
6278
#: bzrlib/errors.py:3098
6279
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6280
msgstr ""
6281
6282
#: bzrlib/errors.py:3108
6283
msgid "No such view: %(view_name)s."
6284
msgstr ""
6285
6286
#: bzrlib/errors.py:3118
6287
msgid ""
6288
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6289
"to a later format."
6290
msgstr ""
6291
6292
#: bzrlib/errors.py:3127
6293
msgid ""
6294
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6295
msgstr ""
6296
6297
#: bzrlib/errors.py:3194
6298
msgid "%(bzrdir)r does not support co-located branches."
6299
msgstr ""
6300
6301
#: bzrlib/errors.py:3200
6302
msgid ""
6303
"Unable to determine your name.\n"
6304
"Please, set your name with the 'whoami' command.\n"
6305
"E.g. bzr whoami \"Your Name <name@example.com>\""
6306
msgstr ""
6307
6308
#: bzrlib/errors.py:3209
6309
msgid "Invalid pattern(s) found. %(msg)s"
6310
msgstr ""
6311
6312
#: bzrlib/errors.py:3217
6313
msgid ""
6314
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6315
"unbind` to fix."
6316
msgstr ""
6317
6318
#: bzrlib/errors.py:3228
6319
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6320
msgstr ""
6321
6322
#: bzrlib/errors.py:3237
6323
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6324
msgstr ""
6325
6326
#: bzrlib/errors.py:3246
6327
msgid ""
6328
"No compatible object available for operations from %(source)r to %(target)r."
6329
msgstr ""
6330
6331
#: bzrlib/errors.py:3256
6332
msgid ""
6333
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6334
"%(arguments)s."
6335
msgstr ""
6336
6337
#: bzrlib/errors.py:3266
6338
msgid ""
6339
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6340
"format %(format)r"
6341
msgstr ""
6342
6343
#: bzrlib/errors.py:3278
6344
msgid ""
6345
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6346
"plugin."
6347
msgstr ""
6348
6349
#: bzrlib/errors.py:3291
6350
msgid "Binary files section encountered."
6351
msgstr ""
6352
6353
#: bzrlib/errors.py:3299
6354
msgid ""
6355
"Malformed patch header. %(desc)s\n"
6356
"%(line)r"
6357
msgstr ""
6358
6359
#: bzrlib/errors.py:3308
6360
msgid ""
6361
"Malformed hunk header. %(desc)s\n"
6362
"%(line)r"
6363
msgstr ""
6364
6365
#: bzrlib/errors.py:3317
6366
msgid ""
6367
"Malformed line. %(desc)s\n"
6368
"%(line)r"
6369
msgstr ""
6370
6371
#: bzrlib/errors.py:3327
6372
msgid ""
6373
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6374
"but patch says it should be \"%(patch_line)s\""
6375
msgstr ""
6376
6377
#: bzrlib/errors.py:3338
6378
msgid "The feature %(feature)s has already been registered."
6379
msgstr ""
6380
6381
#: bzrlib/export_pot.py:252
6382
#, python-format
6383
msgid "Exporting messages from builtin command: %s"
6384
msgstr ""
6385
6386
#: bzrlib/export_pot.py:271
6387
msgid "Exporting messages from plugin command: {0} in {1}"
6388
msgstr ""
6389
6390
#: bzrlib/export_pot.py:292
6391
#, python-format
6392
msgid "Exporting message from error: %s"
6393
msgstr ""
6394
6395
#: bzrlib/fetch.py:98
6396
msgid "Finding revisions"
6397
msgstr ""
6398
6399
#: bzrlib/fetch.py:103
6400
msgid "Fetching revisions"
6401
msgstr ""
6402
6403
#: bzrlib/foreign.py:262
6404
msgid "Push into a different VCS without any custom bzr metadata."
6405
msgstr ""
6406
6407
#: bzrlib/foreign.py:264
6408
msgid ""
6409
"This will afterwards rebase the local branch on the remote\n"
6410
"branch unless the --no-rebase option is used, in which case \n"
6411
"the two branches will be out of sync after the push. "
6412
msgstr ""
6413
6414
#: bzrlib/foreign.py:277
6415
msgid "Do not rebase after push."
6416
msgstr ""
6417
6418
#: bzrlib/foreign.py:311
6419
#, python-format
6420
msgid "Using saved location: %s\n"
6421
msgstr ""
6422
6423
#: bzrlib/foreign.py:321
6424
msgid ""
6425
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6426
"regular push."
6427
msgstr ""
6428
6429
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6430
msgid "{0} commits with valid signatures"
6431
msgstr ""
6432
6433
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6434
msgid "{0} commit with unknown key"
6435
msgid_plural "{0} commits with unknown keys"
6436
msgstr[0] ""
6437
msgstr[1] ""
6438
6439
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6440
msgid "{0} commit not valid"
6441
msgid_plural "{0} commits not valid"
6442
msgstr[0] ""
6443
msgstr[1] ""
6444
6445
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6446
msgid "{0} commit not signed"
6447
msgid_plural "{0} commits not signed"
6448
msgstr[0] ""
6449
msgstr[1] ""
6450
6451
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6452
msgid "{0} commit with key now expired"
6453
msgid_plural "{0} commits with key now expired"
6454
msgstr[0] ""
6455
msgstr[1] ""
6456
6457
#: bzrlib/gpg.py:343
6458
msgid "No GnuPG key results for pattern: {0}"
6459
msgstr ""
6460
6461
#: bzrlib/gpg.py:386
6462
msgid "{0} signed {1} commit"
6463
msgid_plural "{0} signed {1} commits"
6464
msgstr[0] ""
6465
msgstr[1] ""
6466
6467
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6468
msgid "{0} commit by author {1}"
6469
msgid_plural "{0} commits by author {1}"
6470
msgstr[0] ""
6471
msgstr[1] ""
6472
6473
#: bzrlib/gpg.py:433
6474
msgid "Unknown key {0} signed {1} commit"
6475
msgid_plural "Unknown key {0} signed {1} commits"
6476
msgstr[0] ""
6477
msgstr[1] ""
6478
6479
#: bzrlib/gpg.py:452
6480
msgid "{0} commit by author {1} with key {2} now expired"
6481
msgid_plural "{0} commits by author {1} with key {2} now expired"
6482
msgstr[0] ""
6483
msgstr[1] ""
6484
6485
#: bzrlib/groupcompress.py:1739
6486
#, python-format
6487
msgid "Insert claimed random_id=True, but then inserted %r two times"
6488
msgstr ""
6489
6490
#: bzrlib/hooks.py:331
6491
#, python-format
6492
msgid "Introduced in: %s"
6493
msgstr "Introduzido em: %s"
6494
6495
#: bzrlib/hooks.py:334
6496
#, python-format
6497
msgid "Deprecated in: %s"
6498
msgstr ""
6499
6500
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6501
msgid "Walking content"
6502
msgstr ""
6503
6504
#: bzrlib/knit.py:3330
6505
msgid "annotating"
6506
msgstr ""
6507
6508
#: bzrlib/lock.py:548
6509
msgid "{0!r} was {1} locked again"
6510
msgstr ""
6511
6512
#: bzrlib/lockdir.py:321
6513
#, python-format
6514
msgid "error removing pending lock: %s"
6515
msgstr ""
6516
6517
#: bzrlib/lockdir.py:616
6518
msgid "Unable to obtain"
6519
msgstr ""
6520
6521
#: bzrlib/lockdir.py:618
6522
msgid "Lock owner changed for"
6523
msgstr ""
6524
6525
#: bzrlib/lockdir.py:620
6526
msgid "{0} lock {1} {2}."
6527
msgstr ""
6528
6529
#: bzrlib/lockdir.py:627
6530
#, python-format
6531
msgid "Will continue to try until %s, unless you press Ctrl-C."
6532
msgstr ""
6533
6534
#: bzrlib/lockdir.py:629
6535
msgid "See \"bzr help break-lock\" for more."
6536
msgstr ""
6537
6538
#: bzrlib/lockdir.py:739
6539
#, python-format
6540
msgid ""
6541
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6542
msgstr ""
6543
6544
#: bzrlib/log.py:572
6545
msgid "--exclude-common-ancestry requires two different revisions"
6546
msgstr ""
6547
6548
#: bzrlib/log.py:574
6549
#, python-format
6550
msgid "invalid direction %r"
6551
msgstr ""
6552
6553
#: bzrlib/log.py:662
6554
msgid "Start revision not found in history of end revision."
6555
msgstr ""
6556
6557
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6558
msgid "Logging revision 0 is invalid."
6559
msgstr ""
6560
6561
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6562
msgid "Start revision must be older than the end revision."
6563
msgstr ""
6564
6565
#: bzrlib/log.py:1827
6566
#, python-format
6567
msgid "unknown log formatter: %r"
6568
msgstr ""
6569
6570
#: bzrlib/log.py:2123
6571
msgid "fixes bug"
6572
msgid_plural "fixes bugs"
6573
msgstr[0] ""
6574
msgstr[1] ""
6575
6576
#: bzrlib/merge.py:689
6577
msgid "All changes applied successfully."
6578
msgstr ""
6579
6580
#: bzrlib/merge.py:691
6581
#, python-format
6582
msgid "%d conflicts encountered."
6583
msgstr ""
6584
6585
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6586
msgid "Preparing file merge"
6587
msgstr ""
6588
6589
#: bzrlib/multiparent.py:426
6590
msgid "Importing revisions"
6591
msgstr ""
6592
6593
#: bzrlib/option.py:526
6594
msgid "Show help message."
6595
msgstr ""
6596
6597
#: bzrlib/option.py:528
6598
msgid "Only display errors and warnings."
6599
msgstr ""
6600
6601
#: bzrlib/option.py:531
6602
msgid "Show usage message and options."
6603
msgstr ""
6604
6605
#: bzrlib/option.py:533
6606
msgid "Display more information."
6607
msgstr ""
6608
6609
#: bzrlib/option.py:541
6610
msgid ""
6611
"Select changes introduced by the specified revision. See also \"help "
6612
"revisionspec\"."
6613
msgstr ""
6614
6615
#: bzrlib/option.py:543
6616
msgid "Branch to operate on, instead of working directory."
6617
msgstr ""
6618
6619
#: bzrlib/option.py:545
6620
msgid "Detailed log format."
6621
msgstr ""
6622
6623
#: bzrlib/option.py:545
6624
msgid "Format used by GNU ChangeLog files."
6625
msgstr ""
6626
6627
#: bzrlib/option.py:545
6628
msgid "Log format with one line per revision."
6629
msgstr ""
6630
6631
#: bzrlib/option.py:545
6632
msgid "Moderately short log format."
6633
msgstr ""
6634
6635
#: bzrlib/option.py:545
6636
msgid "Use specified log format."
6637
msgstr ""
6638
6639
#: bzrlib/option.py:547
6640
msgid "Log format"
6641
msgstr ""
6642
6643
#: bzrlib/option.py:549
6644
msgid "LCA-newness merge."
6645
msgstr ""
6646
6647
#: bzrlib/option.py:549
6648
msgid "Merge using external diff3."
6649
msgstr ""
6650
6651
#: bzrlib/option.py:549
6652
msgid "Native diff3-style merge."
6653
msgstr ""
6654
6655
#: bzrlib/option.py:549
6656
msgid "Select a particular merge algorithm."
6657
msgstr ""
6658
6659
#: bzrlib/option.py:549
6660
msgid "Weave-based merge."
6661
msgstr ""
6662
6663
#: bzrlib/option.py:551
6664
msgid "Merge algorithm"
6665
msgstr ""
6666
6667
#: bzrlib/option.py:554
6668
msgid "Message string."
6669
msgstr ""
6670
6671
#: bzrlib/option.py:556
6672
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6673
msgstr ""
6674
6675
#: bzrlib/option.py:558
6676
msgid "Ignore differences between branches and overwrite unconditionally."
6677
msgstr ""
6678
6679
#: bzrlib/option.py:560
6680
msgid "Remember the specified location as a default."
6681
msgstr ""
6682
6683
#: bzrlib/option.py:562
6684
msgid "Reprocess to reduce spurious conflicts."
6685
msgstr ""
6686
6687
#: bzrlib/option.py:566
6688
msgid "See \"help revisionspec\" for details."
6689
msgstr ""
6690
6691
#: bzrlib/option.py:568
6692
msgid "Show internal object ids."
6693
msgstr ""
6694
6695
#: bzrlib/option.py:571
6696
msgid "Display timezone as local, original, or utc."
6697
msgstr ""
6698
6699
#: bzrlib/osutils.py:100
6700
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6701
msgstr ""
6702
6703
#: bzrlib/osutils.py:220
6704
msgid "lstat/stat of ({0!r}): {1!r}"
6705
msgstr ""
6706
6707
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6708
#, python-format
6709
msgid "sorry, %r not allowed in path"
6710
msgstr ""
6711
6712
#: bzrlib/osutils.py:1237
6713
#, python-format
6714
msgid "%r is too short to calculate a relative path"
6715
msgstr ""
6716
6717
#: bzrlib/plugin.py:143
6718
#, python-format
6719
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6720
msgstr ""
6721
6722
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6723
msgid "Enable completions for the selected plugin (default: all plugins)"
6724
msgstr ""
6725
6726
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6727
msgid "Generate a shell function for bash command line completion."
6728
msgstr ""
6729
6730
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6731
msgid ""
6732
"This command generates a shell function which can be used by bash to\n"
6733
"automatically complete the currently typed command when the user presses\n"
6734
"the completion key (usually tab)."
6735
msgstr ""
6736
6737
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6738
msgid ""
6739
"Commonly used like this:\n"
6740
" eval \"`bzr bash-completion`\""
6741
msgstr ""
6742
6743
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6744
msgid "Name of the generated function (default: _bzr)"
6745
msgstr ""
6746
6747
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6748
msgid "Generate only the shell function, don't enable it"
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/__init__.py:81
6752
msgid "Register a branch with launchpad.net."
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/__init__.py:83
6756
msgid ""
6757
"This command lists a bzr branch in the directory of branches on\n"
6758
"launchpad.net. Registration allows the branch to be associated with\n"
6759
"bugs or specifications."
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/__init__.py:87
6763
msgid ""
6764
"Before using this command you must register the project to which the\n"
6765
"branch belongs, and create an account for yourself on launchpad.net."
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/__init__.py:90
6769
msgid ""
6770
"arguments:\n"
6771
" public_url: The publicly visible url for the branch to register.\n"
6772
" This must be an http or https url (which Launchpad can read\n"
6773
" from to access the branch). Local file urls, SFTP urls, and\n"
6774
" bzr+ssh urls will not work.\n"
6775
" If no public_url is provided, bzr will use the configured\n"
6776
" public_url if there is one for the current branch, and\n"
6777
" otherwise error."
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/__init__.py:99
6781
msgid ""
6782
"example:\n"
6783
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6784
" --project fooproject"
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/__init__.py:106
6788
msgid "Launchpad project short name to associate with the branch."
6789
msgstr ""
6790
6791
#: bzrlib/plugins/launchpad/__init__.py:113
6792
msgid ""
6793
"Short name for the branch; by default taken from the last component of the "
6794
"url."
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/__init__.py:117
6798
msgid "One-sentence description of the branch."
6799
msgstr ""
6800
6801
#: bzrlib/plugins/launchpad/__init__.py:120
6802
msgid "Longer description of the purpose or contents of the branch."
6803
msgstr ""
6804
6805
#: bzrlib/plugins/launchpad/__init__.py:123
6806
msgid "Branch author's email address, if not yourself."
6807
msgstr ""
6808
6809
#: bzrlib/plugins/launchpad/__init__.py:126
6810
msgid "The bug this branch fixes."
6811
msgstr ""
6812
6813
#: bzrlib/plugins/launchpad/__init__.py:129
6814
msgid "Prepare the request but don't actually send it."
6815
msgstr ""
6816
6817
#: bzrlib/plugins/launchpad/__init__.py:151
6818
msgid ""
6819
"register-branch requires a public branch url - see bzr help register-branch."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/__init__.py:159
6823
msgid "--product is deprecated; please use --project."
6824
msgstr ""
6825
6826
#: bzrlib/plugins/launchpad/__init__.py:191
6827
msgid "Open a Launchpad branch page in your web browser."
6828
msgstr ""
6829
6830
#: bzrlib/plugins/launchpad/__init__.py:196
6831
msgid "Do not actually open the browser. Just say the URL we would use."
6832
msgstr ""
6833
6834
#: bzrlib/plugins/launchpad/__init__.py:231
6835
#, python-format
6836
msgid "Opening %s in web browser"
6837
msgstr ""
6838
6839
#: bzrlib/plugins/launchpad/__init__.py:241
6840
msgid "Show or set the Launchpad user ID."
6841
msgstr ""
6842
6843
#: bzrlib/plugins/launchpad/__init__.py:243
6844
msgid ""
6845
"When communicating with Launchpad, some commands need to know your\n"
6846
"Launchpad user ID. This command can be used to set or show the\n"
6847
"user ID that Bazaar will use for such communication."
6848
msgstr ""
6849
6850
#: bzrlib/plugins/launchpad/__init__.py:247
6851
msgid ""
6852
":Examples:\n"
6853
" Show the Launchpad ID of the current user::"
6854
msgstr ""
6855
":Exemplos:\n"
6856
" Mostra o ID do launchpad do usuário atual::"
6857
6858
#: bzrlib/plugins/launchpad/__init__.py:250
6859
msgid " bzr launchpad-login"
6860
msgstr " bzr launchpad-login"
6861
6862
#: bzrlib/plugins/launchpad/__init__.py:252
6863
msgid " Set the Launchpad ID of the current user to 'bob'::"
6864
msgstr " Define um ID do launchpad para o usuário 'bob'::"
6865
6866
#: bzrlib/plugins/launchpad/__init__.py:254
6867
msgid " bzr launchpad-login bob"
6868
msgstr " bzr launchpad-login bob"
6869
6870
#: bzrlib/plugins/launchpad/__init__.py:261
6871
msgid "Don't check that the user name is valid."
6872
msgstr "Não verifique se o nome de usuário é válido."
6873
6874
#: bzrlib/plugins/launchpad/__init__.py:276
6875
#: bzrlib/plugins/launchpad/__init__.py:287
6876
msgid "Launchpad user ID exists and has SSH keys.\n"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/launchpad/__init__.py:279
6880
msgid "No Launchpad user ID configured.\n"
6881
msgstr "Nenhum ID de usuário launchpad configurado.\n"
6882
6883
#: bzrlib/plugins/launchpad/__init__.py:290
6884
#, python-format
6885
msgid "Launchpad user ID set to '%s'.\n"
6886
msgstr "ID de usuário launchpad definido como '%s'.\n"
6887
6888
#: bzrlib/plugins/launchpad/__init__.py:298
6889
msgid "Ask Launchpad to mirror a branch now."
6890
msgstr ""
6891
6892
#: bzrlib/plugins/launchpad/__init__.py:318
6893
msgid "Propose merging a branch on Launchpad."
6894
msgstr ""
6895
6896
#: bzrlib/plugins/launchpad/__init__.py:320
6897
msgid ""
6898
"This will open your usual editor to provide the initial comment. When it\n"
6899
"has created the proposal, it will open it in your default web browser."
6900
msgstr ""
6901
6902
#: bzrlib/plugins/launchpad/__init__.py:323
6903
msgid ""
6904
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6905
"is not supplied, the remembered submit branch will be used. If no submit\n"
6906
"branch is remembered, the development focus will be used."
6907
msgstr ""
6908
6909
#: bzrlib/plugins/launchpad/__init__.py:327
6910
msgid ""
6911
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6912
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6913
"The parameter the launchpad account name of the desired reviewer. This\n"
6914
"may optionally be followed by '=' and the review type. For example:"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/launchpad/__init__.py:332
6918
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6919
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
6920
6921
#: bzrlib/plugins/launchpad/__init__.py:334
6922
msgid ""
6923
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6924
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6925
msgstr ""
6926
6927
#: bzrlib/plugins/launchpad/__init__.py:339
6928
msgid "Propose the merge on staging."
6929
msgstr ""
6930
6931
#: bzrlib/plugins/launchpad/__init__.py:341
6932
msgid "Commit message."
6933
msgstr ""
6934
6935
#: bzrlib/plugins/launchpad/__init__.py:343
6936
msgid "Mark the proposal as approved immediately."
6937
msgstr ""
6938
6939
#: bzrlib/plugins/launchpad/__init__.py:345
6940
msgid "Requested reviewer and optional type."
6941
msgstr ""
6942
6943
#: bzrlib/plugins/launchpad/__init__.py:382
6944
msgid "Find the proposal to merge this revision."
6945
msgstr ""
6946
6947
#: bzrlib/plugins/launchpad/__init__.py:384
6948
msgid ""
6949
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6950
"This works only if the selected branch was the merge proposal target, and\n"
6951
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6952
"are opened in a web browser."
6953
msgstr ""
6954
6955
#: bzrlib/plugins/launchpad/__init__.py:389
6956
msgid ""
6957
"Any revision involved in the merge may be specified-- the revision in\n"
6958
"which the merge was performed, or one of the revisions that was merged."
6959
msgstr ""
6960
6961
#: bzrlib/plugins/launchpad/__init__.py:392
6962
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6963
msgstr ""
6964
6965
#: bzrlib/plugins/launchpad/__init__.py:394
6966
msgid " bzr lp-find-proposal -r annotate:README:1"
6967
msgstr ""
6968
6969
#: bzrlib/plugins/launchpad/__init__.py:409
6970
msgid "No review found."
6971
msgstr ""
6972
6973
#: bzrlib/plugins/launchpad/__init__.py:410
6974
#, python-format
6975
msgid "%d proposals(s) found."
6976
msgstr ""
6977
6978
#: bzrlib/plugins/launchpad/__init__.py:420
6979
msgid "Finding revision-id"
6980
msgstr ""
6981
6982
#: bzrlib/plugins/launchpad/__init__.py:427
6983
msgid "Finding merge"
6984
msgstr ""
6985
6986
#: bzrlib/plugins/launchpad/__init__.py:432
6987
msgid "Finding revno"
6988
msgstr ""
6989
6990
#: bzrlib/plugins/launchpad/__init__.py:437
6991
msgid "Finding Launchpad branch"
6992
msgstr ""
6993
6994
#: bzrlib/plugins/launchpad/__init__.py:440
6995
msgid "Finding proposals"
6996
msgstr ""
6997
6998
#: bzrlib/plugins/launchpad/account.py:66
6999
msgid "Setting ssh/sftp usernames for launchpad.net."
7000
msgstr ""
7001
7002
#: bzrlib/plugins/launchpad/lp_api.py:241
7003
#: bzrlib/plugins/launchpad/lp_api.py:246
7004
#, python-format
7005
msgid "%s is not registered on Launchpad"
7006
msgstr ""
7007
7008
#: bzrlib/plugins/launchpad/lp_api.py:256
7009
#, python-format
7010
msgid "%s has no development focus."
7011
msgstr ""
7012
7013
#: bzrlib/plugins/launchpad/lp_api.py:261
7014
#, python-format
7015
msgid "development focus %s has no branch."
7016
msgstr ""
7017
7018
#: bzrlib/plugins/launchpad/lp_api.py:266
7019
#, python-format
7020
msgid "source package %s has no branch."
7021
msgstr ""
7022
7023
#: bzrlib/plugins/launchpad/lp_api.py:270
7024
#, python-format
7025
msgid "%s has no associated product or source package."
7026
msgstr ""
7027
7028
#: bzrlib/plugins/launchpad/lp_api.py:282
7029
#, python-format
7030
msgid "%s is already up-to-date."
7031
msgstr ""
7032
7033
#: bzrlib/plugins/launchpad/lp_api.py:289
7034
#, python-format
7035
msgid "Pushing to %s"
7036
msgstr ""
7037
7038
#: bzrlib/plugins/launchpad/lp_directory.py:170
7039
msgid ""
7040
"resolution for {0}\n"
7041
" local: {1}\n"
7042
" remote: {2}"
7043
msgstr ""
7044
7045
#: bzrlib/plugins/launchpad/lp_propose.py:149
7046
#, python-format
7047
msgid "There is already a branch merge proposal: %s"
7048
msgstr ""
7049
7050
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7051
msgid "pb parameter to convert() is deprecated"
7052
msgstr ""
7053
7054
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7055
msgid "starting upgrade from format 4 to 5"
7056
msgstr ""
7057
7058
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7059
msgid "note: upgrade may be faster if all store files are ungzipped first"
7060
msgstr ""
7061
7062
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7063
msgid "converting revision"
7064
msgstr ""
7065
7066
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7067
msgid "upgraded to weaves:"
7068
msgstr ""
7069
7070
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7071
#, python-format
7072
msgid "%6d revisions and inventories"
7073
msgstr ""
7074
7075
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7076
#, python-format
7077
msgid "%6d revisions not present"
7078
msgstr ""
7079
7080
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7081
#, python-format
7082
msgid "%6d texts"
7083
msgstr ""
7084
7085
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7086
msgid "writing weave"
7087
msgstr ""
7088
7089
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7090
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7091
msgid "inventory"
7092
msgstr ""
7093
7094
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7095
msgid "write revision"
7096
msgstr ""
7097
7098
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7099
msgid "loading revision"
7100
msgstr ""
7101
7102
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7103
#, python-format
7104
msgid "revision {%s} not present in branch; will be converted as a ghost"
7105
msgstr ""
7106
7107
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7108
msgid "starting upgrade from format 5 to 6"
7109
msgstr ""
7110
7111
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7112
#, python-format
7113
msgid "adding prefixes to %s"
7114
msgstr ""
7115
7116
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7117
msgid "starting upgrade from format 6 to metadir"
7118
msgstr ""
7119
7120
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7121
msgid "Removing ancestry.weave"
7122
msgstr ""
7123
7124
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7125
msgid "Finding branch files"
7126
msgstr ""
7127
7128
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7129
msgid "Upgrading repository"
7130
msgstr ""
7131
7132
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7133
msgid "Upgrading branch"
7134
msgstr ""
7135
7136
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7137
msgid "No working tree."
7138
msgstr ""
7139
7140
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7141
msgid "Upgrading working tree"
7142
msgstr ""
7143
7144
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7145
#, python-format
7146
msgid "Make %s lock"
7147
msgstr ""
7148
7149
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7150
#, python-format
7151
msgid "Moving %s"
7152
msgstr ""
7153
7154
#: bzrlib/push.py:56
7155
msgid "Created new branch."
7156
msgstr ""
7157
7158
#: bzrlib/push.py:97
7159
#, python-format
7160
msgid ""
7161
"Target directory %s already contains a .bzr directory, but it is not valid."
7162
msgstr ""
7163
7164
#: bzrlib/push.py:101
7165
#, python-format
7166
msgid ""
7167
"Target directory %s already exists, but does not have a .bzr directory. "
7168
"Supply --use-existing-dir to push there anyway."
7169
msgstr ""
7170
7171
#: bzrlib/push.py:122
7172
#, python-format
7173
msgid "Too many redirections trying to make %s."
7174
msgstr ""
7175
7176
#: bzrlib/push.py:147
7177
msgid ""
7178
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7179
"information."
7180
msgstr ""
7181
7182
#: bzrlib/push.py:151
7183
#, python-format
7184
msgid ""
7185
"It is not possible to losslessly push to %s. You may want to use dpush "
7186
"instead."
7187
msgstr ""
7188
7189
#: bzrlib/push.py:157
7190
#, python-format
7191
msgid ""
7192
"At %s you have a valid .bzr control directory, but not a branch or "
7193
"repository. This is an unsupported configuration. Please move the target "
7194
"directory out of the way and try again."
7195
msgstr ""
7196
7197
#: bzrlib/reconcile.py:97
7198
#, python-format
7199
msgid "Reconciling branch %s"
7200
msgstr ""
7201
7202
#: bzrlib/reconcile.py:103
7203
#, python-format
7204
msgid "Reconciling repository %s"
7205
msgstr ""
7206
7207
#: bzrlib/reconcile.py:105
7208
msgid "Reconciling repository"
7209
msgstr ""
7210
7211
#: bzrlib/reconcile.py:111
7212
#, python-format
7213
msgid "%s cannot canonicalize CHKs."
7214
msgstr ""
7215
7216
#: bzrlib/reconcile.py:119
7217
msgid "Reconcile aborted: revision index has inconsistent parents."
7218
msgstr ""
7219
7220
#: bzrlib/reconcile.py:121
7221
msgid "Run \"bzr check\" for more details."
7222
msgstr ""
7223
7224
#: bzrlib/reconcile.py:123
7225
msgid "Reconciliation complete."
7226
msgstr ""
7227
7228
#: bzrlib/reconcile.py:166
7229
msgid "Fixing last revision info {0} => {1}"
7230
msgstr ""
7231
7232
#: bzrlib/reconcile.py:173
7233
msgid "revision_history ok."
7234
msgstr ""
7235
7236
#: bzrlib/reconcile.py:234
7237
msgid "Reading inventory data"
7238
msgstr ""
7239
7240
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7241
msgid "Inventory ok."
7242
msgstr ""
7243
7244
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7245
msgid "Backing up inventory"
7246
msgstr ""
7247
7248
#: bzrlib/reconcile.py:258
7249
msgid "Backup inventory created."
7250
msgstr ""
7251
7252
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7253
msgid "Writing weave"
7254
msgstr ""
7255
7256
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7257
msgid "Inventory regenerated."
7258
msgstr ""
7259
7260
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7261
msgid "Reading indexes"
7262
msgstr ""
7263
7264
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7265
msgid "Checking unused inventories"
7266
msgstr ""
7267
7268
#: bzrlib/reconcile.py:388
7269
msgid "Backup Inventory created"
7270
msgstr ""
7271
7272
#: bzrlib/reconcile.py:446
7273
msgid "Fixing text parents"
7274
msgstr ""
7275
7276
#: bzrlib/reconfigure.py:54
7277
msgid "{0} is now stacked on {1}\n"
7278
msgstr ""
7279
7280
#: bzrlib/reconfigure.py:69
7281
#, python-format
7282
msgid "%s is now not stacked\n"
7283
msgstr ""
7284
7285
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7286
#, python-format
7287
msgid "bzr: ERROR (ignored): %s"
7288
msgstr ""
7289
7290
#: bzrlib/remote.py:2541
7291
msgid "Copying repository content as tarball..."
7292
msgstr ""
7293
7294
#: bzrlib/rename_map.py:69
7295
msgid "Calculating hashes"
7296
msgstr ""
7297
7298
#: bzrlib/rename_map.py:107
7299
msgid "Determining hash hits"
7300
msgstr ""
7301
7302
#: bzrlib/rename_map.py:242
7303
msgid "{0} => {1}"
7304
msgstr ""
7305
7306
#: bzrlib/repository.py:1787
7307
msgid "Moving repository to repository.backup"
7308
msgstr ""
7309
7310
#: bzrlib/repository.py:1794
7311
msgid "Creating new repository"
7312
msgstr ""
7313
7314
#: bzrlib/repository.py:1799
7315
msgid "Copying content"
7316
msgstr ""
7317
7318
#: bzrlib/repository.py:1803
7319
msgid "Deleting old repository content"
7320
msgstr ""
7321
7322
#: bzrlib/repository.py:1805
7323
msgid "repository converted"
7324
msgstr ""
7325
7326
#: bzrlib/revisionspec.py:903
7327
msgid "Using {0} {1}"
7328
msgstr ""
7329
7330
#: bzrlib/send.py:58
7331
#, python-format
7332
msgid "Mail client \"%s\" does not support specifying body"
7333
msgstr ""
7334
7335
#: bzrlib/send.py:62
7336
msgid "--remember requires a branch to be specified."
7337
msgstr ""
7338
7339
#: bzrlib/send.py:77
7340
msgid "No submit branch known or specified"
7341
msgstr ""
7342
7343
#: bzrlib/send.py:80
7344
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7345
msgstr ""
7346
7347
#: bzrlib/send.py:98
7348
#, python-format
7349
msgid "No such send format '%s'."
7350
msgstr ""
7351
7352
#: bzrlib/send.py:114
7353
msgid "bzr send takes at most two one revision identifiers"
7354
msgstr ""
7355
7356
#: bzrlib/send.py:127
7357
msgid "No revisions to submit."
7358
msgstr ""
7359
7360
#: bzrlib/send.py:139
7361
msgid ""
7362
"- not supported for merge directives that use more than one output file."
7363
msgstr ""
7364
7365
#: bzrlib/send.py:185
7366
msgid "Format 0.9 does not permit bundle with no patch"
7367
msgstr ""
7368
7369
#: bzrlib/shelf_ui.py:46
7370
#, python-format
7371
msgid "Shelve adding file \"%(path)s\"?"
7372
msgstr ""
7373
7374
#: bzrlib/shelf_ui.py:47
7375
msgid "Shelve binary changes?"
7376
msgstr ""
7377
7378
#: bzrlib/shelf_ui.py:48
7379
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7380
msgstr ""
7381
7382
#: bzrlib/shelf_ui.py:50
7383
#, python-format
7384
msgid "Shelve removing file \"%(path)s\"?"
7385
msgstr ""
7386
7387
#: bzrlib/shelf_ui.py:51
7388
#, python-format
7389
msgid "Shelve %d change(s)?"
7390
msgstr ""
7391
7392
#: bzrlib/shelf_ui.py:52
7393
msgid "Shelve?"
7394
msgstr ""
7395
7396
#: bzrlib/shelf_ui.py:53
7397
#, python-format
7398
msgid ""
7399
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7400
msgstr ""
7401
7402
#: bzrlib/shelf_ui.py:55
7403
#, python-format
7404
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7405
msgstr ""
7406
7407
#: bzrlib/shelf_ui.py:70
7408
#, python-format
7409
msgid "Changes shelved with id \"%d\"."
7410
msgstr ""
7411
7412
#: bzrlib/shelf_ui.py:74
7413
msgid "Selected changes destroyed."
7414
msgstr ""
7415
7416
#: bzrlib/shelf_ui.py:78
7417
msgid "Selected changes:"
7418
msgstr ""
7419
7420
#: bzrlib/shelf_ui.py:98
7421
#, python-format
7422
msgid "Delete file \"%(path)s\"?"
7423
msgstr ""
7424
7425
#: bzrlib/shelf_ui.py:99
7426
msgid "Apply binary changes?"
7427
msgstr ""
7428
7429
#: bzrlib/shelf_ui.py:100
7430
#, python-format
7431
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7432
msgstr ""
7433
7434
#: bzrlib/shelf_ui.py:102
7435
#, python-format
7436
msgid "Add file \"%(path)s\"?"
7437
msgstr ""
7438
7439
#: bzrlib/shelf_ui.py:103
7440
#, python-format
7441
msgid "Apply %d change(s)?"
7442
msgstr ""
7443
7444
#: bzrlib/shelf_ui.py:104
7445
msgid "Apply change?"
7446
msgstr ""
7447
7448
#: bzrlib/shelf_ui.py:105
7449
#, python-format
7450
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7451
msgstr ""
7452
7453
#: bzrlib/shelf_ui.py:107
7454
#, python-format
7455
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7456
msgstr ""
7457
7458
#: bzrlib/shelf_ui.py:402
7459
msgid "No changes are shelved."
7460
msgstr ""
7461
7462
#: bzrlib/shelf_ui.py:460
7463
#, python-format
7464
msgid "Using changes with id \"%d\"."
7465
msgstr ""
7466
7467
#: bzrlib/shelf_ui.py:464
7468
#, python-format
7469
msgid "Message: %s"
7470
msgstr ""
7471
7472
#: bzrlib/shelf_ui.py:476
7473
#, python-format
7474
msgid "Deleted changes with id \"%d\"."
7475
msgstr ""
7476
7477
#: bzrlib/smart/medium.py:714
7478
msgid "HPSS calls: {0} ({1} vfs) {2}"
7479
msgstr ""
7480
7481
#: bzrlib/smart/server.py:169
7482
msgid "Requested to stop gracefully"
7483
msgstr ""
7484
7485
#: bzrlib/smart/server.py:179
7486
#, python-format
7487
msgid "Waiting for %d client(s) to finish"
7488
msgstr ""
7489
7490
#: bzrlib/smart/server.py:185
7491
#, python-format
7492
msgid "Still waiting for %d client(s) to finish"
7493
msgstr ""
7494
7495
#: bzrlib/smart/server.py:219
7496
#, python-format
7497
msgid "listening socket error: %s"
7498
msgstr ""
7499
7500
#: bzrlib/smart/server.py:452
7501
#, python-format
7502
msgid "listening on port: %s"
7503
msgstr ""
7504
7505
#: bzrlib/switch.py:73
7506
msgid "Pending merges must be committed or reverted before using switch."
7507
msgstr ""
7508
7509
#: bzrlib/switch.py:100
7510
msgid ""
7511
"Cannot switch as local commits found in the checkout. Commit these to the "
7512
"bound branch or use --force to throw them away."
7513
msgstr ""
7514
7515
#: bzrlib/switch.py:105
7516
#, python-format
7517
msgid ""
7518
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7519
"anyway, use --force."
7520
msgstr ""
7521
7522
#: bzrlib/switch.py:125
7523
msgid "Cannot switch a branch, only a checkout."
7524
msgstr ""
7525
7526
#: bzrlib/switch.py:163
7527
#, python-format
7528
msgid "Tree is up to date at revision %d."
7529
msgstr ""
7530
7531
#: bzrlib/switch.py:169
7532
#, python-format
7533
msgid "Updated to revision %d."
7534
msgstr ""
7535
7536
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7537
msgid "Apply phase"
7538
msgstr ""
7539
7540
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7541
msgid "removing file"
7542
msgstr ""
7543
7544
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7545
msgid "adding file"
7546
msgstr ""
7547
7548
#: bzrlib/transform.py:2591
7549
msgid "Building tree"
7550
msgstr ""
7551
7552
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7553
msgid "Adding file contents"
7554
msgstr ""
7555
7556
#: bzrlib/transform.py:3028
7557
msgid "Resolution pass"
7558
msgstr ""
7559
7560
#: bzrlib/transport/ftp/_gssapi.py:88
7561
#, python-format
7562
msgid "Authenticated as %s"
7563
msgstr ""
7564
7565
#: bzrlib/tree.py:634
7566
msgid "*** {0} content-filter: {1} => {2!r}"
7567
msgstr ""
7568
7569
#: bzrlib/upgrade.py:77
7570
#, python-format
7571
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7572
msgstr ""
7573
7574
#: bzrlib/upgrade.py:100
7575
#, python-format
7576
msgid "cannot upgrade from bzrdir format %s"
7577
msgstr ""
7578
7579
#: bzrlib/upgrade.py:103
7580
#, python-format
7581
msgid "starting upgrade of %s"
7582
msgstr ""
7583
7584
#: bzrlib/upgrade.py:110
7585
msgid "finished"
7586
msgstr ""
7587
7588
#: bzrlib/upgrade.py:120
7589
msgid "Deleting backup.bzr"
7590
msgstr ""
7591
7592
#: bzrlib/upgrade.py:151
7593
msgid ""
7594
"\n"
7595
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7596
msgstr ""
7597
7598
#: bzrlib/upgrade.py:208
7599
#, python-format
7600
msgid "Found %d dependent branches - upgrading ..."
7601
msgstr ""
7602
7603
#: bzrlib/upgrade.py:276
7604
msgid "Upgrading bzrdirs"
7605
msgstr ""
7606
7607
#: bzrlib/upgrade.py:282
7608
#, python-format
7609
msgid "Upgrading %s"
7610
msgstr ""
7611
7612
#: bzrlib/upgrade.py:283
7613
msgid "Upgrading {0} {1} ..."
7614
msgstr ""
7615
7616
#: bzrlib/upgrade.py:301
7617
msgid "Removing backup ..."
7618
msgstr ""
7619
7620
#: bzrlib/upgrade.py:305
7621
msgid "failed to clean-up {0}: {1}"
7622
msgstr ""
7623
7624
#: bzrlib/vf_repository.py:1090
7625
msgid "inventories"
7626
msgstr ""
7627
7628
#: bzrlib/vf_repository.py:1116
7629
msgid "texts"
7630
msgstr ""
7631
7632
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7633
msgid "Calculating text parents"
7634
msgstr ""
7635
7636
#: bzrlib/vf_repository.py:1706
7637
msgid "Fetch texts"
7638
msgstr ""
7639
7640
#: bzrlib/vf_repository.py:2535
7641
msgid "loading text store"
7642
msgstr ""
7643
7644
#: bzrlib/vf_repository.py:2541
7645
msgid "checking text graph"
7646
msgstr ""
7647
7648
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7649
#: bzrlib/vf_repository.py:3124
7650
msgid "Transferring revisions"
7651
msgstr ""
7652
7653
#: bzrlib/win32utils.py:146
7654
msgid "Failed to GetProcessMemoryInfo()"
7655
msgstr ""
7656
7657
#: bzrlib/win32utils.py:167
7658
msgid "Cannot debug memory on win32 without ctypes or win32process"
7659
msgstr ""
7660
7661
#: bzrlib/win32utils.py:172
7662
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7663
msgstr ""
7664
7665
#: bzrlib/win32utils.py:180
7666
#, python-format
7667
msgid "WorkingSize %8d KiB"
7668
msgstr ""
7669
7670
#: bzrlib/win32utils.py:181
7671
#, python-format
7672
msgid "PeakWorking %8d KiB"
7673
msgstr ""
7674
7675
#: bzrlib/win32utils.py:182
7676
#, python-format
7677
msgid "PagefileUsage %8d KiB"
7678
msgstr ""
7679
7680
#: bzrlib/win32utils.py:183
7681
#, python-format
7682
msgid "PeakPagefileUsage %8d KiB"
7683
msgstr ""
7684
7685
#: bzrlib/win32utils.py:185
7686
#, python-format
7687
msgid "PrivateUsage %8d KiB"
7688
msgstr ""
7689
7690
#: bzrlib/win32utils.py:186
7691
#, python-format
7692
msgid "PageFaultCount %8d"
7693
msgstr ""
7694
7695
#: bzrlib/workingtree.py:1478
7696
msgid "Rerun update after fixing the conflicts."
7697
msgstr ""
7698
7699
#: dummy/help_topics/authentication/summary.txt:1
7700
msgid "Information on configuring authentication"
7701
msgstr ""
7702
7703
#: dummy/help_topics/basic/detail.txt:1
7704
msgid ""
7705
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7706
"http://bazaar.canonical.com/"
7707
msgstr ""
7708
7709
#: dummy/help_topics/basic/detail.txt:4
7710
msgid ""
7711
"Basic commands:\n"
7712
" bzr init makes this directory a versioned branch\n"
7713
" bzr branch make a copy of another branch"
7714
msgstr ""
7715
7716
#: dummy/help_topics/basic/detail.txt:8
7717
msgid ""
7718
" bzr add make files or directories versioned\n"
7719
" bzr ignore ignore a file or pattern\n"
7720
" bzr mv move or rename a versioned file"
7721
msgstr ""
7722
7723
#: dummy/help_topics/basic/detail.txt:12
7724
msgid ""
7725
" bzr status summarize changes in working copy\n"
7726
" bzr diff show detailed diffs"
7727
msgstr ""
7728
7729
#: dummy/help_topics/basic/detail.txt:15
7730
msgid ""
7731
" bzr merge pull in changes from another branch\n"
7732
" bzr commit save some or all changes\n"
7733
" bzr send send changes via email"
7734
msgstr ""
7735
7736
#: dummy/help_topics/basic/detail.txt:19
7737
msgid ""
7738
" bzr log show history of changes\n"
7739
" bzr check validate storage"
7740
msgstr ""
7741
7742
#: dummy/help_topics/basic/detail.txt:22
7743
msgid ""
7744
" bzr help init more help on e.g. init command\n"
7745
" bzr help commands list all commands\n"
7746
" bzr help topics list all help topics\n"
7747
msgstr ""
7748
7749
#: dummy/help_topics/basic/summary.txt:1
7750
msgid "Basic commands"
7751
msgstr ""
7752
7753
#: dummy/help_topics/branches/detail.txt:1
7754
msgid "Branches"
7755
msgstr ""
7756
7757
#: dummy/help_topics/branches/detail.txt:3
7758
msgid ""
7759
"A branch consists of the state of a project, including all of its\n"
7760
"history. All branches have a repository associated (which is where the\n"
7761
"branch history is stored), but multiple branches may share the same\n"
7762
"repository (a shared repository). Branches can be copied and merged."
7763
msgstr ""
7764
7765
#: dummy/help_topics/branches/detail.txt:8
7766
msgid ""
7767
"In addition, one branch may be bound to another one. Binding to another\n"
7768
"branch indicates that commits which happen in this branch must also \n"
7769
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7770
"commits when the two branches are out of date. In order for a commit \n"
7771
"to succeed, it may be necessary to update the current branch using \n"
7772
"``bzr update``."
7773
msgstr ""
7774
7775
#: dummy/help_topics/branches/detail.txt:15
7776
#: dummy/help_topics/checkouts/detail.txt:66
7777
#: dummy/help_topics/repositories/detail.txt:36
7778
msgid "Related commands::"
7779
msgstr ""
7780
7781
#: dummy/help_topics/branches/detail.txt:17
7782
msgid ""
7783
" init Change a directory into a versioned branch.\n"
7784
" branch Create a new branch that is a copy of an existing branch.\n"
7785
" merge Perform a three-way merge.\n"
7786
" bind Bind a branch to another one.\n"
7787
msgstr ""
7788
7789
#: dummy/help_topics/branches/summary.txt:1
7790
msgid "Information on what a branch is"
7791
msgstr ""
7792
7793
#: dummy/help_topics/bugs/summary.txt:1
7794
msgid "Bug tracker settings"
7795
msgstr ""
7796
7797
#: dummy/help_topics/checkouts/detail.txt:1
7798
msgid "Checkouts"
7799
msgstr ""
7800
7801
#: dummy/help_topics/checkouts/detail.txt:3
7802
msgid ""
7803
"Checkouts are source trees that are connected to a branch, so that when\n"
7804
"you commit in the source tree, the commit goes into that branch. They\n"
7805
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7806
"Bazaar's decentralized features until you want them. Using checkouts\n"
7807
"with shared repositories is very similar to working with SVN or CVS, but\n"
7808
"doesn't have the same restrictions. And using checkouts still allows\n"
7809
"others working on the project to use whatever workflow they like."
7810
msgstr ""
7811
7812
#: dummy/help_topics/checkouts/detail.txt:11
7813
msgid ""
7814
"A checkout is created with the bzr checkout command (see \"help "
7815
"checkout\").\n"
7816
"You pass it a reference to another branch, and it will create a local copy\n"
7817
"for you that still contains a reference to the branch you created the\n"
7818
"checkout from (the master branch). Then if you make any commits they will "
7819
"be\n"
7820
"made on the other branch first. This creates an instant mirror of your work, "
7821
"or\n"
7822
"facilitates lockstep development, where each developer is working together,\n"
7823
"continuously integrating the changes of others."
7824
msgstr ""
7825
7826
#: dummy/help_topics/checkouts/detail.txt:19
7827
msgid ""
7828
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7829
"you have the full history locally. As you have a first class branch you "
7830
"can\n"
7831
"also commit locally if you want, for instance due to the temporary loss af "
7832
"a\n"
7833
"network connection. Use the --local option to commit to do this. All the "
7834
"local\n"
7835
"commits will then be made on the master branch the next time you do a non-"
7836
"local\n"
7837
"commit."
7838
msgstr ""
7839
7840
#: dummy/help_topics/checkouts/detail.txt:26
7841
msgid ""
7842
"If you are using a checkout from a shared branch you will periodically want "
7843
"to\n"
7844
"pull in all the changes made by others. This is done using the \"update\"\n"
7845
"command. The changes need to be applied before any non-local commit, but\n"
7846
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7847
"command when needed."
7848
msgstr ""
7849
7850
#: dummy/help_topics/checkouts/detail.txt:32
7851
msgid ""
7852
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7853
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7854
"SVN checkout in that it is not a first class branch, it mainly consists of "
7855
"the\n"
7856
"working tree. This means that any history operations must query the master\n"
7857
"branch, which could be slow if a network connection is involved. Also, as "
7858
"you\n"
7859
"don't have a local branch, then you cannot commit locally."
7860
msgstr ""
7861
7862
#: dummy/help_topics/checkouts/detail.txt:39
7863
msgid ""
7864
"Lightweight checkouts work best when you have fast reliable access to the\n"
7865
"master branch. This means that if the master branch is on the same disk or "
7866
"LAN\n"
7867
"a lightweight checkout will be faster than a heavyweight one for any "
7868
"commands\n"
7869
"that modify the revision history (as only one copy of the branch needs to\n"
7870
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7871
"that uses the history but does not change it, but if the master branch is "
7872
"on\n"
7873
"the same disk then there won't be a noticeable difference."
7874
msgstr ""
7875
7876
#: dummy/help_topics/checkouts/detail.txt:47
7877
msgid ""
7878
"Another possible use for a checkout is to use it with a treeless repository\n"
7879
"containing your branches, where you maintain only one working tree by\n"
7880
"switching the master branch that the checkout points to when you want to\n"
7881
"work on a different branch."
7882
msgstr ""
7883
7884
#: dummy/help_topics/checkouts/detail.txt:52
7885
msgid ""
7886
"Obviously to commit on a checkout you need to be able to write to the "
7887
"master\n"
7888
"branch. This means that the master branch must be accessible over a "
7889
"writeable\n"
7890
"protocol , such as sftp://, and that you have write permissions at the "
7891
"other\n"
7892
"end. Checkouts also work on the local file system, so that all that matters "
7893
"is\n"
7894
"file permissions."
7895
msgstr ""
7896
7897
#: dummy/help_topics/checkouts/detail.txt:58
7898
msgid ""
7899
"You can change the master of a checkout by using the \"switch\" command "
7900
"(see\n"
7901
"\"help switch\"). This will change the location that the commits are sent "
7902
"to.\n"
7903
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7904
"checkout. If you would like to convert your heavy checkout into a normal\n"
7905
"branch so that every commit is local, you can use the \"unbind\" command. To "
7906
"see\n"
7907
"whether or not a branch is bound or not you can use the \"info\" command. If "
7908
"the\n"
7909
"branch is bound it will tell you the location of the bound branch."
7910
msgstr ""
7911
7912
#: dummy/help_topics/checkouts/detail.txt:68
7913
msgid ""
7914
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7915
" checkout\n"
7916
" update Pull any changes in the master branch in to your checkout\n"
7917
" commit Make a commit that is sent to the master branch. If you have\n"
7918
" a heavy checkout then the --local option will commit to the\n"
7919
" checkout without sending the commit to the master\n"
7920
" switch Change the master branch that the commits in the checkout "
7921
"will\n"
7922
" be sent to\n"
7923
" bind Turn a standalone branch into a heavy checkout so that any\n"
7924
" commits will be sent to the master branch\n"
7925
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7926
" commits are only made locally\n"
7927
" info Displays whether a branch is bound or unbound. If the branch "
7928
"is\n"
7929
" bound, then it will also display the location of the bound "
7930
"branch\n"
7931
msgstr ""
7932
7933
#: dummy/help_topics/checkouts/summary.txt:1
7934
msgid "Information on what a checkout is"
7935
msgstr ""
7936
7937
#: dummy/help_topics/commands/summary.txt:1
7938
msgid "Basic help for all commands"
7939
msgstr ""
7940
7941
#: dummy/help_topics/configuration/summary.txt:1
7942
msgid "Details on the configuration settings available"
7943
msgstr ""
7944
7945
#: dummy/help_topics/conflict-types/summary.txt:1
7946
msgid "Types of conflicts and what to do about them"
7947
msgstr ""
7948
7949
#: dummy/help_topics/content-filters/summary.txt:1
7950
msgid "Conversion of content into/from working trees"
7951
msgstr ""
7952
7953
#: dummy/help_topics/criss-cross/detail.txt:1
7954
msgid "Criss-Cross"
7955
msgstr ""
7956
7957
#: dummy/help_topics/criss-cross/detail.txt:3
7958
msgid ""
7959
"A criss-cross in the branch history can cause the default merge technique\n"
7960
"to emit more conflicts than would normally be expected."
7961
msgstr ""
7962
7963
#: dummy/help_topics/criss-cross/detail.txt:6
7964
msgid ""
7965
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7966
"give\n"
7967
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7968
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7969
msgstr ""
7970
7971
#: dummy/help_topics/criss-cross/detail.txt:10
7972
msgid ""
7973
"Criss-crosses occur in a branch's history if two branches merge the same "
7974
"thing\n"
7975
"and then merge one another, or if two branches merge one another at the "
7976
"same\n"
7977
"time. They can be avoided by having each branch only merge from or into a\n"
7978
"designated central branch (a \"star topology\")."
7979
msgstr ""
7980
7981
#: dummy/help_topics/criss-cross/detail.txt:15
7982
msgid ""
7983
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7984
"default\n"
7985
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7986
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7987
"differences between THIS and OTHER are due to one side adding lines, or\n"
7988
"from another side removing lines."
7989
msgstr ""
7990
7991
#: dummy/help_topics/criss-cross/detail.txt:21
7992
msgid ""
7993
"Criss-crosses mean there is no good choice for a base. Selecting the "
7994
"recent\n"
7995
"merge points could cause one side's changes to be silently discarded.\n"
7996
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7997
"are emitted."
7998
msgstr ""
7999
8000
#: dummy/help_topics/criss-cross/detail.txt:26
8001
msgid ""
8002
"The ``weave`` merge type is not affected by this problem because it uses\n"
8003
"line-origin detection instead of a basis revision to determine the cause of\n"
8004
"differences.\n"
8005
msgstr ""
8006
8007
#: dummy/help_topics/criss-cross/summary.txt:1
8008
msgid "Information on criss-cross merging"
8009
msgstr ""
8010
8011
#: dummy/help_topics/current-formats/summary.txt:1
8012
msgid "Current storage formats"
8013
msgstr ""
8014
8015
#: dummy/help_topics/debug-flags/summary.txt:1
8016
msgid "Options to show or record debug information"
8017
msgstr ""
8018
8019
#: dummy/help_topics/diverged-branches/summary.txt:1
8020
msgid "How to fix diverged branches"
8021
msgstr ""
8022
8023
#: dummy/help_topics/env-variables/detail.txt:1
8024
msgid "Environment Variables"
8025
msgstr ""
8026
8027
#: dummy/help_topics/env-variables/detail.txt:3
8028
msgid ""
8029
"=================== "
8030
"===========================================================\n"
8031
"BZRPATH Path where bzr is to look for shell plugin external\n"
8032
" commands.\n"
8033
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8034
"EMAIL E-Mail address of the user.\n"
8035
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8036
"EDITOR Editor for editing commit messages.\n"
8037
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8038
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8039
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8040
"BZR_PLUGIN_PATH.\n"
8041
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8042
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8043
"and\n"
8044
" HOME.\n"
8045
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8046
"URLs).\n"
8047
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8048
"sshcorp,\n"
8049
" plink or lsh.\n"
8050
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8051
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8052
"BZR_COLUMNS Override implicit terminal width.\n"
8053
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8054
"(selftest)\n"
8055
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8056
"'text'.\n"
8057
"BZR_PDB Control whether to launch a debugger on error.\n"
8058
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8059
" breakin debugger.\n"
8060
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8061
"(instead\n"
8062
" of char-based).\n"
8063
"=================== "
8064
"===========================================================\n"
8065
msgstr ""
8066
8067
#: dummy/help_topics/env-variables/summary.txt:1
8068
msgid "Environment variable names and values"
8069
msgstr ""
8070
8071
#: dummy/help_topics/eol/summary.txt:1
8072
msgid "Information on end-of-line handling"
8073
msgstr ""
8074
8075
#: dummy/help_topics/files/detail.txt:1
8076
msgid "Files"
8077
msgstr ""
8078
8079
#: dummy/help_topics/files/detail.txt:3
8080
msgid ""
8081
":On Unix: ~/.bazaar/bazaar.conf\n"
8082
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8083
"bazaar\\\\2.0\\\\bazaar.conf"
8084
msgstr ""
8085
8086
#: dummy/help_topics/files/detail.txt:6
8087
msgid ""
8088
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8089
"used to define general configuration that will be applied everywhere.\n"
8090
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8091
"commonly used options."
8092
msgstr ""
8093
8094
#: dummy/help_topics/files/detail.txt:11
8095
msgid "A typical config file might look something like::"
8096
msgstr ""
8097
8098
#: dummy/help_topics/files/detail.txt:13
8099
msgid ""
8100
" [DEFAULT]\n"
8101
" email=John Doe <jdoe@isp.com>"
8102
msgstr ""
8103
8104
#: dummy/help_topics/files/detail.txt:16
8105
msgid ""
8106
" [ALIASES]\n"
8107
" commit = commit --strict\n"
8108
" log10 = log --short -r -10..-1\n"
8109
msgstr ""
8110
8111
#: dummy/help_topics/files/summary.txt:1
8112
msgid "Information on configuration and log files"
8113
msgstr ""
8114
8115
#: dummy/help_topics/formats/detail.txt:1
8116
msgid "Storage Formats"
8117
msgstr ""
8118
8119
#: dummy/help_topics/formats/detail.txt:3
8120
msgid ""
8121
"To ensure that older clients do not access data incorrectly,\n"
8122
"Bazaar's policy is to introduce a new storage format whenever\n"
8123
"new features requiring new metadata are added. New storage\n"
8124
"formats may also be introduced to improve performance and\n"
8125
"scalability."
8126
msgstr ""
8127
8128
#: dummy/help_topics/formats/detail.txt:9
8129
msgid ""
8130
"The newest format, 2a, is highly recommended. If your\n"
8131
"project is not using 2a, then you should suggest to the\n"
8132
"project owner to upgrade."
8133
msgstr ""
8134
8135
#: dummy/help_topics/formats/detail.txt:13
8136
msgid ""
8137
"\n"
8138
".. note::"
8139
msgstr ""
8140
8141
#: dummy/help_topics/formats/detail.txt:16
8142
msgid ""
8143
" Some of the older formats have two variants:\n"
8144
" a plain one and a rich-root one. The latter include an additional\n"
8145
" field about the root of the tree. There is no performance cost\n"
8146
" for using a rich-root format but you cannot easily merge changes\n"
8147
" from a rich-root format into a plain format. As a consequence,\n"
8148
" moving a project to a rich-root format takes some co-ordination\n"
8149
" in that all contributors need to upgrade their repositories\n"
8150
" around the same time. 2a and all future formats will be\n"
8151
" implicitly rich-root."
8152
msgstr ""
8153
8154
#: dummy/help_topics/formats/detail.txt:26
8155
msgid ""
8156
"See :doc:`current-formats-help` for the complete list of\n"
8157
"currently supported formats. See :doc:`other-formats-help` for\n"
8158
"descriptions of any available experimental and deprecated formats.\n"
8159
msgstr ""
8160
8161
#: dummy/help_topics/formats/summary.txt:1
8162
msgid "Information on choosing a storage format"
8163
msgstr ""
8164
8165
#: dummy/help_topics/global-options/detail.txt:1
8166
msgid "Global Options"
8167
msgstr ""
8168
8169
#: dummy/help_topics/global-options/detail.txt:3
8170
msgid ""
8171
"These options may be used with any command, and may appear in front of any\n"
8172
"command. (e.g. ``bzr --profile help``)."
8173
msgstr ""
8174
8175
#: dummy/help_topics/global-options/detail.txt:6
8176
msgid ""
8177
"--version Print the version number. Must be supplied before the "
8178
"command.\n"
8179
"--no-aliases Do not process command aliases when running this command.\n"
8180
"--builtin Use the built-in version of a command, not the plugin "
8181
"version.\n"
8182
" This does not suppress other plugin effects.\n"
8183
"--no-plugins Do not process any plugins.\n"
8184
"--no-l10n Do not translate messages.\n"
8185
"--concurrency Number of processes that can be run concurrently (selftest)."
8186
msgstr ""
8187
8188
#: dummy/help_topics/global-options/detail.txt:14
8189
msgid ""
8190
"--profile Profile execution using the hotshot profiler.\n"
8191
"--lsprof Profile execution using the lsprof profiler.\n"
8192
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8193
" results to a specified file. If the filename ends with "
8194
"\".txt\",\n"
8195
" text format will be used. If the filename either starts "
8196
"with\n"
8197
" \"callgrind.out\" or end with \".callgrind\", the output will "
8198
"be\n"
8199
" formatted for use with KCacheGrind. Otherwise, the output\n"
8200
" will be a pickle.\n"
8201
"--coverage Generate line coverage report in the specified directory."
8202
msgstr ""
8203
8204
#: dummy/help_topics/global-options/detail.txt:24
8205
msgid ""
8206
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8207
"for\n"
8208
" the duration of the command. This can be used multiple times "
8209
"if\n"
8210
" several options need to be overridden."
8211
msgstr ""
8212
8213
#: dummy/help_topics/global-options/detail.txt:28
8214
msgid ""
8215
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8216
"information on profiling."
8217
msgstr ""
8218
8219
#: dummy/help_topics/global-options/detail.txt:31
8220
msgid ""
8221
"A number of debug flags are also available to assist troubleshooting and\n"
8222
"development. See :doc:`debug-flags-help`.\n"
8223
msgstr ""
8224
8225
#: dummy/help_topics/global-options/summary.txt:1
8226
msgid "Options that control how Bazaar runs"
8227
msgstr ""
8228
8229
#: dummy/help_topics/hidden-commands/summary.txt:1
8230
msgid "All hidden commands"
8231
msgstr ""
8232
8233
#: dummy/help_topics/hooks/summary.txt:1
8234
msgid "Points at which custom processing can be added"
8235
msgstr ""
8236
8237
#: dummy/help_topics/launchpad/detail.txt:1
8238
msgid "Integration with Launchpad.net"
8239
msgstr ""
8240
8241
#: dummy/help_topics/launchpad/detail.txt:3
8242
msgid ""
8243
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8244
"specification tracking."
8245
msgstr ""
8246
8247
#: dummy/help_topics/launchpad/detail.txt:6
8248
msgid ""
8249
"The bzr client (through the plugin called 'launchpad') has special\n"
8250
"features to communicate with Launchpad:"
8251
msgstr ""
8252
8253
#: dummy/help_topics/launchpad/detail.txt:9
8254
msgid ""
8255
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8256
"This\n"
8257
" is then used by the 'lp:' transport to download your branches using\n"
8258
" bzr+ssh://."
8259
msgstr ""
8260
8261
#: dummy/help_topics/launchpad/detail.txt:13
8262
msgid ""
8263
" * The 'lp:' transport uses Launchpad as a directory service: for "
8264
"example\n"
8265
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8266
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8267
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8268
msgstr ""
8269
8270
#: dummy/help_topics/launchpad/detail.txt:18
8271
msgid ""
8272
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8273
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8274
"lp:12345'\n"
8275
" will record a revision property that marks that revision as fixing\n"
8276
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8277
" automatically be linked to the bug report."
8278
msgstr ""
8279
8280
#: dummy/help_topics/launchpad/detail.txt:24
8281
msgid ""
8282
" * The register-branch command tells Launchpad about the url of a\n"
8283
" public branch. Launchpad will then mirror the branch, display\n"
8284
" its contents and allow it to be attached to bugs and other\n"
8285
" objects."
8286
msgstr ""
8287
8288
#: dummy/help_topics/launchpad/detail.txt:29
8289
msgid "For more information see http://help.launchpad.net/\n"
8290
msgstr ""
8291
8292
#: dummy/help_topics/launchpad/summary.txt:1
8293
msgid "Using Bazaar with Launchpad.net"
8294
msgstr ""
8295
8296
#: dummy/help_topics/location-alias/summary.txt:1
8297
msgid "Aliases for remembered locations"
8298
msgstr ""
8299
8300
#: dummy/help_topics/log-formats/summary.txt:1
8301
msgid "Details on the logging formats available"
8302
msgstr ""
8303
8304
#: dummy/help_topics/other-formats/summary.txt:1
8305
msgid "Experimental and deprecated storage formats"
8306
msgstr ""
8307
8308
#: dummy/help_topics/patterns/summary.txt:1
8309
msgid "Information on the pattern syntax"
8310
msgstr ""
8311
8312
#: dummy/help_topics/repositories/detail.txt:1
8313
msgid "Repositories"
8314
msgstr ""
8315
8316
#: dummy/help_topics/repositories/detail.txt:3
8317
msgid ""
8318
"Repositories in Bazaar are where committed information is stored. There is\n"
8319
"a repository associated with every branch."
8320
msgstr ""
8321
8322
#: dummy/help_topics/repositories/detail.txt:6
8323
msgid ""
8324
"Repositories are a form of database. Bzr will usually maintain this for\n"
8325
"good performance automatically, but in some situations (e.g. when doing\n"
8326
"very many commits in a short time period) you may want to ask bzr to\n"
8327
"optimise the database indices. This can be done by the 'bzr pack' command."
8328
msgstr ""
8329
8330
#: dummy/help_topics/repositories/detail.txt:11
8331
msgid ""
8332
"By default just running 'bzr init' will create a repository within the new\n"
8333
"branch but it is possible to create a shared repository which allows "
8334
"multiple\n"
8335
"branches to share their information in the same location. When a new branch "
8336
"is\n"
8337
"created it will first look to see if there is a containing shared repository "
8338
"it\n"
8339
"can use."
8340
msgstr ""
8341
8342
#: dummy/help_topics/repositories/detail.txt:17
8343
msgid ""
8344
"When two branches of the same project share a repository, there is\n"
8345
"generally a large space saving. For some operations (e.g. branching\n"
8346
"within the repository) this translates in to a large time saving."
8347
msgstr ""
8348
8349
#: dummy/help_topics/repositories/detail.txt:21
8350
msgid ""
8351
"To create a shared repository use the init-repository command (or the alias\n"
8352
"init-repo). This command takes the location of the repository to create. "
8353
"This\n"
8354
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8355
"which contains a shared repository. Any new branches that are created in "
8356
"this\n"
8357
"directory will then use it for storage."
8358
msgstr ""
8359
8360
#: dummy/help_topics/repositories/detail.txt:27
8361
msgid ""
8362
"It is a good idea to create a repository whenever you might create more\n"
8363
"than one branch of a project. This is true for both working areas where you\n"
8364
"are doing the development, and any server areas that you use for hosting\n"
8365
"projects. In the latter case, it is common to want branches without working\n"
8366
"trees. Since the files in the branch will not be edited directly there is "
8367
"no\n"
8368
"need to use up disk space for a working tree. To create a repository in "
8369
"which\n"
8370
"the branches will not have working trees pass the '--no-trees' option to\n"
8371
"'init-repository'."
8372
msgstr ""
8373
8374
#: dummy/help_topics/repositories/detail.txt:38
8375
msgid ""
8376
" init-repository Create a shared repository. Use --no-trees to create "
8377
"one\n"
8378
" in which new branches won't get a working tree.\n"
8379
msgstr ""
8380
8381
#: dummy/help_topics/repositories/summary.txt:1
8382
msgid "Basic information on shared repositories."
8383
msgstr ""
8384
8385
#: dummy/help_topics/revisionspec/summary.txt:1
8386
msgid "Explain how to use --revision"
8387
msgstr ""
8388
8389
#: dummy/help_topics/rules/summary.txt:1
8390
msgid "Information on defining rule-based preferences"
8391
msgstr ""
8392
8393
#: dummy/help_topics/standalone-trees/detail.txt:1
8394
msgid "Standalone Trees"
8395
msgstr ""
8396
8397
#: dummy/help_topics/standalone-trees/detail.txt:3
8398
msgid ""
8399
"A standalone tree is a working tree with an associated repository. It\n"
8400
"is an independently usable branch, with no dependencies on any other.\n"
8401
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8402
"an existing project under version control."
8403
msgstr ""
8404
8405
#: dummy/help_topics/standalone-trees/detail.txt:8
8406
msgid "Related Commands::"
8407
msgstr ""
8408
8409
#: dummy/help_topics/standalone-trees/detail.txt:10
8410
msgid " init Make a directory into a versioned branch.\n"
8411
msgstr ""
8412
8413
#: dummy/help_topics/standalone-trees/summary.txt:1
8414
msgid "Information on what a standalone tree is"
8415
msgstr ""
8416
8417
#: dummy/help_topics/standard-options/detail.txt:1
8418
msgid "Standard Options"
8419
msgstr ""
8420
8421
#: dummy/help_topics/standard-options/detail.txt:3
8422
msgid "Standard options are legal for all commands."
8423
msgstr ""
8424
8425
#: dummy/help_topics/standard-options/detail.txt:5
8426
msgid ""
8427
"--help, -h Show help message.\n"
8428
"--verbose, -v Display more information.\n"
8429
"--quiet, -q Only display errors and warnings."
8430
msgstr ""
8431
8432
#: dummy/help_topics/standard-options/detail.txt:9
8433
msgid "Unlike global options, standard options can be used in aliases.\n"
8434
msgstr ""
8435
8436
#: dummy/help_topics/standard-options/summary.txt:1
8437
msgid "Options that can be used with any command"
8438
msgstr ""
8439
8440
#: dummy/help_topics/status-flags/detail.txt:1
8441
msgid "Status Flags"
8442
msgstr ""
8443
8444
#: dummy/help_topics/status-flags/detail.txt:3
8445
msgid ""
8446
"Status flags are used to summarise changes to the working tree in a concise\n"
8447
"manner. They are in the form::"
8448
msgstr ""
8449
8450
#: dummy/help_topics/status-flags/detail.txt:6
8451
msgid " xxx <filename>"
8452
msgstr ""
8453
8454
#: dummy/help_topics/status-flags/detail.txt:8
8455
msgid "where the columns' meanings are as follows."
8456
msgstr ""
8457
8458
#: dummy/help_topics/status-flags/detail.txt:10
8459
msgid "Column 1 - versioning/renames::"
8460
msgstr ""
8461
8462
#: dummy/help_topics/status-flags/detail.txt:12
8463
msgid ""
8464
" + File versioned\n"
8465
" - File unversioned\n"
8466
" R File renamed\n"
8467
" ? File unknown\n"
8468
" X File nonexistent (and unknown to bzr)\n"
8469
" C File has conflicts\n"
8470
" P Entry for a pending merge (not a file)"
8471
msgstr ""
8472
8473
#: dummy/help_topics/status-flags/detail.txt:20
8474
msgid "Column 2 - contents::"
8475
msgstr ""
8476
8477
#: dummy/help_topics/status-flags/detail.txt:22
8478
msgid ""
8479
" N File created\n"
8480
" D File deleted\n"
8481
" K File kind changed\n"
8482
" M File modified"
8483
msgstr ""
8484
8485
#: dummy/help_topics/status-flags/detail.txt:27
8486
msgid "Column 3 - execute::"
8487
msgstr ""
8488
8489
#: dummy/help_topics/status-flags/detail.txt:29
8490
msgid " * The execute bit was changed\n"
8491
msgstr ""
8492
8493
#: dummy/help_topics/status-flags/summary.txt:1
8494
msgid "Help on status flags"
8495
msgstr ""
8496
8497
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8498
msgid "Branches Out of Sync"
8499
msgstr ""
8500
8501
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8502
msgid ""
8503
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8504
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8505
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8506
"have the same last revision as the new reference branch for the lightweight\n"
8507
"checkout, data could be lost, so Bazaar refuses."
8508
msgstr ""
8509
8510
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8511
msgid "How you deal with this depends on *why* the branches are out of sync."
8512
msgstr ""
8513
8514
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8515
msgid ""
8516
"If you have a checkout and have done local commits, you can get back in "
8517
"sync\n"
8518
"by running \"bzr update\" (and possibly \"bzr commit\")."
8519
msgstr ""
8520
8521
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8522
msgid ""
8523
"If you have a branch and the remote branch is out-of-date, you can push\n"
8524
"the local changes using \"bzr push\". If the local branch is out of date, "
8525
"you\n"
8526
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8527
"commit\n"
8528
"and then push your changes. If you decide that some of the changes aren't\n"
8529
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8530
msgstr ""
8531
8532
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8533
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8534
msgstr ""
8535
8536
#: dummy/help_topics/topics/summary.txt:1
8537
msgid "Topics list"
8538
msgstr ""
8539
8540
#: dummy/help_topics/url-special-chars/summary.txt:1
8541
msgid "Special character handling in URLs"
8542
msgstr ""
8543
8544
#: dummy/help_topics/urlspec/summary.txt:1
8545
msgid "Supported transport protocols"
8546
msgstr ""
8547
8548
#: dummy/help_topics/working-trees/detail.txt:1
8549
msgid "Working Trees"
8550
msgstr ""
8551
8552
#: dummy/help_topics/working-trees/detail.txt:3
8553
msgid ""
8554
"A working tree is the contents of a branch placed on disk so that you can\n"
8555
"see the files and edit them. The working tree is where you make changes to "
8556
"a\n"
8557
"branch, and when you commit the current state of the working tree is the\n"
8558
"snapshot that is recorded in the commit."
8559
msgstr ""
8560
8561
#: dummy/help_topics/working-trees/detail.txt:8
8562
msgid ""
8563
"When you push a branch to a remote system, a working tree will not be\n"
8564
"created. If one is already present the files will not be updated. The\n"
8565
"branch information will be updated and the working tree will be marked\n"
8566
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8567
"may be uncommitted changes or the update may cause content conflicts that "
8568
"are\n"
8569
"difficult to deal with remotely."
8570
msgstr ""
8571
8572
#: dummy/help_topics/working-trees/detail.txt:15
8573
msgid ""
8574
"If you have a branch with no working tree you can use the 'checkout' "
8575
"command\n"
8576
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8577
"will\n"
8578
"create the working tree. If the branch is updated remotely, you can update "
8579
"the\n"
8580
"working tree by running 'bzr update' in that directory."
8581
msgstr ""
8582
8583
#: dummy/help_topics/working-trees/detail.txt:20
8584
msgid ""
8585
"If you have a branch with a working tree that you do not want the 'remove-"
8586
"tree'\n"
8587
"command will remove the tree if it is safe. This can be done to avoid the\n"
8588
"warning about the remote working tree not being updated when pushing to the\n"
8589
"branch. It can also be useful when working with a '--no-trees' repository\n"
8590
"(see 'bzr help repositories')."
8591
msgstr ""
8592
8593
#: dummy/help_topics/working-trees/detail.txt:26
8594
msgid ""
8595
"If you want to have a working tree on a remote machine that you push to you\n"
8596
"can either run 'bzr update' in the remote branch after each push, or use "
8597
"some\n"
8598
"other method to update the tree during the push. There is an 'rspush' "
8599
"plugin\n"
8600
"that will update the working tree using rsync as well as doing a push. "
8601
"There\n"
8602
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8603
"SSH\n"
8604
"after each push."
8605
msgstr ""
8606
8607
#: dummy/help_topics/working-trees/detail.txt:33
8608
msgid "Useful commands::"
8609
msgstr ""
8610
8611
#: dummy/help_topics/working-trees/detail.txt:35
8612
msgid ""
8613
" checkout Create a working tree when a branch does not have one.\n"
8614
" remove-tree Removes the working tree from a branch when it is safe to do "
8615
"so.\n"
8616
" update When a working tree is out of sync with its associated "
8617
"branch\n"
8618
" this will update the tree to match the branch.\n"
8619
msgstr ""
8620
8621
#: dummy/help_topics/working-trees/summary.txt:1
8622
msgid "Information on working trees"
8623
msgstr ""
8624
8625
#: en/help_topics/authentication.txt:1
8626
msgid ""
8627
"Authentication Settings\n"
8628
"======================="
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:4
8632
msgid ""
8633
"\n"
8634
"Intent\n"
8635
"------"
8636
msgstr ""
8637
8638
#: en/help_topics/authentication.txt:8
8639
msgid ""
8640
"Many different authentication policies can be described in the\n"
8641
"``authentication.conf`` file but a particular user should need only a few\n"
8642
"definitions to cover his needs without having to specify a user and a "
8643
"password\n"
8644
"for every branch he uses."
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:13
8648
msgid ""
8649
"The definitions found in this file are used to find the credentials to use "
8650
"for\n"
8651
"a given url. The same credentials can generally be used for as many branches "
8652
"as\n"
8653
"possible by grouping their declaration around the remote servers that need\n"
8654
"them. It's even possible to declare credentials that will be used by "
8655
"different\n"
8656
"servers."
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:19
8660
msgid ""
8661
"The intent is to make this file as small as possible to minimize maintenance."
8662
msgstr ""
8663
8664
#: en/help_topics/authentication.txt:21
8665
msgid ""
8666
"Once the relevant credentials are declared in this file you may use branch "
8667
"urls\n"
8668
"without embedding passwords (security hazard) or even users (enabling "
8669
"sharing\n"
8670
"of your urls with others)."
8671
msgstr ""
8672
8673
#: en/help_topics/authentication.txt:25
8674
msgid "Instead of using::"
8675
msgstr "Em vez de usar::"
8676
8677
#: en/help_topics/authentication.txt:27
8678
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8679
msgstr " bzr branch ftp://joe:secret@host.com/caminho/para/meu/ramo"
8680
8681
#: en/help_topics/authentication.txt:29
8682
msgid "you simply use::"
8683
msgstr "você simplesmente usa::"
8684
8685
#: en/help_topics/authentication.txt:31
8686
msgid " bzr branch ftp://host.com/path/to/my/branch"
8687
msgstr " bzr branch ftp://host.com/caminho/para/meu/ramo"
8688
8689
#: en/help_topics/authentication.txt:33
8690
msgid ""
8691
"provided you have created the following ``authentication.conf`` file::"
8692
msgstr ""
8693
8694
#: en/help_topics/authentication.txt:35
8695
msgid ""
8696
" [myprojects]\n"
8697
" scheme=ftp\n"
8698
" host=host.com\n"
8699
" user=joe\n"
8700
" password=secret\n"
8701
" "
8702
msgstr ""
8703
8704
#: en/help_topics/authentication.txt:42
8705
msgid ""
8706
"Authentication definitions\n"
8707
"--------------------------"
8708
msgstr ""
8709
8710
#: en/help_topics/authentication.txt:45
8711
msgid ""
8712
"There are two kinds of authentication used by the various schemes supported "
8713
"by\n"
8714
"bzr:"
8715
msgstr ""
8716
8717
#: en/help_topics/authentication.txt:48
8718
msgid "1. user and password"
8719
msgstr ""
8720
8721
#: en/help_topics/authentication.txt:50
8722
msgid ""
8723
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8724
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8725
"ssh agents are a better, more secure solution. So we have chosen to not "
8726
"provide\n"
8727
"our own less secure method."
8728
msgstr ""
8729
8730
#: en/help_topics/authentication.txt:55
8731
msgid "2. user, realm and password"
8732
msgstr ""
8733
8734
#: en/help_topics/authentication.txt:57
8735
msgid ""
8736
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8737
"against a host. But, by using ``.htaccess`` files, for example, it is "
8738
"possible\n"
8739
"to define several (``user, realm, password``) for a given ``host``. So what "
8740
"is\n"
8741
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8742
"is\n"
8743
"not taken into account in the definitions, but will displayed if bzr "
8744
"prompts\n"
8745
"you for a password."
8746
msgstr ""
8747
8748
#: en/help_topics/authentication.txt:64
8749
msgid ""
8750
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8751
"specifying the appropriate port."
8752
msgstr ""
8753
8754
#: en/help_topics/authentication.txt:67
8755
msgid ""
8756
"To take all schemes into account, the password will be deduced from a set "
8757
"of\n"
8758
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8759
"``user``,\n"
8760
"``password``)."
8761
msgstr ""
8762
8763
#: en/help_topics/authentication.txt:71
8764
msgid ""
8765
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8766
"used\n"
8767
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8768
"``ssh``\n"
8769
" should be used instead since this is the real scheme regarding\n"
8770
" authentication,"
8771
msgstr ""
8772
8773
#: en/help_topics/authentication.txt:76
8774
msgid " * ``host``: can be empty (to act as a default for any host),"
8775
msgstr ""
8776
8777
#: en/help_topics/authentication.txt:78
8778
msgid ""
8779
" * ``port`` can be empty (useful when an host provides several servers for "
8780
"the\n"
8781
" same scheme), only numerical values are allowed, this should be used "
8782
"only\n"
8783
" when the server uses a port different than the scheme standard port,"
8784
msgstr ""
8785
8786
#: en/help_topics/authentication.txt:82
8787
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:84
8791
msgid ""
8792
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8793
" ``getpass.get_user()``),"
8794
msgstr ""
8795
8796
#: en/help_topics/authentication.txt:87
8797
msgid ""
8798
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8799
" password."
8800
msgstr ""
8801
8802
#: en/help_topics/authentication.txt:90
8803
msgid ""
8804
"Multiple definitions can be provided and, for a given URL, bzr will select "
8805
"a\n"
8806
"(``user`` [, ``password``]) based on the following rules :"
8807
msgstr ""
8808
8809
#: en/help_topics/authentication.txt:93
8810
msgid " 1. the first match wins,"
8811
msgstr ""
8812
8813
#: en/help_topics/authentication.txt:95
8814
msgid " 2. empty fields match everything,"
8815
msgstr ""
8816
8817
#: en/help_topics/authentication.txt:97
8818
msgid ""
8819
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8820
msgstr ""
8821
8822
#: en/help_topics/authentication.txt:99
8823
msgid ""
8824
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8825
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8826
"``projectbzr.sf.net``\n"
8827
" will not match ``bzr.sf.net``)."
8828
msgstr ""
8829
8830
#: en/help_topics/authentication.txt:103
8831
msgid ""
8832
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8833
msgstr ""
8834
8835
#: en/help_topics/authentication.txt:105
8836
msgid ""
8837
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8838
"above,\n"
8839
" empty paths will match any provided path)."
8840
msgstr ""
8841
8842
#: en/help_topics/authentication.txt:110
8843
msgid ""
8844
"File format\n"
8845
"-----------"
8846
msgstr ""
8847
8848
#: en/help_topics/authentication.txt:113
8849
msgid ""
8850
"The general rules for :doc:`configuration files <configuration-help>`\n"
8851
"apply except for the variable policies."
8852
msgstr ""
8853
8854
#: en/help_topics/authentication.txt:116
8855
msgid "Each section describes an authentication definition."
8856
msgstr ""
8857
8858
#: en/help_topics/authentication.txt:118
8859
msgid ""
8860
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8861
"reserved\n"
8862
"and should appear as the *last* section."
8863
msgstr ""
8864
8865
#: en/help_topics/authentication.txt:121
8866
msgid "Each section should define:"
8867
msgstr ""
8868
8869
#: en/help_topics/authentication.txt:123
8870
msgid "* ``user``: the login to be used,"
8871
msgstr ""
8872
8873
#: en/help_topics/authentication.txt:125
8874
msgid "Each section could define:"
8875
msgstr ""
8876
8877
#: en/help_topics/authentication.txt:127
8878
msgid "* ``host``: the remote server,"
8879
msgstr ""
8880
8881
#: en/help_topics/authentication.txt:129
8882
msgid "* ``port``: the port the server is listening,"
8883
msgstr ""
8884
8885
#: en/help_topics/authentication.txt:131
8886
msgid "* ``path``: the branch location,"
8887
msgstr ""
8888
8889
#: en/help_topics/authentication.txt:133
8890
msgid "* ``password``: the password."
8891
msgstr ""
8892
8893
#: en/help_topics/authentication.txt:135
8894
msgid ""
8895
"\n"
8896
"Examples\n"
8897
"--------"
8898
msgstr ""
8899
8900
#: en/help_topics/authentication.txt:139
8901
msgid ""
8902
"\n"
8903
"Personal projects hosted outside\n"
8904
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8905
msgstr ""
8906
8907
#: en/help_topics/authentication.txt:143
8908
msgid ""
8909
"All connections are done with the same ``user`` (the remote one for which "
8910
"the\n"
8911
"default bzr one is not appropriate) and the password is always prompted "
8912
"with\n"
8913
"some exceptions::"
8914
msgstr ""
8915
8916
#: en/help_topics/authentication.txt:147
8917
msgid ""
8918
" # Pet projects on hobby.net\n"
8919
" [hobby]\n"
8920
" host=r.hobby.net\n"
8921
" user=jim\n"
8922
" password=obvious1234\n"
8923
" \n"
8924
" # Home server\n"
8925
" [home]\n"
8926
" scheme=https\n"
8927
" host=home.net\n"
8928
" user=joe\n"
8929
" password=1essobV10us\n"
8930
" \n"
8931
" [DEFAULT]\n"
8932
" # Our local user is barbaz, on all remote sites we're known as "
8933
"foobar\n"
8934
" user=foobar"
8935
msgstr ""
8936
8937
#: en/help_topics/authentication.txt:164
8938
msgid ""
8939
"\n"
8940
"Source hosting provider\n"
8941
"~~~~~~~~~~~~~~~~~~~~~~~"
8942
msgstr ""
8943
8944
#: en/help_topics/authentication.txt:168
8945
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8946
msgstr ""
8947
8948
#: en/help_topics/authentication.txt:170
8949
msgid ""
8950
" [shpnet domain]\n"
8951
" # we use sftp, but ssh is the scheme used for authentication\n"
8952
" scheme=ssh\n"
8953
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8954
" host=.shp.net\n"
8955
" user=joe\n"
8956
" # bzr don't support supplying a password for sftp,\n"
8957
" # consider using an ssh agent if you don't want to supply\n"
8958
" # a password interactively. (pageant, ssh-agent, etc)"
8959
msgstr ""
8960
8961
#: en/help_topics/authentication.txt:180
8962
msgid ""
8963
"HTTPS, SFTP servers and their proxy\n"
8964
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8965
msgstr ""
8966
8967
#: en/help_topics/authentication.txt:183
8968
msgid ""
8969
"At company.com, the server hosting release and integration branches is "
8970
"behind a\n"
8971
"proxy, and the two branches use different authentication policies::"
8972
msgstr ""
8973
8974
#: en/help_topics/authentication.txt:186
8975
msgid ""
8976
" [reference code]\n"
8977
" scheme=https\n"
8978
" host=dev.company.com\n"
8979
" path=/dev\n"
8980
" user=user1\n"
8981
" password=pass1"
8982
msgstr ""
8983
8984
#: en/help_topics/authentication.txt:193
8985
msgid ""
8986
" # development branches on dev server\n"
8987
" [dev]\n"
8988
" scheme=ssh # bzr+ssh and sftp are available here\n"
8989
" host=dev.company.com\n"
8990
" path=/dev/integration\n"
8991
" user=user2\n"
8992
" \n"
8993
" # proxy\n"
8994
" [proxy]\n"
8995
" scheme=http\n"
8996
" host=proxy.company.com\n"
8997
" port=3128\n"
8998
" user=proxyuser1\n"
8999
" password=proxypass1"
9000
msgstr ""
9001
9002
#: en/help_topics/authentication.txt:208
9003
msgid ""
9004
"\n"
9005
"Planned enhancements\n"
9006
"--------------------"
9007
msgstr ""
9008
9009
#: en/help_topics/authentication.txt:212
9010
msgid ""
9011
"The following are not yet implemented but planned as parts of a work in\n"
9012
"progress:"
9013
msgstr ""
9014
9015
#: en/help_topics/authentication.txt:215
9016
msgid "* add a ``password_encoding`` field allowing:"
9017
msgstr ""
9018
9019
#: en/help_topics/authentication.txt:217
9020
msgid ""
9021
" - storing the passwords in various obfuscating encodings (base64 for one),"
9022
msgstr ""
9023
9024
#: en/help_topics/authentication.txt:219
9025
msgid " - delegate password storage to plugins (.netrc for example)."
9026
msgstr ""
9027
9028
#: en/help_topics/authentication.txt:221
9029
msgid ""
9030
"* update the credentials when the user is prompted for user or password,"
9031
msgstr ""
9032
9033
#: en/help_topics/authentication.txt:223
9034
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9035
msgstr ""
9036
9037
#: en/help_topics/authentication.txt:225
9038
msgid ""
9039
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9040
"but\n"
9041
"ignored in the actual implementation.\n"
9042
msgstr ""
9043
9044
#: en/help_topics/bugs.txt:1
9045
msgid "Bug Tracker Settings"
9046
msgstr ""
9047
9048
#: en/help_topics/bugs.txt:3
9049
msgid ""
9050
"When making a commit, metadata about bugs fixed by that change can be\n"
9051
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9052
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9053
"(The only ``status`` value currently supported is ``fixed.``)"
9054
msgstr ""
9055
9056
#: en/help_topics/bugs.txt:8
9057
msgid ""
9058
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9059
"identifier\n"
9060
"rather than a full URL. This looks like::"
9061
msgstr ""
9062
"A opção ``--fixes`` permite a você especificar um rastreador de bug e um "
9063
"identificador de bug\n"
9064
"em vez de uma URL completa. Isso parece::"
9065
9066
#: en/help_topics/bugs.txt:11
9067
msgid " bzr commit --fixes <tracker>:<id>"
9068
msgstr " bzr commit --fixes <tracker>:<id>"
9069
9070
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9071
msgid "or::"
9072
msgstr "ou::"
9073
9074
#: en/help_topics/bugs.txt:15
9075
msgid " bzr commit --fixes <id>"
9076
msgstr " bzr commit --fixes <id>"
9077
9078
#: en/help_topics/bugs.txt:17
9079
msgid ""
9080
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9081
"the\n"
9082
"identifier for that bug within the bugtracker, usually the bug number.\n"
9083
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9084
"or global configuration is used."
9085
msgstr ""
9086
9087
#: en/help_topics/bugs.txt:22
9088
msgid ""
9089
"Bazaar knows about a few bug trackers that have many users. If\n"
9090
"you use one of these bug trackers then there is no setup required to\n"
9091
"use this feature, you just need to know the tracker identifier to use.\n"
9092
"These are the bugtrackers that are built in:"
9093
msgstr ""
9094
9095
#: en/help_topics/bugs.txt:27
9096
msgid ""
9097
" ============================ ============ ============\n"
9098
" URL Abbreviation Example\n"
9099
" ============================ ============ ============\n"
9100
" https://bugs.launchpad.net/ lp lp:12345\n"
9101
" http://bugs.debian.org/ deb deb:12345\n"
9102
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9103
" ============================ ============ ============"
9104
msgstr ""
9105
9106
#: en/help_topics/bugs.txt:35
9107
msgid ""
9108
"For the bug trackers not listed above configuration is required.\n"
9109
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9110
"is built in, along with a template mechanism for other bugtrackers with\n"
9111
"simple URL schemes. If your bug tracker can't be described by one\n"
9112
"of the schemes described below then you can write a plugin to support\n"
9113
"it."
9114
msgstr ""
9115
9116
#: en/help_topics/bugs.txt:42
9117
msgid ""
9118
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9119
"variable which contains the base URL of the bug tracker. These options\n"
9120
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9121
"configuration section in ``locations.conf``. You can set up these values\n"
9122
"for each of the projects you work on."
9123
msgstr ""
9124
9125
#: en/help_topics/bugs.txt:48
9126
msgid ""
9127
"Note: As you provide a short name for each tracker, you can specify one or\n"
9128
"more bugs in one or more trackers at commit time if you wish."
9129
msgstr ""
9130
9131
#: en/help_topics/bugs.txt:51
9132
msgid ""
9133
"Launchpad\n"
9134
"---------"
9135
msgstr ""
9136
"Launchpad\n"
9137
"---------"
9138
9139
#: en/help_topics/bugs.txt:54
9140
msgid ""
9141
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9142
msgstr ""
9143
9144
#: en/help_topics/bugs.txt:56
9145
msgid ""
9146
"bugzilla_<tracker>_url\n"
9147
"----------------------"
9148
msgstr ""
9149
9150
#: en/help_topics/bugs.txt:59
9151
msgid ""
9152
"If present, the location of the Bugzilla bug tracker referred to by\n"
9153
"<tracker>. This option can then be used together with ``bzr commit\n"
9154
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9155
"example::"
9156
msgstr ""
9157
9158
#: en/help_topics/bugs.txt:64
9159
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9160
msgstr ""
9161
9162
#: en/help_topics/bugs.txt:66
9163
msgid ""
9164
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9165
"fixed."
9166
msgstr ""
9167
9168
#: en/help_topics/bugs.txt:69
9169
msgid ""
9170
"trac_<tracker>_url\n"
9171
"------------------"
9172
msgstr ""
9173
9174
#: en/help_topics/bugs.txt:72
9175
msgid ""
9176
"If present, the location of the Trac instance referred to by\n"
9177
"<tracker>. This option can then be used together with ``bzr commit\n"
9178
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9179
"example::"
9180
msgstr ""
9181
9182
#: en/help_topics/bugs.txt:77
9183
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9184
msgstr ""
9185
9186
#: en/help_topics/bugs.txt:79
9187
msgid ""
9188
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9189
"as\n"
9190
"fixed."
9191
msgstr ""
9192
9193
#: en/help_topics/bugs.txt:82
9194
msgid ""
9195
"bugtracker_<tracker>_url\n"
9196
"------------------------"
9197
msgstr ""
9198
9199
#: en/help_topics/bugs.txt:85
9200
msgid ""
9201
"If present, the location of a generic bug tracker instance referred to by\n"
9202
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9203
"which will be replaced by a specific bug ID. This option can then be used\n"
9204
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9205
"fixed by that commit. For example::"
9206
msgstr ""
9207
9208
#: en/help_topics/bugs.txt:91
9209
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9210
msgstr ""
9211
9212
#: en/help_topics/bugs.txt:93
9213
msgid ""
9214
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9215
"Roundup bug tracker as fixed, or::"
9216
msgstr ""
9217
9218
#: en/help_topics/bugs.txt:96
9219
msgid ""
9220
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9221
msgstr ""
9222
9223
#: en/help_topics/bugs.txt:98
9224
msgid ""
9225
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9226
"RT bug tracker as fixed, or::"
9227
msgstr ""
9228
9229
#: en/help_topics/bugs.txt:101
9230
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9231
msgstr ""
9232
9233
#: en/help_topics/bugs.txt:103
9234
msgid ""
9235
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9236
"1234\n"
9237
"in Hudson's JIRA bug tracker as fixed.\n"
9238
msgstr ""
9239
9240
#: en/help_topics/commands.txt:1
9241
msgid ""
9242
"add Add specified files or directories.\n"
9243
"alias Set/unset and display aliases.\n"
9244
"annotate Show the origin of each line in a file.\n"
9245
"bash-completion Generate a shell function for bash command line "
9246
"completion.\n"
9247
" [bash_completion]\n"
9248
"bind Convert the current branch into a checkout of the "
9249
"supplied\n"
9250
" branch.\n"
9251
"branch Create a new branch that is a copy of an existing branch.\n"
9252
"branches List the branches available at the current location.\n"
9253
"break-lock Break a dead lock.\n"
9254
"cat Write the contents of a file as of a given revision to\n"
9255
" standard output.\n"
9256
"check Validate working tree structure, branch consistency and\n"
9257
" repository history.\n"
9258
"checkout Create a new checkout of an existing branch.\n"
9259
"clean-tree Remove unwanted files from working tree.\n"
9260
"commit Commit changes into a new revision.\n"
9261
"config Display, set or remove a configuration option.\n"
9262
"conflicts List files with conflicts.\n"
9263
"deleted List files deleted in the working tree.\n"
9264
"diff Show differences in the working tree, between revisions "
9265
"or\n"
9266
" branches.\n"
9267
"dpush Push into a different VCS without any custom bzr "
9268
"metadata.\n"
9269
"export Export current or past revision to a destination directory "
9270
"or\n"
9271
" archive.\n"
9272
"help Show help on a command or other topic.\n"
9273
"ignore Ignore specified files or patterns.\n"
9274
"ignored List ignored files and the patterns that matched them.\n"
9275
"info Show information about a working tree, branch or "
9276
"repository.\n"
9277
"init Make a directory into a versioned branch.\n"
9278
"init-repository Create a shared repository for branches to share storage\n"
9279
" space.\n"
9280
"join Combine a tree into its containing tree.\n"
9281
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9282
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9283
"launchpad-open Open a Launchpad branch page in your web browser. "
9284
"[launchpad]\n"
9285
"log Show historical log for a branch or subset of a branch.\n"
9286
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9287
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9288
"ls List files in a tree.\n"
9289
"merge Perform a three-way merge.\n"
9290
"missing Show unmerged/unpulled revisions between two branches.\n"
9291
"mkdir Create a new versioned directory.\n"
9292
"mv Move or rename a file.\n"
9293
"nick Print or set the branch nickname.\n"
9294
"pack Compress the data within a repository.\n"
9295
"plugins List the installed plugins.\n"
9296
"pull Turn this branch into a mirror of another branch.\n"
9297
"push Update a mirror of this branch.\n"
9298
"reconcile Reconcile bzr metadata in a branch.\n"
9299
"reconfigure Reconfigure the type of a bzr directory.\n"
9300
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9301
"remerge Redo a merge.\n"
9302
"remove Remove files or directories.\n"
9303
"remove-branch Remove a branch.\n"
9304
"remove-tree Remove the working tree from a given branch/checkout.\n"
9305
"renames Show list of renamed files.\n"
9306
"resolve Mark a conflict as resolved.\n"
9307
"revert Revert files to a previous revision.\n"
9308
"revno Show current revision number.\n"
9309
"root Show the tree root directory.\n"
9310
"send Mail or create a merge-directive for submitting changes.\n"
9311
"serve Run the bzr server.\n"
9312
"shelve Temporarily set aside some changes from the current tree.\n"
9313
"sign-my-commits Sign all commits by a given committer.\n"
9314
"split Split a subdirectory of a tree into a separate tree.\n"
9315
"status Display status summary.\n"
9316
"switch Set the branch of a checkout and update.\n"
9317
"tag Create, remove or modify a tag naming a revision.\n"
9318
"tags List tags.\n"
9319
"testament Show testament (signing-form) of a revision.\n"
9320
"unbind Convert the current checkout into a regular branch.\n"
9321
"uncommit Remove the last committed revision.\n"
9322
"unshelve Restore shelved changes.\n"
9323
"update Update a working tree to a new revision.\n"
9324
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9325
" format.\n"
9326
"verify-signatures Verify all commit signatures.\n"
9327
"version Show version of bzr.\n"
9328
"version-info Show version information about this tree.\n"
9329
"view Manage filtered views.\n"
9330
"whoami Show or set bzr user id.\n"
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:1
9334
msgid ""
9335
"Configuration Settings\n"
9336
"======================="
9337
msgstr ""
9338
"Definições de configuração\n"
9339
"======================="
9340
9341
#: en/help_topics/configuration.txt:4
9342
msgid ""
9343
"Environment settings\n"
9344
"---------------------"
9345
msgstr ""
9346
"Configurações de ambiente\n"
9347
"---------------------"
9348
9349
#: en/help_topics/configuration.txt:7
9350
msgid ""
9351
"While most configuration is handled by configuration files, some options\n"
9352
"which may be semi-permanent can also be controlled through the environment."
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:10
9356
msgid ""
9357
"BZR_EMAIL\n"
9358
"~~~~~~~~~"
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:13
9362
msgid "Override the email id used by Bazaar. Typical format::"
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:15
9366
msgid " \"John Doe <jdoe@example.com>\""
9367
msgstr " \"John Doe <jdoe@exemplo.com>\""
9368
9369
#: en/help_topics/configuration.txt:17
9370
msgid "See also the ``email`` configuration option."
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:19
9374
msgid ""
9375
"BZR_PROGRESS_BAR\n"
9376
"~~~~~~~~~~~~~~~~"
9377
msgstr ""
9378
9379
#: en/help_topics/configuration.txt:22
9380
msgid ""
9381
"Override the progress display. Possible values are \"none\" or \"text\". "
9382
"If\n"
9383
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9384
"draws\n"
9385
"the ordinary command line progress bar."
9386
msgstr ""
9387
9388
#: en/help_topics/configuration.txt:26
9389
msgid ""
9390
"BZR_SIGQUIT_PDB\n"
9391
"~~~~~~~~~~~~~~~"
9392
msgstr ""
9393
9394
#: en/help_topics/configuration.txt:29
9395
msgid ""
9396
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:31
9400
msgid ""
9401
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9402
"* 1 = Invoke breakin debugger (default)"
9403
msgstr ""
9404
9405
#: en/help_topics/configuration.txt:34
9406
msgid ""
9407
"BZR_HOME\n"
9408
"~~~~~~~~"
9409
msgstr ""
9410
"BZR_HOME\n"
9411
"~~~~~~~~"
9412
9413
#: en/help_topics/configuration.txt:37
9414
msgid "Override the home directory used by Bazaar."
9415
msgstr ""
9416
9417
#: en/help_topics/configuration.txt:39
9418
msgid ""
9419
"BZR_SSH\n"
9420
"~~~~~~~"
9421
msgstr ""
9422
"BZR_SSH\n"
9423
"~~~~~~~"
9424
9425
#: en/help_topics/configuration.txt:42
9426
msgid "Select a different SSH implementation."
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:44
9430
msgid ""
9431
"BZR_PDB\n"
9432
"~~~~~~~"
9433
msgstr ""
9434
"BZR_PDB\n"
9435
"~~~~~~~"
9436
9437
#: en/help_topics/configuration.txt:47
9438
msgid "Control whether to launch a debugger on error."
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:49
9442
msgid ""
9443
"* 0 = Standard behavior\n"
9444
"* 1 = Launch debugger"
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:52
9448
msgid ""
9449
"BZR_REMOTE_PATH\n"
9450
"~~~~~~~~~~~~~~~"
9451
msgstr ""
9452
"BZR_REMOTE_PATH\n"
9453
"~~~~~~~~~~~~~~~"
9454
9455
#: en/help_topics/configuration.txt:55
9456
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:57
9460
msgid "See also the ``bzr_remote_path`` configuration option."
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:59
9464
msgid ""
9465
"BZR_EDITOR\n"
9466
"~~~~~~~~~~"
9467
msgstr ""
9468
"BZR_EDITOR\n"
9469
"~~~~~~~~~~"
9470
9471
#: en/help_topics/configuration.txt:62
9472
msgid "Path to the editor Bazaar should use for commit messages, etc."
9473
msgstr ""
9474
9475
#: en/help_topics/configuration.txt:64
9476
msgid ""
9477
"BZR_LOG\n"
9478
"~~~~~~~"
9479
msgstr ""
9480
"BZR_LOG\n"
9481
"~~~~~~~"
9482
9483
#: en/help_topics/configuration.txt:67
9484
msgid ""
9485
"Location of the Bazaar log file. You can check the current location by\n"
9486
"running ``bzr version``."
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:70
9490
msgid ""
9491
"The log file contains debug information that is useful for diagnosing or\n"
9492
"reporting problems with Bazaar."
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:73
9496
msgid ""
9497
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9498
"will disable logging."
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:76
9502
msgid ""
9503
"\n"
9504
"BZR_PLUGIN_PATH\n"
9505
"~~~~~~~~~~~~~~~"
9506
msgstr ""
9507
"\n"
9508
"BZR_PLUGIN_PATH\n"
9509
"~~~~~~~~~~~~~~~"
9510
9511
#: en/help_topics/configuration.txt:80
9512
msgid ""
9513
"The path to the plugins directory that Bazaar should use.\n"
9514
"If not set, Bazaar will search for plugins in:"
9515
msgstr ""
9516
9517
#: en/help_topics/configuration.txt:83
9518
msgid ""
9519
"* the user specific plugin directory (containing the ``user`` plugins),"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:85
9523
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:87
9527
msgid ""
9528
"* the site specific plugin directory if applicable (containing\n"
9529
" the ``site`` plugins)."
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:90
9533
msgid ""
9534
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9535
"the way the plugin are searched. "
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:93
9539
msgid ""
9540
"As for the ``PATH`` variables, if multiple directories are\n"
9541
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9542
"platform specific appropriate character (':' on Unix,\n"
9543
"';' on windows)"
9544
msgstr ""
9545
9546
#: en/help_topics/configuration.txt:98
9547
msgid ""
9548
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9549
"in ``user``. However it will continue to search in ``core`` and\n"
9550
"``site`` unless they are explicitly removed."
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:102
9554
msgid ""
9555
"If you need to change the order or remove one of these\n"
9556
"directories, you should use special values:"
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:105
9560
msgid ""
9561
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9562
" path from the default values,"
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:108
9566
msgid ""
9567
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9568
" before the remaining default values (and also remove it from\n"
9569
" the default values)."
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:112
9573
msgid ""
9574
"Note that the special values 'user', 'core' and 'site' should be\n"
9575
"used literally, they will be substituted by the corresponding,\n"
9576
"platform specific, values."
9577
msgstr ""
9578
9579
#: en/help_topics/configuration.txt:116
9580
msgid ""
9581
"The examples below use ':' as the separator, windows users\n"
9582
"should use ';'."
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:119
9586
msgid "Overriding the default user plugin directory::"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:121
9590
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9591
msgstr " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9592
9593
#: en/help_topics/configuration.txt:123
9594
msgid "Disabling the site directory while retaining the user directory::"
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:125
9598
msgid " BZR_PLUGIN_PATH='-site:+user'"
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:127
9602
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9603
msgstr ""
9604
9605
#: en/help_topics/configuration.txt:129
9606
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:131
9610
msgid "Overriding the default site plugin directory::"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:133
9614
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9615
msgstr ""
9616
9617
#: en/help_topics/configuration.txt:135
9618
msgid ""
9619
"BZR_DISABLE_PLUGINS\n"
9620
"~~~~~~~~~~~~~~~~~~~"
9621
msgstr ""
9622
"BZR_DISABLE_PLUGINS\n"
9623
"~~~~~~~~~~~~~~~~~~~"
9624
9625
#: en/help_topics/configuration.txt:138
9626
msgid ""
9627
"Under special circumstances (mostly when trying to diagnose a\n"
9628
"bug), it's better to disable a plugin (or several) rather than\n"
9629
"uninstalling them completely. Such plugins can be specified in\n"
9630
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9631
msgstr ""
9632
9633
#: en/help_topics/configuration.txt:143
9634
msgid ""
9635
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9636
"will raise an import error if they are explicitly imported (by\n"
9637
"another plugin that depends on them for example)."
9638
msgstr ""
9639
9640
#: en/help_topics/configuration.txt:147
9641
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9642
msgstr ""
9643
9644
#: en/help_topics/configuration.txt:149
9645
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9646
msgstr ""
9647
9648
#: en/help_topics/configuration.txt:151
9649
msgid ""
9650
"BZR_PLUGINS_AT\n"
9651
"~~~~~~~~~~~~~~"
9652
msgstr ""
9653
"BZR_PLUGINS_AT\n"
9654
"~~~~~~~~~~~~~~"
9655
9656
#: en/help_topics/configuration.txt:154
9657
msgid ""
9658
"When adding a new feature or working on a bug in a plugin,\n"
9659
"developers often need to use a specific version of a given\n"
9660
"plugin. Since python requires that the directory containing the\n"
9661
"code is named like the plugin itself this make it impossible to\n"
9662
"use arbitrary directory names (using a two-level directory scheme\n"
9663
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9664
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:162
9668
msgid ""
9669
"Plugins specified in this environment variable takes precedence\n"
9670
"over the ones in ``BZR_PLUGIN_PATH``."
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:165
9674
msgid ""
9675
"The variable specified a list of ``plugin_name@plugin path``,\n"
9676
"``plugin_name`` being the name of the plugin as it appears in\n"
9677
"python module paths, ``plugin_path`` being the path to the\n"
9678
"directory containing the plugin code itself\n"
9679
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9680
"separator, use ';' on windows."
9681
msgstr ""
9682
9683
#: en/help_topics/configuration.txt:172
9684
msgid ""
9685
"Example:\n"
9686
"~~~~~~~~"
9687
msgstr ""
9688
"Exemplo:\n"
9689
"~~~~~~~~"
9690
9691
#: en/help_topics/configuration.txt:175
9692
msgid ""
9693
"Using a specific version of ``myplugin``:\n"
9694
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:178
9698
msgid ""
9699
"BZRPATH\n"
9700
"~~~~~~~"
9701
msgstr ""
9702
"BZRPATH\n"
9703
"~~~~~~~"
9704
9705
#: en/help_topics/configuration.txt:181
9706
msgid "The path where Bazaar should look for shell plugin external commands."
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:183
9710
msgid ""
9711
"\n"
9712
"http_proxy, https_proxy\n"
9713
"~~~~~~~~~~~~~~~~~~~~~~~"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:187
9717
msgid "Specifies the network proxy for outgoing connections, for example::"
9718
msgstr ""
9719
9720
#: en/help_topics/configuration.txt:189
9721
msgid ""
9722
" http_proxy=http://proxy.example.com:3128/ \n"
9723
" https_proxy=http://proxy.example.com:3128/"
9724
msgstr ""
9725
" http_proxy=http://proxy.example.com:3128/ \n"
9726
" https_proxy=http://proxy.example.com:3128/"
9727
9728
#: en/help_topics/configuration.txt:192
9729
msgid ""
9730
"\n"
9731
"Configuration files\n"
9732
"-------------------"
9733
msgstr ""
9734
"\n"
9735
"Arquivos de configuração\n"
9736
"-------------------"
9737
9738
#: en/help_topics/configuration.txt:196
9739
msgid ""
9740
"Location\n"
9741
"~~~~~~~~"
9742
msgstr ""
9743
"Localização\n"
9744
"~~~~~~~~"
9745
9746
#: en/help_topics/configuration.txt:199
9747
msgid ""
9748
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9749
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9750
"on\n"
9751
"Windows. (You can check the location for your system by using\n"
9752
"``bzr version``.)"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:204
9756
msgid "There are three primary configuration files in this location:"
9757
msgstr ""
9758
9759
#: en/help_topics/configuration.txt:206
9760
msgid "* ``bazaar.conf`` describes default configuration options,"
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:208
9764
msgid ""
9765
"* ``locations.conf`` describes configuration information for\n"
9766
" specific branch locations,"
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:211
9770
msgid ""
9771
"* ``authentication.conf`` describes credential information for\n"
9772
" remote servers."
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:214
9776
msgid ""
9777
"Each branch can also contain a configuration file that sets values specific\n"
9778
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9779
"the\n"
9780
"branch. This file is visible to all users of a branch, if you wish to "
9781
"override\n"
9782
"one of the values for a branch with a setting that is specific to you then "
9783
"you\n"
9784
"can do so in ``locations.conf``."
9785
msgstr ""
9786
9787
#: en/help_topics/configuration.txt:220
9788
msgid ""
9789
"General format\n"
9790
"~~~~~~~~~~~~~~"
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:223
9794
msgid ""
9795
"An ini file has three types of contructs: section headers, section\n"
9796
"options and comments."
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:226
9800
msgid ""
9801
"Comments\n"
9802
"^^^^^^^^"
9803
msgstr ""
9804
"Comentários\n"
9805
"^^^^^^^^"
9806
9807
#: en/help_topics/configuration.txt:229
9808
msgid ""
9809
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9810
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9811
"Bazaar when parsing ini files."
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:233
9815
msgid ""
9816
"Section headers\n"
9817
"^^^^^^^^^^^^^^^"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:236
9821
msgid ""
9822
"A section header is a word enclosed in brackets that starts at the begining\n"
9823
"of a line. A typical section header looks like this::"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:239
9827
msgid " [DEFAULT]"
9828
msgstr " [DEFAULT]"
9829
9830
#: en/help_topics/configuration.txt:241
9831
msgid ""
9832
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9833
"[ALIASES]. Section headers are case sensitive. The default section provides "
9834
"for\n"
9835
"setting options which can be overridden with the branch config file."
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:245
9839
msgid ""
9840
"For ``locations.conf``, the options from the section with the\n"
9841
"longest matching section header are used to the exclusion of other\n"
9842
"potentially valid section headers. A section header uses the path for\n"
9843
"the branch as the section header. Some examples include::"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:250
9847
msgid ""
9848
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9849
" [/home/jdoe/branches/]"
9850
msgstr ""
9851
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9852
" [/home/jdoe/branches/]"
9853
9854
#: en/help_topics/configuration.txt:253
9855
msgid ""
9856
"\n"
9857
"Section options\n"
9858
"^^^^^^^^^^^^^^^"
9859
msgstr ""
9860
9861
#: en/help_topics/configuration.txt:257
9862
msgid ""
9863
"A section option resides within a section. A section option contains an\n"
9864
"option name, an equals sign and a value. For example::"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:260
9868
msgid ""
9869
" email = John Doe <jdoe@isp.com>\n"
9870
" gpg_signing_key = Amy Pond <amy@example.com>"
9871
msgstr ""
9872
" email = John Doe <jdoe@isp.com>\n"
9873
" gpg_signing_key = Amy Pond <amy@example.com>"
9874
9875
#: en/help_topics/configuration.txt:263
9876
msgid ""
9877
"A option can reference other options by enclosing them in curly brackets::"
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:265
9881
msgid ""
9882
" my_branch_name = feature_x\n"
9883
" my_server = bzr+ssh://example.com\n"
9884
" push_location = {my_server}/project/{my_branch_name}"
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:269
9888
msgid ""
9889
"Option policies\n"
9890
"^^^^^^^^^^^^^^^"
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:272
9894
msgid ""
9895
"Options defined in a section affect the named directory or URL plus\n"
9896
"any locations they contain. Policies can be used to change how an\n"
9897
"option value is interpreted for contained locations. Currently\n"
9898
"there are three policies available:"
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:277
9902
msgid ""
9903
" none:\n"
9904
" the value is interpreted the same for contained locations. This is\n"
9905
" the default behaviour.\n"
9906
" norecurse:\n"
9907
" the value is only used for the exact location specified by the\n"
9908
" section name.\n"
9909
" appendpath:\n"
9910
" for contained locations, any additional path components are\n"
9911
" appended to the value."
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:287
9915
msgid ""
9916
"Policies are specified by keys with names of the form "
9917
"\"<option_name>:policy\".\n"
9918
"For example, to define the push location for a tree of branches, the\n"
9919
"following could be used::"
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:291
9923
msgid ""
9924
" [/top/location]\n"
9925
" push_location = sftp://example.com/location\n"
9926
" push_location:policy = appendpath"
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:295
9930
msgid ""
9931
"With this configuration, the push location for ``/top/location/branch1``\n"
9932
"would be ``sftp://example.com/location/branch1``."
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:298
9936
msgid ""
9937
"Section local options\n"
9938
"^^^^^^^^^^^^^^^^^^^^^"
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:301
9942
msgid ""
9943
"Some options are defined automatically inside a given section and can be\n"
9944
"refered to in this section only. "
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:304
9948
msgid "For example, the ``appendpath`` policy can be used like this::"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:306
9952
msgid ""
9953
" [/home/vila/src/bzr/bugs]\n"
9954
" mypush = lp:~vila/bzr\n"
9955
" mypush:policy=appendpath"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:310
9959
msgid "Using ``relpath`` to achieve the same result is done like this::"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:312
9963
msgid ""
9964
" [/home/vila/src/bzr/bugs]\n"
9965
" mypush = lp:~vila/bzr/{relpath}"
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:315
9969
msgid ""
9970
"In both cases, when used in a directory like\n"
9971
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9972
msgstr ""
9973
9974
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9975
msgid ""
9976
" $ bzr config mypush\n"
9977
" lp:~vila/bzr/832013-expand-in-stack"
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:321
9981
msgid "Another such option is ``basename`` which can be used like this::"
9982
msgstr ""
9983
9984
#: en/help_topics/configuration.txt:323
9985
msgid ""
9986
" [/home/vila/src/bzr]\n"
9987
" mypush = lp:~vila/bzr/{basename}"
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:326
9991
msgid ""
9992
"When used in a directory like\n"
9993
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9994
msgstr ""
9995
9996
#: en/help_topics/configuration.txt:332
9997
msgid ""
9998
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9999
"itself is defined as the relative path between the section name and the\n"
10000
"location it matches."
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:336
10004
msgid ""
10005
"When an option is local to a Section, it cannot be referred to from option\n"
10006
"values in any other section from the same ``Store`` nor from any other\n"
10007
"``Store``."
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:340
10011
msgid ""
10012
"\n"
10013
"The main configuration file, bazaar.conf\n"
10014
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10015
msgstr ""
10016
10017
#: en/help_topics/configuration.txt:344
10018
msgid ""
10019
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10020
"The default section contains the default\n"
10021
"configuration options for all branches. The default section can be\n"
10022
"overriden by providing a branch-specific section in ``locations.conf``."
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:349
10026
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10027
msgstr ""
10028
10029
#: en/help_topics/configuration.txt:351
10030
msgid ""
10031
" [DEFAULT]\n"
10032
" email = John Doe <jdoe@isp.com>\n"
10033
" editor = /usr/bin/vim\n"
10034
" create_signatures = when-required"
10035
msgstr ""
10036
" [DEFAULT]\n"
10037
" email = John Doe <jdoe@isp.com>\n"
10038
" editor = /usr/bin/vim\n"
10039
" create_signatures = when-required"
10040
10041
#: en/help_topics/configuration.txt:356
10042
msgid ""
10043
"\n"
10044
"The branch location configuration file, locations.conf\n"
10045
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:360
10049
msgid ""
10050
"``locations.conf`` allows one to specify overriding settings for\n"
10051
"a specific branch. The format is almost identical to the default section in\n"
10052
"bazaar.conf with one significant change: The section header, instead of "
10053
"saying\n"
10054
"default, will be the path to a branch that you wish to override a value\n"
10055
"for. The '?' and '*' wildcards are supported::"
10056
msgstr ""
10057
10058
#: en/help_topics/configuration.txt:366
10059
msgid ""
10060
" [/home/jdoe/branches/nethack]\n"
10061
" email = Nethack Admin <nethack@nethack.com>"
10062
msgstr ""
10063
" [/home/jdoe/branches/nethack]\n"
10064
" email = Nethack Admin <nethack@nethack.com>"
10065
10066
#: en/help_topics/configuration.txt:369
10067
msgid ""
10068
" [http://hypothetical.site.com/branches/devel-branch]\n"
10069
" create_signatures = always"
10070
msgstr ""
10071
" [http://hypothetical.site.com/branches/devel-branch]\n"
10072
" create_signatures = always"
10073
10074
#: en/help_topics/configuration.txt:372
10075
msgid ""
10076
"The authentication configuration file, authentication.conf\n"
10077
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10078
msgstr ""
10079
10080
#: en/help_topics/configuration.txt:375
10081
msgid ""
10082
"``authentication.conf`` allows one to specify credentials for\n"
10083
"remote servers. This can be used for all the supported transports and any "
10084
"part\n"
10085
"of bzr that requires authentication (smtp for example)."
10086
msgstr ""
10087
10088
#: en/help_topics/configuration.txt:379
10089
msgid ""
10090
"The syntax of the file obeys the same rules as the others except for the\n"
10091
"option policies which don't apply."
10092
msgstr ""
10093
10094
#: en/help_topics/configuration.txt:382
10095
msgid ""
10096
"For more information on the possible uses of the authentication "
10097
"configuration\n"
10098
"file see :doc:`authentication-help`."
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:385
10102
msgid ""
10103
"\n"
10104
"Common options\n"
10105
"--------------"
10106
msgstr ""
10107
10108
#: en/help_topics/configuration.txt:389
10109
msgid ""
10110
"debug_flags\n"
10111
"~~~~~~~~~~~"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:392
10115
msgid ""
10116
"A comma-separated list of debugging options to turn on. The same values\n"
10117
"can be used as with the -D command-line option (see `help global-options`).\n"
10118
"For example::"
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:396
10122
msgid " debug_flags = hpss"
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:400
10126
msgid " debug_flags = hpss,evil"
10127
msgstr ""
10128
10129
#: en/help_topics/configuration.txt:402
10130
msgid ""
10131
"email\n"
10132
"~~~~~"
10133
msgstr ""
10134
"email\n"
10135
"~~~~~"
10136
10137
#: en/help_topics/configuration.txt:405
10138
msgid ""
10139
"The email address to use when committing a branch. Typically takes the form\n"
10140
"of::"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:408
10144
msgid " email = Full Name <account@hostname.tld>"
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:410
10148
msgid ""
10149
"editor\n"
10150
"~~~~~~"
10151
msgstr ""
10152
"editor\n"
10153
"~~~~~~"
10154
10155
#: en/help_topics/configuration.txt:413
10156
msgid ""
10157
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10158
"a commit message. This setting is trumped by the environment variable\n"
10159
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10160
"variables."
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:418
10164
msgid ""
10165
"log_format\n"
10166
"~~~~~~~~~~"
10167
msgstr ""
10168
10169
#: en/help_topics/configuration.txt:421
10170
msgid ""
10171
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10172
"and ``line``. Additional formats may be provided by plugins. The default\n"
10173
"value is ``long``."
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:425
10177
msgid ""
10178
"check_signatures\n"
10179
"~~~~~~~~~~~~~~~~"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:428
10183
msgid ""
10184
"Reserved for future use. These options will allow a policy for branches to\n"
10185
"require signatures."
10186
msgstr ""
10187
10188
#: en/help_topics/configuration.txt:431
10189
msgid ""
10190
"require\n"
10191
" The gnupg signature for revisions must be present and must be valid."
10192
msgstr ""
10193
10194
#: en/help_topics/configuration.txt:434
10195
msgid ""
10196
"ignore\n"
10197
" Do not check gnupg signatures of revisions."
10198
msgstr ""
10199
10200
#: en/help_topics/configuration.txt:437
10201
msgid ""
10202
"check-available\n"
10203
" (default) If gnupg signatures for revisions are present, check them.\n"
10204
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10205
" no signature is present."
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:442
10209
msgid ""
10210
"create_signatures\n"
10211
"~~~~~~~~~~~~~~~~~"
10212
msgstr ""
10213
10214
#: en/help_topics/configuration.txt:445
10215
msgid ""
10216
"Defines the behaviour of signing revisions on commits. By default bzr will "
10217
"not\n"
10218
"sign new commits."
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:448
10222
msgid ""
10223
"always\n"
10224
" Sign every new revision that is committed. If the signing fails then "
10225
"the\n"
10226
" commit will not be made."
10227
msgstr ""
10228
10229
#: en/help_topics/configuration.txt:452
10230
msgid ""
10231
"when-required\n"
10232
" Reserved for future use."
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:455
10236
msgid ""
10237
"never\n"
10238
" Reserved for future use."
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:458
10242
msgid ""
10243
"In future it is planned that ``when-required`` will sign newly\n"
10244
"committed revisions only when the branch requires them. ``never`` will "
10245
"refuse\n"
10246
"to sign newly committed revisions, even if the branch requires signatures."
10247
msgstr ""
10248
10249
#: en/help_topics/configuration.txt:462
10250
msgid ""
10251
"dirstate.fdatasync\n"
10252
"~~~~~~~~~~~~~~~~~~"
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:465
10256
msgid ""
10257
"If true (default), working tree metadata changes are flushed through the\n"
10258
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10259
"should not be lost if the machine crashes. See also repository.fdatasync."
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:469
10263
msgid ""
10264
"gpg_signing_key\n"
10265
"~~~~~~~~~~~~~~~"
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:472
10269
msgid ""
10270
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10271
"address, key fingerprint or full key ID. When unset or when set to\n"
10272
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:476
10276
msgid ""
10277
"recurse\n"
10278
"~~~~~~~"
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:479
10282
msgid ""
10283
"Only useful in ``locations.conf``. Defines whether or not the\n"
10284
"configuration for this section applies to subdirectories:"
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:482
10288
msgid ""
10289
"true\n"
10290
" (default) This section applies to subdirectories as well."
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:485
10294
msgid ""
10295
"false\n"
10296
" This section only applies to the branch at this directory and not\n"
10297
" branches below it."
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:489
10301
msgid ""
10302
"gpg_signing_command\n"
10303
"~~~~~~~~~~~~~~~~~~~"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:492
10307
msgid ""
10308
"(Default: \"gpg\"). Which program should be used to sign and check "
10309
"revisions.\n"
10310
"For example::"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:495
10314
msgid " gpg_signing_command = /usr/bin/gnpg"
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:497
10318
msgid ""
10319
"The specified command must accept the options \"--clearsign\" and \"-u "
10320
"<email>\"."
10321
msgstr ""
10322
10323
#: en/help_topics/configuration.txt:499
10324
msgid ""
10325
"bzr_remote_path\n"
10326
"~~~~~~~~~~~~~~~"
10327
msgstr ""
10328
"bzr_remote_path\n"
10329
"~~~~~~~~~~~~~~~"
10330
10331
#: en/help_topics/configuration.txt:502
10332
msgid ""
10333
"(Default: \"bzr\"). The path to the command that should be used to run the "
10334
"smart\n"
10335
"server for bzr. This value may only be specified in locations.conf, because:"
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:505
10339
msgid ""
10340
"- it's needed before branch.conf is accessible\n"
10341
"- allowing remote branch.conf files to specify commands would be a security\n"
10342
" risk"
10343
msgstr ""
10344
10345
#: en/help_topics/configuration.txt:509
10346
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:511
10350
msgid ""
10351
"smtp_server\n"
10352
"~~~~~~~~~~~"
10353
msgstr ""
10354
"smtp_server\n"
10355
"~~~~~~~~~~~"
10356
10357
#: en/help_topics/configuration.txt:514
10358
msgid ""
10359
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10360
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:517
10364
msgid ""
10365
"smtp_username, smtp_password\n"
10366
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10367
msgstr ""
10368
"smtp_username, smtp_password\n"
10369
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10370
10371
#: en/help_topics/configuration.txt:520
10372
msgid ""
10373
"User and password to authenticate to the SMTP server. If smtp_username\n"
10374
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10375
"These settings are only needed if the SMTP server requires authentication\n"
10376
"to send mail."
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:525
10380
msgid ""
10381
"locks.steal_dead\n"
10382
"~~~~~~~~~~~~~~~~"
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:528
10386
msgid ""
10387
"If set to true, bzr will automatically break locks held by processes from\n"
10388
"the same machine and user that are no longer alive. Otherwise, it will\n"
10389
"print a message and you can break the lock manually, if you are satisfied\n"
10390
"the object is no longer in use."
10391
msgstr ""
10392
10393
#: en/help_topics/configuration.txt:533
10394
msgid ""
10395
"mail_client\n"
10396
"~~~~~~~~~~~"
10397
msgstr ""
10398
"mail_client\n"
10399
"~~~~~~~~~~~"
10400
10401
#: en/help_topics/configuration.txt:536
10402
msgid ""
10403
"A mail client to use for sending merge requests.\n"
10404
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10405
"it\n"
10406
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10407
"``editor``."
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:541
10411
msgid "Supported values for specific clients:"
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:543
10415
msgid ""
10416
":claws: Use Claws. This skips a dialog for attaching files.\n"
10417
":evolution: Use Evolution.\n"
10418
":kmail: Use KMail.\n"
10419
":mutt: Use Mutt.\n"
10420
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10421
"1.5,\n"
10422
" this works around some bugs that xdg-email doesn't handle."
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:550
10426
msgid "Supported generic values are:"
10427
msgstr ""
10428
10429
#: en/help_topics/configuration.txt:552
10430
msgid ""
10431
":default: See above.\n"
10432
":editor: Use your editor to compose the merge request. This also uses\n"
10433
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10434
" smtp_username and smtp_password.\n"
10435
":mapi: Use your preferred e-mail client on Windows.\n"
10436
":xdg-email: Use xdg-email to run your preferred mail program"
10437
msgstr ""
10438
10439
#: en/help_topics/configuration.txt:559
10440
msgid ""
10441
"repository.fdatasync\n"
10442
"~~~~~~~~~~~~~~~~~~~~"
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:562
10446
msgid ""
10447
"If true (default), repository changes are flushed through the OS buffers\n"
10448
"to physical disk. This is somewhat slower, but means data should not be\n"
10449
"lost if the machine crashes. See also dirstate.fdatasync."
10450
msgstr ""
10451
10452
#: en/help_topics/configuration.txt:566
10453
msgid ""
10454
"submit_branch\n"
10455
"~~~~~~~~~~~~~"
10456
msgstr ""
10457
"submit_branch\n"
10458
"~~~~~~~~~~~~~"
10459
10460
#: en/help_topics/configuration.txt:569
10461
msgid ""
10462
"The branch you intend to submit your current work to. This is "
10463
"automatically\n"
10464
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10465
"This\n"
10466
"should usually be set on a per-branch or per-location basis."
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:573
10470
msgid ""
10471
"public_branch\n"
10472
"~~~~~~~~~~~~~"
10473
msgstr ""
10474
"public_branch\n"
10475
"~~~~~~~~~~~~~"
10476
10477
#: en/help_topics/configuration.txt:576
10478
msgid ""
10479
"A publically-accessible version of this branch (implying that this version "
10480
"is\n"
10481
"not publically-accessible). Used (and set) by ``bzr send``."
10482
msgstr ""
10483
10484
#: en/help_topics/configuration.txt:579
10485
msgid ""
10486
"suppress_warnings\n"
10487
"~~~~~~~~~~~~~~~~~"
10488
msgstr ""
10489
10490
#: en/help_topics/configuration.txt:582
10491
msgid ""
10492
"A list of strings, each string represent a warning that can be emitted by\n"
10493
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:585
10497
msgid "Valid values:"
10498
msgstr ""
10499
10500
#: en/help_topics/configuration.txt:587
10501
msgid ""
10502
"* ``format_deprecation``:\n"
10503
" whether the format deprecation warning is shown on repositories that "
10504
"are\n"
10505
" using deprecated formats."
10506
msgstr ""
10507
10508
#: en/help_topics/configuration.txt:591
10509
msgid ""
10510
"default_format\n"
10511
"~~~~~~~~~~~~~~"
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:594
10515
msgid ""
10516
"A format name for the default format used when creating branches. See "
10517
"``bzr\n"
10518
"help formats`` for possible values."
10519
msgstr ""
10520
10521
#: en/help_topics/configuration.txt:597
10522
msgid ""
10523
"\n"
10524
"Unicode options\n"
10525
"---------------"
10526
msgstr ""
10527
10528
#: en/help_topics/configuration.txt:601
10529
msgid ""
10530
"output_encoding\n"
10531
"~~~~~~~~~~~~~~~"
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:604
10535
msgid ""
10536
"A Python unicode encoding name for text output from bzr, such as log\n"
10537
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10538
"is the terminal encoding prefered by the operating system."
10539
msgstr ""
10540
10541
#: en/help_topics/configuration.txt:608
10542
msgid ""
10543
"\n"
10544
"Branch type specific options\n"
10545
"----------------------------"
10546
msgstr ""
10547
10548
#: en/help_topics/configuration.txt:612
10549
msgid ""
10550
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10551
"later format. They\n"
10552
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10553
"manually set in ``locations.conf`` or ``bazaar.conf``."
10554
msgstr ""
10555
10556
#: en/help_topics/configuration.txt:617
10557
msgid ""
10558
"append_revisions_only\n"
10559
"~~~~~~~~~~~~~~~~~~~~~"
10560
msgstr ""
10561
10562
#: en/help_topics/configuration.txt:620
10563
msgid ""
10564
"If set to \"True\" then revisions can only be appended to the log, not\n"
10565
"removed. A branch with this setting enabled can only pull from another\n"
10566
"branch if the other branch's log is a longer version of its own. This is\n"
10567
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10568
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10569
"compatibility with previous bzr versions (older than 2.2)."
10570
msgstr ""
10571
10572
#: en/help_topics/configuration.txt:627
10573
msgid ""
10574
"parent_location\n"
10575
"~~~~~~~~~~~~~~~"
10576
msgstr ""
10577
"parent_location\n"
10578
"~~~~~~~~~~~~~~~"
10579
10580
#: en/help_topics/configuration.txt:630
10581
msgid ""
10582
"If present, the location of the default branch for pull or merge. This "
10583
"option\n"
10584
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10585
"--remember``."
10586
msgstr ""
10587
10588
#: en/help_topics/configuration.txt:634
10589
msgid ""
10590
"push_location\n"
10591
"~~~~~~~~~~~~~"
10592
msgstr ""
10593
"push_location\n"
10594
"~~~~~~~~~~~~~"
10595
10596
#: en/help_topics/configuration.txt:637
10597
msgid ""
10598
"If present, the location of the default branch for push. This option\n"
10599
"is normally set by the first ``push`` or ``push --remember``."
10600
msgstr ""
10601
10602
#: en/help_topics/configuration.txt:640
10603
msgid ""
10604
"push_strict\n"
10605
"~~~~~~~~~~~"
10606
msgstr ""
10607
"push_strict\n"
10608
"~~~~~~~~~~~"
10609
10610
#: en/help_topics/configuration.txt:643
10611
msgid ""
10612
"If present, defines the ``--strict`` option default value for checking\n"
10613
"uncommitted changes before pushing."
10614
msgstr ""
10615
10616
#: en/help_topics/configuration.txt:646
10617
msgid ""
10618
"dpush_strict\n"
10619
"~~~~~~~~~~~~"
10620
msgstr ""
10621
"dpush_strict\n"
10622
"~~~~~~~~~~~~"
10623
10624
#: en/help_topics/configuration.txt:649
10625
msgid ""
10626
"If present, defines the ``--strict`` option default value for checking\n"
10627
"uncommitted changes before pushing into a different VCS without any\n"
10628
"custom bzr metadata."
10629
msgstr ""
10630
10631
#: en/help_topics/configuration.txt:653
10632
msgid ""
10633
"bound_location\n"
10634
"~~~~~~~~~~~~~~"
10635
msgstr ""
10636
10637
#: en/help_topics/configuration.txt:656
10638
msgid ""
10639
"The location that commits should go to when acting as a checkout.\n"
10640
"This option is normally set by ``bind``."
10641
msgstr ""
10642
10643
#: en/help_topics/configuration.txt:659
10644
msgid ""
10645
"bound\n"
10646
"~~~~~"
10647
msgstr ""
10648
10649
#: en/help_topics/configuration.txt:662
10650
msgid ""
10651
"If set to \"True\", the branch should act as a checkout, and push each "
10652
"commit to\n"
10653
"the bound_location. This option is normally set by ``bind``/``unbind``."
10654
msgstr ""
10655
10656
#: en/help_topics/configuration.txt:665
10657
msgid ""
10658
"send_strict\n"
10659
"~~~~~~~~~~~"
10660
msgstr ""
10661
10662
#: en/help_topics/configuration.txt:668
10663
msgid ""
10664
"If present, defines the ``--strict`` option default value for checking\n"
10665
"uncommitted changes before sending a merge directive."
10666
msgstr ""
10667
10668
#: en/help_topics/configuration.txt:671
10669
msgid ""
10670
"add.maximum_file_size\n"
10671
"~~~~~~~~~~~~~~~~~~~~~"
10672
msgstr ""
10673
10674
#: en/help_topics/configuration.txt:674
10675
msgid ""
10676
"Defines the maximum file size the command line \"add\" operation will allow\n"
10677
"in recursive mode, with files larger than this value being skipped. You may "
10678
"\n"
10679
"specify this value as an integer (in which case it is interpreted as bytes), "
10680
"\n"
10681
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10682
"0 \n"
10683
"will disable skipping."
10684
msgstr ""
10685
10686
#: en/help_topics/configuration.txt:680
10687
msgid ""
10688
"External Merge Tools\n"
10689
"--------------------"
10690
msgstr ""
10691
10692
#: en/help_topics/configuration.txt:683
10693
msgid ""
10694
"bzr.mergetool.<name>\n"
10695
"~~~~~~~~~~~~~~~~~~~~"
10696
msgstr ""
10697
10698
#: en/help_topics/configuration.txt:686
10699
msgid ""
10700
"Defines an external merge tool called <name> with the given command-line.\n"
10701
"Arguments containing spaces should be quoted using single or double quotes. "
10702
"The\n"
10703
"executable may omit its path if it can be found on the PATH."
10704
msgstr ""
10705
10706
#: en/help_topics/configuration.txt:690
10707
msgid ""
10708
"The following markers can be used in the command-line to substitute "
10709
"filenames\n"
10710
"involved in the merge conflict::"
10711
msgstr ""
10712
10713
#: en/help_topics/configuration.txt:693
10714
msgid ""
10715
" {base} file.BASE\n"
10716
" {this} file.THIS\n"
10717
" {other} file.OTHER\n"
10718
" {result} output file\n"
10719
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10720
"merge\n"
10721
" succeeds."
10722
msgstr ""
10723
10724
#: en/help_topics/configuration.txt:702
10725
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10726
msgstr ""
10727
10728
#: en/help_topics/configuration.txt:704
10729
msgid ""
10730
"bzr.default_mergetool\n"
10731
"~~~~~~~~~~~~~~~~~~~~~"
10732
msgstr ""
10733
10734
#: en/help_topics/configuration.txt:707
10735
msgid ""
10736
"Specifies which external merge tool (as defined above) should be selected "
10737
"by\n"
10738
"default in tools such as ``bzr qconflicts``."
10739
msgstr ""
10740
10741
#: en/help_topics/configuration.txt:712
10742
msgid " bzr.default_mergetool = kdiff3\n"
10743
msgstr ""
10744
10745
#: en/help_topics/conflict-types.txt:1
10746
msgid ""
10747
"Conflict Types\n"
10748
"=============="
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:4
10752
msgid ""
10753
"Some operations, like merge, revert and pull, modify the contents of your\n"
10754
"working tree. These modifications are programmatically generated, and so "
10755
"they\n"
10756
"may conflict with the current state of your working tree. "
10757
msgstr ""
10758
10759
#: en/help_topics/conflict-types.txt:8
10760
msgid ""
10761
"When conflicts are present in your working tree (as shown by ``bzr\n"
10762
"conflicts``), you should resolve them and then inform bzr that the "
10763
"conflicts\n"
10764
"have been resolved."
10765
msgstr ""
10766
10767
#: en/help_topics/conflict-types.txt:12
10768
msgid ""
10769
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10770
"should resolve them is not the one responsible for their occurrence, as is "
10771
"the\n"
10772
"case when merging other people's work or because some conflicts are "
10773
"presented\n"
10774
"in a way that is not easy to understand."
10775
msgstr ""
10776
10777
#: en/help_topics/conflict-types.txt:17
10778
msgid ""
10779
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10780
"conflict if and only if there's an actual conceptual conflict in the source\n"
10781
"tree. Because Bazaar doesn't understand the real meaning of the files "
10782
"being\n"
10783
"versioned, it can, when faced with ambiguities, fall short in either "
10784
"direction\n"
10785
"trying to resolve the conflict itself. Many kinds of changes can be "
10786
"combined\n"
10787
"programmatically, but sometimes only a human can determine the right thing "
10788
"to\n"
10789
"do."
10790
msgstr ""
10791
10792
#: en/help_topics/conflict-types.txt:25
10793
msgid ""
10794
"When Bazaar generates a conflict, it adds information into the working tree "
10795
"to\n"
10796
"present the conflicting versions, and it's up to you to find the correct\n"
10797
"resolution."
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:29
10801
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:31
10805
msgid ""
10806
"1. Modify the working tree content so that the conflicted item is now in "
10807
"the\n"
10808
" state you want to keep, then"
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:34
10812
msgid ""
10813
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10814
" remaining generated information (``bzr resolve <item>``)."
10815
msgstr ""
10816
10817
#: en/help_topics/conflict-types.txt:37
10818
msgid ""
10819
"For most conflict types, there are some obvious ways to modify the working\n"
10820
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10821
"itself already made a choice, when possible."
10822
msgstr ""
10823
10824
#: en/help_topics/conflict-types.txt:41
10825
msgid ""
10826
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10827
"different ways to resolve the conflict."
10828
msgstr ""
10829
10830
#: en/help_topics/conflict-types.txt:44
10831
msgid ""
10832
"Each type of conflict is explained below, and the action which must be done "
10833
"to\n"
10834
"resolve the conflict is outlined."
10835
msgstr ""
10836
10837
#: en/help_topics/conflict-types.txt:47
10838
msgid ""
10839
"Various actions are available depending on the kind of conflict, for some "
10840
"of\n"
10841
"these actions, Bazaar can provide some help. In the end you should at least\n"
10842
"inform Bazaar that you're done with the conflict with::"
10843
msgstr ""
10844
10845
#: en/help_topics/conflict-types.txt:51
10846
msgid " ``bzr resolve FILE --action=done'"
10847
msgstr ""
10848
10849
#: en/help_topics/conflict-types.txt:53
10850
msgid ""
10851
"Note that this is the default action when a single file is involved so you "
10852
"can\n"
10853
"simply use::"
10854
msgstr ""
10855
10856
#: en/help_topics/conflict-types.txt:56
10857
msgid " ``bzr resolve FILE``"
10858
msgstr ""
10859
10860
#: en/help_topics/conflict-types.txt:58
10861
msgid "See ``bzr help resolve`` for more details."
10862
msgstr ""
10863
10864
#: en/help_topics/conflict-types.txt:60
10865
msgid ""
10866
"Text conflicts\n"
10867
"--------------"
10868
msgstr ""
10869
10870
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10871
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10872
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10873
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10874
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10875
msgid "Typical message::"
10876
msgstr ""
10877
10878
#: en/help_topics/conflict-types.txt:65
10879
msgid " Text conflict in FILE"
10880
msgstr ""
10881
10882
#: en/help_topics/conflict-types.txt:67
10883
msgid ""
10884
"These are produced when a text merge cannot completely reconcile two sets "
10885
"of\n"
10886
"text changes. Bazaar will emit files for each version with the extensions\n"
10887
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10888
"tree,\n"
10889
"i.e. the tree that you are merging changes into. OTHER is the version that "
10890
"you\n"
10891
"are merging into the target. BASE is an older version that is used as a "
10892
"basis\n"
10893
"for comparison."
10894
msgstr ""
10895
10896
#: en/help_topics/conflict-types.txt:74
10897
msgid ""
10898
"In the main copy of the file, Bazaar will include all the changes that it\n"
10899
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10900
"\"herringbone\" markers like ``<<<<<<<``."
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:78
10904
msgid ""
10905
"Say the initial text is \"The project leader released it.\", and THIS "
10906
"modifies it\n"
10907
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10908
"leader\n"
10909
"released Bazaar.\" A conflict would look like this::"
10910
msgstr ""
10911
10912
#: en/help_topics/conflict-types.txt:82
10913
msgid ""
10914
" <<<<<<< TREE\n"
10915
" Martin Pool released it.\n"
10916
" =======\n"
10917
" The project leader released Bazaar.\n"
10918
" >>>>>>> MERGE-SOURCE"
10919
msgstr ""
10920
10921
#: en/help_topics/conflict-types.txt:88
10922
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10923
msgstr ""
10924
10925
#: en/help_topics/conflict-types.txt:90
10926
msgid ""
10927
"You can handle text conflicts either by editing the main copy of the file,\n"
10928
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10929
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10930
"set of changes over the other (but see below when you encounter these\n"
10931
"cases). More often, the two sets of changes must be intelligently combined."
10932
msgstr ""
10933
10934
#: en/help_topics/conflict-types.txt:96
10935
msgid ""
10936
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10937
"you are done editing, the file should look like it never had a conflict, and "
10938
"be\n"
10939
"ready to commit."
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:100
10943
msgid ""
10944
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10945
"Bazaar will auto-detect which conflicts you have resolved."
10946
msgstr ""
10947
10948
#: en/help_topics/conflict-types.txt:103
10949
msgid ""
10950
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10951
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10952
"working tree."
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:107
10956
msgid ""
10957
"\n"
10958
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10959
"resolve`` with one of the following actions:"
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:111
10963
msgid ""
10964
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10965
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:114
10969
msgid ""
10970
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10971
"modifications will be taken into account."
10972
msgstr ""
10973
10974
#: en/help_topics/conflict-types.txt:117
10975
msgid ""
10976
"Content conflicts\n"
10977
"-----------------"
10978
msgstr ""
10979
10980
#: en/help_topics/conflict-types.txt:122
10981
msgid " Contents conflict in FILE"
10982
msgstr ""
10983
10984
#: en/help_topics/conflict-types.txt:124
10985
msgid ""
10986
"This conflict happens when there are conflicting changes in the working "
10987
"tree\n"
10988
"and the merge source, but the conflicted items are not text files. They "
10989
"may\n"
10990
"be binary files, or symlinks, or directories. It can even happen with "
10991
"files\n"
10992
"that are deleted on one side, and modified on the other."
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:129
10996
msgid ""
10997
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10998
"be\n"
10999
"regular files, symlinks or directories). But it will not include a \"main "
11000
"copy\"\n"
11001
"of the file with herringbone conflict markers. It will appear that the "
11002
"\"main\n"
11003
"copy\" has been renamed to THIS or OTHER."
11004
msgstr ""
11005
11006
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11007
msgid ""
11008
"To resolve that kind of conflict, you should rebuild FILE from either "
11009
"version\n"
11010
"or a combination of both."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11014
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11015
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11016
#: en/help_topics/conflict-types.txt:361
11017
msgid "``bzr resolve`` recognizes the following actions:"
11018
msgstr ""
11019
11020
#: en/help_topics/conflict-types.txt:139
11021
msgid ""
11022
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11023
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11024
"* ``--action=done`` will just mark the conflict as resolved."
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:143
11028
msgid ""
11029
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11030
"and\n"
11031
"``.OTHER`` files if they are still present in the working tree."
11032
msgstr ""
11033
11034
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11035
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11036
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11037
#: en/help_topics/conflict-types.txt:369
11038
msgid ""
11039
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11040
msgstr ""
11041
11042
#: en/help_topics/conflict-types.txt:148
11043
msgid ""
11044
"Tag conflicts\n"
11045
"-------------"
11046
msgstr ""
11047
11048
#: en/help_topics/conflict-types.txt:153
11049
msgid ""
11050
" Conflicting tags:\n"
11051
" version-0.1"
11052
msgstr ""
11053
11054
#: en/help_topics/conflict-types.txt:156
11055
msgid ""
11056
"When pulling from or pushing to another branch, Bazaar informs you about "
11057
"tags\n"
11058
"that conflict between the two branches; that is the same tag points to two\n"
11059
"different revisions. You need not resolve these conflicts, but subsequent\n"
11060
"uses of pull or push will result in the same message."
11061
msgstr ""
11062
11063
#: en/help_topics/conflict-types.txt:161
11064
msgid ""
11065
"To resolve the conflict, you must apply the correct tags to either the "
11066
"target\n"
11067
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11068
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11069
"target branch's tags match the source branch, then in the target branch do\n"
11070
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11071
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11072
"source\n"
11073
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11074
"favor of the target branch, you need to similarly use ``tag --force`` in "
11075
"the\n"
11076
"source branch. (Note that pulling or pushing using --overwrite will "
11077
"overwrite\n"
11078
"all tags as well.)"
11079
msgstr ""
11080
11081
#: en/help_topics/conflict-types.txt:172
11082
msgid ""
11083
"Duplicate paths\n"
11084
"---------------"
11085
msgstr ""
11086
11087
#: en/help_topics/conflict-types.txt:177
11088
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11089
msgstr ""
11090
11091
#: en/help_topics/conflict-types.txt:179
11092
msgid ""
11093
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11094
"already been used. The existing file will be renamed to \"FILE.moved\". "
11095
msgstr ""
11096
11097
#: en/help_topics/conflict-types.txt:187
11098
msgid ""
11099
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11100
"FILE``,\n"
11101
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11102
"* ``--action=done`` will just mark the conflict as resolved."
11103
msgstr ""
11104
11105
#: en/help_topics/conflict-types.txt:191
11106
msgid ""
11107
"Note that you must get rid of FILE.moved before using ``--action=done``."
11108
msgstr ""
11109
11110
#: en/help_topics/conflict-types.txt:195
11111
msgid ""
11112
"Unversioned parent\n"
11113
"------------------"
11114
msgstr ""
11115
11116
#: en/help_topics/conflict-types.txt:200
11117
msgid ""
11118
" Conflict because FILE is not versioned, but has versioned children."
11119
msgstr ""
11120
11121
#: en/help_topics/conflict-types.txt:202
11122
msgid ""
11123
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11124
"not\n"
11125
"versioned. This happens when the directory has been deleted in the target,\n"
11126
"but has a new child in the source, or vice versa. In this situation, "
11127
"Bazaar\n"
11128
"will version the parent directory as well. Resolving this issue depends\n"
11129
"very much on the particular scenario. You may wish to rename or delete "
11130
"either\n"
11131
"the file or the directory. When you are satisfied, you can run \"bzr "
11132
"resolve\n"
11133
"FILE\" to mark the conflict as resolved."
11134
msgstr ""
11135
11136
#: en/help_topics/conflict-types.txt:210
11137
msgid ""
11138
"Missing parent\n"
11139
"--------------"
11140
msgstr ""
11141
11142
#: en/help_topics/conflict-types.txt:215
11143
msgid " Conflict adding files to FILE. Created directory."
11144
msgstr ""
11145
11146
#: en/help_topics/conflict-types.txt:217
11147
msgid ""
11148
"This happens when a directory has been deleted in the target, but has new\n"
11149
"children in the source. This is similar to the \"unversioned parent\" "
11150
"conflict,\n"
11151
"except that the parent directory does not *exist*, instead of just being\n"
11152
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11153
"Resolving this issue depends very much on the particular scenario."
11154
msgstr ""
11155
11156
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11157
msgid ""
11158
"To resolve that kind of conflict, you should either remove or rename the\n"
11159
"children or the directory or a combination of both."
11160
msgstr ""
11161
11162
#: en/help_topics/conflict-types.txt:228
11163
msgid ""
11164
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11165
" children,\n"
11166
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11167
"children\n"
11168
" and restoring the directory,\n"
11169
"* ``--action=done`` will just mark the conflict as resolved."
11170
msgstr ""
11171
11172
#: en/help_topics/conflict-types.txt:236
11173
msgid ""
11174
"Deleting parent\n"
11175
"---------------"
11176
msgstr ""
11177
11178
#: en/help_topics/conflict-types.txt:241
11179
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:243
11183
msgid ""
11184
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11185
"source, but has new children in the target (either because a directory\n"
11186
"deletion is merged or because the merge introduce new children). Bazaar\n"
11187
"will retain the directory. Resolving this issue depends very much on the\n"
11188
"particular scenario."
11189
msgstr ""
11190
11191
#: en/help_topics/conflict-types.txt:254
11192
msgid ""
11193
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11194
"directory,"
11195
msgstr ""
11196
11197
#: en/help_topics/conflict-types.txt:256
11198
msgid ""
11199
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11200
" children,"
11201
msgstr ""
11202
11203
#: en/help_topics/conflict-types.txt:259
11204
msgid "* ``--action=done`` will just mark the conflict as resolved."
11205
msgstr ""
11206
11207
#: en/help_topics/conflict-types.txt:261
11208
msgid ""
11209
"Note that when merging a directory deletion, if unversioned files are\n"
11210
"present, they become potential orphans has they don't have a directory\n"
11211
"parent anymore."
11212
msgstr ""
11213
11214
#: en/help_topics/conflict-types.txt:265
11215
msgid ""
11216
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11217
"setting the ``bzr.transform.orphan_policy`` configuration option."
11218
msgstr ""
11219
11220
#: en/help_topics/conflict-types.txt:268
11221
msgid "There are two possible values for this option:"
11222
msgstr ""
11223
11224
#: en/help_topics/conflict-types.txt:270
11225
msgid ""
11226
"* ``conflict`` (the default): will leave the orphans in place and\n"
11227
" generate a conflicts,"
11228
msgstr ""
11229
11230
#: en/help_topics/conflict-types.txt:273
11231
msgid ""
11232
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11233
"root\n"
11234
" of the working tree with names like ``<file>.~#~``."
11235
msgstr ""
11236
11237
#: en/help_topics/conflict-types.txt:278
11238
msgid ""
11239
"Path conflict\n"
11240
"-------------"
11241
msgstr ""
11242
11243
#: en/help_topics/conflict-types.txt:283
11244
msgid " Path conflict: PATH1 / PATH2"
11245
msgstr ""
11246
11247
#: en/help_topics/conflict-types.txt:285
11248
msgid ""
11249
"This happens when the source and target have each modified the name or "
11250
"parent\n"
11251
"directory of a file. Bazaar will use the path elements from the source."
11252
msgstr ""
11253
11254
#: en/help_topics/conflict-types.txt:288
11255
msgid ""
11256
"To resolve that kind of conflict, you just have to decide what name should "
11257
"be\n"
11258
"retained for the file involved."
11259
msgstr ""
11260
11261
#: en/help_topics/conflict-types.txt:293
11262
msgid ""
11263
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11264
" issuing ``bzr mv PATH2 PATH1``,\n"
11265
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11266
"``PATH2``,\n"
11267
"* ``--action=done`` will just mark the conflict as resolved."
11268
msgstr ""
11269
11270
#: en/help_topics/conflict-types.txt:300
11271
msgid ""
11272
"Parent loop\n"
11273
"-----------"
11274
msgstr ""
11275
11276
#: en/help_topics/conflict-types.txt:305
11277
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11278
msgstr ""
11279
11280
#: en/help_topics/conflict-types.txt:307
11281
msgid ""
11282
"This happens when the source and the target have each moved directories, so\n"
11283
"that, if the change could be applied, a directory would be contained by "
11284
"itself.\n"
11285
"For example::"
11286
msgstr ""
11287
11288
#: en/help_topics/conflict-types.txt:311
11289
msgid ""
11290
" $ bzr init\n"
11291
" $ bzr mkdir white\n"
11292
" $ bzr mkdir black\n"
11293
" $ bzr commit -m \"BASE\"\n"
11294
" $ bzr branch . ../other\n"
11295
" $ bzr mv white black\n"
11296
" $ bzr commit -m \"THIS\"\n"
11297
" $ bzr mv ../other/black ../other/white\n"
11298
" $ bzr commit ../other -m \"OTHER\"\n"
11299
" $ bzr merge ../other"
11300
msgstr ""
11301
" $ bzr init\n"
11302
" $ bzr mkdir white\n"
11303
" $ bzr mkdir black\n"
11304
" $ bzr commit -m \"BASE\"\n"
11305
" $ bzr branch . ../other\n"
11306
" $ bzr mv white black\n"
11307
" $ bzr commit -m \"THIS\"\n"
11308
" $ bzr mv ../other/black ../other/white\n"
11309
" $ bzr commit ../other -m \"OTHER\"\n"
11310
" $ bzr merge ../other"
11311
11312
#: en/help_topics/conflict-types.txt:322
11313
msgid ""
11314
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11315
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11316
"name should be retained for the directories involved."
11317
msgstr ""
11318
11319
#: en/help_topics/conflict-types.txt:328
11320
msgid ""
11321
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11322
"\n"
11323
" in ``black``,\n"
11324
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11325
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11326
"* ``--action=done`` will just mark the conflict as resolved."
11327
msgstr ""
11328
11329
#: en/help_topics/conflict-types.txt:336
11330
msgid ""
11331
"Non-directory parent\n"
11332
"--------------------"
11333
msgstr ""
11334
11335
#: en/help_topics/conflict-types.txt:341
11336
msgid ""
11337
" Conflict: foo.new is not a directory, but has files in it.\n"
11338
" Created directory."
11339
msgstr ""
11340
11341
#: en/help_topics/conflict-types.txt:344
11342
msgid ""
11343
"This happens when one side has added files to a directory, and the other "
11344
"side\n"
11345
"has changed the directory into a file or symlink. For example::"
11346
msgstr ""
11347
"Isso acontece quando um lado adicionou arquivos para um diretório, e o outro "
11348
"lado\n"
11349
"foi alterado o diretório em arquivo ou link simbólico. Por exemplo::"
11350
11351
#: en/help_topics/conflict-types.txt:347
11352
msgid ""
11353
" $ bzr init\n"
11354
" $ bzr mkdir foo\n"
11355
" $ bzr commit -m \"BASE\"\n"
11356
" $ bzr branch . ../other\n"
11357
" $ rmdir foo\n"
11358
" $ touch foo\n"
11359
" $ bzr commit -m \"THIS\"\n"
11360
" $ bzr mkdir ../other/foo/bar\n"
11361
" $ bzr commit ../other -m \"OTHER\"\n"
11362
" $ bzr merge ../other"
11363
msgstr ""
11364
" $ bzr init\n"
11365
" $ bzr mkdir foo\n"
11366
" $ bzr commit -m \"BASE\"\n"
11367
" $ bzr branch . ../other\n"
11368
" $ rmdir foo\n"
11369
" $ touch foo\n"
11370
" $ bzr commit -m \"THIS\"\n"
11371
" $ bzr mkdir ../other/foo/bar\n"
11372
" $ bzr commit ../other -m \"OTHER\"\n"
11373
" $ bzr merge ../other"
11374
11375
#: en/help_topics/conflict-types.txt:358
11376
msgid ""
11377
"To resolve that kind of conflict, you have to decide what name should be\n"
11378
"retained for the file, directory or symlink involved."
11379
msgstr ""
11380
"Para resolver esse tipo de conflito, você tem que decidir o nome deve ser\n"
11381
"mantido para o arquivo, diretório, ou link simbólico envolvidos."
11382
11383
#: en/help_topics/conflict-types.txt:363
11384
msgid ""
11385
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11386
" ``bzr add foo``,\n"
11387
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11388
" ``bzr mv foo.new foo``,\n"
11389
"* ``--action=done`` will just mark the conflict as resolved."
11390
msgstr ""
11391
"* ``--action=take-this`` emitirá ``bzr rm --force foo.new`` e \n"
11392
" ``bzr add foo``,\n"
11393
"* ``--action=take-other`` emitirá ``bzr rm --force foo`` e \n"
11394
" ``bzr mv foo.new foo``,\n"
11395
"* ``--action=done`` apenas marcará o conflito como resolvido."
11396
11397
#: en/help_topics/conflict-types.txt:371
11398
msgid ""
11399
"MalformedTransform\n"
11400
"------------------"
11401
msgstr ""
11402
11403
#: en/help_topics/conflict-types.txt:374
11404
msgid ""
11405
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11406
"exception. This means that Bazaar encountered a filesystem conflict that it "
11407
"was\n"
11408
"unable to resolve. This usually indicates a bug. Please let us know if "
11409
"you\n"
11410
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11411
msgstr ""
11412
11413
#: en/help_topics/content-filters.txt:1
11414
msgid ""
11415
"Content Filters\n"
11416
"==============="
11417
msgstr ""
11418
11419
#: en/help_topics/content-filters.txt:4
11420
msgid ""
11421
"Content formats\n"
11422
"---------------"
11423
msgstr ""
11424
11425
#: en/help_topics/content-filters.txt:7
11426
msgid ""
11427
"Bazaar's content filtering allows you to store files in a different\n"
11428
"format from the copy in your working tree. This lets you, or your\n"
11429
"co-developers, use Windows development tools that expect CRLF files\n"
11430
"on projects that use other line-ending conventions. Among other things,\n"
11431
"content filters also let Unix developers more easily work on projects\n"
11432
"using Windows line-ending conventions, keyword expansion/compression,\n"
11433
"and trailing spaces on lines in text files to be implicitly stripped\n"
11434
"when committed."
11435
msgstr ""
11436
11437
#: en/help_topics/content-filters.txt:16
11438
msgid "To generalize, there are two content formats supported by Bazaar:"
11439
msgstr ""
11440
"Para generalizar, existem dois formatos de conteúdo suportados pelo Bazaar:"
11441
11442
#: en/help_topics/content-filters.txt:18
11443
msgid ""
11444
"* a canonical format - how files are stored internally\n"
11445
"* a convenience format - how files are created in a working tree."
11446
msgstr ""
11447
"* Um formato canonical - como os arquivos são armazenados internamente.\n"
11448
"* Um formato conveniente - como os arquivos são criados em uma árvore de "
11449
"diretório."
11450
11451
#: en/help_topics/content-filters.txt:21
11452
msgid ""
11453
"\n"
11454
"Format conversion\n"
11455
"-----------------"
11456
msgstr ""
11457
11458
#: en/help_topics/content-filters.txt:25
11459
msgid ""
11460
"The conversion between these formats is done by content filters.\n"
11461
"A content filter has two parts:"
11462
msgstr ""
11463
11464
#: en/help_topics/content-filters.txt:28
11465
msgid ""
11466
"* a read converter - converts from convenience to canonical format\n"
11467
"* a write converter - converts from canonical to convenience format."
11468
msgstr ""
11469
11470
#: en/help_topics/content-filters.txt:31
11471
msgid ""
11472
"Many of these converters will provide *round-trip* conversion,\n"
11473
"i.e. applying the read converter followed by the write converter\n"
11474
"gives back the original content. However, others may provide an\n"
11475
"asymmetric conversion. For example, a read converter might strip\n"
11476
"trailing whitespace off lines in source code while the matching\n"
11477
"write converter might pass content through unchanged."
11478
msgstr ""
11479
11480
#: en/help_topics/content-filters.txt:38
11481
msgid ""
11482
"\n"
11483
"Enabling content filters\n"
11484
"------------------------"
11485
msgstr ""
11486
11487
#: en/help_topics/content-filters.txt:42
11488
msgid ""
11489
"Content filters are typically provided by plugins, so the first step\n"
11490
"in using them is to install the relevant plugins and read their\n"
11491
"documentation. Some plugins may be very specific about which files\n"
11492
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11493
"In other cases, the plugin may leave it in the user's hands to\n"
11494
"define which files are to be filtered. This is typically done\n"
11495
"using rule-based preferences. See ``bzr help rules`` for general\n"
11496
"information about defining these."
11497
msgstr ""
11498
11499
#: en/help_topics/content-filters.txt:51
11500
msgid ""
11501
"\n"
11502
"Impact on commands\n"
11503
"------------------"
11504
msgstr ""
11505
11506
#: en/help_topics/content-filters.txt:55
11507
msgid ""
11508
"Read converters are only applied to commands that read content from\n"
11509
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11510
"will apply read converters to files in the working tree, then compare\n"
11511
"the results to the content last committed."
11512
msgstr ""
11513
11514
#: en/help_topics/content-filters.txt:60
11515
msgid ""
11516
"Write converters are only applied by commands that **create files in a\n"
11517
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11518
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11519
"respectively."
11520
msgstr ""
11521
11522
#: en/help_topics/content-filters.txt:65
11523
msgid ""
11524
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11525
"comitting files. If this makes sense for a given plugin providing\n"
11526
"a content filter, the plugin can usually achieve this effect by using a\n"
11527
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11528
"for more information on hooks."
11529
msgstr ""
11530
11531
#: en/help_topics/content-filters.txt:71
11532
msgid ""
11533
"\n"
11534
"Refreshing your working tree\n"
11535
"----------------------------"
11536
msgstr ""
11537
11538
#: en/help_topics/content-filters.txt:75
11539
msgid ""
11540
"For performance reasons, Bazaar caches the timestamps of files in\n"
11541
"a working tree, and assumes files are unchanged if their timestamps\n"
11542
"match the cached values. As a consequence, there are times when\n"
11543
"you may need to explicitly ask for content filtering to be reapplied\n"
11544
"in one or both directions, e.g. after installing or reconfiguring\n"
11545
"plugins providing it."
11546
msgstr ""
11547
11548
#: en/help_topics/content-filters.txt:82
11549
msgid "Here are some general guidelines for doing this:"
11550
msgstr ""
11551
11552
#: en/help_topics/content-filters.txt:84
11553
msgid ""
11554
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11555
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11556
" relevant read converters and compare the end result with the\n"
11557
" canonical format."
11558
msgstr ""
11559
11560
#: en/help_topics/content-filters.txt:89
11561
msgid ""
11562
" * To reapply write converters, ensure there are no local changes,\n"
11563
" delete the relevant files and run ``bzr revert`` on those files."
11564
msgstr ""
11565
11566
#: en/help_topics/content-filters.txt:92
11567
msgid ""
11568
"Note: In the future, it is likely that additional options will be added\n"
11569
"to commands to make this refreshing process faster and safer.\n"
11570
msgstr ""
11571
11572
#: en/help_topics/current-formats.txt:1
11573
msgid "Current Storage Formats"
11574
msgstr ""
11575
11576
#: en/help_topics/current-formats.txt:3
11577
msgid ""
11578
":2a:\n"
11579
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11580
" compress storage. Provides rich roots which are a one-way\n"
11581
" transition."
11582
msgstr ""
11583
11584
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11585
msgid ""
11586
"\n"
11587
"See :doc:`formats-help` for more about storage formats."
11588
msgstr ""
11589
11590
#: en/help_topics/debug-flags.txt:1
11591
msgid ""
11592
"Debug Flags\n"
11593
"==========="
11594
msgstr ""
11595
11596
#: en/help_topics/debug-flags.txt:4
11597
msgid ""
11598
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11599
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11600
msgstr ""
11601
11602
#: en/help_topics/debug-flags.txt:7
11603
msgid ""
11604
"-Dauth Trace authentication sections used.\n"
11605
"-Dbytes Print out how many bytes were transferred\n"
11606
"-Ddirstate Trace dirstate activity (verbose!)\n"
11607
"-Derror Instead of normal error handling, always print a "
11608
"traceback\n"
11609
" on error.\n"
11610
"-Devil Capture call sites that do expensive or badly-scaling\n"
11611
" operations.\n"
11612
"-Dfetch Trace history copying between repositories.\n"
11613
"-Dfilters Emit information for debugging content filtering.\n"
11614
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11615
"fetch.\n"
11616
"-Dgraph Trace graph traversal.\n"
11617
"-Dhashcache Log every time a working file is read to determine its "
11618
"hash.\n"
11619
"-Dhooks Trace hook execution.\n"
11620
"-Dhpss Trace smart protocol requests and responses.\n"
11621
"-Dhpssdetail More hpss details.\n"
11622
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11623
"-Dhttp Trace http connections, requests and responses.\n"
11624
"-Dindex Trace major index operations.\n"
11625
"-Dknit Trace knit operations.\n"
11626
"-Dlock Trace when lockdir locks are taken or released.\n"
11627
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11628
" retrying the request.\n"
11629
"-Dprogress Trace progress bar operations.\n"
11630
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11631
"-Dmerge Emit information for debugging merges.\n"
11632
"-Dno_apport Don't use apport to report crashes.\n"
11633
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11634
"-Dpack Emit information about pack operations.\n"
11635
"-Drelock Emit a message every time a branch or repository object "
11636
"is\n"
11637
" unlocked then relocked the same way.\n"
11638
"-Dsftp Trace SFTP internals.\n"
11639
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11640
"expected\n"
11641
"-Dstream Trace fetch streams.\n"
11642
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11643
"portable\n"
11644
" manner.\n"
11645
"-Dunlock Some errors during unlock are treated as warnings.\n"
11646
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11647
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11648
"appropriate\n"
11649
" for the format, even for non-local fetches.\n"
11650
msgstr ""
11651
11652
#: en/help_topics/diverged-branches.txt:1
11653
msgid ""
11654
"Diverged Branches\n"
11655
"================="
11656
msgstr ""
11657
11658
#: en/help_topics/diverged-branches.txt:4
11659
msgid ""
11660
"When Bazaar tries to push one branch onto another, it requires that the\n"
11661
"destination branch must be ready to receive the source branch. If this "
11662
"isn't\n"
11663
"the case, then we say that the branches have ``diverged``. Branches are\n"
11664
"considered diverged if the destination branch's most recent commit is one "
11665
"that\n"
11666
"has not been merged (directly or indirectly) by the source branch. To "
11667
"recover\n"
11668
"from diverged branches, one must merge the missing revisions into the "
11669
"source\n"
11670
"branch."
11671
msgstr ""
11672
11673
#: en/help_topics/diverged-branches.txt:12
11674
msgid ""
11675
"This situation commonly arises when using a centralized workflow with local\n"
11676
"commits. If someone else has committed new work to the mainline since your\n"
11677
"last pull and you have local commits that have not yet been pushed to the\n"
11678
"mainline, then your local branch and the mainline have diverged."
11679
msgstr ""
11680
11681
#: en/help_topics/diverged-branches.txt:17
11682
msgid ""
11683
"Discovering What Has Diverged\n"
11684
"-----------------------------"
11685
msgstr ""
11686
11687
#: en/help_topics/diverged-branches.txt:20
11688
msgid ""
11689
"The ``bzr missing`` command is used to find out what revisions are in "
11690
"another\n"
11691
"branch that are not present in the current branch, and vice-versa. It shows "
11692
"a\n"
11693
"summary of which extra revisions exist in each branch. If you want to see "
11694
"the\n"
11695
"precise effects of those revisions, you can use ``bzr diff --"
11696
"old=other_branch``\n"
11697
"to show the differences between other_branch and your current branch."
11698
msgstr ""
11699
11700
#: en/help_topics/diverged-branches.txt:26
11701
msgid ""
11702
"A Solution\n"
11703
"----------"
11704
msgstr ""
11705
11706
#: en/help_topics/diverged-branches.txt:29
11707
msgid ""
11708
"The solution is to merge the revisions from the mainline into your local\n"
11709
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11710
"mainline. This merge may result in conflicts if the other developer's "
11711
"changes\n"
11712
"overlap with your changes. These conflicts should be resolved before\n"
11713
"continuing. After any conflicts have been resolved, or even if there were "
11714
"no\n"
11715
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11716
"to your local branch. This requirement gives you an opportunity to test "
11717
"the\n"
11718
"resulting working tree for correctness, since the merged revisions could "
11719
"have\n"
11720
"made arbitrary changes. After testing, you should commit the merge using\n"
11721
"``bzr commit``. This clears up the diverged branches situation. Your "
11722
"local\n"
11723
"branch can now be pushed to the mainline.\n"
11724
msgstr ""
11725
11726
#: en/help_topics/eol.txt:1
11727
msgid ""
11728
"End of Line Conversion\n"
11729
"======================"
11730
msgstr ""
11731
11732
#: en/help_topics/eol.txt:4
11733
msgid ""
11734
"EOL conversion is provided as a content filter where Bazaar internally\n"
11735
"stores a canonical format but outputs a convenience format. See\n"
11736
"``bzr help content-filters`` for general information about using these."
11737
msgstr ""
11738
11739
#: en/help_topics/eol.txt:8
11740
msgid ""
11741
"Note: Content filtering is only supported in recently added formats,\n"
11742
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11743
"in a recent format. (Just setting the format on the repository\n"
11744
"is not enough.) If content filtering does not appear to be working, use\n"
11745
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11746
"or later."
11747
msgstr ""
11748
11749
#: en/help_topics/eol.txt:15
11750
msgid ""
11751
"EOL conversion needs to be enabled for selected file patterns using\n"
11752
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11753
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11754
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11755
"supported in a future verison of Bazaar."
11756
msgstr ""
11757
11758
#: en/help_topics/eol.txt:21
11759
msgid ""
11760
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11761
"(If a value is not set, ``exact`` is the default.)"
11762
msgstr ""
11763
11764
#: en/help_topics/eol.txt:24
11765
msgid ""
11766
" ========== ===================================== ======================\n"
11767
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11768
" ========== ===================================== ======================\n"
11769
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11770
" ---------- ------------------------------------- ----------------------\n"
11771
" ``lf`` ``lf`` ``lf``\n"
11772
" ---------- ------------------------------------- ----------------------\n"
11773
" ``crlf`` ``crlf`` ``lf``\n"
11774
" ---------- ------------------------------------- ----------------------\n"
11775
" ``exact`` No conversion Exactly as in file\n"
11776
" ========== ===================================== ======================"
11777
msgstr ""
11778
11779
#: en/help_topics/eol.txt:36
11780
msgid ""
11781
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11782
"byte is detected in the file."
11783
msgstr ""
11784
11785
#: en/help_topics/eol.txt:39
11786
msgid ""
11787
"For users working on a cross-platform project, here is a suggested rule\n"
11788
"to use as a starting point::"
11789
msgstr ""
11790
11791
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11792
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11793
msgid ""
11794
" [name *]\n"
11795
" eol = native"
11796
msgstr ""
11797
11798
#: en/help_topics/eol.txt:45
11799
msgid ""
11800
"If you have binary files that do not contain a null byte though, be\n"
11801
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11802
"by giving more explicit patterns earlier in the rules file. For example::"
11803
msgstr ""
11804
11805
#: en/help_topics/eol.txt:49
11806
msgid ""
11807
" [name *.png]\n"
11808
" eol = exact"
11809
msgstr ""
11810
11811
#: en/help_topics/eol.txt:55
11812
msgid ""
11813
"If your working tree is on a network drive shared by users on different\n"
11814
"operating systems, you typically want to force certain conventions for\n"
11815
"certain files. In that way, if a file is created with the wrong line\n"
11816
"endings or line endings get mixed during editing, it gets committed\n"
11817
"correctly and gets checked out correctly. For example::"
11818
msgstr ""
11819
11820
#: en/help_topics/eol.txt:61
11821
msgid ""
11822
" [name *.bat]\n"
11823
" eol = crlf"
11824
msgstr ""
11825
11826
#: en/help_topics/eol.txt:64
11827
msgid ""
11828
" [name *.sh]\n"
11829
" eol = lf"
11830
msgstr ""
11831
11832
#: en/help_topics/eol.txt:70
11833
msgid ""
11834
"If you take the care to create files with their required endings, you can\n"
11835
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11836
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11837
"introducing mixed line endings will be corrected during commit for files\n"
11838
"with those settings."
11839
msgstr ""
11840
11841
#: en/help_topics/eol.txt:76
11842
msgid ""
11843
"If you have sample test data that deliberately has text files with mixed\n"
11844
"newline conventions, you can ask for those to be left alone like this::"
11845
msgstr ""
11846
11847
#: en/help_topics/eol.txt:79
11848
msgid ""
11849
" [name test_data/]\n"
11850
" eol = exact"
11851
msgstr ""
11852
11853
#: en/help_topics/eol.txt:85
11854
msgid ""
11855
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11856
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11857
"of content analysis to detect binary files for commands like ``diff``.\n"
11858
"In the future, a ``binary = true`` rule may be added but it is not\n"
11859
"supported yet.)"
11860
msgstr ""
11861
11862
#: en/help_topics/eol.txt:91
11863
msgid ""
11864
"If you have an existing repository with text files already stored using\n"
11865
"Windows newline conventions (``crlf``), then you may want to keep using "
11866
"that\n"
11867
"convention in the repository. Forcing certain files to this convention\n"
11868
"may also help users who do not have rules configured. To do this, set\n"
11869
"``eol`` to one of the values below."
11870
msgstr ""
11871
11872
#: en/help_topics/eol.txt:97
11873
msgid ""
11874
" ============================ ======================== "
11875
"======================\n"
11876
" Value Checkout end-of-lines as Commit end-of-lines "
11877
"as\n"
11878
" ============================ ======================== "
11879
"======================\n"
11880
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11881
" ``lf`` otherwise\n"
11882
" ---------------------------- ------------------------ ----------------------"
11883
"\n"
11884
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11885
" ---------------------------- ------------------------ ----------------------"
11886
"\n"
11887
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11888
" ============================ ======================== ======================"
11889
msgstr ""
11890
11891
#: en/help_topics/eol.txt:108
11892
msgid ""
11893
"For users working on an existing project that uses Windows newline\n"
11894
"conventions in their Bazaar repository, this rule is suggested as a\n"
11895
"starting point::"
11896
msgstr ""
11897
11898
#: en/help_topics/eol.txt:112
11899
msgid ""
11900
" [name *]\n"
11901
" eol = native-with-crlf-in-repo"
11902
msgstr ""
11903
11904
#: en/help_topics/eol.txt:115
11905
msgid ""
11906
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11907
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11908
"``crlf`` and ``exact``."
11909
msgstr ""
11910
11911
#: en/help_topics/eol.txt:119
11912
msgid ""
11913
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11914
"never reject files because a given line ending or mixed line endings\n"
11915
"are found. A precommit hook should be used if you wish to validate\n"
11916
"(and not just convert) content before committing.\n"
11917
msgstr ""
11918
11919
#: en/help_topics/hidden-commands.txt:1
11920
msgid ""
11921
"added List files added in working tree.\n"
11922
"ancestry List all revisions merged into this branch.\n"
11923
"assert-fail Test reporting of assertion failures\n"
11924
"bundle-info Output interesting stats about a bundle\n"
11925
"bundle-revisions Create a merge-directive for submitting changes.\n"
11926
"cat-revision Write out metadata for a revision.\n"
11927
"dump-btree Dump the contents of a btree index file to stdout.\n"
11928
"export-pot Export command helps and error messages in po format.\n"
11929
"file-id Print file_id of a particular file or directory.\n"
11930
"file-path Print path of file_ids to a file or directory.\n"
11931
"find-merge-base Find and print a base revision for merging two "
11932
"branches.\n"
11933
"hooks Show hooks.\n"
11934
"inventory Show inventory of the current working copy or a "
11935
"revision.\n"
11936
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11937
"lookup-revision Lookup the revision-id from a revision-number\n"
11938
"merge-directive Generate a merge directive for auto-merge tools.\n"
11939
"modified List files modified in working tree.\n"
11940
"re-sign Create a digital signature for an existing revision.\n"
11941
"reference list, view and set branch locations for nested trees.\n"
11942
"relpath Show path of a file relative to root\n"
11943
"repair-workingtree Reset the working tree state file.\n"
11944
"revision-history Display the list of revision ids on a branch.\n"
11945
"revision-info Show revision number and revision id for a given "
11946
"revision\n"
11947
" identifier.\n"
11948
"rocks Statement of optimism.\n"
11949
"selftest Run internal test suite.\n"
11950
"shell-complete Show appropriate completions for context.\n"
11951
"test-script Run a shell-like test from a file.\n"
11952
"touching-revisions Return revision-ids which affected a particular file.\n"
11953
"unknowns List unknown files.\n"
11954
"wait-until-signalled Test helper for\n"
11955
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11956
msgstr ""
11957
11958
#: en/help_topics/hooks.txt:1
11959
msgid ""
11960
"\n"
11961
"Hooks\n"
11962
"====="
11963
msgstr ""
11964
11965
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11966
msgid ""
11967
"Introduction\n"
11968
"------------"
11969
msgstr ""
11970
11971
#: en/help_topics/hooks.txt:8
11972
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11973
msgstr ""
11974
11975
#: en/help_topics/hooks.txt:10
11976
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11977
msgstr ""
11978
11979
#: en/help_topics/hooks.txt:12
11980
msgid ""
11981
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11982
msgstr ""
11983
11984
#: en/help_topics/hooks.txt:14
11985
msgid ""
11986
"The class that contains each hook is given before the hooks it supplies. "
11987
"For\n"
11988
"instance, BranchHooks as the class is the hooks class for\n"
11989
"`bzrlib.branch.Branch.hooks`."
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:18
11993
msgid ""
11994
"Each description also indicates whether the hook runs on the client (the\n"
11995
"machine where bzr was invoked) or the server (the machine addressed by\n"
11996
"the branch URL). These may be, but are not necessarily, the same machine."
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:22
12000
msgid ""
12001
"Plugins (including hooks) are run on the server if all of these is true:"
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:24
12005
msgid ""
12006
" * The connection is via a smart server (accessed with a URL starting with\n"
12007
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12008
"\"http://\"\n"
12009
" URL when a smart server is available via HTTP)."
12010
msgstr ""
12011
12012
#: en/help_topics/hooks.txt:28
12013
msgid ""
12014
" * The hook is either server specific or part of general infrastructure "
12015
"rather\n"
12016
" than client specific code (such as commit)."
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:31
12020
msgid ""
12021
"\n"
12022
"BranchHooks\n"
12023
"-----------"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:35
12027
msgid ""
12028
"automatic_tag_name\n"
12029
"~~~~~~~~~~~~~~~~~~"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12033
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12034
msgid "Introduced in: 2.2"
12035
msgstr "Introduzido em: 2.2"
12036
12037
#: en/help_topics/hooks.txt:40
12038
msgid ""
12039
"Called to determine an automatic tag name for a revision.\n"
12040
"automatic_tag_name is called with (branch, revision_id) and should\n"
12041
"return a tag name or None if no tag name could be determined. The\n"
12042
"first non-None tag name returned will be used."
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:45
12046
msgid ""
12047
"open\n"
12048
"~~~~"
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12052
#: en/help_topics/hooks.txt:304
12053
msgid "Introduced in: 1.8"
12054
msgstr "Introduzido em: 1.8"
12055
12056
#: en/help_topics/hooks.txt:50
12057
msgid ""
12058
"Called with the Branch object that has been opened after a branch is\n"
12059
"opened."
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:53
12063
msgid ""
12064
"post_branch_init\n"
12065
"~~~~~~~~~~~~~~~~"
12066
msgstr ""
12067
12068
#: en/help_topics/hooks.txt:58
12069
msgid ""
12070
"Called after new branch initialization completes. post_branch_init is\n"
12071
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12072
"branch and checkout (both heavyweight and lightweight) will all\n"
12073
"trigger this hook."
12074
msgstr ""
12075
12076
#: en/help_topics/hooks.txt:63
12077
msgid ""
12078
"post_change_branch_tip\n"
12079
"~~~~~~~~~~~~~~~~~~~~~~"
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12083
msgid "Introduced in: 1.4"
12084
msgstr "Introduzido em: 1.4"
12085
12086
#: en/help_topics/hooks.txt:68
12087
msgid ""
12088
"Called in bzr client and server after a change to the tip of a branch\n"
12089
"is made. post_change_branch_tip is called with a\n"
12090
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12091
"uncommit will all trigger this hook."
12092
msgstr ""
12093
12094
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12095
msgid ""
12096
"post_commit\n"
12097
"~~~~~~~~~~~"
12098
msgstr ""
12099
"post_commit\n"
12100
"~~~~~~~~~~~"
12101
12102
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12103
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12104
#: en/help_topics/hooks.txt:145
12105
msgid "Introduced in: 0.15"
12106
msgstr "Introduzido em: 0.15"
12107
12108
#: en/help_topics/hooks.txt:78
12109
msgid ""
12110
"Called in the bzr client after a commit has completed. post_commit is\n"
12111
"called with (local, master, old_revno, old_revid, new_revno,\n"
12112
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12113
"branch."
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:83
12117
msgid ""
12118
"post_pull\n"
12119
"~~~~~~~~~"
12120
msgstr ""
12121
"post_pull\n"
12122
"~~~~~~~~~"
12123
12124
#: en/help_topics/hooks.txt:88
12125
msgid ""
12126
"Called after a pull operation completes. post_pull is called with a\n"
12127
"bzrlib.branch.PullResult object and only runs in the bzr client."
12128
msgstr ""
12129
12130
#: en/help_topics/hooks.txt:91
12131
msgid ""
12132
"post_push\n"
12133
"~~~~~~~~~"
12134
msgstr ""
12135
"post_push\n"
12136
"~~~~~~~~~"
12137
12138
#: en/help_topics/hooks.txt:96
12139
msgid ""
12140
"Called after a push operation completes. post_push is called with a\n"
12141
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:99
12145
msgid ""
12146
"post_switch\n"
12147
"~~~~~~~~~~~"
12148
msgstr ""
12149
"post_switch\n"
12150
"~~~~~~~~~~~"
12151
12152
#: en/help_topics/hooks.txt:104
12153
msgid ""
12154
"Called after a checkout switches branch. post_switch is called with a\n"
12155
"bzrlib.branch.SwitchHookParams."
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:107
12159
msgid ""
12160
"post_uncommit\n"
12161
"~~~~~~~~~~~~~"
12162
msgstr ""
12163
"post_uncommit\n"
12164
"~~~~~~~~~~~~~"
12165
12166
#: en/help_topics/hooks.txt:112
12167
msgid ""
12168
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12169
"called with (local, master, old_revno, old_revid, new_revno,\n"
12170
"new_revid) where local is the local branch or None, master is the\n"
12171
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12172
"of None."
12173
msgstr ""
12174
12175
#: en/help_topics/hooks.txt:118
12176
msgid ""
12177
"pre_change_branch_tip\n"
12178
"~~~~~~~~~~~~~~~~~~~~~"
12179
msgstr ""
12180
12181
#: en/help_topics/hooks.txt:121
12182
msgid "Introduced in: 1.6"
12183
msgstr "Introduzido em: 1.6"
12184
12185
#: en/help_topics/hooks.txt:123
12186
msgid ""
12187
"Called in bzr client and server before a change to the tip of a branch\n"
12188
"is made. pre_change_branch_tip is called with a\n"
12189
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12190
"uncommit will all trigger this hook."
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:128
12194
msgid ""
12195
"pre_commit\n"
12196
"~~~~~~~~~~"
12197
msgstr ""
12198
"pre_commit\n"
12199
"~~~~~~~~~~"
12200
12201
#: en/help_topics/hooks.txt:131
12202
msgid "Introduced in: 0.91"
12203
msgstr "Introduzido em: 0.91"
12204
12205
#: en/help_topics/hooks.txt:133
12206
msgid ""
12207
"Called after a commit is calculated but before it is completed.\n"
12208
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12209
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12210
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12211
"TreeDelta object describing changes from the basis revision. hooks\n"
12212
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12213
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12214
"tree."
12215
msgstr ""
12216
12217
#: en/help_topics/hooks.txt:142
12218
msgid ""
12219
"set_rh\n"
12220
"~~~~~~"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:147
12224
msgid ""
12225
"Invoked whenever the revision history has been set via\n"
12226
"set_revision_history. The api signature is (branch, revision_history),\n"
12227
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12228
"for bzr to trigger, a better hook to use is\n"
12229
"Branch.post_change_branch_tip."
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:153
12233
msgid ""
12234
"transform_fallback_location\n"
12235
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12236
msgstr ""
12237
12238
#: en/help_topics/hooks.txt:156
12239
msgid "Introduced in: 1.9"
12240
msgstr "Introduzido em: 1.9"
12241
12242
#: en/help_topics/hooks.txt:158
12243
msgid ""
12244
"Called when a stacked branch is activating its fallback locations.\n"
12245
"transform_fallback_location is called with (branch, url), and should\n"
12246
"return a new url. Returning the same url allows it to be used as-is,\n"
12247
"returning a different one can be used to cause the branch to stack on\n"
12248
"a closer copy of that fallback_location. Note that the branch cannot\n"
12249
"have history accessing methods called on it during this hook because\n"
12250
"the fallback locations have not been activated. When there are\n"
12251
"multiple hooks installed for transform_fallback_location, all are\n"
12252
"called with the url returned from the previous hook.The order is\n"
12253
"however undefined."
12254
msgstr ""
12255
12256
#: en/help_topics/hooks.txt:169
12257
msgid ""
12258
"CommandHooks\n"
12259
"------------"
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:172
12263
msgid ""
12264
"extend_command\n"
12265
"~~~~~~~~~~~~~~"
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:175
12269
msgid "Introduced in: 1.13"
12270
msgstr "Introduzido em: 1.13"
12271
12272
#: en/help_topics/hooks.txt:177
12273
msgid ""
12274
"Called after creating a command object to allow modifications such as\n"
12275
"adding or removing options, docs etc. Called with the new\n"
12276
"bzrlib.commands.Command object."
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:181
12280
msgid ""
12281
"get_command\n"
12282
"~~~~~~~~~~~"
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12286
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12287
msgid "Introduced in: 1.17"
12288
msgstr "Introduzido em: 1.17"
12289
12290
#: en/help_topics/hooks.txt:186
12291
msgid ""
12292
"Called when creating a single command. Called with (cmd_or_None,\n"
12293
"command_name). get_command should either return the cmd_or_None\n"
12294
"parameter, or a replacement Command object that should be used for the\n"
12295
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12296
"Many users will prefer to use bzrlib.commands.register_command or\n"
12297
"plugin_cmds.register_lazy."
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:193
12301
msgid ""
12302
"get_missing_command\n"
12303
"~~~~~~~~~~~~~~~~~~~"
12304
msgstr ""
12305
12306
#: en/help_topics/hooks.txt:198
12307
msgid ""
12308
"Called when creating a single command if no command could be found.\n"
12309
"Called with (command_name). get_missing_command should either return\n"
12310
"None, or a Command object to be used for the command."
12311
msgstr ""
12312
12313
#: en/help_topics/hooks.txt:202
12314
msgid ""
12315
"list_commands\n"
12316
"~~~~~~~~~~~~~"
12317
msgstr ""
12318
12319
#: en/help_topics/hooks.txt:207
12320
msgid ""
12321
"Called when enumerating commands. Called with a set of cmd_name\n"
12322
"strings for all the commands found so far. This set is safe to mutate\n"
12323
"- e.g. to remove a command. list_commands should return the updated\n"
12324
"set of command names."
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:212
12328
msgid ""
12329
"_ConfigHooks\n"
12330
"------------"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:215
12334
msgid ""
12335
"get\n"
12336
"~~~"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12340
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12341
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12342
#: en/help_topics/hooks.txt:443
12343
msgid "Introduced in: 2.4"
12344
msgstr "Introduzido em: 2.4"
12345
12346
#: en/help_topics/hooks.txt:220
12347
msgid ""
12348
"Invoked when a config option is read. The signature is (stack, name,\n"
12349
"value)."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:223
12353
msgid ""
12354
"load\n"
12355
"~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:228
12359
msgid "Invoked when a config store is loaded. The signature is (store)."
12360
msgstr ""
12361
12362
#: en/help_topics/hooks.txt:230
12363
msgid ""
12364
"remove\n"
12365
"~~~~~~"
12366
msgstr ""
12367
12368
#: en/help_topics/hooks.txt:235
12369
msgid ""
12370
"Invoked when a config option is removed. The signature is (stack,\n"
12371
"name)."
12372
msgstr ""
12373
12374
#: en/help_topics/hooks.txt:238
12375
msgid ""
12376
"save\n"
12377
"~~~~"
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:243
12381
msgid "Invoked when a config store is saved. The signature is (store)."
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:245
12385
msgid ""
12386
"set\n"
12387
"~~~"
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:250
12391
msgid ""
12392
"Invoked when a config option is set. The signature is (stack, name,\n"
12393
"value)."
12394
msgstr ""
12395
12396
#: en/help_topics/hooks.txt:253
12397
msgid ""
12398
"ControlDirHooks\n"
12399
"---------------"
12400
msgstr ""
12401
12402
#: en/help_topics/hooks.txt:256
12403
msgid ""
12404
"post_repo_init\n"
12405
"~~~~~~~~~~~~~~"
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:261
12409
msgid ""
12410
"Invoked after a repository has been initialized. post_repo_init is\n"
12411
"called with a bzrlib.controldir.RepoInitHookParams."
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:264
12415
msgid ""
12416
"pre_open\n"
12417
"~~~~~~~~"
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:267
12421
msgid "Introduced in: 1.14"
12422
msgstr "Introduzido em: 1.14"
12423
12424
#: en/help_topics/hooks.txt:269
12425
msgid ""
12426
"Invoked before attempting to open a ControlDir with the transport that\n"
12427
"the open will use."
12428
msgstr ""
12429
12430
#: en/help_topics/hooks.txt:272
12431
msgid ""
12432
"InfoHooks\n"
12433
"---------"
12434
msgstr ""
12435
12436
#: en/help_topics/hooks.txt:275
12437
msgid ""
12438
"repository\n"
12439
"~~~~~~~~~~"
12440
msgstr ""
12441
12442
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12443
#: en/help_topics/hooks.txt:521
12444
msgid "Introduced in: 1.15"
12445
msgstr "Introduzido em: 1.15.0"
12446
12447
#: en/help_topics/hooks.txt:280
12448
msgid ""
12449
"Invoked when displaying the statistics for a repository. repository is\n"
12450
"called with a statistics dictionary as returned by the repository and\n"
12451
"a file-like object to write to."
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:284
12455
msgid ""
12456
"LockHooks\n"
12457
"---------"
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:287
12461
msgid ""
12462
"lock_acquired\n"
12463
"~~~~~~~~~~~~~"
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:292
12467
msgid ""
12468
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12469
msgstr ""
12470
12471
#: en/help_topics/hooks.txt:294
12472
msgid ""
12473
"lock_broken\n"
12474
"~~~~~~~~~~~"
12475
msgstr ""
12476
12477
#: en/help_topics/hooks.txt:299
12478
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:301
12482
msgid ""
12483
"lock_released\n"
12484
"~~~~~~~~~~~~~"
12485
msgstr ""
12486
12487
#: en/help_topics/hooks.txt:306
12488
msgid ""
12489
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:308
12493
msgid ""
12494
"MergeHooks\n"
12495
"----------"
12496
msgstr ""
12497
12498
#: en/help_topics/hooks.txt:311
12499
msgid ""
12500
"merge_file_content\n"
12501
"~~~~~~~~~~~~~~~~~~"
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:314
12505
msgid "Introduced in: 2.1"
12506
msgstr "Introduzido em: 2.1"
12507
12508
#: en/help_topics/hooks.txt:316
12509
msgid ""
12510
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12511
"object when starting a merge. Should return either None or a subclass\n"
12512
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12513
"called per file that needs to be merged (including when one side has\n"
12514
"deleted the file and the other has changed it). See the\n"
12515
"AbstractPerFileMerger API docs for details on how it is used by merge."
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:323
12519
msgid ""
12520
"post_merge\n"
12521
"~~~~~~~~~~"
12522
msgstr ""
12523
12524
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12525
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12526
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12527
msgid "Introduced in: 2.5"
12528
msgstr "Introduzido em: 2.5"
12529
12530
#: en/help_topics/hooks.txt:328
12531
msgid ""
12532
"Called after a merge. Receives a Merger object as the single argument.\n"
12533
"The return value is ignored."
12534
msgstr ""
12535
12536
#: en/help_topics/hooks.txt:331
12537
msgid ""
12538
"pre_merge\n"
12539
"~~~~~~~~~"
12540
msgstr ""
12541
12542
#: en/help_topics/hooks.txt:336
12543
msgid ""
12544
"Called before a merge. Receives a Merger object as the single\n"
12545
"argument."
12546
msgstr ""
12547
12548
#: en/help_topics/hooks.txt:339
12549
msgid ""
12550
"MergeDirectiveHooks\n"
12551
"-------------------"
12552
msgstr ""
12553
12554
#: en/help_topics/hooks.txt:342
12555
msgid ""
12556
"merge_request_body\n"
12557
"~~~~~~~~~~~~~~~~~~"
12558
msgstr ""
12559
12560
#: en/help_topics/hooks.txt:345
12561
msgid "Introduced in: 1.15.0"
12562
msgstr "Introduzido em: 1.15.0"
12563
12564
#: en/help_topics/hooks.txt:347
12565
msgid ""
12566
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12567
"request. Callbacks must return a body. If more than one callback is\n"
12568
"registered, the output of one callback is provided to the next."
12569
msgstr ""
12570
12571
#: en/help_topics/hooks.txt:351
12572
msgid ""
12573
"MessageEditorHooks\n"
12574
"------------------"
12575
msgstr ""
12576
12577
#: en/help_topics/hooks.txt:354
12578
msgid ""
12579
"commit_message_template\n"
12580
"~~~~~~~~~~~~~~~~~~~~~~~"
12581
msgstr ""
12582
12583
#: en/help_topics/hooks.txt:357
12584
msgid "Introduced in: 1.10"
12585
msgstr "Introduzido em: 1.10"
12586
12587
#: en/help_topics/hooks.txt:359
12588
msgid ""
12589
"Called when a commit message is being generated.\n"
12590
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12591
"and the message that is known so far. commit_message_template must\n"
12592
"return a new message to use (which could be the same as it was given).\n"
12593
"When there are multiple hooks registered for commit_message_template,\n"
12594
"they are chained with the result from the first passed into the\n"
12595
"second, and so on."
12596
msgstr ""
12597
12598
#: en/help_topics/hooks.txt:367
12599
msgid ""
12600
"set_commit_message\n"
12601
"~~~~~~~~~~~~~~~~~~"
12602
msgstr ""
12603
12604
#: en/help_topics/hooks.txt:372
12605
msgid ""
12606
"Set a fixed commit message. set_commit_message is called with the\n"
12607
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12608
"properties by editing commit.builder._revprops) and the message so\n"
12609
"far. set_commit_message must return the message to use or None if it\n"
12610
"should use the message editor as normal."
12611
msgstr ""
12612
12613
#: en/help_topics/hooks.txt:378
12614
msgid ""
12615
"MutableTreeHooks\n"
12616
"----------------"
12617
msgstr ""
12618
12619
#: en/help_topics/hooks.txt:381
12620
msgid ""
12621
"post_build_tree\n"
12622
"~~~~~~~~~~~~~~~"
12623
msgstr ""
12624
12625
#: en/help_topics/hooks.txt:386
12626
msgid ""
12627
"Called after a completely new tree is built. The hook is called with\n"
12628
"the tree as its only argument."
12629
msgstr ""
12630
12631
#: en/help_topics/hooks.txt:392
12632
msgid "Introduced in: 2.0"
12633
msgstr "Introduzido em: 2.0"
12634
12635
#: en/help_topics/hooks.txt:394
12636
msgid ""
12637
"Called after a commit is performed on a tree. The hook is called with\n"
12638
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12639
"commit was performed on is available via the mutable_tree attribute of\n"
12640
"that object."
12641
msgstr ""
12642
12643
#: en/help_topics/hooks.txt:399
12644
msgid ""
12645
"post_transform\n"
12646
"~~~~~~~~~~~~~~"
12647
msgstr ""
12648
12649
#: en/help_topics/hooks.txt:404
12650
msgid ""
12651
"Called after a tree transform has been performed on a tree. The hook\n"
12652
"is called with the tree that is being transformed and the transform."
12653
msgstr ""
12654
12655
#: en/help_topics/hooks.txt:407
12656
msgid ""
12657
"pre_transform\n"
12658
"~~~~~~~~~~~~~"
12659
msgstr ""
12660
12661
#: en/help_topics/hooks.txt:412
12662
msgid ""
12663
"Called before a tree transform on this tree. The hook is called with\n"
12664
"the tree that is being transformed and the transform."
12665
msgstr ""
12666
12667
#: en/help_topics/hooks.txt:415
12668
msgid ""
12669
"start_commit\n"
12670
"~~~~~~~~~~~~"
12671
msgstr ""
12672
12673
#: en/help_topics/hooks.txt:420
12674
msgid ""
12675
"Called before a commit is performed on a tree. The start commit hook\n"
12676
"is able to change the tree before the commit takes place. start_commit\n"
12677
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12678
"being performed on."
12679
msgstr ""
12680
12681
#: en/help_topics/hooks.txt:425
12682
msgid ""
12683
"SmartClientHooks\n"
12684
"----------------"
12685
msgstr ""
12686
12687
#: en/help_topics/hooks.txt:428
12688
msgid ""
12689
"call\n"
12690
"~~~~"
12691
msgstr ""
12692
12693
#: en/help_topics/hooks.txt:431
12694
msgid "Introduced in: unknown"
12695
msgstr "Introduzido em: desconhecido"
12696
12697
#: en/help_topics/hooks.txt:433
12698
msgid ""
12699
"Called when the smart client is submitting a request to the smart\n"
12700
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12701
"Streaming request bodies, and responses, are not accessible."
12702
msgstr ""
12703
12704
#: en/help_topics/hooks.txt:437
12705
msgid ""
12706
"SmartServerHooks\n"
12707
"----------------"
12708
msgstr ""
12709
12710
#: en/help_topics/hooks.txt:440
12711
msgid ""
12712
"server_exception\n"
12713
"~~~~~~~~~~~~~~~~"
12714
msgstr ""
12715
12716
#: en/help_topics/hooks.txt:445
12717
msgid ""
12718
"Called by the bzr server when an exception occurs. server_exception is\n"
12719
"called with the sys.exc_info() tuple return true for the hook if the\n"
12720
"exception has been handled, in which case the server will exit\n"
12721
"normally."
12722
msgstr ""
12723
12724
#: en/help_topics/hooks.txt:450
12725
msgid ""
12726
"server_started\n"
12727
"~~~~~~~~~~~~~~"
12728
msgstr ""
12729
12730
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12731
msgid "Introduced in: 0.16"
12732
msgstr "Introduzido em: 0.16"
12733
12734
#: en/help_topics/hooks.txt:455
12735
msgid ""
12736
"Called by the bzr server when it starts serving a directory.\n"
12737
"server_started is called with (backing urls, public url), where\n"
12738
"backing_url is a list of URLs giving the server-specific directory\n"
12739
"locations, and public_url is the public URL for the directory being\n"
12740
"served."
12741
msgstr ""
12742
12743
#: en/help_topics/hooks.txt:461
12744
msgid ""
12745
"server_started_ex\n"
12746
"~~~~~~~~~~~~~~~~~"
12747
msgstr ""
12748
12749
#: en/help_topics/hooks.txt:466
12750
msgid ""
12751
"Called by the bzr server when it starts serving a directory.\n"
12752
"server_started is called with (backing_urls, server_obj)."
12753
msgstr ""
12754
12755
#: en/help_topics/hooks.txt:469
12756
msgid ""
12757
"server_stopped\n"
12758
"~~~~~~~~~~~~~~"
12759
msgstr ""
12760
12761
#: en/help_topics/hooks.txt:474
12762
msgid ""
12763
"Called by the bzr server when it stops serving a directory.\n"
12764
"server_stopped is called with the same parameters as the\n"
12765
"server_started hook: (backing_urls, public_url)."
12766
msgstr ""
12767
12768
#: en/help_topics/hooks.txt:478
12769
msgid ""
12770
"StatusHooks\n"
12771
"-----------"
12772
msgstr ""
12773
12774
#: en/help_topics/hooks.txt:481
12775
msgid ""
12776
"post_status\n"
12777
"~~~~~~~~~~~"
12778
msgstr ""
12779
12780
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12781
msgid "Introduced in: 2.3"
12782
msgstr "Introduzido em: 2.3"
12783
12784
#: en/help_topics/hooks.txt:486
12785
msgid ""
12786
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12787
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12788
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12789
"correspond to the command line options specified by the user for the\n"
12790
"status command. to_file is the output stream for writing."
12791
msgstr ""
12792
12793
#: en/help_topics/hooks.txt:492
12794
msgid ""
12795
"pre_status\n"
12796
"~~~~~~~~~~"
12797
msgstr ""
12798
12799
#: en/help_topics/hooks.txt:497
12800
msgid ""
12801
"Called with argument StatusHookParams before Bazaar displays the\n"
12802
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12803
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12804
"correspond to the command line options specified by the user for the\n"
12805
"status command. to_file is the output stream for writing."
12806
msgstr ""
12807
12808
#: en/help_topics/hooks.txt:503
12809
msgid ""
12810
"TransportHooks\n"
12811
"--------------"
12812
msgstr ""
12813
12814
#: en/help_topics/hooks.txt:506
12815
msgid ""
12816
"post_connect\n"
12817
"~~~~~~~~~~~~"
12818
msgstr ""
12819
12820
#: en/help_topics/hooks.txt:511
12821
msgid ""
12822
"Called after a new connection is established or a reconnect occurs.\n"
12823
"The sole argument passed is either the connected transport or smart\n"
12824
"medium instance."
12825
msgstr ""
12826
12827
#: en/help_topics/hooks.txt:515
12828
msgid ""
12829
"RioVersionInfoBuilderHooks\n"
12830
"--------------------------"
12831
msgstr ""
12832
12833
#: en/help_topics/hooks.txt:518
12834
msgid ""
12835
"revision\n"
12836
"~~~~~~~~"
12837
msgstr ""
12838
12839
#: en/help_topics/hooks.txt:523
12840
msgid ""
12841
"Invoked when adding information about a revision to the RIO stanza\n"
12842
"that is printed. revision is called with a revision object and a RIO\n"
12843
"stanza.\n"
12844
msgstr ""
12845
12846
#: en/help_topics/location-alias.txt:1
12847
msgid ""
12848
"Location aliases\n"
12849
"================"
12850
msgstr ""
12851
12852
#: en/help_topics/location-alias.txt:4
12853
msgid ""
12854
"Bazaar defines several aliases for locations associated with a branch. "
12855
"These\n"
12856
"can be used with most commands that expect a location, such as `bzr push`."
12857
msgstr ""
12858
12859
#: en/help_topics/location-alias.txt:7
12860
msgid "The aliases are::"
12861
msgstr ""
12862
12863
#: en/help_topics/location-alias.txt:9
12864
msgid ""
12865
" :bound The branch this branch is bound to, for bound branches.\n"
12866
" :parent The parent of this branch.\n"
12867
" :public The public location of this branch.\n"
12868
" :push The saved location used for `bzr push` with no arguments.\n"
12869
" :submit The submit branch for this branch.\n"
12870
" :this This branch."
12871
msgstr ""
12872
12873
#: en/help_topics/location-alias.txt:16
12874
msgid "For example, to push to the parent location::"
12875
msgstr ""
12876
12877
#: en/help_topics/location-alias.txt:18
12878
msgid " bzr push :parent\n"
12879
msgstr ""
12880
12881
#: en/help_topics/log-formats.txt:1
12882
msgid ""
12883
"Log Formats\n"
12884
"==========="
12885
msgstr ""
12886
12887
#: en/help_topics/log-formats.txt:4
12888
msgid ""
12889
"A log format controls how information about each revision is displayed.\n"
12890
"The standard log formats are compared below::"
12891
msgstr ""
12892
12893
#: en/help_topics/log-formats.txt:7
12894
msgid ""
12895
" Feature long short line\n"
12896
" ---------------------- ------------- ------------ -------------------\n"
12897
" design goal detailed view concise view 1 revision per line\n"
12898
" committer name+email name only name only\n"
12899
" author name+email - -\n"
12900
" date-time format full date only date only\n"
12901
" commit message full full top line\n"
12902
" tags yes yes yes\n"
12903
" merges indicator - yes -\n"
12904
" status/delta optional optional -\n"
12905
" diff/patch optional optional -\n"
12906
" revision-id optional optional -\n"
12907
" branch nick yes - -\n"
12908
" foreign vcs properties yes yes -\n"
12909
" preferred levels all 1 1\n"
12910
" digital signature optional - -"
12911
msgstr ""
12912
12913
#: en/help_topics/log-formats.txt:24
12914
msgid ""
12915
"The default format is ``long``. To change this, define the ``log_format``\n"
12916
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12917
msgstr ""
12918
12919
#: en/help_topics/log-formats.txt:27
12920
msgid ""
12921
" [DEFAULT]\n"
12922
" log_format = short"
12923
msgstr ""
12924
12925
#: en/help_topics/log-formats.txt:30
12926
msgid ""
12927
"Alternatively, to change the log format used for a given query, use the\n"
12928
"--long, --short or --line options."
12929
msgstr ""
12930
12931
#: en/help_topics/log-formats.txt:33
12932
msgid ""
12933
"If one of the standard log formats does not meet your needs, additional\n"
12934
"formats can be provided by plugins.\n"
12935
msgstr ""
12936
12937
#: en/help_topics/other-formats.txt:1
12938
msgid "Other Storage Formats"
12939
msgstr "Outros formatos de armazenamento"
12940
12941
#: en/help_topics/other-formats.txt:3
12942
msgid "Experimental formats are shown below."
12943
msgstr "Formatos experimentais são mostrados abaixo."
12944
12945
#: en/help_topics/other-formats.txt:5
12946
msgid ""
12947
":development-colo:\n"
12948
" (native) The 2a format with experimental support for colocated\n"
12949
" branches."
12950
msgstr ""
12951
12952
#: en/help_topics/other-formats.txt:9
12953
msgid ""
12954
"\n"
12955
"Deprecated formats are shown below."
12956
msgstr ""
12957
"\n"
12958
"Formatos obsoletos são mostrados abaixo."
12959
12960
#: en/help_topics/other-formats.txt:12
12961
msgid ""
12962
":pack-0.92:\n"
12963
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12964
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12965
" by bzr < 0.92."
12966
msgstr ""
12967
12968
#: en/help_topics/patterns.txt:1
12969
msgid ""
12970
"Patterns\n"
12971
"========"
12972
msgstr ""
12973
12974
#: en/help_topics/patterns.txt:4
12975
msgid ""
12976
"Bazaar uses patterns to match files at various times. For example,\n"
12977
"the ``add`` command skips over files that match ignore patterns\n"
12978
"and preferences can be associated with files using rule patterns.\n"
12979
"The pattern syntax is described below."
12980
msgstr ""
12981
12982
#: en/help_topics/patterns.txt:9
12983
msgid ""
12984
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12985
"slash or is a regular expression, it is compared to the whole path\n"
12986
"from the branch root. Otherwise, it is compared to only the last\n"
12987
"component of the path. To match a file only in the root directory,\n"
12988
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12989
msgstr ""
12990
12991
#: en/help_topics/patterns.txt:15
12992
msgid "Patterns may include globbing wildcards such as::"
12993
msgstr ""
12994
12995
#: en/help_topics/patterns.txt:17
12996
msgid ""
12997
" ? - Matches any single character except '/'\n"
12998
" * - Matches 0 or more characters except '/'\n"
12999
" /**/ - Matches 0 or more directories in a path\n"
13000
" [a-z] - Matches a single character from within a group of characters"
13001
msgstr ""
13002
13003
#: en/help_topics/patterns.txt:22
13004
msgid ""
13005
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13006
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13007
"expression. Regular expression patterns may not include named or\n"
13008
"numbered groups."
13009
msgstr ""
13010
13011
#: en/help_topics/patterns.txt:27
13012
msgid ""
13013
"Case insensitive ignore patterns can be specified with regular expressions\n"
13014
"by using the ``i`` (for ignore case) flag in the pattern."
13015
msgstr ""
13016
13017
#: en/help_topics/patterns.txt:30
13018
msgid ""
13019
"For example, a case insensitive match for ``foo`` may be specified as::"
13020
msgstr ""
13021
13022
#: en/help_topics/patterns.txt:32
13023
msgid " RE:(?i)foo"
13024
msgstr ""
13025
13026
#: en/help_topics/patterns.txt:34
13027
msgid ""
13028
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13029
"matched by that pattern will not be ignored."
13030
msgstr ""
13031
13032
#: en/help_topics/patterns.txt:37
13033
msgid ""
13034
".. _Python regular expressions: http://docs.python.org/library/re.html"
13035
msgstr ""
13036
13037
#: en/help_topics/revisionspec.txt:1
13038
msgid "Revision Identifiers"
13039
msgstr ""
13040
13041
#: en/help_topics/revisionspec.txt:3
13042
msgid ""
13043
"A revision identifier refers to a specific state of a branch's history. It\n"
13044
"can be expressed in several ways. It can begin with a keyword to\n"
13045
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13046
"'before:yesterday' and 'submit:'."
13047
msgstr ""
13048
13049
#: en/help_topics/revisionspec.txt:8
13050
msgid ""
13051
"Alternately, it can be given without a keyword, in which case it will be\n"
13052
"checked as a revision number, a tag, a revision id, a date specification, or "
13053
"a\n"
13054
"branch specification, in that order. For example, 'date:today' could be\n"
13055
"written as simply 'today', though if you have a tag called 'today' that "
13056
"will\n"
13057
"be found first."
13058
msgstr ""
13059
13060
#: en/help_topics/revisionspec.txt:14
13061
msgid ""
13062
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13063
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13064
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13065
"or\n"
13066
"spaces around the '..')."
13067
msgstr ""
13068
13069
#: en/help_topics/revisionspec.txt:19
13070
msgid ""
13071
"Ranges are interpreted differently by different commands. To the \"log\" "
13072
"command,\n"
13073
"a range is a sequence of log messages, but to the \"diff\" command, the "
13074
"range\n"
13075
"denotes a change between revisions (and not a sequence of changes). In\n"
13076
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13077
"consider it\n"
13078
"to be open-ended, that is, they include one end but not the other. For "
13079
"example:\n"
13080
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13081
"3649,\n"
13082
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13083
"and\n"
13084
"3649, but not 3647."
13085
msgstr ""
13086
13087
#: en/help_topics/revisionspec.txt:28
13088
msgid "The keywords used as revision selection methods are the following:"
13089
msgstr ""
13090
13091
#: en/help_topics/revisionspec.txt:30
13092
msgid ""
13093
":revid:\n"
13094
"\tSelects a revision using the revision id.\n"
13095
":submit:\n"
13096
"\tSelects a common ancestor with the submit branch.\n"
13097
":ancestor:\n"
13098
"\tSelects a common ancestor with a second branch.\n"
13099
":date:\n"
13100
"\tSelects a revision on the basis of a datestamp.\n"
13101
":branch:\n"
13102
"\tSelects the last revision of a specified branch.\n"
13103
":tag:\n"
13104
"\tSelects a revision identified by a tag name.\n"
13105
":revno:\n"
13106
"\tSelects a revision using a number.\n"
13107
":before:\n"
13108
"\tSelects the parent of the revision specified.\n"
13109
":annotate:\n"
13110
"\tSelect the revision that last modified the specified line.\n"
13111
":mainline:\n"
13112
"\tSelect mainline revision that merged the specified revision.\n"
13113
":last:\n"
13114
"\tSelects the nth revision from the end."
13115
msgstr ""
13116
13117
#: en/help_topics/revisionspec.txt:53
13118
msgid "In addition, plugins can provide other keywords."
13119
msgstr ""
13120
13121
#: en/help_topics/revisionspec.txt:55
13122
msgid "A detailed description of each keyword is given below."
13123
msgstr ""
13124
13125
#: en/help_topics/revisionspec.txt:57
13126
msgid ":revid:"
13127
msgstr ""
13128
13129
#: en/help_topics/revisionspec.txt:59
13130
msgid ""
13131
" Supply a specific revision id, that can be used to specify any\n"
13132
" revision id in the ancestry of the branch.\n"
13133
" Including merges, and pending merges.\n"
13134
" Examples::"
13135
msgstr ""
13136
13137
#: en/help_topics/revisionspec.txt:64
13138
msgid ""
13139
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13140
msgstr ""
13141
13142
#: en/help_topics/revisionspec.txt:66
13143
msgid ":submit:"
13144
msgstr ""
13145
13146
#: en/help_topics/revisionspec.txt:68
13147
msgid ""
13148
" Diffing against this shows all the changes that were made in this "
13149
"branch,\n"
13150
" and is a good predictor of what merge will do. The submit branch is\n"
13151
" used by the bundle and merge directive commands. If no submit branch\n"
13152
" is specified, the parent branch is used instead."
13153
msgstr ""
13154
13155
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13156
msgid ""
13157
" The common ancestor is the last revision that existed in both\n"
13158
" branches. Usually this is the branch point, but it could also be\n"
13159
" a revision that was merged."
13160
msgstr ""
13161
13162
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13163
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13164
#: en/help_topics/revisionspec.txt:153
13165
msgid " Examples::"
13166
msgstr " Exemplos::"
13167
13168
#: en/help_topics/revisionspec.txt:79
13169
msgid " $ bzr diff -r submit:"
13170
msgstr " $ bzr diff -r submit:"
13171
13172
#: en/help_topics/revisionspec.txt:81
13173
msgid ":ancestor:"
13174
msgstr ""
13175
13176
#: en/help_topics/revisionspec.txt:83
13177
msgid " Supply the path to a branch to select the common ancestor."
13178
msgstr ""
13179
13180
#: en/help_topics/revisionspec.txt:89
13181
msgid ""
13182
" This is frequently used with 'diff' to return all of the changes\n"
13183
" that your branch introduces, while excluding the changes that you\n"
13184
" have not merged from the remote branch."
13185
msgstr ""
13186
13187
#: en/help_topics/revisionspec.txt:95
13188
msgid ""
13189
" ancestor:/path/to/branch\n"
13190
" $ bzr diff -r ancestor:../../mainline/branch"
13191
msgstr ""
13192
13193
#: en/help_topics/revisionspec.txt:98
13194
msgid ":date:"
13195
msgstr ""
13196
13197
#: en/help_topics/revisionspec.txt:100
13198
msgid ""
13199
" Supply a datestamp to select the first revision that matches the date.\n"
13200
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13201
" Matches the first entry after a given date (either at midnight or\n"
13202
" at a specified time)."
13203
msgstr ""
13204
13205
#: en/help_topics/revisionspec.txt:105
13206
msgid " One way to display all the changes since yesterday would be::"
13207
msgstr ""
13208
13209
#: en/help_topics/revisionspec.txt:107
13210
msgid " bzr log -r date:yesterday.."
13211
msgstr ""
13212
13213
#: en/help_topics/revisionspec.txt:111
13214
msgid ""
13215
" date:yesterday -> select the first revision since "
13216
"yesterday\n"
13217
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13218
" August 14th, 2006 at 5:10pm."
13219
msgstr ""
13220
13221
#: en/help_topics/revisionspec.txt:115
13222
msgid ":branch:"
13223
msgstr ":ramo:"
13224
13225
#: en/help_topics/revisionspec.txt:117
13226
msgid " Supply the path to a branch to select its last revision."
13227
msgstr ""
13228
" Fornecer o caminho de um ramo para selecionar sua última revisão."
13229
13230
#: en/help_topics/revisionspec.txt:121
13231
msgid " branch:/path/to/branch"
13232
msgstr " branch:/caminho/para/ramo"
13233
13234
#: en/help_topics/revisionspec.txt:123
13235
msgid ":tag:"
13236
msgstr ":tag:"
13237
13238
#: en/help_topics/revisionspec.txt:125
13239
msgid " Tags are stored in the branch and created by the 'tag' command."
13240
msgstr " Tags são armazenadas no ramo e criadas pelo comando 'tag'."
13241
13242
#: en/help_topics/revisionspec.txt:127
13243
msgid ":revno:"
13244
msgstr ":revno:"
13245
13246
#: en/help_topics/revisionspec.txt:129
13247
msgid ""
13248
" Use an integer to specify a revision in the history of the branch.\n"
13249
" Optionally a branch can be specified. A negative number will count\n"
13250
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13251
" one). If the negative number is larger than the branch's history, the\n"
13252
" first revision is returned.\n"
13253
" Examples::"
13254
msgstr ""
13255
13256
#: en/help_topics/revisionspec.txt:136
13257
msgid ""
13258
" revno:1 -> return the first revision of this branch\n"
13259
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13260
" the branch '/path/to/branch'\n"
13261
" revno:-1 -> The last revision in a branch.\n"
13262
" -2:http://other/branch -> The second to last revision in the\n"
13263
" remote branch.\n"
13264
" -1000000 -> Most likely the first revision, unless\n"
13265
" your history is very long."
13266
msgstr ""
13267
13268
#: en/help_topics/revisionspec.txt:145
13269
msgid ":before:"
13270
msgstr ""
13271
13272
#: en/help_topics/revisionspec.txt:147
13273
msgid ""
13274
" Supply any revision spec to return the parent of that revision. This "
13275
"is\n"
13276
" mostly useful when inspecting revisions that are not in the revision "
13277
"history\n"
13278
" of a branch."
13279
msgstr ""
13280
13281
#: en/help_topics/revisionspec.txt:151
13282
msgid ""
13283
" It is an error to request the parent of the null revision (before:0)."
13284
msgstr ""
13285
13286
#: en/help_topics/revisionspec.txt:155
13287
msgid ""
13288
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13289
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13290
" aaaa@bbbb-1234567890\n"
13291
" bzr diff -r before:1913..1913\n"
13292
" -> Find the changes between revision 1913 and its parent "
13293
"(1912).\n"
13294
" (What changes did revision 1913 introduce).\n"
13295
" This is equivalent to: bzr diff -c 1913"
13296
msgstr ""
13297
13298
#: en/help_topics/revisionspec.txt:163
13299
msgid ":annotate:"
13300
msgstr ""
13301
13302
#: en/help_topics/revisionspec.txt:165
13303
msgid ""
13304
" Select the revision that last modified the specified line. Line is\n"
13305
" specified as path:number. Path is a relative path to the file. "
13306
"Numbers\n"
13307
" start at 1, and are relative to the current version, not the last-\n"
13308
" committed version of the file."
13309
msgstr ""
13310
13311
#: en/help_topics/revisionspec.txt:170
13312
msgid ":mainline:"
13313
msgstr ""
13314
13315
#: en/help_topics/revisionspec.txt:172
13316
msgid ""
13317
" Select the revision that merged the specified revision into mainline."
13318
msgstr ""
13319
13320
#: en/help_topics/revisionspec.txt:174
13321
msgid ":last:"
13322
msgstr ""
13323
13324
#: en/help_topics/revisionspec.txt:176
13325
msgid ""
13326
" Supply a positive number to get the nth revision from the end.\n"
13327
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13328
" Examples::"
13329
msgstr ""
13330
13331
#: en/help_topics/revisionspec.txt:180
13332
msgid ""
13333
" last:1 -> return the last revision\n"
13334
" last:3 -> return the revision 2 before the end.\n"
13335
msgstr ""
13336
13337
#: en/help_topics/rules.txt:1
13338
msgid ""
13339
"Rules\n"
13340
"====="
13341
msgstr ""
13342
13343
#: en/help_topics/rules.txt:7
13344
msgid ""
13345
"Rules are defined in ini file format where the sections are file glob\n"
13346
"patterns and the contents of each section are the preferences for files\n"
13347
"matching that pattern(s). For example::"
13348
msgstr ""
13349
13350
#: en/help_topics/rules.txt:11
13351
msgid ""
13352
" [name *.bat]\n"
13353
" eol = native"
13354
msgstr ""
13355
13356
#: en/help_topics/rules.txt:14
13357
msgid ""
13358
" [name *.html *.xml]\n"
13359
" keywords = xml_escape"
13360
msgstr ""
13361
13362
#: en/help_topics/rules.txt:17
13363
msgid ""
13364
"Preferences like these are useful for commands and plugins wishing to\n"
13365
"provide custom behaviour for selected files. For more information on \n"
13366
"end of line conversion see :doc:`eol-help`.\n"
13367
"Keyword support is provided by the `keywords plugin\n"
13368
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13369
msgstr ""
13370
13371
#: en/help_topics/rules.txt:23
13372
msgid ""
13373
"Files\n"
13374
"-----"
13375
msgstr ""
13376
13377
#: en/help_topics/rules.txt:26
13378
msgid ""
13379
"Default rules for all branches are defined in the optional file\n"
13380
"``BZR_HOME/rules``. "
13381
msgstr ""
13382
13383
#: en/help_topics/rules.txt:29
13384
msgid ""
13385
"Rule Patterns\n"
13386
"-------------"
13387
msgstr ""
13388
13389
#: en/help_topics/rules.txt:32
13390
msgid ""
13391
"Patterns are ordered and searching stops as soon as one matches.\n"
13392
"As a consequence, more explicit patterns should be placed towards\n"
13393
"the top of the file. Rule patterns use exactly the same conventions\n"
13394
"as ignore patterns. See :doc:`patterns-help` for details."
13395
msgstr ""
13396
13397
#: en/help_topics/rules.txt:37
13398
msgid ".. note::"
13399
msgstr ""
13400
13401
#: en/help_topics/rules.txt:39
13402
msgid ""
13403
" Patterns containing square brackets or spaces should be\n"
13404
" surrounded in quotes to ensure they are correctly parsed.\n"
13405
msgstr ""
13406
13407
#: en/help_topics/topics.txt:1
13408
msgid ""
13409
"authentication Information on configuring authentication\n"
13410
"basic Basic commands\n"
13411
"branches Information on what a branch is\n"
13412
"bugs Bug tracker settings\n"
13413
"checkouts Information on what a checkout is\n"
13414
"commands Basic help for all commands\n"
13415
"configuration Details on the configuration settings available\n"
13416
"conflict-types Types of conflicts and what to do about them\n"
13417
"content-filters Conversion of content into/from working trees\n"
13418
"criss-cross Information on criss-cross merging\n"
13419
"current-formats Current storage formats\n"
13420
"debug-flags Options to show or record debug information\n"
13421
"diverged-branches How to fix diverged branches\n"
13422
"env-variables Environment variable names and values\n"
13423
"eol Information on end-of-line handling\n"
13424
"files Information on configuration and log files\n"
13425
"formats Information on choosing a storage format\n"
13426
"global-options Options that control how Bazaar runs\n"
13427
"hidden-commands All hidden commands\n"
13428
"hooks Points at which custom processing can be added\n"
13429
"launchpad Using Bazaar with Launchpad.net\n"
13430
"location-alias Aliases for remembered locations\n"
13431
"log-formats Details on the logging formats available\n"
13432
"other-formats Experimental and deprecated storage formats\n"
13433
"patterns Information on the pattern syntax\n"
13434
"repositories Basic information on shared repositories.\n"
13435
"revisionspec Explain how to use --revision\n"
13436
"rules Information on defining rule-based preferences\n"
13437
"standalone-trees Information on what a standalone tree is\n"
13438
"standard-options Options that can be used with any command\n"
13439
"status-flags Help on status flags\n"
13440
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13441
"topics Topics list\n"
13442
"url-special-chars Special character handling in URLs\n"
13443
"urlspec Supported transport protocols\n"
13444
"working-trees Information on working trees\n"
13445
msgstr ""
13446
13447
#: en/help_topics/url-special-chars.txt:1
13448
msgid ""
13449
"Special character handling in URLs\n"
13450
"=================================="
13451
msgstr ""
13452
13453
#: en/help_topics/url-special-chars.txt:4
13454
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13455
msgstr "Bazaar permite locais serem especificados de várias maneiras, seja:"
13456
13457
#: en/help_topics/url-special-chars.txt:6
13458
msgid " * Fully qualified URLs"
13459
msgstr ""
13460
13461
#: en/help_topics/url-special-chars.txt:8
13462
msgid " * File system paths, relative or absolute"
13463
msgstr ""
13464
13465
#: en/help_topics/url-special-chars.txt:10
13466
msgid ""
13467
"Internally bzr treats all locations as URLs. For any file system paths\n"
13468
"that are specified it will automatically determine the appropriate URL\n"
13469
"representation, and escape special characters where necessary."
13470
msgstr ""
13471
13472
#: en/help_topics/url-special-chars.txt:14
13473
msgid ""
13474
"There are a few characters which have special meaning in URLs and need "
13475
"careful\n"
13476
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13477
"value in URLs. Any non-ASCII characters in a file path will automatically "
13478
"be\n"
13479
"urlencoded when the path is converted to a URL."
13480
msgstr ""
13481
13482
#: en/help_topics/url-special-chars.txt:19
13483
msgid ""
13484
"URLs represent non-ASCII characters in an encoding defined by the server, "
13485
"but\n"
13486
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13487
"be\n"
13488
"generous in what it accepts as a URL and to print them in a way that\n"
13489
"will be readable."
13490
msgstr ""
13491
13492
#: en/help_topics/url-special-chars.txt:24
13493
msgid ""
13494
"For example, if you have a directory named '/tmp/%2False' these are all "
13495
"valid\n"
13496
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13497
"slash)::"
13498
msgstr ""
13499
13500
#: en/help_topics/url-special-chars.txt:27
13501
msgid ""
13502
" cd /tmp\n"
13503
" bzr log /tmp/%2False\n"
13504
" bzr log %2False\n"
13505
" bzr log file:///tmp/%252False\n"
13506
" bzr log file://localhost/tmp/%252False\n"
13507
" bzr log file:%252False"
13508
msgstr ""
13509
" cd /tmp\n"
13510
" bzr log /tmp/%2False\n"
13511
" bzr log %2False\n"
13512
" bzr log file:///tmp/%252False\n"
13513
" bzr log file://localhost/tmp/%252False\n"
13514
" bzr log file:%252False"
13515
13516
#: en/help_topics/url-special-chars.txt:34
13517
msgid "These are valid but do not refer to the same file::"
13518
msgstr "Estes são válidos, mas não se referem ao mesmo arquivo::"
13519
13520
#: en/help_topics/url-special-chars.txt:36
13521
msgid ""
13522
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13523
" bzr log %252False (refers to a file called /tmp/%252False)"
13524
msgstr ""
13525
13526
#: en/help_topics/url-special-chars.txt:39
13527
msgid ""
13528
"Comma also has special meaning in URLs, because it denotes `segment "
13529
"parameters`_"
13530
msgstr ""
13531
13532
#: en/help_topics/url-special-chars.txt:41
13533
msgid ""
13534
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13535
msgstr ""
13536
13537
#: en/help_topics/url-special-chars.txt:43
13538
msgid ""
13539
"Comma is also special in any file system paths that are specified. To use a "
13540
"literal\n"
13541
"comma in a file system path, specify a URL and URL encode the comma::"
13542
msgstr ""
13543
13544
#: en/help_topics/url-special-chars.txt:46
13545
msgid ""
13546
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13547
"\"branch\" set to \"bla\"\n"
13548
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13549
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13550
"\"branch\" set to \"bla\"\n"
13551
msgstr ""
13552
13553
#: en/help_topics/urlspec.txt:1
13554
msgid "URL Identifiers"
13555
msgstr "Identificadores de URL"
13556
13557
#: en/help_topics/urlspec.txt:3
13558
msgid "Supported URL prefixes::"
13559
msgstr "Prefixos de URL suportados::"
13560
13561
#: en/help_topics/urlspec.txt:5
13562
msgid ""
13563
" aftp:// Access using active FTP.\n"
13564
" bzr:// Fast access using the Bazaar smart server.\n"
13565
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13566
" file:// Access using the standard filesystem (default)\n"
13567
" ftp:// Access using passive FTP.\n"
13568
" http:// Read-only access of branches exported on the web.\n"
13569
" https:// Read-only access of branches exported on the web using "
13570
"SSL.\n"
13571
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13572
msgstr ""
13573
" aftp:// Acessa usando FTP ativo.\n"
13574
" bzr:// Acesso rápido usando o bazaar smart server.\n"
13575
" bzr+ssh:// Acesso rápido usando o Bazaar smart sobre SSH.\n"
13576
" file:// Acesso usando o sistema de arquivos (padrão)\n"
13577
" ftp:// Acesso usando FTP passivo.\n"
13578
" http:// Acesso somente leitura de ramos exportados na web.\n"
13579
" https:// Acesso somente leitura de ramos exportados na web usando SSL.\n"
13580
" sftp:// Acesso usando SFTP (a maioria dos servidores SSH fornecem acesso "
13581
"SFTP)."
13582
13583
#: en/help_topics/urlspec.txt:14
13584
msgid "Supported modifiers::"
13585
msgstr "Modificadores suportados::"
13586
13587
#: en/help_topics/urlspec.txt:16
13588
msgid " gio+ Access using any GIO supported protocols."
13589
msgstr ""
13590
13591
#: en/help_topics/urlspec.txt:18
13592
msgid "Bazaar supports all of the standard parts within the URL::"
13593
msgstr ""
13594
13595
#: en/help_topics/urlspec.txt:20
13596
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13597
msgstr " <protocolo>://[usuário[:senha]@]servidor[:porta]/[diretório]"
13598
13599
#: en/help_topics/urlspec.txt:22
13600
msgid "allowing URLs such as::"
13601
msgstr "permitindo URLs, tais como::"
13602
13603
#: en/help_topics/urlspec.txt:24
13604
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13605
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13606
13607
#: en/help_topics/urlspec.txt:26
13608
msgid ""
13609
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13610
"with '~' as meaning that the rest of the path should be interpreted\n"
13611
"relative to the remote user's home directory. For example if the user\n"
13612
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13613
"shell.example.com, then::"
13614
msgstr ""
13615
13616
#: en/help_topics/urlspec.txt:32
13617
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13618
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13619
13620
#: en/help_topics/urlspec.txt:34
13621
msgid "would refer to ``/home/remote/myproject/trunk``."
13622
msgstr "refere-se a ``/home/remote/myproject/trunk``."
13623
13624
#: en/help_topics/urlspec.txt:36
13625
msgid ""
13626
"Many commands that accept URLs also accept location aliases too.\n"
13627
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13628
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1