« back to all changes in this revision
Viewing changes to po/pt_BR.po
- browse files at revision 6437.63.12
- compare with another revision
- download diff
- download tarball
- view history from revision 6437.63.12
- Committer: Vincent Ladeuil
- Date: 2013-05-25 17:12:43 UTC
- mto: (6437.77.1 2.5)
- mto: This revision was merged to the branch mainline in revision 6577.
- Revision ID: v.ladeuil+lp@free.fr-20130525171243-au0073fnspecl3kg
Empty arguments in EDITOR are now properly preserved
- files added:
- NEWS
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
added
removed
po/pt_BR.po
1
# Brazilian Portuguese translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-05-19 23:19+0000\n"
12
"Last-Translator: João Lucas <joao-lucas@live.com>\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-05-20 04:54+0000\n"
19
"X-Generator: Launchpad (build 15259)\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
"Desde um checkout leve é pouco mais do que uma árvore de trabalho\n"
262
"isso vai se recusar a executar contra um."
263
264
#: bzrlib/builtins.py:554
265
msgid "To re-create the working tree, use \"bzr checkout\"."
266
msgstr "Para recriar a árvore de trabalho, use \"bzr checkout\"."
267
268
#: bzrlib/builtins.py:560
269
msgid ""
270
"Remove the working tree even if it has uncommitted or shelved changes."
271
msgstr ""
272
"Remover a árvore de trabalho, mesmo que tenha mudanças não confirmadas ou "
273
"arquivadas."
274
275
#: bzrlib/builtins.py:574
276
msgid "No working tree to remove"
277
msgstr "Nenhuma árvore de trabalho para remover"
278
279
#: bzrlib/builtins.py:576
280
msgid "You cannot remove the working tree of a remote path"
281
msgstr "Você não pode remover a árvore de trabalho de um caminho remoto"
282
283
#: bzrlib/builtins.py:585
284
msgid "You cannot remove the working tree from a lightweight checkout"
285
msgstr "Você não pode remover a árvore de trabalho de um projeto importado"
286
287
#: bzrlib/builtins.py:625
288
msgid ""
289
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
290
"instead. Use \"--force\" if you are sure you want to reset the working tree."
291
msgstr ""
292
"A árvore não parece estar corrompida. Você provavelmente vai querer usar "
293
"\"bzr reverter\" como alternativa. Use \"--force\" se você tem certeza que "
294
"deseja redefinir a árvore de trabalho."
295
296
#: bzrlib/builtins.py:636
297
msgid ""
298
", the header appears corrupt, try passing -r -1 to set the state to the last "
299
"commit"
300
msgstr ""
301
", o cabeçalho parece estar corrompido, tente passar -r -1 para definir o "
302
"estado como última submissão"
303
304
#: bzrlib/builtins.py:640
305
msgid "failed to reset the tree state{0}"
306
msgstr "falhou para redefinir o estado da árvore{0}"
307
308
#: bzrlib/builtins.py:644
309
msgid "Show current revision number."
310
msgstr "Mostrar o número da revisão atual."
311
312
#: bzrlib/builtins.py:646
313
msgid "This is equal to the number of revisions on this branch."
314
msgstr "Este é equivalente ao número de revisões no ramo."
315
316
#: bzrlib/builtins.py:659
317
msgid "--tree and --revision can not be used together"
318
msgstr "--tre e --revision não podem ser usados juntos"
319
320
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
321
msgid "Tags can only be placed on a single revision, not on a range"
322
msgstr ""
323
"Tags podem apenas serem colocadas em uma revisão simples, não em um intervalo"
324
325
#: bzrlib/builtins.py:700
326
msgid "Show revno of working tree."
327
msgstr "Mostrar número de revisão da árvore de trabalho."
328
329
#: bzrlib/builtins.py:748
330
msgid "Add specified files or directories."
331
msgstr "Adicionar arquivos ou diretórios especificados."
332
333
#: bzrlib/builtins.py:750
334
msgid ""
335
"In non-recursive mode, all the named items are added, regardless\n"
336
"of whether they were previously ignored. A warning is given if\n"
337
"any of the named files are already versioned."
338
msgstr ""
339
"Em modo não-recursivo, todos os itens nomeados são adicionados, \n"
340
"independentemente de terem sido anteriormente ignorados. Um aviso \n"
341
"é dado se qualquer um dos arquivos nomeados já estiverem versionados."
342
343
#: bzrlib/builtins.py:754
344
msgid ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
msgstr ""
353
"No modo recursivo (o padrão), os arquivos são tratados da mesma maneira\n"
354
"mas o comportamento é diferente para os diretórios. Os diretórios que\n"
355
"já estão versionados não dão um aviso. Todos os diretórios, já versionado \n"
356
"ou não, são pesquisados para que arquivos ou subdiretórios que não \n"
357
"são de nenhuma versão ou foram ignorados, possam ser adicionados. \n"
358
"Esta pesquisa ocorre recursivamente dentro de diretórios \n"
359
"versionados. Se nenhum nome é dado '.' é assumido."
360
361
#: bzrlib/builtins.py:762
362
msgid ""
363
"A warning will be printed when nested trees are encountered,\n"
364
"unless they are explicitly ignored."
365
msgstr ""
366
"Um alerta será impresso quando árvores aninhadas forem encontradas,\n"
367
"exceto que seja explicitamente ignorado."
368
369
#: bzrlib/builtins.py:765
370
msgid ""
371
"Therefore simply saying 'bzr add' will version all files that\n"
372
"are currently unknown."
373
msgstr ""
374
"Portanto, dizendo simplesmente 'bzr add' assumimos que a \n"
375
"versão de todos os arquivos são atualmente desconhecidas."
376
377
#: bzrlib/builtins.py:768
378
msgid ""
379
"Adding a file whose parent directory is not versioned will\n"
380
"implicitly add the parent, and so on up to the root. This means\n"
381
"you should never need to explicitly add a directory, they'll just\n"
382
"get added when you add a file in the directory."
383
msgstr ""
384
"Adicionar um arquivo cujo diretório pai não é versionado irá\n"
385
"implicitamente adicionar o diretório pai, e assim por diante até a raiz. "
386
"Isto significa\n"
387
"que você nunca precisará adicionar explicitamente um diretório, eles apenas\n"
388
"serão adicionados quando você adicionar um arquivo no diretório."
389
390
#: bzrlib/builtins.py:773
391
msgid ""
392
"--dry-run will show which files would be added, but not actually\n"
393
"add them."
394
msgstr ""
395
"--dry-run irá mostrar quais arquivos deveriam ser adicionados, mas na "
396
"verdade\n"
397
"não os adiciona."
398
399
#: bzrlib/builtins.py:776
400
msgid ""
401
"--file-ids-from will try to use the file ids from the supplied path.\n"
402
"It looks up ids trying to find a matching parent directory with the\n"
403
"same filename, and then by pure path. This option is rarely needed\n"
404
"but can be useful when adding the same logical file into two\n"
405
"branches that will be merged later (without showing the two different\n"
406
"adds as a conflict). It is also useful when merging another project\n"
407
"into a subdirectory of this one."
408
msgstr ""
409
"--file-ids-from tentará usar os ids de arquivo do caminho fornecido.\n"
410
"Procura ids tentando encontrar um diretório pai correspondente com\n"
411
"o mesmo nome, e depois pelo caminho absoluto. Esta opção é raramente \n"
412
"necessária mas pode ser útil quando adicionar o mesmo arquivo lógico em \n"
413
"duas ramificações que serão mescladas mais tarde (sem mostrar as duas "
414
"adições \n"
415
"como conflitos). Isto também pode ser útil quando estiver mesclando outro \n"
416
"projeto dentro de um subdiretório deste."
417
418
#: bzrlib/builtins.py:784
419
msgid ""
420
"Any files matching patterns in the ignore list will not be added\n"
421
"unless they are explicitly mentioned."
422
msgstr ""
423
"Quaisquer arquivos correspondentes com o padrão na lista ignorar não serão "
424
"adicionados\n"
425
"a menos que eles sejam explicitamente mencionados."
426
427
#: bzrlib/builtins.py:787
428
msgid ""
429
"In recursive mode, files larger than the configuration option \n"
430
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
431
"to file size."
432
msgstr ""
433
"No modo recursivo, arquivos maiores do que a opção de configuração \n"
434
"add.maximum_file_size serão pulados. Itens nomeados nunca são pulados\n"
435
"devido ao tamanho do arquivo."
436
437
#: bzrlib/builtins.py:794
438
msgid "Don't recursively add the contents of directories."
439
msgstr "Não adiciona recursivamente o conteúdo dos diretórios."
440
441
#: bzrlib/builtins.py:800
442
msgid "Lookup file ids from this tree."
443
msgstr "Pesquisa de arquivo por ids nesta árvore"
444
445
#: bzrlib/builtins.py:836
446
msgid "ignored {0} matching \"{1}\"\n"
447
msgstr "ignorado {0} correspondente a \"{1}\"\n"
448
449
#: bzrlib/builtins.py:841
450
msgid "Create a new versioned directory."
451
msgstr "Criar um novo diretório versionado."
452
453
#: bzrlib/builtins.py:843
454
msgid "This is equivalent to creating the directory and then adding it."
455
msgstr "Isto é equivalente a criar o diretório e depois adicioná-lo."
456
457
#: bzrlib/builtins.py:850
458
msgid "No error if existing, make parent directories as needed."
459
msgstr "Nenhum erro existente, cria diretórios pais conforme necessário."
460
461
#: bzrlib/builtins.py:884
462
#, python-format
463
msgid "added %s\n"
464
msgstr "%s adicionado\n"
465
466
#: bzrlib/builtins.py:926
467
#, python-format
468
msgid "invalid kind %r specified"
469
msgstr "tipo especificado %r é inválido"
470
471
#: bzrlib/builtins.py:963
472
msgid "Move or rename a file."
473
msgstr "Mover ou renomear um arquivo."
474
475
#: bzrlib/builtins.py:965
476
msgid " bzr mv SOURCE... DESTINATION"
477
msgstr " bzr mv ORIGEM... DESTINO"
478
479
#: bzrlib/builtins.py:967
480
msgid ""
481
"If the last argument is a versioned directory, all the other names\n"
482
"are moved into it. Otherwise, there must be exactly two arguments\n"
483
"and the file is changed to a new name."
484
msgstr ""
485
"Se o último argumento é um diretório versionado, todos os outros nomes\n"
486
"são movidos para ele. Caso contrário, deve haver exatamente dois argumentos\n"
487
"e o arquivo é alterado para um novo nome."
488
489
#: bzrlib/builtins.py:971
490
msgid ""
491
"If OLDNAME does not exist on the filesystem but is versioned and\n"
492
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
493
"assumes that the file has been manually moved and only updates\n"
494
"its internal inventory to reflect that change.\n"
495
"The same is valid when moving many SOURCE files to a DESTINATION."
496
msgstr ""
497
"Se NOMEANTIGO não existe no sistema de arquivos, mas é versionado e\n"
498
"NOVONAME existe no sistema de arquivos, mas não é versionado, mv\n"
499
"assume que o arquivo foi movido manualmente e atualiza apenas\n"
500
"seu inventário interno para refletir essa mudança. O mesmo é válido \n"
501
"quando se deslocam muitos arquivos de ORIGEM para um DESTINO."
502
503
#: bzrlib/builtins.py:977
504
msgid "Files cannot be moved between branches."
505
msgstr "Os arquivos não podem ser movidos entre os ramos."
506
507
#: bzrlib/builtins.py:984
508
msgid ""
509
"Move only the bzr identifier of the file, because the file has already been "
510
"moved."
511
msgstr ""
512
"Mover apenas o identificador bzr do arquivo, porque o arquivo já foi movido."
513
514
#: bzrlib/builtins.py:986
515
msgid "Automatically guess renames."
516
msgstr "Prever que será renomeado automaticamente."
517
518
#: bzrlib/builtins.py:987
519
msgid "Avoid making changes when guessing renames."
520
msgstr "Evite fazer alterações quando prever que será renomeado."
521
522
#: bzrlib/builtins.py:996
523
msgid "--dry-run requires --auto."
524
msgstr "--dry-run requer --auto."
525
526
#: bzrlib/builtins.py:1000
527
msgid "missing file argument"
528
msgstr "falta argumento de arquivo"
529
530
#: bzrlib/builtins.py:1004
531
msgid "can not move root of branch"
532
msgstr "não é possível mover a raiz do ramo"
533
534
#: bzrlib/builtins.py:1010
535
msgid "Only one path may be specified to --auto."
536
msgstr "Apenas um caminho deve ser especificado para --auto."
537
538
#: bzrlib/builtins.py:1013
539
msgid "--after cannot be specified with --auto."
540
msgstr "--after não pode ser especificado com --auto."
541
542
#: bzrlib/builtins.py:1050
543
msgid "to mv multiple files the destination must be a versioned directory"
544
msgstr ""
545
"para mover múltiplos arquivos, o destino deve ser um diretório versionado"
546
547
#: bzrlib/builtins.py:1102
548
msgid "Turn this branch into a mirror of another branch."
549
msgstr "Transformar esse ramo em um espelho de outro ramo."
550
551
#: bzrlib/builtins.py:1104
552
msgid ""
553
"By default, this command only works on branches that have not diverged.\n"
554
"Branches are considered diverged if the destination branch's most recent \n"
555
"commit is one that has not been merged (directly or indirectly) into the \n"
556
"parent."
557
msgstr ""
558
"Por padrão, este comando só funciona em ramos não divergentes.\n"
559
"Ramos são considerados não divergentes se o ramo de destino mais \n"
560
"recentemente submetido é aquele que não foi mesclado (direta ou \n"
561
"indiretamente) para o pai."
562
563
#: bzrlib/builtins.py:1109
564
msgid ""
565
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
566
"from one into the other. Once one branch has merged, the other should\n"
567
"be able to pull it again."
568
msgstr ""
569
"Se os ramos divergiram, você pode usar 'bzr merge' para mesclar as "
570
"alterações\n"
571
"de um para o outro. Uma vez que um ramo se fundiu, o outro deve\n"
572
"ser capaz de puxá-lo novamente."
573
574
#: bzrlib/builtins.py:1113
575
msgid ""
576
"If you want to replace your local changes and just want your branch to\n"
577
"match the remote one, use pull --overwrite. This will work even if the two\n"
578
"branches have diverged."
579
msgstr ""
580
"Se você quer substituir suas alterações locais e quer apenas a sua "
581
"ramificação\n"
582
"para corresponder com a remota, use pull --overwrite. Isto funcionará mesmo "
583
"se\n"
584
"as duas ramificações divergiram."
585
586
#: bzrlib/builtins.py:1117
587
msgid ""
588
"If there is no default location set, the first pull will set it (use\n"
589
"--no-remember to avoid setting it). After that, you can omit the\n"
590
"location to use the default. To change the default, use --remember. The\n"
591
"value will only be saved if the remote location can be accessed."
592
msgstr ""
593
"Se não estiver definido a localização padrão, na primeira vez que o projeto "
594
"for puxado será definido (use \n"
595
"--no-remember para evitar isso). Após isso, você pode omitir a localização\n"
596
"para usar o padrão. Para alterar o padrão, use --remember. O valor será\n"
597
"salvo apenas se o local remoto puder ser acessado."
598
599
#: bzrlib/builtins.py:1122
600
msgid ""
601
"The --verbose option will display the revisions pulled using the log_format\n"
602
"configuration option. You can use a different format by overriding it with\n"
603
"-Olog_format=<other_format>."
604
msgstr ""
605
"A opção --verbose irá mostrar as revisões extraídas usando a opção\n"
606
"de configuração log_format. Você pode usar um formato diferente para \n"
607
"substituí-lo com -Olog_format=<outro formato>."
608
609
#: bzrlib/builtins.py:1126
610
msgid ""
611
"Note: The location can be specified either in the form of a branch,\n"
612
"or in the form of a path to a file containing a merge directive generated\n"
613
"with bzr send."
614
msgstr ""
615
"Nota: a localização pode ser especificada ou na forma de uma ramificação,\n"
616
"ou na forma de um caminho para um arquivo contendo uma diretiva\n"
617
"de mesclagem gerada com bzr send."
618
619
#: bzrlib/builtins.py:1134
620
msgid "Show logs of pulled revisions."
621
msgstr "Mostrar os logs de revisões puxadas."
622
623
#: bzrlib/builtins.py:1136
624
msgid ""
625
"Branch to pull into, rather than the one containing the working directory."
626
msgstr ""
627
"Ramificação para extrair, ao invés de uma que contém o diretório de trabalho."
628
629
#: bzrlib/builtins.py:1139
630
msgid ""
631
"Perform a local pull in a bound branch. Local pulls are not applied to the "
632
"master branch."
633
msgstr ""
634
"Realizar uma extração local em uma ramificação limite. Extrações locais não "
635
"são aplicadas na ramificação mestre."
636
637
#: bzrlib/builtins.py:1168
638
msgid "Need working tree for --show-base."
639
msgstr "Necessário a árvore de trabalho para --show-base."
640
641
#: bzrlib/builtins.py:1184
642
msgid "No pull location known or specified."
643
msgstr "Nenhuma localização de extração conhecida ou especificada"
644
645
#: bzrlib/builtins.py:1190
646
#, python-format
647
msgid "Using saved parent location: %s\n"
648
msgstr "Usando a localização pai salva: %s\n"
649
650
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
651
msgid "Cannot use -r with merge directives or bundles"
652
msgstr "Não foi possível usar -r com diretivas mescladas ou empacotadas"
653
654
#: bzrlib/builtins.py:1238
655
msgid "Update a mirror of this branch."
656
msgstr "Atualização de um espelho deste ramo."
657
658
#: bzrlib/builtins.py:1240
659
msgid ""
660
"The target branch will not have its working tree populated because this\n"
661
"is both expensive, and is not supported on remote file systems."
662
msgstr ""
663
"A ramificação alvo não terá sua árvore de trabalho populada porque isto\n"
664
"é dispendioso e não suportado em sistema de arquivos remoto."
665
666
#: bzrlib/builtins.py:1243
667
msgid ""
668
"Some smart servers or protocols *may* put the working tree in place in\n"
669
"the future."
670
msgstr ""
671
"Alguns servidores inteligentes ou protocolos * pode * colocar a árvore de "
672
"trabalho em vigor no\n"
673
"futuro."
674
675
#: bzrlib/builtins.py:1246
676
msgid ""
677
"This command only works on branches that have not diverged. Branches are\n"
678
"considered diverged if the destination branch's most recent commit is one\n"
679
"that has not been merged (directly or indirectly) by the source branch."
680
msgstr ""
681
"Este comando funcionará apenas em ramificações que não possuem divergências. "
682
"Ramificações \n"
683
"são consideradas divergentes se a ramificação de destino possui envios mais "
684
"recentes e \n"
685
"não pode ser fundida (direta ou indiretamente) pela ramificação de origem."
686
687
#: bzrlib/builtins.py:1250
688
msgid ""
689
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
690
"the other branch completely, discarding its unmerged changes."
691
msgstr ""
692
"Se ramificações estão divergentes, você pode usar 'bzr push --overwrite' "
693
"para substituir\n"
694
"a outra ramificação completamente, discartando mudanças não fundidas."
695
696
#: bzrlib/builtins.py:1253
697
msgid ""
698
"If you want to ensure you have the different changes in the other branch,\n"
699
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
700
"After that you will be able to do a push without '--overwrite'."
701
msgstr ""
702
"Se você deseja certificar-se que possui mudanças diferentes em outra "
703
"ramificação,\n"
704
"faça um merge (veja bzr help merge) a partir da outra ramificação, e envie-"
705
"o. Após isto\n"
706
"você será capaz de fazer um push sem \"'--overwrite\"."
707
708
#: bzrlib/builtins.py:1257
709
msgid ""
710
"If there is no default push location set, the first push will set it (use\n"
711
"--no-remember to avoid setting it). After that, you can omit the\n"
712
"location to use the default. To change the default, use --remember. The\n"
713
"value will only be saved if the remote location can be accessed."
714
msgstr ""
715
"Se não houver um definição de localização de envio padrão, o primeiro envio "
716
"irá ajustá-lo (use\n"
717
"--no-remember para evitar isto). Após isto você poderá omitir a\n"
718
"localização para usar o padrão. Para alterar o padrão, use --remember. O\n"
719
"valor será salvo apenas se a localização remota puder ser acessada."
720
721
#: bzrlib/builtins.py:1262
722
msgid ""
723
"The --verbose option will display the revisions pushed using the log_format\n"
724
"configuration option. You can use a different format by overriding it with\n"
725
"-Olog_format=<other_format>."
726
msgstr ""
727
"A opção --verbose irá exibir as revisões enviadas usando a opção de \n"
728
"configuração log_format. Você pode usar um formato diferente substituindo-o "
729
"\n"
730
"com -Olog_format=<outro_formato>"
731
732
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
733
msgid ""
734
"Branch to push from, rather than the one containing the working directory."
735
msgstr ""
736
"Ramo para enviar a partir de, ao invés de uma que contém o diretório de "
737
"trabalho."
738
739
#: bzrlib/builtins.py:1276
740
msgid ""
741
"By default push will fail if the target directory exists, but does not "
742
"already have a control directory. This flag will allow push to proceed."
743
msgstr ""
744
"Por padrão o envio irá falhar se o diretório de destino existir, mas não se "
745
"tem um diretório de controle. Este sinalizador permitirá que o envio "
746
"prossiga."
747
748
#: bzrlib/builtins.py:1281
749
msgid ""
750
"Create a stacked branch that references the public location of the parent "
751
"branch."
752
msgstr ""
753
"Criar uma ramificação empilhada que referencia a localização pública do ramo "
754
"pai."
755
756
#: bzrlib/builtins.py:1284
757
msgid ""
758
"Create a stacked branch that refers to another branch for the commit "
759
"history. Only the work not present in the referenced branch is included in "
760
"the branch created."
761
msgstr ""
762
"Criar uma ramificação empilhada que referencia a outro ramo do histórico de "
763
"envio. Apenas o trabalho não presente no ramo referenciado é incluído no "
764
"ramo criado."
765
766
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
767
msgid ""
768
"Refuse to push if there are uncommitted changes in the working tree, --no-"
769
"strict disables the check."
770
msgstr ""
771
"Recusa o envio se houver alterações não confirmadas na árvore de trabalho, --"
772
"no-strict desativa a verificação."
773
774
#: bzrlib/builtins.py:1292
775
msgid "Don't populate the working tree, even for protocols that support it."
776
msgstr ""
777
"Não popular a árvore de trabalho, mesmo para protocolos que o suportam."
778
779
#: bzrlib/builtins.py:1336
780
msgid "Could not determine branch to refer to."
781
msgstr "Não foi possível determinar uma ramificação a ser referenciada"
782
783
#: bzrlib/builtins.py:1345
784
#, python-format
785
msgid ""
786
"No push location known or specified. To push to the parent branch (at %s), "
787
"use 'bzr push :parent'."
788
msgstr ""
789
"Nenhuma localização de envio é conhecida ou foi especificada. Para enviar "
790
"para o ramo pai (em %s), use 'bzr push :pai'."
791
792
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
793
msgid "No push location known or specified."
794
msgstr "Sem local de envio conhecido ou especificado."
795
796
#: bzrlib/builtins.py:1355
797
#, python-format
798
msgid "Using saved push location: %s"
799
msgstr "Usando localização de envio salvo: %s"
800
801
#: bzrlib/builtins.py:1365
802
msgid "Create a new branch that is a copy of an existing branch."
803
msgstr "Criar um novo ramo que é uma cópia de um ramo existente."
804
805
#: bzrlib/builtins.py:1367
806
msgid ""
807
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
808
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
809
"./bar.\n"
810
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
811
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
812
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
813
"create ./foo-bar."
814
msgstr ""
815
"Se TO_LOCATION for omitido, o último componente de FROM_LOCATION será\n"
816
"usado. Em outras palavras, \"branch ../foo/bar\" vai tentar criar ./bar.\n"
817
"Se FROM_LOCATION não possuir / ou separador de caminho embutido,\n"
818
"TO_LOCATION será derivado de FROM_LOCATION se retirando o esquema\n"
819
"ou identificador de drive, se existirem. Por exemplo, \"branch lp:foo-bar\"\n"
820
"tentará criar ./foo-bar."
821
822
#: bzrlib/builtins.py:1374
823
msgid ""
824
"To retrieve the branch as of a particular revision, supply the --revision\n"
825
"parameter, as in \"branch foo/bar -r 5\"."
826
msgstr ""
827
"Para conseguir o ramo de uma revisão em particular, forneça o parâmetro --"
828
"revision\n"
829
"como em \"branch foo/bar -r 5\"."
830
831
#: bzrlib/builtins.py:1377
832
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
833
msgstr "Os sinônimos 'clone e 'get' para esse comando são obsoletos."
834
835
#: bzrlib/builtins.py:1387
836
msgid "Create a branch without a working-tree."
837
msgstr "Criar um ramo sem uma árvore de trabalho."
838
839
#: bzrlib/builtins.py:1389
840
msgid "Switch the checkout in the current directory to the new branch."
841
msgstr "Alterar o checkout no diretório atual para o novo ramo."
842
843
#: bzrlib/builtins.py:1392
844
msgid ""
845
"Create a stacked branch referring to the source branch. The new branch will "
846
"depend on the availability of the source branch for all operations."
847
msgstr ""
848
"Cria um ramo empilhado se referindo ao ramo fonte. O novo ramo vai depender "
849
"da disponibilidade do ramo fonte para todas as operações."
850
851
#: bzrlib/builtins.py:1396
852
msgid "Do not use a shared repository, even if available."
853
msgstr "Não utilizar um repositório compartilhado, mesmo se disponível."
854
855
#: bzrlib/builtins.py:1398
856
msgid ""
857
"By default branch will fail if the target directory exists, but does not "
858
"already have a control directory. This flag will allow branch to proceed."
859
msgstr ""
860
"Por padrão, um ramo irá falhar se apontar para um diretório que existe mas "
861
"não tem ainda um diretório de controle. Esta opção irá permitir o ramo de "
862
"continuar."
863
864
#: bzrlib/builtins.py:1403
865
msgid "Bind new branch to from location."
866
msgstr "Vincular novo ramo a partir da localização."
867
868
#: bzrlib/builtins.py:1450
869
#, python-format
870
msgid "Target directory \"%s\" already exists."
871
msgstr "Diretório alvo \"%s\" já existe."
872
873
#: bzrlib/builtins.py:1462
874
#, python-format
875
msgid "Parent of \"%s\" does not exist."
876
msgstr "Pasta pai de \"%s\" não existe."
877
878
#: bzrlib/builtins.py:1481
879
msgid "The branch {0} has no revision {1}."
880
msgstr "O ramo {0} não tem revisão {1}."
881
882
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
883
#, python-format
884
msgid "Created new stacked branch referring to %s."
885
msgstr "Criado novo ramo empilhado referente a %s."
886
887
#: bzrlib/builtins.py:1500
888
#, python-format
889
msgid "Branched %d revision."
890
msgid_plural "Branched %d revisions."
891
msgstr[0] "Revisão %d ramificada."
892
msgstr[1] "Revisões %d ramificadas."
893
894
#: bzrlib/builtins.py:1505
895
#, python-format
896
msgid "New branch bound to %s"
897
msgstr "Novo ramo ligado a %s"
898
899
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
900
#, python-format
901
msgid "Switched to branch: %s"
902
msgstr "Trocado para o ramo: %s"
903
904
#: bzrlib/builtins.py:1515
905
msgid "List the branches available at the current location."
906
msgstr "Lista os ramos disponíveis na localização atual."
907
908
#: bzrlib/builtins.py:1517
909
msgid ""
910
"This command will print the names of all the branches at the current\n"
911
"location."
912
msgstr "Esse comando irá mostrar os nomes de todos os ramos no local atual."
913
914
#: bzrlib/builtins.py:1524
915
msgid ""
916
"Recursively scan for branches rather than just looking in the specified "
917
"location."
918
msgstr ""
919
"Pesquisar recursivamente por ramos ao invés de apenas procurar em um local "
920
"especificado."
921
922
#: bzrlib/builtins.py:1554
923
msgid "(default)"
924
msgstr "(padrão)"
925
926
#: bzrlib/builtins.py:1566
927
msgid "Create a new checkout of an existing branch."
928
msgstr "Criar um novo checkout de um ramo existente."
929
930
#: bzrlib/builtins.py:1568
931
msgid ""
932
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
933
"for\n"
934
"the branch found in '.'. This is useful if you have removed the working "
935
"tree\n"
936
"or if it was never created - i.e. if you pushed the branch to its current\n"
937
"location using SFTP."
938
msgstr ""
939
"Se BRANCH_LOCATION for omitido, o checkout irá reconstituir a árvore de\n"
940
"trabalho para o ramo encontrado em '.'. Isto é útil se você tiver removido "
941
"a\n"
942
"árvore de trabalho ou se ela nunca foi criada - i.e. se você enviou o ramo\n"
943
"para o seu local atual usando SFTP."
944
945
#: bzrlib/builtins.py:1573
946
msgid ""
947
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
948
"will\n"
949
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
950
"./bar.\n"
951
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
952
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
953
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
954
"create ./foo-bar."
955
msgstr ""
956
"Se TO_LOCATION for omitido, o último componente de BRANCH_LOCATION será\n"
957
"usado. Em outras palavras, \"checkout ../foo/bar\" vai tentar criar ./bar.\n"
958
"Se BRANCH_LOCATION não possuir / ou separador de caminho embutido,\n"
959
"TO_LOCATION será derivado de BRANCH_LOCATION se retirando o esquema\n"
960
"ou identificador de drive, se existirem. Por exemplo, \"checkout lp:foo-"
961
"bar\"\n"
962
"tentará criar ./foo-bar."
963
964
#: bzrlib/builtins.py:1580
965
msgid ""
966
"To retrieve the branch as of a particular revision, supply the --revision\n"
967
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
968
"immediately\n"
969
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
970
"old\n"
971
"code.)"
972
msgstr ""
973
"Para obter um ramo como uma revisão específica, informe o parâmetro\n"
974
"--revision, como em \"checkout foo/bar -r 5\". Note que isso estará\n"
975
"imediatamente desatualizado [logo você não pode submeter] mas pode\n"
976
"ser útil (i.e. para examinar código antigo)."
977
978
#: bzrlib/builtins.py:1590
979
msgid ""
980
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
981
"the branch for every operation. Normal checkouts can perform common "
982
"operations like diff and status without such access, and also support local "
983
"commits."
984
msgstr ""
985
"Realize um checkout leve. Checkouts leves dependem do acesso ao ramo para "
986
"cada operações. Checkouts normais podem realizar operações comuns como diff "
987
"e status sem esse acesso, e também tem suporte a submissões locais."
988
989
#: bzrlib/builtins.py:1597
990
msgid "Get file contents from this tree."
991
msgstr "Obter o conteúdo do arquivo desta árvore."
992
993
#: bzrlib/builtins.py:1599
994
msgid "Hard-link working tree files where possible."
995
msgstr "Use hard-link na árvore de trabalho sempre que possível."
996
997
#: bzrlib/builtins.py:1640
998
msgid ""
999
"Show list of renamed files.\n"
1000
" "
1001
msgstr ""
1002
"Mostrar a lista de arquivos renomeados.\n"
1003
" "
1004
1005
#: bzrlib/builtins.py:1670
1006
msgid "Update a working tree to a new revision."
1007
msgstr "Atualizar a árvore de trabalho para a nova revisão."
1008
1009
#: bzrlib/builtins.py:1672
1010
msgid ""
1011
"This will perform a merge of the destination revision (the tip of the\n"
1012
"branch, or the specified revision) into the working tree, and then make\n"
1013
"that revision the basis revision for the working tree. "
1014
msgstr ""
1015
"Isto irá realizar uma mesclagem da revisão de destino (a ponta do ramo,\n"
1016
"ou a revisão especificada) com a árvore de trabalho, e então fazer\n"
1017
"daquela revisão a revisão base para a árvore de trabalho. "
1018
1019
#: bzrlib/builtins.py:1676
1020
msgid ""
1021
"You can use this to visit an older revision, or to update a working tree\n"
1022
"that is out of date from its branch."
1023
msgstr ""
1024
"Você pode usar isso para visitar uma revisão antiga, ou para atualizar a "
1025
"árvore de trabalho\n"
1026
"que está desatualizada de seu ramo."
1027
1028
#: bzrlib/builtins.py:1679
1029
msgid ""
1030
"If there are any uncommitted changes in the tree, they will be carried\n"
1031
"across and remain as uncommitted changes after the update. To discard\n"
1032
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1033
"with the changes brought in by the change in basis revision."
1034
msgstr ""
1035
"Se houver quaisquer alterações não submetidas na árvore, elas serão\n"
1036
"guardadas e continuarão como alterações nao submetidas após a\n"
1037
"atualização. Para descartar estas alterações, use 'bzr revert'. As "
1038
"alterações\n"
1039
"não submetidas podem conflitar com as alterações trazidas pela alteração\n"
1040
"da revisão de base."
1041
1042
#: bzrlib/builtins.py:1684
1043
msgid ""
1044
"If the tree's branch is bound to a master branch, bzr will also update\n"
1045
"the branch from the master."
1046
msgstr ""
1047
"Se ramo da árvore está ligado a um ramo mestre, o bzr também atualizará\\\n"
1048
"o ramo a partir do ramo mestre."
1049
1050
#: bzrlib/builtins.py:1687
1051
msgid ""
1052
"You cannot update just a single file or directory, because each Bazaar\n"
1053
"working tree has just a single basis revision. If you want to restore a\n"
1054
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1055
"update'. If you want to restore a file to its state in a previous\n"
1056
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1057
"out the old content of that file to a new location."
1058
msgstr ""
1059
"Você não pode atualizar apenas um arquivo ou diretório, porque cada árvore\n"
1060
"de trabalho do Bazaar só possui uma única revisão de base. Se você quiser\n"
1061
"recuperar um arquivo que foi removido localmente, use 'bzr revert' ao invés\n"
1062
"de 'bzr update'. Se você quiser recuperar um arquivo para o seu estado em\n"
1063
"uma revisão anterior, use 'bzr revert' com a opção '-r', ou use 'bzr cat' "
1064
"para\n"
1065
"escrever o conteúdo do arquivo antigo em um novo local."
1066
1067
#: bzrlib/builtins.py:1694
1068
msgid ""
1069
"The 'dir' argument, if given, must be the location of the root of a\n"
1070
"working tree to update. By default, the working tree that contains the \n"
1071
"current working directory is used."
1072
msgstr ""
1073
"O argumento 'dir', se fornecido, deve ser a localização da raiz da\n"
1074
"árvore de trabalho a ser atualizada. Por padrão, a árvore de trabalho que \n"
1075
"contém o diretório atual é usada."
1076
1077
#: bzrlib/builtins.py:1710
1078
msgid "bzr update --revision takes exactly one revision"
1079
msgstr "bzr update --revision tem exatamente uma revisão"
1080
1081
#: bzrlib/builtins.py:1718
1082
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1083
msgstr ""
1084
"bzr update só pode atualizar uma árvore inteira, e não um arquivo ou "
1085
"subdiretório."
1086
1087
#: bzrlib/builtins.py:1749
1088
msgid "Tree is up to date at revision {0} of branch {1}"
1089
msgstr "Árvore está atualizada na revisão {0} do ramo {1}"
1090
1091
#: bzrlib/builtins.py:1765
1092
#, python-format
1093
msgid ""
1094
"branch has no revision %s\n"
1095
"bzr update --revision only works for a revision in the branch history"
1096
msgstr ""
1097
"o ramo não tem revisão %s\n"
1098
"bzr update --revision só funciona para uma revisão no histórico da "
1099
"ramificação."
1100
1101
#: bzrlib/builtins.py:1771
1102
msgid "Updated to revision {0} of branch {1}"
1103
msgstr "Atualizado para a revisão {0} do ramo {1}"
1104
1105
#: bzrlib/builtins.py:1775
1106
msgid ""
1107
"Your local commits will now show as pending merges with 'bzr status', and "
1108
"can be committed with 'bzr commit'."
1109
msgstr ""
1110
"Suas submissões locais agora serão mostradas como pendentes de mesclagem com "
1111
"'brz status', e podem ser submetidas com 'bzr commit'."
1112
1113
#: bzrlib/builtins.py:1784
1114
msgid "Show information about a working tree, branch or repository."
1115
msgstr ""
1116
"Mostrar informações sobre uma árvore de trabalho, ramo ou repositório."
1117
1118
#: bzrlib/builtins.py:1786
1119
msgid ""
1120
"This command will show all known locations and formats associated to the\n"
1121
"tree, branch or repository."
1122
msgstr ""
1123
"Esse comando irá mostrar todos os locais conhecidos e formatos associados à\n"
1124
"árvore, ramo ou repositório."
1125
1126
#: bzrlib/builtins.py:1789
1127
msgid ""
1128
"In verbose mode, statistical information is included with each report.\n"
1129
"To see extended statistic information, use a verbosity level of 2 or\n"
1130
"higher by specifying the verbose option multiple times, e.g. -vv."
1131
msgstr ""
1132
"No modo detalhado, informações estatísticas são incluídas em cada "
1133
"relatório.\n"
1134
"Para ver informações estatísticas mais avançadas, use o nível de "
1135
"detalhamento 2 ou\n"
1136
"superior especificando a opção de detalhamento múltiplas vezes, e.g. -vv."
1137
1138
#: bzrlib/builtins.py:1793
1139
msgid "Branches and working trees will also report any missing revisions."
1140
msgstr ""
1141
"Ramos e árvores de trabalho irão também reportar qualquer falta de revisão."
1142
1143
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1144
#: bzrlib/builtins.py:6442
1145
msgid ":Examples:"
1146
msgstr ":Exemplos:"
1147
1148
#: bzrlib/builtins.py:1797
1149
msgid " Display information on the format and related locations:"
1150
msgstr " Exibir informações sobre o formato e locais relacionados:"
1151
1152
#: bzrlib/builtins.py:1799
1153
msgid " bzr info"
1154
msgstr " bzr info"
1155
1156
#: bzrlib/builtins.py:1801
1157
msgid ""
1158
" Display the above together with extended format information and\n"
1159
" basic statistics (like the number of files in the working tree and\n"
1160
" number of revisions in the branch and repository):"
1161
msgstr ""
1162
" Exibir acima as informações juntas sobre o formato estendido e "
1163
"estatísticas básicas (como o número de arquivos na árvore de trabalho e "
1164
"número de revisões no ramo e repositório):"
1165
1166
#: bzrlib/builtins.py:1805
1167
msgid " bzr info -v"
1168
msgstr " bzr info -v"
1169
1170
#: bzrlib/builtins.py:1807
1171
msgid " Display the above together with number of committers to the branch:"
1172
msgstr " Mostrar acima junto com o número de committers para o ramo:"
1173
1174
#: bzrlib/builtins.py:1809
1175
msgid " bzr info -vv"
1176
msgstr " bzr info -vv"
1177
1178
#: bzrlib/builtins.py:1828
1179
msgid "Remove files or directories."
1180
msgstr "Remove arquivos ou diretórios."
1181
1182
#: bzrlib/builtins.py:1830
1183
msgid ""
1184
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1185
"delete them if they can easily be recovered using revert otherwise they\n"
1186
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1187
"parameters are given Bazaar will scan for files that are being tracked by\n"
1188
"Bazaar but missing in your tree and stop tracking them for you."
1189
msgstr ""
1190
1191
#: bzrlib/builtins.py:1838
1192
msgid "Only remove files that have never been committed."
1193
msgstr "Remover apenas arquivos que nunca foram enviados."
1194
1195
#: bzrlib/builtins.py:1840
1196
msgid "The file deletion mode to be used."
1197
msgstr "O modo de exclusão do arquivo a ser utilizado."
1198
1199
#: bzrlib/builtins.py:1841
1200
msgid "Deletion Strategy"
1201
msgstr "Estratégia de exclusão"
1202
1203
#: bzrlib/builtins.py:1842
1204
msgid "Backup changed files (default)."
1205
msgstr "Backup de arquivos alterados (padrão)."
1206
1207
#: bzrlib/builtins.py:1843
1208
msgid "Delete from bzr but leave the working copy."
1209
msgstr "Excluir do brz mas deixe a cópia de trabalho."
1210
1211
#: bzrlib/builtins.py:1844
1212
msgid "Don't backup changed files."
1213
msgstr "Não faça backup de arquivos alterados."
1214
1215
#: bzrlib/builtins.py:1845
1216
msgid ""
1217
"Delete all the specified files, even if they can not be recovered and even "
1218
"if they are non-empty directories. (deprecated, use no-backup)"
1219
msgstr ""
1220
"Apagar todos os arquivos especificados, mesmo que eles não possam ser "
1221
"recuperados e até mesmo se eles são diretórios não vazios. (obsoleto, use no-"
1222
"backup)"
1223
1224
#: bzrlib/builtins.py:1854
1225
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1226
msgstr ""
1227
"(A opção --force é obsoleta, preferencialmente use --no-backup no futuro.)"
1228
1229
#: bzrlib/builtins.py:1871
1230
msgid "No matching files."
1231
msgstr "Nenhum arquivo correspondente."
1232
1233
#: bzrlib/builtins.py:1932
1234
msgid "Reconcile bzr metadata in a branch."
1235
msgstr "Reconciliar metadados bzr em um ramo."
1236
1237
#: bzrlib/builtins.py:1934
1238
msgid ""
1239
"This can correct data mismatches that may have been caused by\n"
1240
"previous ghost operations or bzr upgrades. You should only\n"
1241
"need to run this command if 'bzr check' or a bzr developer\n"
1242
"advises you to run it."
1243
msgstr ""
1244
1245
#: bzrlib/builtins.py:1939
1246
msgid ""
1247
"If a second branch is provided, cross-branch reconciliation is\n"
1248
"also attempted, which will check that data like the tree root\n"
1249
"id which was not present in very early bzr versions is represented\n"
1250
"correctly in both branches."
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:1944
1254
msgid ""
1255
"At the same time it is run it may recompress data resulting in\n"
1256
"a potential saving in disk space or performance gain."
1257
msgstr ""
1258
"No mesmo tempo em que ele é executado ele pode recompactar os dados, "
1259
"resultando em\n"
1260
"num potencial ganho de espaço em disco e desempenho."
1261
1262
#: bzrlib/builtins.py:1947
1263
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1264
msgstr ""
1265
"O ramo *deve* estar em um sistema listável tal como um disco local ou um "
1266
"sftp."
1267
1268
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1269
msgid ""
1270
"Format for the bzr 2.0 series.\n"
1271
"Uses group-compress storage.\n"
1272
"Provides rich roots which are a one-way transition.\n"
1273
msgstr ""
1274
"Formato para série 2.0 bzr.\n"
1275
"Usa compressa de grupo de armazenamento.\n"
1276
"Fornece raízes ricas com transição de sentido único.\n"
1277
1278
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1279
msgid ""
1280
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1281
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1282
msgstr ""
1283
"Pacote baseado em formato utilizado na série 1.x. Introduzido em 0,92. "
1284
"Interopera com repositórios bzr antes de 0,92, mas não pode ser lido por bzr "
1285
"<0,92. "
1286
1287
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1288
msgid "The 2a format with experimental support for colocated branches.\n"
1289
msgstr "O formato 2a possui suporte experimental para ramos co-locados.\n"
1290
1291
#: bzrlib/builtins.py:2015
1292
msgid "Make a directory into a versioned branch."
1293
msgstr "Crie um diretório em um ramo versionados."
1294
1295
#: bzrlib/builtins.py:2017
1296
msgid ""
1297
"Use this to create an empty branch, or before importing an\n"
1298
"existing project."
1299
msgstr ""
1300
"Use isso para criar um ramo vazio, ou antes de importar um\n"
1301
"projeto existente."
1302
1303
#: bzrlib/builtins.py:2020
1304
msgid ""
1305
"If there is a repository in a parent directory of the location, then\n"
1306
"the history of the branch will be stored in the repository. Otherwise\n"
1307
"init creates a standalone branch which carries its own history\n"
1308
"in the .bzr directory."
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2025
1312
msgid ""
1313
"If there is already a branch at the location but it has no working tree,\n"
1314
"the tree can be populated with 'bzr checkout'."
1315
msgstr ""
1316
"Se já houver um ramo no local mas este não tem árvore de trabalho,\n"
1317
"a árvore pode ser povoada com 'bzr checkout'."
1318
1319
#: bzrlib/builtins.py:2028
1320
msgid "Recipe for importing a tree of files::"
1321
msgstr "Receita para importação de uma árvore de arquivos::"
1322
1323
#: bzrlib/builtins.py:2030
1324
msgid ""
1325
" cd ~/project\n"
1326
" bzr init\n"
1327
" bzr add .\n"
1328
" bzr status\n"
1329
" bzr commit -m \"imported project\""
1330
msgstr ""
1331
" cd ~/project\n"
1332
" bzr init\n"
1333
" bzr add .\n"
1334
" bzr status\n"
1335
" bzr commit -m \"projeto importado\""
1336
1337
#: bzrlib/builtins.py:2041
1338
msgid ""
1339
"Create the path leading up to the branch if it does not already exist."
1340
msgstr "Criar o caminho que conduz até o ramo se ele não existir."
1341
1342
#: bzrlib/builtins.py:2044
1343
msgid "Specify a format for this branch. See \"help formats\"."
1344
msgstr "Especifique um formato para esse ramo. Consulte \"help formats\"."
1345
1346
#: bzrlib/builtins.py:2052
1347
msgid ""
1348
"Never change revnos or the existing log. Append revisions to it only."
1349
msgstr ""
1350
"Nunca mude o número de revisão ou o log existente. Somente adicione revisões "
1351
"a ele."
1352
1353
#: bzrlib/builtins.py:2055
1354
msgid "Create a branch without a working tree."
1355
msgstr "Criar um ramo sem uma árvore de trabalho."
1356
1357
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1358
#, python-format
1359
msgid ""
1360
"Parent directory of %s does not exist.\n"
1361
"You may supply --create-prefix to create all leading parent directories."
1362
msgstr ""
1363
"Diretório pai de %s não existe.\n"
1364
"Você deve fornecer --create-prefix para criar todos os principais diretórios "
1365
"pai."
1366
1367
#: bzrlib/builtins.py:2109
1368
msgid ""
1369
"This branch format cannot be set to append-revisions-only. Try --default."
1370
msgstr ""
1371
"Esse formato de ramo não pode ser mandado para append-revisions-only. Tente -"
1372
"-default."
1373
1374
#: bzrlib/builtins.py:2120
1375
msgid "Created a {0} (format: {1})\n"
1376
msgstr "Criou um {0} (formato: {1})\n"
1377
1378
#: bzrlib/builtins.py:2129
1379
#, python-format
1380
msgid "Using shared repository: %s\n"
1381
msgstr "Usando repositório compartilhado: %s\n"
1382
1383
#: bzrlib/builtins.py:2133
1384
msgid "Create a shared repository for branches to share storage space."
1385
msgstr ""
1386
"Criar um repositório compartilhado de ramos para dividir espaço de "
1387
"armazenamento."
1388
1389
#: bzrlib/builtins.py:2135
1390
msgid ""
1391
"New branches created under the repository directory will store their\n"
1392
"revisions in the repository, not in the branch directory. For branches\n"
1393
"with shared history, this reduces the amount of storage needed and \n"
1394
"speeds up the creation of new branches."
1395
msgstr ""
1396
"Novos ramos criados sob o diretório do repositório irão armazenar suas\n"
1397
"revisões no repositório, não no diretório do ramo. Para ramos\n"
1398
"com histórico compartilhado, isto reduz a quantidade de armazenamento "
1399
"necessário e\n"
1400
"acelera a criação de novos ramos."
1401
1402
#: bzrlib/builtins.py:2140
1403
msgid ""
1404
"If the --no-trees option is given then the branches in the repository\n"
1405
"will not have working trees by default. They will still exist as \n"
1406
"directories on disk, but they will not have separate copies of the \n"
1407
"files at a certain revision. This can be useful for repositories that\n"
1408
"store branches which are interacted with through checkouts or remote\n"
1409
"branches, such as on a server."
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2147
1413
msgid ""
1414
":Examples:\n"
1415
" Create a shared repository holding just branches::"
1416
msgstr ""
1417
":Exemplos:\n"
1418
" Cria um repositório compartilhado contendo apenas ramos::"
1419
1420
#: bzrlib/builtins.py:2150
1421
msgid ""
1422
" bzr init-repo --no-trees repo\n"
1423
" bzr init repo/trunk"
1424
msgstr ""
1425
" bzr init-repo --no-trees repo\n"
1426
" bzr init repo/trunk"
1427
1428
#: bzrlib/builtins.py:2153
1429
msgid " Make a lightweight checkout elsewhere::"
1430
msgstr " Faça um leve checkout em outro lugar::"
1431
1432
#: bzrlib/builtins.py:2155
1433
msgid ""
1434
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1435
" cd trunk-checkout\n"
1436
" (add files here)"
1437
msgstr ""
1438
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1439
" cd trunk-checkout\n"
1440
" (adicione arquivos aqui)"
1441
1442
#: bzrlib/builtins.py:2163
1443
msgid ""
1444
"Specify a format for this repository. See \"bzr help formats\" for details."
1445
msgstr ""
1446
"Especifique um formato para este repositório. Veja \"bzr help formats\" para "
1447
"detalhes."
1448
1449
#: bzrlib/builtins.py:2167
1450
msgid "Repository format"
1451
msgstr "Formato de repositório"
1452
1453
#: bzrlib/builtins.py:2169
1454
msgid "Branches in the repository will default to not having a working tree."
1455
msgstr ""
1456
"Ramos no repositório será o padrão para não ter uma árvore de trabalho."
1457
1458
#: bzrlib/builtins.py:2195
1459
msgid "Show differences in the working tree, between revisions or branches."
1460
msgstr ""
1461
"Mostrar diferenças na árvore de trabalho, entre as revisões ou ramos."
1462
1463
#: bzrlib/builtins.py:2197
1464
msgid ""
1465
"If no arguments are given, all changes for the current tree are listed.\n"
1466
"If files are given, only the changes in those files are listed.\n"
1467
"Remote and multiple branches can be compared by using the --old and\n"
1468
"--new options. If not provided, the default for both is derived from\n"
1469
"the first argument, if any, or the current tree if no arguments are\n"
1470
"given."
1471
msgstr ""
1472
1473
#: bzrlib/builtins.py:2204
1474
msgid ""
1475
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1476
"produces patches suitable for \"patch -p1\"."
1477
msgstr ""
1478
"\"bzr diff -p1\" é equivalente a \"bzr diff --prefix old/:new/\", e\n"
1479
"produz caminhos adequados para \"patch -p1\"."
1480
1481
#: bzrlib/builtins.py:2207
1482
msgid ""
1483
"Note that when using the -r argument with a range of revisions, the\n"
1484
"differences are computed between the two specified revisions. That\n"
1485
"is, the command does not show the changes introduced by the first \n"
1486
"revision in the range. This differs from the interpretation of \n"
1487
"revision ranges used by \"bzr log\" which includes the first revision\n"
1488
"in the range."
1489
msgstr ""
1490
1491
#: bzrlib/builtins.py:2214
1492
msgid ""
1493
":Exit values:\n"
1494
" 1 - changed\n"
1495
" 2 - unrepresentable changes\n"
1496
" 3 - error\n"
1497
" 0 - no change"
1498
msgstr ""
1499
":Valores de saída:\n"
1500
" 1 - alterado\n"
1501
" 2 - mudanças irrepresentáveis\n"
1502
" 3 - erro\n"
1503
" 0 - Sem alteração"
1504
1505
#: bzrlib/builtins.py:2220
1506
msgid ""
1507
":Examples:\n"
1508
" Shows the difference in the working tree versus the last commit::"
1509
msgstr ""
1510
":Exemplos:\n"
1511
" Mostra a diferença da árvore de trabalho em relação a última submissão::"
1512
1513
#: bzrlib/builtins.py:2223
1514
msgid " bzr diff"
1515
msgstr " bzr diff"
1516
1517
#: bzrlib/builtins.py:2225
1518
msgid " Difference between the working tree and revision 1::"
1519
msgstr " Diferença entre a árvore de trabalho e a revisão 1::"
1520
1521
#: bzrlib/builtins.py:2227
1522
msgid " bzr diff -r1"
1523
msgstr " bzr diff -r1"
1524
1525
#: bzrlib/builtins.py:2229
1526
msgid " Difference between revision 3 and revision 1::"
1527
msgstr " Diferença entre a revisão 3 e a revisão 1::"
1528
1529
#: bzrlib/builtins.py:2231
1530
msgid " bzr diff -r1..3"
1531
msgstr " bzr diff -r1..3"
1532
1533
#: bzrlib/builtins.py:2233
1534
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1535
msgstr " Diferença entre a revisão 3 e a revisão 1 para o ramo xxx::"
1536
1537
#: bzrlib/builtins.py:2235
1538
msgid " bzr diff -r1..3 xxx"
1539
msgstr " bzr diff -r1..3 xxx"
1540
1541
#: bzrlib/builtins.py:2237
1542
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1543
msgstr ""
1544
" As alterações introduzidas pela revisão 2 (equivalente a -r1..2)::"
1545
1546
#: bzrlib/builtins.py:2239
1547
msgid " bzr diff -c2"
1548
msgstr " bzr diff -c2"
1549
1550
#: bzrlib/builtins.py:2241
1551
msgid ""
1552
" To see the changes introduced by revision X::\n"
1553
" \n"
1554
" bzr diff -cX"
1555
msgstr ""
1556
" Para ver as alterações introduzidas pela revisão X::\n"
1557
" \n"
1558
" bzr diff-cX"
1559
1560
#: bzrlib/builtins.py:2245
1561
msgid ""
1562
" Note that in the case of a merge, the -c option shows the changes\n"
1563
" compared to the left hand parent. To see the changes against\n"
1564
" another parent, use::"
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2249
1568
msgid " bzr diff -r<chosen_parent>..X"
1569
msgstr " bzr diff -r<chosen_parent>..X"
1570
1571
#: bzrlib/builtins.py:2251
1572
msgid ""
1573
" The changes between the current revision and the previous revision\n"
1574
" (equivalent to -c-1 and -r-2..-1)"
1575
msgstr ""
1576
" As mudanças entre a versão atual e a versão anterior\n"
1577
" (equivalente a -c-1 e -r-2..-1)"
1578
1579
#: bzrlib/builtins.py:2254
1580
msgid " bzr diff -r-2.."
1581
msgstr " bzr diff -r-2.."
1582
1583
#: bzrlib/builtins.py:2256
1584
msgid " Show just the differences for file NEWS::"
1585
msgstr " Mostrar somente as diferenças para o arquivo NEWS::"
1586
1587
#: bzrlib/builtins.py:2258
1588
msgid " bzr diff NEWS"
1589
msgstr " bzr diff NEWS"
1590
1591
#: bzrlib/builtins.py:2260
1592
msgid " Show the differences in working tree xxx for file NEWS::"
1593
msgstr ""
1594
" Mostrar as diferenças na árvore de trabalho xxx para o arquivo NEWS::"
1595
1596
#: bzrlib/builtins.py:2262
1597
msgid " bzr diff xxx/NEWS"
1598
msgstr " bzr diff xxx/NEWS"
1599
1600
#: bzrlib/builtins.py:2264
1601
msgid " Show the differences from branch xxx to this working tree:"
1602
msgstr " Mostrar as diferenças do ramo xxx para esta árvore de trabalho:"
1603
1604
#: bzrlib/builtins.py:2266
1605
msgid " bzr diff --old xxx"
1606
msgstr " bzr diff --old xxx"
1607
1608
#: bzrlib/builtins.py:2268
1609
msgid " Show the differences between two branches for file NEWS::"
1610
msgstr " Mostrar as diferenças entre dois ramos para o aquivo NEWS::"
1611
1612
#: bzrlib/builtins.py:2270
1613
msgid " bzr diff --old xxx --new yyy NEWS"
1614
msgstr " bzr diff --old xxx --new yyy NEWS"
1615
1616
#: bzrlib/builtins.py:2272
1617
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1618
msgstr ""
1619
" O mesmo que 'bzr diff' exceto caminhos iniciados com velho/ e novo/::"
1620
1621
#: bzrlib/builtins.py:2274
1622
msgid ""
1623
" bzr diff --prefix old/:new/\n"
1624
" \n"
1625
" Show the differences using a custom diff program with options::\n"
1626
" \n"
1627
" bzr diff --using /usr/bin/diff --diff-options -wu"
1628
msgstr ""
1629
" bzr diff --prefix old/:new/\n"
1630
" \n"
1631
" Show the differences using a custom diff program with options::\n"
1632
" \n"
1633
" bzr diff --using /usr/bin/diff --diff-options -wu"
1634
1635
#: bzrlib/builtins.py:2284
1636
msgid "Pass these options to the external diff program."
1637
msgstr "Passar essas opções para o programa \"diff\" externo."
1638
1639
#: bzrlib/builtins.py:2287
1640
msgid ""
1641
"Set prefixes added to old and new filenames, as two values separated by a "
1642
"colon. (eg \"old/:new/\")."
1643
msgstr ""
1644
1645
#: bzrlib/builtins.py:2290
1646
msgid "Branch/tree to compare from."
1647
msgstr "Árvore/ramo para a comparar estado anterior."
1648
1649
#: bzrlib/builtins.py:2294
1650
msgid "Branch/tree to compare to."
1651
msgstr "Árvore/ramo para a comparar estado posterior."
1652
1653
#: bzrlib/builtins.py:2300
1654
msgid "Use this command to compare files."
1655
msgstr "Use este comando para comparar arquivos."
1656
1657
#: bzrlib/builtins.py:2305
1658
msgid "Diff format to use."
1659
msgstr "Formato a ser usado no \"diff\"."
1660
1661
#: bzrlib/builtins.py:2307
1662
msgid "Diff format"
1663
msgstr "Formato do \"diff\"."
1664
1665
#: bzrlib/builtins.py:2329
1666
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1667
msgstr ""
1668
"--prefix espera dois valores separados por dois pontos (exemplo: "
1669
"\"antigo/:novo/\")"
1670
1671
#: bzrlib/builtins.py:2333
1672
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1673
msgstr "bzr diff --revision espera exatamente um ou dois números de revisão"
1674
1675
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1676
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1677
msgid "{0} and {1} are mutually exclusive"
1678
msgstr "{0} e {1} são mutuamente exclusivos"
1679
1680
#: bzrlib/builtins.py:2358
1681
msgid ""
1682
"List files deleted in the working tree.\n"
1683
" "
1684
msgstr ""
1685
"Listar arquivos apagados na árvore de trabalho\n"
1686
" "
1687
1688
#: bzrlib/builtins.py:2436
1689
msgid "Show the tree root directory."
1690
msgstr "Mostra o diretório raiz da árvore."
1691
1692
#: bzrlib/builtins.py:2438
1693
msgid ""
1694
"The root is the nearest enclosing directory with a .bzr control\n"
1695
"directory."
1696
msgstr ""
1697
"A raíz é o diretório pai mais próximo que contém um diretório de\n"
1698
"controle .bzr."
1699
1700
#: bzrlib/builtins.py:2453
1701
msgid "The limit argument must be an integer."
1702
msgstr "O argumento de limite deve ser um inteiro."
1703
1704
#: bzrlib/builtins.py:2461
1705
msgid "The levels argument must be an integer."
1706
msgstr "O argumento de níveis deve ser um inteiro."
1707
1708
#: bzrlib/builtins.py:2466
1709
msgid "Show historical log for a branch or subset of a branch."
1710
msgstr ""
1711
"Mostrar os registros temporais para um ramo ou subconjunto de um ramo."
1712
1713
#: bzrlib/builtins.py:2468
1714
msgid ""
1715
"log is bzr's default tool for exploring the history of a branch.\n"
1716
"The branch to use is taken from the first parameter. If no parameters\n"
1717
"are given, the branch containing the working directory is logged.\n"
1718
"Here are some simple examples::"
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:2473
1722
msgid ""
1723
" bzr log log the current branch\n"
1724
" bzr log foo.py log a file in its branch\n"
1725
" bzr log http://server/branch log a branch on a server"
1726
msgstr ""
1727
" bzr log registra o ramo atual\n"
1728
" bzr log foo.py registra um arquivo neste ramo\n"
1729
" bzr log http://server/branch registra um ramo no servidor"
1730
1731
#: bzrlib/builtins.py:2477
1732
msgid ""
1733
"The filtering, ordering and information shown for each revision can\n"
1734
"be controlled as explained below. By default, all revisions are\n"
1735
"shown sorted (topologically) so that newer revisions appear before\n"
1736
"older ones and descendants always appear before ancestors. If displayed,\n"
1737
"merged revisions are shown indented under the revision in which they\n"
1738
"were merged."
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2484
1742
msgid ":Output control:"
1743
msgstr ":Controle de saída:"
1744
1745
#: bzrlib/builtins.py:2486
1746
msgid ""
1747
" The log format controls how information about each revision is\n"
1748
" displayed. The standard log formats are called ``long``, ``short``\n"
1749
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1750
" for more details on log formats."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2491
1754
msgid ""
1755
" The following options can be used to control what information is\n"
1756
" displayed::"
1757
msgstr ""
1758
" As seguintes informações podem ser usadas para controlar quais informações "
1759
"são\n"
1760
" mostradas::"
1761
1762
#: bzrlib/builtins.py:2494
1763
msgid ""
1764
" -l N display a maximum of N revisions\n"
1765
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1766
" -v display a status summary (delta) for each revision\n"
1767
" -p display a diff (patch) for each revision\n"
1768
" --show-ids display revision-ids (and file-ids), not just revnos"
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2500
1772
msgid ""
1773
" Note that the default number of levels to display is a function of the\n"
1774
" log format. If the -n option is not used, the standard log formats show\n"
1775
" just the top level (mainline)."
1776
msgstr ""
1777
" Note que o número padrão de níveis a serem exibidos é uma função do\n"
1778
" formato log. Se a opção -n não é usada, os formatos log padrão mostram\n"
1779
" simplesmente o nível máximo (linha principal)."
1780
1781
#: bzrlib/builtins.py:2504
1782
msgid ""
1783
" Status summaries are shown using status flags like A, M, etc. To see\n"
1784
" the changes explained using words like ``added`` and ``modified``\n"
1785
" instead, use the -vv option."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:2508
1789
msgid ":Ordering control:"
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:2510
1793
msgid ""
1794
" To display revisions from oldest to newest, use the --forward option.\n"
1795
" In most cases, using this option will have little impact on the total\n"
1796
" time taken to produce a log, though --forward does not incrementally\n"
1797
" display revisions like --reverse does when it can."
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:2515
1801
msgid ":Revision filtering:"
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:2517
1805
msgid ""
1806
" The -r option can be used to specify what revision or range of revisions\n"
1807
" to filter against. The various forms are shown below::"
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:2520
1811
msgid ""
1812
" -rX display revision X\n"
1813
" -rX.. display revision X and later\n"
1814
" -r..Y display up to and including revision Y\n"
1815
" -rX..Y display from X to Y inclusive"
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:2525
1819
msgid ""
1820
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1821
" Some common examples are given below::"
1822
msgstr ""
1823
" Veja ``bzr help revisionspec`` para detalhes de como especificar X e Y.\n"
1824
" Alguns exemplos comuns são dados abaixo::"
1825
1826
#: bzrlib/builtins.py:2528
1827
msgid ""
1828
" -r-1 show just the tip\n"
1829
" -r-10.. show the last 10 mainline revisions\n"
1830
" -rsubmit:.. show what's new on this branch\n"
1831
" -rancestor:path.. show changes since the common ancestor of this\n"
1832
" branch and the one at location path\n"
1833
" -rdate:yesterday.. show changes since yesterday"
1834
msgstr ""
1835
1836
#: bzrlib/builtins.py:2535
1837
msgid ""
1838
" When logging a range of revisions using -rX..Y, log starts at\n"
1839
" revision Y and searches back in history through the primary\n"
1840
" (\"left-hand\") parents until it finds X. When logging just the\n"
1841
" top level (using -n1), an error is reported if X is not found\n"
1842
" along the way. If multi-level logging is used (-n0), X may be\n"
1843
" a nested merge revision and the log will be truncated accordingly."
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:2542
1847
msgid ":Path filtering:"
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:2544
1851
msgid ""
1852
" If parameters are given and the first one is not a branch, the log\n"
1853
" will be filtered to show only those revisions that changed the\n"
1854
" nominated files or directories."
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:2548
1858
msgid ""
1859
" Filenames are interpreted within their historical context. To log a\n"
1860
" deleted file, specify a revision range so that the file existed at\n"
1861
" the end or start of the range."
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:2552
1865
msgid ""
1866
" Historical context is also important when interpreting pathnames of\n"
1867
" renamed files/directories. Consider the following example:"
1868
msgstr ""
1869
" Contexto histórico também é importante quando você está interpretando os "
1870
"caminhos de \n"
1871
" arquivos/diretórios renomeados. Considere o seguinte exemplo:"
1872
1873
#: bzrlib/builtins.py:2555
1874
msgid ""
1875
" * revision 1: add tutorial.txt\n"
1876
" * revision 2: modify tutorial.txt\n"
1877
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1878
msgstr ""
1879
" * revisão 1: adicionar tutorial.txt\n"
1880
" * revisão 2: modificar tutorial.txt\n"
1881
" * revisão 3: renomear tutorial.txt para guide.txt; adicionar tutorial.txt"
1882
1883
#: bzrlib/builtins.py:2559
1884
msgid " In this case:"
1885
msgstr " Nesse caso:"
1886
1887
#: bzrlib/builtins.py:2561
1888
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1889
msgstr ""
1890
" * ``bzr log guide.txt`` ira registrar o arquivo adicionado na revisão 1"
1891
1892
#: bzrlib/builtins.py:2563
1893
msgid ""
1894
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1895
msgstr ""
1896
" * ``bzr log tutorial.txt`` ira registrar o novo arquivo adicionado a "
1897
"revisão 3"
1898
1899
#: bzrlib/builtins.py:2565
1900
msgid ""
1901
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1902
" the original file in revision 2."
1903
msgstr ""
1904
" * ``bzr log -r2 -p tutorial.txt`` ira mostrar as mudanças feitas no\n"
1905
" arquivo original na revisão 2."
1906
1907
#: bzrlib/builtins.py:2568
1908
msgid ""
1909
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1910
" was no file called guide.txt in revision 2."
1911
msgstr ""
1912
" * ``bzr log -r2 -p guide.txt`` ira mostrar uma mensagem de erro pois\n"
1913
" não há um arquivo chamado guide.txt na revisão 2."
1914
1915
#: bzrlib/builtins.py:2571
1916
msgid ""
1917
" Renames are always followed by log. By design, there is no need to\n"
1918
" explicitly ask for this (and no way to stop logging a file back\n"
1919
" until it was last renamed)."
1920
msgstr ""
1921
1922
#: bzrlib/builtins.py:2575
1923
msgid ":Other filtering:"
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:2577
1927
msgid ""
1928
" The --match option can be used for finding revisions that match a\n"
1929
" regular expression in a commit message, committer, author or bug.\n"
1930
" Specifying the option several times will match any of the supplied\n"
1931
" expressions. --match-author, --match-bugs, --match-committer and\n"
1932
" --match-message can be used to only match a specific field."
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:2583
1936
msgid ":Tips & tricks:"
1937
msgstr ":Dicas & truques:"
1938
1939
#: bzrlib/builtins.py:2585
1940
msgid ""
1941
" GUI tools and IDEs are often better at exploring history than command\n"
1942
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1943
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1944
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1945
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:2591
1949
msgid ""
1950
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1951
msgstr " Você pode achar útil adicionar atalhos no ``bazaar.conf``::"
1952
1953
#: bzrlib/builtins.py:2593
1954
msgid ""
1955
" [ALIASES]\n"
1956
" tip = log -r-1\n"
1957
" top = log -l10 --line\n"
1958
" show = log -v -p"
1959
msgstr ""
1960
" [ALIASES]\n"
1961
" tip = log -r-1\n"
1962
" top = log -l10 --line\n"
1963
" show = log -v -p"
1964
1965
#: bzrlib/builtins.py:2598
1966
msgid ""
1967
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1968
" will show the last 10 mainline revisions. To see the details of a\n"
1969
" particular revision X, ``bzr show -rX``."
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:2602
1973
msgid ""
1974
" If you are interested in looking deeper into a particular merge X,\n"
1975
" use ``bzr log -n0 -rX``."
1976
msgstr ""
1977
" Se você estiver interessado em olhar mais profundamente uma mesclagem X,\n"
1978
" use ``bzr log -n0 -rX``."
1979
1980
#: bzrlib/builtins.py:2605
1981
msgid ""
1982
" ``bzr log -v`` on a branch with lots of history is currently\n"
1983
" very slow. A fix for this issue is currently under development.\n"
1984
" With or without that fix, it is recommended that a revision range\n"
1985
" be given when using the -v option."
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:2610
1989
msgid ""
1990
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1991
" used to find revisions matching user names, commit messages, etc.\n"
1992
" Among other features, this plugin can find all revisions containing\n"
1993
" a list of words but not others."
1994
msgstr ""
1995
1996
#: bzrlib/builtins.py:2615
1997
msgid ""
1998
" When exploring non-mainline history on large projects with deep\n"
1999
" history, the performance of log can be greatly improved by installing\n"
2000
" the historycache plugin. This plugin buffers historical information\n"
2001
" trading disk space for faster speed."
2002
msgstr ""
2003
2004
#: bzrlib/builtins.py:2624
2005
msgid "Show from oldest to newest."
2006
msgstr "Mostrar mais antiga para a mais recente."
2007
2008
#: bzrlib/builtins.py:2627
2009
msgid "Show files changed in each revision."
2010
msgstr "Mostrar os arquivos mudaram em cada revisão."
2011
2012
#: bzrlib/builtins.py:2633
2013
msgid "Show just the specified revision. See also \"help revisionspec\"."
2014
msgstr ""
2015
"Mostra apenas a versão especificada. Veja também \"help revisionspec\"."
2016
2017
#: bzrlib/builtins.py:2637
2018
msgid "What names to list as authors - first, all or committer."
2019
msgstr ""
2020
2021
#: bzrlib/builtins.py:2638
2022
msgid "Authors"
2023
msgstr "Autores"
2024
2025
#: bzrlib/builtins.py:2643
2026
msgid "Number of levels to display - 0 for all, 1 for flat."
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:2653
2030
msgid "Limit the output to the first N revisions."
2031
msgstr "Limite a saída as primeiras N versões."
2032
2033
#: bzrlib/builtins.py:2658
2034
msgid "Show changes made in each revision as a patch."
2035
msgstr "Mostrar alterações feitas em cada revisão como um caminho."
2036
2037
#: bzrlib/builtins.py:2660
2038
msgid "Show merged revisions like --levels 0 does."
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:2664
2042
msgid "Do not report commits with more than one parent."
2043
msgstr "Não reportar submissões com mais de um pai."
2044
2045
#: bzrlib/builtins.py:2666
2046
msgid ""
2047
"Display only the revisions that are not part of both ancestries (require -"
2048
"rX..Y)."
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:2670
2052
msgid "Show digital signature validity."
2053
msgstr "Mostrar a validade da assinatura digital."
2054
2055
#: bzrlib/builtins.py:2673
2056
msgid "Show revisions whose properties match this expression."
2057
msgstr "Mostrar versões onde as propriedades coincidem com essa expressão."
2058
2059
#: bzrlib/builtins.py:2677
2060
msgid "Show revisions whose message matches this expression."
2061
msgstr "Mostrar versões onde a mensagem coincide com essa expressão."
2062
2063
#: bzrlib/builtins.py:2681
2064
msgid "Show revisions whose committer matches this expression."
2065
msgstr ""
2066
2067
#: bzrlib/builtins.py:2685
2068
msgid "Show revisions whose authors match this expression."
2069
msgstr "Mostrar versões onde os autores coincidem com essa expressão."
2070
2071
#: bzrlib/builtins.py:2689
2072
msgid "Show revisions whose bugs match this expression."
2073
msgstr "Mostrar versões que tem erros que coincidem com essa expressão."
2074
2075
#: bzrlib/builtins.py:2743
2076
msgid "--exclude-common-ancestry requires -r with two revisions"
2077
msgstr "--exclude-common-ancestry requer -r com duas versões."
2078
2079
#: bzrlib/builtins.py:2771
2080
#, python-format
2081
msgid "Path unknown at end or start of revision range: %s"
2082
msgstr "Caminho desconhecido no final ou começo do intervalo da versão: %s"
2083
2084
#: bzrlib/builtins.py:2888
2085
#, python-format
2086
msgid "bzr %s doesn't accept two revisions in different branches."
2087
msgstr "bzr %s não aceita duas versões em diferentes ramos."
2088
2089
#: bzrlib/builtins.py:2904
2090
#, python-format
2091
msgid "bzr %s --revision takes one or two values."
2092
msgstr "bzr %s --revision tem um ou dois valores."
2093
2094
#: bzrlib/builtins.py:2949
2095
msgid ""
2096
"List files in a tree.\n"
2097
" "
2098
msgstr ""
2099
"Lista os arquivos em uma árvore.\n"
2100
" "
2101
2102
#: bzrlib/builtins.py:2958
2103
msgid "Recurse into subdirectories."
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:2960
2107
msgid "Print paths relative to the root of the branch."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:2962
2111
msgid "Print unknown files."
2112
msgstr "Imprimir arquivos desconhecidos."
2113
2114
#: bzrlib/builtins.py:2963
2115
msgid "Print versioned files."
2116
msgstr "Imprimir arquivos versionados."
2117
2118
#: bzrlib/builtins.py:2966
2119
msgid "Print ignored files."
2120
msgstr "Imprimir arquivos ignorados."
2121
2122
#: bzrlib/builtins.py:2968
2123
msgid "List entries of a particular kind: file, directory, symlink."
2124
msgstr ""
2125
"Lista entradas de um tipo particular: arquivo, diretório ou ligação "
2126
"simbólica."
2127
2128
#: bzrlib/builtins.py:2981
2129
msgid "invalid kind specified"
2130
msgstr "Tipo especificado inválido"
2131
2132
#: bzrlib/builtins.py:2984
2133
msgid "Cannot set both --verbose and --null"
2134
msgstr "Não se pode definir --verbose e --null ao mesmo tempo."
2135
2136
#: bzrlib/builtins.py:2993
2137
msgid "cannot specify both --from-root and PATH"
2138
msgstr "Não se pode definir --from-root e CAMINHO ao mesmo tempo"
2139
2140
#: bzrlib/builtins.py:3080
2141
msgid "Ignore specified files or patterns."
2142
msgstr "Ignora arquivos ou padrões especificados."
2143
2144
#: bzrlib/builtins.py:3082
2145
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2146
msgstr "Veja ``bzr help patterns`` para detalhes sobre o padrão da sintaxe."
2147
2148
#: bzrlib/builtins.py:3084
2149
msgid ""
2150
"If a .bzrignore file does not exist, the ignore command\n"
2151
"will create one and add the specified files or patterns to the newly\n"
2152
"created file. The ignore command will also automatically add the \n"
2153
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2154
"the use of the ignore command will require an explicit add command."
2155
msgstr ""
2156
2157
#: bzrlib/builtins.py:3090
2158
msgid ""
2159
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2160
"After adding, editing or deleting that file either indirectly by\n"
2161
"using this command or directly by using an editor, be sure to commit\n"
2162
"it."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3095
2166
msgid ""
2167
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2168
"the global ignore file can be found in the application data directory as\n"
2169
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2170
"Global ignores are not touched by this command. The global ignore file\n"
2171
"can be edited directly using an editor."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3101
2175
msgid ""
2176
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2177
"precedence over regular ignores. Such exceptions are used to specify\n"
2178
"files that should be versioned which would otherwise be ignored."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3105
2182
msgid ""
2183
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2184
"precedence over the '!' exception patterns."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3108
2188
msgid ""
2189
":Notes: \n"
2190
" \n"
2191
"* Ignore patterns containing shell wildcards must be quoted from\n"
2192
" the shell on Unix."
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3113
2196
msgid ""
2197
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2198
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3116
2202
msgid ""
2203
":Examples:\n"
2204
" Ignore the top level Makefile::"
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3119
2208
msgid " bzr ignore ./Makefile"
2209
msgstr " bzr ignore ./Makefile"
2210
2211
#: bzrlib/builtins.py:3121
2212
msgid " Ignore .class files in all directories...::"
2213
msgstr " Ignora arquivos .class em todos os diretórios...::"
2214
2215
#: bzrlib/builtins.py:3123
2216
msgid " bzr ignore \"*.class\""
2217
msgstr " bzr ignore \"*.class\""
2218
2219
#: bzrlib/builtins.py:3125
2220
msgid " ...but do not ignore \"special.class\"::"
2221
msgstr " ...mas não ignora \"special.class\"::"
2222
2223
#: bzrlib/builtins.py:3127
2224
msgid " bzr ignore \"!special.class\""
2225
msgstr " bzr ignore \"!special.class\""
2226
2227
#: bzrlib/builtins.py:3129
2228
msgid " Ignore files whose name begins with the \"#\" character::"
2229
msgstr " Ignora arquivos cujo nome começa com o caracter \"#\"::"
2230
2231
#: bzrlib/builtins.py:3131
2232
msgid " bzr ignore \"RE:^#\""
2233
msgstr " bzr ignore \"RE:^#\""
2234
2235
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2236
msgid " Ignore .o files under the lib directory::"
2237
msgstr " Ignora arquivos .o no diretório lib::"
2238
2239
#: bzrlib/builtins.py:3135
2240
msgid " bzr ignore \"lib/**/*.o\""
2241
msgstr " bzr ignore \"lib/**/*.o\""
2242
2243
#: bzrlib/builtins.py:3139
2244
msgid " bzr ignore \"RE:lib/.*\\.o\""
2245
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2246
2247
#: bzrlib/builtins.py:3141
2248
msgid " Ignore everything but the \"debian\" toplevel directory::"
2249
msgstr " Ignora tudo exceto o diretório \"debian\" primário::"
2250
2251
#: bzrlib/builtins.py:3143
2252
msgid ""
2253
" bzr ignore \"RE:(?!debian/).*\"\n"
2254
" \n"
2255
" Ignore everything except the \"local\" toplevel directory,\n"
2256
" but always ignore autosave files ending in ~, even under local/::\n"
2257
" \n"
2258
" bzr ignore \"*\"\n"
2259
" bzr ignore \"!./local\"\n"
2260
" bzr ignore \"!!*~\""
2261
msgstr ""
2262
" bzr ignore \"RE:(?!debian/).*\"\n"
2263
" \n"
2264
" Ignora tudo exceto o diretório \"local\" primário,\n"
2265
" mas sempre ignora arquivos automáticos terminados em \"~\", mesmo dentro "
2266
"de local/::\n"
2267
" \n"
2268
" bzr ignore \"*\"\n"
2269
" bzr ignore \"!./local\"\n"
2270
" bzr ignore \"!!*~\""
2271
2272
#: bzrlib/builtins.py:3157
2273
msgid "Display the default ignore rules that bzr uses."
2274
msgstr ""
2275
2276
#: bzrlib/builtins.py:3169
2277
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2278
msgstr ""
2279
2280
#: bzrlib/builtins.py:3180
2281
#, python-format
2282
msgid "Invalid ignore pattern found. %s"
2283
msgid_plural "Invalid ignore patterns found. %s"
2284
msgstr[0] ""
2285
msgstr[1] ""
2286
2287
#: bzrlib/builtins.py:3189
2288
msgid "NAME_PATTERN should not be an absolute path"
2289
msgstr "NOME_DO_PADRAO não deve ser um caminho absoluto"
2290
2291
#: bzrlib/builtins.py:3202
2292
#, python-format
2293
msgid ""
2294
"Warning: the following files are version controlled and match your ignore "
2295
"pattern:\n"
2296
"%s\n"
2297
"These files will continue to be version controlled unless you 'bzr remove' "
2298
"them.\n"
2299
msgstr ""
2300
"Alerta: os seguintes arquivos são controlados por versão e coincidem com o "
2301
"seu padrão de ignorar:\n"
2302
"%s\n"
2303
"Esses arquivos continuarão a ser controlados por versão a menos que você os "
2304
"remova 'brz remove'.\n"
2305
2306
#: bzrlib/builtins.py:3209
2307
msgid "List ignored files and the patterns that matched them."
2308
msgstr "Listar os arquivos ignorados e os padrões que coincidem com eles."
2309
2310
#: bzrlib/builtins.py:3211
2311
msgid ""
2312
"List all the ignored files and the ignore pattern that caused the file to\n"
2313
"be ignored."
2314
msgstr ""
2315
"Listar todos os arquivos ignorados e os padrões de ignorar que fizeram com "
2316
"que o arquivo\n"
2317
"fosse ignorado."
2318
2319
#: bzrlib/builtins.py:3214
2320
msgid "Alternatively, to list just the files::"
2321
msgstr "Alternativamente, listar apenas os arquivos::"
2322
2323
#: bzrlib/builtins.py:3216
2324
msgid " bzr ls --ignored"
2325
msgstr " bzr ls --ignored"
2326
2327
#: bzrlib/builtins.py:3250
2328
#, python-format
2329
msgid "not a valid revision-number: %r"
2330
msgstr "não é um número de revisão válido: %r"
2331
2332
#: bzrlib/builtins.py:3257
2333
msgid ""
2334
"Export current or past revision to a destination directory or archive."
2335
msgstr "Exporta a revisão atual ou antiga para um diretório ou arquivo."
2336
2337
#: bzrlib/builtins.py:3259
2338
msgid "If no revision is specified this exports the last committed revision."
2339
msgstr ""
2340
"Caso nenhuma revisão seja especificada isto exporta a última versão "
2341
"submetida."
2342
2343
#: bzrlib/builtins.py:3261
2344
msgid ""
2345
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2346
"given, try to find the format with the extension. If no extension\n"
2347
"is found exports to a directory (equivalent to --format=dir)."
2348
msgstr ""
2349
2350
#: bzrlib/builtins.py:3265
2351
msgid ""
2352
"If root is supplied, it will be used as the root directory inside\n"
2353
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2354
"to the exported filename. The root option has no effect for 'dir' format."
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3269
2358
msgid ""
2359
"If branch is omitted then the branch containing the current working\n"
2360
"directory will be used."
2361
msgstr ""
2362
"Se o ramo for omitido então o ramo contando o diretório atual de \n"
2363
"trabalho será utilizado."
2364
2365
#: bzrlib/builtins.py:3272
2366
msgid ""
2367
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2368
msgstr ""
2369
"Nota: Exportar da árvore com arquivos nomeados em formato não-ASCII, não é "
2370
"suportado."
2371
2372
#: bzrlib/builtins.py:3274
2373
msgid ""
2374
" ================= =========================\n"
2375
" Supported formats Autodetected by extension\n"
2376
" ================= =========================\n"
2377
" dir (none)\n"
2378
" tar .tar\n"
2379
" tbz2 .tar.bz2, .tbz2\n"
2380
" tgz .tar.gz, .tgz\n"
2381
" zip .zip\n"
2382
" ================= ========================="
2383
msgstr ""
2384
" ================= =========================\n"
2385
" Formatos suportados detectados pela extensão\n"
2386
" ================= =========================\n"
2387
" dir (nenhum)\n"
2388
" tar .tar\n"
2389
" tbz2 .tar.bz2, .tbz2\n"
2390
" tgz .tar.gz, .tgz\n"
2391
" zip .zip\n"
2392
" ================= ========================="
2393
2394
#: bzrlib/builtins.py:3288
2395
msgid "Type of file to export to."
2396
msgstr "Tipo do arquivo para exportar para."
2397
2398
#: bzrlib/builtins.py:3291
2399
msgid "Apply content filters to export the convenient form."
2400
msgstr "Aplicar filtros de conteúdo para exportar de forma conveniente."
2401
2402
#: bzrlib/builtins.py:3295
2403
msgid "Name of the root directory inside the exported file."
2404
msgstr "Nome do diretório raiz dentro do arquivo exportado."
2405
2406
#: bzrlib/builtins.py:3297
2407
msgid ""
2408
"Set modification time of files to that of the last revision in which it was "
2409
"changed."
2410
msgstr ""
2411
"Ajuste o tempo de modificação dos arquivos para a última revisão em que eles "
2412
"foram modificados."
2413
2414
#: bzrlib/builtins.py:3300
2415
msgid ""
2416
"Export the working tree contents rather than that of the last revision."
2417
msgstr "Exportar o conteúdo da árvore de trabalho antes da última revisão."
2418
2419
#: bzrlib/builtins.py:3319
2420
msgid "--uncommitted requires a working tree"
2421
msgstr "--uncommitted requer uma árvore de trabalho"
2422
2423
#: bzrlib/builtins.py:3328
2424
#, python-format
2425
msgid "Unsupported export format: %s"
2426
msgstr "Formato de exportação não suportado: %s"
2427
2428
#: bzrlib/builtins.py:3332
2429
msgid ""
2430
"Write the contents of a file as of a given revision to standard output."
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3334
2434
msgid "If no revision is nominated, the last revision is used."
2435
msgstr "Caso nenhuma revisão seja designada, a última versão é usada."
2436
2437
#: bzrlib/builtins.py:3336
2438
msgid ""
2439
"Note: Take care to redirect standard output when using this command on a\n"
2440
"binary file."
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3342
2444
msgid "The path name in the old tree."
2445
msgstr "O caminho do arquivo na antiga árvore."
2446
2447
#: bzrlib/builtins.py:3343
2448
msgid "Apply content filters to display the convenience form."
2449
msgstr "Aplicar filtros de conteúdo para exibir de forma conveniente."
2450
2451
#: bzrlib/builtins.py:3354
2452
msgid "bzr cat --revision takes exactly one revision specifier"
2453
msgstr "bzr cat --revision pega exatamente especificador de versão."
2454
2455
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2456
msgid "{0!r} is not present in revision {1}"
2457
msgstr "{0!r} não está presente na versão {1}"
2458
2459
#: bzrlib/builtins.py:3414
2460
msgid "Commit changes into a new revision."
2461
msgstr "Submeter alterações para uma nova versão."
2462
2463
#: bzrlib/builtins.py:3416
2464
msgid ""
2465
"An explanatory message needs to be given for each commit. This is\n"
2466
"often done by using the --message option (getting the message from the\n"
2467
"command line) or by using the --file option (getting the message from\n"
2468
"a file). If neither of these options is given, an editor is opened for\n"
2469
"the user to enter the message. To see the changed files in the\n"
2470
"boilerplate text loaded into the editor, use the --show-diff option."
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3423
2474
msgid ""
2475
"By default, the entire tree is committed and the person doing the\n"
2476
"commit is assumed to be the author. These defaults can be overridden\n"
2477
"as explained below."
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3427
2481
msgid ":Selective commits:"
2482
msgstr ":Submissões seletivas:"
2483
2484
#: bzrlib/builtins.py:3429
2485
msgid ""
2486
" If selected files are specified, only changes to those files are\n"
2487
" committed. If a directory is specified then the directory and\n"
2488
" everything within it is committed."
2489
msgstr ""
2490
2491
#: bzrlib/builtins.py:3433
2492
msgid ""
2493
" When excludes are given, they take precedence over selected files.\n"
2494
" For example, to commit only changes within foo, but not changes\n"
2495
" within foo/bar::"
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3437
2499
msgid " bzr commit foo -x foo/bar"
2500
msgstr " bzr commit foo -x foo/bar"
2501
2502
#: bzrlib/builtins.py:3439
2503
msgid " A selective commit after a merge is not yet supported."
2504
msgstr ""
2505
2506
#: bzrlib/builtins.py:3441
2507
msgid ":Custom authors:"
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3443
2511
msgid ""
2512
" If the author of the change is not the same person as the committer,\n"
2513
" you can specify the author's name using the --author option. The\n"
2514
" name should be in the same format as a committer-id, e.g.\n"
2515
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2516
" the change you can specify the option multiple times, once for each\n"
2517
" author."
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3450
2521
msgid ":Checks:"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3452
2525
msgid ""
2526
" A common mistake is to forget to add a new file or directory before\n"
2527
" running the commit command. The --strict option checks for unknown\n"
2528
" files and aborts the commit if any are found. More advanced pre-commit\n"
2529
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2530
" for details."
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3458
2534
msgid ":Things to note:"
2535
msgstr ":Notas:"
2536
2537
#: bzrlib/builtins.py:3460
2538
msgid ""
2539
" If you accidentially commit the wrong changes or make a spelling\n"
2540
" mistake in the commit message say, you can use the uncommit command\n"
2541
" to undo it. See ``bzr help uncommit`` for details."
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3464
2545
msgid ""
2546
" Hooks can also be configured to run after a commit. This allows you\n"
2547
" to trigger updates to external systems like bug trackers. The --fixes\n"
2548
" option can be used to record the association between a revision and\n"
2549
" one or more bugs. See ``bzr help bugs`` for details."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3474
2553
msgid "Do not consider changes made to a given path."
2554
msgstr "Não considerar as alterações feitas para um determinado caminho."
2555
2556
#: bzrlib/builtins.py:3477
2557
msgid "Description of the new revision."
2558
msgstr "Descrição da nova revisão."
2559
2560
#: bzrlib/builtins.py:3480
2561
msgid "Commit even if nothing has changed."
2562
msgstr "Usar commit, mesmo que nada tenha mudado."
2563
2564
#: bzrlib/builtins.py:3484
2565
msgid "Take commit message from this file."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3486
2569
msgid "Refuse to commit if there are unknown files in the working tree."
2570
msgstr ""
2571
"Recuse submeter se houver arquivos desconhecidos na árvore de trabalho."
2572
2573
#: bzrlib/builtins.py:3489
2574
msgid ""
2575
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2576
"08:00:00 +0100'."
2577
msgstr ""
2578
"Defina uma data de submissão manualmente usando formato de data de "
2579
"submissão, ex. '2009-10-10 08:00:00 +0100'."
2580
2581
#: bzrlib/builtins.py:3492
2582
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2583
msgstr ""
2584
"Marque um bug como estando corrigido por esta versão (ver \"bzr help bugs\")."
2585
2586
#: bzrlib/builtins.py:3495
2587
msgid "Set the author's name, if it's different from the committer."
2588
msgstr ""
2589
"Defina o nome do autor, se este for diferente do usuário que submeteu."
2590
2591
#: bzrlib/builtins.py:3498
2592
msgid ""
2593
"Perform a local commit in a bound branch. Local commits are not pushed to "
2594
"the master branch until a normal commit is performed."
2595
msgstr ""
2596
2597
#: bzrlib/builtins.py:3504
2598
msgid ""
2599
"When no message is supplied, show the diff along with the status summary in "
2600
"the message editor."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:3507
2604
msgid ""
2605
"When committing to a foreign version control system do not push data that "
2606
"can not be natively represented."
2607
msgstr ""
2608
2609
#: bzrlib/builtins.py:3525
2610
#, python-format
2611
msgid ""
2612
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2613
"default bug tracker using the `bugtracker` option.\n"
2614
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2615
msgstr ""
2616
"Nenhum rastreador especificado para o bug %s. Use a forma 'tracker:id' ou "
2617
"especifique um rastreador de bug padrão usando a opção `bugtracker`.\n"
2618
"Veja \"bzr help bugs\" para mais informações sobre este recurso. Submissão "
2619
"recusada."
2620
2621
#: bzrlib/builtins.py:3534
2622
#, python-format
2623
msgid ""
2624
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2625
"for more information on this feature.\n"
2626
"Commit refused."
2627
msgstr ""
2628
"Bug inválido %s. Deve estar na forma de 'tracker:id'. Veja \"bzr help bugs\" "
2629
"para mais informações sobre este recurso.\n"
2630
"Submissão recusada."
2631
2632
#: bzrlib/builtins.py:3543
2633
#, python-format
2634
msgid "Unrecognized bug %s. Commit refused."
2635
msgstr "Bug não reconhecido %s. Submissão recusada."
2636
2637
#: bzrlib/builtins.py:3546
2638
#, python-format
2639
msgid ""
2640
"%s\n"
2641
"Commit refused."
2642
msgstr ""
2643
"%s\n"
2644
"Submissão recusada."
2645
2646
#: bzrlib/builtins.py:3570
2647
msgid "Could not parse --commit-time: "
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:3610
2651
msgid "please specify either --message or --file"
2652
msgstr "por favor especifique --message ou --file"
2653
2654
#: bzrlib/builtins.py:3639
2655
msgid "please specify a commit message with either --message or --file"
2656
msgstr ""
2657
"por favor especifique uma mensagem de submissão com --message ou --file"
2658
2659
#: bzrlib/builtins.py:3642
2660
msgid ""
2661
"Empty commit message specified. Please specify a commit message with either -"
2662
"-message or --file or leave a blank message with --message \"\"."
2663
msgstr ""
2664
2665
#: bzrlib/builtins.py:3662
2666
msgid ""
2667
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2668
"-unchanged to force an empty commit."
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:3666
2672
msgid ""
2673
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2674
"resolve FILE\" to resolve."
2675
msgstr ""
2676
"Conflitos detectados na árvore de trabalho. Use \"bzr conflicts\" para "
2677
"listar, \"bzr resolve FILE\" para decidir."
2678
2679
#: bzrlib/builtins.py:3670
2680
msgid "Commit refused because there are unknown files in the working tree."
2681
msgstr ""
2682
"Submissão recusada por haver arquivos desconhecidos na árvore de trabalho."
2683
2684
#: bzrlib/builtins.py:3673
2685
msgid ""
2686
"\n"
2687
"To commit to master branch, run update and then commit.\n"
2688
"You can also pass --local to commit to continue working disconnected."
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:3681
2692
msgid ""
2693
"Validate working tree structure, branch consistency and repository history."
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:3683
2697
msgid ""
2698
"This command checks various invariants about branch and repository storage\n"
2699
"to detect data corruption or bzr bugs."
2700
msgstr ""
2701
2702
#: bzrlib/builtins.py:3686
2703
msgid ""
2704
"The working tree and branch checks will only give output if a problem is\n"
2705
"detected. The output fields of the repository check are:"
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:3689
2709
msgid ""
2710
"revisions\n"
2711
" This is just the number of revisions checked. It doesn't\n"
2712
" indicate a problem."
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:3693
2716
msgid ""
2717
"versionedfiles\n"
2718
" This is just the number of versionedfiles checked. It\n"
2719
" doesn't indicate a problem."
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:3697
2723
msgid ""
2724
"unreferenced ancestors\n"
2725
" Texts that are ancestors of other texts, but\n"
2726
" are not properly referenced by the revision ancestry. This is a\n"
2727
" subtle problem that Bazaar can work around."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:3702
2731
msgid ""
2732
"unique file texts\n"
2733
" This is the total number of unique file contents\n"
2734
" seen in the checked revisions. It does not indicate a problem."
2735
msgstr ""
2736
2737
#: bzrlib/builtins.py:3706
2738
msgid ""
2739
"repeated file texts\n"
2740
" This is the total number of repeated texts seen\n"
2741
" in the checked revisions. Texts can be repeated when their file\n"
2742
" entries are modified, but the file contents are not. It does not\n"
2743
" indicate a problem."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:3712
2747
msgid ""
2748
"If no restrictions are specified, all Bazaar data that is found at the "
2749
"given\n"
2750
"location will be checked."
2751
msgstr ""
2752
"Se restrições não forem especificadas, todos os dados do Bazaar que forem "
2753
"encontrados\n"
2754
"no local dado serão checados."
2755
2756
#: bzrlib/builtins.py:3717
2757
msgid " Check the tree and branch at 'foo'::"
2758
msgstr " Cheque a árvore e ramo em 'foo'::"
2759
2760
#: bzrlib/builtins.py:3719
2761
msgid " bzr check --tree --branch foo"
2762
msgstr " bzr check --tree --branch foo"
2763
2764
#: bzrlib/builtins.py:3721
2765
msgid " Check only the repository at 'bar'::"
2766
msgstr " Cheque apenas o repositório em 'bar'::"
2767
2768
#: bzrlib/builtins.py:3723
2769
msgid " bzr check --repo bar"
2770
msgstr " bzr check --repo bar"
2771
2772
#: bzrlib/builtins.py:3725
2773
msgid " Check everything at 'baz'::"
2774
msgstr " Cheque tudo em 'baz'::"
2775
2776
#: bzrlib/builtins.py:3727
2777
msgid " bzr check baz"
2778
msgstr " bzr check baz"
2779
2780
#: bzrlib/builtins.py:3733
2781
msgid "Check the branch related to the current directory."
2782
msgstr "Cheque o ramo relacionado ao diretório atual."
2783
2784
#: bzrlib/builtins.py:3735
2785
msgid "Check the repository related to the current directory."
2786
msgstr "Cheque o repositório relacionado ao diretório atual."
2787
2788
#: bzrlib/builtins.py:3737
2789
msgid "Check the working tree related to the current directory."
2790
msgstr "Cheque a árvore de trabalho relacionada ao diretório atual."
2791
2792
#: bzrlib/builtins.py:3751
2793
msgid "Upgrade a repository, branch or working tree to a newer format."
2794
msgstr ""
2795
"Atualize um repositório, ramo ou árvore de trabalho para um formato mais "
2796
"recente."
2797
2798
#: bzrlib/builtins.py:3753
2799
msgid ""
2800
"When the default format has changed after a major new release of\n"
2801
"Bazaar, you may be informed during certain operations that you\n"
2802
"should upgrade. Upgrading to a newer format may improve performance\n"
2803
"or make new features available. It may however limit interoperability\n"
2804
"with older repositories or with older versions of Bazaar."
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:3759
2808
msgid ""
2809
"If you wish to upgrade to a particular format rather than the\n"
2810
"current default, that can be specified using the --format option.\n"
2811
"As a consequence, you can use the upgrade command this way to\n"
2812
"\"downgrade\" to an earlier format, though some conversions are\n"
2813
"a one way process (e.g. changing from the 1.x default to the\n"
2814
"2.x default) so downgrading is not always possible."
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:3766
2818
msgid ""
2819
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2820
"process (where # is a number). By default, this is left there on\n"
2821
"completion. If the conversion fails, delete the new .bzr directory\n"
2822
"and rename this one back in its place. Use the --clean option to ask\n"
2823
"for the backup.bzr directory to be removed on successful conversion.\n"
2824
"Alternatively, you can delete it by hand if everything looks good\n"
2825
"afterwards."
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:3774
2829
msgid ""
2830
"If the location given is a shared repository, dependent branches\n"
2831
"are also converted provided the repository converts successfully.\n"
2832
"If the conversion of a branch fails, remaining branches are still\n"
2833
"tried."
2834
msgstr ""
2835
2836
#: bzrlib/builtins.py:3779
2837
msgid ""
2838
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2839
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2840
msgstr ""
2841
"Para mais informações sobre atualizações, veja o Bazaar Upgrade Guide,\n"
2842
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2843
2844
#: bzrlib/builtins.py:3787
2845
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2846
msgstr ""
2847
"Atualize para um formato específico. Veja \"bzr help formats\" para detalhes."
2848
2849
#: bzrlib/builtins.py:3791
2850
msgid "Branch format"
2851
msgstr "Formato de ramo"
2852
2853
#: bzrlib/builtins.py:3793
2854
msgid "Remove the backup.bzr directory if successful."
2855
msgstr "Remover o diretório backup.bzr se for bem sucedido."
2856
2857
#: bzrlib/builtins.py:3795
2858
msgid "Show what would be done, but don't actually do anything."
2859
msgstr "Mostra o que seria feito, mas na realidade não faz nada."
2860
2861
#: bzrlib/builtins.py:3810
2862
msgid "Show or set bzr user id."
2863
msgstr "Mostrar ou definir o id do usuário do bzr."
2864
2865
#: bzrlib/builtins.py:3812
2866
msgid ""
2867
":Examples:\n"
2868
" Show the email of the current user::"
2869
msgstr ""
2870
2871
#: bzrlib/builtins.py:3815
2872
msgid " bzr whoami --email"
2873
msgstr " bzr whoami --email"
2874
2875
#: bzrlib/builtins.py:3817
2876
msgid " Set the current user::"
2877
msgstr " Definir o usuário atual::"
2878
2879
#: bzrlib/builtins.py:3819
2880
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2881
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2882
2883
#: bzrlib/builtins.py:3823
2884
msgid "Display email address only."
2885
msgstr "Mostra apenas o endereço de email."
2886
2887
#: bzrlib/builtins.py:3825
2888
msgid "Set identity for the current branch instead of globally."
2889
msgstr "Definir uma identidade para o ramo atual ao invés de globalmente."
2890
2891
#: bzrlib/builtins.py:3851
2892
msgid "--email can only be used to display existing identity"
2893
msgstr "--email pode apenas ser usado para exibir identidade existente"
2894
2895
#: bzrlib/builtins.py:3873
2896
msgid "Print or set the branch nickname."
2897
msgstr "Imprime ou define o apelido do ramo."
2898
2899
#: bzrlib/builtins.py:3875
2900
msgid ""
2901
"If unset, the tree root directory name is used as the nickname.\n"
2902
"To print the current nickname, execute with no argument."
2903
msgstr ""
2904
2905
#: bzrlib/builtins.py:3878
2906
msgid ""
2907
"Bound branches use the nickname of its master branch unless it is set\n"
2908
"locally."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:3898
2912
msgid "Set/unset and display aliases."
2913
msgstr ""
2914
2915
#: bzrlib/builtins.py:3900
2916
msgid ""
2917
":Examples:\n"
2918
" Show the current aliases::"
2919
msgstr ""
2920
":Exemplos:\n"
2921
" Mostra os atalhos atuais::"
2922
2923
#: bzrlib/builtins.py:3903
2924
msgid " bzr alias"
2925
msgstr " bzr alias"
2926
2927
#: bzrlib/builtins.py:3905
2928
msgid " Show the alias specified for 'll'::"
2929
msgstr " Mostrar os atalhos especificados para 'll'::"
2930
2931
#: bzrlib/builtins.py:3907
2932
msgid " bzr alias ll"
2933
msgstr " bzr alias ll"
2934
2935
#: bzrlib/builtins.py:3909
2936
msgid " Set an alias for 'll'::"
2937
msgstr " Definir um atalho para 'll'::"
2938
2939
#: bzrlib/builtins.py:3911
2940
msgid " bzr alias ll=\"log --line -r-10..-1\""
2941
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2942
2943
#: bzrlib/builtins.py:3913
2944
msgid " To remove an alias for 'll'::"
2945
msgstr " Para remover um atalho para 'll'::"
2946
2947
#: bzrlib/builtins.py:3915
2948
msgid " bzr alias --remove ll"
2949
msgstr " bzr alias --remove ll"
2950
2951
#: bzrlib/builtins.py:3920
2952
msgid "Remove the alias."
2953
msgstr "Remove o atalho."
2954
2955
#: bzrlib/builtins.py:3938
2956
msgid "bzr alias --remove expects an alias to remove."
2957
msgstr "bzr alias --remove espera por um apelido(alias) para remover."
2958
2959
#: bzrlib/builtins.py:4119
2960
msgid ""
2961
"subunit not available. subunit needs to be installed to use --subunit."
2962
msgstr ""
2963
"subunit não disponivel. É preciso instalar subunit para usar --subunit."
2964
2965
#: bzrlib/builtins.py:4136
2966
msgid ""
2967
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2968
msgstr "--benchmark não é suportado por bzr 2.2; utilize bzr-usertest"
2969
2970
#: bzrlib/builtins.py:4183
2971
msgid "Show version of bzr."
2972
msgstr "Mostra a versão do bzr."
2973
2974
#: bzrlib/builtins.py:4187
2975
msgid "Print just the version number."
2976
msgstr "Mostra apenas o número da versão."
2977
2978
#: bzrlib/builtins.py:4206
2979
msgid "It sure does!\n"
2980
msgstr "Com certeza faz!\n"
2981
2982
#: bzrlib/builtins.py:4230
2983
#, python-format
2984
msgid "merge base is revision %s\n"
2985
msgstr "a base da mesclagem é a revisão %s\n"
2986
2987
#: bzrlib/builtins.py:4234
2988
msgid "Perform a three-way merge."
2989
msgstr "Realizar uma mesclagem de três-vias."
2990
2991
#: bzrlib/builtins.py:4236
2992
msgid ""
2993
"The source of the merge can be specified either in the form of a branch,\n"
2994
"or in the form of a path to a file containing a merge directive generated\n"
2995
"with bzr send. If neither is specified, the default is the upstream branch\n"
2996
"or the branch most recently merged using --remember. The source of the\n"
2997
"merge may also be specified in the form of a path to a file in another\n"
2998
"branch: in this case, only the modifications to that file are merged into\n"
2999
"the current working tree."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4244
3003
msgid ""
3004
"When merging from a branch, by default bzr will try to merge in all new\n"
3005
"work from the other branch, automatically determining an appropriate base\n"
3006
"revision. If this fails, you may need to give an explicit base."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4248
3010
msgid ""
3011
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3012
"try to merge in all new work up to and including revision OTHER."
3013
msgstr ""
3014
3015
#: bzrlib/builtins.py:4251
3016
msgid ""
3017
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3018
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3019
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3020
"not already contain revision BASE, such a merge is commonly referred to as\n"
3021
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3022
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3023
"changes from the other branch is not stored in the commit."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4259
3027
msgid "Revision numbers are always relative to the source branch."
3028
msgstr "Os números da revisão são sempre relativos ao ramo fonte."
3029
3030
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3031
msgid ""
3032
"Merge will do its best to combine the changes in two branches, but there\n"
3033
"are some kinds of problems only a human can fix. When it encounters those,\n"
3034
"it will mark a conflict. A conflict means that you need to fix something,\n"
3035
"before you can commit."
3036
msgstr ""
3037
3038
#: bzrlib/builtins.py:4266
3039
msgid ""
3040
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3041
msgstr ""
3042
"Use brz resolve quando você tiver um problema solucionado. Veja também bzr "
3043
"conflicts."
3044
3045
#: bzrlib/builtins.py:4268
3046
msgid ""
3047
"If there is no default branch set, the first merge will set it (use\n"
3048
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3049
"to use the default. To change the default, use --remember. The value will\n"
3050
"only be saved if the remote location can be accessed."
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4273
3054
msgid ""
3055
"The results of the merge are placed into the destination working\n"
3056
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3057
"committed to record the result of the merge."
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4277
3061
msgid ""
3062
"merge refuses to run if there are any uncommitted changes, unless\n"
3063
"--force is given. If --force is given, then the changes from the source \n"
3064
"will be merged with the current working tree, including any uncommitted\n"
3065
"changes in the tree. The --force option can also be used to create a\n"
3066
"merge revision which has more than two parents."
3067
msgstr ""
3068
3069
#: bzrlib/builtins.py:4283
3070
msgid ""
3071
"If one would like to merge changes from the working tree of the other\n"
3072
"branch without merging any committed revisions, the --uncommitted option\n"
3073
"can be given."
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:4287
3077
msgid ""
3078
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3079
"you to apply each diff hunk and file change, similar to \"shelve\"."
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4290
3083
msgid ""
3084
":Examples:\n"
3085
" To merge all new revisions from bzr.dev::"
3086
msgstr ""
3087
":Exemplos:\n"
3088
" Para mesclar todas as verões de bzr.dev::"
3089
3090
#: bzrlib/builtins.py:4293
3091
msgid " bzr merge ../bzr.dev"
3092
msgstr " bzr merge ../bzr.dev"
3093
3094
#: bzrlib/builtins.py:4295
3095
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3096
msgstr " Para mesclar mudanças e incluir a versão 82 de bzr.dev::"
3097
3098
#: bzrlib/builtins.py:4297
3099
msgid " bzr merge -r 82 ../bzr.dev"
3100
msgstr " bzr merge -r 82 ../bzr.dev"
3101
3102
#: bzrlib/builtins.py:4299
3103
msgid " To merge the changes introduced by 82, without previous changes::"
3104
msgstr ""
3105
" Para mesclar as mudanças introduzidas por 82, sem as mudanças "
3106
"anteriores::"
3107
3108
#: bzrlib/builtins.py:4301
3109
msgid " bzr merge -r 81..82 ../bzr.dev"
3110
msgstr " bzr merge -r 81..82 ../bzr.dev"
3111
3112
#: bzrlib/builtins.py:4303
3113
msgid " To apply a merge directive contained in /tmp/merge::"
3114
msgstr " Para aplicar uma mesclagem diretiva contida em /tmp/merge::"
3115
3116
#: bzrlib/builtins.py:4305
3117
msgid " bzr merge /tmp/merge"
3118
msgstr " bzr merge /tmp/merge"
3119
3120
#: bzrlib/builtins.py:4307
3121
msgid ""
3122
" To create a merge revision with three parents from two branches\n"
3123
" feature1a and feature1b:"
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:4310
3127
msgid ""
3128
" bzr merge ../feature1a\n"
3129
" bzr merge ../feature1b --force\n"
3130
" bzr commit -m 'revision with three parents'"
3131
msgstr ""
3132
" bzr merge ../feature1a\n"
3133
" bzr merge ../feature1b --force\n"
3134
" bzr commit -m 'revisão com três pais'"
3135
3136
#: bzrlib/builtins.py:4322
3137
msgid "Merge even if the destination tree has uncommitted changes."
3138
msgstr ""
3139
3140
#: bzrlib/builtins.py:4328
3141
msgid ""
3142
"Apply uncommitted changes from a working copy, instead of branch changes."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:4330
3146
msgid ""
3147
"If the destination is already completely merged into the source, pull from "
3148
"the source rather than merging. When this happens, you do not need to "
3149
"commit the result."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:4335
3153
msgid ""
3154
"Branch to merge into, rather than the one containing the working directory."
3155
msgstr ""
3156
3157
#: bzrlib/builtins.py:4337
3158
msgid "Instead of merging, show a diff of the merge."
3159
msgstr "Em vez de mesclar, mostre uma comparação da mesclagem."
3160
3161
#: bzrlib/builtins.py:4339
3162
msgid "Select changes interactively."
3163
msgstr "Selecione mudanças interativamente."
3164
3165
#: bzrlib/builtins.py:4361
3166
msgid ""
3167
"Merging into empty branches not currently supported, "
3168
"https://bugs.launchpad.net/bzr/+bug/308562"
3169
msgstr ""
3170
"Mesclagem em ramos vazios não é suportada atualmente, "
3171
"https://bugs.launchpad.net/bzr/+bug/308562"
3172
3173
#: bzrlib/builtins.py:4388
3174
msgid "Cannot use --uncommitted with bundles or merge directives."
3175
msgstr ""
3176
"Não é possível usar --uncommitted com empacotamentos ou diretivas mescladas."
3177
3178
#: bzrlib/builtins.py:4399
3179
msgid "Cannot use --uncommitted and --revision at the same time."
3180
msgstr "Não é possível usar --uncommitted e --revision ao mesmo tempo."
3181
3182
#: bzrlib/builtins.py:4419
3183
msgid "merger: "
3184
msgstr "mesclar: "
3185
3186
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3187
msgid "Nothing to do."
3188
msgstr "Nada a ser feito."
3189
3190
#: bzrlib/builtins.py:4425
3191
msgid "Cannot pull individual files"
3192
msgstr "Não foi possível obter os arquivos individuais"
3193
3194
#: bzrlib/builtins.py:4433
3195
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3196
msgstr "Este ramo não tem submissões. (talvez você prefira 'bzr pull')"
3197
3198
#: bzrlib/builtins.py:4491
3199
#, python-format
3200
msgid "Show-base is not supported for this merge type. %s"
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:4500
3204
#, python-format
3205
msgid "Conflict reduction is not supported for merge type %s."
3206
msgstr "Redução de conflito não é suportada para mesclagem de tipo %s."
3207
3208
#: bzrlib/builtins.py:4504
3209
msgid "Cannot do conflict reduction and show base."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:4615
3213
msgid "No location specified or remembered"
3214
msgstr "Nenhum local especificado ou memorizado"
3215
3216
#: bzrlib/builtins.py:4617
3217
msgid "{0} remembered {1} location {2}"
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:4623
3221
msgid "Redo a merge."
3222
msgstr "Refazer uma mesclagem."
3223
3224
#: bzrlib/builtins.py:4625
3225
msgid ""
3226
"Use this if you want to try a different merge technique while resolving\n"
3227
"conflicts. Some merge techniques are better than others, and remerge\n"
3228
"lets you try different ones on different files."
3229
msgstr ""
3230
"Use isto se você quer tentar uma técnica de mesclagem diferente para "
3231
"resolver\n"
3232
"conflitos. Algumas técnicas de mesclagem são melhores que outras, e "
3233
"remesclar\n"
3234
"lhe permite tentar técnicas diferentes em arquivos diferentes."
3235
3236
#: bzrlib/builtins.py:4629
3237
msgid ""
3238
"The options for remerge have the same meaning and defaults as the ones for\n"
3239
"merge. The difference is that remerge can (only) be run when there is a\n"
3240
"pending merge, and it lets you specify particular files."
3241
msgstr ""
3242
"As opções para remesclar têm o mesmo significado e padrões que aquelas para\n"
3243
"mesclar. A diferença é que a remesclagem (só) pode ser executada quando há "
3244
"uma\n"
3245
"mesclagem pendente, e lhe permite especificar arquivos específicos."
3246
3247
#: bzrlib/builtins.py:4633
3248
msgid ""
3249
":Examples:\n"
3250
" Re-do the merge of all conflicted files, and show the base text in\n"
3251
" conflict regions, in addition to the usual THIS and OTHER texts::"
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:4637
3255
msgid " bzr remerge --show-base"
3256
msgstr " bzr remerge --show-base"
3257
3258
#: bzrlib/builtins.py:4639
3259
msgid ""
3260
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3261
" additional processing to reduce the size of conflict regions::"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:4642
3265
msgid " bzr remerge --merge-type weave --reprocess foobar"
3266
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3267
3268
#: bzrlib/builtins.py:4649
3269
msgid "Show base revision text in conflicts."
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:4661
3273
msgid ""
3274
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3275
"merges."
3276
msgstr ""
3277
3278
#: bzrlib/builtins.py:4717
3279
msgid "Revert files to a previous revision."
3280
msgstr "Reverter arquivos para uma revisão anterior."
3281
3282
#: bzrlib/builtins.py:4719
3283
msgid ""
3284
"Giving a list of files will revert only those files. Otherwise, all files\n"
3285
"will be reverted. If the revision is not specified with '--revision', the\n"
3286
"last committed revision is used."
3287
msgstr ""
3288
3289
#: bzrlib/builtins.py:4723
3290
msgid ""
3291
"To remove only some changes, without reverting to a prior version, use\n"
3292
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3293
"will remove the changes introduced by the second last commit (-2), without\n"
3294
"affecting the changes introduced by the last commit (-1). To remove\n"
3295
"certain changes on a hunk-by-hunk basis, see the shelve command."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:4729
3299
msgid ""
3300
"By default, any files that have been manually changed will be backed up\n"
3301
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3302
"'.~#~' appended to their name, where # is a number."
3303
msgstr ""
3304
"Por padrão, quaisquer arquivos que tenham sido manualmente alterados terão "
3305
"cópias criadas\n"
3306
"primeiramente. (Arquivos modificados apenas por mesclagem não têm cópias "
3307
"criadas.) Cópias de arquivos têm\n"
3308
"'.~#~' concatenado aos seus nomes, onde # é um número."
3309
3310
#: bzrlib/builtins.py:4733
3311
msgid ""
3312
"When you provide files, you can use their current pathname or the pathname\n"
3313
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3314
"name. If you name a directory, all the contents of that directory will be\n"
3315
"reverted."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:4738
3319
msgid ""
3320
"If you have newly added files since the target revision, they will be\n"
3321
"removed. If the files to be removed have been changed, backups will be\n"
3322
"created as above. Directories containing unknown files will not be\n"
3323
"deleted."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:4743
3327
msgid ""
3328
"The working tree contains a list of revisions that have been merged but\n"
3329
"not yet committed. These revisions will be included as additional parents\n"
3330
"of the next commit. Normally, using revert clears that list as well as\n"
3331
"reverting the files. If any files are specified, revert leaves the list\n"
3332
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3333
".`` in the tree root to revert all files but keep the recorded merges,\n"
3334
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3335
"reverting any files."
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:4752
3339
msgid ""
3340
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3341
"changes from a branch in a single revision. To do this, perform the merge\n"
3342
"as desired. Then doing revert with the \"--forget-merges\" option will "
3343
"keep\n"
3344
"the content of the tree as it was, but it will clear the list of pending\n"
3345
"merges. The next commit will then contain all of the changes that are\n"
3346
"present in the other branch, but without any other parent revisions.\n"
3347
"Because this technique forgets where these changes originated, it may\n"
3348
"cause additional conflicts on later merges involving the same source and\n"
3349
"target branches."
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:4766
3353
msgid "Do not save backups of reverted files."
3354
msgstr "Não salvar cópias de arquivos revertidos."
3355
3356
#: bzrlib/builtins.py:4768
3357
msgid "Remove pending merge marker, without changing any files."
3358
msgstr "Remover marcador de mesclagem pendente, sem alterar nenhum arquivo."
3359
3360
#: bzrlib/builtins.py:4799
3361
msgid ""
3362
"Show help on a command or other topic.\n"
3363
" "
3364
msgstr ""
3365
"Mostrar a ajuda de um comando ou outro assunto.\n"
3366
" "
3367
3368
#: bzrlib/builtins.py:4804
3369
msgid "Show help on all commands."
3370
msgstr "Mostrar ajuda sobre todos os comandos."
3371
3372
#: bzrlib/builtins.py:4833
3373
msgid "Show unmerged/unpulled revisions between two branches."
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:4835
3377
msgid "OTHER_BRANCH may be local or remote."
3378
msgstr "OUTRO_RAMO pode ser local ou remoto."
3379
3380
#: bzrlib/builtins.py:4837
3381
msgid ""
3382
"To filter on a range of revisions, you can use the command -r begin..end\n"
3383
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3384
"also valid.\n"
3385
" \n"
3386
":Exit values:\n"
3387
" 1 - some missing revisions\n"
3388
" 0 - no missing revisions"
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:4847
3392
msgid ""
3393
" Determine the missing revisions between this and the branch at the\n"
3394
" remembered pull location::"
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:4850
3398
msgid " bzr missing"
3399
msgstr " bzr missing"
3400
3401
#: bzrlib/builtins.py:4852
3402
msgid " Determine the missing revisions between this and another branch::"
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:4854
3406
msgid " bzr missing http://server/branch"
3407
msgstr " bzr missing http://server/branch"
3408
3409
#: bzrlib/builtins.py:4856
3410
msgid ""
3411
" Determine the missing revisions up to a specific revision on the other\n"
3412
" branch::"
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:4859
3416
msgid " bzr missing -r ..-10"
3417
msgstr " bzr missing -r ..-10"
3418
3419
#: bzrlib/builtins.py:4861
3420
msgid ""
3421
" Determine the missing revisions up to a specific revision on this\n"
3422
" branch::"
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:4864
3426
msgid " bzr missing --my-revision ..-10"
3427
msgstr " bzr missing --my-revision ..-10"
3428
3429
#: bzrlib/builtins.py:4871
3430
msgid "Reverse the order of revisions."
3431
msgstr "Inverter a ordem das revisões"
3432
3433
#: bzrlib/builtins.py:4873
3434
msgid "Display changes in the local branch only."
3435
msgstr "Mostrar mudanças somente no ramo local."
3436
3437
#: bzrlib/builtins.py:4874
3438
msgid "Same as --mine-only."
3439
msgstr "O mesmo que --mine-only."
3440
3441
#: bzrlib/builtins.py:4876
3442
msgid "Display changes in the remote branch only."
3443
msgstr "Mostrar alterações somente no ramo remoto."
3444
3445
#: bzrlib/builtins.py:4877
3446
msgid "Same as --theirs-only."
3447
msgstr "O mesmo que --theirs-only."
3448
3449
#: bzrlib/builtins.py:4882
3450
msgid ""
3451
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3452
"details."
3453
msgstr ""
3454
"Filtrar em outras revisões de ramo (inclusive). Ver \"help revisionspec\" "
3455
"para detalhes."
3456
3457
#: bzrlib/builtins.py:4886
3458
msgid ""
3459
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3460
"details."
3461
msgstr ""
3462
"Filtrar em revisões de ramo locais (inclusive). Ver \"help revisionspec\" "
3463
"para detalhes."
3464
3465
#: bzrlib/builtins.py:4889
3466
msgid "Show all revisions in addition to the mainline ones."
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:4943
3470
msgid "No peer location known or specified."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:4947
3474
msgid "Using saved parent location: {0}\n"
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:4980
3478
#, python-format
3479
msgid "You have %d extra revision:\n"
3480
msgid_plural "You have %d extra revisions:\n"
3481
msgstr[0] "Você tem %d revisão extra:\n"
3482
msgstr[1] "Você tem %d revisões extras:\n"
3483
3484
#: bzrlib/builtins.py:4996
3485
#, python-format
3486
msgid "You are missing %d revision:\n"
3487
msgid_plural "You are missing %d revisions:\n"
3488
msgstr[0] "Você tem %d revisão pendente:\n"
3489
msgstr[1] "Você tem %d revisões pendentes:\n"
3490
3491
#: bzrlib/builtins.py:5008
3492
msgid "This branch has no new revisions.\n"
3493
msgstr "Esse ramo não tem novas revisões.\n"
3494
3495
#: bzrlib/builtins.py:5011
3496
msgid "Other branch has no new revisions.\n"
3497
msgstr "Outro ramo não tem novas revisões.\n"
3498
3499
#: bzrlib/builtins.py:5016
3500
msgid "Branches are up to date.\n"
3501
msgstr "Ramos estão atualizados.\n"
3502
3503
#: bzrlib/builtins.py:5027
3504
msgid "Compress the data within a repository."
3505
msgstr "Comprimir os dados em um repositório."
3506
3507
#: bzrlib/builtins.py:5029
3508
msgid ""
3509
"This operation compresses the data within a bazaar repository. As\n"
3510
"bazaar supports automatic packing of repository, this operation is\n"
3511
"normally not required to be done manually."
3512
msgstr ""
3513
"Essa operação comprime dados em um repositório bazaar. Como\n"
3514
"o bazaar fornece o empacotamento automático de repositório, essa operação\n"
3515
"normalmente não é necessário ser feita manualmente."
3516
3517
#: bzrlib/builtins.py:5033
3518
msgid ""
3519
"During the pack operation, bazaar takes a backup of existing repository\n"
3520
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3521
"automatically when it is safe to do so. To save disk space by removing\n"
3522
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3523
"used."
3524
msgstr ""
3525
3526
#: bzrlib/builtins.py:5039
3527
msgid ""
3528
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3529
"during or immediately after repacking, you may be left with a state\n"
3530
"where the deletion has been written to disk but the new packs have not\n"
3531
"been. In this case the repository may be unusable."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5048
3535
msgid "Delete obsolete packs to save disk space."
3536
msgstr "Excluir pacotes obsoletos para economizar espaço em disco."
3537
3538
#: bzrlib/builtins.py:5062
3539
msgid "List the installed plugins."
3540
msgstr "Lista os plugins instalados."
3541
3542
#: bzrlib/builtins.py:5064
3543
msgid ""
3544
"This command displays the list of installed plugins including\n"
3545
"version of plugin and a short description of each."
3546
msgstr ""
3547
"Este comando exibe a lista dos plugins instalados, incluindo\n"
3548
"versão do plugin e uma breve descrição de cada."
3549
3550
#: bzrlib/builtins.py:5067
3551
msgid "--verbose shows the path where each plugin is located."
3552
msgstr "--verbose mostra o caminho onde cada plugin está localizado."
3553
3554
#: bzrlib/builtins.py:5069
3555
msgid ""
3556
"A plugin is an external component for Bazaar that extends the\n"
3557
"revision control system, by adding or replacing code in Bazaar.\n"
3558
"Plugins can do a variety of things, including overriding commands,\n"
3559
"adding new commands, providing additional network transports and\n"
3560
"customizing log output."
3561
msgstr ""
3562
"Um plugin é um componente externo ao Bazaar que amplia o\n"
3563
"sistema de controle de versão, adicionando ou substituindo código no "
3564
"Bazaar.\n"
3565
"Plugins podem fazer uma variedade de ações, incluindo sobrescrever "
3566
"comandos,\n"
3567
"adicionar novos comandos, prover uma rede de transporte adicional e\n"
3568
"personalizar registro de informações."
3569
3570
#: bzrlib/builtins.py:5075
3571
msgid ""
3572
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3573
"for further information on plugins including where to find them and how to\n"
3574
"install them. Instructions are also provided there on how to write new\n"
3575
"plugins using the Python programming language."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5091
3579
msgid "Show testament (signing-form) of a revision."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5094
3583
msgid "Produce long-format testament."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5096
3587
msgid "Produce a strict-format testament."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:5122
3591
msgid "Show the origin of each line in a file."
3592
msgstr "Mostra a origem de cada linha em um arquivo."
3593
3594
#: bzrlib/builtins.py:5124
3595
msgid ""
3596
"This prints out the given file with an annotation on the left side\n"
3597
"indicating which revision, author and date introduced the change."
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5127
3601
msgid ""
3602
"If the origin is the same for a run of consecutive lines, it is\n"
3603
"shown only at the top, unless the --all option is given."
3604
msgstr ""
3605
3606
#: bzrlib/builtins.py:5135
3607
msgid "Show annotations on all lines."
3608
msgstr "Mostrar anotações em todas as linhas."
3609
3610
#: bzrlib/builtins.py:5136
3611
msgid "Show commit date in annotations."
3612
msgstr "Mostrar data de submissão nas anotações."
3613
3614
#: bzrlib/builtins.py:5223
3615
msgid "Cannot sign a range of non-revision-history revisions"
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5235
3619
msgid "Please supply either one revision, or a range."
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5239
3623
msgid ""
3624
"Convert the current branch into a checkout of the supplied branch.\n"
3625
"If no branch is supplied, rebind to the last bound location."
3626
msgstr ""
3627
3628
#: bzrlib/builtins.py:5242
3629
msgid ""
3630
"Once converted into a checkout, commits must succeed on the master branch\n"
3631
"before they will be applied to the local branch."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5245
3635
msgid ""
3636
"Bound branches use the nickname of its master branch unless it is set\n"
3637
"locally, in which case binding will update the local nickname to be\n"
3638
"that of the master."
3639
msgstr ""
3640
3641
#: bzrlib/builtins.py:5260
3642
msgid "No location supplied. This format does not remember old locations."
3643
msgstr ""
3644
"Sem localização fornecida. Este formato não se lembra de locais antigos."
3645
3646
#: bzrlib/builtins.py:5265
3647
msgid "Branch is already bound"
3648
msgstr "O ramo já está ligado."
3649
3650
#: bzrlib/builtins.py:5267
3651
msgid "No location supplied and no previous location known"
3652
msgstr "Nenhum local fornecido e nenhuma localização prévia conhecida"
3653
3654
#: bzrlib/builtins.py:5273
3655
msgid "These branches have diverged. Try merging, and then bind again."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5280
3659
msgid "Convert the current checkout into a regular branch."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5282
3663
msgid ""
3664
"After unbinding, the local branch is considered independent and subsequent\n"
3665
"commits will be local only."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5293
3669
msgid "Local branch is not bound"
3670
msgstr "O ramo local náo está associado"
3671
3672
#: bzrlib/builtins.py:5297
3673
msgid "Remove the last committed revision."
3674
msgstr "Remover a última revisão submetida."
3675
3676
#: bzrlib/builtins.py:5299
3677
msgid ""
3678
"--verbose will print out what is being removed.\n"
3679
"--dry-run will go through all the motions, but not actually\n"
3680
"remove anything."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5303
3684
msgid ""
3685
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3686
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3687
"branch at revision 15."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5307
3691
msgid ""
3692
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3693
"it may make is to restore any pending merges that were present before\n"
3694
"the commit."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:5318
3698
msgid "Don't actually make changes."
3699
msgstr "Na verdade, não fazer alterações."
3700
3701
#: bzrlib/builtins.py:5319
3702
msgid "Say yes to all questions."
3703
msgstr "Diga sim para todas as questões."
3704
3705
#: bzrlib/builtins.py:5321
3706
msgid "Keep tags that point to removed revisions."
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:5323
3710
msgid "Only remove the commits from the local branch when in a checkout."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5372
3714
msgid "No revisions to uncommit.\n"
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5387
3718
msgid "Dry-run, pretending to remove the above revisions.\n"
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5390
3722
msgid "The above revision(s) will be removed.\n"
3723
msgstr "A(s) revisão(ões) acima será(ão) removida(s).\n"
3724
3725
#: bzrlib/builtins.py:5394
3726
msgid "Uncommit these revisions"
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5397
3730
msgid "Canceled\n"
3731
msgstr "Cancelado\n"
3732
3733
#: bzrlib/builtins.py:5404
3734
#, python-format
3735
msgid ""
3736
"You can restore the old tip by running:\n"
3737
" bzr pull . -r revid:%s\n"
3738
msgstr ""
3739
3740
#: bzrlib/builtins.py:5409
3741
msgid "Break a dead lock."
3742
msgstr ""
3743
3744
#: bzrlib/builtins.py:5411
3745
msgid ""
3746
"This command breaks a lock on a repository, branch, working directory or\n"
3747
"config file."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:5414
3751
msgid ""
3752
"CAUTION: Locks should only be broken when you are sure that the process\n"
3753
"holding the lock has been stopped."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5417
3757
msgid ""
3758
"You can get information on what locks are open via the 'bzr info\n"
3759
"[location]' command."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:5420
3763
msgid ""
3764
":Examples:\n"
3765
" bzr break-lock\n"
3766
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3767
" bzr break-lock --conf ~/.bazaar"
3768
msgstr ""
3769
":Exemplos:\n"
3770
" bzr break-lock\n"
3771
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3772
" bzr break-lock --conf ~/.bazaar"
3773
3774
#: bzrlib/builtins.py:5429
3775
msgid "LOCATION is the directory where the config lock is."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5431
3779
msgid "Do not ask for confirmation before breaking the lock."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:5466
3783
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:5467
3787
msgid "Run the bzr server."
3788
msgstr "Execute o servidor bzr."
3789
3790
#: bzrlib/builtins.py:5473
3791
msgid "Serve on stdin/out for use from inetd or sshd."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:5474
3795
msgid "protocol"
3796
msgstr "protocolo"
3797
3798
#: bzrlib/builtins.py:5475
3799
msgid "Protocol to serve."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:5479
3803
msgid ""
3804
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3805
"Passing 0 as the port number will result in a dynamically allocated port. "
3806
"The default port depends on the protocol."
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:5485
3810
msgid "Serve contents of this directory."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:5487
3814
msgid ""
3815
"By default the server is a readonly server. Supplying --allow-writes "
3816
"enables write access to the contents of the served directory and below. "
3817
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3818
"of external authentication is arranged supplying this option leads to global "
3819
"uncontrolled write access to your file system."
3820
msgstr ""
3821
3822
#: bzrlib/builtins.py:5496
3823
msgid "Override the default idle client timeout (5min)."
3824
msgstr ""
3825
3826
#: bzrlib/builtins.py:5546
3827
msgid "Combine a tree into its containing tree."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:5548
3831
msgid "This command requires the target tree to be in a rich-root format."
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:5550
3835
msgid ""
3836
"The TREE argument should be an independent tree, inside another tree, but\n"
3837
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3838
"running \"bzr branch\" with the target inside a tree.)"
3839
msgstr ""
3840
3841
#: bzrlib/builtins.py:5554
3842
msgid ""
3843
"The result is a combined tree, with the subtree no longer an independent\n"
3844
"part. This is marked as a merge of the subtree into the containing tree,\n"
3845
"and all history is preserved."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:5572
3849
#, python-format
3850
msgid ""
3851
"Can't join trees because %s doesn't support rich root data.\n"
3852
"You can use bzr upgrade on the repository."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3856
msgid "Cannot join {0}. {1}"
3857
msgstr ""
3858
3859
#: bzrlib/builtins.py:5592
3860
msgid "Split a subdirectory of a tree into a separate tree."
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:5594
3864
msgid ""
3865
"This command will produce a target tree in a format that supports\n"
3866
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3867
"converted into earlier formats like 'dirstate-tags'."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:5598
3871
msgid ""
3872
"The TREE argument should be a subdirectory of a working tree. That\n"
3873
"subdirectory will be converted into an independent tree, with its own\n"
3874
"branch. Commits in the top-level tree will not apply to the new subtree."
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:5678
3878
msgid "No submit branch specified or known"
3879
msgstr "Nenhum ramo de submissão especificado ou conhecido"
3880
3881
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3882
msgid "No public branch specified or known"
3883
msgstr "Nenhum ramo público especificado ou conhecido"
3884
3885
#: bzrlib/builtins.py:5691
3886
msgid "bzr merge-directive takes at most two one revision identifiers"
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:5700
3890
msgid "No revisions to bundle."
3891
msgstr "Sem revisões para empacotar."
3892
3893
#: bzrlib/builtins.py:5719
3894
msgid "Mail or create a merge-directive for submitting changes."
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:5721
3898
msgid "A merge directive provides many things needed for requesting merges:"
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:5723
3902
msgid "* A machine-readable description of the merge to perform"
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:5725
3906
msgid "* An optional patch that is a preview of the changes requested"
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:5727
3910
msgid ""
3911
"* An optional bundle of revision data, so that the changes can be applied\n"
3912
" directly from the merge directive, without retrieving data from a\n"
3913
" branch."
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:5731
3917
msgid ""
3918
"`bzr send` creates a compact data set that, when applied using bzr\n"
3919
"merge, has the same effect as merging from the source branch. "
3920
msgstr ""
3921
3922
#: bzrlib/builtins.py:5734
3923
msgid ""
3924
"By default the merge directive is self-contained and can be applied to any\n"
3925
"branch containing submit_branch in its ancestory without needing access to\n"
3926
"the source branch."
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:5738
3930
msgid ""
3931
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3932
"revisions, but only a structured request to merge from the\n"
3933
"public_location. In that case the public_branch is needed and it must be\n"
3934
"up-to-date and accessible to the recipient. The public_branch is always\n"
3935
"included if known, so that people can check it later."
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:5744
3939
msgid ""
3940
"The submit branch defaults to the parent of the source branch, but can be\n"
3941
"overridden. Both submit branch and public branch will be remembered in\n"
3942
"branch.conf the first time they are used for a particular branch. The\n"
3943
"source branch defaults to that containing the working directory, but can\n"
3944
"be changed using --from."
3945
msgstr ""
3946
3947
#: bzrlib/builtins.py:5750
3948
msgid ""
3949
"Both the submit branch and the public branch follow the usual behavior with\n"
3950
"respect to --remember: If there is no default location set, the first send\n"
3951
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3952
"omit the location to use the default. To change the default, use\n"
3953
"--remember. The value will only be saved if the location can be accessed."
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:5756
3957
msgid ""
3958
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3959
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3960
"If a public location is known for the submit_branch, that location is used\n"
3961
"in the merge directive."
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:5761
3965
msgid ""
3966
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3967
"given, in which case it is sent to a file."
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:5764
3971
msgid ""
3972
"Mail is sent using your preferred mail program. This should be transparent\n"
3973
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3974
"If the preferred client can't be found (or used), your editor will be used."
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:5768
3978
msgid ""
3979
"To use a specific mail program, set the mail_client configuration option.\n"
3980
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3981
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3982
"(MacOS X's\n"
3983
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3984
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3985
"add\n"
3986
"supported clients."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:5775
3990
msgid ""
3991
"If mail is being sent, a to address is required. This can be supplied\n"
3992
"either on the commandline, by setting the submit_to configuration\n"
3993
"option in the branch itself or the child_submit_to configuration option\n"
3994
"in the submit branch."
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:5780
3998
msgid ""
3999
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4000
"and\n"
4001
"merge directive format 2. It is significantly faster and smaller than\n"
4002
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4003
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4004
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4005
msgstr ""
4006
4007
#: bzrlib/builtins.py:5786
4008
msgid ""
4009
"The merge directives created by bzr send may be applied using bzr merge or\n"
4010
"bzr pull by specifying a file containing a merge directive as the location."
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:5789
4014
msgid ""
4015
"bzr send makes extensive use of public locations to map local locations "
4016
"into\n"
4017
"URLs that can be used by other people. See `bzr help configuration` to\n"
4018
"set them, and use `bzr info` to display them."
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:5813
4022
msgid "Write merge directive to this file or directory; use - for stdout."
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:5817
4026
msgid ""
4027
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4028
"strict disables the check."
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:5819
4032
msgid "Mail the request to this address."
4033
msgstr "Enviar o pedido para este endereço."
4034
4035
#: bzrlib/builtins.py:5823
4036
msgid "Body for the email."
4037
msgstr "Corpo para o e-mail."
4038
4039
#: bzrlib/builtins.py:5876
4040
msgid "Do not include a bundle in the merge directive."
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:5877
4044
msgid "Do not include a preview patch in the merge directive."
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:5880
4048
msgid "Remember submit and public branch."
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:5882
4052
msgid ""
4053
"Branch to generate the submission from, rather than the one containing the "
4054
"working directory."
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4058
msgid "format"
4059
msgstr "formato"
4060
4061
#: bzrlib/builtins.py:5893
4062
msgid "Use the specified output format."
4063
msgstr "Usar o formato de saída especificado."
4064
4065
#: bzrlib/builtins.py:5915
4066
msgid "Create, remove or modify a tag naming a revision."
4067
msgstr "Cria, remove ou modifica um rótulo nomeando uma versão."
4068
4069
#: bzrlib/builtins.py:5917
4070
msgid ""
4071
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4072
"(--revision) option can be given -rtag:X, where X is any previously\n"
4073
"created tag."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:5921
4077
msgid ""
4078
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4079
"along when you branch, push, pull or merge."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:5924
4083
msgid ""
4084
"It is an error to give a tag name that already exists unless you pass\n"
4085
"--force, in which case the tag is moved to point to the new revision."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:5927
4089
msgid ""
4090
"To rename a tag (change the name but keep it on the same revsion), run "
4091
"``bzr\n"
4092
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:5930
4096
msgid ""
4097
"If no tag name is specified it will be determined through the \n"
4098
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4099
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4100
"details."
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:5940
4104
msgid "Delete this tag rather than placing it."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:5943
4108
msgid "Branch in which to place the tag."
4109
msgstr ""
4110
4111
#: bzrlib/builtins.py:5945
4112
msgid "Replace existing tags."
4113
msgstr "Substituir as tags existentes."
4114
4115
#: bzrlib/builtins.py:5960
4116
msgid "No tag specified to delete."
4117
msgstr "Sem tag especifica para apagar."
4118
4119
#: bzrlib/builtins.py:5962
4120
#, python-format
4121
msgid "Deleted tag %s."
4122
msgstr "Tag %s apagada."
4123
4124
#: bzrlib/builtins.py:5976
4125
msgid "Please specify a tag name."
4126
msgstr "Por favor, especifique o nome da tag."
4127
4128
#: bzrlib/builtins.py:5984
4129
#, python-format
4130
msgid "Tag %s already exists for that revision."
4131
msgstr "A tag %s já existe para aquela revisão."
4132
4133
#: bzrlib/builtins.py:5988
4134
#, python-format
4135
msgid "Created tag %s."
4136
msgstr "Tag %s criada."
4137
4138
#: bzrlib/builtins.py:5990
4139
#, python-format
4140
msgid "Updated tag %s."
4141
msgstr "Tag %s atualizada."
4142
4143
#: bzrlib/builtins.py:5994
4144
msgid "List tags."
4145
msgstr "Lista de tags."
4146
4147
#: bzrlib/builtins.py:5996
4148
msgid ""
4149
"This command shows a table of tag names and the revisions they reference."
4150
msgstr ""
4151
"Este comando mostra uma tabela de nomes de rótulos e as versões que "
4152
"referenciam."
4153
4154
#: bzrlib/builtins.py:6002
4155
msgid "Branch whose tags should be displayed."
4156
msgstr "Ramo em que o rótulo deveria ser exibido."
4157
4158
#: bzrlib/builtins.py:6004
4159
msgid "Sort tags by different criteria."
4160
msgstr "Ordene rótulos por diferentes critérios."
4161
4162
#: bzrlib/builtins.py:6004
4163
msgid "Sorting"
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6073
4167
msgid "Reconfigure the type of a bzr directory."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6075
4171
msgid "A target configuration must be specified."
4172
msgstr "Uma configuração de destino deve ser especificada."
4173
4174
#: bzrlib/builtins.py:6077
4175
msgid ""
4176
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4177
"The order of preference is\n"
4178
"1. For a lightweight checkout, the current bound location.\n"
4179
"2. For branches that used to be checkouts, the previously-bound location.\n"
4180
"3. The push location.\n"
4181
"4. The parent location.\n"
4182
"If none of these is available, --bind-to must be specified."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6091
4186
msgid "Tree type"
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6092
4190
msgid "The relation between branch and tree."
4191
msgstr "A relação entre ramo e árvore."
4192
4193
#: bzrlib/builtins.py:6094
4194
msgid "Reconfigure to be an unbound branch with no working tree."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6095
4198
msgid "Reconfigure to be an unbound branch with a working tree."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6096
4202
msgid "Reconfigure to be a bound branch with a working tree."
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:6097
4206
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6102
4210
msgid "Repository type"
4211
msgstr "Tipo de repositório"
4212
4213
#: bzrlib/builtins.py:6103
4214
msgid "Location fo the repository."
4215
msgstr "Local para o repositório."
4216
4217
#: bzrlib/builtins.py:6105
4218
msgid ""
4219
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6107
4223
msgid "Reconfigure to use a shared repository."
4224
msgstr "Reconfigurar para usar um repositório compartilhado."
4225
4226
#: bzrlib/builtins.py:6111
4227
msgid "Trees in Repository"
4228
msgstr "Árvores no Repositório"
4229
4230
#: bzrlib/builtins.py:6112
4231
msgid "Whether new branches in the repository have trees."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6114
4235
msgid ""
4236
"Reconfigure repository to create working trees on branches by default."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6116
4240
msgid ""
4241
"Reconfigure repository to not create working trees on branches by default."
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6119
4245
msgid "Branch to bind checkout to."
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6121
4249
msgid "Perform reconfiguration even if local changes will be lost."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6124
4253
msgid "Reconfigure a branch to be stacked on another branch."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6128
4257
msgid ""
4258
"Reconfigure a branch to be unstacked. This may require copying substantial "
4259
"data into it."
4260
msgstr ""
4261
4262
#: bzrlib/builtins.py:6138
4263
msgid "Can't use both --stacked-on and --unstacked"
4264
msgstr "Não é possível usar ambos --stacked-on e --unstacked"
4265
4266
#: bzrlib/builtins.py:6152
4267
msgid "No target configuration specified"
4268
msgstr "Configuração do alvo não especificada"
4269
4270
#: bzrlib/builtins.py:6187
4271
msgid "Set the branch of a checkout and update."
4272
msgstr ""
4273
4274
#: bzrlib/builtins.py:6189
4275
msgid ""
4276
"For lightweight checkouts, this changes the branch being referenced.\n"
4277
"For heavyweight checkouts, this checks that there are no local commits\n"
4278
"versus the current bound branch, then it makes the local branch a mirror\n"
4279
"of the new location and binds to it."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6194
4283
msgid ""
4284
"In both cases, the working tree is updated and uncommitted changes\n"
4285
"are merged. The user can commit or revert these as they desire."
4286
msgstr ""
4287
4288
#: bzrlib/builtins.py:6197
4289
msgid "Pending merges need to be committed or reverted before using switch."
4290
msgstr ""
4291
4292
#: bzrlib/builtins.py:6199
4293
msgid ""
4294
"The path to the branch to switch to can be specified relative to the parent\n"
4295
"directory of the current branch. For example, if you are currently in a\n"
4296
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4297
"/path/to/newbranch."
4298
msgstr ""
4299
4300
#: bzrlib/builtins.py:6204
4301
msgid ""
4302
"Bound branches use the nickname of its master branch unless it is set\n"
4303
"locally, in which case switching will update the local nickname to be\n"
4304
"that of the master."
4305
msgstr ""
4306
4307
#: bzrlib/builtins.py:6212
4308
msgid "Switch even if local commits will be lost."
4309
msgstr ""
4310
4311
#: bzrlib/builtins.py:6215
4312
msgid "Create the target branch from this one before switching to it."
4313
msgstr ""
4314
4315
#: bzrlib/builtins.py:6229
4316
msgid "You must supply either a revision or a location"
4317
msgstr "Você deve fornecer ou uma versão ou um local"
4318
4319
#: bzrlib/builtins.py:6242
4320
msgid "cannot create branch without source branch"
4321
msgstr "não é possível criar um ramo sem ramo fonte"
4322
4323
#: bzrlib/builtins.py:6262
4324
msgid "Manage filtered views."
4325
msgstr "Gerenciar exibições filtradas."
4326
4327
#: bzrlib/builtins.py:6264
4328
msgid ""
4329
"Views provide a mask over the tree so that users can focus on\n"
4330
"a subset of a tree when doing their work. After creating a view,\n"
4331
"commands that support a list of files - status, diff, commit, etc -\n"
4332
"effectively have that list of files implicitly given each time.\n"
4333
"An explicit list of files can still be given but those files\n"
4334
"must be within the current view."
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6271
4338
msgid ""
4339
"In most cases, a view has a short life-span: it is created to make\n"
4340
"a selected change and is deleted once that change is committed.\n"
4341
"At other times, you may wish to create one or more named views\n"
4342
"and switch between them."
4343
msgstr ""
4344
4345
#: bzrlib/builtins.py:6276
4346
msgid ""
4347
"To disable the current view without deleting it, you can switch to\n"
4348
"the pseudo view called ``off``. This can be useful when you need\n"
4349
"to see the whole tree for an operation or two (e.g. merge) but\n"
4350
"want to switch back to your view after that."
4351
msgstr ""
4352
4353
#: bzrlib/builtins.py:6281
4354
msgid ""
4355
":Examples:\n"
4356
" To define the current view::"
4357
msgstr ""
4358
4359
#: bzrlib/builtins.py:6284
4360
msgid " bzr view file1 dir1 ..."
4361
msgstr " bzr view file1 dir1 ..."
4362
4363
#: bzrlib/builtins.py:6286
4364
msgid " To list the current view::"
4365
msgstr ""
4366
4367
#: bzrlib/builtins.py:6288
4368
msgid " bzr view"
4369
msgstr " bzr view"
4370
4371
#: bzrlib/builtins.py:6290
4372
msgid " To delete the current view::"
4373
msgstr ""
4374
4375
#: bzrlib/builtins.py:6292
4376
msgid " bzr view --delete"
4377
msgstr " bzr view --delete"
4378
4379
#: bzrlib/builtins.py:6294
4380
msgid " To disable the current view without deleting it::"
4381
msgstr ""
4382
4383
#: bzrlib/builtins.py:6296
4384
msgid " bzr view --switch off"
4385
msgstr " bzr view --switch off"
4386
4387
#: bzrlib/builtins.py:6298
4388
msgid " To define a named view and switch to it::"
4389
msgstr ""
4390
4391
#: bzrlib/builtins.py:6300
4392
msgid " bzr view --name view-name file1 dir1 ..."
4393
msgstr " bzr view --name view-name file1 dir1 ..."
4394
4395
#: bzrlib/builtins.py:6302
4396
msgid " To list a named view::"
4397
msgstr ""
4398
4399
#: bzrlib/builtins.py:6304
4400
msgid " bzr view --name view-name"
4401
msgstr " bzr view --name view-name"
4402
4403
#: bzrlib/builtins.py:6306
4404
msgid " To delete a named view::"
4405
msgstr ""
4406
4407
#: bzrlib/builtins.py:6308
4408
msgid " bzr view --name view-name --delete"
4409
msgstr " bzr view --name view-name --delete"
4410
4411
#: bzrlib/builtins.py:6310
4412
msgid " To switch to a named view::"
4413
msgstr ""
4414
4415
#: bzrlib/builtins.py:6312
4416
msgid " bzr view --switch view-name"
4417
msgstr " bzr view --switch view-name"
4418
4419
#: bzrlib/builtins.py:6314
4420
msgid " To list all views defined::"
4421
msgstr ""
4422
4423
#: bzrlib/builtins.py:6316
4424
msgid " bzr view --all"
4425
msgstr " bzr view --all"
4426
4427
#: bzrlib/builtins.py:6318
4428
msgid " To delete all views::"
4429
msgstr ""
4430
4431
#: bzrlib/builtins.py:6320
4432
msgid " bzr view --delete --all"
4433
msgstr " bzr view --delete --all"
4434
4435
#: bzrlib/builtins.py:6327
4436
msgid "Apply list or delete action to all views."
4437
msgstr "Aplicar ação de listar ou apagar para todas as visões."
4438
4439
#: bzrlib/builtins.py:6330
4440
msgid "Delete the view."
4441
msgstr "Apagar a visão."
4442
4443
#: bzrlib/builtins.py:6333
4444
msgid "Name of the view to define, list or delete."
4445
msgstr "Nome da visão para definir, listar ou apagar."
4446
4447
#: bzrlib/builtins.py:6337
4448
msgid "Name of the view to switch to."
4449
msgstr ""
4450
4451
#: bzrlib/builtins.py:6356
4452
msgid "Both --delete and a file list specified"
4453
msgstr ""
4454
4455
#: bzrlib/builtins.py:6359
4456
msgid "Both --delete and --switch specified"
4457
msgstr ""
4458
4459
#: bzrlib/builtins.py:6362
4460
msgid "Deleted all views.\n"
4461
msgstr "Todas as visões apagadas.\n"
4462
4463
#: bzrlib/builtins.py:6364
4464
msgid "No current view to delete"
4465
msgstr "Nenhuma visão vigente para apagar"
4466
4467
#: bzrlib/builtins.py:6367
4468
#, python-format
4469
msgid "Deleted '%s' view.\n"
4470
msgstr ""
4471
4472
#: bzrlib/builtins.py:6371
4473
msgid "Both --switch and a file list specified"
4474
msgstr ""
4475
4476
#: bzrlib/builtins.py:6374
4477
msgid "Both --switch and --all specified"
4478
msgstr ""
4479
4480
#: bzrlib/builtins.py:6377
4481
msgid "No current view to disable"
4482
msgstr ""
4483
4484
#: bzrlib/builtins.py:6379
4485
#, python-format
4486
msgid "Disabled '%s' view.\n"
4487
msgstr ""
4488
4489
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4490
msgid "Using '{0}' view: {1}\n"
4491
msgstr ""
4492
4493
#: bzrlib/builtins.py:6386
4494
msgid "Views defined:\n"
4495
msgstr "Visões definidas:\n"
4496
4497
#: bzrlib/builtins.py:6395
4498
msgid "No views defined.\n"
4499
msgstr "Nenhuma visão definidas.\n"
4500
4501
#: bzrlib/builtins.py:6402
4502
msgid "Cannot change the 'off' pseudo view"
4503
msgstr ""
4504
4505
#: bzrlib/builtins.py:6410
4506
msgid "No current view.\n"
4507
msgstr ""
4508
4509
#: bzrlib/builtins.py:6413
4510
msgid "'{0}' view is: {1}\n"
4511
msgstr ""
4512
4513
#: bzrlib/builtins.py:6433
4514
msgid " <no hooks installed>\n"
4515
msgstr ""
4516
4517
#: bzrlib/builtins.py:6437
4518
msgid "Remove a branch."
4519
msgstr "Remova um ramo."
4520
4521
#: bzrlib/builtins.py:6439
4522
msgid ""
4523
"This will remove the branch from the specified location but \n"
4524
"will keep any working tree or repository in place."
4525
msgstr ""
4526
"Isto irá remover o ramo do local especificado mas \n"
4527
"manterá qualquer árvore de trabalho ou repositório no lugar."
4528
4529
#: bzrlib/builtins.py:6444
4530
msgid " Remove the branch at repo/trunk::"
4531
msgstr ""
4532
4533
#: bzrlib/builtins.py:6446
4534
msgid " bzr remove-branch repo/trunk"
4535
msgstr " bzr remove-branch repo/trunk"
4536
4537
#: bzrlib/builtins.py:6461
4538
msgid "Plaintext diff output."
4539
msgstr ""
4540
4541
#: bzrlib/builtins.py:6462
4542
msgid "Temporarily set aside some changes from the current tree."
4543
msgstr ""
4544
4545
#: bzrlib/builtins.py:6464
4546
msgid ""
4547
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4548
"ie. out of the way, until a later time when you can bring them back from\n"
4549
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4550
"your working tree, and so they aren't propagated along with your branch nor\n"
4551
"will they survive its deletion."
4552
msgstr ""
4553
4554
#: bzrlib/builtins.py:6470
4555
msgid "If shelve --list is specified, previously-shelved changes are listed."
4556
msgstr ""
4557
4558
#: bzrlib/builtins.py:6472
4559
msgid ""
4560
"Shelve is intended to help separate several sets of changes that have\n"
4561
"been inappropriately mingled. If you just want to get rid of all changes\n"
4562
"and you don't need to restore them later, use revert. If you want to\n"
4563
"shelve all text changes at once, use shelve --all."
4564
msgstr ""
4565
4566
#: bzrlib/builtins.py:6477
4567
msgid ""
4568
"If filenames are specified, only the changes to those files will be\n"
4569
"shelved. Other files will be left untouched."
4570
msgstr ""
4571
4572
#: bzrlib/builtins.py:6480
4573
msgid ""
4574
"If a revision is specified, changes since that revision will be shelved."
4575
msgstr ""
4576
"Se uma versão está especificada, mudanças desde aquela versão serão "
4577
"arquivadas."
4578
4579
#: bzrlib/builtins.py:6482
4580
msgid ""
4581
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4582
"restore the most recently shelved changes."
4583
msgstr ""
4584
4585
#: bzrlib/builtins.py:6485
4586
msgid ""
4587
"For complicated changes, it is possible to edit the changes in a separate\n"
4588
"editor program to decide what the file remaining in the working copy\n"
4589
"should look like. To do this, add the configuration option"
4590
msgstr ""
4591
4592
#: bzrlib/builtins.py:6489
4593
msgid " change_editor = PROGRAM @new_path @old_path"
4594
msgstr " change_editor = PROGRAM @new_path @old_path"
4595
4596
#: bzrlib/builtins.py:6491
4597
msgid ""
4598
"where @new_path is replaced with the path of the new version of the \n"
4599
"file and @old_path is replaced with the path of the old version of \n"
4600
"the file. The PROGRAM should save the new file with the desired \n"
4601
"contents of the file in the working tree.\n"
4602
" "
4603
msgstr ""
4604
4605
#: bzrlib/builtins.py:6503
4606
msgid "Shelve all changes."
4607
msgstr "Arquivar todas as mudanças."
4608
4609
#: bzrlib/builtins.py:6505
4610
msgid "Method to use for writing diffs."
4611
msgstr ""
4612
4613
#: bzrlib/builtins.py:6505
4614
msgid "writer"
4615
msgstr "escritor"
4616
4617
#: bzrlib/builtins.py:6509
4618
msgid "List shelved changes."
4619
msgstr "Lista as mudanças arquivadas."
4620
4621
#: bzrlib/builtins.py:6511
4622
msgid "Destroy removed changes instead of shelving them."
4623
msgstr "Destrói mudanças removidas em vez de arquivá-las."
4624
4625
#: bzrlib/builtins.py:6540
4626
msgid "No shelved changes."
4627
msgstr "Sem mudanças arquivadas."
4628
4629
#: bzrlib/builtins.py:6551
4630
msgid "Restore shelved changes."
4631
msgstr "Recuperar mudanças arquivadas."
4632
4633
#: bzrlib/builtins.py:6553
4634
msgid ""
4635
"By default, the most recently shelved changes are restored. However if you\n"
4636
"specify a shelf by id those changes will be restored instead. This works\n"
4637
"best when the changes don't depend on each other."
4638
msgstr ""
4639
4640
#: bzrlib/builtins.py:6562
4641
msgid "The action to perform."
4642
msgstr ""
4643
4644
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4645
msgid "action"
4646
msgstr ""
4647
4648
#: bzrlib/builtins.py:6564
4649
msgid "Apply changes and remove from the shelf."
4650
msgstr ""
4651
4652
#: bzrlib/builtins.py:6565
4653
msgid "Show changes, but do not apply or remove them."
4654
msgstr ""
4655
4656
#: bzrlib/builtins.py:6566
4657
msgid ""
4658
"Instead of unshelving the changes, show the diff that would result from "
4659
"unshelving."
4660
msgstr ""
4661
4662
#: bzrlib/builtins.py:6568
4663
msgid "Delete changes without applying them."
4664
msgstr ""
4665
4666
#: bzrlib/builtins.py:6569
4667
msgid "Apply changes but don't delete them."
4668
msgstr ""
4669
4670
#: bzrlib/builtins.py:6584
4671
msgid "Remove unwanted files from working tree."
4672
msgstr ""
4673
4674
#: bzrlib/builtins.py:6586
4675
msgid ""
4676
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4677
"files are never deleted."
4678
msgstr ""
4679
4680
#: bzrlib/builtins.py:6589
4681
msgid ""
4682
"Another class is 'detritus', which includes files emitted by bzr during\n"
4683
"normal operations and selftests. (The value of these files decreases with\n"
4684
"time.)"
4685
msgstr ""
4686
4687
#: bzrlib/builtins.py:6593
4688
msgid ""
4689
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4690
"flags are respected, and may be combined."
4691
msgstr ""
4692
4693
#: bzrlib/builtins.py:6596
4694
msgid "To check what clean-tree will do, use --dry-run."
4695
msgstr ""
4696
4697
#: bzrlib/builtins.py:6599
4698
msgid "Delete all ignored files."
4699
msgstr ""
4700
4701
#: bzrlib/builtins.py:6600
4702
msgid ""
4703
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4704
msgstr ""
4705
4706
#: bzrlib/builtins.py:6603
4707
msgid "Delete files unknown to bzr (default)."
4708
msgstr ""
4709
4710
#: bzrlib/builtins.py:6604
4711
msgid "Show files to delete instead of deleting them."
4712
msgstr ""
4713
4714
#: bzrlib/builtins.py:6606
4715
msgid "Do not prompt before deleting."
4716
msgstr ""
4717
4718
#: bzrlib/bundle/__init__.py:59
4719
msgid "A directory cannot be a bundle"
4720
msgstr ""
4721
4722
#: bzrlib/bundle/apply_bundle.py:40
4723
msgid "Install revisions"
4724
msgstr ""
4725
4726
#: bzrlib/bundle/commands.py:64
4727
msgid "--verbose requires a merge directive"
4728
msgstr ""
4729
4730
#: bzrlib/bundle/commands.py:67
4731
msgid "Bundle format not supported"
4732
msgstr ""
4733
4734
#: bzrlib/bundle/commands.py:77
4735
msgid "Records\n"
4736
msgstr ""
4737
4738
#: bzrlib/bundle/commands.py:81
4739
msgid "{0}: {1} ({2} multiparent)\n"
4740
msgstr ""
4741
4742
#: bzrlib/bundle/commands.py:83
4743
#, python-format
4744
msgid "unique files: %d\n"
4745
msgstr ""
4746
4747
#: bzrlib/bundle/commands.py:92
4748
msgid "Revisions\n"
4749
msgstr ""
4750
4751
#: bzrlib/bundle/commands.py:93
4752
#, python-format
4753
msgid "nicks: %s\n"
4754
msgstr ""
4755
4756
#: bzrlib/bundle/commands.py:95
4757
#, python-format
4758
msgid ""
4759
"committers: \n"
4760
"%s\n"
4761
msgstr ""
4762
4763
#: bzrlib/bundle/commands.py:103
4764
msgid "Decoded contents\n"
4765
msgstr ""
4766
4767
#: bzrlib/bundle/serializer/v4.py:327
4768
#, python-format
4769
msgid "Bundling %d revision."
4770
msgid_plural "Bundling %d revisions."
4771
msgstr[0] ""
4772
msgstr[1] ""
4773
4774
#: bzrlib/bzrdir.py:490
4775
msgid ""
4776
"making backup of {0}\n"
4777
" to {1}"
4778
msgstr ""
4779
4780
#: bzrlib/bzrdir.py:513
4781
msgid "renamed {0} to {1}"
4782
msgstr ""
4783
4784
#: bzrlib/bzrdir.py:1652
4785
#, python-format
4786
msgid ""
4787
"Source repository format does not support stacking, using format:\n"
4788
" %s"
4789
msgstr ""
4790
4791
#: bzrlib/bzrdir.py:1672
4792
#, python-format
4793
msgid ""
4794
"Source branch format does not support stacking, using format:\n"
4795
" %s"
4796
msgstr ""
4797
4798
#: bzrlib/bzrdir.py:1818
4799
msgid "starting repository conversion"
4800
msgstr ""
4801
4802
#: bzrlib/bzrdir.py:2039
4803
msgid "Using default stacking branch {0} at {1}"
4804
msgstr ""
4805
4806
#: bzrlib/check.py:108
4807
msgid "check"
4808
msgstr ""
4809
4810
#: bzrlib/check.py:110
4811
msgid "checking revisions"
4812
msgstr ""
4813
4814
#: bzrlib/check.py:112
4815
msgid "checking commit contents"
4816
msgstr ""
4817
4818
#: bzrlib/check.py:114
4819
msgid "checking file graphs"
4820
msgstr ""
4821
4822
#: bzrlib/check.py:118
4823
msgid "checking branches and trees"
4824
msgstr ""
4825
4826
#: bzrlib/check.py:205
4827
msgid "checked repository {0} format {1}"
4828
msgstr ""
4829
4830
#: bzrlib/check.py:208
4831
#, python-format
4832
msgid "%6d revisions"
4833
msgstr ""
4834
4835
#: bzrlib/check.py:209
4836
#, python-format
4837
msgid "%6d file-ids"
4838
msgstr ""
4839
4840
#: bzrlib/check.py:211
4841
#, python-format
4842
msgid "%6d unreferenced text versions"
4843
msgstr ""
4844
4845
#: bzrlib/check.py:215
4846
msgid "unreferenced version: {{{0}}} in {1}"
4847
msgstr ""
4848
4849
#: bzrlib/check.py:218
4850
#, python-format
4851
msgid "%6d revisions are missing inventory_sha1"
4852
msgstr ""
4853
4854
#: bzrlib/check.py:221
4855
#, python-format
4856
msgid "%6d revisions are mentioned but not present"
4857
msgstr ""
4858
4859
#: bzrlib/check.py:224
4860
#, python-format
4861
msgid "%6d ghost revisions"
4862
msgstr ""
4863
4864
#: bzrlib/check.py:229
4865
#, python-format
4866
msgid "%6d revisions missing parents in ancestry"
4867
msgstr ""
4868
4869
#: bzrlib/check.py:233
4870
#, python-format
4871
msgid " %s should be in the ancestry for:"
4872
msgstr ""
4873
4874
#: bzrlib/check.py:237
4875
#, python-format
4876
msgid "%6d inconsistent parents"
4877
msgstr ""
4878
4879
#: bzrlib/check.py:241
4880
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4881
msgstr ""
4882
4883
#: bzrlib/check.py:247
4884
#, python-format
4885
msgid "%6d revisions have incorrect parents in the revision index"
4886
msgstr ""
4887
4888
#: bzrlib/check.py:253
4889
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4890
msgstr ""
4891
4892
#: bzrlib/check.py:267
4893
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4894
msgstr ""
4895
4896
#: bzrlib/check.py:296
4897
msgid ""
4898
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4899
"{{{4}}}"
4900
msgstr ""
4901
4902
#: bzrlib/check.py:354
4903
#, python-format
4904
msgid "Checking branch at '%s'."
4905
msgstr ""
4906
4907
#: bzrlib/check.py:374
4908
#, python-format
4909
msgid "Checking working tree at '%s'."
4910
msgstr ""
4911
4912
#: bzrlib/check.py:427 bzrlib/check.py:441
4913
msgid "No branch found at specified location."
4914
msgstr ""
4915
4916
#: bzrlib/check.py:429 bzrlib/check.py:439
4917
msgid "No working tree found at specified location."
4918
msgstr ""
4919
4920
#: bzrlib/check.py:432
4921
#, python-format
4922
msgid "Checking repository at '%s'."
4923
msgstr ""
4924
4925
#: bzrlib/check.py:443
4926
msgid "No repository found at specified location."
4927
msgstr ""
4928
4929
#: bzrlib/clean_tree.py:63
4930
msgid "Nothing to delete."
4931
msgstr ""
4932
4933
#: bzrlib/clean_tree.py:68
4934
msgid "Are you sure you wish to delete these"
4935
msgstr ""
4936
4937
#: bzrlib/clean_tree.py:70
4938
msgid "Canceled"
4939
msgstr ""
4940
4941
#: bzrlib/clean_tree.py:107
4942
#, python-format
4943
msgid "unable to remove %s"
4944
msgstr ""
4945
4946
#: bzrlib/clean_tree.py:111
4947
msgid "deleting paths:"
4948
msgstr ""
4949
4950
#: bzrlib/clean_tree.py:125
4951
msgid "unable to remove \"{0}\": {1}."
4952
msgstr ""
4953
4954
#: bzrlib/clean_tree.py:130
4955
msgid "No files deleted."
4956
msgstr ""
4957
4958
#: bzrlib/cmd_version_info.py:47
4959
msgid "No known version info format {0}. Supported types are: {1}"
4960
msgstr ""
4961
4962
#: bzrlib/cmd_version_info.py:52
4963
msgid "Version info in Custom template-based format."
4964
msgstr ""
4965
4966
#: bzrlib/cmd_version_info.py:52
4967
msgid "Version info in Python format."
4968
msgstr ""
4969
4970
#: bzrlib/cmd_version_info.py:52
4971
msgid "Version info in RIO (simple text) format (default)."
4972
msgstr ""
4973
4974
#: bzrlib/cmd_version_info.py:53
4975
msgid "Show version information about this tree."
4976
msgstr ""
4977
4978
#: bzrlib/cmd_version_info.py:55
4979
msgid ""
4980
"You can use this command to add information about version into\n"
4981
"source code of an application. The output can be in one of the\n"
4982
"supported formats or in a custom format based on a template."
4983
msgstr ""
4984
4985
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4986
#: en/help_topics/configuration.txt:710
4987
msgid "For example::"
4988
msgstr ""
4989
4990
#: bzrlib/cmd_version_info.py:61
4991
msgid ""
4992
" bzr version-info --custom \\\n"
4993
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4994
msgstr ""
4995
4996
#: bzrlib/cmd_version_info.py:64
4997
msgid ""
4998
"will produce a C header file with formatted string containing the\n"
4999
"current revision number. Other supported variables in templates are:"
5000
msgstr ""
5001
5002
#: bzrlib/cmd_version_info.py:67
5003
msgid ""
5004
" * {date} - date of the last revision\n"
5005
" * {build_date} - current date\n"
5006
" * {revno} - revision number\n"
5007
" * {revision_id} - revision id\n"
5008
" * {branch_nick} - branch nickname\n"
5009
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5010
" otherwise 1"
5011
msgstr ""
5012
5013
#: bzrlib/cmd_version_info.py:77
5014
msgid "Select the output format."
5015
msgstr ""
5016
5017
#: bzrlib/cmd_version_info.py:81
5018
msgid "Include all possible information."
5019
msgstr ""
5020
5021
#: bzrlib/cmd_version_info.py:82
5022
msgid "Check if tree is clean."
5023
msgstr ""
5024
5025
#: bzrlib/cmd_version_info.py:84
5026
msgid "Include the revision-history."
5027
msgstr ""
5028
5029
#: bzrlib/cmd_version_info.py:86
5030
msgid "Include the last revision for each file."
5031
msgstr ""
5032
5033
#: bzrlib/cmd_version_info.py:87
5034
msgid "Template for the output."
5035
msgstr ""
5036
5037
#: bzrlib/cmd_version_info.py:101
5038
msgid "bzr version-info --revision takes exactly one revision specifier"
5039
msgstr ""
5040
5041
#: bzrlib/commands.py:229
5042
#, python-format
5043
msgid "unknown command \"%s\""
5044
msgstr ""
5045
5046
#: bzrlib/commands.py:476
5047
msgid "No help for this command."
5048
msgstr ""
5049
5050
#: bzrlib/commands.py:489
5051
#, python-format
5052
msgid ":Purpose: %s\n"
5053
msgstr ""
5054
5055
#: bzrlib/commands.py:491
5056
#, python-format
5057
msgid ""
5058
":Usage:\n"
5059
"%s\n"
5060
msgstr ""
5061
":Uso:\n"
5062
"%s\n"
5063
5064
#: bzrlib/commands.py:493
5065
#, python-format
5066
msgid ":Usage: %s\n"
5067
msgstr ":Uso: %s\n"
5068
5069
#: bzrlib/commands.py:512
5070
#, python-format
5071
msgid ":Options:%s"
5072
msgstr ""
5073
5074
#: bzrlib/commands.py:523
5075
#, python-format
5076
msgid ""
5077
":Description:\n"
5078
" %s\n"
5079
"\n"
5080
msgstr ""
5081
5082
#: bzrlib/commands.py:533
5083
#, python-format
5084
msgid ""
5085
"See bzr help %s for more details and examples.\n"
5086
"\n"
5087
msgstr ""
5088
5089
#: bzrlib/commands.py:538
5090
msgid ":Aliases: "
5091
msgstr ""
5092
5093
#: bzrlib/commands.py:542
5094
#, python-format
5095
msgid ":From: plugin \"%s\"\n"
5096
msgstr ""
5097
5098
#: bzrlib/commands.py:554
5099
msgid ":doc:`{0} <{1}-help>`"
5100
msgstr ""
5101
5102
#: bzrlib/commands.py:558
5103
#, python-format
5104
msgid ":See also: %s"
5105
msgstr ""
5106
5107
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5108
msgid "Only ASCII permitted in option names"
5109
msgstr ""
5110
5111
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5112
msgid "command {0!r} needs one or more {1}"
5113
msgstr ""
5114
5115
#: bzrlib/commands.py:858
5116
msgid "command {0!r} requires argument {1}"
5117
msgstr ""
5118
5119
#: bzrlib/commands.py:865
5120
msgid "extra argument to command {0}: {1}"
5121
msgstr ""
5122
5123
#: bzrlib/commands.py:962
5124
#, python-format
5125
msgid "Profile data written to \"%s\"."
5126
msgstr ""
5127
5128
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5129
msgid "added"
5130
msgstr ""
5131
5132
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5133
msgid "modified"
5134
msgstr ""
5135
5136
#: bzrlib/commit.py:131
5137
#, python-format
5138
msgid "Committing%s"
5139
msgstr ""
5140
5141
#: bzrlib/commit.py:134
5142
#, python-format
5143
msgid "Committed revision %d."
5144
msgstr ""
5145
5146
#: bzrlib/commit.py:143
5147
#, python-format
5148
msgid "deleted %s"
5149
msgstr ""
5150
5151
#: bzrlib/commit.py:146
5152
#, python-format
5153
msgid "missing %s"
5154
msgstr ""
5155
5156
#: bzrlib/commit.py:511
5157
msgid ""
5158
"Conflicting tags in bound branch:\n"
5159
"{0}"
5160
msgstr ""
5161
5162
#: bzrlib/commit.py:742
5163
msgid "renamed"
5164
msgstr ""
5165
5166
#: bzrlib/commit.py:977
5167
msgid "unchanged"
5168
msgstr ""
5169
5170
#: bzrlib/commit.py:999
5171
msgid "{0} [{1}] - Stage"
5172
msgstr ""
5173
5174
#: bzrlib/commit.py:1002
5175
#, python-format
5176
msgid "%s - Stage"
5177
msgstr ""
5178
5179
#: bzrlib/commit_signature_commands.py:36
5180
msgid "Sign all commits by a given committer."
5181
msgstr ""
5182
5183
#: bzrlib/commit_signature_commands.py:38
5184
msgid ""
5185
"If location is not specified the local tree is used.\n"
5186
"If committer is not specified the default committer is used."
5187
msgstr ""
5188
5189
#: bzrlib/commit_signature_commands.py:41
5190
msgid "This does not sign commits that already have signatures."
5191
msgstr ""
5192
5193
#: bzrlib/commit_signature_commands.py:49
5194
msgid ""
5195
"Don't actually sign anything, just print the revisions that would be signed."
5196
msgstr ""
5197
5198
#: bzrlib/commit_signature_commands.py:103
5199
msgid "Verify all commit signatures."
5200
msgstr ""
5201
5202
#: bzrlib/commit_signature_commands.py:105
5203
msgid ""
5204
"Verifies that all commits in the branch are signed by known GnuPG keys."
5205
msgstr ""
5206
5207
#: bzrlib/commit_signature_commands.py:110
5208
msgid ""
5209
"Comma separated list of GPG key patterns which are acceptable for "
5210
"verification."
5211
msgstr ""
5212
5213
#: bzrlib/commit_signature_commands.py:147
5214
msgid "Cannot verify a range of non-revision-history revisions"
5215
msgstr ""
5216
5217
#: bzrlib/commit_signature_commands.py:168
5218
msgid "All commits signed with verifiable keys"
5219
msgstr ""
5220
5221
#: bzrlib/config.py:475
5222
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5223
msgstr ""
5224
5225
#: bzrlib/config.py:2485
5226
msgid "{0} is not an SI unit."
5227
msgstr ""
5228
5229
#: bzrlib/config.py:2949
5230
msgid ""
5231
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5232
"will be saved."
5233
msgstr ""
5234
5235
#: bzrlib/config.py:3093
5236
#, python-format
5237
msgid "Invalid '%s', should be of the form 'name=value'"
5238
msgstr ""
5239
5240
#: bzrlib/config.py:3962
5241
msgid "Display, set or remove a configuration option."
5242
msgstr ""
5243
5244
#: bzrlib/config.py:3964
5245
msgid "Display the active value for a given option."
5246
msgstr ""
5247
5248
#: bzrlib/config.py:3966
5249
msgid ""
5250
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5251
"matching options are displayed mentioning their scope. The active value\n"
5252
"that bzr will take into account is the first one displayed for each option."
5253
msgstr ""
5254
5255
#: bzrlib/config.py:3970
5256
msgid "If no NAME is given, --all .* is implied."
5257
msgstr ""
5258
5259
#: bzrlib/config.py:3972
5260
msgid ""
5261
"Setting a value is achieved by using name=value without spaces. The value\n"
5262
"is set in the most relevant scope and can be checked by displaying the\n"
5263
"option again."
5264
msgstr ""
5265
5266
#: bzrlib/config.py:3984
5267
msgid "Reduce the scope to the specified configuration file."
5268
msgstr ""
5269
5270
#: bzrlib/config.py:3988
5271
msgid "Display all the defined values for the matching options."
5272
msgstr ""
5273
5274
#: bzrlib/config.py:3990
5275
msgid "Remove the option from the configuration file."
5276
msgstr ""
5277
5278
#: bzrlib/conflicts.py:50
5279
msgid "List files with conflicts."
5280
msgstr ""
5281
5282
#: bzrlib/conflicts.py:57
5283
msgid ""
5284
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5285
"is supplied, the pathnames of files with text conflicts are listed,\n"
5286
"instead. (This is useful for editing all files with text conflicts.)"
5287
msgstr ""
5288
5289
#: bzrlib/conflicts.py:61
5290
msgid "Use bzr resolve when you have fixed a problem."
5291
msgstr ""
5292
5293
#: bzrlib/conflicts.py:66
5294
msgid "List paths of files with text conflicts."
5295
msgstr ""
5296
5297
#: bzrlib/conflicts.py:85
5298
msgid "Marks the conflict as resolved."
5299
msgstr ""
5300
5301
#: bzrlib/conflicts.py:88
5302
msgid "Resolve the conflict preserving the version in the working tree."
5303
msgstr ""
5304
5305
#: bzrlib/conflicts.py:91
5306
msgid "Resolve the conflict taking the merged version into account."
5307
msgstr ""
5308
5309
#: bzrlib/conflicts.py:98
5310
msgid "How to resolve the conflict."
5311
msgstr ""
5312
5313
#: bzrlib/conflicts.py:104
5314
msgid "Mark a conflict as resolved."
5315
msgstr ""
5316
5317
#: bzrlib/conflicts.py:111
5318
msgid ""
5319
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5320
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5321
"as\n"
5322
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5323
msgstr ""
5324
5325
#: bzrlib/conflicts.py:119
5326
msgid "Resolve all conflicts in this tree."
5327
msgstr ""
5328
5329
#: bzrlib/conflicts.py:126
5330
msgid "If --all is specified, no FILE may be provided"
5331
msgstr ""
5332
5333
#: bzrlib/conflicts.py:151
5334
#, python-format
5335
msgid "%d conflict auto-resolved."
5336
msgid_plural "%d conflicts auto-resolved."
5337
msgstr[0] ""
5338
msgstr[1] ""
5339
5340
#: bzrlib/conflicts.py:154
5341
msgid "Remaining conflicts:"
5342
msgstr ""
5343
5344
#: bzrlib/conflicts.py:159
5345
msgid "All conflicts resolved."
5346
msgstr ""
5347
5348
#: bzrlib/conflicts.py:168
5349
msgid "{0} conflict resolved, {1} remaining"
5350
msgid_plural "{0} conflicts resolved, {1} remaining"
5351
msgstr[0] ""
5352
msgstr[1] ""
5353
5354
#: bzrlib/controldir.py:710
5355
msgid "{0} is{1} redirected to {2}"
5356
msgstr ""
5357
5358
#: bzrlib/diff.py:399
5359
#, python-format
5360
msgid "*** Ignoring files outside view. View is %s"
5361
msgstr ""
5362
5363
#: bzrlib/errors.py:157
5364
msgid "The tree builder is already building a tree."
5365
msgstr ""
5366
5367
#: bzrlib/errors.py:178
5368
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5369
msgstr ""
5370
5371
#: bzrlib/errors.py:197
5372
msgid ""
5373
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5374
"versions \"%(minimum)s\" to \"%(current)s\"."
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:209
5378
msgid "The transport '%(transport)s' is only accessible within this process."
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:227
5382
msgid "Invalid revision number %(revno)s"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:236
5386
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:247
5390
msgid "Reserved revision-id {%(revision_id)s}"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:261
5394
msgid "There is no public branch set for \"%(branch_url)s\"."
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:271
5398
msgid ""
5399
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5400
"obtain a list of topics."
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:280
5404
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:290
5408
msgid ""
5409
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:299
5413
msgid "The branch '%(branch)s' is not stacked."
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:313
5417
msgid "No WorkingTree exists for \"%(base)s\"."
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:322
5421
msgid "Not currently building a tree."
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:327
5425
msgid "%(url)s is not a local path."
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:355
5429
msgid "%(not_locked)r is not write locked but needs to be."
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:363
5433
msgid "Error in command line options"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:368
5437
msgid "%(value)s is not an index of type %(_type)s."
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:378
5441
msgid "Error in data for index %(value)s."
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:387
5445
msgid "The key '%(key)s' is already in index '%(index)s'."
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:397
5449
msgid "The key '%(key)s' is not a valid key."
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:406
5453
msgid "Could not parse options for index %(value)s."
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:415
5457
msgid "The value '%(value)s' is not a valid value."
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:424
5461
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:443
5465
msgid "Generic path error: %(path)r%(extra)s)"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:456
5469
msgid "No such file: %(path)r%(extra)s"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:461
5473
msgid "File exists: %(path)r%(extra)s"
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:467
5477
msgid ""
5478
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5479
"after to tell bzr about a rename that has already happened)%(extra)s"
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:483
5483
msgid "\"%(path)s\" is not a directory %(extra)s"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:488
5487
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:493
5491
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5492
msgstr ""
5493
5494
#: bzrlib/errors.py:498
5495
msgid "Hard-linking \"%(path)s\" is not supported"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:513
5499
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5500
msgstr ""
5501
5502
#: bzrlib/errors.py:518
5503
msgid "Permission denied: \"%(path)s\"%(extra)s"
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:523
5507
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:528
5511
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:539
5515
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:561
5519
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:571
5523
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:579
5527
msgid ""
5528
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5529
"upgrade the branch to permit branch stacking."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:590
5533
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:600
5537
msgid ""
5538
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5539
"need to upgrade the repository to permit branch stacking."
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:611
5543
msgid "Error reading from %(path)r."
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:630
5547
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:646
5551
msgid "Path \"%(path)s\" is not unicode normalized"
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:654
5555
msgid "Not a branch: \"%(path)s\"%(detail)s."
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:696
5559
msgid "No submit branch available for branch \"%(path)s\""
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:705
5563
msgid "A control directory already exists: \"%(path)s\"."
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:710
5567
msgid "Already a branch: \"%(path)s\"."
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:715
5571
msgid "Parent branch already exists: \"%(path)s\"."
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:721
5575
msgid ""
5576
"Directory contains a branch, but no working tree (use bzr checkout if you "
5577
"wish to build a working tree): \"%(path)s\""
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:726
5581
msgid ""
5582
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:736
5586
msgid ""
5587
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:746
5591
msgid "No repository present: \"%(path)s\""
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:753
5595
msgid ""
5596
"Unsupported branch format: %(format)s\n"
5597
"Please run 'bzr upgrade'"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:759
5601
msgid "Unknown %(kind)s format: %(format)r"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:768
5605
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:778
5609
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:793
5613
msgid ""
5614
"%(target)s\n"
5615
"is not compatible with\n"
5616
"%(source)s\n"
5617
"%(details)s"
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:809
5621
msgid "Revision is not compatible with %(repo_format)s"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:819
5625
msgid "%(context_info)s%(path)s is already versioned."
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:840
5629
msgid "%(context_info)s%(path)s is not versioned."
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:861
5633
msgid "Path(s) are not versioned: %(paths_as_string)s"
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:872
5637
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:891
5641
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:899
5645
msgid ""
5646
"Filename %(filename)r is not valid in your current filesystem encoding "
5647
"%(fs_encoding)s"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:910
5651
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:928
5655
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:967
5659
msgid "Cannot lock %(lock)s: %(why)s"
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:977
5663
msgid ""
5664
"A transaction related operation was attempted after the transaction finished."
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:1004
5668
msgid "Cannot lock: transport is read only: %(transport)s"
5669
msgstr ""
5670
5671
#: bzrlib/errors.py:1012
5672
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:1023
5676
msgid ""
5677
"Lock was broken while still open: %(lock)s - check storage consistency!"
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:1034
5681
msgid ""
5682
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5683
"%(holder)r, wanted to break %(target)r"
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:1046
5687
msgid ""
5688
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5689
"Use 'bzr break-lock' to clear it"
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:1059
5693
msgid "Lock not held: %(lock)s"
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:1088
5697
msgid "No changes to commit"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:1093
5701
msgid ""
5702
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:1103
5706
msgid ""
5707
"Excluding paths during commit is not supported by repository at "
5708
"%(repository)r."
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:1112
5712
msgid ""
5713
"The specified commit message contains characters unsupported by the current "
5714
"encoding."
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:1118
5718
msgid "Upgrade URL cannot work with readonly URLs."
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:1123
5722
msgid "The branch format %(format)s is already at the most recent format."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:1146
5726
msgid "Option --change does not accept revision ranges"
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:1151
5730
msgid "No namespace registered for string: %(spec)r"
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:1170
5734
msgid ""
5735
"Requested revision: '%(spec)s' does not exist in branch: "
5736
"%(branch_url)s%(extra)s"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:1184
5740
msgid ""
5741
"Operation denied because it would change the main history, which is not "
5742
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:1195
5746
msgid ""
5747
"These branches have diverged. Use the missing command to see how.\n"
5748
"Use the merge command to reconcile them."
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:1215
5752
msgid ""
5753
"Branches have no common ancestor, and no merge base revision was specified."
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:1221
5757
msgid ""
5758
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:1227
5762
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:1236
5766
msgid ""
5767
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5768
msgstr ""
5769
5770
#: bzrlib/errors.py:1245
5771
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:1254
5775
msgid "Branch %(branch)s has no commits."
5776
msgstr ""
5777
5778
#: bzrlib/errors.py:1272
5779
msgid ""
5780
"Bound branch %(branch)s is out of date with master branch "
5781
"%(master)s.%(extra_help)s"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:1284
5785
msgid ""
5786
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5787
"bound to %(remote)s."
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:1296
5791
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:1305
5795
msgid ""
5796
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5797
"%(error)s"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:1317
5801
msgid "Error in processing weave: %(msg)s"
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:1326
5805
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:1337
5809
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:1347
5813
msgid "Weave invariant violated: %(what)s"
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:1356
5817
msgid "Parents are mismatched between two revisions. %(msg)s"
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:1378
5821
msgid ""
5822
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5823
"%(weave_b)s"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:1390
5827
msgid "Versioned file error"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:1395
5831
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:1405
5835
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:1415
5839
msgid "Text did not match its checksum: %(msg)s"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:1541
5843
msgid "Export format %(format)r not supported"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:1550
5847
msgid "Transport error: %(msg)s %(orig_error)s"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:1576
5851
msgid "Generic bzr smart protocol error: %(details)s"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:1584
5855
msgid "Received bad protocol version marker: %(marker)r"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:1616
5859
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:1621
5863
msgid "Connection error: %(msg)s %(orig_error)s"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:1626
5867
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:1647
5871
msgid "Connection closed: %(msg)s %(orig_error)s"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:1652
5875
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:1657
5879
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:1667
5883
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:1682
5887
msgid "Certificate error: %(error)s"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:1690
5891
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:1704
5895
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:1712
5899
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:1721
5903
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:1735
5907
msgid "Too many redirections"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:1740
5911
msgid "Working tree has conflicts."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:1744
5915
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:1753
5919
msgid ""
5920
"Error(s) parsing config file %(filename)s:\n"
5921
"%(errors)s"
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:1763
5925
msgid ""
5926
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5927
"See ``bzr help %(name)s``"
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:1773
5931
msgid "%(username)r does not seem to contain a reasonable email address"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:1782
5935
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:1790
5939
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:1798
5943
msgid "Unable to import library \"%(library)s\": %(error)s"
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:1806
5947
msgid "python-gpgme is not installed, it is needed to verify signatures"
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:1814
5951
msgid ""
5952
"The working tree for %(basedir)s has changed since the last commit, but "
5953
"weave merge requires that it be unchanged"
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:1824
5957
msgid ""
5958
"Can't reprocess and show base, because reprocessing obscures the "
5959
"relationship of conflicting lines to the base"
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:1830
5963
msgid "Cycle in graph %(graph)r"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:1858
5967
msgid "File %(filename)s is not conflicted."
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:1880
5971
msgid "No bundle was found in \"%(filename)s\"."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:1889
5975
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:1899
5979
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:1912
5983
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:1922
5987
msgid "Key %(key)s is already present in map"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:1927
5991
msgid "The prefix %(prefix)s is in the help search path twice."
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:1937
5995
msgid ""
5996
"No final name for trans_id %(trans_id)r\n"
5997
"file-id: %(file_id)r\n"
5998
"root trans-id: %(root_trans_id)r\n"
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:1969
6002
msgid "Attempt to reuse a transform that has already been applied."
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:1974
6006
msgid "Moving the root directory is not supported at this time"
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:1979
6010
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:1990
6014
msgid ""
6015
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2026
6019
msgid ""
6020
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:2056
6024
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:2064
6028
msgid "Nothing to merge."
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:2069
6032
msgid "Format %(format)s cannot be initialised by this version of bzr."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:2078
6036
msgid ""
6037
"Cannot convert from format %(from_format)s to format %(format)s. "
6038
"%(problem)s"
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:2090
6042
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:2098
6046
msgid "%(exe_name)s could not be found on this machine"
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:2106
6050
msgid "Diff is not installed on this machine: %(msg)s"
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:2114
6054
msgid "Diff3 is not installed on this machine."
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:2120
6058
msgid "The content being inserted is already present."
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:2125
6062
msgid ""
6063
"This tree contains left-over files from a failed operation.\n"
6064
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6065
"to\n"
6066
" keep, and delete it when you are done."
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2136
6070
msgid ""
6071
"This tree contains left-over files from a failed operation.\n"
6072
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6073
" wish to keep, and delete it when you are done."
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:2146
6077
msgid ""
6078
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6079
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6080
"to\n"
6081
" keep, and delete it when you are done."
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:2157
6085
msgid ""
6086
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6087
"examine %(pending_deletion)s to see if it contains any files you wish to "
6088
"keep, and delete it when you are done."
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:2167
6092
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:2181
6096
msgid ""
6097
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6098
msgstr ""
6099
6100
#: bzrlib/errors.py:2194
6101
msgid "Error in merge modified format"
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:2199
6105
msgid "Format error in conflict listings"
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:2203
6109
msgid ""
6110
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6111
"Error: %(description)s"
6112
msgstr ""
6113
6114
#: bzrlib/errors.py:2214
6115
msgid ""
6116
"An error has been detected in the repository %(repo_path)s.\n"
6117
"Please run bzr reconcile on this repository."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:2225
6121
msgid ""
6122
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6123
"reason: %(reason)s"
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:2238
6127
msgid ""
6128
"An inconsistent delta was supplied: %(delta)r\n"
6129
"reason: %(reason)s"
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:2250
6133
msgid "To use this feature you must upgrade your branch at %(path)s."
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:2259
6137
msgid "To use this feature you must upgrade your repository at %(path)s."
6138
msgstr ""
6139
6140
#: bzrlib/errors.py:2264
6141
msgid ""
6142
"To use this feature you must upgrade your branch at %(path)s to a format "
6143
"which supports rich roots."
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:2270
6147
msgid "Cannot perform local-only commits on unbound branches."
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:2275
6151
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:2296
6155
msgid "Ghost tags not supported by format %(format)r."
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2304
6159
msgid "File is binary but should be text."
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:2309
6163
msgid "The path %(path)s is not permitted on this platform"
6164
msgstr ""
6165
6166
#: bzrlib/errors.py:2318
6167
msgid ""
6168
"Testament did not match expected value.\n"
6169
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6170
" {%(measured)s}"
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:2330
6174
msgid "Not a bzr revision-bundle: %(text)r"
6175
msgstr ""
6176
6177
#: bzrlib/errors.py:2339
6178
msgid "Bad bzr revision-bundle: %(text)r"
6179
msgstr ""
6180
6181
#: bzrlib/errors.py:2348
6182
msgid "Malformed bzr revision-bundle header: %(text)r"
6183
msgstr ""
6184
6185
#: bzrlib/errors.py:2353
6186
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6187
msgstr ""
6188
6189
#: bzrlib/errors.py:2358
6190
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6191
msgstr ""
6192
6193
#: bzrlib/errors.py:2363
6194
msgid "End of line marker was not \\n in bzr revision-bundle"
6195
msgstr ""
6196
6197
#: bzrlib/errors.py:2373
6198
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6199
msgstr ""
6200
6201
#: bzrlib/errors.py:2383
6202
msgid "Root class for inventory serialization errors"
6203
msgstr ""
6204
6205
#: bzrlib/errors.py:2387
6206
msgid ""
6207
"The inventory was not in the expected format:\n"
6208
" %(msg)s"
6209
msgstr ""
6210
6211
#: bzrlib/errors.py:2396
6212
msgid "This operation requires rich root data storage"
6213
msgstr ""
6214
6215
#: bzrlib/errors.py:2409
6216
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6217
msgstr ""
6218
6219
#: bzrlib/errors.py:2418
6220
msgid ""
6221
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6222
"variable."
6223
msgstr ""
6224
6225
#: bzrlib/errors.py:2425
6226
msgid ""
6227
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6228
"ghost at {%(ghost_revision_id)s}"
6229
msgstr ""
6230
6231
#: bzrlib/errors.py:2435
6232
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6233
msgstr ""
6234
6235
#: bzrlib/errors.py:2486
6236
msgid ""
6237
"A merge directive must provide either a bundle or a public branch location."
6238
msgstr ""
6239
6240
#: bzrlib/errors.py:2493
6241
msgid "Bad merge directive payload %(start)r"
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:2503
6245
msgid "Preview patch does not match requested changes."
6246
msgstr ""
6247
6248
#: bzrlib/errors.py:2509
6249
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6250
msgstr ""
6251
6252
#: bzrlib/errors.py:2519
6253
msgid ""
6254
"Your branch does not have all of the revisions required in order to merge "
6255
"this merge directive and the target location specified in the merge "
6256
"directive is not a branch: %(location)s."
6257
msgstr ""
6258
6259
#: bzrlib/errors.py:2531
6260
msgid "Unsupported entry kind %(kind)s"
6261
msgstr ""
6262
6263
#: bzrlib/errors.py:2539
6264
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6265
msgstr ""
6266
6267
#: bzrlib/errors.py:2549
6268
msgid "Subsume target %(other_tree)s needs to be upgraded."
6269
msgstr ""
6270
6271
#: bzrlib/errors.py:2568
6272
msgid "No such tag: %(tag_name)s"
6273
msgstr ""
6274
6275
#: bzrlib/errors.py:2576
6276
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6277
msgstr ""
6278
6279
#: bzrlib/errors.py:2585
6280
msgid "Tag %(tag_name)s already exists."
6281
msgstr ""
6282
6283
#: bzrlib/errors.py:2593
6284
msgid ""
6285
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6286
"bugs\" for more information on this feature."
6287
msgstr ""
6288
6289
#: bzrlib/errors.py:2603
6290
msgid ""
6291
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6292
msgstr ""
6293
6294
#: bzrlib/errors.py:2613
6295
msgid ""
6296
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6297
msgstr ""
6298
6299
#: bzrlib/errors.py:2623
6300
msgid "Invalid line in bugs property: '%(line)s'"
6301
msgstr ""
6302
6303
#: bzrlib/errors.py:2631
6304
msgid "Invalid bug status: '%(status)s'"
6305
msgstr ""
6306
6307
#: bzrlib/errors.py:2639
6308
msgid "Could not understand response from smart server: %(response_tuple)r"
6309
msgstr ""
6310
6311
#: bzrlib/errors.py:2678
6312
msgid "Server sent an unexpected error: %(error_tuple)r"
6313
msgstr ""
6314
6315
#: bzrlib/errors.py:2697
6316
msgid "Unrecognised container format: %(container_format)r"
6317
msgstr ""
6318
6319
#: bzrlib/errors.py:2705
6320
msgid "Unexpected end of container stream"
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:2710
6324
msgid "Unknown record type: %(record_type)r"
6325
msgstr ""
6326
6327
#: bzrlib/errors.py:2718
6328
msgid "Invalid record: %(reason)s"
6329
msgstr ""
6330
6331
#: bzrlib/errors.py:2726
6332
msgid "Container has data after end marker: %(excess)r"
6333
msgstr ""
6334
6335
#: bzrlib/errors.py:2734
6336
msgid "Container has multiple records with the same name: %(name)s"
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:2747
6340
msgid "Corrupt or incompatible data stream: %(reason)s"
6341
msgstr ""
6342
6343
#: bzrlib/errors.py:2755
6344
msgid "SMTP error: %(error)s"
6345
msgstr ""
6346
6347
#: bzrlib/errors.py:2763
6348
msgid "No message supplied."
6349
msgstr ""
6350
6351
#: bzrlib/errors.py:2768
6352
msgid "No mail-to address (--mail-to) or output (-o) specified."
6353
msgstr ""
6354
6355
#: bzrlib/errors.py:2773
6356
msgid "Unknown mail client: %(mail_client)s"
6357
msgstr ""
6358
6359
#: bzrlib/errors.py:2781
6360
msgid ""
6361
"Unable to find mail client with the following names: "
6362
"%(mail_command_list_string)s"
6363
msgstr ""
6364
6365
#: bzrlib/errors.py:2791
6366
msgid "SMTP connection to %(host)s refused"
6367
msgstr ""
6368
6369
#: bzrlib/errors.py:2800
6370
msgid "Please specify smtp_server. No server at default %(host)s."
6371
msgstr ""
6372
6373
#: bzrlib/errors.py:2814
6374
msgid ""
6375
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6376
"reconfigure."
6377
msgstr ""
6378
6379
#: bzrlib/errors.py:2826
6380
msgid "'%(display_url)s' is already a branch."
6381
msgstr ""
6382
6383
#: bzrlib/errors.py:2831
6384
msgid "'%(display_url)s' is already a tree."
6385
msgstr ""
6386
6387
#: bzrlib/errors.py:2836
6388
msgid "'%(display_url)s' is already a checkout."
6389
msgstr ""
6390
6391
#: bzrlib/errors.py:2841
6392
msgid "'%(display_url)s' is already a lightweight checkout."
6393
msgstr ""
6394
6395
#: bzrlib/errors.py:2846
6396
msgid "'%(display_url)s' is already using a shared repository."
6397
msgstr ""
6398
6399
#: bzrlib/errors.py:2851
6400
msgid "'%(display_url)s' is already standalone."
6401
msgstr ""
6402
6403
#: bzrlib/errors.py:2856
6404
msgid "Shared repository '%(display_url)s' already creates working trees."
6405
msgstr ""
6406
6407
#: bzrlib/errors.py:2862
6408
msgid ""
6409
"Shared repository '%(display_url)s' already doesn't create working trees."
6410
msgstr ""
6411
6412
#: bzrlib/errors.py:2868
6413
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6414
msgstr ""
6415
6416
#: bzrlib/errors.py:2873
6417
msgid "No location could be found to bind to at %(display_url)s."
6418
msgstr ""
6419
6420
#: bzrlib/errors.py:2878
6421
msgid ""
6422
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6423
"status).%(more)s"
6424
msgstr ""
6425
6426
#: bzrlib/errors.py:2897
6427
msgid ""
6428
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6429
"list).%(more)s"
6430
msgstr ""
6431
6432
#: bzrlib/errors.py:2903
6433
msgid "Variable {%(name)s} is not available."
6434
msgstr ""
6435
6436
#: bzrlib/errors.py:2911
6437
msgid "No template specified."
6438
msgstr ""
6439
6440
#: bzrlib/errors.py:2916
6441
msgid "Unable to create symlink %(path_str)son this platform"
6442
msgstr ""
6443
6444
#: bzrlib/errors.py:2931
6445
msgid ""
6446
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6447
"\"original\", \"local\"."
6448
msgstr ""
6449
6450
#: bzrlib/errors.py:2965
6451
msgid ""
6452
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6453
msgstr ""
6454
6455
#: bzrlib/errors.py:2977
6456
msgid "The \"%(config_id)s\" configuration does not exist."
6457
msgstr ""
6458
6459
#: bzrlib/errors.py:2985
6460
msgid "The \"%(option_name)s\" configuration option does not exist."
6461
msgstr ""
6462
6463
#: bzrlib/errors.py:2993
6464
msgid "The alias \"%(alias_name)s\" does not exist."
6465
msgstr ""
6466
6467
#: bzrlib/errors.py:3007
6468
msgid "\"%(alias_name)s\" is not a valid location alias."
6469
msgstr ""
6470
6471
#: bzrlib/errors.py:3015
6472
msgid "No %(alias_name)s location assigned."
6473
msgstr ""
6474
6475
#: bzrlib/errors.py:3023
6476
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6477
msgstr ""
6478
6479
#: bzrlib/errors.py:3033
6480
msgid "Unknown rules detected: %(unknowns_str)s."
6481
msgstr ""
6482
6483
#: bzrlib/errors.py:3044
6484
msgid "Tip change rejected: %(msg)s"
6485
msgstr ""
6486
6487
#: bzrlib/errors.py:3052
6488
msgid "Shelf corrupt."
6489
msgstr ""
6490
6491
#: bzrlib/errors.py:3057
6492
msgid "Corruption while decompressing repository file%(orig_error)s"
6493
msgstr ""
6494
6495
#: bzrlib/errors.py:3069
6496
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6497
msgstr ""
6498
6499
#: bzrlib/errors.py:3077
6500
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6501
msgstr ""
6502
6503
#: bzrlib/errors.py:3085
6504
msgid ""
6505
"An attempt to access a url outside the server jail was made: '%(url)s'."
6506
msgstr ""
6507
6508
#: bzrlib/errors.py:3093
6509
msgid "The user aborted the operation."
6510
msgstr ""
6511
6512
#: bzrlib/errors.py:3098
6513
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6514
msgstr ""
6515
6516
#: bzrlib/errors.py:3108
6517
msgid "No such view: %(view_name)s."
6518
msgstr ""
6519
6520
#: bzrlib/errors.py:3118
6521
msgid ""
6522
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6523
"to a later format."
6524
msgstr ""
6525
6526
#: bzrlib/errors.py:3127
6527
msgid ""
6528
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6529
msgstr ""
6530
6531
#: bzrlib/errors.py:3194
6532
msgid "%(bzrdir)r does not support co-located branches."
6533
msgstr ""
6534
6535
#: bzrlib/errors.py:3200
6536
msgid ""
6537
"Unable to determine your name.\n"
6538
"Please, set your name with the 'whoami' command.\n"
6539
"E.g. bzr whoami \"Your Name <name@example.com>\""
6540
msgstr ""
6541
6542
#: bzrlib/errors.py:3209
6543
msgid "Invalid pattern(s) found. %(msg)s"
6544
msgstr ""
6545
6546
#: bzrlib/errors.py:3217
6547
msgid ""
6548
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6549
"unbind` to fix."
6550
msgstr ""
6551
6552
#: bzrlib/errors.py:3228
6553
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6554
msgstr ""
6555
6556
#: bzrlib/errors.py:3237
6557
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6558
msgstr ""
6559
6560
#: bzrlib/errors.py:3246
6561
msgid ""
6562
"No compatible object available for operations from %(source)r to %(target)r."
6563
msgstr ""
6564
6565
#: bzrlib/errors.py:3256
6566
msgid ""
6567
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6568
"%(arguments)s."
6569
msgstr ""
6570
6571
#: bzrlib/errors.py:3266
6572
msgid ""
6573
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6574
"format %(format)r"
6575
msgstr ""
6576
6577
#: bzrlib/errors.py:3278
6578
msgid ""
6579
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6580
"plugin."
6581
msgstr ""
6582
6583
#: bzrlib/errors.py:3291
6584
msgid "Binary files section encountered."
6585
msgstr ""
6586
6587
#: bzrlib/errors.py:3299
6588
msgid ""
6589
"Malformed patch header. %(desc)s\n"
6590
"%(line)r"
6591
msgstr ""
6592
6593
#: bzrlib/errors.py:3308
6594
msgid ""
6595
"Malformed hunk header. %(desc)s\n"
6596
"%(line)r"
6597
msgstr ""
6598
6599
#: bzrlib/errors.py:3317
6600
msgid ""
6601
"Malformed line. %(desc)s\n"
6602
"%(line)r"
6603
msgstr ""
6604
6605
#: bzrlib/errors.py:3327
6606
msgid ""
6607
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6608
"but patch says it should be \"%(patch_line)s\""
6609
msgstr ""
6610
6611
#: bzrlib/errors.py:3338
6612
msgid "The feature %(feature)s has already been registered."
6613
msgstr ""
6614
6615
#: bzrlib/export_pot.py:252
6616
#, python-format
6617
msgid "Exporting messages from builtin command: %s"
6618
msgstr ""
6619
6620
#: bzrlib/export_pot.py:271
6621
msgid "Exporting messages from plugin command: {0} in {1}"
6622
msgstr ""
6623
6624
#: bzrlib/export_pot.py:292
6625
#, python-format
6626
msgid "Exporting message from error: %s"
6627
msgstr ""
6628
6629
#: bzrlib/fetch.py:98
6630
msgid "Finding revisions"
6631
msgstr ""
6632
6633
#: bzrlib/fetch.py:103
6634
msgid "Fetching revisions"
6635
msgstr ""
6636
6637
#: bzrlib/foreign.py:262
6638
msgid "Push into a different VCS without any custom bzr metadata."
6639
msgstr ""
6640
6641
#: bzrlib/foreign.py:264
6642
msgid ""
6643
"This will afterwards rebase the local branch on the remote\n"
6644
"branch unless the --no-rebase option is used, in which case \n"
6645
"the two branches will be out of sync after the push. "
6646
msgstr ""
6647
6648
#: bzrlib/foreign.py:277
6649
msgid "Do not rebase after push."
6650
msgstr ""
6651
6652
#: bzrlib/foreign.py:311
6653
#, python-format
6654
msgid "Using saved location: %s\n"
6655
msgstr ""
6656
6657
#: bzrlib/foreign.py:321
6658
msgid ""
6659
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6660
"regular push."
6661
msgstr ""
6662
6663
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6664
msgid "{0} commits with valid signatures"
6665
msgstr ""
6666
6667
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6668
msgid "{0} commit with unknown key"
6669
msgid_plural "{0} commits with unknown keys"
6670
msgstr[0] ""
6671
msgstr[1] ""
6672
6673
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6674
msgid "{0} commit not valid"
6675
msgid_plural "{0} commits not valid"
6676
msgstr[0] ""
6677
msgstr[1] ""
6678
6679
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6680
msgid "{0} commit not signed"
6681
msgid_plural "{0} commits not signed"
6682
msgstr[0] ""
6683
msgstr[1] ""
6684
6685
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6686
msgid "{0} commit with key now expired"
6687
msgid_plural "{0} commits with key now expired"
6688
msgstr[0] ""
6689
msgstr[1] ""
6690
6691
#: bzrlib/gpg.py:343
6692
msgid "No GnuPG key results for pattern: {0}"
6693
msgstr ""
6694
6695
#: bzrlib/gpg.py:386
6696
msgid "{0} signed {1} commit"
6697
msgid_plural "{0} signed {1} commits"
6698
msgstr[0] ""
6699
msgstr[1] ""
6700
6701
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6702
msgid "{0} commit by author {1}"
6703
msgid_plural "{0} commits by author {1}"
6704
msgstr[0] ""
6705
msgstr[1] ""
6706
6707
#: bzrlib/gpg.py:433
6708
msgid "Unknown key {0} signed {1} commit"
6709
msgid_plural "Unknown key {0} signed {1} commits"
6710
msgstr[0] ""
6711
msgstr[1] ""
6712
6713
#: bzrlib/gpg.py:452
6714
msgid "{0} commit by author {1} with key {2} now expired"
6715
msgid_plural "{0} commits by author {1} with key {2} now expired"
6716
msgstr[0] ""
6717
msgstr[1] ""
6718
6719
#: bzrlib/groupcompress.py:1739
6720
#, python-format
6721
msgid "Insert claimed random_id=True, but then inserted %r two times"
6722
msgstr ""
6723
6724
#: bzrlib/hooks.py:331
6725
#, python-format
6726
msgid "Introduced in: %s"
6727
msgstr "Introduzido em: %s"
6728
6729
#: bzrlib/hooks.py:334
6730
#, python-format
6731
msgid "Deprecated in: %s"
6732
msgstr ""
6733
6734
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6735
msgid "Walking content"
6736
msgstr ""
6737
6738
#: bzrlib/knit.py:3330
6739
msgid "annotating"
6740
msgstr ""
6741
6742
#: bzrlib/lock.py:548
6743
msgid "{0!r} was {1} locked again"
6744
msgstr ""
6745
6746
#: bzrlib/lockdir.py:321
6747
#, python-format
6748
msgid "error removing pending lock: %s"
6749
msgstr ""
6750
6751
#: bzrlib/lockdir.py:616
6752
msgid "Unable to obtain"
6753
msgstr ""
6754
6755
#: bzrlib/lockdir.py:618
6756
msgid "Lock owner changed for"
6757
msgstr ""
6758
6759
#: bzrlib/lockdir.py:620
6760
msgid "{0} lock {1} {2}."
6761
msgstr ""
6762
6763
#: bzrlib/lockdir.py:627
6764
#, python-format
6765
msgid "Will continue to try until %s, unless you press Ctrl-C."
6766
msgstr ""
6767
6768
#: bzrlib/lockdir.py:629
6769
msgid "See \"bzr help break-lock\" for more."
6770
msgstr ""
6771
6772
#: bzrlib/lockdir.py:739
6773
#, python-format
6774
msgid ""
6775
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6776
msgstr ""
6777
6778
#: bzrlib/log.py:572
6779
msgid "--exclude-common-ancestry requires two different revisions"
6780
msgstr ""
6781
6782
#: bzrlib/log.py:574
6783
#, python-format
6784
msgid "invalid direction %r"
6785
msgstr ""
6786
6787
#: bzrlib/log.py:662
6788
msgid "Start revision not found in history of end revision."
6789
msgstr ""
6790
6791
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6792
msgid "Logging revision 0 is invalid."
6793
msgstr ""
6794
6795
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6796
msgid "Start revision must be older than the end revision."
6797
msgstr ""
6798
6799
#: bzrlib/log.py:1827
6800
#, python-format
6801
msgid "unknown log formatter: %r"
6802
msgstr ""
6803
6804
#: bzrlib/log.py:2123
6805
msgid "fixes bug"
6806
msgid_plural "fixes bugs"
6807
msgstr[0] ""
6808
msgstr[1] ""
6809
6810
#: bzrlib/merge.py:689
6811
msgid "All changes applied successfully."
6812
msgstr ""
6813
6814
#: bzrlib/merge.py:691
6815
#, python-format
6816
msgid "%d conflicts encountered."
6817
msgstr ""
6818
6819
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6820
msgid "Preparing file merge"
6821
msgstr ""
6822
6823
#: bzrlib/multiparent.py:426
6824
msgid "Importing revisions"
6825
msgstr ""
6826
6827
#: bzrlib/option.py:526
6828
msgid "Show help message."
6829
msgstr ""
6830
6831
#: bzrlib/option.py:528
6832
msgid "Only display errors and warnings."
6833
msgstr ""
6834
6835
#: bzrlib/option.py:531
6836
msgid "Show usage message and options."
6837
msgstr ""
6838
6839
#: bzrlib/option.py:533
6840
msgid "Display more information."
6841
msgstr ""
6842
6843
#: bzrlib/option.py:541
6844
msgid ""
6845
"Select changes introduced by the specified revision. See also \"help "
6846
"revisionspec\"."
6847
msgstr ""
6848
6849
#: bzrlib/option.py:543
6850
msgid "Branch to operate on, instead of working directory."
6851
msgstr ""
6852
6853
#: bzrlib/option.py:545
6854
msgid "Detailed log format."
6855
msgstr ""
6856
6857
#: bzrlib/option.py:545
6858
msgid "Format used by GNU ChangeLog files."
6859
msgstr ""
6860
6861
#: bzrlib/option.py:545
6862
msgid "Log format with one line per revision."
6863
msgstr ""
6864
6865
#: bzrlib/option.py:545
6866
msgid "Moderately short log format."
6867
msgstr ""
6868
6869
#: bzrlib/option.py:545
6870
msgid "Use specified log format."
6871
msgstr ""
6872
6873
#: bzrlib/option.py:547
6874
msgid "Log format"
6875
msgstr ""
6876
6877
#: bzrlib/option.py:549
6878
msgid "LCA-newness merge."
6879
msgstr ""
6880
6881
#: bzrlib/option.py:549
6882
msgid "Merge using external diff3."
6883
msgstr ""
6884
6885
#: bzrlib/option.py:549
6886
msgid "Native diff3-style merge."
6887
msgstr ""
6888
6889
#: bzrlib/option.py:549
6890
msgid "Select a particular merge algorithm."
6891
msgstr ""
6892
6893
#: bzrlib/option.py:549
6894
msgid "Weave-based merge."
6895
msgstr ""
6896
6897
#: bzrlib/option.py:551
6898
msgid "Merge algorithm"
6899
msgstr ""
6900
6901
#: bzrlib/option.py:554
6902
msgid "Message string."
6903
msgstr ""
6904
6905
#: bzrlib/option.py:556
6906
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6907
msgstr ""
6908
6909
#: bzrlib/option.py:558
6910
msgid "Ignore differences between branches and overwrite unconditionally."
6911
msgstr ""
6912
6913
#: bzrlib/option.py:560
6914
msgid "Remember the specified location as a default."
6915
msgstr ""
6916
6917
#: bzrlib/option.py:562
6918
msgid "Reprocess to reduce spurious conflicts."
6919
msgstr ""
6920
6921
#: bzrlib/option.py:566
6922
msgid "See \"help revisionspec\" for details."
6923
msgstr ""
6924
6925
#: bzrlib/option.py:568
6926
msgid "Show internal object ids."
6927
msgstr ""
6928
6929
#: bzrlib/option.py:571
6930
msgid "Display timezone as local, original, or utc."
6931
msgstr ""
6932
6933
#: bzrlib/osutils.py:100
6934
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6935
msgstr ""
6936
6937
#: bzrlib/osutils.py:220
6938
msgid "lstat/stat of ({0!r}): {1!r}"
6939
msgstr ""
6940
6941
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6942
#, python-format
6943
msgid "sorry, %r not allowed in path"
6944
msgstr ""
6945
6946
#: bzrlib/osutils.py:1237
6947
#, python-format
6948
msgid "%r is too short to calculate a relative path"
6949
msgstr ""
6950
6951
#: bzrlib/plugin.py:143
6952
#, python-format
6953
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6954
msgstr ""
6955
6956
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6957
msgid "Enable completions for the selected plugin (default: all plugins)"
6958
msgstr ""
6959
6960
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6961
msgid "Generate a shell function for bash command line completion."
6962
msgstr ""
6963
6964
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6965
msgid ""
6966
"This command generates a shell function which can be used by bash to\n"
6967
"automatically complete the currently typed command when the user presses\n"
6968
"the completion key (usually tab)."
6969
msgstr ""
6970
6971
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6972
msgid ""
6973
"Commonly used like this:\n"
6974
" eval \"`bzr bash-completion`\""
6975
msgstr ""
6976
6977
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6978
msgid "Name of the generated function (default: _bzr)"
6979
msgstr ""
6980
6981
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6982
msgid "Generate only the shell function, don't enable it"
6983
msgstr ""
6984
6985
#: bzrlib/plugins/launchpad/__init__.py:81
6986
msgid "Register a branch with launchpad.net."
6987
msgstr ""
6988
6989
#: bzrlib/plugins/launchpad/__init__.py:83
6990
msgid ""
6991
"This command lists a bzr branch in the directory of branches on\n"
6992
"launchpad.net. Registration allows the branch to be associated with\n"
6993
"bugs or specifications."
6994
msgstr ""
6995
6996
#: bzrlib/plugins/launchpad/__init__.py:87
6997
msgid ""
6998
"Before using this command you must register the project to which the\n"
6999
"branch belongs, and create an account for yourself on launchpad.net."
7000
msgstr ""
7001
7002
#: bzrlib/plugins/launchpad/__init__.py:90
7003
msgid ""
7004
"arguments:\n"
7005
" public_url: The publicly visible url for the branch to register.\n"
7006
" This must be an http or https url (which Launchpad can read\n"
7007
" from to access the branch). Local file urls, SFTP urls, and\n"
7008
" bzr+ssh urls will not work.\n"
7009
" If no public_url is provided, bzr will use the configured\n"
7010
" public_url if there is one for the current branch, and\n"
7011
" otherwise error."
7012
msgstr ""
7013
7014
#: bzrlib/plugins/launchpad/__init__.py:99
7015
msgid ""
7016
"example:\n"
7017
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7018
" --project fooproject"
7019
msgstr ""
7020
7021
#: bzrlib/plugins/launchpad/__init__.py:106
7022
msgid "Launchpad project short name to associate with the branch."
7023
msgstr ""
7024
7025
#: bzrlib/plugins/launchpad/__init__.py:113
7026
msgid ""
7027
"Short name for the branch; by default taken from the last component of the "
7028
"url."
7029
msgstr ""
7030
7031
#: bzrlib/plugins/launchpad/__init__.py:117
7032
msgid "One-sentence description of the branch."
7033
msgstr ""
7034
7035
#: bzrlib/plugins/launchpad/__init__.py:120
7036
msgid "Longer description of the purpose or contents of the branch."
7037
msgstr ""
7038
7039
#: bzrlib/plugins/launchpad/__init__.py:123
7040
msgid "Branch author's email address, if not yourself."
7041
msgstr ""
7042
7043
#: bzrlib/plugins/launchpad/__init__.py:126
7044
msgid "The bug this branch fixes."
7045
msgstr ""
7046
7047
#: bzrlib/plugins/launchpad/__init__.py:129
7048
msgid "Prepare the request but don't actually send it."
7049
msgstr ""
7050
7051
#: bzrlib/plugins/launchpad/__init__.py:151
7052
msgid ""
7053
"register-branch requires a public branch url - see bzr help register-branch."
7054
msgstr ""
7055
7056
#: bzrlib/plugins/launchpad/__init__.py:159
7057
msgid "--product is deprecated; please use --project."
7058
msgstr ""
7059
7060
#: bzrlib/plugins/launchpad/__init__.py:191
7061
msgid "Open a Launchpad branch page in your web browser."
7062
msgstr ""
7063
7064
#: bzrlib/plugins/launchpad/__init__.py:196
7065
msgid "Do not actually open the browser. Just say the URL we would use."
7066
msgstr ""
7067
7068
#: bzrlib/plugins/launchpad/__init__.py:231
7069
#, python-format
7070
msgid "Opening %s in web browser"
7071
msgstr ""
7072
7073
#: bzrlib/plugins/launchpad/__init__.py:241
7074
msgid "Show or set the Launchpad user ID."
7075
msgstr ""
7076
7077
#: bzrlib/plugins/launchpad/__init__.py:243
7078
msgid ""
7079
"When communicating with Launchpad, some commands need to know your\n"
7080
"Launchpad user ID. This command can be used to set or show the\n"
7081
"user ID that Bazaar will use for such communication."
7082
msgstr ""
7083
7084
#: bzrlib/plugins/launchpad/__init__.py:247
7085
msgid ""
7086
":Examples:\n"
7087
" Show the Launchpad ID of the current user::"
7088
msgstr ""
7089
":Exemplos:\n"
7090
" Mostra o ID do launchpad do usuário atual::"
7091
7092
#: bzrlib/plugins/launchpad/__init__.py:250
7093
msgid " bzr launchpad-login"
7094
msgstr " bzr launchpad-login"
7095
7096
#: bzrlib/plugins/launchpad/__init__.py:252
7097
msgid " Set the Launchpad ID of the current user to 'bob'::"
7098
msgstr " Define um ID do launchpad para o usuário 'bob'::"
7099
7100
#: bzrlib/plugins/launchpad/__init__.py:254
7101
msgid " bzr launchpad-login bob"
7102
msgstr " bzr launchpad-login bob"
7103
7104
#: bzrlib/plugins/launchpad/__init__.py:261
7105
msgid "Don't check that the user name is valid."
7106
msgstr "Não verifique se o nome de usuário é válido."
7107
7108
#: bzrlib/plugins/launchpad/__init__.py:276
7109
#: bzrlib/plugins/launchpad/__init__.py:287
7110
msgid "Launchpad user ID exists and has SSH keys.\n"
7111
msgstr ""
7112
7113
#: bzrlib/plugins/launchpad/__init__.py:279
7114
msgid "No Launchpad user ID configured.\n"
7115
msgstr "Nenhum ID de usuário launchpad configurado.\n"
7116
7117
#: bzrlib/plugins/launchpad/__init__.py:290
7118
#, python-format
7119
msgid "Launchpad user ID set to '%s'.\n"
7120
msgstr "ID de usuário launchpad definido como '%s'.\n"
7121
7122
#: bzrlib/plugins/launchpad/__init__.py:298
7123
msgid "Ask Launchpad to mirror a branch now."
7124
msgstr ""
7125
7126
#: bzrlib/plugins/launchpad/__init__.py:318
7127
msgid "Propose merging a branch on Launchpad."
7128
msgstr ""
7129
7130
#: bzrlib/plugins/launchpad/__init__.py:320
7131
msgid ""
7132
"This will open your usual editor to provide the initial comment. When it\n"
7133
"has created the proposal, it will open it in your default web browser."
7134
msgstr ""
7135
7136
#: bzrlib/plugins/launchpad/__init__.py:323
7137
msgid ""
7138
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7139
"is not supplied, the remembered submit branch will be used. If no submit\n"
7140
"branch is remembered, the development focus will be used."
7141
msgstr ""
7142
7143
#: bzrlib/plugins/launchpad/__init__.py:327
7144
msgid ""
7145
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7146
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7147
"The parameter the launchpad account name of the desired reviewer. This\n"
7148
"may optionally be followed by '=' and the review type. For example:"
7149
msgstr ""
7150
7151
#: bzrlib/plugins/launchpad/__init__.py:332
7152
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7153
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
7154
7155
#: bzrlib/plugins/launchpad/__init__.py:334
7156
msgid ""
7157
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7158
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7159
msgstr ""
7160
7161
#: bzrlib/plugins/launchpad/__init__.py:339
7162
msgid "Propose the merge on staging."
7163
msgstr ""
7164
7165
#: bzrlib/plugins/launchpad/__init__.py:341
7166
msgid "Commit message."
7167
msgstr ""
7168
7169
#: bzrlib/plugins/launchpad/__init__.py:343
7170
msgid "Mark the proposal as approved immediately."
7171
msgstr ""
7172
7173
#: bzrlib/plugins/launchpad/__init__.py:345
7174
msgid "Requested reviewer and optional type."
7175
msgstr ""
7176
7177
#: bzrlib/plugins/launchpad/__init__.py:382
7178
msgid "Find the proposal to merge this revision."
7179
msgstr ""
7180
7181
#: bzrlib/plugins/launchpad/__init__.py:384
7182
msgid ""
7183
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7184
"This works only if the selected branch was the merge proposal target, and\n"
7185
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7186
"are opened in a web browser."
7187
msgstr ""
7188
7189
#: bzrlib/plugins/launchpad/__init__.py:389
7190
msgid ""
7191
"Any revision involved in the merge may be specified-- the revision in\n"
7192
"which the merge was performed, or one of the revisions that was merged."
7193
msgstr ""
7194
7195
#: bzrlib/plugins/launchpad/__init__.py:392
7196
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7197
msgstr ""
7198
7199
#: bzrlib/plugins/launchpad/__init__.py:394
7200
msgid " bzr lp-find-proposal -r annotate:README:1"
7201
msgstr ""
7202
7203
#: bzrlib/plugins/launchpad/__init__.py:409
7204
msgid "No review found."
7205
msgstr ""
7206
7207
#: bzrlib/plugins/launchpad/__init__.py:410
7208
#, python-format
7209
msgid "%d proposals(s) found."
7210
msgstr ""
7211
7212
#: bzrlib/plugins/launchpad/__init__.py:420
7213
msgid "Finding revision-id"
7214
msgstr ""
7215
7216
#: bzrlib/plugins/launchpad/__init__.py:427
7217
msgid "Finding merge"
7218
msgstr ""
7219
7220
#: bzrlib/plugins/launchpad/__init__.py:432
7221
msgid "Finding revno"
7222
msgstr ""
7223
7224
#: bzrlib/plugins/launchpad/__init__.py:437
7225
msgid "Finding Launchpad branch"
7226
msgstr ""
7227
7228
#: bzrlib/plugins/launchpad/__init__.py:440
7229
msgid "Finding proposals"
7230
msgstr ""
7231
7232
#: bzrlib/plugins/launchpad/account.py:66
7233
msgid "Setting ssh/sftp usernames for launchpad.net."
7234
msgstr ""
7235
7236
#: bzrlib/plugins/launchpad/lp_api.py:241
7237
#: bzrlib/plugins/launchpad/lp_api.py:246
7238
#, python-format
7239
msgid "%s is not registered on Launchpad"
7240
msgstr ""
7241
7242
#: bzrlib/plugins/launchpad/lp_api.py:256
7243
#, python-format
7244
msgid "%s has no development focus."
7245
msgstr ""
7246
7247
#: bzrlib/plugins/launchpad/lp_api.py:261
7248
#, python-format
7249
msgid "development focus %s has no branch."
7250
msgstr ""
7251
7252
#: bzrlib/plugins/launchpad/lp_api.py:266
7253
#, python-format
7254
msgid "source package %s has no branch."
7255
msgstr ""
7256
7257
#: bzrlib/plugins/launchpad/lp_api.py:270
7258
#, python-format
7259
msgid "%s has no associated product or source package."
7260
msgstr ""
7261
7262
#: bzrlib/plugins/launchpad/lp_api.py:282
7263
#, python-format
7264
msgid "%s is already up-to-date."
7265
msgstr ""
7266
7267
#: bzrlib/plugins/launchpad/lp_api.py:289
7268
#, python-format
7269
msgid "Pushing to %s"
7270
msgstr ""
7271
7272
#: bzrlib/plugins/launchpad/lp_directory.py:170
7273
msgid ""
7274
"resolution for {0}\n"
7275
" local: {1}\n"
7276
" remote: {2}"
7277
msgstr ""
7278
7279
#: bzrlib/plugins/launchpad/lp_propose.py:149
7280
#, python-format
7281
msgid "There is already a branch merge proposal: %s"
7282
msgstr ""
7283
7284
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7285
msgid "pb parameter to convert() is deprecated"
7286
msgstr ""
7287
7288
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7289
msgid "starting upgrade from format 4 to 5"
7290
msgstr ""
7291
7292
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7293
msgid "note: upgrade may be faster if all store files are ungzipped first"
7294
msgstr ""
7295
7296
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7297
msgid "converting revision"
7298
msgstr ""
7299
7300
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7301
msgid "upgraded to weaves:"
7302
msgstr ""
7303
7304
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7305
#, python-format
7306
msgid "%6d revisions and inventories"
7307
msgstr ""
7308
7309
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7310
#, python-format
7311
msgid "%6d revisions not present"
7312
msgstr ""
7313
7314
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7315
#, python-format
7316
msgid "%6d texts"
7317
msgstr ""
7318
7319
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7320
msgid "writing weave"
7321
msgstr ""
7322
7323
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7324
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7325
msgid "inventory"
7326
msgstr ""
7327
7328
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7329
msgid "write revision"
7330
msgstr ""
7331
7332
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7333
msgid "loading revision"
7334
msgstr ""
7335
7336
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7337
#, python-format
7338
msgid "revision {%s} not present in branch; will be converted as a ghost"
7339
msgstr ""
7340
7341
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7342
msgid "starting upgrade from format 5 to 6"
7343
msgstr ""
7344
7345
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7346
#, python-format
7347
msgid "adding prefixes to %s"
7348
msgstr ""
7349
7350
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7351
msgid "starting upgrade from format 6 to metadir"
7352
msgstr ""
7353
7354
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7355
msgid "Removing ancestry.weave"
7356
msgstr ""
7357
7358
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7359
msgid "Finding branch files"
7360
msgstr ""
7361
7362
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7363
msgid "Upgrading repository"
7364
msgstr ""
7365
7366
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7367
msgid "Upgrading branch"
7368
msgstr ""
7369
7370
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7371
msgid "No working tree."
7372
msgstr ""
7373
7374
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7375
msgid "Upgrading working tree"
7376
msgstr ""
7377
7378
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7379
#, python-format
7380
msgid "Make %s lock"
7381
msgstr ""
7382
7383
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7384
#, python-format
7385
msgid "Moving %s"
7386
msgstr ""
7387
7388
#: bzrlib/push.py:56
7389
msgid "Created new branch."
7390
msgstr ""
7391
7392
#: bzrlib/push.py:97
7393
#, python-format
7394
msgid ""
7395
"Target directory %s already contains a .bzr directory, but it is not valid."
7396
msgstr ""
7397
7398
#: bzrlib/push.py:101
7399
#, python-format
7400
msgid ""
7401
"Target directory %s already exists, but does not have a .bzr directory. "
7402
"Supply --use-existing-dir to push there anyway."
7403
msgstr ""
7404
7405
#: bzrlib/push.py:122
7406
#, python-format
7407
msgid "Too many redirections trying to make %s."
7408
msgstr ""
7409
7410
#: bzrlib/push.py:147
7411
msgid ""
7412
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7413
"information."
7414
msgstr ""
7415
7416
#: bzrlib/push.py:151
7417
#, python-format
7418
msgid ""
7419
"It is not possible to losslessly push to %s. You may want to use dpush "
7420
"instead."
7421
msgstr ""
7422
7423
#: bzrlib/push.py:157
7424
#, python-format
7425
msgid ""
7426
"At %s you have a valid .bzr control directory, but not a branch or "
7427
"repository. This is an unsupported configuration. Please move the target "
7428
"directory out of the way and try again."
7429
msgstr ""
7430
7431
#: bzrlib/reconcile.py:97
7432
#, python-format
7433
msgid "Reconciling branch %s"
7434
msgstr ""
7435
7436
#: bzrlib/reconcile.py:103
7437
#, python-format
7438
msgid "Reconciling repository %s"
7439
msgstr ""
7440
7441
#: bzrlib/reconcile.py:105
7442
msgid "Reconciling repository"
7443
msgstr ""
7444
7445
#: bzrlib/reconcile.py:111
7446
#, python-format
7447
msgid "%s cannot canonicalize CHKs."
7448
msgstr ""
7449
7450
#: bzrlib/reconcile.py:119
7451
msgid "Reconcile aborted: revision index has inconsistent parents."
7452
msgstr ""
7453
7454
#: bzrlib/reconcile.py:121
7455
msgid "Run \"bzr check\" for more details."
7456
msgstr ""
7457
7458
#: bzrlib/reconcile.py:123
7459
msgid "Reconciliation complete."
7460
msgstr ""
7461
7462
#: bzrlib/reconcile.py:166
7463
msgid "Fixing last revision info {0} => {1}"
7464
msgstr ""
7465
7466
#: bzrlib/reconcile.py:173
7467
msgid "revision_history ok."
7468
msgstr ""
7469
7470
#: bzrlib/reconcile.py:234
7471
msgid "Reading inventory data"
7472
msgstr ""
7473
7474
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7475
msgid "Inventory ok."
7476
msgstr ""
7477
7478
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7479
msgid "Backing up inventory"
7480
msgstr ""
7481
7482
#: bzrlib/reconcile.py:258
7483
msgid "Backup inventory created."
7484
msgstr ""
7485
7486
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7487
msgid "Writing weave"
7488
msgstr ""
7489
7490
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7491
msgid "Inventory regenerated."
7492
msgstr ""
7493
7494
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7495
msgid "Reading indexes"
7496
msgstr ""
7497
7498
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7499
msgid "Checking unused inventories"
7500
msgstr ""
7501
7502
#: bzrlib/reconcile.py:388
7503
msgid "Backup Inventory created"
7504
msgstr ""
7505
7506
#: bzrlib/reconcile.py:446
7507
msgid "Fixing text parents"
7508
msgstr ""
7509
7510
#: bzrlib/reconfigure.py:54
7511
msgid "{0} is now stacked on {1}\n"
7512
msgstr ""
7513
7514
#: bzrlib/reconfigure.py:69
7515
#, python-format
7516
msgid "%s is now not stacked\n"
7517
msgstr ""
7518
7519
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7520
#, python-format
7521
msgid "bzr: ERROR (ignored): %s"
7522
msgstr ""
7523
7524
#: bzrlib/remote.py:2541
7525
msgid "Copying repository content as tarball..."
7526
msgstr ""
7527
7528
#: bzrlib/rename_map.py:69
7529
msgid "Calculating hashes"
7530
msgstr ""
7531
7532
#: bzrlib/rename_map.py:107
7533
msgid "Determining hash hits"
7534
msgstr ""
7535
7536
#: bzrlib/rename_map.py:242
7537
msgid "{0} => {1}"
7538
msgstr ""
7539
7540
#: bzrlib/repository.py:1787
7541
msgid "Moving repository to repository.backup"
7542
msgstr ""
7543
7544
#: bzrlib/repository.py:1794
7545
msgid "Creating new repository"
7546
msgstr ""
7547
7548
#: bzrlib/repository.py:1799
7549
msgid "Copying content"
7550
msgstr ""
7551
7552
#: bzrlib/repository.py:1803
7553
msgid "Deleting old repository content"
7554
msgstr ""
7555
7556
#: bzrlib/repository.py:1805
7557
msgid "repository converted"
7558
msgstr ""
7559
7560
#: bzrlib/revisionspec.py:903
7561
msgid "Using {0} {1}"
7562
msgstr ""
7563
7564
#: bzrlib/send.py:58
7565
#, python-format
7566
msgid "Mail client \"%s\" does not support specifying body"
7567
msgstr ""
7568
7569
#: bzrlib/send.py:62
7570
msgid "--remember requires a branch to be specified."
7571
msgstr ""
7572
7573
#: bzrlib/send.py:77
7574
msgid "No submit branch known or specified"
7575
msgstr ""
7576
7577
#: bzrlib/send.py:80
7578
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7579
msgstr ""
7580
7581
#: bzrlib/send.py:98
7582
#, python-format
7583
msgid "No such send format '%s'."
7584
msgstr ""
7585
7586
#: bzrlib/send.py:114
7587
msgid "bzr send takes at most two one revision identifiers"
7588
msgstr ""
7589
7590
#: bzrlib/send.py:127
7591
msgid "No revisions to submit."
7592
msgstr ""
7593
7594
#: bzrlib/send.py:139
7595
msgid ""
7596
"- not supported for merge directives that use more than one output file."
7597
msgstr ""
7598
7599
#: bzrlib/send.py:185
7600
msgid "Format 0.9 does not permit bundle with no patch"
7601
msgstr ""
7602
7603
#: bzrlib/shelf_ui.py:46
7604
#, python-format
7605
msgid "Shelve adding file \"%(path)s\"?"
7606
msgstr ""
7607
7608
#: bzrlib/shelf_ui.py:47
7609
msgid "Shelve binary changes?"
7610
msgstr ""
7611
7612
#: bzrlib/shelf_ui.py:48
7613
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7614
msgstr ""
7615
7616
#: bzrlib/shelf_ui.py:50
7617
#, python-format
7618
msgid "Shelve removing file \"%(path)s\"?"
7619
msgstr ""
7620
7621
#: bzrlib/shelf_ui.py:51
7622
#, python-format
7623
msgid "Shelve %d change(s)?"
7624
msgstr ""
7625
7626
#: bzrlib/shelf_ui.py:52
7627
msgid "Shelve?"
7628
msgstr ""
7629
7630
#: bzrlib/shelf_ui.py:53
7631
#, python-format
7632
msgid ""
7633
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7634
msgstr ""
7635
7636
#: bzrlib/shelf_ui.py:55
7637
#, python-format
7638
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7639
msgstr ""
7640
7641
#: bzrlib/shelf_ui.py:70
7642
#, python-format
7643
msgid "Changes shelved with id \"%d\"."
7644
msgstr ""
7645
7646
#: bzrlib/shelf_ui.py:74
7647
msgid "Selected changes destroyed."
7648
msgstr ""
7649
7650
#: bzrlib/shelf_ui.py:78
7651
msgid "Selected changes:"
7652
msgstr ""
7653
7654
#: bzrlib/shelf_ui.py:98
7655
#, python-format
7656
msgid "Delete file \"%(path)s\"?"
7657
msgstr ""
7658
7659
#: bzrlib/shelf_ui.py:99
7660
msgid "Apply binary changes?"
7661
msgstr ""
7662
7663
#: bzrlib/shelf_ui.py:100
7664
#, python-format
7665
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7666
msgstr ""
7667
7668
#: bzrlib/shelf_ui.py:102
7669
#, python-format
7670
msgid "Add file \"%(path)s\"?"
7671
msgstr ""
7672
7673
#: bzrlib/shelf_ui.py:103
7674
#, python-format
7675
msgid "Apply %d change(s)?"
7676
msgstr ""
7677
7678
#: bzrlib/shelf_ui.py:104
7679
msgid "Apply change?"
7680
msgstr ""
7681
7682
#: bzrlib/shelf_ui.py:105
7683
#, python-format
7684
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7685
msgstr ""
7686
7687
#: bzrlib/shelf_ui.py:107
7688
#, python-format
7689
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7690
msgstr ""
7691
7692
#: bzrlib/shelf_ui.py:402
7693
msgid "No changes are shelved."
7694
msgstr ""
7695
7696
#: bzrlib/shelf_ui.py:460
7697
#, python-format
7698
msgid "Using changes with id \"%d\"."
7699
msgstr ""
7700
7701
#: bzrlib/shelf_ui.py:464
7702
#, python-format
7703
msgid "Message: %s"
7704
msgstr ""
7705
7706
#: bzrlib/shelf_ui.py:476
7707
#, python-format
7708
msgid "Deleted changes with id \"%d\"."
7709
msgstr ""
7710
7711
#: bzrlib/smart/medium.py:714
7712
msgid "HPSS calls: {0} ({1} vfs) {2}"
7713
msgstr ""
7714
7715
#: bzrlib/smart/server.py:169
7716
msgid "Requested to stop gracefully"
7717
msgstr ""
7718
7719
#: bzrlib/smart/server.py:179
7720
#, python-format
7721
msgid "Waiting for %d client(s) to finish"
7722
msgstr ""
7723
7724
#: bzrlib/smart/server.py:185
7725
#, python-format
7726
msgid "Still waiting for %d client(s) to finish"
7727
msgstr ""
7728
7729
#: bzrlib/smart/server.py:219
7730
#, python-format
7731
msgid "listening socket error: %s"
7732
msgstr ""
7733
7734
#: bzrlib/smart/server.py:452
7735
#, python-format
7736
msgid "listening on port: %s"
7737
msgstr ""
7738
7739
#: bzrlib/switch.py:73
7740
msgid "Pending merges must be committed or reverted before using switch."
7741
msgstr ""
7742
7743
#: bzrlib/switch.py:100
7744
msgid ""
7745
"Cannot switch as local commits found in the checkout. Commit these to the "
7746
"bound branch or use --force to throw them away."
7747
msgstr ""
7748
7749
#: bzrlib/switch.py:105
7750
#, python-format
7751
msgid ""
7752
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7753
"anyway, use --force."
7754
msgstr ""
7755
7756
#: bzrlib/switch.py:125
7757
msgid "Cannot switch a branch, only a checkout."
7758
msgstr ""
7759
7760
#: bzrlib/switch.py:163
7761
#, python-format
7762
msgid "Tree is up to date at revision %d."
7763
msgstr ""
7764
7765
#: bzrlib/switch.py:169
7766
#, python-format
7767
msgid "Updated to revision %d."
7768
msgstr ""
7769
7770
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7771
msgid "Apply phase"
7772
msgstr ""
7773
7774
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7775
msgid "removing file"
7776
msgstr ""
7777
7778
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7779
msgid "adding file"
7780
msgstr ""
7781
7782
#: bzrlib/transform.py:2591
7783
msgid "Building tree"
7784
msgstr ""
7785
7786
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7787
msgid "Adding file contents"
7788
msgstr ""
7789
7790
#: bzrlib/transform.py:3028
7791
msgid "Resolution pass"
7792
msgstr ""
7793
7794
#: bzrlib/transport/ftp/_gssapi.py:88
7795
#, python-format
7796
msgid "Authenticated as %s"
7797
msgstr ""
7798
7799
#: bzrlib/tree.py:634
7800
msgid "*** {0} content-filter: {1} => {2!r}"
7801
msgstr ""
7802
7803
#: bzrlib/upgrade.py:77
7804
#, python-format
7805
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7806
msgstr ""
7807
7808
#: bzrlib/upgrade.py:100
7809
#, python-format
7810
msgid "cannot upgrade from bzrdir format %s"
7811
msgstr ""
7812
7813
#: bzrlib/upgrade.py:103
7814
#, python-format
7815
msgid "starting upgrade of %s"
7816
msgstr ""
7817
7818
#: bzrlib/upgrade.py:110
7819
msgid "finished"
7820
msgstr ""
7821
7822
#: bzrlib/upgrade.py:120
7823
msgid "Deleting backup.bzr"
7824
msgstr ""
7825
7826
#: bzrlib/upgrade.py:151
7827
msgid ""
7828
"\n"
7829
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7830
msgstr ""
7831
7832
#: bzrlib/upgrade.py:208
7833
#, python-format
7834
msgid "Found %d dependent branches - upgrading ..."
7835
msgstr ""
7836
7837
#: bzrlib/upgrade.py:276
7838
msgid "Upgrading bzrdirs"
7839
msgstr ""
7840
7841
#: bzrlib/upgrade.py:282
7842
#, python-format
7843
msgid "Upgrading %s"
7844
msgstr ""
7845
7846
#: bzrlib/upgrade.py:283
7847
msgid "Upgrading {0} {1} ..."
7848
msgstr ""
7849
7850
#: bzrlib/upgrade.py:301
7851
msgid "Removing backup ..."
7852
msgstr ""
7853
7854
#: bzrlib/upgrade.py:305
7855
msgid "failed to clean-up {0}: {1}"
7856
msgstr ""
7857
7858
#: bzrlib/vf_repository.py:1090
7859
msgid "inventories"
7860
msgstr ""
7861
7862
#: bzrlib/vf_repository.py:1116
7863
msgid "texts"
7864
msgstr ""
7865
7866
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7867
msgid "Calculating text parents"
7868
msgstr ""
7869
7870
#: bzrlib/vf_repository.py:1706
7871
msgid "Fetch texts"
7872
msgstr ""
7873
7874
#: bzrlib/vf_repository.py:2535
7875
msgid "loading text store"
7876
msgstr ""
7877
7878
#: bzrlib/vf_repository.py:2541
7879
msgid "checking text graph"
7880
msgstr ""
7881
7882
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7883
#: bzrlib/vf_repository.py:3124
7884
msgid "Transferring revisions"
7885
msgstr ""
7886
7887
#: bzrlib/win32utils.py:146
7888
msgid "Failed to GetProcessMemoryInfo()"
7889
msgstr ""
7890
7891
#: bzrlib/win32utils.py:167
7892
msgid "Cannot debug memory on win32 without ctypes or win32process"
7893
msgstr ""
7894
7895
#: bzrlib/win32utils.py:172
7896
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7897
msgstr ""
7898
7899
#: bzrlib/win32utils.py:180
7900
#, python-format
7901
msgid "WorkingSize %8d KiB"
7902
msgstr ""
7903
7904
#: bzrlib/win32utils.py:181
7905
#, python-format
7906
msgid "PeakWorking %8d KiB"
7907
msgstr ""
7908
7909
#: bzrlib/win32utils.py:182
7910
#, python-format
7911
msgid "PagefileUsage %8d KiB"
7912
msgstr ""
7913
7914
#: bzrlib/win32utils.py:183
7915
#, python-format
7916
msgid "PeakPagefileUsage %8d KiB"
7917
msgstr ""
7918
7919
#: bzrlib/win32utils.py:185
7920
#, python-format
7921
msgid "PrivateUsage %8d KiB"
7922
msgstr ""
7923
7924
#: bzrlib/win32utils.py:186
7925
#, python-format
7926
msgid "PageFaultCount %8d"
7927
msgstr ""
7928
7929
#: bzrlib/workingtree.py:1478
7930
msgid "Rerun update after fixing the conflicts."
7931
msgstr ""
7932
7933
#: dummy/help_topics/authentication/summary.txt:1
7934
msgid "Information on configuring authentication"
7935
msgstr ""
7936
7937
#: dummy/help_topics/basic/detail.txt:1
7938
msgid ""
7939
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7940
"http://bazaar.canonical.com/"
7941
msgstr ""
7942
7943
#: dummy/help_topics/basic/detail.txt:4
7944
msgid ""
7945
"Basic commands:\n"
7946
" bzr init makes this directory a versioned branch\n"
7947
" bzr branch make a copy of another branch"
7948
msgstr ""
7949
7950
#: dummy/help_topics/basic/detail.txt:8
7951
msgid ""
7952
" bzr add make files or directories versioned\n"
7953
" bzr ignore ignore a file or pattern\n"
7954
" bzr mv move or rename a versioned file"
7955
msgstr ""
7956
7957
#: dummy/help_topics/basic/detail.txt:12
7958
msgid ""
7959
" bzr status summarize changes in working copy\n"
7960
" bzr diff show detailed diffs"
7961
msgstr ""
7962
7963
#: dummy/help_topics/basic/detail.txt:15
7964
msgid ""
7965
" bzr merge pull in changes from another branch\n"
7966
" bzr commit save some or all changes\n"
7967
" bzr send send changes via email"
7968
msgstr ""
7969
7970
#: dummy/help_topics/basic/detail.txt:19
7971
msgid ""
7972
" bzr log show history of changes\n"
7973
" bzr check validate storage"
7974
msgstr ""
7975
7976
#: dummy/help_topics/basic/detail.txt:22
7977
msgid ""
7978
" bzr help init more help on e.g. init command\n"
7979
" bzr help commands list all commands\n"
7980
" bzr help topics list all help topics\n"
7981
msgstr ""
7982
7983
#: dummy/help_topics/basic/summary.txt:1
7984
msgid "Basic commands"
7985
msgstr ""
7986
7987
#: dummy/help_topics/branches/detail.txt:1
7988
msgid "Branches"
7989
msgstr ""
7990
7991
#: dummy/help_topics/branches/detail.txt:3
7992
msgid ""
7993
"A branch consists of the state of a project, including all of its\n"
7994
"history. All branches have a repository associated (which is where the\n"
7995
"branch history is stored), but multiple branches may share the same\n"
7996
"repository (a shared repository). Branches can be copied and merged."
7997
msgstr ""
7998
7999
#: dummy/help_topics/branches/detail.txt:8
8000
msgid ""
8001
"In addition, one branch may be bound to another one. Binding to another\n"
8002
"branch indicates that commits which happen in this branch must also \n"
8003
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8004
"commits when the two branches are out of date. In order for a commit \n"
8005
"to succeed, it may be necessary to update the current branch using \n"
8006
"``bzr update``."
8007
msgstr ""
8008
8009
#: dummy/help_topics/branches/detail.txt:15
8010
#: dummy/help_topics/checkouts/detail.txt:66
8011
#: dummy/help_topics/repositories/detail.txt:36
8012
msgid "Related commands::"
8013
msgstr ""
8014
8015
#: dummy/help_topics/branches/detail.txt:17
8016
msgid ""
8017
" init Change a directory into a versioned branch.\n"
8018
" branch Create a new branch that is a copy of an existing branch.\n"
8019
" merge Perform a three-way merge.\n"
8020
" bind Bind a branch to another one.\n"
8021
msgstr ""
8022
8023
#: dummy/help_topics/branches/summary.txt:1
8024
msgid "Information on what a branch is"
8025
msgstr ""
8026
8027
#: dummy/help_topics/bugs/summary.txt:1
8028
msgid "Bug tracker settings"
8029
msgstr ""
8030
8031
#: dummy/help_topics/checkouts/detail.txt:1
8032
msgid "Checkouts"
8033
msgstr ""
8034
8035
#: dummy/help_topics/checkouts/detail.txt:3
8036
msgid ""
8037
"Checkouts are source trees that are connected to a branch, so that when\n"
8038
"you commit in the source tree, the commit goes into that branch. They\n"
8039
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8040
"Bazaar's decentralized features until you want them. Using checkouts\n"
8041
"with shared repositories is very similar to working with SVN or CVS, but\n"
8042
"doesn't have the same restrictions. And using checkouts still allows\n"
8043
"others working on the project to use whatever workflow they like."
8044
msgstr ""
8045
8046
#: dummy/help_topics/checkouts/detail.txt:11
8047
msgid ""
8048
"A checkout is created with the bzr checkout command (see \"help "
8049
"checkout\").\n"
8050
"You pass it a reference to another branch, and it will create a local copy\n"
8051
"for you that still contains a reference to the branch you created the\n"
8052
"checkout from (the master branch). Then if you make any commits they will "
8053
"be\n"
8054
"made on the other branch first. This creates an instant mirror of your work, "
8055
"or\n"
8056
"facilitates lockstep development, where each developer is working together,\n"
8057
"continuously integrating the changes of others."
8058
msgstr ""
8059
8060
#: dummy/help_topics/checkouts/detail.txt:19
8061
msgid ""
8062
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8063
"you have the full history locally. As you have a first class branch you "
8064
"can\n"
8065
"also commit locally if you want, for instance due to the temporary loss af "
8066
"a\n"
8067
"network connection. Use the --local option to commit to do this. All the "
8068
"local\n"
8069
"commits will then be made on the master branch the next time you do a non-"
8070
"local\n"
8071
"commit."
8072
msgstr ""
8073
8074
#: dummy/help_topics/checkouts/detail.txt:26
8075
msgid ""
8076
"If you are using a checkout from a shared branch you will periodically want "
8077
"to\n"
8078
"pull in all the changes made by others. This is done using the \"update\"\n"
8079
"command. The changes need to be applied before any non-local commit, but\n"
8080
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8081
"command when needed."
8082
msgstr ""
8083
8084
#: dummy/help_topics/checkouts/detail.txt:32
8085
msgid ""
8086
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8087
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8088
"SVN checkout in that it is not a first class branch, it mainly consists of "
8089
"the\n"
8090
"working tree. This means that any history operations must query the master\n"
8091
"branch, which could be slow if a network connection is involved. Also, as "
8092
"you\n"
8093
"don't have a local branch, then you cannot commit locally."
8094
msgstr ""
8095
8096
#: dummy/help_topics/checkouts/detail.txt:39
8097
msgid ""
8098
"Lightweight checkouts work best when you have fast reliable access to the\n"
8099
"master branch. This means that if the master branch is on the same disk or "
8100
"LAN\n"
8101
"a lightweight checkout will be faster than a heavyweight one for any "
8102
"commands\n"
8103
"that modify the revision history (as only one copy of the branch needs to\n"
8104
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8105
"that uses the history but does not change it, but if the master branch is "
8106
"on\n"
8107
"the same disk then there won't be a noticeable difference."
8108
msgstr ""
8109
8110
#: dummy/help_topics/checkouts/detail.txt:47
8111
msgid ""
8112
"Another possible use for a checkout is to use it with a treeless repository\n"
8113
"containing your branches, where you maintain only one working tree by\n"
8114
"switching the master branch that the checkout points to when you want to\n"
8115
"work on a different branch."
8116
msgstr ""
8117
8118
#: dummy/help_topics/checkouts/detail.txt:52
8119
msgid ""
8120
"Obviously to commit on a checkout you need to be able to write to the "
8121
"master\n"
8122
"branch. This means that the master branch must be accessible over a "
8123
"writeable\n"
8124
"protocol , such as sftp://, and that you have write permissions at the "
8125
"other\n"
8126
"end. Checkouts also work on the local file system, so that all that matters "
8127
"is\n"
8128
"file permissions."
8129
msgstr ""
8130
8131
#: dummy/help_topics/checkouts/detail.txt:58
8132
msgid ""
8133
"You can change the master of a checkout by using the \"switch\" command "
8134
"(see\n"
8135
"\"help switch\"). This will change the location that the commits are sent "
8136
"to.\n"
8137
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8138
"checkout. If you would like to convert your heavy checkout into a normal\n"
8139
"branch so that every commit is local, you can use the \"unbind\" command. To "
8140
"see\n"
8141
"whether or not a branch is bound or not you can use the \"info\" command. If "
8142
"the\n"
8143
"branch is bound it will tell you the location of the bound branch."
8144
msgstr ""
8145
8146
#: dummy/help_topics/checkouts/detail.txt:68
8147
msgid ""
8148
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8149
" checkout\n"
8150
" update Pull any changes in the master branch in to your checkout\n"
8151
" commit Make a commit that is sent to the master branch. If you have\n"
8152
" a heavy checkout then the --local option will commit to the\n"
8153
" checkout without sending the commit to the master\n"
8154
" switch Change the master branch that the commits in the checkout "
8155
"will\n"
8156
" be sent to\n"
8157
" bind Turn a standalone branch into a heavy checkout so that any\n"
8158
" commits will be sent to the master branch\n"
8159
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8160
" commits are only made locally\n"
8161
" info Displays whether a branch is bound or unbound. If the branch "
8162
"is\n"
8163
" bound, then it will also display the location of the bound "
8164
"branch\n"
8165
msgstr ""
8166
8167
#: dummy/help_topics/checkouts/summary.txt:1
8168
msgid "Information on what a checkout is"
8169
msgstr ""
8170
8171
#: dummy/help_topics/commands/summary.txt:1
8172
msgid "Basic help for all commands"
8173
msgstr ""
8174
8175
#: dummy/help_topics/configuration/summary.txt:1
8176
msgid "Details on the configuration settings available"
8177
msgstr ""
8178
8179
#: dummy/help_topics/conflict-types/summary.txt:1
8180
msgid "Types of conflicts and what to do about them"
8181
msgstr ""
8182
8183
#: dummy/help_topics/content-filters/summary.txt:1
8184
msgid "Conversion of content into/from working trees"
8185
msgstr ""
8186
8187
#: dummy/help_topics/criss-cross/detail.txt:1
8188
msgid "Criss-Cross"
8189
msgstr ""
8190
8191
#: dummy/help_topics/criss-cross/detail.txt:3
8192
msgid ""
8193
"A criss-cross in the branch history can cause the default merge technique\n"
8194
"to emit more conflicts than would normally be expected."
8195
msgstr ""
8196
8197
#: dummy/help_topics/criss-cross/detail.txt:6
8198
msgid ""
8199
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8200
"give\n"
8201
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8202
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8203
msgstr ""
8204
8205
#: dummy/help_topics/criss-cross/detail.txt:10
8206
msgid ""
8207
"Criss-crosses occur in a branch's history if two branches merge the same "
8208
"thing\n"
8209
"and then merge one another, or if two branches merge one another at the "
8210
"same\n"
8211
"time. They can be avoided by having each branch only merge from or into a\n"
8212
"designated central branch (a \"star topology\")."
8213
msgstr ""
8214
8215
#: dummy/help_topics/criss-cross/detail.txt:15
8216
msgid ""
8217
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8218
"default\n"
8219
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8220
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8221
"differences between THIS and OTHER are due to one side adding lines, or\n"
8222
"from another side removing lines."
8223
msgstr ""
8224
8225
#: dummy/help_topics/criss-cross/detail.txt:21
8226
msgid ""
8227
"Criss-crosses mean there is no good choice for a base. Selecting the "
8228
"recent\n"
8229
"merge points could cause one side's changes to be silently discarded.\n"
8230
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8231
"are emitted."
8232
msgstr ""
8233
8234
#: dummy/help_topics/criss-cross/detail.txt:26
8235
msgid ""
8236
"The ``weave`` merge type is not affected by this problem because it uses\n"
8237
"line-origin detection instead of a basis revision to determine the cause of\n"
8238
"differences.\n"
8239
msgstr ""
8240
8241
#: dummy/help_topics/criss-cross/summary.txt:1
8242
msgid "Information on criss-cross merging"
8243
msgstr ""
8244
8245
#: dummy/help_topics/current-formats/summary.txt:1
8246
msgid "Current storage formats"
8247
msgstr ""
8248
8249
#: dummy/help_topics/debug-flags/summary.txt:1
8250
msgid "Options to show or record debug information"
8251
msgstr ""
8252
8253
#: dummy/help_topics/diverged-branches/summary.txt:1
8254
msgid "How to fix diverged branches"
8255
msgstr ""
8256
8257
#: dummy/help_topics/env-variables/detail.txt:1
8258
msgid "Environment Variables"
8259
msgstr ""
8260
8261
#: dummy/help_topics/env-variables/detail.txt:3
8262
msgid ""
8263
"=================== "
8264
"===========================================================\n"
8265
"BZRPATH Path where bzr is to look for shell plugin external\n"
8266
" commands.\n"
8267
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8268
"EMAIL E-Mail address of the user.\n"
8269
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8270
"EDITOR Editor for editing commit messages.\n"
8271
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8272
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8273
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8274
"BZR_PLUGIN_PATH.\n"
8275
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8276
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8277
"and\n"
8278
" HOME.\n"
8279
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8280
"URLs).\n"
8281
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8282
"sshcorp,\n"
8283
" plink or lsh.\n"
8284
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8285
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8286
"BZR_COLUMNS Override implicit terminal width.\n"
8287
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8288
"(selftest)\n"
8289
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8290
"'text'.\n"
8291
"BZR_PDB Control whether to launch a debugger on error.\n"
8292
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8293
" breakin debugger.\n"
8294
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8295
"(instead\n"
8296
" of char-based).\n"
8297
"=================== "
8298
"===========================================================\n"
8299
msgstr ""
8300
8301
#: dummy/help_topics/env-variables/summary.txt:1
8302
msgid "Environment variable names and values"
8303
msgstr ""
8304
8305
#: dummy/help_topics/eol/summary.txt:1
8306
msgid "Information on end-of-line handling"
8307
msgstr ""
8308
8309
#: dummy/help_topics/files/detail.txt:1
8310
msgid "Files"
8311
msgstr ""
8312
8313
#: dummy/help_topics/files/detail.txt:3
8314
msgid ""
8315
":On Unix: ~/.bazaar/bazaar.conf\n"
8316
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8317
"bazaar\\\\2.0\\\\bazaar.conf"
8318
msgstr ""
8319
8320
#: dummy/help_topics/files/detail.txt:6
8321
msgid ""
8322
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8323
"used to define general configuration that will be applied everywhere.\n"
8324
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8325
"commonly used options."
8326
msgstr ""
8327
8328
#: dummy/help_topics/files/detail.txt:11
8329
msgid "A typical config file might look something like::"
8330
msgstr ""
8331
8332
#: dummy/help_topics/files/detail.txt:13
8333
msgid ""
8334
" [DEFAULT]\n"
8335
" email=John Doe <jdoe@isp.com>"
8336
msgstr ""
8337
8338
#: dummy/help_topics/files/detail.txt:16
8339
msgid ""
8340
" [ALIASES]\n"
8341
" commit = commit --strict\n"
8342
" log10 = log --short -r -10..-1\n"
8343
msgstr ""
8344
8345
#: dummy/help_topics/files/summary.txt:1
8346
msgid "Information on configuration and log files"
8347
msgstr ""
8348
8349
#: dummy/help_topics/formats/detail.txt:1
8350
msgid "Storage Formats"
8351
msgstr ""
8352
8353
#: dummy/help_topics/formats/detail.txt:3
8354
msgid ""
8355
"To ensure that older clients do not access data incorrectly,\n"
8356
"Bazaar's policy is to introduce a new storage format whenever\n"
8357
"new features requiring new metadata are added. New storage\n"
8358
"formats may also be introduced to improve performance and\n"
8359
"scalability."
8360
msgstr ""
8361
8362
#: dummy/help_topics/formats/detail.txt:9
8363
msgid ""
8364
"The newest format, 2a, is highly recommended. If your\n"
8365
"project is not using 2a, then you should suggest to the\n"
8366
"project owner to upgrade."
8367
msgstr ""
8368
8369
#: dummy/help_topics/formats/detail.txt:13
8370
msgid ""
8371
"\n"
8372
".. note::"
8373
msgstr ""
8374
8375
#: dummy/help_topics/formats/detail.txt:16
8376
msgid ""
8377
" Some of the older formats have two variants:\n"
8378
" a plain one and a rich-root one. The latter include an additional\n"
8379
" field about the root of the tree. There is no performance cost\n"
8380
" for using a rich-root format but you cannot easily merge changes\n"
8381
" from a rich-root format into a plain format. As a consequence,\n"
8382
" moving a project to a rich-root format takes some co-ordination\n"
8383
" in that all contributors need to upgrade their repositories\n"
8384
" around the same time. 2a and all future formats will be\n"
8385
" implicitly rich-root."
8386
msgstr ""
8387
8388
#: dummy/help_topics/formats/detail.txt:26
8389
msgid ""
8390
"See :doc:`current-formats-help` for the complete list of\n"
8391
"currently supported formats. See :doc:`other-formats-help` for\n"
8392
"descriptions of any available experimental and deprecated formats.\n"
8393
msgstr ""
8394
8395
#: dummy/help_topics/formats/summary.txt:1
8396
msgid "Information on choosing a storage format"
8397
msgstr ""
8398
8399
#: dummy/help_topics/global-options/detail.txt:1
8400
msgid "Global Options"
8401
msgstr ""
8402
8403
#: dummy/help_topics/global-options/detail.txt:3
8404
msgid ""
8405
"These options may be used with any command, and may appear in front of any\n"
8406
"command. (e.g. ``bzr --profile help``)."
8407
msgstr ""
8408
8409
#: dummy/help_topics/global-options/detail.txt:6
8410
msgid ""
8411
"--version Print the version number. Must be supplied before the "
8412
"command.\n"
8413
"--no-aliases Do not process command aliases when running this command.\n"
8414
"--builtin Use the built-in version of a command, not the plugin "
8415
"version.\n"
8416
" This does not suppress other plugin effects.\n"
8417
"--no-plugins Do not process any plugins.\n"
8418
"--no-l10n Do not translate messages.\n"
8419
"--concurrency Number of processes that can be run concurrently (selftest)."
8420
msgstr ""
8421
8422
#: dummy/help_topics/global-options/detail.txt:14
8423
msgid ""
8424
"--profile Profile execution using the hotshot profiler.\n"
8425
"--lsprof Profile execution using the lsprof profiler.\n"
8426
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8427
" results to a specified file. If the filename ends with "
8428
"\".txt\",\n"
8429
" text format will be used. If the filename either starts "
8430
"with\n"
8431
" \"callgrind.out\" or end with \".callgrind\", the output will "
8432
"be\n"
8433
" formatted for use with KCacheGrind. Otherwise, the output\n"
8434
" will be a pickle.\n"
8435
"--coverage Generate line coverage report in the specified directory."
8436
msgstr ""
8437
8438
#: dummy/help_topics/global-options/detail.txt:24
8439
msgid ""
8440
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8441
"for\n"
8442
" the duration of the command. This can be used multiple times "
8443
"if\n"
8444
" several options need to be overridden."
8445
msgstr ""
8446
8447
#: dummy/help_topics/global-options/detail.txt:28
8448
msgid ""
8449
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8450
"information on profiling."
8451
msgstr ""
8452
8453
#: dummy/help_topics/global-options/detail.txt:31
8454
msgid ""
8455
"A number of debug flags are also available to assist troubleshooting and\n"
8456
"development. See :doc:`debug-flags-help`.\n"
8457
msgstr ""
8458
8459
#: dummy/help_topics/global-options/summary.txt:1
8460
msgid "Options that control how Bazaar runs"
8461
msgstr ""
8462
8463
#: dummy/help_topics/hidden-commands/summary.txt:1
8464
msgid "All hidden commands"
8465
msgstr ""
8466
8467
#: dummy/help_topics/hooks/summary.txt:1
8468
msgid "Points at which custom processing can be added"
8469
msgstr ""
8470
8471
#: dummy/help_topics/launchpad/detail.txt:1
8472
msgid "Integration with Launchpad.net"
8473
msgstr ""
8474
8475
#: dummy/help_topics/launchpad/detail.txt:3
8476
msgid ""
8477
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8478
"specification tracking."
8479
msgstr ""
8480
8481
#: dummy/help_topics/launchpad/detail.txt:6
8482
msgid ""
8483
"The bzr client (through the plugin called 'launchpad') has special\n"
8484
"features to communicate with Launchpad:"
8485
msgstr ""
8486
8487
#: dummy/help_topics/launchpad/detail.txt:9
8488
msgid ""
8489
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8490
"This\n"
8491
" is then used by the 'lp:' transport to download your branches using\n"
8492
" bzr+ssh://."
8493
msgstr ""
8494
8495
#: dummy/help_topics/launchpad/detail.txt:13
8496
msgid ""
8497
" * The 'lp:' transport uses Launchpad as a directory service: for "
8498
"example\n"
8499
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8500
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8501
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8502
msgstr ""
8503
8504
#: dummy/help_topics/launchpad/detail.txt:18
8505
msgid ""
8506
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8507
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8508
"lp:12345'\n"
8509
" will record a revision property that marks that revision as fixing\n"
8510
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8511
" automatically be linked to the bug report."
8512
msgstr ""
8513
8514
#: dummy/help_topics/launchpad/detail.txt:24
8515
msgid ""
8516
" * The register-branch command tells Launchpad about the url of a\n"
8517
" public branch. Launchpad will then mirror the branch, display\n"
8518
" its contents and allow it to be attached to bugs and other\n"
8519
" objects."
8520
msgstr ""
8521
8522
#: dummy/help_topics/launchpad/detail.txt:29
8523
msgid "For more information see http://help.launchpad.net/\n"
8524
msgstr ""
8525
8526
#: dummy/help_topics/launchpad/summary.txt:1
8527
msgid "Using Bazaar with Launchpad.net"
8528
msgstr ""
8529
8530
#: dummy/help_topics/location-alias/summary.txt:1
8531
msgid "Aliases for remembered locations"
8532
msgstr ""
8533
8534
#: dummy/help_topics/log-formats/summary.txt:1
8535
msgid "Details on the logging formats available"
8536
msgstr ""
8537
8538
#: dummy/help_topics/other-formats/summary.txt:1
8539
msgid "Experimental and deprecated storage formats"
8540
msgstr ""
8541
8542
#: dummy/help_topics/patterns/summary.txt:1
8543
msgid "Information on the pattern syntax"
8544
msgstr ""
8545
8546
#: dummy/help_topics/repositories/detail.txt:1
8547
msgid "Repositories"
8548
msgstr ""
8549
8550
#: dummy/help_topics/repositories/detail.txt:3
8551
msgid ""
8552
"Repositories in Bazaar are where committed information is stored. There is\n"
8553
"a repository associated with every branch."
8554
msgstr ""
8555
8556
#: dummy/help_topics/repositories/detail.txt:6
8557
msgid ""
8558
"Repositories are a form of database. Bzr will usually maintain this for\n"
8559
"good performance automatically, but in some situations (e.g. when doing\n"
8560
"very many commits in a short time period) you may want to ask bzr to\n"
8561
"optimise the database indices. This can be done by the 'bzr pack' command."
8562
msgstr ""
8563
8564
#: dummy/help_topics/repositories/detail.txt:11
8565
msgid ""
8566
"By default just running 'bzr init' will create a repository within the new\n"
8567
"branch but it is possible to create a shared repository which allows "
8568
"multiple\n"
8569
"branches to share their information in the same location. When a new branch "
8570
"is\n"
8571
"created it will first look to see if there is a containing shared repository "
8572
"it\n"
8573
"can use."
8574
msgstr ""
8575
8576
#: dummy/help_topics/repositories/detail.txt:17
8577
msgid ""
8578
"When two branches of the same project share a repository, there is\n"
8579
"generally a large space saving. For some operations (e.g. branching\n"
8580
"within the repository) this translates in to a large time saving."
8581
msgstr ""
8582
8583
#: dummy/help_topics/repositories/detail.txt:21
8584
msgid ""
8585
"To create a shared repository use the init-repository command (or the alias\n"
8586
"init-repo). This command takes the location of the repository to create. "
8587
"This\n"
8588
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8589
"which contains a shared repository. Any new branches that are created in "
8590
"this\n"
8591
"directory will then use it for storage."
8592
msgstr ""
8593
8594
#: dummy/help_topics/repositories/detail.txt:27
8595
msgid ""
8596
"It is a good idea to create a repository whenever you might create more\n"
8597
"than one branch of a project. This is true for both working areas where you\n"
8598
"are doing the development, and any server areas that you use for hosting\n"
8599
"projects. In the latter case, it is common to want branches without working\n"
8600
"trees. Since the files in the branch will not be edited directly there is "
8601
"no\n"
8602
"need to use up disk space for a working tree. To create a repository in "
8603
"which\n"
8604
"the branches will not have working trees pass the '--no-trees' option to\n"
8605
"'init-repository'."
8606
msgstr ""
8607
8608
#: dummy/help_topics/repositories/detail.txt:38
8609
msgid ""
8610
" init-repository Create a shared repository. Use --no-trees to create "
8611
"one\n"
8612
" in which new branches won't get a working tree.\n"
8613
msgstr ""
8614
8615
#: dummy/help_topics/repositories/summary.txt:1
8616
msgid "Basic information on shared repositories."
8617
msgstr ""
8618
8619
#: dummy/help_topics/revisionspec/summary.txt:1
8620
msgid "Explain how to use --revision"
8621
msgstr ""
8622
8623
#: dummy/help_topics/rules/summary.txt:1
8624
msgid "Information on defining rule-based preferences"
8625
msgstr ""
8626
8627
#: dummy/help_topics/standalone-trees/detail.txt:1
8628
msgid "Standalone Trees"
8629
msgstr ""
8630
8631
#: dummy/help_topics/standalone-trees/detail.txt:3
8632
msgid ""
8633
"A standalone tree is a working tree with an associated repository. It\n"
8634
"is an independently usable branch, with no dependencies on any other.\n"
8635
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8636
"an existing project under version control."
8637
msgstr ""
8638
8639
#: dummy/help_topics/standalone-trees/detail.txt:8
8640
msgid "Related Commands::"
8641
msgstr ""
8642
8643
#: dummy/help_topics/standalone-trees/detail.txt:10
8644
msgid " init Make a directory into a versioned branch.\n"
8645
msgstr ""
8646
8647
#: dummy/help_topics/standalone-trees/summary.txt:1
8648
msgid "Information on what a standalone tree is"
8649
msgstr ""
8650
8651
#: dummy/help_topics/standard-options/detail.txt:1
8652
msgid "Standard Options"
8653
msgstr ""
8654
8655
#: dummy/help_topics/standard-options/detail.txt:3
8656
msgid "Standard options are legal for all commands."
8657
msgstr ""
8658
8659
#: dummy/help_topics/standard-options/detail.txt:5
8660
msgid ""
8661
"--help, -h Show help message.\n"
8662
"--verbose, -v Display more information.\n"
8663
"--quiet, -q Only display errors and warnings."
8664
msgstr ""
8665
8666
#: dummy/help_topics/standard-options/detail.txt:9
8667
msgid "Unlike global options, standard options can be used in aliases.\n"
8668
msgstr ""
8669
8670
#: dummy/help_topics/standard-options/summary.txt:1
8671
msgid "Options that can be used with any command"
8672
msgstr ""
8673
8674
#: dummy/help_topics/status-flags/detail.txt:1
8675
msgid "Status Flags"
8676
msgstr ""
8677
8678
#: dummy/help_topics/status-flags/detail.txt:3
8679
msgid ""
8680
"Status flags are used to summarise changes to the working tree in a concise\n"
8681
"manner. They are in the form::"
8682
msgstr ""
8683
8684
#: dummy/help_topics/status-flags/detail.txt:6
8685
msgid " xxx <filename>"
8686
msgstr ""
8687
8688
#: dummy/help_topics/status-flags/detail.txt:8
8689
msgid "where the columns' meanings are as follows."
8690
msgstr ""
8691
8692
#: dummy/help_topics/status-flags/detail.txt:10
8693
msgid "Column 1 - versioning/renames::"
8694
msgstr ""
8695
8696
#: dummy/help_topics/status-flags/detail.txt:12
8697
msgid ""
8698
" + File versioned\n"
8699
" - File unversioned\n"
8700
" R File renamed\n"
8701
" ? File unknown\n"
8702
" X File nonexistent (and unknown to bzr)\n"
8703
" C File has conflicts\n"
8704
" P Entry for a pending merge (not a file)"
8705
msgstr ""
8706
8707
#: dummy/help_topics/status-flags/detail.txt:20
8708
msgid "Column 2 - contents::"
8709
msgstr ""
8710
8711
#: dummy/help_topics/status-flags/detail.txt:22
8712
msgid ""
8713
" N File created\n"
8714
" D File deleted\n"
8715
" K File kind changed\n"
8716
" M File modified"
8717
msgstr ""
8718
8719
#: dummy/help_topics/status-flags/detail.txt:27
8720
msgid "Column 3 - execute::"
8721
msgstr ""
8722
8723
#: dummy/help_topics/status-flags/detail.txt:29
8724
msgid " * The execute bit was changed\n"
8725
msgstr ""
8726
8727
#: dummy/help_topics/status-flags/summary.txt:1
8728
msgid "Help on status flags"
8729
msgstr ""
8730
8731
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8732
msgid "Branches Out of Sync"
8733
msgstr ""
8734
8735
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8736
msgid ""
8737
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8738
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8739
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8740
"have the same last revision as the new reference branch for the lightweight\n"
8741
"checkout, data could be lost, so Bazaar refuses."
8742
msgstr ""
8743
8744
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8745
msgid "How you deal with this depends on *why* the branches are out of sync."
8746
msgstr ""
8747
8748
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8749
msgid ""
8750
"If you have a checkout and have done local commits, you can get back in "
8751
"sync\n"
8752
"by running \"bzr update\" (and possibly \"bzr commit\")."
8753
msgstr ""
8754
8755
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8756
msgid ""
8757
"If you have a branch and the remote branch is out-of-date, you can push\n"
8758
"the local changes using \"bzr push\". If the local branch is out of date, "
8759
"you\n"
8760
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8761
"commit\n"
8762
"and then push your changes. If you decide that some of the changes aren't\n"
8763
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8764
msgstr ""
8765
8766
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8767
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8768
msgstr ""
8769
8770
#: dummy/help_topics/topics/summary.txt:1
8771
msgid "Topics list"
8772
msgstr ""
8773
8774
#: dummy/help_topics/url-special-chars/summary.txt:1
8775
msgid "Special character handling in URLs"
8776
msgstr ""
8777
8778
#: dummy/help_topics/urlspec/summary.txt:1
8779
msgid "Supported transport protocols"
8780
msgstr ""
8781
8782
#: dummy/help_topics/working-trees/detail.txt:1
8783
msgid "Working Trees"
8784
msgstr ""
8785
8786
#: dummy/help_topics/working-trees/detail.txt:3
8787
msgid ""
8788
"A working tree is the contents of a branch placed on disk so that you can\n"
8789
"see the files and edit them. The working tree is where you make changes to "
8790
"a\n"
8791
"branch, and when you commit the current state of the working tree is the\n"
8792
"snapshot that is recorded in the commit."
8793
msgstr ""
8794
8795
#: dummy/help_topics/working-trees/detail.txt:8
8796
msgid ""
8797
"When you push a branch to a remote system, a working tree will not be\n"
8798
"created. If one is already present the files will not be updated. The\n"
8799
"branch information will be updated and the working tree will be marked\n"
8800
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8801
"may be uncommitted changes or the update may cause content conflicts that "
8802
"are\n"
8803
"difficult to deal with remotely."
8804
msgstr ""
8805
8806
#: dummy/help_topics/working-trees/detail.txt:15
8807
msgid ""
8808
"If you have a branch with no working tree you can use the 'checkout' "
8809
"command\n"
8810
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8811
"will\n"
8812
"create the working tree. If the branch is updated remotely, you can update "
8813
"the\n"
8814
"working tree by running 'bzr update' in that directory."
8815
msgstr ""
8816
8817
#: dummy/help_topics/working-trees/detail.txt:20
8818
msgid ""
8819
"If you have a branch with a working tree that you do not want the 'remove-"
8820
"tree'\n"
8821
"command will remove the tree if it is safe. This can be done to avoid the\n"
8822
"warning about the remote working tree not being updated when pushing to the\n"
8823
"branch. It can also be useful when working with a '--no-trees' repository\n"
8824
"(see 'bzr help repositories')."
8825
msgstr ""
8826
8827
#: dummy/help_topics/working-trees/detail.txt:26
8828
msgid ""
8829
"If you want to have a working tree on a remote machine that you push to you\n"
8830
"can either run 'bzr update' in the remote branch after each push, or use "
8831
"some\n"
8832
"other method to update the tree during the push. There is an 'rspush' "
8833
"plugin\n"
8834
"that will update the working tree using rsync as well as doing a push. "
8835
"There\n"
8836
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8837
"SSH\n"
8838
"after each push."
8839
msgstr ""
8840
8841
#: dummy/help_topics/working-trees/detail.txt:33
8842
msgid "Useful commands::"
8843
msgstr ""
8844
8845
#: dummy/help_topics/working-trees/detail.txt:35
8846
msgid ""
8847
" checkout Create a working tree when a branch does not have one.\n"
8848
" remove-tree Removes the working tree from a branch when it is safe to do "
8849
"so.\n"
8850
" update When a working tree is out of sync with its associated "
8851
"branch\n"
8852
" this will update the tree to match the branch.\n"
8853
msgstr ""
8854
8855
#: dummy/help_topics/working-trees/summary.txt:1
8856
msgid "Information on working trees"
8857
msgstr ""
8858
8859
#: en/help_topics/authentication.txt:1
8860
msgid ""
8861
"Authentication Settings\n"
8862
"======================="
8863
msgstr ""
8864
8865
#: en/help_topics/authentication.txt:4
8866
msgid ""
8867
"\n"
8868
"Intent\n"
8869
"------"
8870
msgstr ""
8871
8872
#: en/help_topics/authentication.txt:8
8873
msgid ""
8874
"Many different authentication policies can be described in the\n"
8875
"``authentication.conf`` file but a particular user should need only a few\n"
8876
"definitions to cover his needs without having to specify a user and a "
8877
"password\n"
8878
"for every branch he uses."
8879
msgstr ""
8880
8881
#: en/help_topics/authentication.txt:13
8882
msgid ""
8883
"The definitions found in this file are used to find the credentials to use "
8884
"for\n"
8885
"a given url. The same credentials can generally be used for as many branches "
8886
"as\n"
8887
"possible by grouping their declaration around the remote servers that need\n"
8888
"them. It's even possible to declare credentials that will be used by "
8889
"different\n"
8890
"servers."
8891
msgstr ""
8892
8893
#: en/help_topics/authentication.txt:19
8894
msgid ""
8895
"The intent is to make this file as small as possible to minimize maintenance."
8896
msgstr ""
8897
8898
#: en/help_topics/authentication.txt:21
8899
msgid ""
8900
"Once the relevant credentials are declared in this file you may use branch "
8901
"urls\n"
8902
"without embedding passwords (security hazard) or even users (enabling "
8903
"sharing\n"
8904
"of your urls with others)."
8905
msgstr ""
8906
8907
#: en/help_topics/authentication.txt:25
8908
msgid "Instead of using::"
8909
msgstr "Em vez de usar::"
8910
8911
#: en/help_topics/authentication.txt:27
8912
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8913
msgstr " bzr branch ftp://joe:secret@host.com/caminho/para/meu/ramo"
8914
8915
#: en/help_topics/authentication.txt:29
8916
msgid "you simply use::"
8917
msgstr "você simplesmente usa::"
8918
8919
#: en/help_topics/authentication.txt:31
8920
msgid " bzr branch ftp://host.com/path/to/my/branch"
8921
msgstr " bzr branch ftp://host.com/caminho/para/meu/ramo"
8922
8923
#: en/help_topics/authentication.txt:33
8924
msgid ""
8925
"provided you have created the following ``authentication.conf`` file::"
8926
msgstr ""
8927
8928
#: en/help_topics/authentication.txt:35
8929
msgid ""
8930
" [myprojects]\n"
8931
" scheme=ftp\n"
8932
" host=host.com\n"
8933
" user=joe\n"
8934
" password=secret\n"
8935
" "
8936
msgstr ""
8937
8938
#: en/help_topics/authentication.txt:42
8939
msgid ""
8940
"Authentication definitions\n"
8941
"--------------------------"
8942
msgstr ""
8943
8944
#: en/help_topics/authentication.txt:45
8945
msgid ""
8946
"There are two kinds of authentication used by the various schemes supported "
8947
"by\n"
8948
"bzr:"
8949
msgstr ""
8950
8951
#: en/help_topics/authentication.txt:48
8952
msgid "1. user and password"
8953
msgstr ""
8954
8955
#: en/help_topics/authentication.txt:50
8956
msgid ""
8957
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8958
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8959
"ssh agents are a better, more secure solution. So we have chosen to not "
8960
"provide\n"
8961
"our own less secure method."
8962
msgstr ""
8963
8964
#: en/help_topics/authentication.txt:55
8965
msgid "2. user, realm and password"
8966
msgstr ""
8967
8968
#: en/help_topics/authentication.txt:57
8969
msgid ""
8970
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8971
"against a host. But, by using ``.htaccess`` files, for example, it is "
8972
"possible\n"
8973
"to define several (``user, realm, password``) for a given ``host``. So what "
8974
"is\n"
8975
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8976
"is\n"
8977
"not taken into account in the definitions, but will displayed if bzr "
8978
"prompts\n"
8979
"you for a password."
8980
msgstr ""
8981
8982
#: en/help_topics/authentication.txt:64
8983
msgid ""
8984
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8985
"specifying the appropriate port."
8986
msgstr ""
8987
8988
#: en/help_topics/authentication.txt:67
8989
msgid ""
8990
"To take all schemes into account, the password will be deduced from a set "
8991
"of\n"
8992
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8993
"``user``,\n"
8994
"``password``)."
8995
msgstr ""
8996
8997
#: en/help_topics/authentication.txt:71
8998
msgid ""
8999
" * ``scheme``: can be empty (meaning the rest of the definition can be "
9000
"used\n"
9001
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9002
"``ssh``\n"
9003
" should be used instead since this is the real scheme regarding\n"
9004
" authentication,"
9005
msgstr ""
9006
9007
#: en/help_topics/authentication.txt:76
9008
msgid " * ``host``: can be empty (to act as a default for any host),"
9009
msgstr ""
9010
9011
#: en/help_topics/authentication.txt:78
9012
msgid ""
9013
" * ``port`` can be empty (useful when an host provides several servers for "
9014
"the\n"
9015
" same scheme), only numerical values are allowed, this should be used "
9016
"only\n"
9017
" when the server uses a port different than the scheme standard port,"
9018
msgstr ""
9019
9020
#: en/help_topics/authentication.txt:82
9021
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
9022
msgstr ""
9023
9024
#: en/help_topics/authentication.txt:84
9025
msgid ""
9026
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
9027
" ``getpass.get_user()``),"
9028
msgstr ""
9029
9030
#: en/help_topics/authentication.txt:87
9031
msgid ""
9032
" * ``password``: can be empty if you prefer to always be prompted for your\n"
9033
" password."
9034
msgstr ""
9035
9036
#: en/help_topics/authentication.txt:90
9037
msgid ""
9038
"Multiple definitions can be provided and, for a given URL, bzr will select "
9039
"a\n"
9040
"(``user`` [, ``password``]) based on the following rules :"
9041
msgstr ""
9042
9043
#: en/help_topics/authentication.txt:93
9044
msgid " 1. the first match wins,"
9045
msgstr ""
9046
9047
#: en/help_topics/authentication.txt:95
9048
msgid " 2. empty fields match everything,"
9049
msgstr ""
9050
9051
#: en/help_topics/authentication.txt:97
9052
msgid ""
9053
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9054
msgstr ""
9055
9056
#: en/help_topics/authentication.txt:99
9057
msgid ""
9058
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9059
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
9060
"``projectbzr.sf.net``\n"
9061
" will not match ``bzr.sf.net``)."
9062
msgstr ""
9063
9064
#: en/help_topics/authentication.txt:103
9065
msgid ""
9066
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9067
msgstr ""
9068
9069
#: en/help_topics/authentication.txt:105
9070
msgid ""
9071
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9072
"above,\n"
9073
" empty paths will match any provided path)."
9074
msgstr ""
9075
9076
#: en/help_topics/authentication.txt:110
9077
msgid ""
9078
"File format\n"
9079
"-----------"
9080
msgstr ""
9081
9082
#: en/help_topics/authentication.txt:113
9083
msgid ""
9084
"The general rules for :doc:`configuration files <configuration-help>`\n"
9085
"apply except for the variable policies."
9086
msgstr ""
9087
9088
#: en/help_topics/authentication.txt:116
9089
msgid "Each section describes an authentication definition."
9090
msgstr ""
9091
9092
#: en/help_topics/authentication.txt:118
9093
msgid ""
9094
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9095
"reserved\n"
9096
"and should appear as the *last* section."
9097
msgstr ""
9098
9099
#: en/help_topics/authentication.txt:121
9100
msgid "Each section should define:"
9101
msgstr ""
9102
9103
#: en/help_topics/authentication.txt:123
9104
msgid "* ``user``: the login to be used,"
9105
msgstr ""
9106
9107
#: en/help_topics/authentication.txt:125
9108
msgid "Each section could define:"
9109
msgstr ""
9110
9111
#: en/help_topics/authentication.txt:127
9112
msgid "* ``host``: the remote server,"
9113
msgstr ""
9114
9115
#: en/help_topics/authentication.txt:129
9116
msgid "* ``port``: the port the server is listening,"
9117
msgstr ""
9118
9119
#: en/help_topics/authentication.txt:131
9120
msgid "* ``path``: the branch location,"
9121
msgstr ""
9122
9123
#: en/help_topics/authentication.txt:133
9124
msgid "* ``password``: the password."
9125
msgstr ""
9126
9127
#: en/help_topics/authentication.txt:135
9128
msgid ""
9129
"\n"
9130
"Examples\n"
9131
"--------"
9132
msgstr ""
9133
9134
#: en/help_topics/authentication.txt:139
9135
msgid ""
9136
"\n"
9137
"Personal projects hosted outside\n"
9138
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9139
msgstr ""
9140
9141
#: en/help_topics/authentication.txt:143
9142
msgid ""
9143
"All connections are done with the same ``user`` (the remote one for which "
9144
"the\n"
9145
"default bzr one is not appropriate) and the password is always prompted "
9146
"with\n"
9147
"some exceptions::"
9148
msgstr ""
9149
9150
#: en/help_topics/authentication.txt:147
9151
msgid ""
9152
" # Pet projects on hobby.net\n"
9153
" [hobby]\n"
9154
" host=r.hobby.net\n"
9155
" user=jim\n"
9156
" password=obvious1234\n"
9157
" \n"
9158
" # Home server\n"
9159
" [home]\n"
9160
" scheme=https\n"
9161
" host=home.net\n"
9162
" user=joe\n"
9163
" password=1essobV10us\n"
9164
" \n"
9165
" [DEFAULT]\n"
9166
" # Our local user is barbaz, on all remote sites we're known as "
9167
"foobar\n"
9168
" user=foobar"
9169
msgstr ""
9170
9171
#: en/help_topics/authentication.txt:164
9172
msgid ""
9173
"\n"
9174
"Source hosting provider\n"
9175
"~~~~~~~~~~~~~~~~~~~~~~~"
9176
msgstr ""
9177
9178
#: en/help_topics/authentication.txt:168
9179
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9180
msgstr ""
9181
9182
#: en/help_topics/authentication.txt:170
9183
msgid ""
9184
" [shpnet domain]\n"
9185
" # we use sftp, but ssh is the scheme used for authentication\n"
9186
" scheme=ssh\n"
9187
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9188
" host=.shp.net\n"
9189
" user=joe\n"
9190
" # bzr don't support supplying a password for sftp,\n"
9191
" # consider using an ssh agent if you don't want to supply\n"
9192
" # a password interactively. (pageant, ssh-agent, etc)"
9193
msgstr ""
9194
9195
#: en/help_topics/authentication.txt:180
9196
msgid ""
9197
"HTTPS, SFTP servers and their proxy\n"
9198
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9199
msgstr ""
9200
9201
#: en/help_topics/authentication.txt:183
9202
msgid ""
9203
"At company.com, the server hosting release and integration branches is "
9204
"behind a\n"
9205
"proxy, and the two branches use different authentication policies::"
9206
msgstr ""
9207
9208
#: en/help_topics/authentication.txt:186
9209
msgid ""
9210
" [reference code]\n"
9211
" scheme=https\n"
9212
" host=dev.company.com\n"
9213
" path=/dev\n"
9214
" user=user1\n"
9215
" password=pass1"
9216
msgstr ""
9217
9218
#: en/help_topics/authentication.txt:193
9219
msgid ""
9220
" # development branches on dev server\n"
9221
" [dev]\n"
9222
" scheme=ssh # bzr+ssh and sftp are available here\n"
9223
" host=dev.company.com\n"
9224
" path=/dev/integration\n"
9225
" user=user2\n"
9226
" \n"
9227
" # proxy\n"
9228
" [proxy]\n"
9229
" scheme=http\n"
9230
" host=proxy.company.com\n"
9231
" port=3128\n"
9232
" user=proxyuser1\n"
9233
" password=proxypass1"
9234
msgstr ""
9235
9236
#: en/help_topics/authentication.txt:208
9237
msgid ""
9238
"\n"
9239
"Planned enhancements\n"
9240
"--------------------"
9241
msgstr ""
9242
9243
#: en/help_topics/authentication.txt:212
9244
msgid ""
9245
"The following are not yet implemented but planned as parts of a work in\n"
9246
"progress:"
9247
msgstr ""
9248
9249
#: en/help_topics/authentication.txt:215
9250
msgid "* add a ``password_encoding`` field allowing:"
9251
msgstr ""
9252
9253
#: en/help_topics/authentication.txt:217
9254
msgid ""
9255
" - storing the passwords in various obfuscating encodings (base64 for one),"
9256
msgstr ""
9257
9258
#: en/help_topics/authentication.txt:219
9259
msgid " - delegate password storage to plugins (.netrc for example)."
9260
msgstr ""
9261
9262
#: en/help_topics/authentication.txt:221
9263
msgid ""
9264
"* update the credentials when the user is prompted for user or password,"
9265
msgstr ""
9266
9267
#: en/help_topics/authentication.txt:223
9268
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9269
msgstr ""
9270
9271
#: en/help_topics/authentication.txt:225
9272
msgid ""
9273
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9274
"but\n"
9275
"ignored in the actual implementation.\n"
9276
msgstr ""
9277
9278
#: en/help_topics/bugs.txt:1
9279
msgid "Bug Tracker Settings"
9280
msgstr ""
9281
9282
#: en/help_topics/bugs.txt:3
9283
msgid ""
9284
"When making a commit, metadata about bugs fixed by that change can be\n"
9285
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9286
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9287
"(The only ``status`` value currently supported is ``fixed.``)"
9288
msgstr ""
9289
9290
#: en/help_topics/bugs.txt:8
9291
msgid ""
9292
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9293
"identifier\n"
9294
"rather than a full URL. This looks like::"
9295
msgstr ""
9296
"A opção ``--fixes`` permite a você especificar um rastreador de bug e um "
9297
"identificador de bug\n"
9298
"em vez de uma URL completa. Isso parece::"
9299
9300
#: en/help_topics/bugs.txt:11
9301
msgid " bzr commit --fixes <tracker>:<id>"
9302
msgstr " bzr commit --fixes <tracker>:<id>"
9303
9304
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9305
msgid "or::"
9306
msgstr "ou::"
9307
9308
#: en/help_topics/bugs.txt:15
9309
msgid " bzr commit --fixes <id>"
9310
msgstr " bzr commit --fixes <id>"
9311
9312
#: en/help_topics/bugs.txt:17
9313
msgid ""
9314
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9315
"the\n"
9316
"identifier for that bug within the bugtracker, usually the bug number.\n"
9317
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9318
"or global configuration is used."
9319
msgstr ""
9320
9321
#: en/help_topics/bugs.txt:22
9322
msgid ""
9323
"Bazaar knows about a few bug trackers that have many users. If\n"
9324
"you use one of these bug trackers then there is no setup required to\n"
9325
"use this feature, you just need to know the tracker identifier to use.\n"
9326
"These are the bugtrackers that are built in:"
9327
msgstr ""
9328
9329
#: en/help_topics/bugs.txt:27
9330
msgid ""
9331
" ============================ ============ ============\n"
9332
" URL Abbreviation Example\n"
9333
" ============================ ============ ============\n"
9334
" https://bugs.launchpad.net/ lp lp:12345\n"
9335
" http://bugs.debian.org/ deb deb:12345\n"
9336
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9337
" ============================ ============ ============"
9338
msgstr ""
9339
9340
#: en/help_topics/bugs.txt:35
9341
msgid ""
9342
"For the bug trackers not listed above configuration is required.\n"
9343
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9344
"is built in, along with a template mechanism for other bugtrackers with\n"
9345
"simple URL schemes. If your bug tracker can't be described by one\n"
9346
"of the schemes described below then you can write a plugin to support\n"
9347
"it."
9348
msgstr ""
9349
9350
#: en/help_topics/bugs.txt:42
9351
msgid ""
9352
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9353
"variable which contains the base URL of the bug tracker. These options\n"
9354
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9355
"configuration section in ``locations.conf``. You can set up these values\n"
9356
"for each of the projects you work on."
9357
msgstr ""
9358
9359
#: en/help_topics/bugs.txt:48
9360
msgid ""
9361
"Note: As you provide a short name for each tracker, you can specify one or\n"
9362
"more bugs in one or more trackers at commit time if you wish."
9363
msgstr ""
9364
9365
#: en/help_topics/bugs.txt:51
9366
msgid ""
9367
"Launchpad\n"
9368
"---------"
9369
msgstr ""
9370
"Launchpad\n"
9371
"---------"
9372
9373
#: en/help_topics/bugs.txt:54
9374
msgid ""
9375
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9376
msgstr ""
9377
9378
#: en/help_topics/bugs.txt:56
9379
msgid ""
9380
"bugzilla_<tracker>_url\n"
9381
"----------------------"
9382
msgstr ""
9383
9384
#: en/help_topics/bugs.txt:59
9385
msgid ""
9386
"If present, the location of the Bugzilla bug tracker referred to by\n"
9387
"<tracker>. This option can then be used together with ``bzr commit\n"
9388
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9389
"example::"
9390
msgstr ""
9391
9392
#: en/help_topics/bugs.txt:64
9393
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9394
msgstr ""
9395
9396
#: en/help_topics/bugs.txt:66
9397
msgid ""
9398
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9399
"fixed."
9400
msgstr ""
9401
9402
#: en/help_topics/bugs.txt:69
9403
msgid ""
9404
"trac_<tracker>_url\n"
9405
"------------------"
9406
msgstr ""
9407
9408
#: en/help_topics/bugs.txt:72
9409
msgid ""
9410
"If present, the location of the Trac instance referred to by\n"
9411
"<tracker>. This option can then be used together with ``bzr commit\n"
9412
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9413
"example::"
9414
msgstr ""
9415
9416
#: en/help_topics/bugs.txt:77
9417
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9418
msgstr ""
9419
9420
#: en/help_topics/bugs.txt:79
9421
msgid ""
9422
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9423
"as\n"
9424
"fixed."
9425
msgstr ""
9426
9427
#: en/help_topics/bugs.txt:82
9428
msgid ""
9429
"bugtracker_<tracker>_url\n"
9430
"------------------------"
9431
msgstr ""
9432
9433
#: en/help_topics/bugs.txt:85
9434
msgid ""
9435
"If present, the location of a generic bug tracker instance referred to by\n"
9436
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9437
"which will be replaced by a specific bug ID. This option can then be used\n"
9438
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9439
"fixed by that commit. For example::"
9440
msgstr ""
9441
9442
#: en/help_topics/bugs.txt:91
9443
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9444
msgstr ""
9445
9446
#: en/help_topics/bugs.txt:93
9447
msgid ""
9448
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9449
"Roundup bug tracker as fixed, or::"
9450
msgstr ""
9451
9452
#: en/help_topics/bugs.txt:96
9453
msgid ""
9454
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9455
msgstr ""
9456
9457
#: en/help_topics/bugs.txt:98
9458
msgid ""
9459
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9460
"RT bug tracker as fixed, or::"
9461
msgstr ""
9462
9463
#: en/help_topics/bugs.txt:101
9464
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9465
msgstr ""
9466
9467
#: en/help_topics/bugs.txt:103
9468
msgid ""
9469
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9470
"1234\n"
9471
"in Hudson's JIRA bug tracker as fixed.\n"
9472
msgstr ""
9473
9474
#: en/help_topics/commands.txt:1
9475
msgid ""
9476
"add Add specified files or directories.\n"
9477
"alias Set/unset and display aliases.\n"
9478
"annotate Show the origin of each line in a file.\n"
9479
"bash-completion Generate a shell function for bash command line "
9480
"completion.\n"
9481
" [bash_completion]\n"
9482
"bind Convert the current branch into a checkout of the "
9483
"supplied\n"
9484
" branch.\n"
9485
"branch Create a new branch that is a copy of an existing branch.\n"
9486
"branches List the branches available at the current location.\n"
9487
"break-lock Break a dead lock.\n"
9488
"cat Write the contents of a file as of a given revision to\n"
9489
" standard output.\n"
9490
"check Validate working tree structure, branch consistency and\n"
9491
" repository history.\n"
9492
"checkout Create a new checkout of an existing branch.\n"
9493
"clean-tree Remove unwanted files from working tree.\n"
9494
"commit Commit changes into a new revision.\n"
9495
"config Display, set or remove a configuration option.\n"
9496
"conflicts List files with conflicts.\n"
9497
"deleted List files deleted in the working tree.\n"
9498
"diff Show differences in the working tree, between revisions "
9499
"or\n"
9500
" branches.\n"
9501
"dpush Push into a different VCS without any custom bzr "
9502
"metadata.\n"
9503
"export Export current or past revision to a destination directory "
9504
"or\n"
9505
" archive.\n"
9506
"help Show help on a command or other topic.\n"
9507
"ignore Ignore specified files or patterns.\n"
9508
"ignored List ignored files and the patterns that matched them.\n"
9509
"info Show information about a working tree, branch or "
9510
"repository.\n"
9511
"init Make a directory into a versioned branch.\n"
9512
"init-repository Create a shared repository for branches to share storage\n"
9513
" space.\n"
9514
"join Combine a tree into its containing tree.\n"
9515
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9516
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9517
"launchpad-open Open a Launchpad branch page in your web browser. "
9518
"[launchpad]\n"
9519
"log Show historical log for a branch or subset of a branch.\n"
9520
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9521
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9522
"ls List files in a tree.\n"
9523
"merge Perform a three-way merge.\n"
9524
"missing Show unmerged/unpulled revisions between two branches.\n"
9525
"mkdir Create a new versioned directory.\n"
9526
"mv Move or rename a file.\n"
9527
"nick Print or set the branch nickname.\n"
9528
"pack Compress the data within a repository.\n"
9529
"plugins List the installed plugins.\n"
9530
"pull Turn this branch into a mirror of another branch.\n"
9531
"push Update a mirror of this branch.\n"
9532
"reconcile Reconcile bzr metadata in a branch.\n"
9533
"reconfigure Reconfigure the type of a bzr directory.\n"
9534
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9535
"remerge Redo a merge.\n"
9536
"remove Remove files or directories.\n"
9537
"remove-branch Remove a branch.\n"
9538
"remove-tree Remove the working tree from a given branch/checkout.\n"
9539
"renames Show list of renamed files.\n"
9540
"resolve Mark a conflict as resolved.\n"
9541
"revert Revert files to a previous revision.\n"
9542
"revno Show current revision number.\n"
9543
"root Show the tree root directory.\n"
9544
"send Mail or create a merge-directive for submitting changes.\n"
9545
"serve Run the bzr server.\n"
9546
"shelve Temporarily set aside some changes from the current tree.\n"
9547
"sign-my-commits Sign all commits by a given committer.\n"
9548
"split Split a subdirectory of a tree into a separate tree.\n"
9549
"status Display status summary.\n"
9550
"switch Set the branch of a checkout and update.\n"
9551
"tag Create, remove or modify a tag naming a revision.\n"
9552
"tags List tags.\n"
9553
"testament Show testament (signing-form) of a revision.\n"
9554
"unbind Convert the current checkout into a regular branch.\n"
9555
"uncommit Remove the last committed revision.\n"
9556
"unshelve Restore shelved changes.\n"
9557
"update Update a working tree to a new revision.\n"
9558
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9559
" format.\n"
9560
"verify-signatures Verify all commit signatures.\n"
9561
"version Show version of bzr.\n"
9562
"version-info Show version information about this tree.\n"
9563
"view Manage filtered views.\n"
9564
"whoami Show or set bzr user id.\n"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:1
9568
msgid ""
9569
"Configuration Settings\n"
9570
"======================="
9571
msgstr ""
9572
"Definições de configuração\n"
9573
"======================="
9574
9575
#: en/help_topics/configuration.txt:4
9576
msgid ""
9577
"Environment settings\n"
9578
"---------------------"
9579
msgstr ""
9580
"Configurações de ambiente\n"
9581
"---------------------"
9582
9583
#: en/help_topics/configuration.txt:7
9584
msgid ""
9585
"While most configuration is handled by configuration files, some options\n"
9586
"which may be semi-permanent can also be controlled through the environment."
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:10
9590
msgid ""
9591
"BZR_EMAIL\n"
9592
"~~~~~~~~~"
9593
msgstr ""
9594
9595
#: en/help_topics/configuration.txt:13
9596
msgid "Override the email id used by Bazaar. Typical format::"
9597
msgstr ""
9598
9599
#: en/help_topics/configuration.txt:15
9600
msgid " \"John Doe <jdoe@example.com>\""
9601
msgstr " \"John Doe <jdoe@exemplo.com>\""
9602
9603
#: en/help_topics/configuration.txt:17
9604
msgid "See also the ``email`` configuration option."
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:19
9608
msgid ""
9609
"BZR_PROGRESS_BAR\n"
9610
"~~~~~~~~~~~~~~~~"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:22
9614
msgid ""
9615
"Override the progress display. Possible values are \"none\" or \"text\". "
9616
"If\n"
9617
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9618
"draws\n"
9619
"the ordinary command line progress bar."
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:26
9623
msgid ""
9624
"BZR_SIGQUIT_PDB\n"
9625
"~~~~~~~~~~~~~~~"
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:29
9629
msgid ""
9630
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9631
msgstr ""
9632
9633
#: en/help_topics/configuration.txt:31
9634
msgid ""
9635
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9636
"* 1 = Invoke breakin debugger (default)"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:34
9640
msgid ""
9641
"BZR_HOME\n"
9642
"~~~~~~~~"
9643
msgstr ""
9644
"BZR_HOME\n"
9645
"~~~~~~~~"
9646
9647
#: en/help_topics/configuration.txt:37
9648
msgid "Override the home directory used by Bazaar."
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:39
9652
msgid ""
9653
"BZR_SSH\n"
9654
"~~~~~~~"
9655
msgstr ""
9656
"BZR_SSH\n"
9657
"~~~~~~~"
9658
9659
#: en/help_topics/configuration.txt:42
9660
msgid "Select a different SSH implementation."
9661
msgstr ""
9662
9663
#: en/help_topics/configuration.txt:44
9664
msgid ""
9665
"BZR_PDB\n"
9666
"~~~~~~~"
9667
msgstr ""
9668
"BZR_PDB\n"
9669
"~~~~~~~"
9670
9671
#: en/help_topics/configuration.txt:47
9672
msgid "Control whether to launch a debugger on error."
9673
msgstr ""
9674
9675
#: en/help_topics/configuration.txt:49
9676
msgid ""
9677
"* 0 = Standard behavior\n"
9678
"* 1 = Launch debugger"
9679
msgstr ""
9680
9681
#: en/help_topics/configuration.txt:52
9682
msgid ""
9683
"BZR_REMOTE_PATH\n"
9684
"~~~~~~~~~~~~~~~"
9685
msgstr ""
9686
"BZR_REMOTE_PATH\n"
9687
"~~~~~~~~~~~~~~~"
9688
9689
#: en/help_topics/configuration.txt:55
9690
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9691
msgstr ""
9692
9693
#: en/help_topics/configuration.txt:57
9694
msgid "See also the ``bzr_remote_path`` configuration option."
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:59
9698
msgid ""
9699
"BZR_EDITOR\n"
9700
"~~~~~~~~~~"
9701
msgstr ""
9702
"BZR_EDITOR\n"
9703
"~~~~~~~~~~"
9704
9705
#: en/help_topics/configuration.txt:62
9706
msgid "Path to the editor Bazaar should use for commit messages, etc."
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:64
9710
msgid ""
9711
"BZR_LOG\n"
9712
"~~~~~~~"
9713
msgstr ""
9714
"BZR_LOG\n"
9715
"~~~~~~~"
9716
9717
#: en/help_topics/configuration.txt:67
9718
msgid ""
9719
"Location of the Bazaar log file. You can check the current location by\n"
9720
"running ``bzr version``."
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:70
9724
msgid ""
9725
"The log file contains debug information that is useful for diagnosing or\n"
9726
"reporting problems with Bazaar."
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:73
9730
msgid ""
9731
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9732
"will disable logging."
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:76
9736
msgid ""
9737
"\n"
9738
"BZR_PLUGIN_PATH\n"
9739
"~~~~~~~~~~~~~~~"
9740
msgstr ""
9741
"\n"
9742
"BZR_PLUGIN_PATH\n"
9743
"~~~~~~~~~~~~~~~"
9744
9745
#: en/help_topics/configuration.txt:80
9746
msgid ""
9747
"The path to the plugins directory that Bazaar should use.\n"
9748
"If not set, Bazaar will search for plugins in:"
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:83
9752
msgid ""
9753
"* the user specific plugin directory (containing the ``user`` plugins),"
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:85
9757
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:87
9761
msgid ""
9762
"* the site specific plugin directory if applicable (containing\n"
9763
" the ``site`` plugins)."
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:90
9767
msgid ""
9768
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9769
"the way the plugin are searched. "
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:93
9773
msgid ""
9774
"As for the ``PATH`` variables, if multiple directories are\n"
9775
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9776
"platform specific appropriate character (':' on Unix,\n"
9777
"';' on windows)"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:98
9781
msgid ""
9782
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9783
"in ``user``. However it will continue to search in ``core`` and\n"
9784
"``site`` unless they are explicitly removed."
9785
msgstr ""
9786
9787
#: en/help_topics/configuration.txt:102
9788
msgid ""
9789
"If you need to change the order or remove one of these\n"
9790
"directories, you should use special values:"
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:105
9794
msgid ""
9795
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9796
" path from the default values,"
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:108
9800
msgid ""
9801
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9802
" before the remaining default values (and also remove it from\n"
9803
" the default values)."
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:112
9807
msgid ""
9808
"Note that the special values 'user', 'core' and 'site' should be\n"
9809
"used literally, they will be substituted by the corresponding,\n"
9810
"platform specific, values."
9811
msgstr ""
9812
9813
#: en/help_topics/configuration.txt:116
9814
msgid ""
9815
"The examples below use ':' as the separator, windows users\n"
9816
"should use ';'."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:119
9820
msgid "Overriding the default user plugin directory::"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:121
9824
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9825
msgstr " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9826
9827
#: en/help_topics/configuration.txt:123
9828
msgid "Disabling the site directory while retaining the user directory::"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:125
9832
msgid " BZR_PLUGIN_PATH='-site:+user'"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:127
9836
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:129
9840
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9841
msgstr ""
9842
9843
#: en/help_topics/configuration.txt:131
9844
msgid "Overriding the default site plugin directory::"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:133
9848
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:135
9852
msgid ""
9853
"BZR_DISABLE_PLUGINS\n"
9854
"~~~~~~~~~~~~~~~~~~~"
9855
msgstr ""
9856
"BZR_DISABLE_PLUGINS\n"
9857
"~~~~~~~~~~~~~~~~~~~"
9858
9859
#: en/help_topics/configuration.txt:138
9860
msgid ""
9861
"Under special circumstances (mostly when trying to diagnose a\n"
9862
"bug), it's better to disable a plugin (or several) rather than\n"
9863
"uninstalling them completely. Such plugins can be specified in\n"
9864
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:143
9868
msgid ""
9869
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9870
"will raise an import error if they are explicitly imported (by\n"
9871
"another plugin that depends on them for example)."
9872
msgstr ""
9873
9874
#: en/help_topics/configuration.txt:147
9875
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:149
9879
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:151
9883
msgid ""
9884
"BZR_PLUGINS_AT\n"
9885
"~~~~~~~~~~~~~~"
9886
msgstr ""
9887
"BZR_PLUGINS_AT\n"
9888
"~~~~~~~~~~~~~~"
9889
9890
#: en/help_topics/configuration.txt:154
9891
msgid ""
9892
"When adding a new feature or working on a bug in a plugin,\n"
9893
"developers often need to use a specific version of a given\n"
9894
"plugin. Since python requires that the directory containing the\n"
9895
"code is named like the plugin itself this make it impossible to\n"
9896
"use arbitrary directory names (using a two-level directory scheme\n"
9897
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9898
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:162
9902
msgid ""
9903
"Plugins specified in this environment variable takes precedence\n"
9904
"over the ones in ``BZR_PLUGIN_PATH``."
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:165
9908
msgid ""
9909
"The variable specified a list of ``plugin_name@plugin path``,\n"
9910
"``plugin_name`` being the name of the plugin as it appears in\n"
9911
"python module paths, ``plugin_path`` being the path to the\n"
9912
"directory containing the plugin code itself\n"
9913
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9914
"separator, use ';' on windows."
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:172
9918
msgid ""
9919
"Example:\n"
9920
"~~~~~~~~"
9921
msgstr ""
9922
"Exemplo:\n"
9923
"~~~~~~~~"
9924
9925
#: en/help_topics/configuration.txt:175
9926
msgid ""
9927
"Using a specific version of ``myplugin``:\n"
9928
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:178
9932
msgid ""
9933
"BZRPATH\n"
9934
"~~~~~~~"
9935
msgstr ""
9936
"BZRPATH\n"
9937
"~~~~~~~"
9938
9939
#: en/help_topics/configuration.txt:181
9940
msgid "The path where Bazaar should look for shell plugin external commands."
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:183
9944
msgid ""
9945
"\n"
9946
"http_proxy, https_proxy\n"
9947
"~~~~~~~~~~~~~~~~~~~~~~~"
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:187
9951
msgid "Specifies the network proxy for outgoing connections, for example::"
9952
msgstr ""
9953
9954
#: en/help_topics/configuration.txt:189
9955
msgid ""
9956
" http_proxy=http://proxy.example.com:3128/ \n"
9957
" https_proxy=http://proxy.example.com:3128/"
9958
msgstr ""
9959
" http_proxy=http://proxy.example.com:3128/ \n"
9960
" https_proxy=http://proxy.example.com:3128/"
9961
9962
#: en/help_topics/configuration.txt:192
9963
msgid ""
9964
"\n"
9965
"Configuration files\n"
9966
"-------------------"
9967
msgstr ""
9968
"\n"
9969
"Arquivos de configuração\n"
9970
"-------------------"
9971
9972
#: en/help_topics/configuration.txt:196
9973
msgid ""
9974
"Location\n"
9975
"~~~~~~~~"
9976
msgstr ""
9977
"Localização\n"
9978
"~~~~~~~~"
9979
9980
#: en/help_topics/configuration.txt:199
9981
msgid ""
9982
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9983
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9984
"on\n"
9985
"Windows. (You can check the location for your system by using\n"
9986
"``bzr version``.)"
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:204
9990
msgid "There are three primary configuration files in this location:"
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:206
9994
msgid "* ``bazaar.conf`` describes default configuration options,"
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:208
9998
msgid ""
9999
"* ``locations.conf`` describes configuration information for\n"
10000
" specific branch locations,"
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:211
10004
msgid ""
10005
"* ``authentication.conf`` describes credential information for\n"
10006
" remote servers."
10007
msgstr ""
10008
10009
#: en/help_topics/configuration.txt:214
10010
msgid ""
10011
"Each branch can also contain a configuration file that sets values specific\n"
10012
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10013
"the\n"
10014
"branch. This file is visible to all users of a branch, if you wish to "
10015
"override\n"
10016
"one of the values for a branch with a setting that is specific to you then "
10017
"you\n"
10018
"can do so in ``locations.conf``."
10019
msgstr ""
10020
10021
#: en/help_topics/configuration.txt:220
10022
msgid ""
10023
"General format\n"
10024
"~~~~~~~~~~~~~~"
10025
msgstr ""
10026
10027
#: en/help_topics/configuration.txt:223
10028
msgid ""
10029
"An ini file has three types of contructs: section headers, section\n"
10030
"options and comments."
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:226
10034
msgid ""
10035
"Comments\n"
10036
"^^^^^^^^"
10037
msgstr ""
10038
"Comentários\n"
10039
"^^^^^^^^"
10040
10041
#: en/help_topics/configuration.txt:229
10042
msgid ""
10043
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10044
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10045
"Bazaar when parsing ini files."
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:233
10049
msgid ""
10050
"Section headers\n"
10051
"^^^^^^^^^^^^^^^"
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:236
10055
msgid ""
10056
"A section header is a word enclosed in brackets that starts at the begining\n"
10057
"of a line. A typical section header looks like this::"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:239
10061
msgid " [DEFAULT]"
10062
msgstr " [DEFAULT]"
10063
10064
#: en/help_topics/configuration.txt:241
10065
msgid ""
10066
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10067
"[ALIASES]. Section headers are case sensitive. The default section provides "
10068
"for\n"
10069
"setting options which can be overridden with the branch config file."
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:245
10073
msgid ""
10074
"For ``locations.conf``, the options from the section with the\n"
10075
"longest matching section header are used to the exclusion of other\n"
10076
"potentially valid section headers. A section header uses the path for\n"
10077
"the branch as the section header. Some examples include::"
10078
msgstr ""
10079
10080
#: en/help_topics/configuration.txt:250
10081
msgid ""
10082
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10083
" [/home/jdoe/branches/]"
10084
msgstr ""
10085
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10086
" [/home/jdoe/branches/]"
10087
10088
#: en/help_topics/configuration.txt:253
10089
msgid ""
10090
"\n"
10091
"Section options\n"
10092
"^^^^^^^^^^^^^^^"
10093
msgstr ""
10094
10095
#: en/help_topics/configuration.txt:257
10096
msgid ""
10097
"A section option resides within a section. A section option contains an\n"
10098
"option name, an equals sign and a value. For example::"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:260
10102
msgid ""
10103
" email = John Doe <jdoe@isp.com>\n"
10104
" gpg_signing_key = Amy Pond <amy@example.com>"
10105
msgstr ""
10106
" email = John Doe <jdoe@isp.com>\n"
10107
" gpg_signing_key = Amy Pond <amy@example.com>"
10108
10109
#: en/help_topics/configuration.txt:263
10110
msgid ""
10111
"A option can reference other options by enclosing them in curly brackets::"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:265
10115
msgid ""
10116
" my_branch_name = feature_x\n"
10117
" my_server = bzr+ssh://example.com\n"
10118
" push_location = {my_server}/project/{my_branch_name}"
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:269
10122
msgid ""
10123
"Option policies\n"
10124
"^^^^^^^^^^^^^^^"
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:272
10128
msgid ""
10129
"Options defined in a section affect the named directory or URL plus\n"
10130
"any locations they contain. Policies can be used to change how an\n"
10131
"option value is interpreted for contained locations. Currently\n"
10132
"there are three policies available:"
10133
msgstr ""
10134
10135
#: en/help_topics/configuration.txt:277
10136
msgid ""
10137
" none:\n"
10138
" the value is interpreted the same for contained locations. This is\n"
10139
" the default behaviour.\n"
10140
" norecurse:\n"
10141
" the value is only used for the exact location specified by the\n"
10142
" section name.\n"
10143
" appendpath:\n"
10144
" for contained locations, any additional path components are\n"
10145
" appended to the value."
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:287
10149
msgid ""
10150
"Policies are specified by keys with names of the form "
10151
"\"<option_name>:policy\".\n"
10152
"For example, to define the push location for a tree of branches, the\n"
10153
"following could be used::"
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:291
10157
msgid ""
10158
" [/top/location]\n"
10159
" push_location = sftp://example.com/location\n"
10160
" push_location:policy = appendpath"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:295
10164
msgid ""
10165
"With this configuration, the push location for ``/top/location/branch1``\n"
10166
"would be ``sftp://example.com/location/branch1``."
10167
msgstr ""
10168
10169
#: en/help_topics/configuration.txt:298
10170
msgid ""
10171
"Section local options\n"
10172
"^^^^^^^^^^^^^^^^^^^^^"
10173
msgstr ""
10174
10175
#: en/help_topics/configuration.txt:301
10176
msgid ""
10177
"Some options are defined automatically inside a given section and can be\n"
10178
"refered to in this section only. "
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:304
10182
msgid "For example, the ``appendpath`` policy can be used like this::"
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:306
10186
msgid ""
10187
" [/home/vila/src/bzr/bugs]\n"
10188
" mypush = lp:~vila/bzr\n"
10189
" mypush:policy=appendpath"
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:310
10193
msgid "Using ``relpath`` to achieve the same result is done like this::"
10194
msgstr ""
10195
10196
#: en/help_topics/configuration.txt:312
10197
msgid ""
10198
" [/home/vila/src/bzr/bugs]\n"
10199
" mypush = lp:~vila/bzr/{relpath}"
10200
msgstr ""
10201
10202
#: en/help_topics/configuration.txt:315
10203
msgid ""
10204
"In both cases, when used in a directory like\n"
10205
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10209
msgid ""
10210
" $ bzr config mypush\n"
10211
" lp:~vila/bzr/832013-expand-in-stack"
10212
msgstr ""
10213
10214
#: en/help_topics/configuration.txt:321
10215
msgid "Another such option is ``basename`` which can be used like this::"
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:323
10219
msgid ""
10220
" [/home/vila/src/bzr]\n"
10221
" mypush = lp:~vila/bzr/{basename}"
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:326
10225
msgid ""
10226
"When used in a directory like\n"
10227
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10228
msgstr ""
10229
10230
#: en/help_topics/configuration.txt:332
10231
msgid ""
10232
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10233
"itself is defined as the relative path between the section name and the\n"
10234
"location it matches."
10235
msgstr ""
10236
10237
#: en/help_topics/configuration.txt:336
10238
msgid ""
10239
"When an option is local to a Section, it cannot be referred to from option\n"
10240
"values in any other section from the same ``Store`` nor from any other\n"
10241
"``Store``."
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:340
10245
msgid ""
10246
"\n"
10247
"The main configuration file, bazaar.conf\n"
10248
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10249
msgstr ""
10250
10251
#: en/help_topics/configuration.txt:344
10252
msgid ""
10253
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10254
"The default section contains the default\n"
10255
"configuration options for all branches. The default section can be\n"
10256
"overriden by providing a branch-specific section in ``locations.conf``."
10257
msgstr ""
10258
10259
#: en/help_topics/configuration.txt:349
10260
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:351
10264
msgid ""
10265
" [DEFAULT]\n"
10266
" email = John Doe <jdoe@isp.com>\n"
10267
" editor = /usr/bin/vim\n"
10268
" create_signatures = when-required"
10269
msgstr ""
10270
" [DEFAULT]\n"
10271
" email = John Doe <jdoe@isp.com>\n"
10272
" editor = /usr/bin/vim\n"
10273
" create_signatures = when-required"
10274
10275
#: en/help_topics/configuration.txt:356
10276
msgid ""
10277
"\n"
10278
"The branch location configuration file, locations.conf\n"
10279
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:360
10283
msgid ""
10284
"``locations.conf`` allows one to specify overriding settings for\n"
10285
"a specific branch. The format is almost identical to the default section in\n"
10286
"bazaar.conf with one significant change: The section header, instead of "
10287
"saying\n"
10288
"default, will be the path to a branch that you wish to override a value\n"
10289
"for. The '?' and '*' wildcards are supported::"
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:366
10293
msgid ""
10294
" [/home/jdoe/branches/nethack]\n"
10295
" email = Nethack Admin <nethack@nethack.com>"
10296
msgstr ""
10297
" [/home/jdoe/branches/nethack]\n"
10298
" email = Nethack Admin <nethack@nethack.com>"
10299
10300
#: en/help_topics/configuration.txt:369
10301
msgid ""
10302
" [http://hypothetical.site.com/branches/devel-branch]\n"
10303
" create_signatures = always"
10304
msgstr ""
10305
" [http://hypothetical.site.com/branches/devel-branch]\n"
10306
" create_signatures = always"
10307
10308
#: en/help_topics/configuration.txt:372
10309
msgid ""
10310
"The authentication configuration file, authentication.conf\n"
10311
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:375
10315
msgid ""
10316
"``authentication.conf`` allows one to specify credentials for\n"
10317
"remote servers. This can be used for all the supported transports and any "
10318
"part\n"
10319
"of bzr that requires authentication (smtp for example)."
10320
msgstr ""
10321
10322
#: en/help_topics/configuration.txt:379
10323
msgid ""
10324
"The syntax of the file obeys the same rules as the others except for the\n"
10325
"option policies which don't apply."
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:382
10329
msgid ""
10330
"For more information on the possible uses of the authentication "
10331
"configuration\n"
10332
"file see :doc:`authentication-help`."
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:385
10336
msgid ""
10337
"\n"
10338
"Common options\n"
10339
"--------------"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:389
10343
msgid ""
10344
"debug_flags\n"
10345
"~~~~~~~~~~~"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:392
10349
msgid ""
10350
"A comma-separated list of debugging options to turn on. The same values\n"
10351
"can be used as with the -D command-line option (see `help global-options`).\n"
10352
"For example::"
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:396
10356
msgid " debug_flags = hpss"
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:400
10360
msgid " debug_flags = hpss,evil"
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:402
10364
msgid ""
10365
"email\n"
10366
"~~~~~"
10367
msgstr ""
10368
"email\n"
10369
"~~~~~"
10370
10371
#: en/help_topics/configuration.txt:405
10372
msgid ""
10373
"The email address to use when committing a branch. Typically takes the form\n"
10374
"of::"
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:408
10378
msgid " email = Full Name <account@hostname.tld>"
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:410
10382
msgid ""
10383
"editor\n"
10384
"~~~~~~"
10385
msgstr ""
10386
"editor\n"
10387
"~~~~~~"
10388
10389
#: en/help_topics/configuration.txt:413
10390
msgid ""
10391
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10392
"a commit message. This setting is trumped by the environment variable\n"
10393
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10394
"variables."
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:418
10398
msgid ""
10399
"log_format\n"
10400
"~~~~~~~~~~"
10401
msgstr ""
10402
10403
#: en/help_topics/configuration.txt:421
10404
msgid ""
10405
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10406
"and ``line``. Additional formats may be provided by plugins. The default\n"
10407
"value is ``long``."
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:425
10411
msgid ""
10412
"check_signatures\n"
10413
"~~~~~~~~~~~~~~~~"
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:428
10417
msgid ""
10418
"Reserved for future use. These options will allow a policy for branches to\n"
10419
"require signatures."
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:431
10423
msgid ""
10424
"require\n"
10425
" The gnupg signature for revisions must be present and must be valid."
10426
msgstr ""
10427
10428
#: en/help_topics/configuration.txt:434
10429
msgid ""
10430
"ignore\n"
10431
" Do not check gnupg signatures of revisions."
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:437
10435
msgid ""
10436
"check-available\n"
10437
" (default) If gnupg signatures for revisions are present, check them.\n"
10438
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10439
" no signature is present."
10440
msgstr ""
10441
10442
#: en/help_topics/configuration.txt:442
10443
msgid ""
10444
"create_signatures\n"
10445
"~~~~~~~~~~~~~~~~~"
10446
msgstr ""
10447
10448
#: en/help_topics/configuration.txt:445
10449
msgid ""
10450
"Defines the behaviour of signing revisions on commits. By default bzr will "
10451
"not\n"
10452
"sign new commits."
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:448
10456
msgid ""
10457
"always\n"
10458
" Sign every new revision that is committed. If the signing fails then "
10459
"the\n"
10460
" commit will not be made."
10461
msgstr ""
10462
10463
#: en/help_topics/configuration.txt:452
10464
msgid ""
10465
"when-required\n"
10466
" Reserved for future use."
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:455
10470
msgid ""
10471
"never\n"
10472
" Reserved for future use."
10473
msgstr ""
10474
10475
#: en/help_topics/configuration.txt:458
10476
msgid ""
10477
"In future it is planned that ``when-required`` will sign newly\n"
10478
"committed revisions only when the branch requires them. ``never`` will "
10479
"refuse\n"
10480
"to sign newly committed revisions, even if the branch requires signatures."
10481
msgstr ""
10482
10483
#: en/help_topics/configuration.txt:462
10484
msgid ""
10485
"dirstate.fdatasync\n"
10486
"~~~~~~~~~~~~~~~~~~"
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:465
10490
msgid ""
10491
"If true (default), working tree metadata changes are flushed through the\n"
10492
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10493
"should not be lost if the machine crashes. See also repository.fdatasync."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:469
10497
msgid ""
10498
"gpg_signing_key\n"
10499
"~~~~~~~~~~~~~~~"
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:472
10503
msgid ""
10504
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10505
"address, key fingerprint or full key ID. When unset or when set to\n"
10506
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10507
msgstr ""
10508
10509
#: en/help_topics/configuration.txt:476
10510
msgid ""
10511
"recurse\n"
10512
"~~~~~~~"
10513
msgstr ""
10514
10515
#: en/help_topics/configuration.txt:479
10516
msgid ""
10517
"Only useful in ``locations.conf``. Defines whether or not the\n"
10518
"configuration for this section applies to subdirectories:"
10519
msgstr ""
10520
10521
#: en/help_topics/configuration.txt:482
10522
msgid ""
10523
"true\n"
10524
" (default) This section applies to subdirectories as well."
10525
msgstr ""
10526
10527
#: en/help_topics/configuration.txt:485
10528
msgid ""
10529
"false\n"
10530
" This section only applies to the branch at this directory and not\n"
10531
" branches below it."
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:489
10535
msgid ""
10536
"gpg_signing_command\n"
10537
"~~~~~~~~~~~~~~~~~~~"
10538
msgstr ""
10539
10540
#: en/help_topics/configuration.txt:492
10541
msgid ""
10542
"(Default: \"gpg\"). Which program should be used to sign and check "
10543
"revisions.\n"
10544
"For example::"
10545
msgstr ""
10546
10547
#: en/help_topics/configuration.txt:495
10548
msgid " gpg_signing_command = /usr/bin/gnpg"
10549
msgstr ""
10550
10551
#: en/help_topics/configuration.txt:497
10552
msgid ""
10553
"The specified command must accept the options \"--clearsign\" and \"-u "
10554
"<email>\"."
10555
msgstr ""
10556
10557
#: en/help_topics/configuration.txt:499
10558
msgid ""
10559
"bzr_remote_path\n"
10560
"~~~~~~~~~~~~~~~"
10561
msgstr ""
10562
"bzr_remote_path\n"
10563
"~~~~~~~~~~~~~~~"
10564
10565
#: en/help_topics/configuration.txt:502
10566
msgid ""
10567
"(Default: \"bzr\"). The path to the command that should be used to run the "
10568
"smart\n"
10569
"server for bzr. This value may only be specified in locations.conf, because:"
10570
msgstr ""
10571
10572
#: en/help_topics/configuration.txt:505
10573
msgid ""
10574
"- it's needed before branch.conf is accessible\n"
10575
"- allowing remote branch.conf files to specify commands would be a security\n"
10576
" risk"
10577
msgstr ""
10578
10579
#: en/help_topics/configuration.txt:509
10580
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10581
msgstr ""
10582
10583
#: en/help_topics/configuration.txt:511
10584
msgid ""
10585
"smtp_server\n"
10586
"~~~~~~~~~~~"
10587
msgstr ""
10588
"smtp_server\n"
10589
"~~~~~~~~~~~"
10590
10591
#: en/help_topics/configuration.txt:514
10592
msgid ""
10593
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10594
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10595
msgstr ""
10596
10597
#: en/help_topics/configuration.txt:517
10598
msgid ""
10599
"smtp_username, smtp_password\n"
10600
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10601
msgstr ""
10602
"smtp_username, smtp_password\n"
10603
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10604
10605
#: en/help_topics/configuration.txt:520
10606
msgid ""
10607
"User and password to authenticate to the SMTP server. If smtp_username\n"
10608
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10609
"These settings are only needed if the SMTP server requires authentication\n"
10610
"to send mail."
10611
msgstr ""
10612
10613
#: en/help_topics/configuration.txt:525
10614
msgid ""
10615
"locks.steal_dead\n"
10616
"~~~~~~~~~~~~~~~~"
10617
msgstr ""
10618
10619
#: en/help_topics/configuration.txt:528
10620
msgid ""
10621
"If set to true, bzr will automatically break locks held by processes from\n"
10622
"the same machine and user that are no longer alive. Otherwise, it will\n"
10623
"print a message and you can break the lock manually, if you are satisfied\n"
10624
"the object is no longer in use."
10625
msgstr ""
10626
10627
#: en/help_topics/configuration.txt:533
10628
msgid ""
10629
"mail_client\n"
10630
"~~~~~~~~~~~"
10631
msgstr ""
10632
"mail_client\n"
10633
"~~~~~~~~~~~"
10634
10635
#: en/help_topics/configuration.txt:536
10636
msgid ""
10637
"A mail client to use for sending merge requests.\n"
10638
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10639
"it\n"
10640
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10641
"``editor``."
10642
msgstr ""
10643
10644
#: en/help_topics/configuration.txt:541
10645
msgid "Supported values for specific clients:"
10646
msgstr ""
10647
10648
#: en/help_topics/configuration.txt:543
10649
msgid ""
10650
":claws: Use Claws. This skips a dialog for attaching files.\n"
10651
":evolution: Use Evolution.\n"
10652
":kmail: Use KMail.\n"
10653
":mutt: Use Mutt.\n"
10654
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10655
"1.5,\n"
10656
" this works around some bugs that xdg-email doesn't handle."
10657
msgstr ""
10658
10659
#: en/help_topics/configuration.txt:550
10660
msgid "Supported generic values are:"
10661
msgstr ""
10662
10663
#: en/help_topics/configuration.txt:552
10664
msgid ""
10665
":default: See above.\n"
10666
":editor: Use your editor to compose the merge request. This also uses\n"
10667
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10668
" smtp_username and smtp_password.\n"
10669
":mapi: Use your preferred e-mail client on Windows.\n"
10670
":xdg-email: Use xdg-email to run your preferred mail program"
10671
msgstr ""
10672
10673
#: en/help_topics/configuration.txt:559
10674
msgid ""
10675
"repository.fdatasync\n"
10676
"~~~~~~~~~~~~~~~~~~~~"
10677
msgstr ""
10678
10679
#: en/help_topics/configuration.txt:562
10680
msgid ""
10681
"If true (default), repository changes are flushed through the OS buffers\n"
10682
"to physical disk. This is somewhat slower, but means data should not be\n"
10683
"lost if the machine crashes. See also dirstate.fdatasync."
10684
msgstr ""
10685
10686
#: en/help_topics/configuration.txt:566
10687
msgid ""
10688
"submit_branch\n"
10689
"~~~~~~~~~~~~~"
10690
msgstr ""
10691
"submit_branch\n"
10692
"~~~~~~~~~~~~~"
10693
10694
#: en/help_topics/configuration.txt:569
10695
msgid ""
10696
"The branch you intend to submit your current work to. This is "
10697
"automatically\n"
10698
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10699
"This\n"
10700
"should usually be set on a per-branch or per-location basis."
10701
msgstr ""
10702
10703
#: en/help_topics/configuration.txt:573
10704
msgid ""
10705
"public_branch\n"
10706
"~~~~~~~~~~~~~"
10707
msgstr ""
10708
"public_branch\n"
10709
"~~~~~~~~~~~~~"
10710
10711
#: en/help_topics/configuration.txt:576
10712
msgid ""
10713
"A publically-accessible version of this branch (implying that this version "
10714
"is\n"
10715
"not publically-accessible). Used (and set) by ``bzr send``."
10716
msgstr ""
10717
10718
#: en/help_topics/configuration.txt:579
10719
msgid ""
10720
"suppress_warnings\n"
10721
"~~~~~~~~~~~~~~~~~"
10722
msgstr ""
10723
10724
#: en/help_topics/configuration.txt:582
10725
msgid ""
10726
"A list of strings, each string represent a warning that can be emitted by\n"
10727
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10728
msgstr ""
10729
10730
#: en/help_topics/configuration.txt:585
10731
msgid "Valid values:"
10732
msgstr ""
10733
10734
#: en/help_topics/configuration.txt:587
10735
msgid ""
10736
"* ``format_deprecation``:\n"
10737
" whether the format deprecation warning is shown on repositories that "
10738
"are\n"
10739
" using deprecated formats."
10740
msgstr ""
10741
10742
#: en/help_topics/configuration.txt:591
10743
msgid ""
10744
"default_format\n"
10745
"~~~~~~~~~~~~~~"
10746
msgstr ""
10747
10748
#: en/help_topics/configuration.txt:594
10749
msgid ""
10750
"A format name for the default format used when creating branches. See "
10751
"``bzr\n"
10752
"help formats`` for possible values."
10753
msgstr ""
10754
10755
#: en/help_topics/configuration.txt:597
10756
msgid ""
10757
"\n"
10758
"Unicode options\n"
10759
"---------------"
10760
msgstr ""
10761
10762
#: en/help_topics/configuration.txt:601
10763
msgid ""
10764
"output_encoding\n"
10765
"~~~~~~~~~~~~~~~"
10766
msgstr ""
10767
10768
#: en/help_topics/configuration.txt:604
10769
msgid ""
10770
"A Python unicode encoding name for text output from bzr, such as log\n"
10771
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10772
"is the terminal encoding prefered by the operating system."
10773
msgstr ""
10774
10775
#: en/help_topics/configuration.txt:608
10776
msgid ""
10777
"\n"
10778
"Branch type specific options\n"
10779
"----------------------------"
10780
msgstr ""
10781
10782
#: en/help_topics/configuration.txt:612
10783
msgid ""
10784
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10785
"later format. They\n"
10786
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10787
"manually set in ``locations.conf`` or ``bazaar.conf``."
10788
msgstr ""
10789
10790
#: en/help_topics/configuration.txt:617
10791
msgid ""
10792
"append_revisions_only\n"
10793
"~~~~~~~~~~~~~~~~~~~~~"
10794
msgstr ""
10795
10796
#: en/help_topics/configuration.txt:620
10797
msgid ""
10798
"If set to \"True\" then revisions can only be appended to the log, not\n"
10799
"removed. A branch with this setting enabled can only pull from another\n"
10800
"branch if the other branch's log is a longer version of its own. This is\n"
10801
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10802
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10803
"compatibility with previous bzr versions (older than 2.2)."
10804
msgstr ""
10805
10806
#: en/help_topics/configuration.txt:627
10807
msgid ""
10808
"parent_location\n"
10809
"~~~~~~~~~~~~~~~"
10810
msgstr ""
10811
"parent_location\n"
10812
"~~~~~~~~~~~~~~~"
10813
10814
#: en/help_topics/configuration.txt:630
10815
msgid ""
10816
"If present, the location of the default branch for pull or merge. This "
10817
"option\n"
10818
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10819
"--remember``."
10820
msgstr ""
10821
10822
#: en/help_topics/configuration.txt:634
10823
msgid ""
10824
"push_location\n"
10825
"~~~~~~~~~~~~~"
10826
msgstr ""
10827
"push_location\n"
10828
"~~~~~~~~~~~~~"
10829
10830
#: en/help_topics/configuration.txt:637
10831
msgid ""
10832
"If present, the location of the default branch for push. This option\n"
10833
"is normally set by the first ``push`` or ``push --remember``."
10834
msgstr ""
10835
10836
#: en/help_topics/configuration.txt:640
10837
msgid ""
10838
"push_strict\n"
10839
"~~~~~~~~~~~"
10840
msgstr ""
10841
"push_strict\n"
10842
"~~~~~~~~~~~"
10843
10844
#: en/help_topics/configuration.txt:643
10845
msgid ""
10846
"If present, defines the ``--strict`` option default value for checking\n"
10847
"uncommitted changes before pushing."
10848
msgstr ""
10849
10850
#: en/help_topics/configuration.txt:646
10851
msgid ""
10852
"dpush_strict\n"
10853
"~~~~~~~~~~~~"
10854
msgstr ""
10855
"dpush_strict\n"
10856
"~~~~~~~~~~~~"
10857
10858
#: en/help_topics/configuration.txt:649
10859
msgid ""
10860
"If present, defines the ``--strict`` option default value for checking\n"
10861
"uncommitted changes before pushing into a different VCS without any\n"
10862
"custom bzr metadata."
10863
msgstr ""
10864
10865
#: en/help_topics/configuration.txt:653
10866
msgid ""
10867
"bound_location\n"
10868
"~~~~~~~~~~~~~~"
10869
msgstr ""
10870
10871
#: en/help_topics/configuration.txt:656
10872
msgid ""
10873
"The location that commits should go to when acting as a checkout.\n"
10874
"This option is normally set by ``bind``."
10875
msgstr ""
10876
10877
#: en/help_topics/configuration.txt:659
10878
msgid ""
10879
"bound\n"
10880
"~~~~~"
10881
msgstr ""
10882
10883
#: en/help_topics/configuration.txt:662
10884
msgid ""
10885
"If set to \"True\", the branch should act as a checkout, and push each "
10886
"commit to\n"
10887
"the bound_location. This option is normally set by ``bind``/``unbind``."
10888
msgstr ""
10889
10890
#: en/help_topics/configuration.txt:665
10891
msgid ""
10892
"send_strict\n"
10893
"~~~~~~~~~~~"
10894
msgstr ""
10895
10896
#: en/help_topics/configuration.txt:668
10897
msgid ""
10898
"If present, defines the ``--strict`` option default value for checking\n"
10899
"uncommitted changes before sending a merge directive."
10900
msgstr ""
10901
10902
#: en/help_topics/configuration.txt:671
10903
msgid ""
10904
"add.maximum_file_size\n"
10905
"~~~~~~~~~~~~~~~~~~~~~"
10906
msgstr ""
10907
10908
#: en/help_topics/configuration.txt:674
10909
msgid ""
10910
"Defines the maximum file size the command line \"add\" operation will allow\n"
10911
"in recursive mode, with files larger than this value being skipped. You may "
10912
"\n"
10913
"specify this value as an integer (in which case it is interpreted as bytes), "
10914
"\n"
10915
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10916
"0 \n"
10917
"will disable skipping."
10918
msgstr ""
10919
10920
#: en/help_topics/configuration.txt:680
10921
msgid ""
10922
"External Merge Tools\n"
10923
"--------------------"
10924
msgstr ""
10925
10926
#: en/help_topics/configuration.txt:683
10927
msgid ""
10928
"bzr.mergetool.<name>\n"
10929
"~~~~~~~~~~~~~~~~~~~~"
10930
msgstr ""
10931
10932
#: en/help_topics/configuration.txt:686
10933
msgid ""
10934
"Defines an external merge tool called <name> with the given command-line.\n"
10935
"Arguments containing spaces should be quoted using single or double quotes. "
10936
"The\n"
10937
"executable may omit its path if it can be found on the PATH."
10938
msgstr ""
10939
10940
#: en/help_topics/configuration.txt:690
10941
msgid ""
10942
"The following markers can be used in the command-line to substitute "
10943
"filenames\n"
10944
"involved in the merge conflict::"
10945
msgstr ""
10946
10947
#: en/help_topics/configuration.txt:693
10948
msgid ""
10949
" {base} file.BASE\n"
10950
" {this} file.THIS\n"
10951
" {other} file.OTHER\n"
10952
" {result} output file\n"
10953
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10954
"merge\n"
10955
" succeeds."
10956
msgstr ""
10957
10958
#: en/help_topics/configuration.txt:702
10959
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10960
msgstr ""
10961
10962
#: en/help_topics/configuration.txt:704
10963
msgid ""
10964
"bzr.default_mergetool\n"
10965
"~~~~~~~~~~~~~~~~~~~~~"
10966
msgstr ""
10967
10968
#: en/help_topics/configuration.txt:707
10969
msgid ""
10970
"Specifies which external merge tool (as defined above) should be selected "
10971
"by\n"
10972
"default in tools such as ``bzr qconflicts``."
10973
msgstr ""
10974
10975
#: en/help_topics/configuration.txt:712
10976
msgid " bzr.default_mergetool = kdiff3\n"
10977
msgstr ""
10978
10979
#: en/help_topics/conflict-types.txt:1
10980
msgid ""
10981
"Conflict Types\n"
10982
"=============="
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:4
10986
msgid ""
10987
"Some operations, like merge, revert and pull, modify the contents of your\n"
10988
"working tree. These modifications are programmatically generated, and so "
10989
"they\n"
10990
"may conflict with the current state of your working tree. "
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:8
10994
msgid ""
10995
"When conflicts are present in your working tree (as shown by ``bzr\n"
10996
"conflicts``), you should resolve them and then inform bzr that the "
10997
"conflicts\n"
10998
"have been resolved."
10999
msgstr ""
11000
11001
#: en/help_topics/conflict-types.txt:12
11002
msgid ""
11003
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11004
"should resolve them is not the one responsible for their occurrence, as is "
11005
"the\n"
11006
"case when merging other people's work or because some conflicts are "
11007
"presented\n"
11008
"in a way that is not easy to understand."
11009
msgstr ""
11010
11011
#: en/help_topics/conflict-types.txt:17
11012
msgid ""
11013
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11014
"conflict if and only if there's an actual conceptual conflict in the source\n"
11015
"tree. Because Bazaar doesn't understand the real meaning of the files "
11016
"being\n"
11017
"versioned, it can, when faced with ambiguities, fall short in either "
11018
"direction\n"
11019
"trying to resolve the conflict itself. Many kinds of changes can be "
11020
"combined\n"
11021
"programmatically, but sometimes only a human can determine the right thing "
11022
"to\n"
11023
"do."
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:25
11027
msgid ""
11028
"When Bazaar generates a conflict, it adds information into the working tree "
11029
"to\n"
11030
"present the conflicting versions, and it's up to you to find the correct\n"
11031
"resolution."
11032
msgstr ""
11033
11034
#: en/help_topics/conflict-types.txt:29
11035
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11036
msgstr ""
11037
11038
#: en/help_topics/conflict-types.txt:31
11039
msgid ""
11040
"1. Modify the working tree content so that the conflicted item is now in "
11041
"the\n"
11042
" state you want to keep, then"
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:34
11046
msgid ""
11047
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11048
" remaining generated information (``bzr resolve <item>``)."
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:37
11052
msgid ""
11053
"For most conflict types, there are some obvious ways to modify the working\n"
11054
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11055
"itself already made a choice, when possible."
11056
msgstr ""
11057
11058
#: en/help_topics/conflict-types.txt:41
11059
msgid ""
11060
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11061
"different ways to resolve the conflict."
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:44
11065
msgid ""
11066
"Each type of conflict is explained below, and the action which must be done "
11067
"to\n"
11068
"resolve the conflict is outlined."
11069
msgstr ""
11070
11071
#: en/help_topics/conflict-types.txt:47
11072
msgid ""
11073
"Various actions are available depending on the kind of conflict, for some "
11074
"of\n"
11075
"these actions, Bazaar can provide some help. In the end you should at least\n"
11076
"inform Bazaar that you're done with the conflict with::"
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:51
11080
msgid " ``bzr resolve FILE --action=done'"
11081
msgstr ""
11082
11083
#: en/help_topics/conflict-types.txt:53
11084
msgid ""
11085
"Note that this is the default action when a single file is involved so you "
11086
"can\n"
11087
"simply use::"
11088
msgstr ""
11089
11090
#: en/help_topics/conflict-types.txt:56
11091
msgid " ``bzr resolve FILE``"
11092
msgstr ""
11093
11094
#: en/help_topics/conflict-types.txt:58
11095
msgid "See ``bzr help resolve`` for more details."
11096
msgstr ""
11097
11098
#: en/help_topics/conflict-types.txt:60
11099
msgid ""
11100
"Text conflicts\n"
11101
"--------------"
11102
msgstr ""
11103
11104
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11105
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11106
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11107
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11108
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11109
msgid "Typical message::"
11110
msgstr ""
11111
11112
#: en/help_topics/conflict-types.txt:65
11113
msgid " Text conflict in FILE"
11114
msgstr ""
11115
11116
#: en/help_topics/conflict-types.txt:67
11117
msgid ""
11118
"These are produced when a text merge cannot completely reconcile two sets "
11119
"of\n"
11120
"text changes. Bazaar will emit files for each version with the extensions\n"
11121
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11122
"tree,\n"
11123
"i.e. the tree that you are merging changes into. OTHER is the version that "
11124
"you\n"
11125
"are merging into the target. BASE is an older version that is used as a "
11126
"basis\n"
11127
"for comparison."
11128
msgstr ""
11129
11130
#: en/help_topics/conflict-types.txt:74
11131
msgid ""
11132
"In the main copy of the file, Bazaar will include all the changes that it\n"
11133
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11134
"\"herringbone\" markers like ``<<<<<<<``."
11135
msgstr ""
11136
11137
#: en/help_topics/conflict-types.txt:78
11138
msgid ""
11139
"Say the initial text is \"The project leader released it.\", and THIS "
11140
"modifies it\n"
11141
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11142
"leader\n"
11143
"released Bazaar.\" A conflict would look like this::"
11144
msgstr ""
11145
11146
#: en/help_topics/conflict-types.txt:82
11147
msgid ""
11148
" <<<<<<< TREE\n"
11149
" Martin Pool released it.\n"
11150
" =======\n"
11151
" The project leader released Bazaar.\n"
11152
" >>>>>>> MERGE-SOURCE"
11153
msgstr ""
11154
11155
#: en/help_topics/conflict-types.txt:88
11156
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11157
msgstr ""
11158
11159
#: en/help_topics/conflict-types.txt:90
11160
msgid ""
11161
"You can handle text conflicts either by editing the main copy of the file,\n"
11162
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11163
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11164
"set of changes over the other (but see below when you encounter these\n"
11165
"cases). More often, the two sets of changes must be intelligently combined."
11166
msgstr ""
11167
11168
#: en/help_topics/conflict-types.txt:96
11169
msgid ""
11170
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11171
"you are done editing, the file should look like it never had a conflict, and "
11172
"be\n"
11173
"ready to commit."
11174
msgstr ""
11175
11176
#: en/help_topics/conflict-types.txt:100
11177
msgid ""
11178
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11179
"Bazaar will auto-detect which conflicts you have resolved."
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:103
11183
msgid ""
11184
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11185
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11186
"working tree."
11187
msgstr ""
11188
11189
#: en/help_topics/conflict-types.txt:107
11190
msgid ""
11191
"\n"
11192
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11193
"resolve`` with one of the following actions:"
11194
msgstr ""
11195
11196
#: en/help_topics/conflict-types.txt:111
11197
msgid ""
11198
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11199
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11200
msgstr ""
11201
11202
#: en/help_topics/conflict-types.txt:114
11203
msgid ""
11204
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11205
"modifications will be taken into account."
11206
msgstr ""
11207
11208
#: en/help_topics/conflict-types.txt:117
11209
msgid ""
11210
"Content conflicts\n"
11211
"-----------------"
11212
msgstr ""
11213
11214
#: en/help_topics/conflict-types.txt:122
11215
msgid " Contents conflict in FILE"
11216
msgstr ""
11217
11218
#: en/help_topics/conflict-types.txt:124
11219
msgid ""
11220
"This conflict happens when there are conflicting changes in the working "
11221
"tree\n"
11222
"and the merge source, but the conflicted items are not text files. They "
11223
"may\n"
11224
"be binary files, or symlinks, or directories. It can even happen with "
11225
"files\n"
11226
"that are deleted on one side, and modified on the other."
11227
msgstr ""
11228
11229
#: en/help_topics/conflict-types.txt:129
11230
msgid ""
11231
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11232
"be\n"
11233
"regular files, symlinks or directories). But it will not include a \"main "
11234
"copy\"\n"
11235
"of the file with herringbone conflict markers. It will appear that the "
11236
"\"main\n"
11237
"copy\" has been renamed to THIS or OTHER."
11238
msgstr ""
11239
11240
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11241
msgid ""
11242
"To resolve that kind of conflict, you should rebuild FILE from either "
11243
"version\n"
11244
"or a combination of both."
11245
msgstr ""
11246
11247
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11248
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11249
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11250
#: en/help_topics/conflict-types.txt:361
11251
msgid "``bzr resolve`` recognizes the following actions:"
11252
msgstr ""
11253
11254
#: en/help_topics/conflict-types.txt:139
11255
msgid ""
11256
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11257
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11258
"* ``--action=done`` will just mark the conflict as resolved."
11259
msgstr ""
11260
11261
#: en/help_topics/conflict-types.txt:143
11262
msgid ""
11263
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11264
"and\n"
11265
"``.OTHER`` files if they are still present in the working tree."
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11269
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11270
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11271
#: en/help_topics/conflict-types.txt:369
11272
msgid ""
11273
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11274
msgstr ""
11275
11276
#: en/help_topics/conflict-types.txt:148
11277
msgid ""
11278
"Tag conflicts\n"
11279
"-------------"
11280
msgstr ""
11281
11282
#: en/help_topics/conflict-types.txt:153
11283
msgid ""
11284
" Conflicting tags:\n"
11285
" version-0.1"
11286
msgstr ""
11287
11288
#: en/help_topics/conflict-types.txt:156
11289
msgid ""
11290
"When pulling from or pushing to another branch, Bazaar informs you about "
11291
"tags\n"
11292
"that conflict between the two branches; that is the same tag points to two\n"
11293
"different revisions. You need not resolve these conflicts, but subsequent\n"
11294
"uses of pull or push will result in the same message."
11295
msgstr ""
11296
11297
#: en/help_topics/conflict-types.txt:161
11298
msgid ""
11299
"To resolve the conflict, you must apply the correct tags to either the "
11300
"target\n"
11301
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11302
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11303
"target branch's tags match the source branch, then in the target branch do\n"
11304
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11305
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11306
"source\n"
11307
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11308
"favor of the target branch, you need to similarly use ``tag --force`` in "
11309
"the\n"
11310
"source branch. (Note that pulling or pushing using --overwrite will "
11311
"overwrite\n"
11312
"all tags as well.)"
11313
msgstr ""
11314
11315
#: en/help_topics/conflict-types.txt:172
11316
msgid ""
11317
"Duplicate paths\n"
11318
"---------------"
11319
msgstr ""
11320
11321
#: en/help_topics/conflict-types.txt:177
11322
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11323
msgstr ""
11324
11325
#: en/help_topics/conflict-types.txt:179
11326
msgid ""
11327
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11328
"already been used. The existing file will be renamed to \"FILE.moved\". "
11329
msgstr ""
11330
11331
#: en/help_topics/conflict-types.txt:187
11332
msgid ""
11333
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11334
"FILE``,\n"
11335
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11336
"* ``--action=done`` will just mark the conflict as resolved."
11337
msgstr ""
11338
11339
#: en/help_topics/conflict-types.txt:191
11340
msgid ""
11341
"Note that you must get rid of FILE.moved before using ``--action=done``."
11342
msgstr ""
11343
11344
#: en/help_topics/conflict-types.txt:195
11345
msgid ""
11346
"Unversioned parent\n"
11347
"------------------"
11348
msgstr ""
11349
11350
#: en/help_topics/conflict-types.txt:200
11351
msgid ""
11352
" Conflict because FILE is not versioned, but has versioned children."
11353
msgstr ""
11354
11355
#: en/help_topics/conflict-types.txt:202
11356
msgid ""
11357
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11358
"not\n"
11359
"versioned. This happens when the directory has been deleted in the target,\n"
11360
"but has a new child in the source, or vice versa. In this situation, "
11361
"Bazaar\n"
11362
"will version the parent directory as well. Resolving this issue depends\n"
11363
"very much on the particular scenario. You may wish to rename or delete "
11364
"either\n"
11365
"the file or the directory. When you are satisfied, you can run \"bzr "
11366
"resolve\n"
11367
"FILE\" to mark the conflict as resolved."
11368
msgstr ""
11369
11370
#: en/help_topics/conflict-types.txt:210
11371
msgid ""
11372
"Missing parent\n"
11373
"--------------"
11374
msgstr ""
11375
11376
#: en/help_topics/conflict-types.txt:215
11377
msgid " Conflict adding files to FILE. Created directory."
11378
msgstr ""
11379
11380
#: en/help_topics/conflict-types.txt:217
11381
msgid ""
11382
"This happens when a directory has been deleted in the target, but has new\n"
11383
"children in the source. This is similar to the \"unversioned parent\" "
11384
"conflict,\n"
11385
"except that the parent directory does not *exist*, instead of just being\n"
11386
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11387
"Resolving this issue depends very much on the particular scenario."
11388
msgstr ""
11389
11390
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11391
msgid ""
11392
"To resolve that kind of conflict, you should either remove or rename the\n"
11393
"children or the directory or a combination of both."
11394
msgstr ""
11395
11396
#: en/help_topics/conflict-types.txt:228
11397
msgid ""
11398
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11399
" children,\n"
11400
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11401
"children\n"
11402
" and restoring the directory,\n"
11403
"* ``--action=done`` will just mark the conflict as resolved."
11404
msgstr ""
11405
11406
#: en/help_topics/conflict-types.txt:236
11407
msgid ""
11408
"Deleting parent\n"
11409
"---------------"
11410
msgstr ""
11411
11412
#: en/help_topics/conflict-types.txt:241
11413
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11414
msgstr ""
11415
11416
#: en/help_topics/conflict-types.txt:243
11417
msgid ""
11418
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11419
"source, but has new children in the target (either because a directory\n"
11420
"deletion is merged or because the merge introduce new children). Bazaar\n"
11421
"will retain the directory. Resolving this issue depends very much on the\n"
11422
"particular scenario."
11423
msgstr ""
11424
11425
#: en/help_topics/conflict-types.txt:254
11426
msgid ""
11427
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11428
"directory,"
11429
msgstr ""
11430
11431
#: en/help_topics/conflict-types.txt:256
11432
msgid ""
11433
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11434
" children,"
11435
msgstr ""
11436
11437
#: en/help_topics/conflict-types.txt:259
11438
msgid "* ``--action=done`` will just mark the conflict as resolved."
11439
msgstr ""
11440
11441
#: en/help_topics/conflict-types.txt:261
11442
msgid ""
11443
"Note that when merging a directory deletion, if unversioned files are\n"
11444
"present, they become potential orphans has they don't have a directory\n"
11445
"parent anymore."
11446
msgstr ""
11447
11448
#: en/help_topics/conflict-types.txt:265
11449
msgid ""
11450
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11451
"setting the ``bzr.transform.orphan_policy`` configuration option."
11452
msgstr ""
11453
11454
#: en/help_topics/conflict-types.txt:268
11455
msgid "There are two possible values for this option:"
11456
msgstr ""
11457
11458
#: en/help_topics/conflict-types.txt:270
11459
msgid ""
11460
"* ``conflict`` (the default): will leave the orphans in place and\n"
11461
" generate a conflicts,"
11462
msgstr ""
11463
11464
#: en/help_topics/conflict-types.txt:273
11465
msgid ""
11466
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11467
"root\n"
11468
" of the working tree with names like ``<file>.~#~``."
11469
msgstr ""
11470
11471
#: en/help_topics/conflict-types.txt:278
11472
msgid ""
11473
"Path conflict\n"
11474
"-------------"
11475
msgstr ""
11476
11477
#: en/help_topics/conflict-types.txt:283
11478
msgid " Path conflict: PATH1 / PATH2"
11479
msgstr ""
11480
11481
#: en/help_topics/conflict-types.txt:285
11482
msgid ""
11483
"This happens when the source and target have each modified the name or "
11484
"parent\n"
11485
"directory of a file. Bazaar will use the path elements from the source."
11486
msgstr ""
11487
11488
#: en/help_topics/conflict-types.txt:288
11489
msgid ""
11490
"To resolve that kind of conflict, you just have to decide what name should "
11491
"be\n"
11492
"retained for the file involved."
11493
msgstr ""
11494
11495
#: en/help_topics/conflict-types.txt:293
11496
msgid ""
11497
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11498
" issuing ``bzr mv PATH2 PATH1``,\n"
11499
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11500
"``PATH2``,\n"
11501
"* ``--action=done`` will just mark the conflict as resolved."
11502
msgstr ""
11503
11504
#: en/help_topics/conflict-types.txt:300
11505
msgid ""
11506
"Parent loop\n"
11507
"-----------"
11508
msgstr ""
11509
11510
#: en/help_topics/conflict-types.txt:305
11511
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11512
msgstr ""
11513
11514
#: en/help_topics/conflict-types.txt:307
11515
msgid ""
11516
"This happens when the source and the target have each moved directories, so\n"
11517
"that, if the change could be applied, a directory would be contained by "
11518
"itself.\n"
11519
"For example::"
11520
msgstr ""
11521
11522
#: en/help_topics/conflict-types.txt:311
11523
msgid ""
11524
" $ bzr init\n"
11525
" $ bzr mkdir white\n"
11526
" $ bzr mkdir black\n"
11527
" $ bzr commit -m \"BASE\"\n"
11528
" $ bzr branch . ../other\n"
11529
" $ bzr mv white black\n"
11530
" $ bzr commit -m \"THIS\"\n"
11531
" $ bzr mv ../other/black ../other/white\n"
11532
" $ bzr commit ../other -m \"OTHER\"\n"
11533
" $ bzr merge ../other"
11534
msgstr ""
11535
" $ bzr init\n"
11536
" $ bzr mkdir white\n"
11537
" $ bzr mkdir black\n"
11538
" $ bzr commit -m \"BASE\"\n"
11539
" $ bzr branch . ../other\n"
11540
" $ bzr mv white black\n"
11541
" $ bzr commit -m \"THIS\"\n"
11542
" $ bzr mv ../other/black ../other/white\n"
11543
" $ bzr commit ../other -m \"OTHER\"\n"
11544
" $ bzr merge ../other"
11545
11546
#: en/help_topics/conflict-types.txt:322
11547
msgid ""
11548
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11549
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11550
"name should be retained for the directories involved."
11551
msgstr ""
11552
11553
#: en/help_topics/conflict-types.txt:328
11554
msgid ""
11555
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11556
"\n"
11557
" in ``black``,\n"
11558
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11559
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11560
"* ``--action=done`` will just mark the conflict as resolved."
11561
msgstr ""
11562
11563
#: en/help_topics/conflict-types.txt:336
11564
msgid ""
11565
"Non-directory parent\n"
11566
"--------------------"
11567
msgstr ""
11568
11569
#: en/help_topics/conflict-types.txt:341
11570
msgid ""
11571
" Conflict: foo.new is not a directory, but has files in it.\n"
11572
" Created directory."
11573
msgstr ""
11574
11575
#: en/help_topics/conflict-types.txt:344
11576
msgid ""
11577
"This happens when one side has added files to a directory, and the other "
11578
"side\n"
11579
"has changed the directory into a file or symlink. For example::"
11580
msgstr ""
11581
"Isso acontece quando um lado adicionou arquivos para um diretório, e o outro "
11582
"lado\n"
11583
"foi alterado o diretório em arquivo ou link simbólico. Por exemplo::"
11584
11585
#: en/help_topics/conflict-types.txt:347
11586
msgid ""
11587
" $ bzr init\n"
11588
" $ bzr mkdir foo\n"
11589
" $ bzr commit -m \"BASE\"\n"
11590
" $ bzr branch . ../other\n"
11591
" $ rmdir foo\n"
11592
" $ touch foo\n"
11593
" $ bzr commit -m \"THIS\"\n"
11594
" $ bzr mkdir ../other/foo/bar\n"
11595
" $ bzr commit ../other -m \"OTHER\"\n"
11596
" $ bzr merge ../other"
11597
msgstr ""
11598
" $ bzr init\n"
11599
" $ bzr mkdir foo\n"
11600
" $ bzr commit -m \"BASE\"\n"
11601
" $ bzr branch . ../other\n"
11602
" $ rmdir foo\n"
11603
" $ touch foo\n"
11604
" $ bzr commit -m \"THIS\"\n"
11605
" $ bzr mkdir ../other/foo/bar\n"
11606
" $ bzr commit ../other -m \"OTHER\"\n"
11607
" $ bzr merge ../other"
11608
11609
#: en/help_topics/conflict-types.txt:358
11610
msgid ""
11611
"To resolve that kind of conflict, you have to decide what name should be\n"
11612
"retained for the file, directory or symlink involved."
11613
msgstr ""
11614
"Para resolver esse tipo de conflito, você tem que decidir o nome deve ser\n"
11615
"mantido para o arquivo, diretório, ou link simbólico envolvidos."
11616
11617
#: en/help_topics/conflict-types.txt:363
11618
msgid ""
11619
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11620
" ``bzr add foo``,\n"
11621
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11622
" ``bzr mv foo.new foo``,\n"
11623
"* ``--action=done`` will just mark the conflict as resolved."
11624
msgstr ""
11625
"* ``--action=take-this`` emitirá ``bzr rm --force foo.new`` e \n"
11626
" ``bzr add foo``,\n"
11627
"* ``--action=take-other`` emitirá ``bzr rm --force foo`` e \n"
11628
" ``bzr mv foo.new foo``,\n"
11629
"* ``--action=done`` apenas marcará o conflito como resolvido."
11630
11631
#: en/help_topics/conflict-types.txt:371
11632
msgid ""
11633
"MalformedTransform\n"
11634
"------------------"
11635
msgstr ""
11636
11637
#: en/help_topics/conflict-types.txt:374
11638
msgid ""
11639
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11640
"exception. This means that Bazaar encountered a filesystem conflict that it "
11641
"was\n"
11642
"unable to resolve. This usually indicates a bug. Please let us know if "
11643
"you\n"
11644
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11645
msgstr ""
11646
11647
#: en/help_topics/content-filters.txt:1
11648
msgid ""
11649
"Content Filters\n"
11650
"==============="
11651
msgstr ""
11652
11653
#: en/help_topics/content-filters.txt:4
11654
msgid ""
11655
"Content formats\n"
11656
"---------------"
11657
msgstr ""
11658
11659
#: en/help_topics/content-filters.txt:7
11660
msgid ""
11661
"Bazaar's content filtering allows you to store files in a different\n"
11662
"format from the copy in your working tree. This lets you, or your\n"
11663
"co-developers, use Windows development tools that expect CRLF files\n"
11664
"on projects that use other line-ending conventions. Among other things,\n"
11665
"content filters also let Unix developers more easily work on projects\n"
11666
"using Windows line-ending conventions, keyword expansion/compression,\n"
11667
"and trailing spaces on lines in text files to be implicitly stripped\n"
11668
"when committed."
11669
msgstr ""
11670
11671
#: en/help_topics/content-filters.txt:16
11672
msgid "To generalize, there are two content formats supported by Bazaar:"
11673
msgstr ""
11674
"Para generalizar, existem dois formatos de conteúdo suportados pelo Bazaar:"
11675
11676
#: en/help_topics/content-filters.txt:18
11677
msgid ""
11678
"* a canonical format - how files are stored internally\n"
11679
"* a convenience format - how files are created in a working tree."
11680
msgstr ""
11681
"* Um formato canonical - como os arquivos são armazenados internamente.\n"
11682
"* Um formato conveniente - como os arquivos são criados em uma árvore de "
11683
"diretório."
11684
11685
#: en/help_topics/content-filters.txt:21
11686
msgid ""
11687
"\n"
11688
"Format conversion\n"
11689
"-----------------"
11690
msgstr ""
11691
11692
#: en/help_topics/content-filters.txt:25
11693
msgid ""
11694
"The conversion between these formats is done by content filters.\n"
11695
"A content filter has two parts:"
11696
msgstr ""
11697
11698
#: en/help_topics/content-filters.txt:28
11699
msgid ""
11700
"* a read converter - converts from convenience to canonical format\n"
11701
"* a write converter - converts from canonical to convenience format."
11702
msgstr ""
11703
11704
#: en/help_topics/content-filters.txt:31
11705
msgid ""
11706
"Many of these converters will provide *round-trip* conversion,\n"
11707
"i.e. applying the read converter followed by the write converter\n"
11708
"gives back the original content. However, others may provide an\n"
11709
"asymmetric conversion. For example, a read converter might strip\n"
11710
"trailing whitespace off lines in source code while the matching\n"
11711
"write converter might pass content through unchanged."
11712
msgstr ""
11713
11714
#: en/help_topics/content-filters.txt:38
11715
msgid ""
11716
"\n"
11717
"Enabling content filters\n"
11718
"------------------------"
11719
msgstr ""
11720
11721
#: en/help_topics/content-filters.txt:42
11722
msgid ""
11723
"Content filters are typically provided by plugins, so the first step\n"
11724
"in using them is to install the relevant plugins and read their\n"
11725
"documentation. Some plugins may be very specific about which files\n"
11726
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11727
"In other cases, the plugin may leave it in the user's hands to\n"
11728
"define which files are to be filtered. This is typically done\n"
11729
"using rule-based preferences. See ``bzr help rules`` for general\n"
11730
"information about defining these."
11731
msgstr ""
11732
11733
#: en/help_topics/content-filters.txt:51
11734
msgid ""
11735
"\n"
11736
"Impact on commands\n"
11737
"------------------"
11738
msgstr ""
11739
11740
#: en/help_topics/content-filters.txt:55
11741
msgid ""
11742
"Read converters are only applied to commands that read content from\n"
11743
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11744
"will apply read converters to files in the working tree, then compare\n"
11745
"the results to the content last committed."
11746
msgstr ""
11747
11748
#: en/help_topics/content-filters.txt:60
11749
msgid ""
11750
"Write converters are only applied by commands that **create files in a\n"
11751
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11752
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11753
"respectively."
11754
msgstr ""
11755
11756
#: en/help_topics/content-filters.txt:65
11757
msgid ""
11758
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11759
"comitting files. If this makes sense for a given plugin providing\n"
11760
"a content filter, the plugin can usually achieve this effect by using a\n"
11761
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11762
"for more information on hooks."
11763
msgstr ""
11764
11765
#: en/help_topics/content-filters.txt:71
11766
msgid ""
11767
"\n"
11768
"Refreshing your working tree\n"
11769
"----------------------------"
11770
msgstr ""
11771
11772
#: en/help_topics/content-filters.txt:75
11773
msgid ""
11774
"For performance reasons, Bazaar caches the timestamps of files in\n"
11775
"a working tree, and assumes files are unchanged if their timestamps\n"
11776
"match the cached values. As a consequence, there are times when\n"
11777
"you may need to explicitly ask for content filtering to be reapplied\n"
11778
"in one or both directions, e.g. after installing or reconfiguring\n"
11779
"plugins providing it."
11780
msgstr ""
11781
11782
#: en/help_topics/content-filters.txt:82
11783
msgid "Here are some general guidelines for doing this:"
11784
msgstr ""
11785
11786
#: en/help_topics/content-filters.txt:84
11787
msgid ""
11788
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11789
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11790
" relevant read converters and compare the end result with the\n"
11791
" canonical format."
11792
msgstr ""
11793
11794
#: en/help_topics/content-filters.txt:89
11795
msgid ""
11796
" * To reapply write converters, ensure there are no local changes,\n"
11797
" delete the relevant files and run ``bzr revert`` on those files."
11798
msgstr ""
11799
11800
#: en/help_topics/content-filters.txt:92
11801
msgid ""
11802
"Note: In the future, it is likely that additional options will be added\n"
11803
"to commands to make this refreshing process faster and safer.\n"
11804
msgstr ""
11805
11806
#: en/help_topics/current-formats.txt:1
11807
msgid "Current Storage Formats"
11808
msgstr ""
11809
11810
#: en/help_topics/current-formats.txt:3
11811
msgid ""
11812
":2a:\n"
11813
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11814
" compress storage. Provides rich roots which are a one-way\n"
11815
" transition."
11816
msgstr ""
11817
11818
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11819
msgid ""
11820
"\n"
11821
"See :doc:`formats-help` for more about storage formats."
11822
msgstr ""
11823
11824
#: en/help_topics/debug-flags.txt:1
11825
msgid ""
11826
"Debug Flags\n"
11827
"==========="
11828
msgstr ""
11829
11830
#: en/help_topics/debug-flags.txt:4
11831
msgid ""
11832
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11833
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11834
msgstr ""
11835
11836
#: en/help_topics/debug-flags.txt:7
11837
msgid ""
11838
"-Dauth Trace authentication sections used.\n"
11839
"-Dbytes Print out how many bytes were transferred\n"
11840
"-Ddirstate Trace dirstate activity (verbose!)\n"
11841
"-Derror Instead of normal error handling, always print a "
11842
"traceback\n"
11843
" on error.\n"
11844
"-Devil Capture call sites that do expensive or badly-scaling\n"
11845
" operations.\n"
11846
"-Dfetch Trace history copying between repositories.\n"
11847
"-Dfilters Emit information for debugging content filtering.\n"
11848
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11849
"fetch.\n"
11850
"-Dgraph Trace graph traversal.\n"
11851
"-Dhashcache Log every time a working file is read to determine its "
11852
"hash.\n"
11853
"-Dhooks Trace hook execution.\n"
11854
"-Dhpss Trace smart protocol requests and responses.\n"
11855
"-Dhpssdetail More hpss details.\n"
11856
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11857
"-Dhttp Trace http connections, requests and responses.\n"
11858
"-Dindex Trace major index operations.\n"
11859
"-Dknit Trace knit operations.\n"
11860
"-Dlock Trace when lockdir locks are taken or released.\n"
11861
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11862
" retrying the request.\n"
11863
"-Dprogress Trace progress bar operations.\n"
11864
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11865
"-Dmerge Emit information for debugging merges.\n"
11866
"-Dno_apport Don't use apport to report crashes.\n"
11867
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11868
"-Dpack Emit information about pack operations.\n"
11869
"-Drelock Emit a message every time a branch or repository object "
11870
"is\n"
11871
" unlocked then relocked the same way.\n"
11872
"-Dsftp Trace SFTP internals.\n"
11873
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11874
"expected\n"
11875
"-Dstream Trace fetch streams.\n"
11876
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11877
"portable\n"
11878
" manner.\n"
11879
"-Dunlock Some errors during unlock are treated as warnings.\n"
11880
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11881
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11882
"appropriate\n"
11883
" for the format, even for non-local fetches.\n"
11884
msgstr ""
11885
11886
#: en/help_topics/diverged-branches.txt:1
11887
msgid ""
11888
"Diverged Branches\n"
11889
"================="
11890
msgstr ""
11891
11892
#: en/help_topics/diverged-branches.txt:4
11893
msgid ""
11894
"When Bazaar tries to push one branch onto another, it requires that the\n"
11895
"destination branch must be ready to receive the source branch. If this "
11896
"isn't\n"
11897
"the case, then we say that the branches have ``diverged``. Branches are\n"
11898
"considered diverged if the destination branch's most recent commit is one "
11899
"that\n"
11900
"has not been merged (directly or indirectly) by the source branch. To "
11901
"recover\n"
11902
"from diverged branches, one must merge the missing revisions into the "
11903
"source\n"
11904
"branch."
11905
msgstr ""
11906
11907
#: en/help_topics/diverged-branches.txt:12
11908
msgid ""
11909
"This situation commonly arises when using a centralized workflow with local\n"
11910
"commits. If someone else has committed new work to the mainline since your\n"
11911
"last pull and you have local commits that have not yet been pushed to the\n"
11912
"mainline, then your local branch and the mainline have diverged."
11913
msgstr ""
11914
11915
#: en/help_topics/diverged-branches.txt:17
11916
msgid ""
11917
"Discovering What Has Diverged\n"
11918
"-----------------------------"
11919
msgstr ""
11920
11921
#: en/help_topics/diverged-branches.txt:20
11922
msgid ""
11923
"The ``bzr missing`` command is used to find out what revisions are in "
11924
"another\n"
11925
"branch that are not present in the current branch, and vice-versa. It shows "
11926
"a\n"
11927
"summary of which extra revisions exist in each branch. If you want to see "
11928
"the\n"
11929
"precise effects of those revisions, you can use ``bzr diff --"
11930
"old=other_branch``\n"
11931
"to show the differences between other_branch and your current branch."
11932
msgstr ""
11933
11934
#: en/help_topics/diverged-branches.txt:26
11935
msgid ""
11936
"A Solution\n"
11937
"----------"
11938
msgstr ""
11939
11940
#: en/help_topics/diverged-branches.txt:29
11941
msgid ""
11942
"The solution is to merge the revisions from the mainline into your local\n"
11943
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11944
"mainline. This merge may result in conflicts if the other developer's "
11945
"changes\n"
11946
"overlap with your changes. These conflicts should be resolved before\n"
11947
"continuing. After any conflicts have been resolved, or even if there were "
11948
"no\n"
11949
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11950
"to your local branch. This requirement gives you an opportunity to test "
11951
"the\n"
11952
"resulting working tree for correctness, since the merged revisions could "
11953
"have\n"
11954
"made arbitrary changes. After testing, you should commit the merge using\n"
11955
"``bzr commit``. This clears up the diverged branches situation. Your "
11956
"local\n"
11957
"branch can now be pushed to the mainline.\n"
11958
msgstr ""
11959
11960
#: en/help_topics/eol.txt:1
11961
msgid ""
11962
"End of Line Conversion\n"
11963
"======================"
11964
msgstr ""
11965
11966
#: en/help_topics/eol.txt:4
11967
msgid ""
11968
"EOL conversion is provided as a content filter where Bazaar internally\n"
11969
"stores a canonical format but outputs a convenience format. See\n"
11970
"``bzr help content-filters`` for general information about using these."
11971
msgstr ""
11972
11973
#: en/help_topics/eol.txt:8
11974
msgid ""
11975
"Note: Content filtering is only supported in recently added formats,\n"
11976
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11977
"in a recent format. (Just setting the format on the repository\n"
11978
"is not enough.) If content filtering does not appear to be working, use\n"
11979
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11980
"or later."
11981
msgstr ""
11982
11983
#: en/help_topics/eol.txt:15
11984
msgid ""
11985
"EOL conversion needs to be enabled for selected file patterns using\n"
11986
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11987
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11988
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11989
"supported in a future verison of Bazaar."
11990
msgstr ""
11991
11992
#: en/help_topics/eol.txt:21
11993
msgid ""
11994
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11995
"(If a value is not set, ``exact`` is the default.)"
11996
msgstr ""
11997
11998
#: en/help_topics/eol.txt:24
11999
msgid ""
12000
" ========== ===================================== ======================\n"
12001
" Value Checkout end-of-lines as Commit end-of-lines as\n"
12002
" ========== ===================================== ======================\n"
12003
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12004
" ---------- ------------------------------------- ----------------------\n"
12005
" ``lf`` ``lf`` ``lf``\n"
12006
" ---------- ------------------------------------- ----------------------\n"
12007
" ``crlf`` ``crlf`` ``lf``\n"
12008
" ---------- ------------------------------------- ----------------------\n"
12009
" ``exact`` No conversion Exactly as in file\n"
12010
" ========== ===================================== ======================"
12011
msgstr ""
12012
12013
#: en/help_topics/eol.txt:36
12014
msgid ""
12015
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12016
"byte is detected in the file."
12017
msgstr ""
12018
12019
#: en/help_topics/eol.txt:39
12020
msgid ""
12021
"For users working on a cross-platform project, here is a suggested rule\n"
12022
"to use as a starting point::"
12023
msgstr ""
12024
12025
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12026
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12027
msgid ""
12028
" [name *]\n"
12029
" eol = native"
12030
msgstr ""
12031
12032
#: en/help_topics/eol.txt:45
12033
msgid ""
12034
"If you have binary files that do not contain a null byte though, be\n"
12035
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12036
"by giving more explicit patterns earlier in the rules file. For example::"
12037
msgstr ""
12038
12039
#: en/help_topics/eol.txt:49
12040
msgid ""
12041
" [name *.png]\n"
12042
" eol = exact"
12043
msgstr ""
12044
12045
#: en/help_topics/eol.txt:55
12046
msgid ""
12047
"If your working tree is on a network drive shared by users on different\n"
12048
"operating systems, you typically want to force certain conventions for\n"
12049
"certain files. In that way, if a file is created with the wrong line\n"
12050
"endings or line endings get mixed during editing, it gets committed\n"
12051
"correctly and gets checked out correctly. For example::"
12052
msgstr ""
12053
12054
#: en/help_topics/eol.txt:61
12055
msgid ""
12056
" [name *.bat]\n"
12057
" eol = crlf"
12058
msgstr ""
12059
12060
#: en/help_topics/eol.txt:64
12061
msgid ""
12062
" [name *.sh]\n"
12063
" eol = lf"
12064
msgstr ""
12065
12066
#: en/help_topics/eol.txt:70
12067
msgid ""
12068
"If you take the care to create files with their required endings, you can\n"
12069
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12070
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12071
"introducing mixed line endings will be corrected during commit for files\n"
12072
"with those settings."
12073
msgstr ""
12074
12075
#: en/help_topics/eol.txt:76
12076
msgid ""
12077
"If you have sample test data that deliberately has text files with mixed\n"
12078
"newline conventions, you can ask for those to be left alone like this::"
12079
msgstr ""
12080
12081
#: en/help_topics/eol.txt:79
12082
msgid ""
12083
" [name test_data/]\n"
12084
" eol = exact"
12085
msgstr ""
12086
12087
#: en/help_topics/eol.txt:85
12088
msgid ""
12089
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12090
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12091
"of content analysis to detect binary files for commands like ``diff``.\n"
12092
"In the future, a ``binary = true`` rule may be added but it is not\n"
12093
"supported yet.)"
12094
msgstr ""
12095
12096
#: en/help_topics/eol.txt:91
12097
msgid ""
12098
"If you have an existing repository with text files already stored using\n"
12099
"Windows newline conventions (``crlf``), then you may want to keep using "
12100
"that\n"
12101
"convention in the repository. Forcing certain files to this convention\n"
12102
"may also help users who do not have rules configured. To do this, set\n"
12103
"``eol`` to one of the values below."
12104
msgstr ""
12105
12106
#: en/help_topics/eol.txt:97
12107
msgid ""
12108
" ============================ ======================== "
12109
"======================\n"
12110
" Value Checkout end-of-lines as Commit end-of-lines "
12111
"as\n"
12112
" ============================ ======================== "
12113
"======================\n"
12114
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12115
" ``lf`` otherwise\n"
12116
" ---------------------------- ------------------------ ----------------------"
12117
"\n"
12118
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12119
" ---------------------------- ------------------------ ----------------------"
12120
"\n"
12121
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12122
" ============================ ======================== ======================"
12123
msgstr ""
12124
12125
#: en/help_topics/eol.txt:108
12126
msgid ""
12127
"For users working on an existing project that uses Windows newline\n"
12128
"conventions in their Bazaar repository, this rule is suggested as a\n"
12129
"starting point::"
12130
msgstr ""
12131
12132
#: en/help_topics/eol.txt:112
12133
msgid ""
12134
" [name *]\n"
12135
" eol = native-with-crlf-in-repo"
12136
msgstr ""
12137
12138
#: en/help_topics/eol.txt:115
12139
msgid ""
12140
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12141
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12142
"``crlf`` and ``exact``."
12143
msgstr ""
12144
12145
#: en/help_topics/eol.txt:119
12146
msgid ""
12147
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12148
"never reject files because a given line ending or mixed line endings\n"
12149
"are found. A precommit hook should be used if you wish to validate\n"
12150
"(and not just convert) content before committing.\n"
12151
msgstr ""
12152
12153
#: en/help_topics/hidden-commands.txt:1
12154
msgid ""
12155
"added List files added in working tree.\n"
12156
"ancestry List all revisions merged into this branch.\n"
12157
"assert-fail Test reporting of assertion failures\n"
12158
"bundle-info Output interesting stats about a bundle\n"
12159
"bundle-revisions Create a merge-directive for submitting changes.\n"
12160
"cat-revision Write out metadata for a revision.\n"
12161
"dump-btree Dump the contents of a btree index file to stdout.\n"
12162
"export-pot Export command helps and error messages in po format.\n"
12163
"file-id Print file_id of a particular file or directory.\n"
12164
"file-path Print path of file_ids to a file or directory.\n"
12165
"find-merge-base Find and print a base revision for merging two "
12166
"branches.\n"
12167
"hooks Show hooks.\n"
12168
"inventory Show inventory of the current working copy or a "
12169
"revision.\n"
12170
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12171
"lookup-revision Lookup the revision-id from a revision-number\n"
12172
"merge-directive Generate a merge directive for auto-merge tools.\n"
12173
"modified List files modified in working tree.\n"
12174
"re-sign Create a digital signature for an existing revision.\n"
12175
"reference list, view and set branch locations for nested trees.\n"
12176
"relpath Show path of a file relative to root\n"
12177
"repair-workingtree Reset the working tree state file.\n"
12178
"revision-history Display the list of revision ids on a branch.\n"
12179
"revision-info Show revision number and revision id for a given "
12180
"revision\n"
12181
" identifier.\n"
12182
"rocks Statement of optimism.\n"
12183
"selftest Run internal test suite.\n"
12184
"shell-complete Show appropriate completions for context.\n"
12185
"test-script Run a shell-like test from a file.\n"
12186
"touching-revisions Return revision-ids which affected a particular file.\n"
12187
"unknowns List unknown files.\n"
12188
"wait-until-signalled Test helper for\n"
12189
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12190
msgstr ""
12191
12192
#: en/help_topics/hooks.txt:1
12193
msgid ""
12194
"\n"
12195
"Hooks\n"
12196
"====="
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12200
msgid ""
12201
"Introduction\n"
12202
"------------"
12203
msgstr ""
12204
12205
#: en/help_topics/hooks.txt:8
12206
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12207
msgstr ""
12208
12209
#: en/help_topics/hooks.txt:10
12210
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:12
12214
msgid ""
12215
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12216
msgstr ""
12217
12218
#: en/help_topics/hooks.txt:14
12219
msgid ""
12220
"The class that contains each hook is given before the hooks it supplies. "
12221
"For\n"
12222
"instance, BranchHooks as the class is the hooks class for\n"
12223
"`bzrlib.branch.Branch.hooks`."
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:18
12227
msgid ""
12228
"Each description also indicates whether the hook runs on the client (the\n"
12229
"machine where bzr was invoked) or the server (the machine addressed by\n"
12230
"the branch URL). These may be, but are not necessarily, the same machine."
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:22
12234
msgid ""
12235
"Plugins (including hooks) are run on the server if all of these is true:"
12236
msgstr ""
12237
12238
#: en/help_topics/hooks.txt:24
12239
msgid ""
12240
" * The connection is via a smart server (accessed with a URL starting with\n"
12241
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12242
"\"http://\"\n"
12243
" URL when a smart server is available via HTTP)."
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:28
12247
msgid ""
12248
" * The hook is either server specific or part of general infrastructure "
12249
"rather\n"
12250
" than client specific code (such as commit)."
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:31
12254
msgid ""
12255
"\n"
12256
"BranchHooks\n"
12257
"-----------"
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:35
12261
msgid ""
12262
"automatic_tag_name\n"
12263
"~~~~~~~~~~~~~~~~~~"
12264
msgstr ""
12265
12266
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12267
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12268
msgid "Introduced in: 2.2"
12269
msgstr "Introduzido em: 2.2"
12270
12271
#: en/help_topics/hooks.txt:40
12272
msgid ""
12273
"Called to determine an automatic tag name for a revision.\n"
12274
"automatic_tag_name is called with (branch, revision_id) and should\n"
12275
"return a tag name or None if no tag name could be determined. The\n"
12276
"first non-None tag name returned will be used."
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:45
12280
msgid ""
12281
"open\n"
12282
"~~~~"
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12286
#: en/help_topics/hooks.txt:304
12287
msgid "Introduced in: 1.8"
12288
msgstr "Introduzido em: 1.8"
12289
12290
#: en/help_topics/hooks.txt:50
12291
msgid ""
12292
"Called with the Branch object that has been opened after a branch is\n"
12293
"opened."
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:53
12297
msgid ""
12298
"post_branch_init\n"
12299
"~~~~~~~~~~~~~~~~"
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:58
12303
msgid ""
12304
"Called after new branch initialization completes. post_branch_init is\n"
12305
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12306
"branch and checkout (both heavyweight and lightweight) will all\n"
12307
"trigger this hook."
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:63
12311
msgid ""
12312
"post_change_branch_tip\n"
12313
"~~~~~~~~~~~~~~~~~~~~~~"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12317
msgid "Introduced in: 1.4"
12318
msgstr "Introduzido em: 1.4"
12319
12320
#: en/help_topics/hooks.txt:68
12321
msgid ""
12322
"Called in bzr client and server after a change to the tip of a branch\n"
12323
"is made. post_change_branch_tip is called with a\n"
12324
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12325
"uncommit will all trigger this hook."
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12329
msgid ""
12330
"post_commit\n"
12331
"~~~~~~~~~~~"
12332
msgstr ""
12333
"post_commit\n"
12334
"~~~~~~~~~~~"
12335
12336
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12337
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12338
#: en/help_topics/hooks.txt:145
12339
msgid "Introduced in: 0.15"
12340
msgstr "Introduzido em: 0.15"
12341
12342
#: en/help_topics/hooks.txt:78
12343
msgid ""
12344
"Called in the bzr client after a commit has completed. post_commit is\n"
12345
"called with (local, master, old_revno, old_revid, new_revno,\n"
12346
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12347
"branch."
12348
msgstr ""
12349
12350
#: en/help_topics/hooks.txt:83
12351
msgid ""
12352
"post_pull\n"
12353
"~~~~~~~~~"
12354
msgstr ""
12355
"post_pull\n"
12356
"~~~~~~~~~"
12357
12358
#: en/help_topics/hooks.txt:88
12359
msgid ""
12360
"Called after a pull operation completes. post_pull is called with a\n"
12361
"bzrlib.branch.PullResult object and only runs in the bzr client."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:91
12365
msgid ""
12366
"post_push\n"
12367
"~~~~~~~~~"
12368
msgstr ""
12369
"post_push\n"
12370
"~~~~~~~~~"
12371
12372
#: en/help_topics/hooks.txt:96
12373
msgid ""
12374
"Called after a push operation completes. post_push is called with a\n"
12375
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:99
12379
msgid ""
12380
"post_switch\n"
12381
"~~~~~~~~~~~"
12382
msgstr ""
12383
"post_switch\n"
12384
"~~~~~~~~~~~"
12385
12386
#: en/help_topics/hooks.txt:104
12387
msgid ""
12388
"Called after a checkout switches branch. post_switch is called with a\n"
12389
"bzrlib.branch.SwitchHookParams."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:107
12393
msgid ""
12394
"post_uncommit\n"
12395
"~~~~~~~~~~~~~"
12396
msgstr ""
12397
"post_uncommit\n"
12398
"~~~~~~~~~~~~~"
12399
12400
#: en/help_topics/hooks.txt:112
12401
msgid ""
12402
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12403
"called with (local, master, old_revno, old_revid, new_revno,\n"
12404
"new_revid) where local is the local branch or None, master is the\n"
12405
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12406
"of None."
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:118
12410
msgid ""
12411
"pre_change_branch_tip\n"
12412
"~~~~~~~~~~~~~~~~~~~~~"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:121
12416
msgid "Introduced in: 1.6"
12417
msgstr "Introduzido em: 1.6"
12418
12419
#: en/help_topics/hooks.txt:123
12420
msgid ""
12421
"Called in bzr client and server before a change to the tip of a branch\n"
12422
"is made. pre_change_branch_tip is called with a\n"
12423
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12424
"uncommit will all trigger this hook."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:128
12428
msgid ""
12429
"pre_commit\n"
12430
"~~~~~~~~~~"
12431
msgstr ""
12432
"pre_commit\n"
12433
"~~~~~~~~~~"
12434
12435
#: en/help_topics/hooks.txt:131
12436
msgid "Introduced in: 0.91"
12437
msgstr "Introduzido em: 0.91"
12438
12439
#: en/help_topics/hooks.txt:133
12440
msgid ""
12441
"Called after a commit is calculated but before it is completed.\n"
12442
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12443
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12444
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12445
"TreeDelta object describing changes from the basis revision. hooks\n"
12446
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12447
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12448
"tree."
12449
msgstr ""
12450
12451
#: en/help_topics/hooks.txt:142
12452
msgid ""
12453
"set_rh\n"
12454
"~~~~~~"
12455
msgstr ""
12456
12457
#: en/help_topics/hooks.txt:147
12458
msgid ""
12459
"Invoked whenever the revision history has been set via\n"
12460
"set_revision_history. The api signature is (branch, revision_history),\n"
12461
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12462
"for bzr to trigger, a better hook to use is\n"
12463
"Branch.post_change_branch_tip."
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:153
12467
msgid ""
12468
"transform_fallback_location\n"
12469
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12470
msgstr ""
12471
12472
#: en/help_topics/hooks.txt:156
12473
msgid "Introduced in: 1.9"
12474
msgstr "Introduzido em: 1.9"
12475
12476
#: en/help_topics/hooks.txt:158
12477
msgid ""
12478
"Called when a stacked branch is activating its fallback locations.\n"
12479
"transform_fallback_location is called with (branch, url), and should\n"
12480
"return a new url. Returning the same url allows it to be used as-is,\n"
12481
"returning a different one can be used to cause the branch to stack on\n"
12482
"a closer copy of that fallback_location. Note that the branch cannot\n"
12483
"have history accessing methods called on it during this hook because\n"
12484
"the fallback locations have not been activated. When there are\n"
12485
"multiple hooks installed for transform_fallback_location, all are\n"
12486
"called with the url returned from the previous hook.The order is\n"
12487
"however undefined."
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:169
12491
msgid ""
12492
"CommandHooks\n"
12493
"------------"
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:172
12497
msgid ""
12498
"extend_command\n"
12499
"~~~~~~~~~~~~~~"
12500
msgstr ""
12501
12502
#: en/help_topics/hooks.txt:175
12503
msgid "Introduced in: 1.13"
12504
msgstr "Introduzido em: 1.13"
12505
12506
#: en/help_topics/hooks.txt:177
12507
msgid ""
12508
"Called after creating a command object to allow modifications such as\n"
12509
"adding or removing options, docs etc. Called with the new\n"
12510
"bzrlib.commands.Command object."
12511
msgstr ""
12512
12513
#: en/help_topics/hooks.txt:181
12514
msgid ""
12515
"get_command\n"
12516
"~~~~~~~~~~~"
12517
msgstr ""
12518
12519
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12520
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12521
msgid "Introduced in: 1.17"
12522
msgstr "Introduzido em: 1.17"
12523
12524
#: en/help_topics/hooks.txt:186
12525
msgid ""
12526
"Called when creating a single command. Called with (cmd_or_None,\n"
12527
"command_name). get_command should either return the cmd_or_None\n"
12528
"parameter, or a replacement Command object that should be used for the\n"
12529
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12530
"Many users will prefer to use bzrlib.commands.register_command or\n"
12531
"plugin_cmds.register_lazy."
12532
msgstr ""
12533
12534
#: en/help_topics/hooks.txt:193
12535
msgid ""
12536
"get_missing_command\n"
12537
"~~~~~~~~~~~~~~~~~~~"
12538
msgstr ""
12539
12540
#: en/help_topics/hooks.txt:198
12541
msgid ""
12542
"Called when creating a single command if no command could be found.\n"
12543
"Called with (command_name). get_missing_command should either return\n"
12544
"None, or a Command object to be used for the command."
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:202
12548
msgid ""
12549
"list_commands\n"
12550
"~~~~~~~~~~~~~"
12551
msgstr ""
12552
12553
#: en/help_topics/hooks.txt:207
12554
msgid ""
12555
"Called when enumerating commands. Called with a set of cmd_name\n"
12556
"strings for all the commands found so far. This set is safe to mutate\n"
12557
"- e.g. to remove a command. list_commands should return the updated\n"
12558
"set of command names."
12559
msgstr ""
12560
12561
#: en/help_topics/hooks.txt:212
12562
msgid ""
12563
"_ConfigHooks\n"
12564
"------------"
12565
msgstr ""
12566
12567
#: en/help_topics/hooks.txt:215
12568
msgid ""
12569
"get\n"
12570
"~~~"
12571
msgstr ""
12572
12573
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12574
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12575
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12576
#: en/help_topics/hooks.txt:443
12577
msgid "Introduced in: 2.4"
12578
msgstr "Introduzido em: 2.4"
12579
12580
#: en/help_topics/hooks.txt:220
12581
msgid ""
12582
"Invoked when a config option is read. The signature is (stack, name,\n"
12583
"value)."
12584
msgstr ""
12585
12586
#: en/help_topics/hooks.txt:223
12587
msgid ""
12588
"load\n"
12589
"~~~~"
12590
msgstr ""
12591
12592
#: en/help_topics/hooks.txt:228
12593
msgid "Invoked when a config store is loaded. The signature is (store)."
12594
msgstr ""
12595
12596
#: en/help_topics/hooks.txt:230
12597
msgid ""
12598
"remove\n"
12599
"~~~~~~"
12600
msgstr ""
12601
12602
#: en/help_topics/hooks.txt:235
12603
msgid ""
12604
"Invoked when a config option is removed. The signature is (stack,\n"
12605
"name)."
12606
msgstr ""
12607
12608
#: en/help_topics/hooks.txt:238
12609
msgid ""
12610
"save\n"
12611
"~~~~"
12612
msgstr ""
12613
12614
#: en/help_topics/hooks.txt:243
12615
msgid "Invoked when a config store is saved. The signature is (store)."
12616
msgstr ""
12617
12618
#: en/help_topics/hooks.txt:245
12619
msgid ""
12620
"set\n"
12621
"~~~"
12622
msgstr ""
12623
12624
#: en/help_topics/hooks.txt:250
12625
msgid ""
12626
"Invoked when a config option is set. The signature is (stack, name,\n"
12627
"value)."
12628
msgstr ""
12629
12630
#: en/help_topics/hooks.txt:253
12631
msgid ""
12632
"ControlDirHooks\n"
12633
"---------------"
12634
msgstr ""
12635
12636
#: en/help_topics/hooks.txt:256
12637
msgid ""
12638
"post_repo_init\n"
12639
"~~~~~~~~~~~~~~"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:261
12643
msgid ""
12644
"Invoked after a repository has been initialized. post_repo_init is\n"
12645
"called with a bzrlib.controldir.RepoInitHookParams."
12646
msgstr ""
12647
12648
#: en/help_topics/hooks.txt:264
12649
msgid ""
12650
"pre_open\n"
12651
"~~~~~~~~"
12652
msgstr ""
12653
12654
#: en/help_topics/hooks.txt:267
12655
msgid "Introduced in: 1.14"
12656
msgstr "Introduzido em: 1.14"
12657
12658
#: en/help_topics/hooks.txt:269
12659
msgid ""
12660
"Invoked before attempting to open a ControlDir with the transport that\n"
12661
"the open will use."
12662
msgstr ""
12663
12664
#: en/help_topics/hooks.txt:272
12665
msgid ""
12666
"InfoHooks\n"
12667
"---------"
12668
msgstr ""
12669
12670
#: en/help_topics/hooks.txt:275
12671
msgid ""
12672
"repository\n"
12673
"~~~~~~~~~~"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12677
#: en/help_topics/hooks.txt:521
12678
msgid "Introduced in: 1.15"
12679
msgstr "Introduzido em: 1.15.0"
12680
12681
#: en/help_topics/hooks.txt:280
12682
msgid ""
12683
"Invoked when displaying the statistics for a repository. repository is\n"
12684
"called with a statistics dictionary as returned by the repository and\n"
12685
"a file-like object to write to."
12686
msgstr ""
12687
12688
#: en/help_topics/hooks.txt:284
12689
msgid ""
12690
"LockHooks\n"
12691
"---------"
12692
msgstr ""
12693
12694
#: en/help_topics/hooks.txt:287
12695
msgid ""
12696
"lock_acquired\n"
12697
"~~~~~~~~~~~~~"
12698
msgstr ""
12699
12700
#: en/help_topics/hooks.txt:292
12701
msgid ""
12702
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12703
msgstr ""
12704
12705
#: en/help_topics/hooks.txt:294
12706
msgid ""
12707
"lock_broken\n"
12708
"~~~~~~~~~~~"
12709
msgstr ""
12710
12711
#: en/help_topics/hooks.txt:299
12712
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12713
msgstr ""
12714
12715
#: en/help_topics/hooks.txt:301
12716
msgid ""
12717
"lock_released\n"
12718
"~~~~~~~~~~~~~"
12719
msgstr ""
12720
12721
#: en/help_topics/hooks.txt:306
12722
msgid ""
12723
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12724
msgstr ""
12725
12726
#: en/help_topics/hooks.txt:308
12727
msgid ""
12728
"MergeHooks\n"
12729
"----------"
12730
msgstr ""
12731
12732
#: en/help_topics/hooks.txt:311
12733
msgid ""
12734
"merge_file_content\n"
12735
"~~~~~~~~~~~~~~~~~~"
12736
msgstr ""
12737
12738
#: en/help_topics/hooks.txt:314
12739
msgid "Introduced in: 2.1"
12740
msgstr "Introduzido em: 2.1"
12741
12742
#: en/help_topics/hooks.txt:316
12743
msgid ""
12744
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12745
"object when starting a merge. Should return either None or a subclass\n"
12746
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12747
"called per file that needs to be merged (including when one side has\n"
12748
"deleted the file and the other has changed it). See the\n"
12749
"AbstractPerFileMerger API docs for details on how it is used by merge."
12750
msgstr ""
12751
12752
#: en/help_topics/hooks.txt:323
12753
msgid ""
12754
"post_merge\n"
12755
"~~~~~~~~~~"
12756
msgstr ""
12757
12758
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12759
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12760
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12761
msgid "Introduced in: 2.5"
12762
msgstr "Introduzido em: 2.5"
12763
12764
#: en/help_topics/hooks.txt:328
12765
msgid ""
12766
"Called after a merge. Receives a Merger object as the single argument.\n"
12767
"The return value is ignored."
12768
msgstr ""
12769
12770
#: en/help_topics/hooks.txt:331
12771
msgid ""
12772
"pre_merge\n"
12773
"~~~~~~~~~"
12774
msgstr ""
12775
12776
#: en/help_topics/hooks.txt:336
12777
msgid ""
12778
"Called before a merge. Receives a Merger object as the single\n"
12779
"argument."
12780
msgstr ""
12781
12782
#: en/help_topics/hooks.txt:339
12783
msgid ""
12784
"MergeDirectiveHooks\n"
12785
"-------------------"
12786
msgstr ""
12787
12788
#: en/help_topics/hooks.txt:342
12789
msgid ""
12790
"merge_request_body\n"
12791
"~~~~~~~~~~~~~~~~~~"
12792
msgstr ""
12793
12794
#: en/help_topics/hooks.txt:345
12795
msgid "Introduced in: 1.15.0"
12796
msgstr "Introduzido em: 1.15.0"
12797
12798
#: en/help_topics/hooks.txt:347
12799
msgid ""
12800
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12801
"request. Callbacks must return a body. If more than one callback is\n"
12802
"registered, the output of one callback is provided to the next."
12803
msgstr ""
12804
12805
#: en/help_topics/hooks.txt:351
12806
msgid ""
12807
"MessageEditorHooks\n"
12808
"------------------"
12809
msgstr ""
12810
12811
#: en/help_topics/hooks.txt:354
12812
msgid ""
12813
"commit_message_template\n"
12814
"~~~~~~~~~~~~~~~~~~~~~~~"
12815
msgstr ""
12816
12817
#: en/help_topics/hooks.txt:357
12818
msgid "Introduced in: 1.10"
12819
msgstr "Introduzido em: 1.10"
12820
12821
#: en/help_topics/hooks.txt:359
12822
msgid ""
12823
"Called when a commit message is being generated.\n"
12824
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12825
"and the message that is known so far. commit_message_template must\n"
12826
"return a new message to use (which could be the same as it was given).\n"
12827
"When there are multiple hooks registered for commit_message_template,\n"
12828
"they are chained with the result from the first passed into the\n"
12829
"second, and so on."
12830
msgstr ""
12831
12832
#: en/help_topics/hooks.txt:367
12833
msgid ""
12834
"set_commit_message\n"
12835
"~~~~~~~~~~~~~~~~~~"
12836
msgstr ""
12837
12838
#: en/help_topics/hooks.txt:372
12839
msgid ""
12840
"Set a fixed commit message. set_commit_message is called with the\n"
12841
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12842
"properties by editing commit.builder._revprops) and the message so\n"
12843
"far. set_commit_message must return the message to use or None if it\n"
12844
"should use the message editor as normal."
12845
msgstr ""
12846
12847
#: en/help_topics/hooks.txt:378
12848
msgid ""
12849
"MutableTreeHooks\n"
12850
"----------------"
12851
msgstr ""
12852
12853
#: en/help_topics/hooks.txt:381
12854
msgid ""
12855
"post_build_tree\n"
12856
"~~~~~~~~~~~~~~~"
12857
msgstr ""
12858
12859
#: en/help_topics/hooks.txt:386
12860
msgid ""
12861
"Called after a completely new tree is built. The hook is called with\n"
12862
"the tree as its only argument."
12863
msgstr ""
12864
12865
#: en/help_topics/hooks.txt:392
12866
msgid "Introduced in: 2.0"
12867
msgstr "Introduzido em: 2.0"
12868
12869
#: en/help_topics/hooks.txt:394
12870
msgid ""
12871
"Called after a commit is performed on a tree. The hook is called with\n"
12872
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12873
"commit was performed on is available via the mutable_tree attribute of\n"
12874
"that object."
12875
msgstr ""
12876
12877
#: en/help_topics/hooks.txt:399
12878
msgid ""
12879
"post_transform\n"
12880
"~~~~~~~~~~~~~~"
12881
msgstr ""
12882
12883
#: en/help_topics/hooks.txt:404
12884
msgid ""
12885
"Called after a tree transform has been performed on a tree. The hook\n"
12886
"is called with the tree that is being transformed and the transform."
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:407
12890
msgid ""
12891
"pre_transform\n"
12892
"~~~~~~~~~~~~~"
12893
msgstr ""
12894
12895
#: en/help_topics/hooks.txt:412
12896
msgid ""
12897
"Called before a tree transform on this tree. The hook is called with\n"
12898
"the tree that is being transformed and the transform."
12899
msgstr ""
12900
12901
#: en/help_topics/hooks.txt:415
12902
msgid ""
12903
"start_commit\n"
12904
"~~~~~~~~~~~~"
12905
msgstr ""
12906
12907
#: en/help_topics/hooks.txt:420
12908
msgid ""
12909
"Called before a commit is performed on a tree. The start commit hook\n"
12910
"is able to change the tree before the commit takes place. start_commit\n"
12911
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12912
"being performed on."
12913
msgstr ""
12914
12915
#: en/help_topics/hooks.txt:425
12916
msgid ""
12917
"SmartClientHooks\n"
12918
"----------------"
12919
msgstr ""
12920
12921
#: en/help_topics/hooks.txt:428
12922
msgid ""
12923
"call\n"
12924
"~~~~"
12925
msgstr ""
12926
12927
#: en/help_topics/hooks.txt:431
12928
msgid "Introduced in: unknown"
12929
msgstr "Introduzido em: desconhecido"
12930
12931
#: en/help_topics/hooks.txt:433
12932
msgid ""
12933
"Called when the smart client is submitting a request to the smart\n"
12934
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12935
"Streaming request bodies, and responses, are not accessible."
12936
msgstr ""
12937
12938
#: en/help_topics/hooks.txt:437
12939
msgid ""
12940
"SmartServerHooks\n"
12941
"----------------"
12942
msgstr ""
12943
12944
#: en/help_topics/hooks.txt:440
12945
msgid ""
12946
"server_exception\n"
12947
"~~~~~~~~~~~~~~~~"
12948
msgstr ""
12949
12950
#: en/help_topics/hooks.txt:445
12951
msgid ""
12952
"Called by the bzr server when an exception occurs. server_exception is\n"
12953
"called with the sys.exc_info() tuple return true for the hook if the\n"
12954
"exception has been handled, in which case the server will exit\n"
12955
"normally."
12956
msgstr ""
12957
12958
#: en/help_topics/hooks.txt:450
12959
msgid ""
12960
"server_started\n"
12961
"~~~~~~~~~~~~~~"
12962
msgstr ""
12963
12964
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12965
msgid "Introduced in: 0.16"
12966
msgstr "Introduzido em: 0.16"
12967
12968
#: en/help_topics/hooks.txt:455
12969
msgid ""
12970
"Called by the bzr server when it starts serving a directory.\n"
12971
"server_started is called with (backing urls, public url), where\n"
12972
"backing_url is a list of URLs giving the server-specific directory\n"
12973
"locations, and public_url is the public URL for the directory being\n"
12974
"served."
12975
msgstr ""
12976
12977
#: en/help_topics/hooks.txt:461
12978
msgid ""
12979
"server_started_ex\n"
12980
"~~~~~~~~~~~~~~~~~"
12981
msgstr ""
12982
12983
#: en/help_topics/hooks.txt:466
12984
msgid ""
12985
"Called by the bzr server when it starts serving a directory.\n"
12986
"server_started is called with (backing_urls, server_obj)."
12987
msgstr ""
12988
12989
#: en/help_topics/hooks.txt:469
12990
msgid ""
12991
"server_stopped\n"
12992
"~~~~~~~~~~~~~~"
12993
msgstr ""
12994
12995
#: en/help_topics/hooks.txt:474
12996
msgid ""
12997
"Called by the bzr server when it stops serving a directory.\n"
12998
"server_stopped is called with the same parameters as the\n"
12999
"server_started hook: (backing_urls, public_url)."
13000
msgstr ""
13001
13002
#: en/help_topics/hooks.txt:478
13003
msgid ""
13004
"StatusHooks\n"
13005
"-----------"
13006
msgstr ""
13007
13008
#: en/help_topics/hooks.txt:481
13009
msgid ""
13010
"post_status\n"
13011
"~~~~~~~~~~~"
13012
msgstr ""
13013
13014
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13015
msgid "Introduced in: 2.3"
13016
msgstr "Introduzido em: 2.3"
13017
13018
#: en/help_topics/hooks.txt:486
13019
msgid ""
13020
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13021
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13022
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13023
"correspond to the command line options specified by the user for the\n"
13024
"status command. to_file is the output stream for writing."
13025
msgstr ""
13026
13027
#: en/help_topics/hooks.txt:492
13028
msgid ""
13029
"pre_status\n"
13030
"~~~~~~~~~~"
13031
msgstr ""
13032
13033
#: en/help_topics/hooks.txt:497
13034
msgid ""
13035
"Called with argument StatusHookParams before Bazaar displays the\n"
13036
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13037
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13038
"correspond to the command line options specified by the user for the\n"
13039
"status command. to_file is the output stream for writing."
13040
msgstr ""
13041
13042
#: en/help_topics/hooks.txt:503
13043
msgid ""
13044
"TransportHooks\n"
13045
"--------------"
13046
msgstr ""
13047
13048
#: en/help_topics/hooks.txt:506
13049
msgid ""
13050
"post_connect\n"
13051
"~~~~~~~~~~~~"
13052
msgstr ""
13053
13054
#: en/help_topics/hooks.txt:511
13055
msgid ""
13056
"Called after a new connection is established or a reconnect occurs.\n"
13057
"The sole argument passed is either the connected transport or smart\n"
13058
"medium instance."
13059
msgstr ""
13060
13061
#: en/help_topics/hooks.txt:515
13062
msgid ""
13063
"RioVersionInfoBuilderHooks\n"
13064
"--------------------------"
13065
msgstr ""
13066
13067
#: en/help_topics/hooks.txt:518
13068
msgid ""
13069
"revision\n"
13070
"~~~~~~~~"
13071
msgstr ""
13072
13073
#: en/help_topics/hooks.txt:523
13074
msgid ""
13075
"Invoked when adding information about a revision to the RIO stanza\n"
13076
"that is printed. revision is called with a revision object and a RIO\n"
13077
"stanza.\n"
13078
msgstr ""
13079
13080
#: en/help_topics/location-alias.txt:1
13081
msgid ""
13082
"Location aliases\n"
13083
"================"
13084
msgstr ""
13085
13086
#: en/help_topics/location-alias.txt:4
13087
msgid ""
13088
"Bazaar defines several aliases for locations associated with a branch. "
13089
"These\n"
13090
"can be used with most commands that expect a location, such as `bzr push`."
13091
msgstr ""
13092
13093
#: en/help_topics/location-alias.txt:7
13094
msgid "The aliases are::"
13095
msgstr ""
13096
13097
#: en/help_topics/location-alias.txt:9
13098
msgid ""
13099
" :bound The branch this branch is bound to, for bound branches.\n"
13100
" :parent The parent of this branch.\n"
13101
" :public The public location of this branch.\n"
13102
" :push The saved location used for `bzr push` with no arguments.\n"
13103
" :submit The submit branch for this branch.\n"
13104
" :this This branch."
13105
msgstr ""
13106
13107
#: en/help_topics/location-alias.txt:16
13108
msgid "For example, to push to the parent location::"
13109
msgstr ""
13110
13111
#: en/help_topics/location-alias.txt:18
13112
msgid " bzr push :parent\n"
13113
msgstr ""
13114
13115
#: en/help_topics/log-formats.txt:1
13116
msgid ""
13117
"Log Formats\n"
13118
"==========="
13119
msgstr ""
13120
13121
#: en/help_topics/log-formats.txt:4
13122
msgid ""
13123
"A log format controls how information about each revision is displayed.\n"
13124
"The standard log formats are compared below::"
13125
msgstr ""
13126
13127
#: en/help_topics/log-formats.txt:7
13128
msgid ""
13129
" Feature long short line\n"
13130
" ---------------------- ------------- ------------ -------------------\n"
13131
" design goal detailed view concise view 1 revision per line\n"
13132
" committer name+email name only name only\n"
13133
" author name+email - -\n"
13134
" date-time format full date only date only\n"
13135
" commit message full full top line\n"
13136
" tags yes yes yes\n"
13137
" merges indicator - yes -\n"
13138
" status/delta optional optional -\n"
13139
" diff/patch optional optional -\n"
13140
" revision-id optional optional -\n"
13141
" branch nick yes - -\n"
13142
" foreign vcs properties yes yes -\n"
13143
" preferred levels all 1 1\n"
13144
" digital signature optional - -"
13145
msgstr ""
13146
13147
#: en/help_topics/log-formats.txt:24
13148
msgid ""
13149
"The default format is ``long``. To change this, define the ``log_format``\n"
13150
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13151
msgstr ""
13152
13153
#: en/help_topics/log-formats.txt:27
13154
msgid ""
13155
" [DEFAULT]\n"
13156
" log_format = short"
13157
msgstr ""
13158
13159
#: en/help_topics/log-formats.txt:30
13160
msgid ""
13161
"Alternatively, to change the log format used for a given query, use the\n"
13162
"--long, --short or --line options."
13163
msgstr ""
13164
13165
#: en/help_topics/log-formats.txt:33
13166
msgid ""
13167
"If one of the standard log formats does not meet your needs, additional\n"
13168
"formats can be provided by plugins.\n"
13169
msgstr ""
13170
13171
#: en/help_topics/other-formats.txt:1
13172
msgid "Other Storage Formats"
13173
msgstr "Outros formatos de armazenamento"
13174
13175
#: en/help_topics/other-formats.txt:3
13176
msgid "Experimental formats are shown below."
13177
msgstr "Formatos experimentais são mostrados abaixo."
13178
13179
#: en/help_topics/other-formats.txt:5
13180
msgid ""
13181
":development-colo:\n"
13182
" (native) The 2a format with experimental support for colocated\n"
13183
" branches."
13184
msgstr ""
13185
13186
#: en/help_topics/other-formats.txt:9
13187
msgid ""
13188
"\n"
13189
"Deprecated formats are shown below."
13190
msgstr ""
13191
"\n"
13192
"Formatos obsoletos são mostrados abaixo."
13193
13194
#: en/help_topics/other-formats.txt:12
13195
msgid ""
13196
":pack-0.92:\n"
13197
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13198
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13199
" by bzr < 0.92."
13200
msgstr ""
13201
13202
#: en/help_topics/patterns.txt:1
13203
msgid ""
13204
"Patterns\n"
13205
"========"
13206
msgstr ""
13207
13208
#: en/help_topics/patterns.txt:4
13209
msgid ""
13210
"Bazaar uses patterns to match files at various times. For example,\n"
13211
"the ``add`` command skips over files that match ignore patterns\n"
13212
"and preferences can be associated with files using rule patterns.\n"
13213
"The pattern syntax is described below."
13214
msgstr ""
13215
13216
#: en/help_topics/patterns.txt:9
13217
msgid ""
13218
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13219
"slash or is a regular expression, it is compared to the whole path\n"
13220
"from the branch root. Otherwise, it is compared to only the last\n"
13221
"component of the path. To match a file only in the root directory,\n"
13222
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13223
msgstr ""
13224
13225
#: en/help_topics/patterns.txt:15
13226
msgid "Patterns may include globbing wildcards such as::"
13227
msgstr ""
13228
13229
#: en/help_topics/patterns.txt:17
13230
msgid ""
13231
" ? - Matches any single character except '/'\n"
13232
" * - Matches 0 or more characters except '/'\n"
13233
" /**/ - Matches 0 or more directories in a path\n"
13234
" [a-z] - Matches a single character from within a group of characters"
13235
msgstr ""
13236
13237
#: en/help_topics/patterns.txt:22
13238
msgid ""
13239
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13240
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13241
"expression. Regular expression patterns may not include named or\n"
13242
"numbered groups."
13243
msgstr ""
13244
13245
#: en/help_topics/patterns.txt:27
13246
msgid ""
13247
"Case insensitive ignore patterns can be specified with regular expressions\n"
13248
"by using the ``i`` (for ignore case) flag in the pattern."
13249
msgstr ""
13250
13251
#: en/help_topics/patterns.txt:30
13252
msgid ""
13253
"For example, a case insensitive match for ``foo`` may be specified as::"
13254
msgstr ""
13255
13256
#: en/help_topics/patterns.txt:32
13257
msgid " RE:(?i)foo"
13258
msgstr ""
13259
13260
#: en/help_topics/patterns.txt:34
13261
msgid ""
13262
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13263
"matched by that pattern will not be ignored."
13264
msgstr ""
13265
13266
#: en/help_topics/patterns.txt:37
13267
msgid ""
13268
".. _Python regular expressions: http://docs.python.org/library/re.html"
13269
msgstr ""
13270
13271
#: en/help_topics/revisionspec.txt:1
13272
msgid "Revision Identifiers"
13273
msgstr ""
13274
13275
#: en/help_topics/revisionspec.txt:3
13276
msgid ""
13277
"A revision identifier refers to a specific state of a branch's history. It\n"
13278
"can be expressed in several ways. It can begin with a keyword to\n"
13279
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13280
"'before:yesterday' and 'submit:'."
13281
msgstr ""
13282
13283
#: en/help_topics/revisionspec.txt:8
13284
msgid ""
13285
"Alternately, it can be given without a keyword, in which case it will be\n"
13286
"checked as a revision number, a tag, a revision id, a date specification, or "
13287
"a\n"
13288
"branch specification, in that order. For example, 'date:today' could be\n"
13289
"written as simply 'today', though if you have a tag called 'today' that "
13290
"will\n"
13291
"be found first."
13292
msgstr ""
13293
13294
#: en/help_topics/revisionspec.txt:14
13295
msgid ""
13296
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13297
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13298
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13299
"or\n"
13300
"spaces around the '..')."
13301
msgstr ""
13302
13303
#: en/help_topics/revisionspec.txt:19
13304
msgid ""
13305
"Ranges are interpreted differently by different commands. To the \"log\" "
13306
"command,\n"
13307
"a range is a sequence of log messages, but to the \"diff\" command, the "
13308
"range\n"
13309
"denotes a change between revisions (and not a sequence of changes). In\n"
13310
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13311
"consider it\n"
13312
"to be open-ended, that is, they include one end but not the other. For "
13313
"example:\n"
13314
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13315
"3649,\n"
13316
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13317
"and\n"
13318
"3649, but not 3647."
13319
msgstr ""
13320
13321
#: en/help_topics/revisionspec.txt:28
13322
msgid "The keywords used as revision selection methods are the following:"
13323
msgstr ""
13324
13325
#: en/help_topics/revisionspec.txt:30
13326
msgid ""
13327
":revid:\n"
13328
"\tSelects a revision using the revision id.\n"
13329
":submit:\n"
13330
"\tSelects a common ancestor with the submit branch.\n"
13331
":ancestor:\n"
13332
"\tSelects a common ancestor with a second branch.\n"
13333
":date:\n"
13334
"\tSelects a revision on the basis of a datestamp.\n"
13335
":branch:\n"
13336
"\tSelects the last revision of a specified branch.\n"
13337
":tag:\n"
13338
"\tSelects a revision identified by a tag name.\n"
13339
":revno:\n"
13340
"\tSelects a revision using a number.\n"
13341
":before:\n"
13342
"\tSelects the parent of the revision specified.\n"
13343
":annotate:\n"
13344
"\tSelect the revision that last modified the specified line.\n"
13345
":mainline:\n"
13346
"\tSelect mainline revision that merged the specified revision.\n"
13347
":last:\n"
13348
"\tSelects the nth revision from the end."
13349
msgstr ""
13350
13351
#: en/help_topics/revisionspec.txt:53
13352
msgid "In addition, plugins can provide other keywords."
13353
msgstr ""
13354
13355
#: en/help_topics/revisionspec.txt:55
13356
msgid "A detailed description of each keyword is given below."
13357
msgstr ""
13358
13359
#: en/help_topics/revisionspec.txt:57
13360
msgid ":revid:"
13361
msgstr ""
13362
13363
#: en/help_topics/revisionspec.txt:59
13364
msgid ""
13365
" Supply a specific revision id, that can be used to specify any\n"
13366
" revision id in the ancestry of the branch.\n"
13367
" Including merges, and pending merges.\n"
13368
" Examples::"
13369
msgstr ""
13370
13371
#: en/help_topics/revisionspec.txt:64
13372
msgid ""
13373
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13374
msgstr ""
13375
13376
#: en/help_topics/revisionspec.txt:66
13377
msgid ":submit:"
13378
msgstr ""
13379
13380
#: en/help_topics/revisionspec.txt:68
13381
msgid ""
13382
" Diffing against this shows all the changes that were made in this "
13383
"branch,\n"
13384
" and is a good predictor of what merge will do. The submit branch is\n"
13385
" used by the bundle and merge directive commands. If no submit branch\n"
13386
" is specified, the parent branch is used instead."
13387
msgstr ""
13388
13389
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13390
msgid ""
13391
" The common ancestor is the last revision that existed in both\n"
13392
" branches. Usually this is the branch point, but it could also be\n"
13393
" a revision that was merged."
13394
msgstr ""
13395
13396
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13397
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13398
#: en/help_topics/revisionspec.txt:153
13399
msgid " Examples::"
13400
msgstr " Exemplos::"
13401
13402
#: en/help_topics/revisionspec.txt:79
13403
msgid " $ bzr diff -r submit:"
13404
msgstr " $ bzr diff -r submit:"
13405
13406
#: en/help_topics/revisionspec.txt:81
13407
msgid ":ancestor:"
13408
msgstr ""
13409
13410
#: en/help_topics/revisionspec.txt:83
13411
msgid " Supply the path to a branch to select the common ancestor."
13412
msgstr ""
13413
13414
#: en/help_topics/revisionspec.txt:89
13415
msgid ""
13416
" This is frequently used with 'diff' to return all of the changes\n"
13417
" that your branch introduces, while excluding the changes that you\n"
13418
" have not merged from the remote branch."
13419
msgstr ""
13420
13421
#: en/help_topics/revisionspec.txt:95
13422
msgid ""
13423
" ancestor:/path/to/branch\n"
13424
" $ bzr diff -r ancestor:../../mainline/branch"
13425
msgstr ""
13426
13427
#: en/help_topics/revisionspec.txt:98
13428
msgid ":date:"
13429
msgstr ""
13430
13431
#: en/help_topics/revisionspec.txt:100
13432
msgid ""
13433
" Supply a datestamp to select the first revision that matches the date.\n"
13434
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13435
" Matches the first entry after a given date (either at midnight or\n"
13436
" at a specified time)."
13437
msgstr ""
13438
13439
#: en/help_topics/revisionspec.txt:105
13440
msgid " One way to display all the changes since yesterday would be::"
13441
msgstr ""
13442
13443
#: en/help_topics/revisionspec.txt:107
13444
msgid " bzr log -r date:yesterday.."
13445
msgstr ""
13446
13447
#: en/help_topics/revisionspec.txt:111
13448
msgid ""
13449
" date:yesterday -> select the first revision since "
13450
"yesterday\n"
13451
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13452
" August 14th, 2006 at 5:10pm."
13453
msgstr ""
13454
13455
#: en/help_topics/revisionspec.txt:115
13456
msgid ":branch:"
13457
msgstr ":ramo:"
13458
13459
#: en/help_topics/revisionspec.txt:117
13460
msgid " Supply the path to a branch to select its last revision."
13461
msgstr ""
13462
" Fornecer o caminho de um ramo para selecionar sua última revisão."
13463
13464
#: en/help_topics/revisionspec.txt:121
13465
msgid " branch:/path/to/branch"
13466
msgstr " branch:/caminho/para/ramo"
13467
13468
#: en/help_topics/revisionspec.txt:123
13469
msgid ":tag:"
13470
msgstr ":tag:"
13471
13472
#: en/help_topics/revisionspec.txt:125
13473
msgid " Tags are stored in the branch and created by the 'tag' command."
13474
msgstr " Tags são armazenadas no ramo e criadas pelo comando 'tag'."
13475
13476
#: en/help_topics/revisionspec.txt:127
13477
msgid ":revno:"
13478
msgstr ":revno:"
13479
13480
#: en/help_topics/revisionspec.txt:129
13481
msgid ""
13482
" Use an integer to specify a revision in the history of the branch.\n"
13483
" Optionally a branch can be specified. A negative number will count\n"
13484
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13485
" one). If the negative number is larger than the branch's history, the\n"
13486
" first revision is returned.\n"
13487
" Examples::"
13488
msgstr ""
13489
13490
#: en/help_topics/revisionspec.txt:136
13491
msgid ""
13492
" revno:1 -> return the first revision of this branch\n"
13493
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13494
" the branch '/path/to/branch'\n"
13495
" revno:-1 -> The last revision in a branch.\n"
13496
" -2:http://other/branch -> The second to last revision in the\n"
13497
" remote branch.\n"
13498
" -1000000 -> Most likely the first revision, unless\n"
13499
" your history is very long."
13500
msgstr ""
13501
13502
#: en/help_topics/revisionspec.txt:145
13503
msgid ":before:"
13504
msgstr ""
13505
13506
#: en/help_topics/revisionspec.txt:147
13507
msgid ""
13508
" Supply any revision spec to return the parent of that revision. This "
13509
"is\n"
13510
" mostly useful when inspecting revisions that are not in the revision "
13511
"history\n"
13512
" of a branch."
13513
msgstr ""
13514
13515
#: en/help_topics/revisionspec.txt:151
13516
msgid ""
13517
" It is an error to request the parent of the null revision (before:0)."
13518
msgstr ""
13519
13520
#: en/help_topics/revisionspec.txt:155
13521
msgid ""
13522
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13523
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13524
" aaaa@bbbb-1234567890\n"
13525
" bzr diff -r before:1913..1913\n"
13526
" -> Find the changes between revision 1913 and its parent "
13527
"(1912).\n"
13528
" (What changes did revision 1913 introduce).\n"
13529
" This is equivalent to: bzr diff -c 1913"
13530
msgstr ""
13531
13532
#: en/help_topics/revisionspec.txt:163
13533
msgid ":annotate:"
13534
msgstr ""
13535
13536
#: en/help_topics/revisionspec.txt:165
13537
msgid ""
13538
" Select the revision that last modified the specified line. Line is\n"
13539
" specified as path:number. Path is a relative path to the file. "
13540
"Numbers\n"
13541
" start at 1, and are relative to the current version, not the last-\n"
13542
" committed version of the file."
13543
msgstr ""
13544
13545
#: en/help_topics/revisionspec.txt:170
13546
msgid ":mainline:"
13547
msgstr ""
13548
13549
#: en/help_topics/revisionspec.txt:172
13550
msgid ""
13551
" Select the revision that merged the specified revision into mainline."
13552
msgstr ""
13553
13554
#: en/help_topics/revisionspec.txt:174
13555
msgid ":last:"
13556
msgstr ""
13557
13558
#: en/help_topics/revisionspec.txt:176
13559
msgid ""
13560
" Supply a positive number to get the nth revision from the end.\n"
13561
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13562
" Examples::"
13563
msgstr ""
13564
13565
#: en/help_topics/revisionspec.txt:180
13566
msgid ""
13567
" last:1 -> return the last revision\n"
13568
" last:3 -> return the revision 2 before the end.\n"
13569
msgstr ""
13570
13571
#: en/help_topics/rules.txt:1
13572
msgid ""
13573
"Rules\n"
13574
"====="
13575
msgstr ""
13576
"Regras\n"
13577
"====="
13578
13579
#: en/help_topics/rules.txt:7
13580
msgid ""
13581
"Rules are defined in ini file format where the sections are file glob\n"
13582
"patterns and the contents of each section are the preferences for files\n"
13583
"matching that pattern(s). For example::"
13584
msgstr ""
13585
13586
#: en/help_topics/rules.txt:11
13587
msgid ""
13588
" [name *.bat]\n"
13589
" eol = native"
13590
msgstr ""
13591
13592
#: en/help_topics/rules.txt:14
13593
msgid ""
13594
" [name *.html *.xml]\n"
13595
" keywords = xml_escape"
13596
msgstr ""
13597
13598
#: en/help_topics/rules.txt:17
13599
msgid ""
13600
"Preferences like these are useful for commands and plugins wishing to\n"
13601
"provide custom behaviour for selected files. For more information on \n"
13602
"end of line conversion see :doc:`eol-help`.\n"
13603
"Keyword support is provided by the `keywords plugin\n"
13604
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13605
msgstr ""
13606
13607
#: en/help_topics/rules.txt:23
13608
msgid ""
13609
"Files\n"
13610
"-----"
13611
msgstr ""
13612
"Arquivos\n"
13613
"-----"
13614
13615
#: en/help_topics/rules.txt:26
13616
msgid ""
13617
"Default rules for all branches are defined in the optional file\n"
13618
"``BZR_HOME/rules``. "
13619
msgstr ""
13620
13621
#: en/help_topics/rules.txt:29
13622
msgid ""
13623
"Rule Patterns\n"
13624
"-------------"
13625
msgstr ""
13626
13627
#: en/help_topics/rules.txt:32
13628
msgid ""
13629
"Patterns are ordered and searching stops as soon as one matches.\n"
13630
"As a consequence, more explicit patterns should be placed towards\n"
13631
"the top of the file. Rule patterns use exactly the same conventions\n"
13632
"as ignore patterns. See :doc:`patterns-help` for details."
13633
msgstr ""
13634
13635
#: en/help_topics/rules.txt:37
13636
msgid ".. note::"
13637
msgstr ""
13638
13639
#: en/help_topics/rules.txt:39
13640
msgid ""
13641
" Patterns containing square brackets or spaces should be\n"
13642
" surrounded in quotes to ensure they are correctly parsed.\n"
13643
msgstr ""
13644
13645
#: en/help_topics/topics.txt:1
13646
msgid ""
13647
"authentication Information on configuring authentication\n"
13648
"basic Basic commands\n"
13649
"branches Information on what a branch is\n"
13650
"bugs Bug tracker settings\n"
13651
"checkouts Information on what a checkout is\n"
13652
"commands Basic help for all commands\n"
13653
"configuration Details on the configuration settings available\n"
13654
"conflict-types Types of conflicts and what to do about them\n"
13655
"content-filters Conversion of content into/from working trees\n"
13656
"criss-cross Information on criss-cross merging\n"
13657
"current-formats Current storage formats\n"
13658
"debug-flags Options to show or record debug information\n"
13659
"diverged-branches How to fix diverged branches\n"
13660
"env-variables Environment variable names and values\n"
13661
"eol Information on end-of-line handling\n"
13662
"files Information on configuration and log files\n"
13663
"formats Information on choosing a storage format\n"
13664
"global-options Options that control how Bazaar runs\n"
13665
"hidden-commands All hidden commands\n"
13666
"hooks Points at which custom processing can be added\n"
13667
"launchpad Using Bazaar with Launchpad.net\n"
13668
"location-alias Aliases for remembered locations\n"
13669
"log-formats Details on the logging formats available\n"
13670
"other-formats Experimental and deprecated storage formats\n"
13671
"patterns Information on the pattern syntax\n"
13672
"repositories Basic information on shared repositories.\n"
13673
"revisionspec Explain how to use --revision\n"
13674
"rules Information on defining rule-based preferences\n"
13675
"standalone-trees Information on what a standalone tree is\n"
13676
"standard-options Options that can be used with any command\n"
13677
"status-flags Help on status flags\n"
13678
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13679
"topics Topics list\n"
13680
"url-special-chars Special character handling in URLs\n"
13681
"urlspec Supported transport protocols\n"
13682
"working-trees Information on working trees\n"
13683
msgstr ""
13684
13685
#: en/help_topics/url-special-chars.txt:1
13686
msgid ""
13687
"Special character handling in URLs\n"
13688
"=================================="
13689
msgstr ""
13690
13691
#: en/help_topics/url-special-chars.txt:4
13692
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13693
msgstr "Bazaar permite locais serem especificados de várias maneiras, seja:"
13694
13695
#: en/help_topics/url-special-chars.txt:6
13696
msgid " * Fully qualified URLs"
13697
msgstr " * URLs completamente definidas"
13698
13699
#: en/help_topics/url-special-chars.txt:8
13700
msgid " * File system paths, relative or absolute"
13701
msgstr " * Caminhos do sistema de arquivos, absolutos ou relativos"
13702
13703
#: en/help_topics/url-special-chars.txt:10
13704
msgid ""
13705
"Internally bzr treats all locations as URLs. For any file system paths\n"
13706
"that are specified it will automatically determine the appropriate URL\n"
13707
"representation, and escape special characters where necessary."
13708
msgstr ""
13709
13710
#: en/help_topics/url-special-chars.txt:14
13711
msgid ""
13712
"There are a few characters which have special meaning in URLs and need "
13713
"careful\n"
13714
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13715
"value in URLs. Any non-ASCII characters in a file path will automatically "
13716
"be\n"
13717
"urlencoded when the path is converted to a URL."
13718
msgstr ""
13719
13720
#: en/help_topics/url-special-chars.txt:19
13721
msgid ""
13722
"URLs represent non-ASCII characters in an encoding defined by the server, "
13723
"but\n"
13724
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13725
"be\n"
13726
"generous in what it accepts as a URL and to print them in a way that\n"
13727
"will be readable."
13728
msgstr ""
13729
13730
#: en/help_topics/url-special-chars.txt:24
13731
msgid ""
13732
"For example, if you have a directory named '/tmp/%2False' these are all "
13733
"valid\n"
13734
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13735
"slash)::"
13736
msgstr ""
13737
13738
#: en/help_topics/url-special-chars.txt:27
13739
msgid ""
13740
" cd /tmp\n"
13741
" bzr log /tmp/%2False\n"
13742
" bzr log %2False\n"
13743
" bzr log file:///tmp/%252False\n"
13744
" bzr log file://localhost/tmp/%252False\n"
13745
" bzr log file:%252False"
13746
msgstr ""
13747
" cd /tmp\n"
13748
" bzr log /tmp/%2False\n"
13749
" bzr log %2False\n"
13750
" bzr log file:///tmp/%252False\n"
13751
" bzr log file://localhost/tmp/%252False\n"
13752
" bzr log file:%252False"
13753
13754
#: en/help_topics/url-special-chars.txt:34
13755
msgid "These are valid but do not refer to the same file::"
13756
msgstr "Estes são válidos, mas não se referem ao mesmo arquivo::"
13757
13758
#: en/help_topics/url-special-chars.txt:36
13759
msgid ""
13760
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13761
" bzr log %252False (refers to a file called /tmp/%252False)"
13762
msgstr ""
13763
13764
#: en/help_topics/url-special-chars.txt:39
13765
msgid ""
13766
"Comma also has special meaning in URLs, because it denotes `segment "
13767
"parameters`_"
13768
msgstr ""
13769
13770
#: en/help_topics/url-special-chars.txt:41
13771
msgid ""
13772
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13773
msgstr ""
13774
13775
#: en/help_topics/url-special-chars.txt:43
13776
msgid ""
13777
"Comma is also special in any file system paths that are specified. To use a "
13778
"literal\n"
13779
"comma in a file system path, specify a URL and URL encode the comma::"
13780
msgstr ""
13781
13782
#: en/help_topics/url-special-chars.txt:46
13783
msgid ""
13784
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13785
"\"branch\" set to \"bla\"\n"
13786
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13787
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13788
"\"branch\" set to \"bla\"\n"
13789
msgstr ""
13790
13791
#: en/help_topics/urlspec.txt:1
13792
msgid "URL Identifiers"
13793
msgstr "Identificadores de URL"
13794
13795
#: en/help_topics/urlspec.txt:3
13796
msgid "Supported URL prefixes::"
13797
msgstr "Prefixos de URL suportados::"
13798
13799
#: en/help_topics/urlspec.txt:5
13800
msgid ""
13801
" aftp:// Access using active FTP.\n"
13802
" bzr:// Fast access using the Bazaar smart server.\n"
13803
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13804
" file:// Access using the standard filesystem (default)\n"
13805
" ftp:// Access using passive FTP.\n"
13806
" http:// Read-only access of branches exported on the web.\n"
13807
" https:// Read-only access of branches exported on the web using "
13808
"SSL.\n"
13809
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13810
msgstr ""
13811
" aftp:// Acessa usando FTP ativo.\n"
13812
" bzr:// Acesso rápido usando o bazaar smart server.\n"
13813
" bzr+ssh:// Acesso rápido usando o Bazaar smart sobre SSH.\n"
13814
" file:// Acesso usando o sistema de arquivos (padrão)\n"
13815
" ftp:// Acesso usando FTP passivo.\n"
13816
" http:// Acesso somente leitura de ramos exportados na web.\n"
13817
" https:// Acesso somente leitura de ramos exportados na web usando SSL.\n"
13818
" sftp:// Acesso usando SFTP (a maioria dos servidores SSH fornecem acesso "
13819
"SFTP)."
13820
13821
#: en/help_topics/urlspec.txt:14
13822
msgid "Supported modifiers::"
13823
msgstr "Modificadores suportados::"
13824
13825
#: en/help_topics/urlspec.txt:16
13826
msgid " gio+ Access using any GIO supported protocols."
13827
msgstr ""
13828
13829
#: en/help_topics/urlspec.txt:18
13830
msgid "Bazaar supports all of the standard parts within the URL::"
13831
msgstr ""
13832
13833
#: en/help_topics/urlspec.txt:20
13834
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13835
msgstr " <protocolo>://[usuário[:senha]@]servidor[:porta]/[diretório]"
13836
13837
#: en/help_topics/urlspec.txt:22
13838
msgid "allowing URLs such as::"
13839
msgstr "permitindo URLs, tais como::"
13840
13841
#: en/help_topics/urlspec.txt:24
13842
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13843
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13844
13845
#: en/help_topics/urlspec.txt:26
13846
msgid ""
13847
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13848
"with '~' as meaning that the rest of the path should be interpreted\n"
13849
"relative to the remote user's home directory. For example if the user\n"
13850
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13851
"shell.example.com, then::"
13852
msgstr ""
13853
"Para URLs bzr+ssh:// e sftp://, Bazaar também suporta caminhos que começam\n"
13854
"com '~' significando que o resto do caminho deve ser interpretado\n"
13855
"relativamente ao diretório home do usuário. Por exemplo, se o usuário\n"
13856
"``remoto`` tem como diretório home ``/home/remoto`` no servidor\n"
13857
"shell.example.com, então::"
13858
13859
#: en/help_topics/urlspec.txt:32
13860
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13861
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13862
13863
#: en/help_topics/urlspec.txt:34
13864
msgid "would refer to ``/home/remote/myproject/trunk``."
13865
msgstr "refere-se a ``/home/remote/myproject/trunk``."
13866
13867
#: en/help_topics/urlspec.txt:36
13868
msgid ""
13869
"Many commands that accept URLs also accept location aliases too.\n"
13870
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13871
msgstr ""
13872
"Diversos comandos que aceitam URLs também aceitam pseudônimos de "
13873
"localização.\n"
13874
"Veja :doc:`location-alias-help` e :doc:`url-special-chars-help`.\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1