« back to all changes in this revision
Viewing changes to po/pt_BR.po
- browse files at revision 6437.2.5
- compare with another revision
- compare with revision 6620
- download diff
- download tarball
- view history from revision 6437.2.5
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-02-04 06:22:01 UTC
- mto: (6437.35.1 2.5.0-dev)
- mto: This revision was merged to the branch mainline in revision 6475.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120204062201-tbxyujjmb0dkh0u7
Launchpad automatic translations update.
added
removed
po/pt_BR.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n > 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:17+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
20
21
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
26
msgid "Unstacking"
27
27
msgstr "Desempilhar"
28
28
29
#: bzrlib/branch.py:3183
29
#: bzrlib/branch.py:3205
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "Enviar para revisão %d."
33
33
34
#: bzrlib/branch.py:3185
34
#: bzrlib/branch.py:3207
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] "%d tag atualizada."
39
39
msgstr[1] "%d tags atualizadas."
40
40
41
#: bzrlib/branch.py:3188
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
43
msgstr "Nenhuma revisão ou tags para enviar."
44
44
45
#: bzrlib/branch.py:3190
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
47
msgstr "Nenhuma revisão para enviar."
48
48
49
#: bzrlib/branch.py:3210
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr "verificado o ramo {0} formato {1}"
52
52
53
#: bzrlib/branch.py:3213
53
#: bzrlib/branch.py:3235
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr "erro encontrado:%s"
57
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorar arquivos fora da visualização. A visualização é %s"
61
msgstr "Ignorando arquivos fora da visualização. A visualização é %s"
62
62
63
#: bzrlib/builtins.py:130
63
#: bzrlib/builtins.py:218
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr "bzr %s --revision produz exatamente o identificador da revisão"
67
67
68
#: bzrlib/builtins.py:215
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
70
msgstr "Mostrar o resumo do estado."
71
71
72
#: bzrlib/builtins.py:217
72
#: bzrlib/builtins.py:305
73
73
msgid ""
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
77
77
"Este é um relatório de arquivos desconhecidos e versionados, reportá-los\n"
78
78
"agrupados por estado. Estados possíveis são:"
79
79
80
#: bzrlib/builtins.py:220
80
#: bzrlib/builtins.py:308
81
81
msgid ""
82
82
"added\n"
83
83
" Versioned in the working copy but not in the previous revision."
85
85
"adicionado\n"
86
86
" Versionado na cópia de trabalho, mas não na revisão anterior."
87
87
88
#: bzrlib/builtins.py:223
88
#: bzrlib/builtins.py:311
89
89
msgid ""
90
90
"removed\n"
91
91
" Versioned in the previous revision but removed or deleted\n"
95
95
" Versionado na revisão anterior, mas removido ou excluído\n"
96
96
" na cópia de trabalho."
97
97
98
#: bzrlib/builtins.py:227
98
#: bzrlib/builtins.py:315
99
99
msgid ""
100
100
"renamed\n"
101
101
" Path of this file changed from the previous revision;\n"
107
107
" o texto também pode ter mudado. Isso inclui arquivos cujo\n"
108
108
" diretório pai foi renomeado."
109
109
110
#: bzrlib/builtins.py:232
110
#: bzrlib/builtins.py:320
111
111
msgid ""
112
112
"modified\n"
113
113
" Text has changed since the previous revision."
115
115
"modificado\n"
116
116
" O texto mudou desde a versão anterior."
117
117
118
#: bzrlib/builtins.py:235
118
#: bzrlib/builtins.py:323
119
119
msgid ""
120
120
"kind changed\n"
121
121
" File kind has been changed (e.g. from file to directory)."
123
123
"tipo alterado\n"
124
124
" Tipo de arquivo foi alterado (por exemplo, de arquivo para o diretório)."
125
125
126
#: bzrlib/builtins.py:238
126
#: bzrlib/builtins.py:326
127
127
msgid ""
128
128
"unknown\n"
129
129
" Not versioned and not matching an ignore pattern."
131
131
"desconhecido\n"
132
132
" Não versionado e não corresponde aos padrões de ignorar."
133
133
134
#: bzrlib/builtins.py:241
134
#: bzrlib/builtins.py:329
135
135
msgid ""
136
136
"Additionally for directories, symlinks and files with a changed\n"
137
137
"executable bit, Bazaar indicates their type using a trailing\n"
143
143
"de fuga: '/', '@' ou '*' respectivamente. Estes adicionais podem ser\n"
144
144
"desativados usando a opção '--no-classify'."
145
145
146
#: bzrlib/builtins.py:246
146
#: bzrlib/builtins.py:334
147
147
msgid ""
148
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
149
"changes to file texts, use 'bzr diff'."
151
151
"Para ver arquivos ignorados use 'bzr ignored'. Para detalhes sobre\n"
152
152
"alterações em arquivos texto, use 'bzr diff'."
153
153
154
#: bzrlib/builtins.py:249
154
#: bzrlib/builtins.py:337
155
155
msgid ""
156
156
"Note that --short or -S gives status flags for each item, similar\n"
157
157
"to Subversion's status command. To get output similar to svn -q,\n"
162
162
"ao comando status do Subversion. Para obter uma saída semelhante ao svn -q,\n"
163
163
"use bzr status -SV."
164
164
165
#: bzrlib/builtins.py:253
165
#: bzrlib/builtins.py:341
166
166
msgid ""
167
167
"If no arguments are specified, the status of the entire working\n"
168
168
"directory is shown. Otherwise, only the status of the specified\n"
174
174
"ou diretório especificado é relatado. Se um diretório for passado, o\n"
175
175
"status é relatado para tudo dentro deste diretório."
176
176
177
#: bzrlib/builtins.py:258
177
#: bzrlib/builtins.py:346
178
178
msgid ""
179
179
"Before merges are committed, the pending merge tip revisions are\n"
180
180
"shown. To see all pending merge revisions, use the -v option.\n"
188
188
"use\n"
189
189
"a opção no-pending ou especifique um arquivo/diretório."
190
190
191
#: bzrlib/builtins.py:263
191
#: bzrlib/builtins.py:351
192
192
msgid ""
193
193
"To compare the working directory to a specific revision, pass a\n"
194
194
"single revision to the revision argument."
196
196
"Para comparar o diretório de trabalho com uma revisão específica,\n"
197
197
"passe uma simples revisão como argumento."
198
198
199
#: bzrlib/builtins.py:266
199
#: bzrlib/builtins.py:354
200
200
msgid ""
201
201
"To see which files have changed in a specific revision, or between\n"
202
202
"two revisions, pass a revision range to the revision argument.\n"
206
206
"duas revisões, passe uma intervalo de revisões como argumento.\n"
207
207
"Isto irá produzir os mesmos resultados de 'bzr diff --summarize'."
208
208
209
#: bzrlib/builtins.py:275
209
#: bzrlib/builtins.py:363
210
210
msgid "Use short status indicators."
211
211
msgstr "Use indicadores de status curto."
212
212
213
#: bzrlib/builtins.py:277
213
#: bzrlib/builtins.py:365
214
214
msgid "Only show versioned files."
215
215
msgstr "Mostrar apenas arquivos versionados."
216
216
217
#: bzrlib/builtins.py:279
217
#: bzrlib/builtins.py:367
218
218
msgid "Don't show pending merges."
219
219
msgstr "Não mostrar mesclagens pendentes."
220
220
221
#: bzrlib/builtins.py:282
221
#: bzrlib/builtins.py:370
222
222
msgid "Do not mark object type using indicator."
223
223
msgstr "Não marque o tipo do objeto através do indicador."
224
224
225
#: bzrlib/builtins.py:297
225
#: bzrlib/builtins.py:385
226
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
227
227
msgstr ""
228
228
"bzr status --revision produz exatamente um ou dois especificadores de revisão"
229
229
230
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
230
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
231
231
msgid "You can only supply one of revision_id or --revision"
232
232
msgstr "Você só pode fornecer um entre revision_id e --revision"
233
233
234
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
234
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
235
235
msgid "You must supply either --revision or a revision_id"
236
236
msgstr "Você deve fornecer qualquer um entre --revision e revision_id"
237
237
238
#: bzrlib/builtins.py:351
238
#: bzrlib/builtins.py:439
239
239
#, python-format
240
240
msgid "Repository %r does not support access to raw revision texts"
241
241
msgstr "O repositório %r não suporta acesso a textos de revisão tipo raw"
242
242
243
#: bzrlib/builtins.py:362
243
#: bzrlib/builtins.py:450
244
244
msgid "The repository {0} contains no revision {1}."
245
245
msgstr "O repositório {0} não contém revisão {1}."
246
246
247
#: bzrlib/builtins.py:369
247
#: bzrlib/builtins.py:457
248
248
msgid "You cannot specify a NULL revision."
249
249
msgstr "Você não pode especificar uma revisão NULL."
250
250
251
#: bzrlib/builtins.py:461
251
#: bzrlib/builtins.py:549
252
252
msgid "Remove the working tree from a given branch/checkout."
253
253
msgstr ""
254
254
"Remover a árvore de trabalho a partir de um determinado ramo/projeto obtido."
255
255
256
#: bzrlib/builtins.py:463
256
#: bzrlib/builtins.py:551
257
257
msgid ""
258
258
"Since a lightweight checkout is little more than a working tree\n"
259
259
"this will refuse to run against one."
260
260
msgstr ""
261
261
262
#: bzrlib/builtins.py:466
262
#: bzrlib/builtins.py:554
263
263
msgid "To re-create the working tree, use \"bzr checkout\"."
264
264
msgstr "Para recriar a árvore de trabalho, use \"bzr checkout\"."
265
265
266
#: bzrlib/builtins.py:472
266
#: bzrlib/builtins.py:560
267
267
msgid ""
268
268
"Remove the working tree even if it has uncommitted or shelved changes."
269
269
msgstr ""
270
270
"Remover a árvore de trabalho, mesmo que tenha mudanças não confirmadas ou "
271
271
"arquivadas."
272
272
273
#: bzrlib/builtins.py:486
273
#: bzrlib/builtins.py:574
274
274
msgid "No working tree to remove"
275
275
msgstr "Nenhuma árvore de trabalho para remover"
276
276
277
#: bzrlib/builtins.py:488
277
#: bzrlib/builtins.py:576
278
278
msgid "You cannot remove the working tree of a remote path"
279
279
msgstr "Você não pode remover a árvore de trabalho de um caminho remoto"
280
280
281
#: bzrlib/builtins.py:497
281
#: bzrlib/builtins.py:585
282
282
msgid "You cannot remove the working tree from a lightweight checkout"
283
283
msgstr "Você não pode remover a árvore de trabalho de um projeto importado"
284
284
285
#: bzrlib/builtins.py:537
285
#: bzrlib/builtins.py:625
286
286
msgid ""
287
287
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
288
288
"instead. Use \"--force\" if you are sure you want to reset the working tree."
291
291
"\"bzr reverter\" como alternativa. Use \"--force\" se você tem certeza que "
292
292
"deseja redefinir a árvore de trabalho."
293
293
294
#: bzrlib/builtins.py:548
294
#: bzrlib/builtins.py:636
295
295
msgid ""
296
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
297
"commit"
299
299
", o cabeçalho parece estar corrompido, tente passar -r -1 para definir o "
300
300
"estado como última submissão"
301
301
302
#: bzrlib/builtins.py:552
302
#: bzrlib/builtins.py:640
303
303
msgid "failed to reset the tree state{0}"
304
304
msgstr "falhou para redefinir o estado da árvore{0}"
305
305
306
#: bzrlib/builtins.py:556
306
#: bzrlib/builtins.py:644
307
307
msgid "Show current revision number."
308
308
msgstr "Mostrar o número da revisão atual."
309
309
310
#: bzrlib/builtins.py:558
310
#: bzrlib/builtins.py:646
311
311
msgid "This is equal to the number of revisions on this branch."
312
312
msgstr "Este é equivalente ao número de revisões no ramo."
313
313
314
#: bzrlib/builtins.py:571
314
#: bzrlib/builtins.py:659
315
315
msgid "--tree and --revision can not be used together"
316
316
msgstr "--tre e --revision não podem ser usados juntos"
317
317
318
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
318
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
319
319
msgid "Tags can only be placed on a single revision, not on a range"
320
320
msgstr ""
321
321
"Tags podem apenas serem colocadas em uma revisão simples, não em um intervalo"
322
322
323
#: bzrlib/builtins.py:612
323
#: bzrlib/builtins.py:700
324
324
msgid "Show revno of working tree."
325
325
msgstr "Mostrar número de revisão da árvore de trabalho."
326
326
327
#: bzrlib/builtins.py:660
327
#: bzrlib/builtins.py:748
328
328
msgid "Add specified files or directories."
329
329
msgstr "Adicionar arquivos ou diretórios especificados."
330
330
331
#: bzrlib/builtins.py:662
331
#: bzrlib/builtins.py:750
332
332
msgid ""
333
333
"In non-recursive mode, all the named items are added, regardless\n"
334
334
"of whether they were previously ignored. A warning is given if\n"
338
338
"independentemente de terem sido anteriormente ignorados. Um aviso \n"
339
339
"é dado se qualquer um dos arquivos nomeados já estiverem versionados."
340
340
341
#: bzrlib/builtins.py:666
341
#: bzrlib/builtins.py:754
342
342
msgid ""
343
343
"In recursive mode (the default), files are treated the same way\n"
344
344
"but the behaviour for directories is different. Directories that\n"
356
356
"Esta pesquisa ocorre recursivamente dentro de diretórios \n"
357
357
"versionados. Se nenhum nome é dado '.' é assumido."
358
358
359
#: bzrlib/builtins.py:674
359
#: bzrlib/builtins.py:762
360
360
msgid ""
361
361
"A warning will be printed when nested trees are encountered,\n"
362
362
"unless they are explicitly ignored."
364
364
"Um alerta será impresso quando árvores aninhadas forem encontradas,\n"
365
365
"exceto que seja explicitamente ignorado."
366
366
367
#: bzrlib/builtins.py:677
367
#: bzrlib/builtins.py:765
368
368
msgid ""
369
369
"Therefore simply saying 'bzr add' will version all files that\n"
370
370
"are currently unknown."
372
372
"Portanto, dizendo simplesmente 'bzr add' assumimos que a \n"
373
373
"versão de todos os arquivos são atualmente desconhecidas."
374
374
375
#: bzrlib/builtins.py:680
375
#: bzrlib/builtins.py:768
376
376
msgid ""
377
377
"Adding a file whose parent directory is not versioned will\n"
378
378
"implicitly add the parent, and so on up to the root. This means\n"
385
385
"que você nunca precisará adicionar explicitamente um diretório, eles apenas\n"
386
386
"serão adicionados quando você adicionar um arquivo no diretório."
387
387
388
#: bzrlib/builtins.py:685
388
#: bzrlib/builtins.py:773
389
389
msgid ""
390
390
"--dry-run will show which files would be added, but not actually\n"
391
391
"add them."
394
394
"verdade\n"
395
395
"não os adiciona."
396
396
397
#: bzrlib/builtins.py:688
397
#: bzrlib/builtins.py:776
398
398
msgid ""
399
399
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
400
"It looks up ids trying to find a matching parent directory with the\n"
413
413
"como conflitos). Isto também pode ser útil quando estiver mesclando outro \n"
414
414
"projeto dentro de um subdiretório deste."
415
415
416
#: bzrlib/builtins.py:696
416
#: bzrlib/builtins.py:784
417
417
msgid ""
418
418
"Any files matching patterns in the ignore list will not be added\n"
419
419
"unless they are explicitly mentioned."
422
422
"adicionados\n"
423
423
"a menos que eles sejam explicitamente mencionados."
424
424
425
#: bzrlib/builtins.py:699
425
#: bzrlib/builtins.py:787
426
426
msgid ""
427
427
"In recursive mode, files larger than the configuration option \n"
428
428
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
432
432
"add.maximum_file_size serão pulados. Itens nomeados nunca são pulados\n"
433
433
"devido ao tamanho do arquivo."
434
434
435
#: bzrlib/builtins.py:706
435
#: bzrlib/builtins.py:794
436
436
msgid "Don't recursively add the contents of directories."
437
437
msgstr "Não adiciona recursivamente o conteúdo dos diretórios."
438
438
439
#: bzrlib/builtins.py:712
439
#: bzrlib/builtins.py:800
440
440
msgid "Lookup file ids from this tree."
441
441
msgstr "Pesquisa de arquivo por ids nesta árvore"
442
442
443
#: bzrlib/builtins.py:748
443
#: bzrlib/builtins.py:836
444
444
msgid "ignored {0} matching \"{1}\"\n"
445
445
msgstr "ignorado {0} correspondente a \"{1}\"\n"
446
446
447
#: bzrlib/builtins.py:753
447
#: bzrlib/builtins.py:841
448
448
msgid "Create a new versioned directory."
449
449
msgstr "Criar um novo diretório versionado."
450
450
451
#: bzrlib/builtins.py:755
451
#: bzrlib/builtins.py:843
452
452
msgid "This is equivalent to creating the directory and then adding it."
453
453
msgstr "Isto é equivalente a criar o diretório e depois adicioná-lo."
454
454
455
#: bzrlib/builtins.py:762
455
#: bzrlib/builtins.py:850
456
456
msgid "No error if existing, make parent directories as needed."
457
457
msgstr ""
458
458
459
#: bzrlib/builtins.py:796
459
#: bzrlib/builtins.py:884
460
460
#, python-format
461
461
msgid "added %s\n"
462
462
msgstr "%s adicionado\n"
463
463
464
#: bzrlib/builtins.py:838
464
#: bzrlib/builtins.py:926
465
465
#, python-format
466
466
msgid "invalid kind %r specified"
467
467
msgstr "tipo especificado %r é inválido"
468
468
469
#: bzrlib/builtins.py:875
469
#: bzrlib/builtins.py:963
470
470
msgid "Move or rename a file."
471
471
msgstr "Mover ou renomear um arquivo."
472
472
473
#: bzrlib/builtins.py:877
473
#: bzrlib/builtins.py:965
474
474
msgid " bzr mv SOURCE... DESTINATION"
475
475
msgstr " bzr mv ORIGEM... DESTINO"
476
476
477
#: bzrlib/builtins.py:879
477
#: bzrlib/builtins.py:967
478
478
msgid ""
479
479
"If the last argument is a versioned directory, all the other names\n"
480
480
"are moved into it. Otherwise, there must be exactly two arguments\n"
484
484
"são movidos para ele. Caso contrário, deve haver exatamente dois argumentos\n"
485
485
"e o arquivo é alterado para um novo nome."
486
486
487
#: bzrlib/builtins.py:883
487
#: bzrlib/builtins.py:971
488
488
msgid ""
489
489
"If OLDNAME does not exist on the filesystem but is versioned and\n"
490
490
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
498
498
"seu inventário interno para refletir essa mudança. O mesmo é válido \n"
499
499
"quando se deslocam muitos arquivos de ORIGEM para um DESTINO."
500
500
501
#: bzrlib/builtins.py:889
501
#: bzrlib/builtins.py:977
502
502
msgid "Files cannot be moved between branches."
503
503
msgstr "Os arquivos não podem ser movidos entre os ramos."
504
504
505
#: bzrlib/builtins.py:896
505
#: bzrlib/builtins.py:984
506
506
msgid ""
507
507
"Move only the bzr identifier of the file, because the file has already been "
508
508
"moved."
509
509
msgstr ""
510
510
"Mover apenas o identificador bzr do arquivo, porque o arquivo já foi movido."
511
511
512
#: bzrlib/builtins.py:898
512
#: bzrlib/builtins.py:986
513
513
msgid "Automatically guess renames."
514
514
msgstr "Prever que será renomeado automaticamente."
515
515
516
#: bzrlib/builtins.py:899
516
#: bzrlib/builtins.py:987
517
517
msgid "Avoid making changes when guessing renames."
518
518
msgstr "Evite fazer alterações quando prever que será renomeado."
519
519
520
#: bzrlib/builtins.py:908
520
#: bzrlib/builtins.py:996
521
521
msgid "--dry-run requires --auto."
522
522
msgstr "--dry-run requer --auto."
523
523
524
#: bzrlib/builtins.py:912
524
#: bzrlib/builtins.py:1000
525
525
msgid "missing file argument"
526
526
msgstr "falta argumento de arquivo"
527
527
528
#: bzrlib/builtins.py:916
528
#: bzrlib/builtins.py:1004
529
529
msgid "can not move root of branch"
530
530
msgstr "não é possível mover a raiz do ramo"
531
531
532
#: bzrlib/builtins.py:922
532
#: bzrlib/builtins.py:1010
533
533
msgid "Only one path may be specified to --auto."
534
534
msgstr "Apenas um caminho deve ser especificado para --auto."
535
535
536
#: bzrlib/builtins.py:925
536
#: bzrlib/builtins.py:1013
537
537
msgid "--after cannot be specified with --auto."
538
538
msgstr "--after não pode ser especificado com --auto."
539
539
540
#: bzrlib/builtins.py:962
540
#: bzrlib/builtins.py:1050
541
541
msgid "to mv multiple files the destination must be a versioned directory"
542
542
msgstr ""
543
543
"para mover múltiplos arquivos, o destino deve ser um diretório versionado"
544
544
545
#: bzrlib/builtins.py:1014
545
#: bzrlib/builtins.py:1102
546
546
msgid "Turn this branch into a mirror of another branch."
547
547
msgstr "Transformar esse ramo em um espelho de outro ramo."
548
548
549
#: bzrlib/builtins.py:1016
549
#: bzrlib/builtins.py:1104
550
550
msgid ""
551
551
"By default, this command only works on branches that have not diverged.\n"
552
552
"Branches are considered diverged if the destination branch's most recent \n"
558
558
"recentemente submetido é aquele que não foi mesclado (direta ou \n"
559
559
"indiretamente) para o pai."
560
560
561
#: bzrlib/builtins.py:1021
561
#: bzrlib/builtins.py:1109
562
562
msgid ""
563
563
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
564
564
"from one into the other. Once one branch has merged, the other should\n"
569
569
"de um para o outro. Uma vez que um ramo se fundiu, o outro deve\n"
570
570
"ser capaz de puxá-lo novamente."
571
571
572
#: bzrlib/builtins.py:1025
572
#: bzrlib/builtins.py:1113
573
573
msgid ""
574
574
"If you want to replace your local changes and just want your branch to\n"
575
575
"match the remote one, use pull --overwrite. This will work even if the two\n"
581
581
"se\n"
582
582
"as duas ramificações divergiram."
583
583
584
#: bzrlib/builtins.py:1029
584
#: bzrlib/builtins.py:1117
585
585
msgid ""
586
586
"If there is no default location set, the first pull will set it (use\n"
587
587
"--no-remember to avoid setting it). After that, you can omit the\n"
594
594
"para usar o padrão. Para alterar o padrão, use --remember. O valor será\n"
595
595
"salvo apenas se o local remoto puder ser acessado."
596
596
597
#: bzrlib/builtins.py:1034
597
#: bzrlib/builtins.py:1122
598
598
msgid ""
599
599
"The --verbose option will display the revisions pulled using the log_format\n"
600
600
"configuration option. You can use a different format by overriding it with\n"
601
601
"-Olog_format=<other_format>."
602
602
msgstr ""
603
"A opção --verbose irá mostrar as revisões extraídas usando a opção\n"
604
"de configuração log_format. Você pode usar um formato diferente para \n"
605
"substituí-lo com -Olog_format=<outro formato>."
603
606
604
#: bzrlib/builtins.py:1038
607
#: bzrlib/builtins.py:1126
605
608
msgid ""
606
609
"Note: The location can be specified either in the form of a branch,\n"
607
610
"or in the form of a path to a file containing a merge directive generated\n"
611
614
"ou na forma de um caminho para um arquivo contendo uma diretiva\n"
612
615
"de mesclagem gerada com bzr send."
613
616
614
#: bzrlib/builtins.py:1046
617
#: bzrlib/builtins.py:1134
615
618
msgid "Show logs of pulled revisions."
616
619
msgstr "Mostrar os logs de revisões puxadas."
617
620
618
#: bzrlib/builtins.py:1048
621
#: bzrlib/builtins.py:1136
619
622
msgid ""
620
623
"Branch to pull into, rather than the one containing the working directory."
621
624
msgstr ""
625
"Ramificação para extrair, ao invés de uma que contém o diretório de trabalho."
622
626
623
#: bzrlib/builtins.py:1051
627
#: bzrlib/builtins.py:1139
624
628
msgid ""
625
629
"Perform a local pull in a bound branch. Local pulls are not applied to the "
626
630
"master branch."
627
631
msgstr ""
632
"Realizar uma extração local em uma ramificação limite. Extrações locais não "
633
"são aplicadas na ramificação mestre."
628
634
629
#: bzrlib/builtins.py:1080
635
#: bzrlib/builtins.py:1168
630
636
msgid "Need working tree for --show-base."
631
637
msgstr "Necessário a árvore de trabalho para --show-base."
632
638
633
#: bzrlib/builtins.py:1096
639
#: bzrlib/builtins.py:1184
634
640
msgid "No pull location known or specified."
635
msgstr ""
641
msgstr "Nenhuma localização de extração conhecida ou especificada"
636
642
637
#: bzrlib/builtins.py:1102
643
#: bzrlib/builtins.py:1190
638
644
#, python-format
639
645
msgid "Using saved parent location: %s\n"
640
msgstr ""
646
msgstr "Usando a localização pai salva: %s\n"
641
647
642
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
648
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
643
649
msgid "Cannot use -r with merge directives or bundles"
644
msgstr ""
650
msgstr "Não foi possível usar -r com diretivas mescladas ou empacotadas"
645
651
646
#: bzrlib/builtins.py:1150
652
#: bzrlib/builtins.py:1238
647
653
msgid "Update a mirror of this branch."
648
654
msgstr "Atualização de um espelho deste ramo."
649
655
650
#: bzrlib/builtins.py:1152
656
#: bzrlib/builtins.py:1240
651
657
msgid ""
652
658
"The target branch will not have its working tree populated because this\n"
653
659
"is both expensive, and is not supported on remote file systems."
654
660
msgstr ""
661
"A ramificação alvo não terá sua árvore de trabalho populada porque isto\n"
662
"é dispendioso e não suportado em sistema de arquivos remoto."
655
663
656
#: bzrlib/builtins.py:1155
664
#: bzrlib/builtins.py:1243
657
665
msgid ""
658
666
"Some smart servers or protocols *may* put the working tree in place in\n"
659
667
"the future."
662
670
"trabalho em vigor no\n"
663
671
"futuro."
664
672
665
#: bzrlib/builtins.py:1158
673
#: bzrlib/builtins.py:1246
666
674
msgid ""
667
675
"This command only works on branches that have not diverged. Branches are\n"
668
676
"considered diverged if the destination branch's most recent commit is one\n"
669
677
"that has not been merged (directly or indirectly) by the source branch."
670
678
msgstr ""
679
"Este comando funcionará apenas em ramificações que não possuem divergências. "
680
"Ramificações \n"
681
"são consideradas divergentes se a ramificação de destino possui envios mais "
682
"recentes e \n"
683
"não pode ser fundida (direta ou indiretamente) pela ramificação de origem."
671
684
672
#: bzrlib/builtins.py:1162
685
#: bzrlib/builtins.py:1250
673
686
msgid ""
674
687
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
675
688
"the other branch completely, discarding its unmerged changes."
676
689
msgstr ""
690
"Se ramificações estão divergentes, você pode usar 'bzr push --overwrite' "
691
"para substituir\n"
692
"a outra ramificação completamente, discartando mudanças não fundidas."
677
693
678
#: bzrlib/builtins.py:1165
694
#: bzrlib/builtins.py:1253
679
695
msgid ""
680
696
"If you want to ensure you have the different changes in the other branch,\n"
681
697
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
682
698
"After that you will be able to do a push without '--overwrite'."
683
699
msgstr ""
700
"Se você deseja certificar-se que possui mudanças diferentes em outra "
701
"ramificação,\n"
702
"faça um merge (veja bzr help merge) a partir da outra ramificação, e envie-"
703
"o. Após isto\n"
704
"você será capaz de fazer um push sem \"'--overwrite\"."
684
705
685
#: bzrlib/builtins.py:1169
706
#: bzrlib/builtins.py:1257
686
707
msgid ""
687
708
"If there is no default push location set, the first push will set it (use\n"
688
709
"--no-remember to avoid setting it). After that, you can omit the\n"
689
710
"location to use the default. To change the default, use --remember. The\n"
690
711
"value will only be saved if the remote location can be accessed."
691
712
msgstr ""
713
"Se não houver um definição de localização de envio padrão, o primeiro envio "
714
"irá ajustá-lo (use\n"
715
"--no-remember para evitar isto). Após isto você poderá omitir a\n"
716
"localização para usar o padrão. Para alterar o padrão, use --remember. O\n"
717
"valor será salvo apenas se a localização remota puder ser acessada."
692
718
693
#: bzrlib/builtins.py:1174
719
#: bzrlib/builtins.py:1262
694
720
msgid ""
695
721
"The --verbose option will display the revisions pushed using the log_format\n"
696
722
"configuration option. You can use a different format by overriding it with\n"
697
723
"-Olog_format=<other_format>."
698
724
msgstr ""
725
"A opção --verbose irá exibir as revisões enviadas usando a opção de \n"
726
"configuração log_format. Você pode usar um formato diferente substituindo-o "
727
"\n"
728
"com -Olog_format=<outro_formato>"
699
729
700
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
730
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
701
731
msgid ""
702
732
"Branch to push from, rather than the one containing the working directory."
703
733
msgstr ""
734
"Ramo para enviar a partir de, ao invés de uma que contém o diretório de "
735
"trabalho."
704
736
705
#: bzrlib/builtins.py:1188
737
#: bzrlib/builtins.py:1276
706
738
msgid ""
707
739
"By default push will fail if the target directory exists, but does not "
708
740
"already have a control directory. This flag will allow push to proceed."
709
741
msgstr ""
742
"Por padrão o envio irá falhar se o diretório de destino existir, mas não se "
743
"tem um diretório de controle. Este sinalizador permitirá que o envio "
744
"prossiga."
710
745
711
#: bzrlib/builtins.py:1193
746
#: bzrlib/builtins.py:1281
712
747
msgid ""
713
748
"Create a stacked branch that references the public location of the parent "
714
749
"branch."
715
750
msgstr ""
751
"Criar uma ramificação empilhada que referencia a localização pública do ramo "
752
"pai."
716
753
717
#: bzrlib/builtins.py:1196
754
#: bzrlib/builtins.py:1284
718
755
msgid ""
719
756
"Create a stacked branch that refers to another branch for the commit "
720
757
"history. Only the work not present in the referenced branch is included in "
721
758
"the branch created."
722
759
msgstr ""
760
"Criar uma ramificação empilhada que referencia a outro ramo do histórico de "
761
"envio. Apenas o trabalho não presente no ramo referenciado é incluído no "
762
"ramo criado."
723
763
724
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
764
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
725
765
msgid ""
726
766
"Refuse to push if there are uncommitted changes in the working tree, --no-"
727
767
"strict disables the check."
728
768
msgstr ""
769
"Recusa o envio se houver alterações não confirmadas na árvore de trabalho, --"
770
"no-strict desativa a verificação."
729
771
730
#: bzrlib/builtins.py:1204
772
#: bzrlib/builtins.py:1292
731
773
msgid "Don't populate the working tree, even for protocols that support it."
732
774
msgstr ""
775
"Não popular a árvore de trabalho, mesmo para protocolos que o suportam."
733
776
734
#: bzrlib/builtins.py:1248
777
#: bzrlib/builtins.py:1336
735
778
msgid "Could not determine branch to refer to."
736
msgstr ""
779
msgstr "Não foi possível determinar uma ramificação a ser referenciada"
737
780
738
#: bzrlib/builtins.py:1257
781
#: bzrlib/builtins.py:1345
739
782
#, python-format
740
783
msgid ""
741
784
"No push location known or specified. To push to the parent branch (at %s), "
742
785
"use 'bzr push :parent'."
743
786
msgstr ""
744
787
745
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
788
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
746
789
msgid "No push location known or specified."
747
msgstr ""
790
msgstr "Sem local de envio conhecido ou especificado."
748
791
749
#: bzrlib/builtins.py:1267
792
#: bzrlib/builtins.py:1355
750
793
#, python-format
751
794
msgid "Using saved push location: %s"
752
msgstr ""
795
msgstr "Usando localização de envio salvo: %s"
753
796
754
#: bzrlib/builtins.py:1277
797
#: bzrlib/builtins.py:1365
755
798
msgid "Create a new branch that is a copy of an existing branch."
756
msgstr ""
799
msgstr "Criar um novo ramo que é uma cópia de um ramo existente."
757
800
758
#: bzrlib/builtins.py:1279
801
#: bzrlib/builtins.py:1367
759
802
msgid ""
760
803
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
761
804
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
766
809
"create ./foo-bar."
767
810
msgstr ""
768
811
769
#: bzrlib/builtins.py:1286
812
#: bzrlib/builtins.py:1374
770
813
msgid ""
771
814
"To retrieve the branch as of a particular revision, supply the --revision\n"
772
815
"parameter, as in \"branch foo/bar -r 5\"."
773
816
msgstr ""
817
"Para conseguir o ramo de uma revisão em particular, forneça o parâmetro --"
818
"revision\n"
819
"como em \"branch foo/bar -r 5\"."
774
820
775
#: bzrlib/builtins.py:1289
821
#: bzrlib/builtins.py:1377
776
822
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
777
msgstr ""
823
msgstr "Os sinônimos 'clone e 'get' para esse comando são obsoletos."
778
824
779
#: bzrlib/builtins.py:1299
825
#: bzrlib/builtins.py:1387
780
826
msgid "Create a branch without a working-tree."
781
msgstr ""
827
msgstr "Criar um ramo sem uma árvore de trabalho."
782
828
783
#: bzrlib/builtins.py:1301
829
#: bzrlib/builtins.py:1389
784
830
msgid "Switch the checkout in the current directory to the new branch."
785
msgstr ""
831
msgstr "Alterar o checkout no diretório atual para o novo ramo."
786
832
787
#: bzrlib/builtins.py:1304
833
#: bzrlib/builtins.py:1392
788
834
msgid ""
789
835
"Create a stacked branch referring to the source branch. The new branch will "
790
836
"depend on the availability of the source branch for all operations."
791
837
msgstr ""
792
838
793
#: bzrlib/builtins.py:1308
839
#: bzrlib/builtins.py:1396
794
840
msgid "Do not use a shared repository, even if available."
795
841
msgstr "Não utilizar um repositório compartilhado, mesmo se disponível."
796
842
797
#: bzrlib/builtins.py:1310
843
#: bzrlib/builtins.py:1398
798
844
msgid ""
799
845
"By default branch will fail if the target directory exists, but does not "
800
846
"already have a control directory. This flag will allow branch to proceed."
801
847
msgstr ""
802
848
803
#: bzrlib/builtins.py:1315
849
#: bzrlib/builtins.py:1403
804
850
msgid "Bind new branch to from location."
805
msgstr ""
851
msgstr "Vincular novo ramo a partir da localização."
806
852
807
#: bzrlib/builtins.py:1362
853
#: bzrlib/builtins.py:1450
808
854
#, python-format
809
855
msgid "Target directory \"%s\" already exists."
810
msgstr ""
856
msgstr "Diretório alvo \"%s\" já existe."
811
857
812
#: bzrlib/builtins.py:1374
858
#: bzrlib/builtins.py:1462
813
859
#, python-format
814
860
msgid "Parent of \"%s\" does not exist."
815
msgstr ""
861
msgstr "Pasta pai de \"%s\" não existe."
816
862
817
#: bzrlib/builtins.py:1393
863
#: bzrlib/builtins.py:1481
818
864
msgid "The branch {0} has no revision {1}."
819
msgstr ""
865
msgstr "O ramo {0} não tem revisão {1}."
820
866
821
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
867
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
822
868
#, python-format
823
869
msgid "Created new stacked branch referring to %s."
824
msgstr ""
870
msgstr "Criado novo ramo empilhado referente a %s."
825
871
826
#: bzrlib/builtins.py:1407
872
#: bzrlib/builtins.py:1500
827
873
#, python-format
828
874
msgid "Branched %d revision."
829
875
msgid_plural "Branched %d revisions."
830
msgstr[0] ""
831
msgstr[1] ""
876
msgstr[0] "Revisão %d ramificada."
877
msgstr[1] "Revisões %d ramificadas."
832
878
833
#: bzrlib/builtins.py:1412
879
#: bzrlib/builtins.py:1505
834
880
#, python-format
835
881
msgid "New branch bound to %s"
836
msgstr ""
882
msgstr "Novo ramo ligado a %s"
837
883
838
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
884
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
839
885
#, python-format
840
886
msgid "Switched to branch: %s"
841
msgstr ""
887
msgstr "Trocado para o ramo: %s"
842
888
843
#: bzrlib/builtins.py:1422
889
#: bzrlib/builtins.py:1515
844
890
msgid "List the branches available at the current location."
845
msgstr ""
891
msgstr "Lista os ramos disponíveis na localização atual."
846
892
847
#: bzrlib/builtins.py:1424
893
#: bzrlib/builtins.py:1517
848
894
msgid ""
849
895
"This command will print the names of all the branches at the current\n"
850
896
"location."
851
msgstr ""
897
msgstr "Esse comando irá mostrar os nomes de todos os ramos no local atual."
852
898
853
#: bzrlib/builtins.py:1431
899
#: bzrlib/builtins.py:1524
854
900
msgid ""
855
901
"Recursively scan for branches rather than just looking in the specified "
856
902
"location."
857
903
msgstr ""
904
"Pesquisar recursivamente por ramos ao invés de apenas procurar em um local "
905
"especificado."
858
906
859
#: bzrlib/builtins.py:1461
907
#: bzrlib/builtins.py:1554
860
908
msgid "(default)"
861
msgstr ""
909
msgstr "(padrão)"
862
910
863
#: bzrlib/builtins.py:1473
911
#: bzrlib/builtins.py:1566
864
912
msgid "Create a new checkout of an existing branch."
865
msgstr ""
913
msgstr "Criar um novo checkout de um ramo existente."
866
914
867
#: bzrlib/builtins.py:1475
915
#: bzrlib/builtins.py:1568
868
916
msgid ""
869
917
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
870
918
"for\n"
874
922
"location using SFTP."
875
923
msgstr ""
876
924
877
#: bzrlib/builtins.py:1480
925
#: bzrlib/builtins.py:1573
878
926
msgid ""
879
927
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
880
928
"will\n"
886
934
"create ./foo-bar."
887
935
msgstr ""
888
936
889
#: bzrlib/builtins.py:1487
937
#: bzrlib/builtins.py:1580
890
938
msgid ""
891
939
"To retrieve the branch as of a particular revision, supply the --revision\n"
892
940
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
896
944
"code.)"
897
945
msgstr ""
898
946
899
#: bzrlib/builtins.py:1497
947
#: bzrlib/builtins.py:1590
900
948
msgid ""
901
949
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
902
950
"the branch for every operation. Normal checkouts can perform common "
904
952
"commits."
905
953
msgstr ""
906
954
907
#: bzrlib/builtins.py:1504
955
#: bzrlib/builtins.py:1597
908
956
msgid "Get file contents from this tree."
909
msgstr ""
957
msgstr "Obter o conteúdo do arquivo desta árvore."
910
958
911
#: bzrlib/builtins.py:1506
959
#: bzrlib/builtins.py:1599
912
960
msgid "Hard-link working tree files where possible."
913
msgstr ""
961
msgstr "Use hard-link na árvore de trabalho sempre que possível."
914
962
915
#: bzrlib/builtins.py:1547
963
#: bzrlib/builtins.py:1640
916
964
msgid ""
917
965
"Show list of renamed files.\n"
918
966
" "
919
967
msgstr ""
968
"Mostrar a lista de arquivos renomeados.\n"
969
" "
920
970
921
#: bzrlib/builtins.py:1577
971
#: bzrlib/builtins.py:1670
922
972
msgid "Update a working tree to a new revision."
923
msgstr ""
973
msgstr "Atualizar a árvore de trabalho para a nova revisão."
924
974
925
#: bzrlib/builtins.py:1579
975
#: bzrlib/builtins.py:1672
926
976
msgid ""
927
977
"This will perform a merge of the destination revision (the tip of the\n"
928
978
"branch, or the specified revision) into the working tree, and then make\n"
929
979
"that revision the basis revision for the working tree. "
930
980
msgstr ""
931
981
932
#: bzrlib/builtins.py:1583
982
#: bzrlib/builtins.py:1676
933
983
msgid ""
934
984
"You can use this to visit an older revision, or to update a working tree\n"
935
985
"that is out of date from its branch."
936
986
msgstr ""
987
"Você pode usar isso para visitar uma revisão antiga, ou para atualizar a "
988
"árvore de trabalho\n"
989
"que está desatualizada de seu ramo."
937
990
938
#: bzrlib/builtins.py:1586
991
#: bzrlib/builtins.py:1679
939
992
msgid ""
940
993
"If there are any uncommitted changes in the tree, they will be carried\n"
941
994
"across and remain as uncommitted changes after the update. To discard\n"
943
996
"with the changes brought in by the change in basis revision."
944
997
msgstr ""
945
998
946
#: bzrlib/builtins.py:1591
999
#: bzrlib/builtins.py:1684
947
1000
msgid ""
948
1001
"If the tree's branch is bound to a master branch, bzr will also update\n"
949
1002
"the branch from the master."
950
1003
msgstr ""
1004
"Se ramo da árvore está ligado a um ramo mestre, o bzr também atualizará\\\n"
1005
"o ramo a partir do ramo mestre."
951
1006
952
#: bzrlib/builtins.py:1594
1007
#: bzrlib/builtins.py:1687
953
1008
msgid ""
954
1009
"You cannot update just a single file or directory, because each Bazaar\n"
955
1010
"working tree has just a single basis revision. If you want to restore a\n"
959
1014
"out the old content of that file to a new location."
960
1015
msgstr ""
961
1016
962
#: bzrlib/builtins.py:1601
1017
#: bzrlib/builtins.py:1694
963
1018
msgid ""
964
1019
"The 'dir' argument, if given, must be the location of the root of a\n"
965
1020
"working tree to update. By default, the working tree that contains the \n"
966
1021
"current working directory is used."
967
1022
msgstr ""
968
1023
969
#: bzrlib/builtins.py:1617
1024
#: bzrlib/builtins.py:1710
970
1025
msgid "bzr update --revision takes exactly one revision"
971
msgstr ""
1026
msgstr "bzr update --revision tem exatamente uma revisão"
972
1027
973
#: bzrlib/builtins.py:1625
1028
#: bzrlib/builtins.py:1718
974
1029
msgid "bzr update can only update a whole tree, not a file or subdirectory"
975
1030
msgstr ""
1031
"bzr update só pode atualizar uma árvore inteira, e não um arquivo ou "
1032
"subdiretório."
976
1033
977
#: bzrlib/builtins.py:1656
1034
#: bzrlib/builtins.py:1749
978
1035
msgid "Tree is up to date at revision {0} of branch {1}"
979
msgstr ""
1036
msgstr "Árvore está atualizada na revisão {0} do ramo {1}"
980
1037
981
#: bzrlib/builtins.py:1672
1038
#: bzrlib/builtins.py:1765
982
1039
#, python-format
983
1040
msgid ""
984
1041
"branch has no revision %s\n"
985
1042
"bzr update --revision only works for a revision in the branch history"
986
1043
msgstr ""
1044
"o ramo não tem revisão %s\n"
1045
"bzr update --revision só funciona para uma revisão no histórico da "
1046
"ramificação."
987
1047
988
#: bzrlib/builtins.py:1678
1048
#: bzrlib/builtins.py:1771
989
1049
msgid "Updated to revision {0} of branch {1}"
990
msgstr ""
1050
msgstr "Atualizado para a revisão {0} do ramo {1}"
991
1051
992
#: bzrlib/builtins.py:1682
1052
#: bzrlib/builtins.py:1775
993
1053
msgid ""
994
1054
"Your local commits will now show as pending merges with 'bzr status', and "
995
1055
"can be committed with 'bzr commit'."
996
1056
msgstr ""
997
1057
998
#: bzrlib/builtins.py:1691
1058
#: bzrlib/builtins.py:1784
999
1059
msgid "Show information about a working tree, branch or repository."
1000
1060
msgstr ""
1061
"Mostrar informações sobre uma árvore de trabalho, ramo ou repositório."
1001
1062
1002
#: bzrlib/builtins.py:1693
1063
#: bzrlib/builtins.py:1786
1003
1064
msgid ""
1004
1065
"This command will show all known locations and formats associated to the\n"
1005
1066
"tree, branch or repository."
1006
1067
msgstr ""
1068
"Esse comando irá mostrar todos os locais conhecidos e formatos associados à\n"
1069
"árvore, ramo ou repositório."
1007
1070
1008
#: bzrlib/builtins.py:1696
1071
#: bzrlib/builtins.py:1789
1009
1072
msgid ""
1010
1073
"In verbose mode, statistical information is included with each report.\n"
1011
1074
"To see extended statistic information, use a verbosity level of 2 or\n"
1012
1075
"higher by specifying the verbose option multiple times, e.g. -vv."
1013
1076
msgstr ""
1014
1077
1015
#: bzrlib/builtins.py:1700
1078
#: bzrlib/builtins.py:1793
1016
1079
msgid "Branches and working trees will also report any missing revisions."
1017
1080
msgstr ""
1081
"Ramos e árvores de trabalho irão também reportar qualquer falta de revisão."
1018
1082
1019
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
1020
#: bzrlib/builtins.py:6389
1083
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1084
#: bzrlib/builtins.py:6442
1021
1085
msgid ":Examples:"
1022
msgstr ""
1086
msgstr ":Exemplos:"
1023
1087
1024
#: bzrlib/builtins.py:1704
1088
#: bzrlib/builtins.py:1797
1025
1089
msgid " Display information on the format and related locations:"
1026
msgstr ""
1090
msgstr " Exibir informações sobre o formato e locais relacionados:"
1027
1091
1028
#: bzrlib/builtins.py:1706
1092
#: bzrlib/builtins.py:1799
1029
1093
msgid " bzr info"
1030
msgstr ""
1094
msgstr " bzr info"
1031
1095
1032
#: bzrlib/builtins.py:1708
1096
#: bzrlib/builtins.py:1801
1033
1097
msgid ""
1034
1098
" Display the above together with extended format information and\n"
1035
1099
" basic statistics (like the number of files in the working tree and\n"
1036
1100
" number of revisions in the branch and repository):"
1037
1101
msgstr ""
1038
1102
1039
#: bzrlib/builtins.py:1712
1103
#: bzrlib/builtins.py:1805
1040
1104
msgid " bzr info -v"
1041
msgstr ""
1105
msgstr " bzr info -v"
1042
1106
1043
#: bzrlib/builtins.py:1714
1107
#: bzrlib/builtins.py:1807
1044
1108
msgid " Display the above together with number of committers to the branch:"
1045
1109
msgstr ""
1046
1110
1047
#: bzrlib/builtins.py:1716
1111
#: bzrlib/builtins.py:1809
1048
1112
msgid " bzr info -vv"
1049
msgstr ""
1113
msgstr " bzr info -vv"
1050
1114
1051
#: bzrlib/builtins.py:1735
1115
#: bzrlib/builtins.py:1828
1052
1116
msgid "Remove files or directories."
1053
msgstr ""
1117
msgstr "Remove arquivos ou diretórios."
1054
1118
1055
#: bzrlib/builtins.py:1737
1119
#: bzrlib/builtins.py:1830
1056
1120
msgid ""
1057
1121
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1058
1122
"delete them if they can easily be recovered using revert otherwise they\n"
1061
1125
"Bazaar but missing in your tree and stop tracking them for you."
1062
1126
msgstr ""
1063
1127
1064
#: bzrlib/builtins.py:1745
1128
#: bzrlib/builtins.py:1838
1065
1129
msgid "Only remove files that have never been committed."
1066
msgstr ""
1130
msgstr "Remover apenas arquivos que nunca foram enviados."
1067
1131
1068
#: bzrlib/builtins.py:1747
1132
#: bzrlib/builtins.py:1840
1069
1133
msgid "The file deletion mode to be used."
1070
msgstr ""
1134
msgstr "O modo de exclusão do arquivo a ser utilizado."
1071
1135
1072
#: bzrlib/builtins.py:1748
1136
#: bzrlib/builtins.py:1841
1073
1137
msgid "Deletion Strategy"
1074
msgstr ""
1138
msgstr "Estratégia de exclusão"
1075
1139
1076
#: bzrlib/builtins.py:1749
1140
#: bzrlib/builtins.py:1842
1077
1141
msgid "Backup changed files (default)."
1078
msgstr ""
1142
msgstr "Backup de arquivos alterados (padrão)."
1079
1143
1080
#: bzrlib/builtins.py:1750
1144
#: bzrlib/builtins.py:1843
1081
1145
msgid "Delete from bzr but leave the working copy."
1082
msgstr ""
1146
msgstr "Excluir do brz mas deixe a cópia de trabalho."
1083
1147
1084
#: bzrlib/builtins.py:1751
1148
#: bzrlib/builtins.py:1844
1085
1149
msgid "Don't backup changed files."
1086
msgstr ""
1150
msgstr "Não faça backup de arquivos alterados."
1087
1151
1088
#: bzrlib/builtins.py:1752
1152
#: bzrlib/builtins.py:1845
1089
1153
msgid ""
1090
1154
"Delete all the specified files, even if they can not be recovered and even "
1091
1155
"if they are non-empty directories. (deprecated, use no-backup)"
1092
1156
msgstr ""
1157
"Apagar todos os arquivos especificados, mesmo que eles não possam ser "
1158
"recuperados e até mesmo se eles são diretórios não vazios. (obsoleto, use no-"
1159
"backup)"
1093
1160
1094
#: bzrlib/builtins.py:1761
1161
#: bzrlib/builtins.py:1854
1095
1162
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1096
1163
msgstr ""
1164
"(A opção --force é obsoleta, preferencialmente use --no-backup no futuro.)"
1097
1165
1098
#: bzrlib/builtins.py:1778
1166
#: bzrlib/builtins.py:1871
1099
1167
msgid "No matching files."
1100
msgstr ""
1168
msgstr "Nenhum arquivo correspondente."
1101
1169
1102
#: bzrlib/builtins.py:1839
1170
#: bzrlib/builtins.py:1932
1103
1171
msgid "Reconcile bzr metadata in a branch."
1104
msgstr ""
1172
msgstr "Reconciliar metadados bzr em um ramo."
1105
1173
1106
#: bzrlib/builtins.py:1841
1174
#: bzrlib/builtins.py:1934
1107
1175
msgid ""
1108
1176
"This can correct data mismatches that may have been caused by\n"
1109
1177
"previous ghost operations or bzr upgrades. You should only\n"
1111
1179
"advises you to run it."
1112
1180
msgstr ""
1113
1181
1114
#: bzrlib/builtins.py:1846
1182
#: bzrlib/builtins.py:1939
1115
1183
msgid ""
1116
1184
"If a second branch is provided, cross-branch reconciliation is\n"
1117
1185
"also attempted, which will check that data like the tree root\n"
1119
1187
"correctly in both branches."
1120
1188
msgstr ""
1121
1189
1122
#: bzrlib/builtins.py:1851
1190
#: bzrlib/builtins.py:1944
1123
1191
msgid ""
1124
1192
"At the same time it is run it may recompress data resulting in\n"
1125
1193
"a potential saving in disk space or performance gain."
1126
1194
msgstr ""
1195
"No mesmo tempo em que ele é executado ele pode recompactar os dados, "
1196
"resultando em\n"
1197
"num potencial ganho de espaço em disco e desempenho."
1127
1198
1128
#: bzrlib/builtins.py:1854
1199
#: bzrlib/builtins.py:1947
1129
1200
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1130
1201
msgstr ""
1131
1202
1132
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1203
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1133
1204
msgid ""
1134
1205
"Format for the bzr 2.0 series.\n"
1135
1206
"Uses group-compress storage.\n"
1136
1207
"Provides rich roots which are a one-way transition.\n"
1137
1208
msgstr ""
1138
1209
1139
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1210
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1140
1211
msgid ""
1141
1212
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1142
1213
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1143
1214
msgstr ""
1144
1215
1145
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1216
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1146
1217
msgid "The 2a format with experimental support for colocated branches.\n"
1147
1218
msgstr ""
1148
1219
1149
#: bzrlib/builtins.py:1922
1220
#: bzrlib/builtins.py:2015
1150
1221
msgid "Make a directory into a versioned branch."
1151
msgstr ""
1222
msgstr "Crie um diretório em um ramo versionados."
1152
1223
1153
#: bzrlib/builtins.py:1924
1224
#: bzrlib/builtins.py:2017
1154
1225
msgid ""
1155
1226
"Use this to create an empty branch, or before importing an\n"
1156
1227
"existing project."
1157
1228
msgstr ""
1229
"Use isso para criar um ramo vazio, ou antes de importar um\n"
1230
"projeto existente."
1158
1231
1159
#: bzrlib/builtins.py:1927
1232
#: bzrlib/builtins.py:2020
1160
1233
msgid ""
1161
1234
"If there is a repository in a parent directory of the location, then\n"
1162
1235
"the history of the branch will be stored in the repository. Otherwise\n"
1164
1237
"in the .bzr directory."
1165
1238
msgstr ""
1166
1239
1167
#: bzrlib/builtins.py:1932
1240
#: bzrlib/builtins.py:2025
1168
1241
msgid ""
1169
1242
"If there is already a branch at the location but it has no working tree,\n"
1170
1243
"the tree can be populated with 'bzr checkout'."
1171
1244
msgstr ""
1172
1245
1173
#: bzrlib/builtins.py:1935
1246
#: bzrlib/builtins.py:2028
1174
1247
msgid "Recipe for importing a tree of files::"
1175
msgstr ""
1248
msgstr "Receita para importação de uma árvore de arquivos::"
1176
1249
1177
#: bzrlib/builtins.py:1937
1250
#: bzrlib/builtins.py:2030
1178
1251
msgid ""
1179
1252
" cd ~/project\n"
1180
1253
" bzr init\n"
1182
1255
" bzr status\n"
1183
1256
" bzr commit -m \"imported project\""
1184
1257
msgstr ""
1258
" cd ~/project\n"
1259
" bzr init\n"
1260
" bzr add .\n"
1261
" bzr status\n"
1262
" bzr commit -m \"projeto importado\""
1185
1263
1186
#: bzrlib/builtins.py:1948
1264
#: bzrlib/builtins.py:2041
1187
1265
msgid ""
1188
1266
"Create the path leading up to the branch if it does not already exist."
1189
msgstr ""
1267
msgstr "Criar o caminho que conduz até o ramo se ele não existir."
1190
1268
1191
#: bzrlib/builtins.py:1951
1269
#: bzrlib/builtins.py:2044
1192
1270
msgid "Specify a format for this branch. See \"help formats\"."
1193
msgstr ""
1271
msgstr "Especifique um formato para esse ramo. Consulte \"help formats\"."
1194
1272
1195
#: bzrlib/builtins.py:1959
1273
#: bzrlib/builtins.py:2052
1196
1274
msgid ""
1197
1275
"Never change revnos or the existing log. Append revisions to it only."
1198
1276
msgstr ""
1199
1277
1200
#: bzrlib/builtins.py:1962
1278
#: bzrlib/builtins.py:2055
1201
1279
msgid "Create a branch without a working tree."
1202
msgstr ""
1280
msgstr "Criar um ramo sem uma árvore de trabalho."
1203
1281
1204
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1282
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1205
1283
#, python-format
1206
1284
msgid ""
1207
1285
"Parent directory of %s does not exist.\n"
1208
1286
"You may supply --create-prefix to create all leading parent directories."
1209
1287
msgstr ""
1288
"Diretório pai de %s não existe.\n"
1289
"Você deve fornecer --create-prefix para criar todos os principais diretórios "
1290
"pai."
1210
1291
1211
#: bzrlib/builtins.py:2016
1292
#: bzrlib/builtins.py:2109
1212
1293
msgid ""
1213
1294
"This branch format cannot be set to append-revisions-only. Try --default."
1214
1295
msgstr ""
1215
1296
1216
#: bzrlib/builtins.py:2027
1297
#: bzrlib/builtins.py:2120
1217
1298
msgid "Created a {0} (format: {1})\n"
1218
msgstr ""
1299
msgstr "Criou um {0} (formato: {1})\n"
1219
1300
1220
#: bzrlib/builtins.py:2036
1301
#: bzrlib/builtins.py:2129
1221
1302
#, python-format
1222
1303
msgid "Using shared repository: %s\n"
1223
msgstr ""
1304
msgstr "Usando repositório compartilhado: %s\n"
1224
1305
1225
#: bzrlib/builtins.py:2040
1306
#: bzrlib/builtins.py:2133
1226
1307
msgid "Create a shared repository for branches to share storage space."
1227
1308
msgstr ""
1309
"Criar um repositório compartilhado de ramos para dividir espaço de "
1310
"armazenamento."
1228
1311
1229
#: bzrlib/builtins.py:2042
1312
#: bzrlib/builtins.py:2135
1230
1313
msgid ""
1231
1314
"New branches created under the repository directory will store their\n"
1232
1315
"revisions in the repository, not in the branch directory. For branches\n"
1234
1317
"speeds up the creation of new branches."
1235
1318
msgstr ""
1236
1319
1237
#: bzrlib/builtins.py:2047
1320
#: bzrlib/builtins.py:2140
1238
1321
msgid ""
1239
1322
"If the --no-trees option is given then the branches in the repository\n"
1240
1323
"will not have working trees by default. They will still exist as \n"
1244
1327
"branches, such as on a server."
1245
1328
msgstr ""
1246
1329
1247
#: bzrlib/builtins.py:2054
1330
#: bzrlib/builtins.py:2147
1248
1331
msgid ""
1249
1332
":Examples:\n"
1250
1333
" Create a shared repository holding just branches::"
1251
1334
msgstr ""
1335
":Exemplos:\n"
1336
" Cria um repositório compartilhado contendo apenas ramos::"
1252
1337
1253
#: bzrlib/builtins.py:2057
1338
#: bzrlib/builtins.py:2150
1254
1339
msgid ""
1255
1340
" bzr init-repo --no-trees repo\n"
1256
1341
" bzr init repo/trunk"
1257
1342
msgstr ""
1343
" bzr init-repo --no-trees repo\n"
1344
" bzr init repo/trunk"
1258
1345
1259
#: bzrlib/builtins.py:2060
1346
#: bzrlib/builtins.py:2153
1260
1347
msgid " Make a lightweight checkout elsewhere::"
1261
msgstr ""
1348
msgstr " Faça um leve checkout em outro lugar::"
1262
1349
1263
#: bzrlib/builtins.py:2062
1350
#: bzrlib/builtins.py:2155
1264
1351
msgid ""
1265
1352
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1266
1353
" cd trunk-checkout\n"
1267
1354
" (add files here)"
1268
1355
msgstr ""
1356
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1357
" cd trunk-checkout\n"
1358
" (adicione arquivos aqui)"
1269
1359
1270
#: bzrlib/builtins.py:2070
1360
#: bzrlib/builtins.py:2163
1271
1361
msgid ""
1272
1362
"Specify a format for this repository. See \"bzr help formats\" for details."
1273
1363
msgstr ""
1364
"Especifique um formato para este repositório. Veja \"bzr help formats\" para "
1365
"detalhes."
1274
1366
1275
#: bzrlib/builtins.py:2074
1367
#: bzrlib/builtins.py:2167
1276
1368
msgid "Repository format"
1277
msgstr ""
1369
msgstr "Formato de repositório"
1278
1370
1279
#: bzrlib/builtins.py:2076
1371
#: bzrlib/builtins.py:2169
1280
1372
msgid "Branches in the repository will default to not having a working tree."
1281
1373
msgstr ""
1374
"Ramos no repositório será o padrão para não ter uma árvore de trabalho."
1282
1375
1283
#: bzrlib/builtins.py:2102
1376
#: bzrlib/builtins.py:2195
1284
1377
msgid "Show differences in the working tree, between revisions or branches."
1285
1378
msgstr ""
1379
"Mostrar diferenças na árvore de trabalho, entre as revisões ou ramos."
1286
1380
1287
#: bzrlib/builtins.py:2104
1381
#: bzrlib/builtins.py:2197
1288
1382
msgid ""
1289
1383
"If no arguments are given, all changes for the current tree are listed.\n"
1290
1384
"If files are given, only the changes in those files are listed.\n"
1294
1388
"given."
1295
1389
msgstr ""
1296
1390
1297
#: bzrlib/builtins.py:2111
1391
#: bzrlib/builtins.py:2204
1298
1392
msgid ""
1299
1393
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1300
1394
"produces patches suitable for \"patch -p1\"."
1301
1395
msgstr ""
1302
1396
1303
#: bzrlib/builtins.py:2114
1397
#: bzrlib/builtins.py:2207
1304
1398
msgid ""
1305
1399
"Note that when using the -r argument with a range of revisions, the\n"
1306
1400
"differences are computed between the two specified revisions. That\n"
1310
1404
"in the range."
1311
1405
msgstr ""
1312
1406
1313
#: bzrlib/builtins.py:2121
1407
#: bzrlib/builtins.py:2214
1314
1408
msgid ""
1315
1409
":Exit values:\n"
1316
1410
" 1 - changed\n"
1318
1412
" 3 - error\n"
1319
1413
" 0 - no change"
1320
1414
msgstr ""
1415
":Valores de saída:\n"
1416
" 1 - alterado\n"
1417
" 2 - mudanças irrepresentáveis\n"
1418
" 3 - erro\n"
1419
" 0 - Sem alteração"
1321
1420
1322
#: bzrlib/builtins.py:2127
1421
#: bzrlib/builtins.py:2220
1323
1422
msgid ""
1324
1423
":Examples:\n"
1325
1424
" Shows the difference in the working tree versus the last commit::"
1326
1425
msgstr ""
1426
":Exemplos:\n"
1427
" Mostra a diferença da árvore de trabalho em relação a última submissão::"
1327
1428
1328
#: bzrlib/builtins.py:2130
1429
#: bzrlib/builtins.py:2223
1329
1430
msgid " bzr diff"
1330
msgstr ""
1431
msgstr " bzr diff"
1331
1432
1332
#: bzrlib/builtins.py:2132
1433
#: bzrlib/builtins.py:2225
1333
1434
msgid " Difference between the working tree and revision 1::"
1334
msgstr ""
1435
msgstr " Diferença entre a árvore de trabalho e a revisão 1::"
1335
1436
1336
#: bzrlib/builtins.py:2134
1437
#: bzrlib/builtins.py:2227
1337
1438
msgid " bzr diff -r1"
1338
msgstr ""
1439
msgstr " bzr diff -r1"
1339
1440
1340
#: bzrlib/builtins.py:2136
1441
#: bzrlib/builtins.py:2229
1341
1442
msgid " Difference between revision 3 and revision 1::"
1342
msgstr ""
1443
msgstr " Diferença entre a revisão 3 e a revisão 1::"
1343
1444
1344
#: bzrlib/builtins.py:2138
1445
#: bzrlib/builtins.py:2231
1345
1446
msgid " bzr diff -r1..3"
1346
msgstr ""
1447
msgstr " bzr diff -r1..3"
1347
1448
1348
#: bzrlib/builtins.py:2140
1449
#: bzrlib/builtins.py:2233
1349
1450
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1350
msgstr ""
1451
msgstr " Diferença entre a revisão 3 e a revisão 1 para o ramo xxx::"
1351
1452
1352
#: bzrlib/builtins.py:2142
1453
#: bzrlib/builtins.py:2235
1353
1454
msgid " bzr diff -r1..3 xxx"
1354
msgstr ""
1455
msgstr " bzr diff -r1..3 xxx"
1355
1456
1356
#: bzrlib/builtins.py:2144
1457
#: bzrlib/builtins.py:2237
1357
1458
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1358
1459
msgstr ""
1460
" As alterações introduzidas pela revisão 2 (equivalente a -r1..2)::"
1359
1461
1360
#: bzrlib/builtins.py:2146
1462
#: bzrlib/builtins.py:2239
1361
1463
msgid " bzr diff -c2"
1362
msgstr ""
1464
msgstr " bzr diff -c2"
1363
1465
1364
#: bzrlib/builtins.py:2148
1466
#: bzrlib/builtins.py:2241
1365
1467
msgid ""
1366
1468
" To see the changes introduced by revision X::\n"
1367
1469
" \n"
1368
1470
" bzr diff -cX"
1369
1471
msgstr ""
1472
" Para ver as alterações introduzidas pela revisão X::\n"
1473
" \n"
1474
" bzr diff-cX"
1370
1475
1371
#: bzrlib/builtins.py:2152
1476
#: bzrlib/builtins.py:2245
1372
1477
msgid ""
1373
1478
" Note that in the case of a merge, the -c option shows the changes\n"
1374
1479
" compared to the left hand parent. To see the changes against\n"
1375
1480
" another parent, use::"
1376
1481
msgstr ""
1377
1482
1378
#: bzrlib/builtins.py:2156
1483
#: bzrlib/builtins.py:2249
1379
1484
msgid " bzr diff -r<chosen_parent>..X"
1380
1485
msgstr ""
1381
1486
1382
#: bzrlib/builtins.py:2158
1487
#: bzrlib/builtins.py:2251
1383
1488
msgid ""
1384
1489
" The changes between the current revision and the previous revision\n"
1385
1490
" (equivalent to -c-1 and -r-2..-1)"
1386
1491
msgstr ""
1387
1492
1388
#: bzrlib/builtins.py:2161
1493
#: bzrlib/builtins.py:2254
1389
1494
msgid " bzr diff -r-2.."
1390
msgstr ""
1495
msgstr " bzr diff -r-2.."
1391
1496
1392
#: bzrlib/builtins.py:2163
1497
#: bzrlib/builtins.py:2256
1393
1498
msgid " Show just the differences for file NEWS::"
1394
1499
msgstr ""
1395
1500
1396
#: bzrlib/builtins.py:2165
1501
#: bzrlib/builtins.py:2258
1397
1502
msgid " bzr diff NEWS"
1398
msgstr ""
1503
msgstr " bzr diff NEWS"
1399
1504
1400
#: bzrlib/builtins.py:2167
1505
#: bzrlib/builtins.py:2260
1401
1506
msgid " Show the differences in working tree xxx for file NEWS::"
1402
1507
msgstr ""
1403
1508
1404
#: bzrlib/builtins.py:2169
1509
#: bzrlib/builtins.py:2262
1405
1510
msgid " bzr diff xxx/NEWS"
1406
msgstr ""
1511
msgstr " bzr diff xxx/NEWS"
1407
1512
1408
#: bzrlib/builtins.py:2171
1513
#: bzrlib/builtins.py:2264
1409
1514
msgid " Show the differences from branch xxx to this working tree:"
1410
1515
msgstr ""
1411
1516
1412
#: bzrlib/builtins.py:2173
1517
#: bzrlib/builtins.py:2266
1413
1518
msgid " bzr diff --old xxx"
1414
msgstr ""
1519
msgstr " bzr diff --old xxx"
1415
1520
1416
#: bzrlib/builtins.py:2175
1521
#: bzrlib/builtins.py:2268
1417
1522
msgid " Show the differences between two branches for file NEWS::"
1418
1523
msgstr ""
1419
1524
1420
#: bzrlib/builtins.py:2177
1525
#: bzrlib/builtins.py:2270
1421
1526
msgid " bzr diff --old xxx --new yyy NEWS"
1422
1527
msgstr ""
1423
1528
1424
#: bzrlib/builtins.py:2179
1529
#: bzrlib/builtins.py:2272
1425
1530
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1426
1531
msgstr ""
1427
1532
1428
#: bzrlib/builtins.py:2181
1533
#: bzrlib/builtins.py:2274
1429
1534
msgid ""
1430
1535
" bzr diff --prefix old/:new/\n"
1431
1536
" \n"
1434
1539
" bzr diff --using /usr/bin/diff --diff-options -wu"
1435
1540
msgstr ""
1436
1541
1437
#: bzrlib/builtins.py:2191
1542
#: bzrlib/builtins.py:2284
1438
1543
msgid "Pass these options to the external diff program."
1439
1544
msgstr ""
1440
1545
1441
#: bzrlib/builtins.py:2194
1546
#: bzrlib/builtins.py:2287
1442
1547
msgid ""
1443
1548
"Set prefixes added to old and new filenames, as two values separated by a "
1444
1549
"colon. (eg \"old/:new/\")."
1445
1550
msgstr ""
1446
1551
1447
#: bzrlib/builtins.py:2197
1552
#: bzrlib/builtins.py:2290
1448
1553
msgid "Branch/tree to compare from."
1449
1554
msgstr ""
1450
1555
1451
#: bzrlib/builtins.py:2201
1556
#: bzrlib/builtins.py:2294
1452
1557
msgid "Branch/tree to compare to."
1453
1558
msgstr ""
1454
1559
1455
#: bzrlib/builtins.py:2207
1560
#: bzrlib/builtins.py:2300
1456
1561
msgid "Use this command to compare files."
1457
1562
msgstr ""
1458
1563
1459
#: bzrlib/builtins.py:2212
1564
#: bzrlib/builtins.py:2305
1460
1565
msgid "Diff format to use."
1461
1566
msgstr ""
1462
1567
1463
#: bzrlib/builtins.py:2214
1568
#: bzrlib/builtins.py:2307
1464
1569
msgid "Diff format"
1465
1570
msgstr ""
1466
1571
1467
#: bzrlib/builtins.py:2236
1572
#: bzrlib/builtins.py:2329
1468
1573
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1469
1574
msgstr ""
1470
1575
1471
#: bzrlib/builtins.py:2240
1576
#: bzrlib/builtins.py:2333
1472
1577
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1473
1578
msgstr ""
1474
1579
1475
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1476
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1580
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1581
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1477
1582
msgid "{0} and {1} are mutually exclusive"
1478
1583
msgstr ""
1479
1584
1480
#: bzrlib/builtins.py:2265
1585
#: bzrlib/builtins.py:2358
1481
1586
msgid ""
1482
1587
"List files deleted in the working tree.\n"
1483
1588
" "
1484
1589
msgstr ""
1485
1590
1486
#: bzrlib/builtins.py:2343
1591
#: bzrlib/builtins.py:2436
1487
1592
msgid "Show the tree root directory."
1488
msgstr ""
1593
msgstr "Mostra o diretório raiz da árvore."
1489
1594
1490
#: bzrlib/builtins.py:2345
1595
#: bzrlib/builtins.py:2438
1491
1596
msgid ""
1492
1597
"The root is the nearest enclosing directory with a .bzr control\n"
1493
1598
"directory."
1494
1599
msgstr ""
1495
1600
1496
#: bzrlib/builtins.py:2360
1601
#: bzrlib/builtins.py:2453
1497
1602
msgid "The limit argument must be an integer."
1498
msgstr ""
1603
msgstr "O argumento de limite deve ser um inteiro."
1499
1604
1500
#: bzrlib/builtins.py:2368
1605
#: bzrlib/builtins.py:2461
1501
1606
msgid "The levels argument must be an integer."
1502
msgstr ""
1607
msgstr "O argumento de níveis deve ser um inteiro."
1503
1608
1504
#: bzrlib/builtins.py:2373
1609
#: bzrlib/builtins.py:2466
1505
1610
msgid "Show historical log for a branch or subset of a branch."
1506
1611
msgstr ""
1507
1612
1508
#: bzrlib/builtins.py:2375
1613
#: bzrlib/builtins.py:2468
1509
1614
msgid ""
1510
1615
"log is bzr's default tool for exploring the history of a branch.\n"
1511
1616
"The branch to use is taken from the first parameter. If no parameters\n"
1513
1618
"Here are some simple examples::"
1514
1619
msgstr ""
1515
1620
1516
#: bzrlib/builtins.py:2380
1621
#: bzrlib/builtins.py:2473
1517
1622
msgid ""
1518
1623
" bzr log log the current branch\n"
1519
1624
" bzr log foo.py log a file in its branch\n"
1520
1625
" bzr log http://server/branch log a branch on a server"
1521
1626
msgstr ""
1522
1627
1523
#: bzrlib/builtins.py:2384
1628
#: bzrlib/builtins.py:2477
1524
1629
msgid ""
1525
1630
"The filtering, ordering and information shown for each revision can\n"
1526
1631
"be controlled as explained below. By default, all revisions are\n"
1530
1635
"were merged."
1531
1636
msgstr ""
1532
1637
1533
#: bzrlib/builtins.py:2391
1638
#: bzrlib/builtins.py:2484
1534
1639
msgid ":Output control:"
1535
1640
msgstr ""
1536
1641
1537
#: bzrlib/builtins.py:2393
1642
#: bzrlib/builtins.py:2486
1538
1643
msgid ""
1539
1644
" The log format controls how information about each revision is\n"
1540
1645
" displayed. The standard log formats are called ``long``, ``short``\n"
1542
1647
" for more details on log formats."
1543
1648
msgstr ""
1544
1649
1545
#: bzrlib/builtins.py:2398
1650
#: bzrlib/builtins.py:2491
1546
1651
msgid ""
1547
1652
" The following options can be used to control what information is\n"
1548
1653
" displayed::"
1549
1654
msgstr ""
1550
1655
1551
#: bzrlib/builtins.py:2401
1656
#: bzrlib/builtins.py:2494
1552
1657
msgid ""
1553
1658
" -l N display a maximum of N revisions\n"
1554
1659
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1557
1662
" --show-ids display revision-ids (and file-ids), not just revnos"
1558
1663
msgstr ""
1559
1664
1560
#: bzrlib/builtins.py:2407
1665
#: bzrlib/builtins.py:2500
1561
1666
msgid ""
1562
1667
" Note that the default number of levels to display is a function of the\n"
1563
1668
" log format. If the -n option is not used, the standard log formats show\n"
1564
1669
" just the top level (mainline)."
1565
1670
msgstr ""
1566
1671
1567
#: bzrlib/builtins.py:2411
1672
#: bzrlib/builtins.py:2504
1568
1673
msgid ""
1569
1674
" Status summaries are shown using status flags like A, M, etc. To see\n"
1570
1675
" the changes explained using words like ``added`` and ``modified``\n"
1571
1676
" instead, use the -vv option."
1572
1677
msgstr ""
1573
1678
1574
#: bzrlib/builtins.py:2415
1679
#: bzrlib/builtins.py:2508
1575
1680
msgid ":Ordering control:"
1576
1681
msgstr ""
1577
1682
1578
#: bzrlib/builtins.py:2417
1683
#: bzrlib/builtins.py:2510
1579
1684
msgid ""
1580
1685
" To display revisions from oldest to newest, use the --forward option.\n"
1581
1686
" In most cases, using this option will have little impact on the total\n"
1583
1688
" display revisions like --reverse does when it can."
1584
1689
msgstr ""
1585
1690
1586
#: bzrlib/builtins.py:2422
1691
#: bzrlib/builtins.py:2515
1587
1692
msgid ":Revision filtering:"
1588
1693
msgstr ""
1589
1694
1590
#: bzrlib/builtins.py:2424
1695
#: bzrlib/builtins.py:2517
1591
1696
msgid ""
1592
1697
" The -r option can be used to specify what revision or range of revisions\n"
1593
1698
" to filter against. The various forms are shown below::"
1594
1699
msgstr ""
1595
1700
1596
#: bzrlib/builtins.py:2427
1701
#: bzrlib/builtins.py:2520
1597
1702
msgid ""
1598
1703
" -rX display revision X\n"
1599
1704
" -rX.. display revision X and later\n"
1601
1706
" -rX..Y display from X to Y inclusive"
1602
1707
msgstr ""
1603
1708
1604
#: bzrlib/builtins.py:2432
1709
#: bzrlib/builtins.py:2525
1605
1710
msgid ""
1606
1711
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1607
1712
" Some common examples are given below::"
1608
1713
msgstr ""
1609
1714
1610
#: bzrlib/builtins.py:2435
1715
#: bzrlib/builtins.py:2528
1611
1716
msgid ""
1612
1717
" -r-1 show just the tip\n"
1613
1718
" -r-10.. show the last 10 mainline revisions\n"
1617
1722
" -rdate:yesterday.. show changes since yesterday"
1618
1723
msgstr ""
1619
1724
1620
#: bzrlib/builtins.py:2442
1725
#: bzrlib/builtins.py:2535
1621
1726
msgid ""
1622
1727
" When logging a range of revisions using -rX..Y, log starts at\n"
1623
1728
" revision Y and searches back in history through the primary\n"
1627
1732
" a nested merge revision and the log will be truncated accordingly."
1628
1733
msgstr ""
1629
1734
1630
#: bzrlib/builtins.py:2449
1735
#: bzrlib/builtins.py:2542
1631
1736
msgid ":Path filtering:"
1632
1737
msgstr ""
1633
1738
1634
#: bzrlib/builtins.py:2451
1739
#: bzrlib/builtins.py:2544
1635
1740
msgid ""
1636
1741
" If parameters are given and the first one is not a branch, the log\n"
1637
1742
" will be filtered to show only those revisions that changed the\n"
1638
1743
" nominated files or directories."
1639
1744
msgstr ""
1640
1745
1641
#: bzrlib/builtins.py:2455
1746
#: bzrlib/builtins.py:2548
1642
1747
msgid ""
1643
1748
" Filenames are interpreted within their historical context. To log a\n"
1644
1749
" deleted file, specify a revision range so that the file existed at\n"
1645
1750
" the end or start of the range."
1646
1751
msgstr ""
1647
1752
1648
#: bzrlib/builtins.py:2459
1753
#: bzrlib/builtins.py:2552
1649
1754
msgid ""
1650
1755
" Historical context is also important when interpreting pathnames of\n"
1651
1756
" renamed files/directories. Consider the following example:"
1652
1757
msgstr ""
1653
1758
1654
#: bzrlib/builtins.py:2462
1759
#: bzrlib/builtins.py:2555
1655
1760
msgid ""
1656
1761
" * revision 1: add tutorial.txt\n"
1657
1762
" * revision 2: modify tutorial.txt\n"
1658
1763
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1659
1764
msgstr ""
1660
1765
1661
#: bzrlib/builtins.py:2466
1766
#: bzrlib/builtins.py:2559
1662
1767
msgid " In this case:"
1663
msgstr ""
1768
msgstr " Nesse caso:"
1664
1769
1665
#: bzrlib/builtins.py:2468
1770
#: bzrlib/builtins.py:2561
1666
1771
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1667
1772
msgstr ""
1668
1773
1669
#: bzrlib/builtins.py:2470
1774
#: bzrlib/builtins.py:2563
1670
1775
msgid ""
1671
1776
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1672
1777
msgstr ""
1673
1778
1674
#: bzrlib/builtins.py:2472
1779
#: bzrlib/builtins.py:2565
1675
1780
msgid ""
1676
1781
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1677
1782
" the original file in revision 2."
1678
1783
msgstr ""
1679
1784
1680
#: bzrlib/builtins.py:2475
1785
#: bzrlib/builtins.py:2568
1681
1786
msgid ""
1682
1787
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1683
1788
" was no file called guide.txt in revision 2."
1684
1789
msgstr ""
1685
1790
1686
#: bzrlib/builtins.py:2478
1791
#: bzrlib/builtins.py:2571
1687
1792
msgid ""
1688
1793
" Renames are always followed by log. By design, there is no need to\n"
1689
1794
" explicitly ask for this (and no way to stop logging a file back\n"
1690
1795
" until it was last renamed)."
1691
1796
msgstr ""
1692
1797
1693
#: bzrlib/builtins.py:2482
1798
#: bzrlib/builtins.py:2575
1694
1799
msgid ":Other filtering:"
1695
1800
msgstr ""
1696
1801
1697
#: bzrlib/builtins.py:2484
1802
#: bzrlib/builtins.py:2577
1698
1803
msgid ""
1699
1804
" The --match option can be used for finding revisions that match a\n"
1700
1805
" regular expression in a commit message, committer, author or bug.\n"
1703
1808
" --match-message can be used to only match a specific field."
1704
1809
msgstr ""
1705
1810
1706
#: bzrlib/builtins.py:2490
1811
#: bzrlib/builtins.py:2583
1707
1812
msgid ":Tips & tricks:"
1708
msgstr ""
1813
msgstr ":Dicas & truques:"
1709
1814
1710
#: bzrlib/builtins.py:2492
1815
#: bzrlib/builtins.py:2585
1711
1816
msgid ""
1712
1817
" GUI tools and IDEs are often better at exploring history than command\n"
1713
1818
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1716
1821
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1717
1822
msgstr ""
1718
1823
1719
#: bzrlib/builtins.py:2498
1824
#: bzrlib/builtins.py:2591
1720
1825
msgid ""
1721
1826
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1722
1827
msgstr ""
1723
1828
1724
#: bzrlib/builtins.py:2500
1829
#: bzrlib/builtins.py:2593
1725
1830
msgid ""
1726
1831
" [ALIASES]\n"
1727
1832
" tip = log -r-1\n"
1728
1833
" top = log -l10 --line\n"
1729
1834
" show = log -v -p"
1730
1835
msgstr ""
1836
" [ALIASES]\n"
1837
" tip = log -r-1\n"
1838
" top = log -l10 --line\n"
1839
" show = log -v -p"
1731
1840
1732
#: bzrlib/builtins.py:2505
1841
#: bzrlib/builtins.py:2598
1733
1842
msgid ""
1734
1843
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1735
1844
" will show the last 10 mainline revisions. To see the details of a\n"
1736
1845
" particular revision X, ``bzr show -rX``."
1737
1846
msgstr ""
1738
1847
1739
#: bzrlib/builtins.py:2509
1848
#: bzrlib/builtins.py:2602
1740
1849
msgid ""
1741
1850
" If you are interested in looking deeper into a particular merge X,\n"
1742
1851
" use ``bzr log -n0 -rX``."
1743
1852
msgstr ""
1744
1853
1745
#: bzrlib/builtins.py:2512
1854
#: bzrlib/builtins.py:2605
1746
1855
msgid ""
1747
1856
" ``bzr log -v`` on a branch with lots of history is currently\n"
1748
1857
" very slow. A fix for this issue is currently under development.\n"
1750
1859
" be given when using the -v option."
1751
1860
msgstr ""
1752
1861
1753
#: bzrlib/builtins.py:2517
1862
#: bzrlib/builtins.py:2610
1754
1863
msgid ""
1755
1864
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1756
1865
" used to find revisions matching user names, commit messages, etc.\n"
1758
1867
" a list of words but not others."
1759
1868
msgstr ""
1760
1869
1761
#: bzrlib/builtins.py:2522
1870
#: bzrlib/builtins.py:2615
1762
1871
msgid ""
1763
1872
" When exploring non-mainline history on large projects with deep\n"
1764
1873
" history, the performance of log can be greatly improved by installing\n"
1766
1875
" trading disk space for faster speed."
1767
1876
msgstr ""
1768
1877
1769
#: bzrlib/builtins.py:2531
1878
#: bzrlib/builtins.py:2624
1770
1879
msgid "Show from oldest to newest."
1771
msgstr ""
1880
msgstr "Mostrar mais antiga para a mais recente."
1772
1881
1773
#: bzrlib/builtins.py:2534
1882
#: bzrlib/builtins.py:2627
1774
1883
msgid "Show files changed in each revision."
1775
msgstr ""
1884
msgstr "Mostrar os arquivos mudaram em cada revisão."
1776
1885
1777
#: bzrlib/builtins.py:2540
1886
#: bzrlib/builtins.py:2633
1778
1887
msgid "Show just the specified revision. See also \"help revisionspec\"."
1779
1888
msgstr ""
1780
1889
1781
#: bzrlib/builtins.py:2544
1890
#: bzrlib/builtins.py:2637
1782
1891
msgid "What names to list as authors - first, all or committer."
1783
1892
msgstr ""
1784
1893
1785
#: bzrlib/builtins.py:2545
1894
#: bzrlib/builtins.py:2638
1786
1895
msgid "Authors"
1787
1896
msgstr ""
1788
1897
1789
#: bzrlib/builtins.py:2550
1898
#: bzrlib/builtins.py:2643
1790
1899
msgid "Number of levels to display - 0 for all, 1 for flat."
1791
1900
msgstr ""
1792
1901
1793
#: bzrlib/builtins.py:2560
1902
#: bzrlib/builtins.py:2653
1794
1903
msgid "Limit the output to the first N revisions."
1795
1904
msgstr ""
1796
1905
1797
#: bzrlib/builtins.py:2565
1906
#: bzrlib/builtins.py:2658
1798
1907
msgid "Show changes made in each revision as a patch."
1799
msgstr ""
1908
msgstr "Mostrar alterações feitas em cada revisão como um caminho."
1800
1909
1801
#: bzrlib/builtins.py:2567
1910
#: bzrlib/builtins.py:2660
1802
1911
msgid "Show merged revisions like --levels 0 does."
1803
1912
msgstr ""
1804
1913
1805
#: bzrlib/builtins.py:2571
1914
#: bzrlib/builtins.py:2664
1806
1915
msgid "Do not report commits with more than one parent."
1807
1916
msgstr ""
1808
1917
1809
#: bzrlib/builtins.py:2573
1918
#: bzrlib/builtins.py:2666
1810
1919
msgid ""
1811
1920
"Display only the revisions that are not part of both ancestries (require -"
1812
1921
"rX..Y)."
1813
1922
msgstr ""
1814
1923
1815
#: bzrlib/builtins.py:2577
1924
#: bzrlib/builtins.py:2670
1816
1925
msgid "Show digital signature validity."
1817
msgstr ""
1926
msgstr "Mostrar a validade da assinatura digital."
1818
1927
1819
#: bzrlib/builtins.py:2580
1928
#: bzrlib/builtins.py:2673
1820
1929
msgid "Show revisions whose properties match this expression."
1821
1930
msgstr ""
1822
1931
1823
#: bzrlib/builtins.py:2584
1932
#: bzrlib/builtins.py:2677
1824
1933
msgid "Show revisions whose message matches this expression."
1825
1934
msgstr ""
1826
1935
1827
#: bzrlib/builtins.py:2588
1936
#: bzrlib/builtins.py:2681
1828
1937
msgid "Show revisions whose committer matches this expression."
1829
1938
msgstr ""
1830
1939
1831
#: bzrlib/builtins.py:2592
1940
#: bzrlib/builtins.py:2685
1832
1941
msgid "Show revisions whose authors match this expression."
1833
1942
msgstr ""
1834
1943
1835
#: bzrlib/builtins.py:2596
1944
#: bzrlib/builtins.py:2689
1836
1945
msgid "Show revisions whose bugs match this expression."
1837
1946
msgstr ""
1838
1947
1839
#: bzrlib/builtins.py:2650
1948
#: bzrlib/builtins.py:2743
1840
1949
msgid "--exclude-common-ancestry requires -r with two revisions"
1841
1950
msgstr ""
1842
1951
1843
#: bzrlib/builtins.py:2678
1952
#: bzrlib/builtins.py:2771
1844
1953
#, python-format
1845
1954
msgid "Path unknown at end or start of revision range: %s"
1846
1955
msgstr ""
1847
1956
1848
#: bzrlib/builtins.py:2795
1957
#: bzrlib/builtins.py:2888
1849
1958
#, python-format
1850
1959
msgid "bzr %s doesn't accept two revisions in different branches."
1851
1960
msgstr ""
1852
1961
1853
#: bzrlib/builtins.py:2811
1962
#: bzrlib/builtins.py:2904
1854
1963
#, python-format
1855
1964
msgid "bzr %s --revision takes one or two values."
1856
1965
msgstr ""
1857
1966
1858
#: bzrlib/builtins.py:2856
1967
#: bzrlib/builtins.py:2949
1859
1968
msgid ""
1860
1969
"List files in a tree.\n"
1861
1970
" "
1862
1971
msgstr ""
1972
"Lista os arquivos em uma árvore.\n"
1973
" "
1863
1974
1864
#: bzrlib/builtins.py:2865
1975
#: bzrlib/builtins.py:2958
1865
1976
msgid "Recurse into subdirectories."
1866
1977
msgstr ""
1867
1978
1868
#: bzrlib/builtins.py:2867
1979
#: bzrlib/builtins.py:2960
1869
1980
msgid "Print paths relative to the root of the branch."
1870
1981
msgstr ""
1871
1982
1872
#: bzrlib/builtins.py:2869
1983
#: bzrlib/builtins.py:2962
1873
1984
msgid "Print unknown files."
1874
msgstr ""
1985
msgstr "Imprimir arquivos desconhecidos."
1875
1986
1876
#: bzrlib/builtins.py:2870
1987
#: bzrlib/builtins.py:2963
1877
1988
msgid "Print versioned files."
1878
msgstr ""
1989
msgstr "Imprimir arquivos versionados."
1879
1990
1880
#: bzrlib/builtins.py:2873
1991
#: bzrlib/builtins.py:2966
1881
1992
msgid "Print ignored files."
1882
msgstr ""
1993
msgstr "Imprimir arquivos ignorados."
1883
1994
1884
#: bzrlib/builtins.py:2875
1995
#: bzrlib/builtins.py:2968
1885
1996
msgid "List entries of a particular kind: file, directory, symlink."
1886
1997
msgstr ""
1887
1998
1888
#: bzrlib/builtins.py:2888
1999
#: bzrlib/builtins.py:2981
1889
2000
msgid "invalid kind specified"
1890
2001
msgstr ""
1891
2002
1892
#: bzrlib/builtins.py:2891
2003
#: bzrlib/builtins.py:2984
1893
2004
msgid "Cannot set both --verbose and --null"
1894
2005
msgstr ""
1895
2006
1896
#: bzrlib/builtins.py:2900
2007
#: bzrlib/builtins.py:2993
1897
2008
msgid "cannot specify both --from-root and PATH"
1898
2009
msgstr ""
1899
2010
1900
#: bzrlib/builtins.py:2987
2011
#: bzrlib/builtins.py:3080
1901
2012
msgid "Ignore specified files or patterns."
1902
2013
msgstr ""
1903
2014
1904
#: bzrlib/builtins.py:2989
2015
#: bzrlib/builtins.py:3082
1905
2016
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1906
2017
msgstr ""
1907
2018
1908
#: bzrlib/builtins.py:2991
2019
#: bzrlib/builtins.py:3084
1909
2020
msgid ""
1910
2021
"If a .bzrignore file does not exist, the ignore command\n"
1911
2022
"will create one and add the specified files or patterns to the newly\n"
1914
2025
"the use of the ignore command will require an explicit add command."
1915
2026
msgstr ""
1916
2027
1917
#: bzrlib/builtins.py:2997
2028
#: bzrlib/builtins.py:3090
1918
2029
msgid ""
1919
2030
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1920
2031
"After adding, editing or deleting that file either indirectly by\n"
1922
2033
"it."
1923
2034
msgstr ""
1924
2035
1925
#: bzrlib/builtins.py:3002
2036
#: bzrlib/builtins.py:3095
1926
2037
msgid ""
1927
2038
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1928
2039
"the global ignore file can be found in the application data directory as\n"
1931
2042
"can be edited directly using an editor."
1932
2043
msgstr ""
1933
2044
1934
#: bzrlib/builtins.py:3008
2045
#: bzrlib/builtins.py:3101
1935
2046
msgid ""
1936
2047
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1937
2048
"precedence over regular ignores. Such exceptions are used to specify\n"
1938
2049
"files that should be versioned which would otherwise be ignored."
1939
2050
msgstr ""
1940
2051
1941
#: bzrlib/builtins.py:3012
2052
#: bzrlib/builtins.py:3105
1942
2053
msgid ""
1943
2054
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1944
2055
"precedence over the '!' exception patterns."
1945
2056
msgstr ""
1946
2057
1947
#: bzrlib/builtins.py:3015
2058
#: bzrlib/builtins.py:3108
1948
2059
msgid ""
1949
2060
":Notes: \n"
1950
2061
" \n"
1952
2063
" the shell on Unix."
1953
2064
msgstr ""
1954
2065
1955
#: bzrlib/builtins.py:3020
2066
#: bzrlib/builtins.py:3113
1956
2067
msgid ""
1957
2068
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1958
2069
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1959
2070
msgstr ""
1960
2071
1961
#: bzrlib/builtins.py:3023
2072
#: bzrlib/builtins.py:3116
1962
2073
msgid ""
1963
2074
":Examples:\n"
1964
2075
" Ignore the top level Makefile::"
1965
2076
msgstr ""
1966
2077
1967
#: bzrlib/builtins.py:3026
2078
#: bzrlib/builtins.py:3119
1968
2079
msgid " bzr ignore ./Makefile"
1969
msgstr ""
2080
msgstr " bzr ignore ./Makefile"
1970
2081
1971
#: bzrlib/builtins.py:3028
2082
#: bzrlib/builtins.py:3121
1972
2083
msgid " Ignore .class files in all directories...::"
1973
2084
msgstr ""
1974
2085
1975
#: bzrlib/builtins.py:3030
2086
#: bzrlib/builtins.py:3123
1976
2087
msgid " bzr ignore \"*.class\""
1977
msgstr ""
2088
msgstr " bzr ignore \"*.class\""
1978
2089
1979
#: bzrlib/builtins.py:3032
2090
#: bzrlib/builtins.py:3125
1980
2091
msgid " ...but do not ignore \"special.class\"::"
1981
2092
msgstr ""
1982
2093
1983
#: bzrlib/builtins.py:3034
2094
#: bzrlib/builtins.py:3127
1984
2095
msgid " bzr ignore \"!special.class\""
1985
msgstr ""
2096
msgstr " bzr ignore \"!special.class\""
1986
2097
1987
#: bzrlib/builtins.py:3036
2098
#: bzrlib/builtins.py:3129
1988
2099
msgid " Ignore files whose name begins with the \"#\" character::"
1989
2100
msgstr ""
1990
2101
1991
#: bzrlib/builtins.py:3038
2102
#: bzrlib/builtins.py:3131
1992
2103
msgid " bzr ignore \"RE:^#\""
1993
msgstr ""
2104
msgstr " bzr ignore \"RE:^#\""
1994
2105
1995
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
2106
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1996
2107
msgid " Ignore .o files under the lib directory::"
1997
2108
msgstr ""
1998
2109
1999
#: bzrlib/builtins.py:3042
2110
#: bzrlib/builtins.py:3135
2000
2111
msgid " bzr ignore \"lib/**/*.o\""
2001
msgstr ""
2112
msgstr " bzr ignore \"lib/**/*.o\""
2002
2113
2003
#: bzrlib/builtins.py:3046
2114
#: bzrlib/builtins.py:3139
2004
2115
msgid " bzr ignore \"RE:lib/.*\\.o\""
2005
msgstr ""
2116
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2006
2117
2007
#: bzrlib/builtins.py:3048
2118
#: bzrlib/builtins.py:3141
2008
2119
msgid " Ignore everything but the \"debian\" toplevel directory::"
2009
2120
msgstr ""
2010
2121
2011
#: bzrlib/builtins.py:3050
2122
#: bzrlib/builtins.py:3143
2012
2123
msgid ""
2013
2124
" bzr ignore \"RE:(?!debian/).*\"\n"
2014
2125
" \n"
2020
2131
" bzr ignore \"!!*~\""
2021
2132
msgstr ""
2022
2133
2023
#: bzrlib/builtins.py:3064
2134
#: bzrlib/builtins.py:3157
2024
2135
msgid "Display the default ignore rules that bzr uses."
2025
2136
msgstr ""
2026
2137
2027
#: bzrlib/builtins.py:3076
2138
#: bzrlib/builtins.py:3169
2028
2139
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2029
2140
msgstr ""
2030
2141
2031
#: bzrlib/builtins.py:3087
2142
#: bzrlib/builtins.py:3180
2032
2143
#, python-format
2033
2144
msgid "Invalid ignore pattern found. %s"
2034
2145
msgid_plural "Invalid ignore patterns found. %s"
2035
2146
msgstr[0] ""
2036
2147
msgstr[1] ""
2037
2148
2038
#: bzrlib/builtins.py:3096
2149
#: bzrlib/builtins.py:3189
2039
2150
msgid "NAME_PATTERN should not be an absolute path"
2040
2151
msgstr ""
2041
2152
2042
#: bzrlib/builtins.py:3109
2153
#: bzrlib/builtins.py:3202
2043
2154
#, python-format
2044
2155
msgid ""
2045
2156
"Warning: the following files are version controlled and match your ignore "
2049
2160
"them.\n"
2050
2161
msgstr ""
2051
2162
2052
#: bzrlib/builtins.py:3116
2163
#: bzrlib/builtins.py:3209
2053
2164
msgid "List ignored files and the patterns that matched them."
2054
2165
msgstr ""
2055
2166
2056
#: bzrlib/builtins.py:3118
2167
#: bzrlib/builtins.py:3211
2057
2168
msgid ""
2058
2169
"List all the ignored files and the ignore pattern that caused the file to\n"
2059
2170
"be ignored."
2060
2171
msgstr ""
2061
2172
2062
#: bzrlib/builtins.py:3121
2173
#: bzrlib/builtins.py:3214
2063
2174
msgid "Alternatively, to list just the files::"
2064
2175
msgstr ""
2065
2176
2066
#: bzrlib/builtins.py:3123
2177
#: bzrlib/builtins.py:3216
2067
2178
msgid " bzr ls --ignored"
2068
msgstr ""
2179
msgstr " bzr ls --ignored"
2069
2180
2070
#: bzrlib/builtins.py:3157
2181
#: bzrlib/builtins.py:3250
2071
2182
#, python-format
2072
2183
msgid "not a valid revision-number: %r"
2073
2184
msgstr ""
2074
2185
2075
#: bzrlib/builtins.py:3164
2186
#: bzrlib/builtins.py:3257
2076
2187
msgid ""
2077
2188
"Export current or past revision to a destination directory or archive."
2078
2189
msgstr ""
2079
2190
2080
#: bzrlib/builtins.py:3166
2191
#: bzrlib/builtins.py:3259
2081
2192
msgid "If no revision is specified this exports the last committed revision."
2082
2193
msgstr ""
2083
2194
2084
#: bzrlib/builtins.py:3168
2195
#: bzrlib/builtins.py:3261
2085
2196
msgid ""
2086
2197
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2087
2198
"given, try to find the format with the extension. If no extension\n"
2088
2199
"is found exports to a directory (equivalent to --format=dir)."
2089
2200
msgstr ""
2090
2201
2091
#: bzrlib/builtins.py:3172
2202
#: bzrlib/builtins.py:3265
2092
2203
msgid ""
2093
2204
"If root is supplied, it will be used as the root directory inside\n"
2094
2205
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2095
2206
"to the exported filename. The root option has no effect for 'dir' format."
2096
2207
msgstr ""
2097
2208
2098
#: bzrlib/builtins.py:3176
2209
#: bzrlib/builtins.py:3269
2099
2210
msgid ""
2100
2211
"If branch is omitted then the branch containing the current working\n"
2101
2212
"directory will be used."
2102
2213
msgstr ""
2103
2214
2104
#: bzrlib/builtins.py:3179
2215
#: bzrlib/builtins.py:3272
2105
2216
msgid ""
2106
2217
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2107
2218
msgstr ""
2108
2219
2109
#: bzrlib/builtins.py:3181
2220
#: bzrlib/builtins.py:3274
2110
2221
msgid ""
2111
2222
" ================= =========================\n"
2112
2223
" Supported formats Autodetected by extension\n"
2119
2230
" ================= ========================="
2120
2231
msgstr ""
2121
2232
2122
#: bzrlib/builtins.py:3195
2233
#: bzrlib/builtins.py:3288
2123
2234
msgid "Type of file to export to."
2124
2235
msgstr ""
2125
2236
2126
#: bzrlib/builtins.py:3198
2237
#: bzrlib/builtins.py:3291
2127
2238
msgid "Apply content filters to export the convenient form."
2128
2239
msgstr ""
2129
2240
2130
#: bzrlib/builtins.py:3202
2241
#: bzrlib/builtins.py:3295
2131
2242
msgid "Name of the root directory inside the exported file."
2132
2243
msgstr ""
2133
2244
2134
#: bzrlib/builtins.py:3204
2245
#: bzrlib/builtins.py:3297
2135
2246
msgid ""
2136
2247
"Set modification time of files to that of the last revision in which it was "
2137
2248
"changed."
2138
2249
msgstr ""
2139
2250
2140
#: bzrlib/builtins.py:3207
2251
#: bzrlib/builtins.py:3300
2141
2252
msgid ""
2142
2253
"Export the working tree contents rather than that of the last revision."
2143
2254
msgstr ""
2144
2255
2145
#: bzrlib/builtins.py:3226
2256
#: bzrlib/builtins.py:3319
2146
2257
msgid "--uncommitted requires a working tree"
2147
2258
msgstr ""
2148
2259
2149
#: bzrlib/builtins.py:3235
2260
#: bzrlib/builtins.py:3328
2150
2261
#, python-format
2151
2262
msgid "Unsupported export format: %s"
2152
2263
msgstr ""
2153
2264
2154
#: bzrlib/builtins.py:3239
2265
#: bzrlib/builtins.py:3332
2155
2266
msgid ""
2156
2267
"Write the contents of a file as of a given revision to standard output."
2157
2268
msgstr ""
2158
2269
2159
#: bzrlib/builtins.py:3241
2270
#: bzrlib/builtins.py:3334
2160
2271
msgid "If no revision is nominated, the last revision is used."
2161
2272
msgstr ""
2162
2273
2163
#: bzrlib/builtins.py:3243
2274
#: bzrlib/builtins.py:3336
2164
2275
msgid ""
2165
2276
"Note: Take care to redirect standard output when using this command on a\n"
2166
2277
"binary file."
2167
2278
msgstr ""
2168
2279
2169
#: bzrlib/builtins.py:3249
2280
#: bzrlib/builtins.py:3342
2170
2281
msgid "The path name in the old tree."
2171
2282
msgstr ""
2172
2283
2173
#: bzrlib/builtins.py:3250
2284
#: bzrlib/builtins.py:3343
2174
2285
msgid "Apply content filters to display the convenience form."
2175
2286
msgstr ""
2176
2287
2177
#: bzrlib/builtins.py:3261
2288
#: bzrlib/builtins.py:3354
2178
2289
msgid "bzr cat --revision takes exactly one revision specifier"
2179
2290
msgstr ""
2180
2291
2181
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2292
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2182
2293
msgid "{0!r} is not present in revision {1}"
2183
2294
msgstr ""
2184
2295
2185
#: bzrlib/builtins.py:3321
2296
#: bzrlib/builtins.py:3414
2186
2297
msgid "Commit changes into a new revision."
2187
2298
msgstr ""
2188
2299
2189
#: bzrlib/builtins.py:3323
2300
#: bzrlib/builtins.py:3416
2190
2301
msgid ""
2191
2302
"An explanatory message needs to be given for each commit. This is\n"
2192
2303
"often done by using the --message option (getting the message from the\n"
2196
2307
"boilerplate text loaded into the editor, use the --show-diff option."
2197
2308
msgstr ""
2198
2309
2199
#: bzrlib/builtins.py:3330
2310
#: bzrlib/builtins.py:3423
2200
2311
msgid ""
2201
2312
"By default, the entire tree is committed and the person doing the\n"
2202
2313
"commit is assumed to be the author. These defaults can be overridden\n"
2203
2314
"as explained below."
2204
2315
msgstr ""
2205
2316
2206
#: bzrlib/builtins.py:3334
2317
#: bzrlib/builtins.py:3427
2207
2318
msgid ":Selective commits:"
2208
2319
msgstr ""
2209
2320
2210
#: bzrlib/builtins.py:3336
2321
#: bzrlib/builtins.py:3429
2211
2322
msgid ""
2212
2323
" If selected files are specified, only changes to those files are\n"
2213
2324
" committed. If a directory is specified then the directory and\n"
2214
2325
" everything within it is committed."
2215
2326
msgstr ""
2216
2327
2217
#: bzrlib/builtins.py:3340
2328
#: bzrlib/builtins.py:3433
2218
2329
msgid ""
2219
2330
" When excludes are given, they take precedence over selected files.\n"
2220
2331
" For example, to commit only changes within foo, but not changes\n"
2221
2332
" within foo/bar::"
2222
2333
msgstr ""
2223
2334
2224
#: bzrlib/builtins.py:3344
2335
#: bzrlib/builtins.py:3437
2225
2336
msgid " bzr commit foo -x foo/bar"
2226
msgstr ""
2337
msgstr " bzr commit foo -x foo/bar"
2227
2338
2228
#: bzrlib/builtins.py:3346
2339
#: bzrlib/builtins.py:3439
2229
2340
msgid " A selective commit after a merge is not yet supported."
2230
2341
msgstr ""
2231
2342
2232
#: bzrlib/builtins.py:3348
2343
#: bzrlib/builtins.py:3441
2233
2344
msgid ":Custom authors:"
2234
2345
msgstr ""
2235
2346
2236
#: bzrlib/builtins.py:3350
2347
#: bzrlib/builtins.py:3443
2237
2348
msgid ""
2238
2349
" If the author of the change is not the same person as the committer,\n"
2239
2350
" you can specify the author's name using the --author option. The\n"
2243
2354
" author."
2244
2355
msgstr ""
2245
2356
2246
#: bzrlib/builtins.py:3357
2357
#: bzrlib/builtins.py:3450
2247
2358
msgid ":Checks:"
2248
2359
msgstr ""
2249
2360
2250
#: bzrlib/builtins.py:3359
2361
#: bzrlib/builtins.py:3452
2251
2362
msgid ""
2252
2363
" A common mistake is to forget to add a new file or directory before\n"
2253
2364
" running the commit command. The --strict option checks for unknown\n"
2256
2367
" for details."
2257
2368
msgstr ""
2258
2369
2259
#: bzrlib/builtins.py:3365
2370
#: bzrlib/builtins.py:3458
2260
2371
msgid ":Things to note:"
2261
msgstr ""
2372
msgstr ":Notas:"
2262
2373
2263
#: bzrlib/builtins.py:3367
2374
#: bzrlib/builtins.py:3460
2264
2375
msgid ""
2265
2376
" If you accidentially commit the wrong changes or make a spelling\n"
2266
2377
" mistake in the commit message say, you can use the uncommit command\n"
2267
2378
" to undo it. See ``bzr help uncommit`` for details."
2268
2379
msgstr ""
2269
2380
2270
#: bzrlib/builtins.py:3371
2381
#: bzrlib/builtins.py:3464
2271
2382
msgid ""
2272
2383
" Hooks can also be configured to run after a commit. This allows you\n"
2273
2384
" to trigger updates to external systems like bug trackers. The --fixes\n"
2275
2386
" one or more bugs. See ``bzr help bugs`` for details."
2276
2387
msgstr ""
2277
2388
2278
#: bzrlib/builtins.py:3381
2389
#: bzrlib/builtins.py:3474
2279
2390
msgid "Do not consider changes made to a given path."
2280
2391
msgstr ""
2281
2392
2282
#: bzrlib/builtins.py:3384
2393
#: bzrlib/builtins.py:3477
2283
2394
msgid "Description of the new revision."
2284
msgstr ""
2395
msgstr "Descrição da nova revisão."
2285
2396
2286
#: bzrlib/builtins.py:3387
2397
#: bzrlib/builtins.py:3480
2287
2398
msgid "Commit even if nothing has changed."
2288
msgstr ""
2399
msgstr "Usar commit, mesmo que nada tenha mudado."
2289
2400
2290
#: bzrlib/builtins.py:3391
2401
#: bzrlib/builtins.py:3484
2291
2402
msgid "Take commit message from this file."
2292
2403
msgstr ""
2293
2404
2294
#: bzrlib/builtins.py:3393
2405
#: bzrlib/builtins.py:3486
2295
2406
msgid "Refuse to commit if there are unknown files in the working tree."
2296
2407
msgstr ""
2297
2408
2298
#: bzrlib/builtins.py:3396
2409
#: bzrlib/builtins.py:3489
2299
2410
msgid ""
2300
2411
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2301
2412
"08:00:00 +0100'."
2302
2413
msgstr ""
2303
2414
2304
#: bzrlib/builtins.py:3399
2415
#: bzrlib/builtins.py:3492
2305
2416
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2306
2417
msgstr ""
2307
2418
2308
#: bzrlib/builtins.py:3402
2419
#: bzrlib/builtins.py:3495
2309
2420
msgid "Set the author's name, if it's different from the committer."
2310
2421
msgstr ""
2311
2422
2312
#: bzrlib/builtins.py:3405
2423
#: bzrlib/builtins.py:3498
2313
2424
msgid ""
2314
2425
"Perform a local commit in a bound branch. Local commits are not pushed to "
2315
2426
"the master branch until a normal commit is performed."
2316
2427
msgstr ""
2317
2428
2318
#: bzrlib/builtins.py:3411
2429
#: bzrlib/builtins.py:3504
2319
2430
msgid ""
2320
2431
"When no message is supplied, show the diff along with the status summary in "
2321
2432
"the message editor."
2322
2433
msgstr ""
2323
2434
2324
#: bzrlib/builtins.py:3414
2435
#: bzrlib/builtins.py:3507
2325
2436
msgid ""
2326
2437
"When committing to a foreign version control system do not push data that "
2327
2438
"can not be natively represented."
2328
2439
msgstr ""
2329
2440
2330
#: bzrlib/builtins.py:3432
2441
#: bzrlib/builtins.py:3525
2331
2442
#, python-format
2332
2443
msgid ""
2333
2444
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2335
2446
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2336
2447
msgstr ""
2337
2448
2338
#: bzrlib/builtins.py:3441
2449
#: bzrlib/builtins.py:3534
2339
2450
#, python-format
2340
2451
msgid ""
2341
2452
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2343
2454
"Commit refused."
2344
2455
msgstr ""
2345
2456
2346
#: bzrlib/builtins.py:3450
2457
#: bzrlib/builtins.py:3543
2347
2458
#, python-format
2348
2459
msgid "Unrecognized bug %s. Commit refused."
2349
2460
msgstr ""
2350
2461
2351
#: bzrlib/builtins.py:3453
2462
#: bzrlib/builtins.py:3546
2352
2463
#, python-format
2353
2464
msgid ""
2354
2465
"%s\n"
2355
2466
"Commit refused."
2356
2467
msgstr ""
2357
2468
2358
#: bzrlib/builtins.py:3477
2469
#: bzrlib/builtins.py:3570
2359
2470
msgid "Could not parse --commit-time: "
2360
2471
msgstr ""
2361
2472
2362
#: bzrlib/builtins.py:3517
2473
#: bzrlib/builtins.py:3610
2363
2474
msgid "please specify either --message or --file"
2364
2475
msgstr ""
2365
2476
2366
#: bzrlib/builtins.py:3546
2477
#: bzrlib/builtins.py:3639
2367
2478
msgid "please specify a commit message with either --message or --file"
2368
2479
msgstr ""
2369
2480
2370
#: bzrlib/builtins.py:3549
2481
#: bzrlib/builtins.py:3642
2371
2482
msgid ""
2372
2483
"Empty commit message specified. Please specify a commit message with either -"
2373
2484
"-message or --file or leave a blank message with --message \"\"."
2374
2485
msgstr ""
2375
2486
2376
#: bzrlib/builtins.py:3569
2487
#: bzrlib/builtins.py:3662
2377
2488
msgid ""
2378
2489
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2379
2490
"-unchanged to force an empty commit."
2380
2491
msgstr ""
2381
2492
2382
#: bzrlib/builtins.py:3573
2493
#: bzrlib/builtins.py:3666
2383
2494
msgid ""
2384
2495
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2385
2496
"resolve FILE\" to resolve."
2386
2497
msgstr ""
2387
2498
2388
#: bzrlib/builtins.py:3577
2499
#: bzrlib/builtins.py:3670
2389
2500
msgid "Commit refused because there are unknown files in the working tree."
2390
2501
msgstr ""
2391
2502
2392
#: bzrlib/builtins.py:3580
2503
#: bzrlib/builtins.py:3673
2393
2504
msgid ""
2394
2505
"\n"
2395
2506
"To commit to master branch, run update and then commit.\n"
2396
2507
"You can also pass --local to commit to continue working disconnected."
2397
2508
msgstr ""
2398
2509
2399
#: bzrlib/builtins.py:3588
2510
#: bzrlib/builtins.py:3681
2400
2511
msgid ""
2401
2512
"Validate working tree structure, branch consistency and repository history."
2402
2513
msgstr ""
2403
2514
2404
#: bzrlib/builtins.py:3590
2515
#: bzrlib/builtins.py:3683
2405
2516
msgid ""
2406
2517
"This command checks various invariants about branch and repository storage\n"
2407
2518
"to detect data corruption or bzr bugs."
2408
2519
msgstr ""
2409
2520
2410
#: bzrlib/builtins.py:3593
2521
#: bzrlib/builtins.py:3686
2411
2522
msgid ""
2412
2523
"The working tree and branch checks will only give output if a problem is\n"
2413
2524
"detected. The output fields of the repository check are:"
2414
2525
msgstr ""
2415
2526
2416
#: bzrlib/builtins.py:3596
2527
#: bzrlib/builtins.py:3689
2417
2528
msgid ""
2418
2529
"revisions\n"
2419
2530
" This is just the number of revisions checked. It doesn't\n"
2420
2531
" indicate a problem."
2421
2532
msgstr ""
2422
2533
2423
#: bzrlib/builtins.py:3600
2534
#: bzrlib/builtins.py:3693
2424
2535
msgid ""
2425
2536
"versionedfiles\n"
2426
2537
" This is just the number of versionedfiles checked. It\n"
2427
2538
" doesn't indicate a problem."
2428
2539
msgstr ""
2429
2540
2430
#: bzrlib/builtins.py:3604
2541
#: bzrlib/builtins.py:3697
2431
2542
msgid ""
2432
2543
"unreferenced ancestors\n"
2433
2544
" Texts that are ancestors of other texts, but\n"
2435
2546
" subtle problem that Bazaar can work around."
2436
2547
msgstr ""
2437
2548
2438
#: bzrlib/builtins.py:3609
2549
#: bzrlib/builtins.py:3702
2439
2550
msgid ""
2440
2551
"unique file texts\n"
2441
2552
" This is the total number of unique file contents\n"
2442
2553
" seen in the checked revisions. It does not indicate a problem."
2443
2554
msgstr ""
2444
2555
2445
#: bzrlib/builtins.py:3613
2556
#: bzrlib/builtins.py:3706
2446
2557
msgid ""
2447
2558
"repeated file texts\n"
2448
2559
" This is the total number of repeated texts seen\n"
2451
2562
" indicate a problem."
2452
2563
msgstr ""
2453
2564
2454
#: bzrlib/builtins.py:3619
2565
#: bzrlib/builtins.py:3712
2455
2566
msgid ""
2456
2567
"If no restrictions are specified, all Bazaar data that is found at the "
2457
2568
"given\n"
2458
2569
"location will be checked."
2459
2570
msgstr ""
2460
2571
2461
#: bzrlib/builtins.py:3624
2572
#: bzrlib/builtins.py:3717
2462
2573
msgid " Check the tree and branch at 'foo'::"
2463
2574
msgstr ""
2464
2575
2465
#: bzrlib/builtins.py:3626
2576
#: bzrlib/builtins.py:3719
2466
2577
msgid " bzr check --tree --branch foo"
2467
msgstr ""
2578
msgstr " bzr check --tree --branch foo"
2468
2579
2469
#: bzrlib/builtins.py:3628
2580
#: bzrlib/builtins.py:3721
2470
2581
msgid " Check only the repository at 'bar'::"
2471
2582
msgstr ""
2472
2583
2473
#: bzrlib/builtins.py:3630
2584
#: bzrlib/builtins.py:3723
2474
2585
msgid " bzr check --repo bar"
2475
msgstr ""
2586
msgstr " bzr check --repo bar"
2476
2587
2477
#: bzrlib/builtins.py:3632
2588
#: bzrlib/builtins.py:3725
2478
2589
msgid " Check everything at 'baz'::"
2479
2590
msgstr ""
2480
2591
2481
#: bzrlib/builtins.py:3634
2592
#: bzrlib/builtins.py:3727
2482
2593
msgid " bzr check baz"
2483
msgstr ""
2594
msgstr " bzr check baz"
2484
2595
2485
#: bzrlib/builtins.py:3640
2596
#: bzrlib/builtins.py:3733
2486
2597
msgid "Check the branch related to the current directory."
2487
2598
msgstr ""
2488
2599
2489
#: bzrlib/builtins.py:3642
2600
#: bzrlib/builtins.py:3735
2490
2601
msgid "Check the repository related to the current directory."
2491
2602
msgstr ""
2492
2603
2493
#: bzrlib/builtins.py:3644
2604
#: bzrlib/builtins.py:3737
2494
2605
msgid "Check the working tree related to the current directory."
2495
2606
msgstr ""
2496
2607
2497
#: bzrlib/builtins.py:3658
2608
#: bzrlib/builtins.py:3751
2498
2609
msgid "Upgrade a repository, branch or working tree to a newer format."
2499
2610
msgstr ""
2500
2611
2501
#: bzrlib/builtins.py:3660
2612
#: bzrlib/builtins.py:3753
2502
2613
msgid ""
2503
2614
"When the default format has changed after a major new release of\n"
2504
2615
"Bazaar, you may be informed during certain operations that you\n"
2507
2618
"with older repositories or with older versions of Bazaar."
2508
2619
msgstr ""
2509
2620
2510
#: bzrlib/builtins.py:3666
2621
#: bzrlib/builtins.py:3759
2511
2622
msgid ""
2512
2623
"If you wish to upgrade to a particular format rather than the\n"
2513
2624
"current default, that can be specified using the --format option.\n"
2517
2628
"2.x default) so downgrading is not always possible."
2518
2629
msgstr ""
2519
2630
2520
#: bzrlib/builtins.py:3673
2631
#: bzrlib/builtins.py:3766
2521
2632
msgid ""
2522
2633
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2523
2634
"process (where # is a number). By default, this is left there on\n"
2528
2639
"afterwards."
2529
2640
msgstr ""
2530
2641
2531
#: bzrlib/builtins.py:3681
2642
#: bzrlib/builtins.py:3774
2532
2643
msgid ""
2533
2644
"If the location given is a shared repository, dependent branches\n"
2534
2645
"are also converted provided the repository converts successfully.\n"
2536
2647
"tried."
2537
2648
msgstr ""
2538
2649
2539
#: bzrlib/builtins.py:3686
2650
#: bzrlib/builtins.py:3779
2540
2651
msgid ""
2541
2652
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2542
2653
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2543
2654
msgstr ""
2544
2655
2545
#: bzrlib/builtins.py:3694
2656
#: bzrlib/builtins.py:3787
2546
2657
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2547
2658
msgstr ""
2548
2659
2549
#: bzrlib/builtins.py:3698
2660
#: bzrlib/builtins.py:3791
2550
2661
msgid "Branch format"
2551
2662
msgstr ""
2552
2663
2553
#: bzrlib/builtins.py:3700
2664
#: bzrlib/builtins.py:3793
2554
2665
msgid "Remove the backup.bzr directory if successful."
2555
2666
msgstr ""
2556
2667
2557
#: bzrlib/builtins.py:3702
2668
#: bzrlib/builtins.py:3795
2558
2669
msgid "Show what would be done, but don't actually do anything."
2559
2670
msgstr ""
2560
2671
2561
#: bzrlib/builtins.py:3717
2672
#: bzrlib/builtins.py:3810
2562
2673
msgid "Show or set bzr user id."
2563
2674
msgstr ""
2564
2675
2565
#: bzrlib/builtins.py:3719
2676
#: bzrlib/builtins.py:3812
2566
2677
msgid ""
2567
2678
":Examples:\n"
2568
2679
" Show the email of the current user::"
2569
2680
msgstr ""
2570
2681
2571
#: bzrlib/builtins.py:3722
2682
#: bzrlib/builtins.py:3815
2572
2683
msgid " bzr whoami --email"
2573
msgstr ""
2684
msgstr " bzr whoami --email"
2574
2685
2575
#: bzrlib/builtins.py:3724
2686
#: bzrlib/builtins.py:3817
2576
2687
msgid " Set the current user::"
2577
2688
msgstr ""
2578
2689
2579
#: bzrlib/builtins.py:3726
2690
#: bzrlib/builtins.py:3819
2580
2691
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2581
msgstr ""
2692
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2582
2693
2583
#: bzrlib/builtins.py:3730
2694
#: bzrlib/builtins.py:3823
2584
2695
msgid "Display email address only."
2585
msgstr ""
2696
msgstr "Mostra apenas o endereço de email."
2586
2697
2587
#: bzrlib/builtins.py:3732
2698
#: bzrlib/builtins.py:3825
2588
2699
msgid "Set identity for the current branch instead of globally."
2589
2700
msgstr ""
2590
2701
2591
#: bzrlib/builtins.py:3758
2702
#: bzrlib/builtins.py:3851
2592
2703
msgid "--email can only be used to display existing identity"
2593
2704
msgstr ""
2594
2705
2595
#: bzrlib/builtins.py:3780
2706
#: bzrlib/builtins.py:3873
2596
2707
msgid "Print or set the branch nickname."
2597
2708
msgstr ""
2598
2709
2599
#: bzrlib/builtins.py:3782
2710
#: bzrlib/builtins.py:3875
2600
2711
msgid ""
2601
2712
"If unset, the tree root directory name is used as the nickname.\n"
2602
2713
"To print the current nickname, execute with no argument."
2603
2714
msgstr ""
2604
2715
2605
#: bzrlib/builtins.py:3785
2716
#: bzrlib/builtins.py:3878
2606
2717
msgid ""
2607
2718
"Bound branches use the nickname of its master branch unless it is set\n"
2608
2719
"locally."
2609
2720
msgstr ""
2610
2721
2611
#: bzrlib/builtins.py:3805
2722
#: bzrlib/builtins.py:3898
2612
2723
msgid "Set/unset and display aliases."
2613
2724
msgstr ""
2614
2725
2615
#: bzrlib/builtins.py:3807
2726
#: bzrlib/builtins.py:3900
2616
2727
msgid ""
2617
2728
":Examples:\n"
2618
2729
" Show the current aliases::"
2619
2730
msgstr ""
2731
":Exemplos:\n"
2732
" Mostra os atalhos atuais::"
2620
2733
2621
#: bzrlib/builtins.py:3810
2734
#: bzrlib/builtins.py:3903
2622
2735
msgid " bzr alias"
2623
msgstr ""
2736
msgstr " bzr alias"
2624
2737
2625
#: bzrlib/builtins.py:3812
2738
#: bzrlib/builtins.py:3905
2626
2739
msgid " Show the alias specified for 'll'::"
2627
2740
msgstr ""
2628
2741
2629
#: bzrlib/builtins.py:3814
2742
#: bzrlib/builtins.py:3907
2630
2743
msgid " bzr alias ll"
2631
msgstr ""
2744
msgstr " bzr alias ll"
2632
2745
2633
#: bzrlib/builtins.py:3816
2746
#: bzrlib/builtins.py:3909
2634
2747
msgid " Set an alias for 'll'::"
2635
2748
msgstr ""
2636
2749
2637
#: bzrlib/builtins.py:3818
2750
#: bzrlib/builtins.py:3911
2638
2751
msgid " bzr alias ll=\"log --line -r-10..-1\""
2639
msgstr ""
2752
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2640
2753
2641
#: bzrlib/builtins.py:3820
2754
#: bzrlib/builtins.py:3913
2642
2755
msgid " To remove an alias for 'll'::"
2643
2756
msgstr ""
2644
2757
2645
#: bzrlib/builtins.py:3822
2758
#: bzrlib/builtins.py:3915
2646
2759
msgid " bzr alias --remove ll"
2647
msgstr ""
2760
msgstr " bzr alias --remove ll"
2648
2761
2649
#: bzrlib/builtins.py:3827
2762
#: bzrlib/builtins.py:3920
2650
2763
msgid "Remove the alias."
2651
msgstr ""
2764
msgstr "Remove o atalho."
2652
2765
2653
#: bzrlib/builtins.py:3845
2766
#: bzrlib/builtins.py:3938
2654
2767
msgid "bzr alias --remove expects an alias to remove."
2655
2768
msgstr ""
2656
2769
2657
#: bzrlib/builtins.py:4026
2770
#: bzrlib/builtins.py:4119
2658
2771
msgid ""
2659
2772
"subunit not available. subunit needs to be installed to use --subunit."
2660
2773
msgstr ""
2661
2774
2662
#: bzrlib/builtins.py:4043
2775
#: bzrlib/builtins.py:4136
2663
2776
msgid ""
2664
2777
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2665
2778
msgstr ""
2666
2779
2667
#: bzrlib/builtins.py:4090
2780
#: bzrlib/builtins.py:4183
2668
2781
msgid "Show version of bzr."
2669
msgstr ""
2782
msgstr "Mostra a versão do bzr."
2670
2783
2671
#: bzrlib/builtins.py:4094
2784
#: bzrlib/builtins.py:4187
2672
2785
msgid "Print just the version number."
2673
msgstr ""
2786
msgstr "Mostra apenas o número da versão."
2674
2787
2675
#: bzrlib/builtins.py:4113
2788
#: bzrlib/builtins.py:4206
2676
2789
msgid "It sure does!\n"
2677
2790
msgstr ""
2678
2791
2679
#: bzrlib/builtins.py:4137
2792
#: bzrlib/builtins.py:4230
2680
2793
#, python-format
2681
2794
msgid "merge base is revision %s\n"
2682
2795
msgstr ""
2683
2796
2684
#: bzrlib/builtins.py:4141
2797
#: bzrlib/builtins.py:4234
2685
2798
msgid "Perform a three-way merge."
2686
2799
msgstr ""
2687
2800
2688
#: bzrlib/builtins.py:4143
2801
#: bzrlib/builtins.py:4236
2689
2802
msgid ""
2690
2803
"The source of the merge can be specified either in the form of a branch,\n"
2691
2804
"or in the form of a path to a file containing a merge directive generated\n"
2696
2809
"the current working tree."
2697
2810
msgstr ""
2698
2811
2699
#: bzrlib/builtins.py:4151
2812
#: bzrlib/builtins.py:4244
2700
2813
msgid ""
2701
2814
"When merging from a branch, by default bzr will try to merge in all new\n"
2702
2815
"work from the other branch, automatically determining an appropriate base\n"
2703
2816
"revision. If this fails, you may need to give an explicit base."
2704
2817
msgstr ""
2705
2818
2706
#: bzrlib/builtins.py:4155
2819
#: bzrlib/builtins.py:4248
2707
2820
msgid ""
2708
2821
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2709
2822
"try to merge in all new work up to and including revision OTHER."
2710
2823
msgstr ""
2711
2824
2712
#: bzrlib/builtins.py:4158
2825
#: bzrlib/builtins.py:4251
2713
2826
msgid ""
2714
2827
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2715
2828
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2720
2833
"changes from the other branch is not stored in the commit."
2721
2834
msgstr ""
2722
2835
2723
#: bzrlib/builtins.py:4166
2836
#: bzrlib/builtins.py:4259
2724
2837
msgid "Revision numbers are always relative to the source branch."
2725
2838
msgstr ""
2726
2839
2727
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2840
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2728
2841
msgid ""
2729
2842
"Merge will do its best to combine the changes in two branches, but there\n"
2730
2843
"are some kinds of problems only a human can fix. When it encounters those,\n"
2731
2844
"it will mark a conflict. A conflict means that you need to fix something,\n"
2732
"before you should commit."
2845
"before you can commit."
2733
2846
msgstr ""
2734
2847
2735
#: bzrlib/builtins.py:4173
2848
#: bzrlib/builtins.py:4266
2736
2849
msgid ""
2737
2850
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2738
2851
msgstr ""
2739
2852
2740
#: bzrlib/builtins.py:4175
2853
#: bzrlib/builtins.py:4268
2741
2854
msgid ""
2742
2855
"If there is no default branch set, the first merge will set it (use\n"
2743
2856
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2745
2858
"only be saved if the remote location can be accessed."
2746
2859
msgstr ""
2747
2860
2748
#: bzrlib/builtins.py:4180
2861
#: bzrlib/builtins.py:4273
2749
2862
msgid ""
2750
2863
"The results of the merge are placed into the destination working\n"
2751
2864
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2752
2865
"committed to record the result of the merge."
2753
2866
msgstr ""
2754
2867
2755
#: bzrlib/builtins.py:4184
2868
#: bzrlib/builtins.py:4277
2756
2869
msgid ""
2757
2870
"merge refuses to run if there are any uncommitted changes, unless\n"
2758
2871
"--force is given. If --force is given, then the changes from the source \n"
2761
2874
"merge revision which has more than two parents."
2762
2875
msgstr ""
2763
2876
2764
#: bzrlib/builtins.py:4190
2877
#: bzrlib/builtins.py:4283
2765
2878
msgid ""
2766
2879
"If one would like to merge changes from the working tree of the other\n"
2767
2880
"branch without merging any committed revisions, the --uncommitted option\n"
2768
2881
"can be given."
2769
2882
msgstr ""
2770
2883
2771
#: bzrlib/builtins.py:4194
2884
#: bzrlib/builtins.py:4287
2772
2885
msgid ""
2773
2886
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2774
2887
"you to apply each diff hunk and file change, similar to \"shelve\"."
2775
2888
msgstr ""
2776
2889
2777
#: bzrlib/builtins.py:4197
2890
#: bzrlib/builtins.py:4290
2778
2891
msgid ""
2779
2892
":Examples:\n"
2780
2893
" To merge all new revisions from bzr.dev::"
2781
2894
msgstr ""
2782
2895
2783
#: bzrlib/builtins.py:4200
2896
#: bzrlib/builtins.py:4293
2784
2897
msgid " bzr merge ../bzr.dev"
2785
msgstr ""
2898
msgstr " bzr merge ../bzr.dev"
2786
2899
2787
#: bzrlib/builtins.py:4202
2900
#: bzrlib/builtins.py:4295
2788
2901
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2789
2902
msgstr ""
2790
2903
2791
#: bzrlib/builtins.py:4204
2904
#: bzrlib/builtins.py:4297
2792
2905
msgid " bzr merge -r 82 ../bzr.dev"
2793
msgstr ""
2906
msgstr " bzr merge -r 82 ../bzr.dev"
2794
2907
2795
#: bzrlib/builtins.py:4206
2908
#: bzrlib/builtins.py:4299
2796
2909
msgid " To merge the changes introduced by 82, without previous changes::"
2797
2910
msgstr ""
2798
2911
2799
#: bzrlib/builtins.py:4208
2912
#: bzrlib/builtins.py:4301
2800
2913
msgid " bzr merge -r 81..82 ../bzr.dev"
2801
msgstr ""
2914
msgstr " bzr merge -r 81..82 ../bzr.dev"
2802
2915
2803
#: bzrlib/builtins.py:4210
2916
#: bzrlib/builtins.py:4303
2804
2917
msgid " To apply a merge directive contained in /tmp/merge::"
2805
2918
msgstr ""
2806
2919
2807
#: bzrlib/builtins.py:4212
2920
#: bzrlib/builtins.py:4305
2808
2921
msgid " bzr merge /tmp/merge"
2809
msgstr ""
2922
msgstr " bzr merge /tmp/merge"
2810
2923
2811
#: bzrlib/builtins.py:4214
2924
#: bzrlib/builtins.py:4307
2812
2925
msgid ""
2813
2926
" To create a merge revision with three parents from two branches\n"
2814
2927
" feature1a and feature1b:"
2815
2928
msgstr ""
2816
2929
2817
#: bzrlib/builtins.py:4217
2930
#: bzrlib/builtins.py:4310
2818
2931
msgid ""
2819
2932
" bzr merge ../feature1a\n"
2820
2933
" bzr merge ../feature1b --force\n"
2821
2934
" bzr commit -m 'revision with three parents'"
2822
2935
msgstr ""
2936
" bzr merge ../feature1a\n"
2937
" bzr merge ../feature1b --force\n"
2938
" bzr commit -m 'revisão com três pais'"
2823
2939
2824
#: bzrlib/builtins.py:4229
2940
#: bzrlib/builtins.py:4322
2825
2941
msgid "Merge even if the destination tree has uncommitted changes."
2826
2942
msgstr ""
2827
2943
2828
#: bzrlib/builtins.py:4235
2944
#: bzrlib/builtins.py:4328
2829
2945
msgid ""
2830
2946
"Apply uncommitted changes from a working copy, instead of branch changes."
2831
2947
msgstr ""
2832
2948
2833
#: bzrlib/builtins.py:4237
2949
#: bzrlib/builtins.py:4330
2834
2950
msgid ""
2835
2951
"If the destination is already completely merged into the source, pull from "
2836
2952
"the source rather than merging. When this happens, you do not need to "
2837
2953
"commit the result."
2838
2954
msgstr ""
2839
2955
2840
#: bzrlib/builtins.py:4242
2956
#: bzrlib/builtins.py:4335
2841
2957
msgid ""
2842
2958
"Branch to merge into, rather than the one containing the working directory."
2843
2959
msgstr ""
2844
2960
2845
#: bzrlib/builtins.py:4244
2961
#: bzrlib/builtins.py:4337
2846
2962
msgid "Instead of merging, show a diff of the merge."
2847
2963
msgstr ""
2848
2964
2849
#: bzrlib/builtins.py:4246
2965
#: bzrlib/builtins.py:4339
2850
2966
msgid "Select changes interactively."
2851
msgstr ""
2967
msgstr "Selecione mudanças interativamente."
2852
2968
2853
#: bzrlib/builtins.py:4268
2969
#: bzrlib/builtins.py:4361
2854
2970
msgid ""
2855
2971
"Merging into empty branches not currently supported, "
2856
2972
"https://bugs.launchpad.net/bzr/+bug/308562"
2857
2973
msgstr ""
2858
2974
2859
#: bzrlib/builtins.py:4295
2975
#: bzrlib/builtins.py:4388
2860
2976
msgid "Cannot use --uncommitted with bundles or merge directives."
2861
2977
msgstr ""
2862
2978
2863
#: bzrlib/builtins.py:4306
2979
#: bzrlib/builtins.py:4399
2864
2980
msgid "Cannot use --uncommitted and --revision at the same time."
2865
2981
msgstr ""
2866
2982
2867
#: bzrlib/builtins.py:4326
2983
#: bzrlib/builtins.py:4419
2868
2984
msgid "merger: "
2869
2985
msgstr ""
2870
2986
2871
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2987
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2872
2988
msgid "Nothing to do."
2873
2989
msgstr ""
2874
2990
2875
#: bzrlib/builtins.py:4332
2991
#: bzrlib/builtins.py:4425
2876
2992
msgid "Cannot pull individual files"
2877
msgstr ""
2993
msgstr "Não foi possível obter os arquivos individuais"
2878
2994
2879
#: bzrlib/builtins.py:4340
2995
#: bzrlib/builtins.py:4433
2880
2996
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2881
2997
msgstr ""
2882
2998
2883
#: bzrlib/builtins.py:4398
2999
#: bzrlib/builtins.py:4491
2884
3000
#, python-format
2885
3001
msgid "Show-base is not supported for this merge type. %s"
2886
3002
msgstr ""
2887
3003
2888
#: bzrlib/builtins.py:4407
3004
#: bzrlib/builtins.py:4500
2889
3005
#, python-format
2890
3006
msgid "Conflict reduction is not supported for merge type %s."
2891
3007
msgstr ""
2892
3008
2893
#: bzrlib/builtins.py:4411
3009
#: bzrlib/builtins.py:4504
2894
3010
msgid "Cannot do conflict reduction and show base."
2895
3011
msgstr ""
2896
3012
2897
#: bzrlib/builtins.py:4522
3013
#: bzrlib/builtins.py:4615
2898
3014
msgid "No location specified or remembered"
2899
3015
msgstr ""
2900
3016
2901
#: bzrlib/builtins.py:4524
3017
#: bzrlib/builtins.py:4617
2902
3018
msgid "{0} remembered {1} location {2}"
2903
3019
msgstr ""
2904
3020
2905
#: bzrlib/builtins.py:4530
3021
#: bzrlib/builtins.py:4623
2906
3022
msgid "Redo a merge."
2907
3023
msgstr ""
2908
3024
2909
#: bzrlib/builtins.py:4532
3025
#: bzrlib/builtins.py:4625
2910
3026
msgid ""
2911
3027
"Use this if you want to try a different merge technique while resolving\n"
2912
3028
"conflicts. Some merge techniques are better than others, and remerge\n"
2913
3029
"lets you try different ones on different files."
2914
3030
msgstr ""
2915
3031
2916
#: bzrlib/builtins.py:4536
3032
#: bzrlib/builtins.py:4629
2917
3033
msgid ""
2918
3034
"The options for remerge have the same meaning and defaults as the ones for\n"
2919
3035
"merge. The difference is that remerge can (only) be run when there is a\n"
2920
3036
"pending merge, and it lets you specify particular files."
2921
3037
msgstr ""
2922
3038
2923
#: bzrlib/builtins.py:4540
3039
#: bzrlib/builtins.py:4633
2924
3040
msgid ""
2925
3041
":Examples:\n"
2926
3042
" Re-do the merge of all conflicted files, and show the base text in\n"
2927
3043
" conflict regions, in addition to the usual THIS and OTHER texts::"
2928
3044
msgstr ""
2929
3045
2930
#: bzrlib/builtins.py:4544
3046
#: bzrlib/builtins.py:4637
2931
3047
msgid " bzr remerge --show-base"
2932
msgstr ""
3048
msgstr " bzr remerge --show-base"
2933
3049
2934
#: bzrlib/builtins.py:4546
3050
#: bzrlib/builtins.py:4639
2935
3051
msgid ""
2936
3052
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2937
3053
" additional processing to reduce the size of conflict regions::"
2938
3054
msgstr ""
2939
3055
2940
#: bzrlib/builtins.py:4549
3056
#: bzrlib/builtins.py:4642
2941
3057
msgid " bzr remerge --merge-type weave --reprocess foobar"
2942
msgstr ""
3058
msgstr " bzr remerge --merge-type weave --reprocess foobar"
2943
3059
2944
#: bzrlib/builtins.py:4556
3060
#: bzrlib/builtins.py:4649
2945
3061
msgid "Show base revision text in conflicts."
2946
3062
msgstr ""
2947
3063
2948
#: bzrlib/builtins.py:4568
3064
#: bzrlib/builtins.py:4661
2949
3065
msgid ""
2950
3066
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2951
3067
"merges."
2952
3068
msgstr ""
2953
3069
2954
#: bzrlib/builtins.py:4624
3070
#: bzrlib/builtins.py:4717
2955
3071
msgid "Revert files to a previous revision."
2956
3072
msgstr ""
2957
3073
2958
#: bzrlib/builtins.py:4626
3074
#: bzrlib/builtins.py:4719
2959
3075
msgid ""
2960
3076
"Giving a list of files will revert only those files. Otherwise, all files\n"
2961
3077
"will be reverted. If the revision is not specified with '--revision', the\n"
2962
3078
"last committed revision is used."
2963
3079
msgstr ""
2964
3080
2965
#: bzrlib/builtins.py:4630
3081
#: bzrlib/builtins.py:4723
2966
3082
msgid ""
2967
3083
"To remove only some changes, without reverting to a prior version, use\n"
2968
3084
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2971
3087
"certain changes on a hunk-by-hunk basis, see the shelve command."
2972
3088
msgstr ""
2973
3089
2974
#: bzrlib/builtins.py:4636
3090
#: bzrlib/builtins.py:4729
2975
3091
msgid ""
2976
3092
"By default, any files that have been manually changed will be backed up\n"
2977
3093
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2978
3094
"'.~#~' appended to their name, where # is a number."
2979
3095
msgstr ""
2980
3096
2981
#: bzrlib/builtins.py:4640
3097
#: bzrlib/builtins.py:4733
2982
3098
msgid ""
2983
3099
"When you provide files, you can use their current pathname or the pathname\n"
2984
3100
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2986
3102
"reverted."
2987
3103
msgstr ""
2988
3104
2989
#: bzrlib/builtins.py:4645
3105
#: bzrlib/builtins.py:4738
2990
3106
msgid ""
2991
3107
"If you have newly added files since the target revision, they will be\n"
2992
3108
"removed. If the files to be removed have been changed, backups will be\n"
2994
3110
"deleted."
2995
3111
msgstr ""
2996
3112
2997
#: bzrlib/builtins.py:4650
3113
#: bzrlib/builtins.py:4743
2998
3114
msgid ""
2999
3115
"The working tree contains a list of revisions that have been merged but\n"
3000
3116
"not yet committed. These revisions will be included as additional parents\n"
3006
3122
"reverting any files."
3007
3123
msgstr ""
3008
3124
3009
#: bzrlib/builtins.py:4659
3125
#: bzrlib/builtins.py:4752
3010
3126
msgid ""
3011
3127
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3012
3128
"changes from a branch in a single revision. To do this, perform the merge\n"
3020
3136
"target branches."
3021
3137
msgstr ""
3022
3138
3023
#: bzrlib/builtins.py:4673
3139
#: bzrlib/builtins.py:4766
3024
3140
msgid "Do not save backups of reverted files."
3025
3141
msgstr ""
3026
3142
3027
#: bzrlib/builtins.py:4675
3143
#: bzrlib/builtins.py:4768
3028
3144
msgid "Remove pending merge marker, without changing any files."
3029
3145
msgstr ""
3030
3146
3031
#: bzrlib/builtins.py:4706
3147
#: bzrlib/builtins.py:4799
3032
3148
msgid ""
3033
3149
"Show help on a command or other topic.\n"
3034
3150
" "
3035
3151
msgstr ""
3036
3152
3037
#: bzrlib/builtins.py:4711
3153
#: bzrlib/builtins.py:4804
3038
3154
msgid "Show help on all commands."
3039
msgstr ""
3155
msgstr "Mostrar ajuda sobre todos os comandos."
3040
3156
3041
#: bzrlib/builtins.py:4740
3157
#: bzrlib/builtins.py:4833
3042
3158
msgid "Show unmerged/unpulled revisions between two branches."
3043
3159
msgstr ""
3044
3160
3045
#: bzrlib/builtins.py:4742
3161
#: bzrlib/builtins.py:4835
3046
3162
msgid "OTHER_BRANCH may be local or remote."
3047
3163
msgstr ""
3048
3164
3049
#: bzrlib/builtins.py:4744
3165
#: bzrlib/builtins.py:4837
3050
3166
msgid ""
3051
3167
"To filter on a range of revisions, you can use the command -r begin..end\n"
3052
3168
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3057
3173
" 0 - no missing revisions"
3058
3174
msgstr ""
3059
3175
3060
#: bzrlib/builtins.py:4754
3176
#: bzrlib/builtins.py:4847
3061
3177
msgid ""
3062
3178
" Determine the missing revisions between this and the branch at the\n"
3063
3179
" remembered pull location::"
3064
3180
msgstr ""
3065
3181
3066
#: bzrlib/builtins.py:4757
3182
#: bzrlib/builtins.py:4850
3067
3183
msgid " bzr missing"
3068
msgstr ""
3184
msgstr " bzr missing"
3069
3185
3070
#: bzrlib/builtins.py:4759
3186
#: bzrlib/builtins.py:4852
3071
3187
msgid " Determine the missing revisions between this and another branch::"
3072
3188
msgstr ""
3073
3189
3074
#: bzrlib/builtins.py:4761
3190
#: bzrlib/builtins.py:4854
3075
3191
msgid " bzr missing http://server/branch"
3076
msgstr ""
3192
msgstr " bzr missing http://server/branch"
3077
3193
3078
#: bzrlib/builtins.py:4763
3194
#: bzrlib/builtins.py:4856
3079
3195
msgid ""
3080
3196
" Determine the missing revisions up to a specific revision on the other\n"
3081
3197
" branch::"
3082
3198
msgstr ""
3083
3199
3084
#: bzrlib/builtins.py:4766
3200
#: bzrlib/builtins.py:4859
3085
3201
msgid " bzr missing -r ..-10"
3086
msgstr ""
3202
msgstr " bzr missing -r ..-10"
3087
3203
3088
#: bzrlib/builtins.py:4768
3204
#: bzrlib/builtins.py:4861
3089
3205
msgid ""
3090
3206
" Determine the missing revisions up to a specific revision on this\n"
3091
3207
" branch::"
3092
3208
msgstr ""
3093
3209
3094
#: bzrlib/builtins.py:4771
3210
#: bzrlib/builtins.py:4864
3095
3211
msgid " bzr missing --my-revision ..-10"
3096
msgstr ""
3212
msgstr " bzr missing --my-revision ..-10"
3097
3213
3098
#: bzrlib/builtins.py:4778
3214
#: bzrlib/builtins.py:4871
3099
3215
msgid "Reverse the order of revisions."
3100
msgstr ""
3216
msgstr "Inverter a ordem das revisões"
3101
3217
3102
#: bzrlib/builtins.py:4780
3218
#: bzrlib/builtins.py:4873
3103
3219
msgid "Display changes in the local branch only."
3104
msgstr ""
3220
msgstr "Mostrar mudanças somente no ramo local."
3105
3221
3106
#: bzrlib/builtins.py:4781
3222
#: bzrlib/builtins.py:4874
3107
3223
msgid "Same as --mine-only."
3108
3224
msgstr ""
3109
3225
3110
#: bzrlib/builtins.py:4783
3226
#: bzrlib/builtins.py:4876
3111
3227
msgid "Display changes in the remote branch only."
3112
msgstr ""
3228
msgstr "Mostrar alterações somente no ramo remoto."
3113
3229
3114
#: bzrlib/builtins.py:4784
3230
#: bzrlib/builtins.py:4877
3115
3231
msgid "Same as --theirs-only."
3116
3232
msgstr ""
3117
3233
3118
#: bzrlib/builtins.py:4789
3234
#: bzrlib/builtins.py:4882
3119
3235
msgid ""
3120
3236
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3121
3237
"details."
3122
3238
msgstr ""
3123
3239
3124
#: bzrlib/builtins.py:4793
3240
#: bzrlib/builtins.py:4886
3125
3241
msgid ""
3126
3242
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3127
3243
"details."
3128
3244
msgstr ""
3129
3245
3130
#: bzrlib/builtins.py:4796
3246
#: bzrlib/builtins.py:4889
3131
3247
msgid "Show all revisions in addition to the mainline ones."
3132
3248
msgstr ""
3133
3249
3134
#: bzrlib/builtins.py:4850
3250
#: bzrlib/builtins.py:4943
3135
3251
msgid "No peer location known or specified."
3136
3252
msgstr ""
3137
3253
3138
#: bzrlib/builtins.py:4854
3254
#: bzrlib/builtins.py:4947
3139
3255
msgid "Using saved parent location: {0}\n"
3140
3256
msgstr ""
3141
3257
3142
#: bzrlib/builtins.py:4887
3258
#: bzrlib/builtins.py:4980
3143
3259
#, python-format
3144
3260
msgid "You have %d extra revision:\n"
3145
3261
msgid_plural "You have %d extra revisions:\n"
3146
3262
msgstr[0] ""
3147
3263
msgstr[1] ""
3148
3264
3149
#: bzrlib/builtins.py:4903
3265
#: bzrlib/builtins.py:4996
3150
3266
#, python-format
3151
3267
msgid "You are missing %d revision:\n"
3152
3268
msgid_plural "You are missing %d revisions:\n"
3153
msgstr[0] ""
3154
msgstr[1] ""
3269
msgstr[0] "Você tem %d revisão pendente:\n"
3270
msgstr[1] "Você tem %d revisões pendentes:\n"
3155
3271
3156
#: bzrlib/builtins.py:4915
3272
#: bzrlib/builtins.py:5008
3157
3273
msgid "This branch has no new revisions.\n"
3158
msgstr ""
3274
msgstr "Esse ramo não tem novas revisões.\n"
3159
3275
3160
#: bzrlib/builtins.py:4918
3276
#: bzrlib/builtins.py:5011
3161
3277
msgid "Other branch has no new revisions.\n"
3162
msgstr ""
3278
msgstr "Outro ramo não tem novas revisões.\n"
3163
3279
3164
#: bzrlib/builtins.py:4923
3280
#: bzrlib/builtins.py:5016
3165
3281
msgid "Branches are up to date.\n"
3166
msgstr ""
3282
msgstr "Ramos estão atualizados.\n"
3167
3283
3168
#: bzrlib/builtins.py:4934
3284
#: bzrlib/builtins.py:5027
3169
3285
msgid "Compress the data within a repository."
3170
msgstr ""
3286
msgstr "Comprimir os dados em um repositório."
3171
3287
3172
#: bzrlib/builtins.py:4936
3288
#: bzrlib/builtins.py:5029
3173
3289
msgid ""
3174
3290
"This operation compresses the data within a bazaar repository. As\n"
3175
3291
"bazaar supports automatic packing of repository, this operation is\n"
3176
3292
"normally not required to be done manually."
3177
3293
msgstr ""
3294
"Essa operação comprimi dados em um repositório bazaar. Como\n"
3295
"o bazaar fornece o empacotamento automático de repositório, essa operação\n"
3296
"normalmente não é necessária ser feito manualmente."
3178
3297
3179
#: bzrlib/builtins.py:4940
3298
#: bzrlib/builtins.py:5033
3180
3299
msgid ""
3181
3300
"During the pack operation, bazaar takes a backup of existing repository\n"
3182
3301
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3185
3304
"used."
3186
3305
msgstr ""
3187
3306
3188
#: bzrlib/builtins.py:4946
3307
#: bzrlib/builtins.py:5039
3189
3308
msgid ""
3190
3309
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3191
3310
"during or immediately after repacking, you may be left with a state\n"
3193
3312
"been. In this case the repository may be unusable."
3194
3313
msgstr ""
3195
3314
3196
#: bzrlib/builtins.py:4955
3315
#: bzrlib/builtins.py:5048
3197
3316
msgid "Delete obsolete packs to save disk space."
3198
msgstr ""
3317
msgstr "Excluir pacotes obsoletos para economizar espaço em disco."
3199
3318
3200
#: bzrlib/builtins.py:4969
3319
#: bzrlib/builtins.py:5062
3201
3320
msgid "List the installed plugins."
3202
msgstr ""
3321
msgstr "Lista os plugins instalados."
3203
3322
3204
#: bzrlib/builtins.py:4971
3323
#: bzrlib/builtins.py:5064
3205
3324
msgid ""
3206
3325
"This command displays the list of installed plugins including\n"
3207
3326
"version of plugin and a short description of each."
3208
3327
msgstr ""
3209
3328
3210
#: bzrlib/builtins.py:4974
3329
#: bzrlib/builtins.py:5067
3211
3330
msgid "--verbose shows the path where each plugin is located."
3212
3331
msgstr ""
3213
3332
3214
#: bzrlib/builtins.py:4976
3333
#: bzrlib/builtins.py:5069
3215
3334
msgid ""
3216
3335
"A plugin is an external component for Bazaar that extends the\n"
3217
3336
"revision control system, by adding or replacing code in Bazaar.\n"
3220
3339
"customizing log output."
3221
3340
msgstr ""
3222
3341
3223
#: bzrlib/builtins.py:4982
3342
#: bzrlib/builtins.py:5075
3224
3343
msgid ""
3225
3344
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3226
3345
"for further information on plugins including where to find them and how to\n"
3228
3347
"plugins using the Python programming language."
3229
3348
msgstr ""
3230
3349
3231
#: bzrlib/builtins.py:4998
3350
#: bzrlib/builtins.py:5091
3232
3351
msgid "Show testament (signing-form) of a revision."
3233
3352
msgstr ""
3234
3353
3235
#: bzrlib/builtins.py:5001
3354
#: bzrlib/builtins.py:5094
3236
3355
msgid "Produce long-format testament."
3237
3356
msgstr ""
3238
3357
3239
#: bzrlib/builtins.py:5003
3358
#: bzrlib/builtins.py:5096
3240
3359
msgid "Produce a strict-format testament."
3241
3360
msgstr ""
3242
3361
3243
#: bzrlib/builtins.py:5029
3362
#: bzrlib/builtins.py:5122
3244
3363
msgid "Show the origin of each line in a file."
3245
msgstr ""
3364
msgstr "Mostra a origem de cada linha em um arquivo."
3246
3365
3247
#: bzrlib/builtins.py:5031
3366
#: bzrlib/builtins.py:5124
3248
3367
msgid ""
3249
3368
"This prints out the given file with an annotation on the left side\n"
3250
3369
"indicating which revision, author and date introduced the change."
3251
3370
msgstr ""
3252
3371
3253
#: bzrlib/builtins.py:5034
3372
#: bzrlib/builtins.py:5127
3254
3373
msgid ""
3255
3374
"If the origin is the same for a run of consecutive lines, it is\n"
3256
3375
"shown only at the top, unless the --all option is given."
3257
3376
msgstr ""
3258
3377
3259
#: bzrlib/builtins.py:5042
3378
#: bzrlib/builtins.py:5135
3260
3379
msgid "Show annotations on all lines."
3261
msgstr ""
3380
msgstr "Mostrar anotações em todas as linhas."
3262
3381
3263
#: bzrlib/builtins.py:5043
3382
#: bzrlib/builtins.py:5136
3264
3383
msgid "Show commit date in annotations."
3265
3384
msgstr ""
3266
3385
3267
#: bzrlib/builtins.py:5130
3386
#: bzrlib/builtins.py:5223
3268
3387
msgid "Cannot sign a range of non-revision-history revisions"
3269
3388
msgstr ""
3270
3389
3271
#: bzrlib/builtins.py:5142
3390
#: bzrlib/builtins.py:5235
3272
3391
msgid "Please supply either one revision, or a range."
3273
3392
msgstr ""
3274
3393
3275
#: bzrlib/builtins.py:5146
3394
#: bzrlib/builtins.py:5239
3276
3395
msgid ""
3277
3396
"Convert the current branch into a checkout of the supplied branch.\n"
3278
3397
"If no branch is supplied, rebind to the last bound location."
3279
3398
msgstr ""
3280
3399
3281
#: bzrlib/builtins.py:5149
3400
#: bzrlib/builtins.py:5242
3282
3401
msgid ""
3283
3402
"Once converted into a checkout, commits must succeed on the master branch\n"
3284
3403
"before they will be applied to the local branch."
3285
3404
msgstr ""
3286
3405
3287
#: bzrlib/builtins.py:5152
3406
#: bzrlib/builtins.py:5245
3288
3407
msgid ""
3289
3408
"Bound branches use the nickname of its master branch unless it is set\n"
3290
3409
"locally, in which case binding will update the local nickname to be\n"
3291
3410
"that of the master."
3292
3411
msgstr ""
3293
3412
3294
#: bzrlib/builtins.py:5167
3413
#: bzrlib/builtins.py:5260
3295
3414
msgid "No location supplied. This format does not remember old locations."
3296
3415
msgstr ""
3416
"Sem localização fornecida. Este formato não se lembra de locais antigos."
3297
3417
3298
#: bzrlib/builtins.py:5172
3418
#: bzrlib/builtins.py:5265
3299
3419
msgid "Branch is already bound"
3300
msgstr ""
3420
msgstr "O ramo já está ligado."
3301
3421
3302
#: bzrlib/builtins.py:5174
3422
#: bzrlib/builtins.py:5267
3303
3423
msgid "No location supplied and no previous location known"
3304
3424
msgstr ""
3305
3425
3306
#: bzrlib/builtins.py:5180
3426
#: bzrlib/builtins.py:5273
3307
3427
msgid "These branches have diverged. Try merging, and then bind again."
3308
3428
msgstr ""
3309
3429
3310
#: bzrlib/builtins.py:5187
3430
#: bzrlib/builtins.py:5280
3311
3431
msgid "Convert the current checkout into a regular branch."
3312
3432
msgstr ""
3313
3433
3314
#: bzrlib/builtins.py:5189
3434
#: bzrlib/builtins.py:5282
3315
3435
msgid ""
3316
3436
"After unbinding, the local branch is considered independent and subsequent\n"
3317
3437
"commits will be local only."
3318
3438
msgstr ""
3319
3439
3320
#: bzrlib/builtins.py:5200
3440
#: bzrlib/builtins.py:5293
3321
3441
msgid "Local branch is not bound"
3322
msgstr ""
3442
msgstr "O ramo local náo está associado"
3323
3443
3324
#: bzrlib/builtins.py:5204
3444
#: bzrlib/builtins.py:5297
3325
3445
msgid "Remove the last committed revision."
3326
msgstr ""
3446
msgstr "Remover a última revisão submetida."
3327
3447
3328
#: bzrlib/builtins.py:5206
3448
#: bzrlib/builtins.py:5299
3329
3449
msgid ""
3330
3450
"--verbose will print out what is being removed.\n"
3331
3451
"--dry-run will go through all the motions, but not actually\n"
3332
3452
"remove anything."
3333
3453
msgstr ""
3334
3454
3335
#: bzrlib/builtins.py:5210
3455
#: bzrlib/builtins.py:5303
3336
3456
msgid ""
3337
3457
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3338
3458
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3339
3459
"branch at revision 15."
3340
3460
msgstr ""
3341
3461
3342
#: bzrlib/builtins.py:5214
3462
#: bzrlib/builtins.py:5307
3343
3463
msgid ""
3344
3464
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3345
3465
"it may make is to restore any pending merges that were present before\n"
3346
3466
"the commit."
3347
3467
msgstr ""
3348
3468
3349
#: bzrlib/builtins.py:5225
3469
#: bzrlib/builtins.py:5318
3350
3470
msgid "Don't actually make changes."
3351
msgstr ""
3471
msgstr "Na verdade, não fazer alterações."
3352
3472
3353
#: bzrlib/builtins.py:5226
3473
#: bzrlib/builtins.py:5319
3354
3474
msgid "Say yes to all questions."
3355
msgstr ""
3475
msgstr "Diga sim para todas as questões."
3356
3476
3357
#: bzrlib/builtins.py:5228
3477
#: bzrlib/builtins.py:5321
3358
3478
msgid "Keep tags that point to removed revisions."
3359
3479
msgstr ""
3360
3480
3361
#: bzrlib/builtins.py:5230
3481
#: bzrlib/builtins.py:5323
3362
3482
msgid "Only remove the commits from the local branch when in a checkout."
3363
3483
msgstr ""
3364
3484
3365
#: bzrlib/builtins.py:5279
3485
#: bzrlib/builtins.py:5372
3366
3486
msgid "No revisions to uncommit.\n"
3367
3487
msgstr ""
3368
3488
3369
#: bzrlib/builtins.py:5294
3489
#: bzrlib/builtins.py:5387
3370
3490
msgid "Dry-run, pretending to remove the above revisions.\n"
3371
3491
msgstr ""
3372
3492
3373
#: bzrlib/builtins.py:5297
3493
#: bzrlib/builtins.py:5390
3374
3494
msgid "The above revision(s) will be removed.\n"
3375
3495
msgstr ""
3376
3496
3377
#: bzrlib/builtins.py:5301
3497
#: bzrlib/builtins.py:5394
3378
3498
msgid "Uncommit these revisions"
3379
3499
msgstr ""
3380
3500
3381
#: bzrlib/builtins.py:5304
3501
#: bzrlib/builtins.py:5397
3382
3502
msgid "Canceled\n"
3383
msgstr ""
3503
msgstr "Cancelado\n"
3384
3504
3385
#: bzrlib/builtins.py:5311
3505
#: bzrlib/builtins.py:5404
3386
3506
#, python-format
3387
3507
msgid ""
3388
3508
"You can restore the old tip by running:\n"
3389
3509
" bzr pull . -r revid:%s\n"
3390
3510
msgstr ""
3391
3511
3392
#: bzrlib/builtins.py:5316
3512
#: bzrlib/builtins.py:5409
3393
3513
msgid "Break a dead lock."
3394
3514
msgstr ""
3395
3515
3396
#: bzrlib/builtins.py:5318
3516
#: bzrlib/builtins.py:5411
3397
3517
msgid ""
3398
3518
"This command breaks a lock on a repository, branch, working directory or\n"
3399
3519
"config file."
3400
3520
msgstr ""
3401
3521
3402
#: bzrlib/builtins.py:5321
3522
#: bzrlib/builtins.py:5414
3403
3523
msgid ""
3404
3524
"CAUTION: Locks should only be broken when you are sure that the process\n"
3405
3525
"holding the lock has been stopped."
3406
3526
msgstr ""
3407
3527
3408
#: bzrlib/builtins.py:5324
3528
#: bzrlib/builtins.py:5417
3409
3529
msgid ""
3410
3530
"You can get information on what locks are open via the 'bzr info\n"
3411
3531
"[location]' command."
3412
3532
msgstr ""
3413
3533
3414
#: bzrlib/builtins.py:5327
3534
#: bzrlib/builtins.py:5420
3415
3535
msgid ""
3416
3536
":Examples:\n"
3417
3537
" bzr break-lock\n"
3418
3538
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3419
3539
" bzr break-lock --conf ~/.bazaar"
3420
3540
msgstr ""
3541
":Exemplos:\n"
3542
" bzr break-lock\n"
3543
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3544
" bzr break-lock --conf ~/.bazaar"
3421
3545
3422
#: bzrlib/builtins.py:5336
3546
#: bzrlib/builtins.py:5429
3423
3547
msgid "LOCATION is the directory where the config lock is."
3424
3548
msgstr ""
3425
3549
3426
#: bzrlib/builtins.py:5338
3550
#: bzrlib/builtins.py:5431
3427
3551
msgid "Do not ask for confirmation before breaking the lock."
3428
3552
msgstr ""
3429
3553
3430
#: bzrlib/builtins.py:5373
3554
#: bzrlib/builtins.py:5466
3431
3555
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3432
3556
msgstr ""
3433
3557
3434
#: bzrlib/builtins.py:5374
3558
#: bzrlib/builtins.py:5467
3435
3559
msgid "Run the bzr server."
3436
msgstr ""
3560
msgstr "Execute o servidor bzr."
3437
3561
3438
#: bzrlib/builtins.py:5380
3562
#: bzrlib/builtins.py:5473
3439
3563
msgid "Serve on stdin/out for use from inetd or sshd."
3440
3564
msgstr ""
3441
3565
3442
#: bzrlib/builtins.py:5381
3566
#: bzrlib/builtins.py:5474
3443
3567
msgid "protocol"
3444
3568
msgstr ""
3445
3569
3446
#: bzrlib/builtins.py:5382
3570
#: bzrlib/builtins.py:5475
3447
3571
msgid "Protocol to serve."
3448
3572
msgstr ""
3449
3573
3450
#: bzrlib/builtins.py:5386
3574
#: bzrlib/builtins.py:5479
3451
3575
msgid ""
3452
3576
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3453
3577
"Passing 0 as the port number will result in a dynamically allocated port. "
3454
3578
"The default port depends on the protocol."
3455
3579
msgstr ""
3456
3580
3457
#: bzrlib/builtins.py:5392
3581
#: bzrlib/builtins.py:5485
3458
3582
msgid "Serve contents of this directory."
3459
3583
msgstr ""
3460
3584
3461
#: bzrlib/builtins.py:5394
3585
#: bzrlib/builtins.py:5487
3462
3586
msgid ""
3463
3587
"By default the server is a readonly server. Supplying --allow-writes "
3464
3588
"enables write access to the contents of the served directory and below. "
3467
3591
"uncontrolled write access to your file system."
3468
3592
msgstr ""
3469
3593
3470
#: bzrlib/builtins.py:5403
3594
#: bzrlib/builtins.py:5496
3471
3595
msgid "Override the default idle client timeout (5min)."
3472
3596
msgstr ""
3473
3597
3474
#: bzrlib/builtins.py:5453
3598
#: bzrlib/builtins.py:5546
3475
3599
msgid "Combine a tree into its containing tree."
3476
3600
msgstr ""
3477
3601
3478
#: bzrlib/builtins.py:5455
3602
#: bzrlib/builtins.py:5548
3479
3603
msgid "This command requires the target tree to be in a rich-root format."
3480
3604
msgstr ""
3481
3605
3482
#: bzrlib/builtins.py:5457
3606
#: bzrlib/builtins.py:5550
3483
3607
msgid ""
3484
3608
"The TREE argument should be an independent tree, inside another tree, but\n"
3485
3609
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3486
3610
"running \"bzr branch\" with the target inside a tree.)"
3487
3611
msgstr ""
3488
3612
3489
#: bzrlib/builtins.py:5461
3613
#: bzrlib/builtins.py:5554
3490
3614
msgid ""
3491
3615
"The result is a combined tree, with the subtree no longer an independent\n"
3492
3616
"part. This is marked as a merge of the subtree into the containing tree,\n"
3493
3617
"and all history is preserved."
3494
3618
msgstr ""
3495
3619
3496
#: bzrlib/builtins.py:5479
3620
#: bzrlib/builtins.py:5572
3497
3621
#, python-format
3498
3622
msgid ""
3499
3623
"Can't join trees because %s doesn't support rich root data.\n"
3500
3624
"You can use bzr upgrade on the repository."
3501
3625
msgstr ""
3502
3626
3503
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3627
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3504
3628
msgid "Cannot join {0}. {1}"
3505
3629
msgstr ""
3506
3630
3507
#: bzrlib/builtins.py:5499
3631
#: bzrlib/builtins.py:5592
3508
3632
msgid "Split a subdirectory of a tree into a separate tree."
3509
3633
msgstr ""
3510
3634
3511
#: bzrlib/builtins.py:5501
3635
#: bzrlib/builtins.py:5594
3512
3636
msgid ""
3513
3637
"This command will produce a target tree in a format that supports\n"
3514
3638
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3515
3639
"converted into earlier formats like 'dirstate-tags'."
3516
3640
msgstr ""
3517
3641
3518
#: bzrlib/builtins.py:5505
3642
#: bzrlib/builtins.py:5598
3519
3643
msgid ""
3520
3644
"The TREE argument should be a subdirectory of a working tree. That\n"
3521
3645
"subdirectory will be converted into an independent tree, with its own\n"
3522
3646
"branch. Commits in the top-level tree will not apply to the new subtree."
3523
3647
msgstr ""
3524
3648
3525
#: bzrlib/builtins.py:5585
3649
#: bzrlib/builtins.py:5678
3526
3650
msgid "No submit branch specified or known"
3527
3651
msgstr ""
3528
3652
3529
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3653
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3530
3654
msgid "No public branch specified or known"
3531
msgstr ""
3655
msgstr "Nenhum ramo público especificado ou conhecido"
3532
3656
3533
#: bzrlib/builtins.py:5598
3657
#: bzrlib/builtins.py:5691
3534
3658
msgid "bzr merge-directive takes at most two one revision identifiers"
3535
3659
msgstr ""
3536
3660
3537
#: bzrlib/builtins.py:5607
3661
#: bzrlib/builtins.py:5700
3538
3662
msgid "No revisions to bundle."
3539
3663
msgstr ""
3540
3664
3541
#: bzrlib/builtins.py:5626
3665
#: bzrlib/builtins.py:5719
3542
3666
msgid "Mail or create a merge-directive for submitting changes."
3543
3667
msgstr ""
3544
3668
3545
#: bzrlib/builtins.py:5628
3669
#: bzrlib/builtins.py:5721
3546
3670
msgid "A merge directive provides many things needed for requesting merges:"
3547
3671
msgstr ""
3548
3672
3549
#: bzrlib/builtins.py:5630
3673
#: bzrlib/builtins.py:5723
3550
3674
msgid "* A machine-readable description of the merge to perform"
3551
3675
msgstr ""
3552
3676
3553
#: bzrlib/builtins.py:5632
3677
#: bzrlib/builtins.py:5725
3554
3678
msgid "* An optional patch that is a preview of the changes requested"
3555
3679
msgstr ""
3556
3680
3557
#: bzrlib/builtins.py:5634
3681
#: bzrlib/builtins.py:5727
3558
3682
msgid ""
3559
3683
"* An optional bundle of revision data, so that the changes can be applied\n"
3560
3684
" directly from the merge directive, without retrieving data from a\n"
3561
3685
" branch."
3562
3686
msgstr ""
3563
3687
3564
#: bzrlib/builtins.py:5638
3688
#: bzrlib/builtins.py:5731
3565
3689
msgid ""
3566
3690
"`bzr send` creates a compact data set that, when applied using bzr\n"
3567
3691
"merge, has the same effect as merging from the source branch. "
3568
3692
msgstr ""
3569
3693
3570
#: bzrlib/builtins.py:5641
3694
#: bzrlib/builtins.py:5734
3571
3695
msgid ""
3572
3696
"By default the merge directive is self-contained and can be applied to any\n"
3573
3697
"branch containing submit_branch in its ancestory without needing access to\n"
3574
3698
"the source branch."
3575
3699
msgstr ""
3576
3700
3577
#: bzrlib/builtins.py:5645
3701
#: bzrlib/builtins.py:5738
3578
3702
msgid ""
3579
3703
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3580
3704
"revisions, but only a structured request to merge from the\n"
3583
3707
"included if known, so that people can check it later."
3584
3708
msgstr ""
3585
3709
3586
#: bzrlib/builtins.py:5651
3710
#: bzrlib/builtins.py:5744
3587
3711
msgid ""
3588
3712
"The submit branch defaults to the parent of the source branch, but can be\n"
3589
3713
"overridden. Both submit branch and public branch will be remembered in\n"
3592
3716
"be changed using --from."
3593
3717
msgstr ""
3594
3718
3595
#: bzrlib/builtins.py:5657
3719
#: bzrlib/builtins.py:5750
3596
3720
msgid ""
3597
3721
"Both the submit branch and the public branch follow the usual behavior with\n"
3598
3722
"respect to --remember: If there is no default location set, the first send\n"
3601
3725
"--remember. The value will only be saved if the location can be accessed."
3602
3726
msgstr ""
3603
3727
3604
#: bzrlib/builtins.py:5663
3728
#: bzrlib/builtins.py:5756
3605
3729
msgid ""
3606
3730
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3607
3731
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3609
3733
"in the merge directive."
3610
3734
msgstr ""
3611
3735
3612
#: bzrlib/builtins.py:5668
3736
#: bzrlib/builtins.py:5761
3613
3737
msgid ""
3614
3738
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3615
3739
"given, in which case it is sent to a file."
3616
3740
msgstr ""
3617
3741
3618
#: bzrlib/builtins.py:5671
3742
#: bzrlib/builtins.py:5764
3619
3743
msgid ""
3620
3744
"Mail is sent using your preferred mail program. This should be transparent\n"
3621
3745
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3622
3746
"If the preferred client can't be found (or used), your editor will be used."
3623
3747
msgstr ""
3624
3748
3625
#: bzrlib/builtins.py:5675
3749
#: bzrlib/builtins.py:5768
3626
3750
msgid ""
3627
3751
"To use a specific mail program, set the mail_client configuration option.\n"
3628
3752
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3634
3758
"supported clients."
3635
3759
msgstr ""
3636
3760
3637
#: bzrlib/builtins.py:5682
3761
#: bzrlib/builtins.py:5775
3638
3762
msgid ""
3639
3763
"If mail is being sent, a to address is required. This can be supplied\n"
3640
3764
"either on the commandline, by setting the submit_to configuration\n"
3642
3766
"in the submit branch."
3643
3767
msgstr ""
3644
3768
3645
#: bzrlib/builtins.py:5687
3769
#: bzrlib/builtins.py:5780
3646
3770
msgid ""
3647
3771
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3648
3772
"and\n"
3652
3776
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3653
3777
msgstr ""
3654
3778
3655
#: bzrlib/builtins.py:5693
3779
#: bzrlib/builtins.py:5786
3656
3780
msgid ""
3657
3781
"The merge directives created by bzr send may be applied using bzr merge or\n"
3658
3782
"bzr pull by specifying a file containing a merge directive as the location."
3659
3783
msgstr ""
3660
3784
3661
#: bzrlib/builtins.py:5696
3785
#: bzrlib/builtins.py:5789
3662
3786
msgid ""
3663
3787
"bzr send makes extensive use of public locations to map local locations "
3664
3788
"into\n"
3666
3790
"set them, and use `bzr info` to display them."
3667
3791
msgstr ""
3668
3792
3669
#: bzrlib/builtins.py:5720
3793
#: bzrlib/builtins.py:5813
3670
3794
msgid "Write merge directive to this file or directory; use - for stdout."
3671
3795
msgstr ""
3672
3796
3673
#: bzrlib/builtins.py:5724
3797
#: bzrlib/builtins.py:5817
3674
3798
msgid ""
3675
3799
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3676
3800
"strict disables the check."
3677
3801
msgstr ""
3678
3802
3679
#: bzrlib/builtins.py:5726
3803
#: bzrlib/builtins.py:5819
3680
3804
msgid "Mail the request to this address."
3681
3805
msgstr ""
3682
3806
3683
#: bzrlib/builtins.py:5730
3807
#: bzrlib/builtins.py:5823
3684
3808
msgid "Body for the email."
3685
msgstr ""
3809
msgstr "Corpo para o e-mail."
3686
3810
3687
#: bzrlib/builtins.py:5783
3811
#: bzrlib/builtins.py:5876
3688
3812
msgid "Do not include a bundle in the merge directive."
3689
3813
msgstr ""
3690
3814
3691
#: bzrlib/builtins.py:5784
3815
#: bzrlib/builtins.py:5877
3692
3816
msgid "Do not include a preview patch in the merge directive."
3693
3817
msgstr ""
3694
3818
3695
#: bzrlib/builtins.py:5787
3819
#: bzrlib/builtins.py:5880
3696
3820
msgid "Remember submit and public branch."
3697
3821
msgstr ""
3698
3822
3699
#: bzrlib/builtins.py:5789
3823
#: bzrlib/builtins.py:5882
3700
3824
msgid ""
3701
3825
"Branch to generate the submission from, rather than the one containing the "
3702
3826
"working directory."
3703
3827
msgstr ""
3704
3828
3705
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3829
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3706
3830
msgid "format"
3707
3831
msgstr ""
3708
3832
3709
#: bzrlib/builtins.py:5800
3833
#: bzrlib/builtins.py:5893
3710
3834
msgid "Use the specified output format."
3711
3835
msgstr ""
3712
3836
3713
#: bzrlib/builtins.py:5822
3837
#: bzrlib/builtins.py:5915
3714
3838
msgid "Create, remove or modify a tag naming a revision."
3715
3839
msgstr ""
3716
3840
3717
#: bzrlib/builtins.py:5824
3841
#: bzrlib/builtins.py:5917
3718
3842
msgid ""
3719
3843
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3720
3844
"(--revision) option can be given -rtag:X, where X is any previously\n"
3721
3845
"created tag."
3722
3846
msgstr ""
3723
3847
3724
#: bzrlib/builtins.py:5828
3848
#: bzrlib/builtins.py:5921
3725
3849
msgid ""
3726
3850
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3727
3851
"along when you branch, push, pull or merge."
3728
3852
msgstr ""
3729
3853
3730
#: bzrlib/builtins.py:5831
3854
#: bzrlib/builtins.py:5924
3731
3855
msgid ""
3732
3856
"It is an error to give a tag name that already exists unless you pass\n"
3733
3857
"--force, in which case the tag is moved to point to the new revision."
3734
3858
msgstr ""
3735
3859
3736
#: bzrlib/builtins.py:5834
3860
#: bzrlib/builtins.py:5927
3737
3861
msgid ""
3738
3862
"To rename a tag (change the name but keep it on the same revsion), run "
3739
3863
"``bzr\n"
3740
3864
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3741
3865
msgstr ""
3742
3866
3743
#: bzrlib/builtins.py:5837
3867
#: bzrlib/builtins.py:5930
3744
3868
msgid ""
3745
3869
"If no tag name is specified it will be determined through the \n"
3746
3870
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3748
3872
"details."
3749
3873
msgstr ""
3750
3874
3751
#: bzrlib/builtins.py:5847
3875
#: bzrlib/builtins.py:5940
3752
3876
msgid "Delete this tag rather than placing it."
3753
3877
msgstr ""
3754
3878
3755
#: bzrlib/builtins.py:5850
3879
#: bzrlib/builtins.py:5943
3756
3880
msgid "Branch in which to place the tag."
3757
3881
msgstr ""
3758
3882
3759
#: bzrlib/builtins.py:5852
3883
#: bzrlib/builtins.py:5945
3760
3884
msgid "Replace existing tags."
3761
msgstr ""
3885
msgstr "Substituir as tags existentes."
3762
3886
3763
#: bzrlib/builtins.py:5867
3887
#: bzrlib/builtins.py:5960
3764
3888
msgid "No tag specified to delete."
3765
msgstr ""
3889
msgstr "Sem tag especifica para apagar."
3766
3890
3767
#: bzrlib/builtins.py:5869
3891
#: bzrlib/builtins.py:5962
3768
3892
#, python-format
3769
3893
msgid "Deleted tag %s."
3770
msgstr ""
3894
msgstr "Tag %s apagada."
3771
3895
3772
#: bzrlib/builtins.py:5883
3896
#: bzrlib/builtins.py:5976
3773
3897
msgid "Please specify a tag name."
3774
msgstr ""
3898
msgstr "Por favor, especifique o nome da tag."
3775
3899
3776
#: bzrlib/builtins.py:5891
3900
#: bzrlib/builtins.py:5984
3777
3901
#, python-format
3778
3902
msgid "Tag %s already exists for that revision."
3779
msgstr ""
3903
msgstr "A tag %s já existe para aquela revisão."
3780
3904
3781
#: bzrlib/builtins.py:5895
3905
#: bzrlib/builtins.py:5988
3782
3906
#, python-format
3783
3907
msgid "Created tag %s."
3784
msgstr ""
3908
msgstr "Tag %s criada."
3785
3909
3786
#: bzrlib/builtins.py:5897
3910
#: bzrlib/builtins.py:5990
3787
3911
#, python-format
3788
3912
msgid "Updated tag %s."
3789
msgstr ""
3913
msgstr "Tag %s atualizada."
3790
3914
3791
#: bzrlib/builtins.py:5901
3915
#: bzrlib/builtins.py:5994
3792
3916
msgid "List tags."
3793
msgstr ""
3917
msgstr "Lista de tags."
3794
3918
3795
#: bzrlib/builtins.py:5903
3919
#: bzrlib/builtins.py:5996
3796
3920
msgid ""
3797
3921
"This command shows a table of tag names and the revisions they reference."
3798
3922
msgstr ""
3799
3923
3800
#: bzrlib/builtins.py:5909
3924
#: bzrlib/builtins.py:6002
3801
3925
msgid "Branch whose tags should be displayed."
3802
3926
msgstr ""
3803
3927
3804
#: bzrlib/builtins.py:5911
3928
#: bzrlib/builtins.py:6004
3805
3929
msgid "Sort tags by different criteria."
3806
3930
msgstr ""
3807
3931
3808
#: bzrlib/builtins.py:5911
3932
#: bzrlib/builtins.py:6004
3809
3933
msgid "Sorting"
3810
3934
msgstr ""
3811
3935
3812
#: bzrlib/builtins.py:5980
3936
#: bzrlib/builtins.py:6073
3813
3937
msgid "Reconfigure the type of a bzr directory."
3814
3938
msgstr ""
3815
3939
3816
#: bzrlib/builtins.py:5982
3940
#: bzrlib/builtins.py:6075
3817
3941
msgid "A target configuration must be specified."
3818
3942
msgstr ""
3819
3943
3820
#: bzrlib/builtins.py:5984
3944
#: bzrlib/builtins.py:6077
3821
3945
msgid ""
3822
3946
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3823
3947
"The order of preference is\n"
3828
3952
"If none of these is available, --bind-to must be specified."
3829
3953
msgstr ""
3830
3954
3831
#: bzrlib/builtins.py:5998
3955
#: bzrlib/builtins.py:6091
3832
3956
msgid "Tree type"
3833
3957
msgstr ""
3834
3958
3835
#: bzrlib/builtins.py:5999
3959
#: bzrlib/builtins.py:6092
3836
3960
msgid "The relation between branch and tree."
3837
3961
msgstr ""
3838
3962
3839
#: bzrlib/builtins.py:6001
3963
#: bzrlib/builtins.py:6094
3840
3964
msgid "Reconfigure to be an unbound branch with no working tree."
3841
3965
msgstr ""
3842
3966
3843
#: bzrlib/builtins.py:6002
3967
#: bzrlib/builtins.py:6095
3844
3968
msgid "Reconfigure to be an unbound branch with a working tree."
3845
3969
msgstr ""
3846
3970
3847
#: bzrlib/builtins.py:6003
3971
#: bzrlib/builtins.py:6096
3848
3972
msgid "Reconfigure to be a bound branch with a working tree."
3849
3973
msgstr ""
3850
3974
3851
#: bzrlib/builtins.py:6004
3975
#: bzrlib/builtins.py:6097
3852
3976
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3853
3977
msgstr ""
3854
3978
3855
#: bzrlib/builtins.py:6009
3979
#: bzrlib/builtins.py:6102
3856
3980
msgid "Repository type"
3857
msgstr ""
3981
msgstr "Tipo de repositório"
3858
3982
3859
#: bzrlib/builtins.py:6010
3983
#: bzrlib/builtins.py:6103
3860
3984
msgid "Location fo the repository."
3861
msgstr ""
3985
msgstr "Local para o repositório."
3862
3986
3863
#: bzrlib/builtins.py:6012
3987
#: bzrlib/builtins.py:6105
3864
3988
msgid ""
3865
3989
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3866
3990
msgstr ""
3867
3991
3868
#: bzrlib/builtins.py:6014
3992
#: bzrlib/builtins.py:6107
3869
3993
msgid "Reconfigure to use a shared repository."
3870
msgstr ""
3994
msgstr "Reconfigurar para usar um repositório compartilhado."
3871
3995
3872
#: bzrlib/builtins.py:6018
3996
#: bzrlib/builtins.py:6111
3873
3997
msgid "Trees in Repository"
3874
3998
msgstr ""
3875
3999
3876
#: bzrlib/builtins.py:6019
4000
#: bzrlib/builtins.py:6112
3877
4001
msgid "Whether new branches in the repository have trees."
3878
4002
msgstr ""
3879
4003
3880
#: bzrlib/builtins.py:6021
4004
#: bzrlib/builtins.py:6114
3881
4005
msgid ""
3882
4006
"Reconfigure repository to create working trees on branches by default."
3883
4007
msgstr ""
3884
4008
3885
#: bzrlib/builtins.py:6023
4009
#: bzrlib/builtins.py:6116
3886
4010
msgid ""
3887
4011
"Reconfigure repository to not create working trees on branches by default."
3888
4012
msgstr ""
3889
4013
3890
#: bzrlib/builtins.py:6026
4014
#: bzrlib/builtins.py:6119
3891
4015
msgid "Branch to bind checkout to."
3892
4016
msgstr ""
3893
4017
3894
#: bzrlib/builtins.py:6028
4018
#: bzrlib/builtins.py:6121
3895
4019
msgid "Perform reconfiguration even if local changes will be lost."
3896
4020
msgstr ""
3897
4021
3898
#: bzrlib/builtins.py:6031
4022
#: bzrlib/builtins.py:6124
3899
4023
msgid "Reconfigure a branch to be stacked on another branch."
3900
4024
msgstr ""
3901
4025
3902
#: bzrlib/builtins.py:6035
4026
#: bzrlib/builtins.py:6128
3903
4027
msgid ""
3904
4028
"Reconfigure a branch to be unstacked. This may require copying substantial "
3905
4029
"data into it."
3906
4030
msgstr ""
3907
4031
3908
#: bzrlib/builtins.py:6045
4032
#: bzrlib/builtins.py:6138
3909
4033
msgid "Can't use both --stacked-on and --unstacked"
3910
4034
msgstr ""
3911
4035
3912
#: bzrlib/builtins.py:6059
4036
#: bzrlib/builtins.py:6152
3913
4037
msgid "No target configuration specified"
3914
4038
msgstr ""
3915
4039
3916
#: bzrlib/builtins.py:6094
4040
#: bzrlib/builtins.py:6187
3917
4041
msgid "Set the branch of a checkout and update."
3918
4042
msgstr ""
3919
4043
3920
#: bzrlib/builtins.py:6096
4044
#: bzrlib/builtins.py:6189
3921
4045
msgid ""
3922
4046
"For lightweight checkouts, this changes the branch being referenced.\n"
3923
4047
"For heavyweight checkouts, this checks that there are no local commits\n"
3925
4049
"of the new location and binds to it."
3926
4050
msgstr ""
3927
4051
3928
#: bzrlib/builtins.py:6101
4052
#: bzrlib/builtins.py:6194
3929
4053
msgid ""
3930
4054
"In both cases, the working tree is updated and uncommitted changes\n"
3931
4055
"are merged. The user can commit or revert these as they desire."
3932
4056
msgstr ""
3933
4057
3934
#: bzrlib/builtins.py:6104
4058
#: bzrlib/builtins.py:6197
3935
4059
msgid "Pending merges need to be committed or reverted before using switch."
3936
4060
msgstr ""
3937
4061
3938
#: bzrlib/builtins.py:6106
4062
#: bzrlib/builtins.py:6199
3939
4063
msgid ""
3940
4064
"The path to the branch to switch to can be specified relative to the parent\n"
3941
4065
"directory of the current branch. For example, if you are currently in a\n"
3943
4067
"/path/to/newbranch."
3944
4068
msgstr ""
3945
4069
3946
#: bzrlib/builtins.py:6111
4070
#: bzrlib/builtins.py:6204
3947
4071
msgid ""
3948
4072
"Bound branches use the nickname of its master branch unless it is set\n"
3949
4073
"locally, in which case switching will update the local nickname to be\n"
3950
4074
"that of the master."
3951
4075
msgstr ""
3952
4076
3953
#: bzrlib/builtins.py:6119
4077
#: bzrlib/builtins.py:6212
3954
4078
msgid "Switch even if local commits will be lost."
3955
4079
msgstr ""
3956
4080
3957
#: bzrlib/builtins.py:6122
4081
#: bzrlib/builtins.py:6215
3958
4082
msgid "Create the target branch from this one before switching to it."
3959
4083
msgstr ""
3960
4084
3961
#: bzrlib/builtins.py:6134
4085
#: bzrlib/builtins.py:6229
3962
4086
msgid "You must supply either a revision or a location"
3963
4087
msgstr ""
3964
4088
3965
#: bzrlib/builtins.py:6145
4089
#: bzrlib/builtins.py:6242
3966
4090
msgid "cannot create branch without source branch"
3967
4091
msgstr ""
3968
4092
3969
#: bzrlib/builtins.py:6209
4093
#: bzrlib/builtins.py:6262
3970
4094
msgid "Manage filtered views."
3971
4095
msgstr ""
3972
4096
3973
#: bzrlib/builtins.py:6211
4097
#: bzrlib/builtins.py:6264
3974
4098
msgid ""
3975
4099
"Views provide a mask over the tree so that users can focus on\n"
3976
4100
"a subset of a tree when doing their work. After creating a view,\n"
3980
4104
"must be within the current view."
3981
4105
msgstr ""
3982
4106
3983
#: bzrlib/builtins.py:6218
4107
#: bzrlib/builtins.py:6271
3984
4108
msgid ""
3985
4109
"In most cases, a view has a short life-span: it is created to make\n"
3986
4110
"a selected change and is deleted once that change is committed.\n"
3988
4112
"and switch between them."
3989
4113
msgstr ""
3990
4114
3991
#: bzrlib/builtins.py:6223
4115
#: bzrlib/builtins.py:6276
3992
4116
msgid ""
3993
4117
"To disable the current view without deleting it, you can switch to\n"
3994
4118
"the pseudo view called ``off``. This can be useful when you need\n"
3996
4120
"want to switch back to your view after that."
3997
4121
msgstr ""
3998
4122
3999
#: bzrlib/builtins.py:6228
4123
#: bzrlib/builtins.py:6281
4000
4124
msgid ""
4001
4125
":Examples:\n"
4002
4126
" To define the current view::"
4003
4127
msgstr ""
4004
4128
4005
#: bzrlib/builtins.py:6231
4129
#: bzrlib/builtins.py:6284
4006
4130
msgid " bzr view file1 dir1 ..."
4007
4131
msgstr ""
4008
4132
4009
#: bzrlib/builtins.py:6233
4133
#: bzrlib/builtins.py:6286
4010
4134
msgid " To list the current view::"
4011
4135
msgstr ""
4012
4136
4013
#: bzrlib/builtins.py:6235
4137
#: bzrlib/builtins.py:6288
4014
4138
msgid " bzr view"
4015
msgstr ""
4139
msgstr " bzr view"
4016
4140
4017
#: bzrlib/builtins.py:6237
4141
#: bzrlib/builtins.py:6290
4018
4142
msgid " To delete the current view::"
4019
4143
msgstr ""
4020
4144
4021
#: bzrlib/builtins.py:6239
4145
#: bzrlib/builtins.py:6292
4022
4146
msgid " bzr view --delete"
4023
msgstr ""
4147
msgstr " bzr view --delete"
4024
4148
4025
#: bzrlib/builtins.py:6241
4149
#: bzrlib/builtins.py:6294
4026
4150
msgid " To disable the current view without deleting it::"
4027
4151
msgstr ""
4028
4152
4029
#: bzrlib/builtins.py:6243
4153
#: bzrlib/builtins.py:6296
4030
4154
msgid " bzr view --switch off"
4031
msgstr ""
4155
msgstr " bzr view --switch off"
4032
4156
4033
#: bzrlib/builtins.py:6245
4157
#: bzrlib/builtins.py:6298
4034
4158
msgid " To define a named view and switch to it::"
4035
4159
msgstr ""
4036
4160
4037
#: bzrlib/builtins.py:6247
4161
#: bzrlib/builtins.py:6300
4038
4162
msgid " bzr view --name view-name file1 dir1 ..."
4039
4163
msgstr ""
4040
4164
4041
#: bzrlib/builtins.py:6249
4165
#: bzrlib/builtins.py:6302
4042
4166
msgid " To list a named view::"
4043
4167
msgstr ""
4044
4168
4045
#: bzrlib/builtins.py:6251
4169
#: bzrlib/builtins.py:6304
4046
4170
msgid " bzr view --name view-name"
4047
msgstr ""
4171
msgstr " bzr view --name view-name"
4048
4172
4049
#: bzrlib/builtins.py:6253
4173
#: bzrlib/builtins.py:6306
4050
4174
msgid " To delete a named view::"
4051
4175
msgstr ""
4052
4176
4053
#: bzrlib/builtins.py:6255
4177
#: bzrlib/builtins.py:6308
4054
4178
msgid " bzr view --name view-name --delete"
4055
msgstr ""
4179
msgstr " bzr view --name view-name --delete"
4056
4180
4057
#: bzrlib/builtins.py:6257
4181
#: bzrlib/builtins.py:6310
4058
4182
msgid " To switch to a named view::"
4059
4183
msgstr ""
4060
4184
4061
#: bzrlib/builtins.py:6259
4185
#: bzrlib/builtins.py:6312
4062
4186
msgid " bzr view --switch view-name"
4063
msgstr ""
4187
msgstr " bzr view --switch view-name"
4064
4188
4065
#: bzrlib/builtins.py:6261
4189
#: bzrlib/builtins.py:6314
4066
4190
msgid " To list all views defined::"
4067
4191
msgstr ""
4068
4192
4069
#: bzrlib/builtins.py:6263
4193
#: bzrlib/builtins.py:6316
4070
4194
msgid " bzr view --all"
4071
msgstr ""
4195
msgstr " bzr view --all"
4072
4196
4073
#: bzrlib/builtins.py:6265
4197
#: bzrlib/builtins.py:6318
4074
4198
msgid " To delete all views::"
4075
4199
msgstr ""
4076
4200
4077
#: bzrlib/builtins.py:6267
4201
#: bzrlib/builtins.py:6320
4078
4202
msgid " bzr view --delete --all"
4079
msgstr ""
4203
msgstr " bzr view --delete --all"
4080
4204
4081
#: bzrlib/builtins.py:6274
4205
#: bzrlib/builtins.py:6327
4082
4206
msgid "Apply list or delete action to all views."
4083
4207
msgstr ""
4084
4208
4085
#: bzrlib/builtins.py:6277
4209
#: bzrlib/builtins.py:6330
4086
4210
msgid "Delete the view."
4087
4211
msgstr ""
4088
4212
4089
#: bzrlib/builtins.py:6280
4213
#: bzrlib/builtins.py:6333
4090
4214
msgid "Name of the view to define, list or delete."
4091
4215
msgstr ""
4092
4216
4093
#: bzrlib/builtins.py:6284
4217
#: bzrlib/builtins.py:6337
4094
4218
msgid "Name of the view to switch to."
4095
4219
msgstr ""
4096
4220
4097
#: bzrlib/builtins.py:6303
4221
#: bzrlib/builtins.py:6356
4098
4222
msgid "Both --delete and a file list specified"
4099
4223
msgstr ""
4100
4224
4101
#: bzrlib/builtins.py:6306
4225
#: bzrlib/builtins.py:6359
4102
4226
msgid "Both --delete and --switch specified"
4103
4227
msgstr ""
4104
4228
4105
#: bzrlib/builtins.py:6309
4229
#: bzrlib/builtins.py:6362
4106
4230
msgid "Deleted all views.\n"
4107
4231
msgstr ""
4108
4232
4109
#: bzrlib/builtins.py:6311
4233
#: bzrlib/builtins.py:6364
4110
4234
msgid "No current view to delete"
4111
4235
msgstr ""
4112
4236
4113
#: bzrlib/builtins.py:6314
4237
#: bzrlib/builtins.py:6367
4114
4238
#, python-format
4115
4239
msgid "Deleted '%s' view.\n"
4116
4240
msgstr ""
4117
4241
4118
#: bzrlib/builtins.py:6318
4242
#: bzrlib/builtins.py:6371
4119
4243
msgid "Both --switch and a file list specified"
4120
4244
msgstr ""
4121
4245
4122
#: bzrlib/builtins.py:6321
4246
#: bzrlib/builtins.py:6374
4123
4247
msgid "Both --switch and --all specified"
4124
4248
msgstr ""
4125
4249
4126
#: bzrlib/builtins.py:6324
4250
#: bzrlib/builtins.py:6377
4127
4251
msgid "No current view to disable"
4128
4252
msgstr ""
4129
4253
4130
#: bzrlib/builtins.py:6326
4254
#: bzrlib/builtins.py:6379
4131
4255
#, python-format
4132
4256
msgid "Disabled '%s' view.\n"
4133
4257
msgstr ""
4134
4258
4135
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4259
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4136
4260
msgid "Using '{0}' view: {1}\n"
4137
4261
msgstr ""
4138
4262
4139
#: bzrlib/builtins.py:6333
4263
#: bzrlib/builtins.py:6386
4140
4264
msgid "Views defined:\n"
4141
4265
msgstr ""
4142
4266
4143
#: bzrlib/builtins.py:6342
4267
#: bzrlib/builtins.py:6395
4144
4268
msgid "No views defined.\n"
4145
4269
msgstr ""
4146
4270
4147
#: bzrlib/builtins.py:6349
4271
#: bzrlib/builtins.py:6402
4148
4272
msgid "Cannot change the 'off' pseudo view"
4149
4273
msgstr ""
4150
4274
4151
#: bzrlib/builtins.py:6357
4275
#: bzrlib/builtins.py:6410
4152
4276
msgid "No current view.\n"
4153
4277
msgstr ""
4154
4278
4155
#: bzrlib/builtins.py:6360
4279
#: bzrlib/builtins.py:6413
4156
4280
msgid "'{0}' view is: {1}\n"
4157
4281
msgstr ""
4158
4282
4159
#: bzrlib/builtins.py:6380
4283
#: bzrlib/builtins.py:6433
4160
4284
msgid " <no hooks installed>\n"
4161
4285
msgstr ""
4162
4286
4163
#: bzrlib/builtins.py:6384
4287
#: bzrlib/builtins.py:6437
4164
4288
msgid "Remove a branch."
4165
4289
msgstr ""
4166
4290
4167
#: bzrlib/builtins.py:6386
4291
#: bzrlib/builtins.py:6439
4168
4292
msgid ""
4169
4293
"This will remove the branch from the specified location but \n"
4170
4294
"will keep any working tree or repository in place."
4171
4295
msgstr ""
4172
4296
4173
#: bzrlib/builtins.py:6391
4297
#: bzrlib/builtins.py:6444
4174
4298
msgid " Remove the branch at repo/trunk::"
4175
4299
msgstr ""
4176
4300
4177
#: bzrlib/builtins.py:6393
4301
#: bzrlib/builtins.py:6446
4178
4302
msgid " bzr remove-branch repo/trunk"
4179
4303
msgstr ""
4180
4304
4181
#: bzrlib/builtins.py:6408
4305
#: bzrlib/builtins.py:6461
4182
4306
msgid "Plaintext diff output."
4183
4307
msgstr ""
4184
4308
4185
#: bzrlib/builtins.py:6409
4309
#: bzrlib/builtins.py:6462
4186
4310
msgid "Temporarily set aside some changes from the current tree."
4187
4311
msgstr ""
4188
4312
4189
#: bzrlib/builtins.py:6411
4313
#: bzrlib/builtins.py:6464
4190
4314
msgid ""
4191
4315
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4192
4316
"ie. out of the way, until a later time when you can bring them back from\n"
4195
4319
"will they survive its deletion."
4196
4320
msgstr ""
4197
4321
4198
#: bzrlib/builtins.py:6417
4322
#: bzrlib/builtins.py:6470
4199
4323
msgid "If shelve --list is specified, previously-shelved changes are listed."
4200
4324
msgstr ""
4201
4325
4202
#: bzrlib/builtins.py:6419
4326
#: bzrlib/builtins.py:6472
4203
4327
msgid ""
4204
4328
"Shelve is intended to help separate several sets of changes that have\n"
4205
4329
"been inappropriately mingled. If you just want to get rid of all changes\n"
4207
4331
"shelve all text changes at once, use shelve --all."
4208
4332
msgstr ""
4209
4333
4210
#: bzrlib/builtins.py:6424
4334
#: bzrlib/builtins.py:6477
4211
4335
msgid ""
4212
4336
"If filenames are specified, only the changes to those files will be\n"
4213
4337
"shelved. Other files will be left untouched."
4214
4338
msgstr ""
4215
4339
4216
#: bzrlib/builtins.py:6427
4340
#: bzrlib/builtins.py:6480
4217
4341
msgid ""
4218
4342
"If a revision is specified, changes since that revision will be shelved."
4219
4343
msgstr ""
4220
4344
4221
#: bzrlib/builtins.py:6429
4345
#: bzrlib/builtins.py:6482
4222
4346
msgid ""
4223
4347
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4224
4348
"restore the most recently shelved changes."
4225
4349
msgstr ""
4226
4350
4227
#: bzrlib/builtins.py:6432
4351
#: bzrlib/builtins.py:6485
4228
4352
msgid ""
4229
4353
"For complicated changes, it is possible to edit the changes in a separate\n"
4230
4354
"editor program to decide what the file remaining in the working copy\n"
4231
4355
"should look like. To do this, add the configuration option"
4232
4356
msgstr ""
4233
4357
4234
#: bzrlib/builtins.py:6436
4358
#: bzrlib/builtins.py:6489
4235
4359
msgid " change_editor = PROGRAM @new_path @old_path"
4236
4360
msgstr ""
4237
4361
4238
#: bzrlib/builtins.py:6438
4362
#: bzrlib/builtins.py:6491
4239
4363
msgid ""
4240
4364
"where @new_path is replaced with the path of the new version of the \n"
4241
4365
"file and @old_path is replaced with the path of the old version of \n"
4244
4368
" "
4245
4369
msgstr ""
4246
4370
4247
#: bzrlib/builtins.py:6450
4371
#: bzrlib/builtins.py:6503
4248
4372
msgid "Shelve all changes."
4249
4373
msgstr ""
4250
4374
4251
#: bzrlib/builtins.py:6452
4375
#: bzrlib/builtins.py:6505
4252
4376
msgid "Method to use for writing diffs."
4253
4377
msgstr ""
4254
4378
4255
#: bzrlib/builtins.py:6452
4379
#: bzrlib/builtins.py:6505
4256
4380
msgid "writer"
4257
4381
msgstr ""
4258
4382
4259
#: bzrlib/builtins.py:6456
4383
#: bzrlib/builtins.py:6509
4260
4384
msgid "List shelved changes."
4261
4385
msgstr ""
4262
4386
4263
#: bzrlib/builtins.py:6458
4387
#: bzrlib/builtins.py:6511
4264
4388
msgid "Destroy removed changes instead of shelving them."
4265
4389
msgstr ""
4266
4390
4267
#: bzrlib/builtins.py:6487
4391
#: bzrlib/builtins.py:6540
4268
4392
msgid "No shelved changes."
4269
4393
msgstr ""
4270
4394
4271
#: bzrlib/builtins.py:6498
4395
#: bzrlib/builtins.py:6551
4272
4396
msgid "Restore shelved changes."
4273
4397
msgstr ""
4274
4398
4275
#: bzrlib/builtins.py:6500
4399
#: bzrlib/builtins.py:6553
4276
4400
msgid ""
4277
4401
"By default, the most recently shelved changes are restored. However if you\n"
4278
4402
"specify a shelf by id those changes will be restored instead. This works\n"
4279
4403
"best when the changes don't depend on each other."
4280
4404
msgstr ""
4281
4405
4282
#: bzrlib/builtins.py:6509
4406
#: bzrlib/builtins.py:6562
4283
4407
msgid "The action to perform."
4284
4408
msgstr ""
4285
4409
4286
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4410
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4287
4411
msgid "action"
4288
4412
msgstr ""
4289
4413
4290
#: bzrlib/builtins.py:6511
4414
#: bzrlib/builtins.py:6564
4291
4415
msgid "Apply changes and remove from the shelf."
4292
4416
msgstr ""
4293
4417
4294
#: bzrlib/builtins.py:6512
4418
#: bzrlib/builtins.py:6565
4295
4419
msgid "Show changes, but do not apply or remove them."
4296
4420
msgstr ""
4297
4421
4298
#: bzrlib/builtins.py:6513
4422
#: bzrlib/builtins.py:6566
4299
4423
msgid ""
4300
4424
"Instead of unshelving the changes, show the diff that would result from "
4301
4425
"unshelving."
4302
4426
msgstr ""
4303
4427
4304
#: bzrlib/builtins.py:6515
4428
#: bzrlib/builtins.py:6568
4305
4429
msgid "Delete changes without applying them."
4306
4430
msgstr ""
4307
4431
4308
#: bzrlib/builtins.py:6516
4432
#: bzrlib/builtins.py:6569
4309
4433
msgid "Apply changes but don't delete them."
4310
4434
msgstr ""
4311
4435
4312
#: bzrlib/builtins.py:6531
4436
#: bzrlib/builtins.py:6584
4313
4437
msgid "Remove unwanted files from working tree."
4314
4438
msgstr ""
4315
4439
4316
#: bzrlib/builtins.py:6533
4440
#: bzrlib/builtins.py:6586
4317
4441
msgid ""
4318
4442
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4319
4443
"files are never deleted."
4320
4444
msgstr ""
4321
4445
4322
#: bzrlib/builtins.py:6536
4446
#: bzrlib/builtins.py:6589
4323
4447
msgid ""
4324
4448
"Another class is 'detritus', which includes files emitted by bzr during\n"
4325
4449
"normal operations and selftests. (The value of these files decreases with\n"
4326
4450
"time.)"
4327
4451
msgstr ""
4328
4452
4329
#: bzrlib/builtins.py:6540
4453
#: bzrlib/builtins.py:6593
4330
4454
msgid ""
4331
4455
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4332
4456
"flags are respected, and may be combined."
4333
4457
msgstr ""
4334
4458
4335
#: bzrlib/builtins.py:6543
4459
#: bzrlib/builtins.py:6596
4336
4460
msgid "To check what clean-tree will do, use --dry-run."
4337
4461
msgstr ""
4338
4462
4339
#: bzrlib/builtins.py:6546
4463
#: bzrlib/builtins.py:6599
4340
4464
msgid "Delete all ignored files."
4341
4465
msgstr ""
4342
4466
4343
#: bzrlib/builtins.py:6547
4467
#: bzrlib/builtins.py:6600
4344
4468
msgid ""
4345
4469
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4346
4470
msgstr ""
4347
4471
4348
#: bzrlib/builtins.py:6550
4472
#: bzrlib/builtins.py:6603
4349
4473
msgid "Delete files unknown to bzr (default)."
4350
4474
msgstr ""
4351
4475
4352
#: bzrlib/builtins.py:6551
4476
#: bzrlib/builtins.py:6604
4353
4477
msgid "Show files to delete instead of deleting them."
4354
4478
msgstr ""
4355
4479
4356
#: bzrlib/builtins.py:6553
4480
#: bzrlib/builtins.py:6606
4357
4481
msgid "Do not prompt before deleting."
4358
4482
msgstr ""
4359
4483
4413
4537
msgstr[0] ""
4414
4538
msgstr[1] ""
4415
4539
4416
#: bzrlib/bzrdir.py:489
4540
#: bzrlib/bzrdir.py:490
4417
4541
msgid ""
4418
4542
"making backup of {0}\n"
4419
4543
" to {1}"
4420
4544
msgstr ""
4421
4545
4422
#: bzrlib/bzrdir.py:512
4546
#: bzrlib/bzrdir.py:513
4423
4547
msgid "renamed {0} to {1}"
4424
4548
msgstr ""
4425
4549
4426
#: bzrlib/bzrdir.py:1663
4550
#: bzrlib/bzrdir.py:1652
4427
4551
#, python-format
4428
4552
msgid ""
4429
4553
"Source repository format does not support stacking, using format:\n"
4430
4554
" %s"
4431
4555
msgstr ""
4432
4556
4433
#: bzrlib/bzrdir.py:1683
4557
#: bzrlib/bzrdir.py:1672
4434
4558
#, python-format
4435
4559
msgid ""
4436
4560
"Source branch format does not support stacking, using format:\n"
4437
4561
" %s"
4438
4562
msgstr ""
4439
4563
4440
#: bzrlib/bzrdir.py:1829
4564
#: bzrlib/bzrdir.py:1818
4441
4565
msgid "starting repository conversion"
4442
4566
msgstr ""
4443
4567
4444
#: bzrlib/bzrdir.py:2058
4568
#: bzrlib/bzrdir.py:2039
4445
4569
msgid "Using default stacking branch {0} at {1}"
4446
4570
msgstr ""
4447
4571
4680
4804
msgid "bzr version-info --revision takes exactly one revision specifier"
4681
4805
msgstr ""
4682
4806
4683
#: bzrlib/commands.py:228
4807
#: bzrlib/commands.py:229
4684
4808
#, python-format
4685
4809
msgid "unknown command \"%s\""
4686
4810
msgstr ""
4687
4811
4688
#: bzrlib/commands.py:475
4812
#: bzrlib/commands.py:476
4689
4813
msgid "No help for this command."
4690
4814
msgstr ""
4691
4815
4692
#: bzrlib/commands.py:488
4816
#: bzrlib/commands.py:489
4693
4817
#, python-format
4694
4818
msgid ":Purpose: %s\n"
4695
4819
msgstr ""
4696
4820
4697
#: bzrlib/commands.py:490
4821
#: bzrlib/commands.py:491
4698
4822
#, python-format
4699
4823
msgid ""
4700
4824
":Usage:\n"
4701
4825
"%s\n"
4702
4826
msgstr ""
4827
":Uso:\n"
4828
"%s\n"
4703
4829
4704
#: bzrlib/commands.py:492
4830
#: bzrlib/commands.py:493
4705
4831
#, python-format
4706
4832
msgid ":Usage: %s\n"
4707
msgstr ""
4833
msgstr ":Uso: %s\n"
4708
4834
4709
#: bzrlib/commands.py:511
4835
#: bzrlib/commands.py:512
4710
4836
#, python-format
4711
4837
msgid ":Options:%s"
4712
4838
msgstr ""
4713
4839
4714
#: bzrlib/commands.py:522
4840
#: bzrlib/commands.py:523
4715
4841
#, python-format
4716
4842
msgid ""
4717
4843
":Description:\n"
4719
4845
"\n"
4720
4846
msgstr ""
4721
4847
4722
#: bzrlib/commands.py:532
4848
#: bzrlib/commands.py:533
4723
4849
#, python-format
4724
4850
msgid ""
4725
4851
"See bzr help %s for more details and examples.\n"
4726
4852
"\n"
4727
4853
msgstr ""
4728
4854
4729
#: bzrlib/commands.py:537
4855
#: bzrlib/commands.py:538
4730
4856
msgid ":Aliases: "
4731
4857
msgstr ""
4732
4858
4733
#: bzrlib/commands.py:541
4859
#: bzrlib/commands.py:542
4734
4860
#, python-format
4735
4861
msgid ":From: plugin \"%s\"\n"
4736
4862
msgstr ""
4737
4863
4738
#: bzrlib/commands.py:553
4864
#: bzrlib/commands.py:554
4739
4865
msgid ":doc:`{0} <{1}-help>`"
4740
4866
msgstr ""
4741
4867
4742
#: bzrlib/commands.py:557
4868
#: bzrlib/commands.py:558
4743
4869
#, python-format
4744
4870
msgid ":See also: %s"
4745
4871
msgstr ""
4746
4872
4747
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4873
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4748
4874
msgid "Only ASCII permitted in option names"
4749
4875
msgstr ""
4750
4876
4751
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4877
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4752
4878
msgid "command {0!r} needs one or more {1}"
4753
4879
msgstr ""
4754
4880
4755
#: bzrlib/commands.py:857
4881
#: bzrlib/commands.py:858
4756
4882
msgid "command {0!r} requires argument {1}"
4757
4883
msgstr ""
4758
4884
4759
#: bzrlib/commands.py:864
4885
#: bzrlib/commands.py:865
4760
4886
msgid "extra argument to command {0}: {1}"
4761
4887
msgstr ""
4762
4888
4763
#: bzrlib/commands.py:961
4889
#: bzrlib/commands.py:962
4764
4890
#, python-format
4765
4891
msgid "Profile data written to \"%s\"."
4766
4892
msgstr ""
4862
4988
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4863
4989
msgstr ""
4864
4990
4865
#: bzrlib/config.py:2499
4991
#: bzrlib/config.py:2485
4866
4992
msgid "{0} is not an SI unit."
4867
4993
msgstr ""
4868
4994
4869
#: bzrlib/config.py:2956
4995
#: bzrlib/config.py:2949
4870
4996
msgid ""
4871
4997
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4872
4998
"will be saved."
4873
4999
msgstr ""
4874
5000
4875
#: bzrlib/config.py:3100
5001
#: bzrlib/config.py:3093
4876
5002
#, python-format
4877
5003
msgid "Invalid '%s', should be of the form 'name=value'"
4878
5004
msgstr ""
4879
5005
4880
#: bzrlib/config.py:3969
5006
#: bzrlib/config.py:3962
4881
5007
msgid "Display, set or remove a configuration option."
4882
5008
msgstr ""
4883
5009
4884
#: bzrlib/config.py:3971
5010
#: bzrlib/config.py:3964
4885
5011
msgid "Display the active value for a given option."
4886
5012
msgstr ""
4887
5013
4888
#: bzrlib/config.py:3973
5014
#: bzrlib/config.py:3966
4889
5015
msgid ""
4890
5016
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4891
5017
"matching options are displayed mentioning their scope. The active value\n"
4892
5018
"that bzr will take into account is the first one displayed for each option."
4893
5019
msgstr ""
4894
5020
4895
#: bzrlib/config.py:3977
5021
#: bzrlib/config.py:3970
4896
5022
msgid "If no NAME is given, --all .* is implied."
4897
5023
msgstr ""
4898
5024
4899
#: bzrlib/config.py:3979
5025
#: bzrlib/config.py:3972
4900
5026
msgid ""
4901
5027
"Setting a value is achieved by using name=value without spaces. The value\n"
4902
5028
"is set in the most relevant scope and can be checked by displaying the\n"
4903
5029
"option again."
4904
5030
msgstr ""
4905
5031
4906
#: bzrlib/config.py:3991
5032
#: bzrlib/config.py:3984
4907
5033
msgid "Reduce the scope to the specified configuration file."
4908
5034
msgstr ""
4909
5035
4910
#: bzrlib/config.py:3995
5036
#: bzrlib/config.py:3988
4911
5037
msgid "Display all the defined values for the matching options."
4912
5038
msgstr ""
4913
5039
4914
#: bzrlib/config.py:3997
5040
#: bzrlib/config.py:3990
4915
5041
msgid "Remove the option from the configuration file."
4916
5042
msgstr ""
4917
5043
4991
5117
msgstr[0] ""
4992
5118
msgstr[1] ""
4993
5119
4994
#: bzrlib/controldir.py:698
5120
#: bzrlib/controldir.py:710
4995
5121
msgid "{0} is{1} redirected to {2}"
4996
5122
msgstr ""
4997
5123
5097
5223
msgid "The value '%(value)s' is not a valid value."
5098
5224
msgstr ""
5099
5225
5226
#: bzrlib/errors.py:424
5227
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5228
msgstr ""
5229
5100
5230
#: bzrlib/errors.py:443
5101
5231
msgid "Generic path error: %(path)r%(extra)s)"
5102
5232
msgstr ""
5196
5326
msgstr ""
5197
5327
5198
5328
#: bzrlib/errors.py:705
5329
msgid "A control directory already exists: \"%(path)s\"."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:710
5199
5333
msgid "Already a branch: \"%(path)s\"."
5200
5334
msgstr ""
5201
5335
5202
#: bzrlib/errors.py:711
5336
#: bzrlib/errors.py:715
5337
msgid "Parent branch already exists: \"%(path)s\"."
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:721
5203
5341
msgid ""
5204
5342
"Directory contains a branch, but no working tree (use bzr checkout if you "
5205
5343
"wish to build a working tree): \"%(path)s\""
5206
5344
msgstr ""
5207
5345
5208
#: bzrlib/errors.py:716
5346
#: bzrlib/errors.py:726
5209
5347
msgid ""
5210
5348
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5211
5349
msgstr ""
5212
5350
5213
#: bzrlib/errors.py:726
5351
#: bzrlib/errors.py:736
5214
5352
msgid ""
5215
5353
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5216
5354
msgstr ""
5217
5355
5218
#: bzrlib/errors.py:736
5356
#: bzrlib/errors.py:746
5219
5357
msgid "No repository present: \"%(path)s\""
5220
5358
msgstr ""
5221
5359
5222
#: bzrlib/errors.py:743
5360
#: bzrlib/errors.py:753
5223
5361
msgid ""
5224
5362
"Unsupported branch format: %(format)s\n"
5225
5363
"Please run 'bzr upgrade'"
5226
5364
msgstr ""
5227
5365
5228
#: bzrlib/errors.py:749
5366
#: bzrlib/errors.py:759
5229
5367
msgid "Unknown %(kind)s format: %(format)r"
5230
5368
msgstr ""
5231
5369
5232
#: bzrlib/errors.py:758
5370
#: bzrlib/errors.py:768
5233
5371
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5234
5372
msgstr ""
5235
5373
5236
#: bzrlib/errors.py:768
5374
#: bzrlib/errors.py:778
5237
5375
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5238
5376
msgstr ""
5239
5377
5240
#: bzrlib/errors.py:783
5378
#: bzrlib/errors.py:793
5241
5379
msgid ""
5242
5380
"%(target)s\n"
5243
5381
"is not compatible with\n"
5245
5383
"%(details)s"
5246
5384
msgstr ""
5247
5385
5248
#: bzrlib/errors.py:799
5386
#: bzrlib/errors.py:809
5249
5387
msgid "Revision is not compatible with %(repo_format)s"
5250
5388
msgstr ""
5251
5389
5252
#: bzrlib/errors.py:809
5390
#: bzrlib/errors.py:819
5253
5391
msgid "%(context_info)s%(path)s is already versioned."
5254
5392
msgstr ""
5255
5393
5256
#: bzrlib/errors.py:830
5394
#: bzrlib/errors.py:840
5257
5395
msgid "%(context_info)s%(path)s is not versioned."
5258
5396
msgstr ""
5259
5397
5260
#: bzrlib/errors.py:851
5398
#: bzrlib/errors.py:861
5261
5399
msgid "Path(s) are not versioned: %(paths_as_string)s"
5262
5400
msgstr ""
5263
5401
5264
#: bzrlib/errors.py:862
5402
#: bzrlib/errors.py:872
5265
5403
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5266
5404
msgstr ""
5267
5405
5268
#: bzrlib/errors.py:881
5406
#: bzrlib/errors.py:891
5269
5407
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5270
5408
msgstr ""
5271
5409
5272
#: bzrlib/errors.py:889
5410
#: bzrlib/errors.py:899
5273
5411
msgid ""
5274
5412
"Filename %(filename)r is not valid in your current filesystem encoding "
5275
5413
"%(fs_encoding)s"
5276
5414
msgstr ""
5277
5415
5278
#: bzrlib/errors.py:900
5416
#: bzrlib/errors.py:910
5279
5417
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5280
5418
msgstr ""
5281
5419
5282
#: bzrlib/errors.py:918
5420
#: bzrlib/errors.py:928
5283
5421
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5284
5422
msgstr ""
5285
5423
5286
#: bzrlib/errors.py:957
5424
#: bzrlib/errors.py:967
5287
5425
msgid "Cannot lock %(lock)s: %(why)s"
5288
5426
msgstr ""
5289
5427
5290
#: bzrlib/errors.py:967
5428
#: bzrlib/errors.py:977
5291
5429
msgid ""
5292
5430
"A transaction related operation was attempted after the transaction finished."
5293
5431
msgstr ""
5294
5432
5295
#: bzrlib/errors.py:994
5433
#: bzrlib/errors.py:1004
5296
5434
msgid "Cannot lock: transport is read only: %(transport)s"
5297
5435
msgstr ""
5298
5436
5299
#: bzrlib/errors.py:1002
5437
#: bzrlib/errors.py:1012
5300
5438
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5301
5439
msgstr ""
5302
5440
5303
#: bzrlib/errors.py:1013
5441
#: bzrlib/errors.py:1023
5304
5442
msgid ""
5305
5443
"Lock was broken while still open: %(lock)s - check storage consistency!"
5306
5444
msgstr ""
5307
5445
5308
#: bzrlib/errors.py:1024
5446
#: bzrlib/errors.py:1034
5309
5447
msgid ""
5310
5448
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5311
5449
"%(holder)r, wanted to break %(target)r"
5312
5450
msgstr ""
5313
5451
5314
#: bzrlib/errors.py:1036
5452
#: bzrlib/errors.py:1046
5315
5453
msgid ""
5316
5454
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5317
5455
"Use 'bzr break-lock' to clear it"
5318
5456
msgstr ""
5319
5457
5320
#: bzrlib/errors.py:1049
5458
#: bzrlib/errors.py:1059
5321
5459
msgid "Lock not held: %(lock)s"
5322
5460
msgstr ""
5323
5461
5324
#: bzrlib/errors.py:1078
5462
#: bzrlib/errors.py:1088
5325
5463
msgid "No changes to commit"
5326
5464
msgstr ""
5327
5465
5328
#: bzrlib/errors.py:1083
5466
#: bzrlib/errors.py:1093
5329
5467
msgid ""
5330
5468
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5331
5469
msgstr ""
5332
5470
5333
#: bzrlib/errors.py:1093
5471
#: bzrlib/errors.py:1103
5334
5472
msgid ""
5335
5473
"Excluding paths during commit is not supported by repository at "
5336
5474
"%(repository)r."
5337
5475
msgstr ""
5338
5476
5339
#: bzrlib/errors.py:1102
5477
#: bzrlib/errors.py:1112
5340
5478
msgid ""
5341
5479
"The specified commit message contains characters unsupported by the current "
5342
5480
"encoding."
5343
5481
msgstr ""
5344
5482
5345
#: bzrlib/errors.py:1108
5483
#: bzrlib/errors.py:1118
5346
5484
msgid "Upgrade URL cannot work with readonly URLs."
5347
5485
msgstr ""
5348
5486
5349
#: bzrlib/errors.py:1113
5487
#: bzrlib/errors.py:1123
5350
5488
msgid "The branch format %(format)s is already at the most recent format."
5351
5489
msgstr ""
5352
5490
5353
#: bzrlib/errors.py:1136
5491
#: bzrlib/errors.py:1146
5354
5492
msgid "Option --change does not accept revision ranges"
5355
5493
msgstr ""
5356
5494
5357
#: bzrlib/errors.py:1141
5495
#: bzrlib/errors.py:1151
5358
5496
msgid "No namespace registered for string: %(spec)r"
5359
5497
msgstr ""
5360
5498
5361
#: bzrlib/errors.py:1160
5499
#: bzrlib/errors.py:1170
5362
5500
msgid ""
5363
5501
"Requested revision: '%(spec)s' does not exist in branch: "
5364
5502
"%(branch_url)s%(extra)s"
5365
5503
msgstr ""
5366
5504
5367
#: bzrlib/errors.py:1174
5505
#: bzrlib/errors.py:1184
5368
5506
msgid ""
5369
5507
"Operation denied because it would change the main history, which is not "
5370
5508
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5371
5509
msgstr ""
5372
5510
5373
#: bzrlib/errors.py:1185
5511
#: bzrlib/errors.py:1195
5374
5512
msgid ""
5375
5513
"These branches have diverged. Use the missing command to see how.\n"
5376
5514
"Use the merge command to reconcile them."
5377
5515
msgstr ""
5378
5516
5379
#: bzrlib/errors.py:1205
5517
#: bzrlib/errors.py:1215
5380
5518
msgid ""
5381
5519
"Branches have no common ancestor, and no merge base revision was specified."
5382
5520
msgstr ""
5383
5521
5384
#: bzrlib/errors.py:1211
5522
#: bzrlib/errors.py:1221
5385
5523
msgid ""
5386
5524
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5387
5525
msgstr ""
5388
5526
5389
#: bzrlib/errors.py:1217
5527
#: bzrlib/errors.py:1227
5390
5528
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5391
5529
msgstr ""
5392
5530
5393
#: bzrlib/errors.py:1226
5531
#: bzrlib/errors.py:1236
5394
5532
msgid ""
5395
5533
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5396
5534
msgstr ""
5397
5535
5398
#: bzrlib/errors.py:1235
5536
#: bzrlib/errors.py:1245
5399
5537
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5400
5538
msgstr ""
5401
5539
5402
#: bzrlib/errors.py:1244
5540
#: bzrlib/errors.py:1254
5403
5541
msgid "Branch %(branch)s has no commits."
5404
5542
msgstr ""
5405
5543
5406
#: bzrlib/errors.py:1262
5544
#: bzrlib/errors.py:1272
5407
5545
msgid ""
5408
5546
"Bound branch %(branch)s is out of date with master branch "
5409
5547
"%(master)s.%(extra_help)s"
5410
5548
msgstr ""
5411
5549
5412
#: bzrlib/errors.py:1274
5550
#: bzrlib/errors.py:1284
5413
5551
msgid ""
5414
5552
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5415
5553
"bound to %(remote)s."
5416
5554
msgstr ""
5417
5555
5418
#: bzrlib/errors.py:1286
5556
#: bzrlib/errors.py:1296
5419
5557
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5420
5558
msgstr ""
5421
5559
5422
#: bzrlib/errors.py:1295
5560
#: bzrlib/errors.py:1305
5423
5561
msgid ""
5424
5562
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5425
5563
"%(error)s"
5426
5564
msgstr ""
5427
5565
5428
#: bzrlib/errors.py:1307
5566
#: bzrlib/errors.py:1317
5429
5567
msgid "Error in processing weave: %(msg)s"
5430
5568
msgstr ""
5431
5569
5432
#: bzrlib/errors.py:1316
5570
#: bzrlib/errors.py:1326
5433
5571
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5434
5572
msgstr ""
5435
5573
5436
#: bzrlib/errors.py:1327
5574
#: bzrlib/errors.py:1337
5437
5575
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5438
5576
msgstr ""
5439
5577
5440
#: bzrlib/errors.py:1337
5578
#: bzrlib/errors.py:1347
5441
5579
msgid "Weave invariant violated: %(what)s"
5442
5580
msgstr ""
5443
5581
5444
#: bzrlib/errors.py:1346
5582
#: bzrlib/errors.py:1356
5445
5583
msgid "Parents are mismatched between two revisions. %(msg)s"
5446
5584
msgstr ""
5447
5585
5448
#: bzrlib/errors.py:1368
5586
#: bzrlib/errors.py:1378
5449
5587
msgid ""
5450
5588
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5451
5589
"%(weave_b)s"
5452
5590
msgstr ""
5453
5591
5454
#: bzrlib/errors.py:1380
5592
#: bzrlib/errors.py:1390
5455
5593
msgid "Versioned file error"
5456
5594
msgstr ""
5457
5595
5458
#: bzrlib/errors.py:1385
5596
#: bzrlib/errors.py:1395
5459
5597
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5460
5598
msgstr ""
5461
5599
5462
#: bzrlib/errors.py:1395
5600
#: bzrlib/errors.py:1405
5463
5601
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5464
5602
msgstr ""
5465
5603
5466
#: bzrlib/errors.py:1405
5604
#: bzrlib/errors.py:1415
5467
5605
msgid "Text did not match its checksum: %(msg)s"
5468
5606
msgstr ""
5469
5607
5470
#: bzrlib/errors.py:1531
5608
#: bzrlib/errors.py:1541
5471
5609
msgid "Export format %(format)r not supported"
5472
5610
msgstr ""
5473
5611
5474
#: bzrlib/errors.py:1540
5612
#: bzrlib/errors.py:1550
5475
5613
msgid "Transport error: %(msg)s %(orig_error)s"
5476
5614
msgstr ""
5477
5615
5478
#: bzrlib/errors.py:1566
5616
#: bzrlib/errors.py:1576
5479
5617
msgid "Generic bzr smart protocol error: %(details)s"
5480
5618
msgstr ""
5481
5619
5482
#: bzrlib/errors.py:1574
5620
#: bzrlib/errors.py:1584
5483
5621
msgid "Received bad protocol version marker: %(marker)r"
5484
5622
msgstr ""
5485
5623
5486
#: bzrlib/errors.py:1606
5624
#: bzrlib/errors.py:1616
5487
5625
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5488
5626
msgstr ""
5489
5627
5490
#: bzrlib/errors.py:1611
5628
#: bzrlib/errors.py:1621
5491
5629
msgid "Connection error: %(msg)s %(orig_error)s"
5492
5630
msgstr ""
5493
5631
5494
#: bzrlib/errors.py:1616
5632
#: bzrlib/errors.py:1626
5495
5633
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5496
5634
msgstr ""
5497
5635
5498
#: bzrlib/errors.py:1637
5636
#: bzrlib/errors.py:1647
5499
5637
msgid "Connection closed: %(msg)s %(orig_error)s"
5500
5638
msgstr ""
5501
5639
5502
#: bzrlib/errors.py:1642
5640
#: bzrlib/errors.py:1652
5503
5641
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5504
5642
msgstr ""
5505
5643
5506
#: bzrlib/errors.py:1647
5644
#: bzrlib/errors.py:1657
5507
5645
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5508
5646
msgstr ""
5509
5647
5510
#: bzrlib/errors.py:1657
5648
#: bzrlib/errors.py:1667
5511
5649
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5512
5650
msgstr ""
5513
5651
5514
#: bzrlib/errors.py:1672
5652
#: bzrlib/errors.py:1682
5653
msgid "Certificate error: %(error)s"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:1690
5515
5657
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5516
5658
msgstr ""
5517
5659
5518
#: bzrlib/errors.py:1686
5660
#: bzrlib/errors.py:1704
5519
5661
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5520
5662
msgstr ""
5521
5663
5522
#: bzrlib/errors.py:1694
5664
#: bzrlib/errors.py:1712
5523
5665
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5524
5666
msgstr ""
5525
5667
5526
#: bzrlib/errors.py:1703
5668
#: bzrlib/errors.py:1721
5527
5669
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5528
5670
msgstr ""
5529
5671
5530
#: bzrlib/errors.py:1717
5672
#: bzrlib/errors.py:1735
5531
5673
msgid "Too many redirections"
5532
5674
msgstr ""
5533
5675
5534
#: bzrlib/errors.py:1722
5676
#: bzrlib/errors.py:1740
5535
5677
msgid "Working tree has conflicts."
5536
5678
msgstr ""
5537
5679
5538
#: bzrlib/errors.py:1726
5680
#: bzrlib/errors.py:1744
5539
5681
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5540
5682
msgstr ""
5541
5683
5542
#: bzrlib/errors.py:1735
5684
#: bzrlib/errors.py:1753
5543
5685
msgid ""
5544
5686
"Error(s) parsing config file %(filename)s:\n"
5545
5687
"%(errors)s"
5546
5688
msgstr ""
5547
5689
5548
#: bzrlib/errors.py:1746
5549
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5690
#: bzrlib/errors.py:1763
5691
msgid ""
5692
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5693
"See ``bzr help %(name)s``"
5550
5694
msgstr ""
5551
5695
5552
#: bzrlib/errors.py:1754
5696
#: bzrlib/errors.py:1773
5553
5697
msgid "%(username)r does not seem to contain a reasonable email address"
5554
5698
msgstr ""
5555
5699
5556
#: bzrlib/errors.py:1763
5700
#: bzrlib/errors.py:1782
5557
5701
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5558
5702
msgstr ""
5559
5703
5560
#: bzrlib/errors.py:1771
5704
#: bzrlib/errors.py:1790
5561
5705
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5562
5706
msgstr ""
5563
5707
5564
#: bzrlib/errors.py:1779
5708
#: bzrlib/errors.py:1798
5565
5709
msgid "Unable to import library \"%(library)s\": %(error)s"
5566
5710
msgstr ""
5567
5711
5568
#: bzrlib/errors.py:1787
5712
#: bzrlib/errors.py:1806
5569
5713
msgid "python-gpgme is not installed, it is needed to verify signatures"
5570
5714
msgstr ""
5571
5715
5572
#: bzrlib/errors.py:1795
5716
#: bzrlib/errors.py:1814
5573
5717
msgid ""
5574
5718
"The working tree for %(basedir)s has changed since the last commit, but "
5575
5719
"weave merge requires that it be unchanged"
5576
5720
msgstr ""
5577
5721
5578
#: bzrlib/errors.py:1805
5722
#: bzrlib/errors.py:1824
5579
5723
msgid ""
5580
5724
"Can't reprocess and show base, because reprocessing obscures the "
5581
5725
"relationship of conflicting lines to the base"
5582
5726
msgstr ""
5583
5727
5584
#: bzrlib/errors.py:1811
5728
#: bzrlib/errors.py:1830
5585
5729
msgid "Cycle in graph %(graph)r"
5586
5730
msgstr ""
5587
5731
5588
#: bzrlib/errors.py:1839
5732
#: bzrlib/errors.py:1858
5589
5733
msgid "File %(filename)s is not conflicted."
5590
5734
msgstr ""
5591
5735
5592
#: bzrlib/errors.py:1861
5736
#: bzrlib/errors.py:1880
5593
5737
msgid "No bundle was found in \"%(filename)s\"."
5594
5738
msgstr ""
5595
5739
5596
#: bzrlib/errors.py:1870
5740
#: bzrlib/errors.py:1889
5597
5741
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5598
5742
msgstr ""
5599
5743
5600
#: bzrlib/errors.py:1880
5744
#: bzrlib/errors.py:1899
5601
5745
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5602
5746
msgstr ""
5603
5747
5604
#: bzrlib/errors.py:1893
5748
#: bzrlib/errors.py:1912
5605
5749
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5606
5750
msgstr ""
5607
5751
5608
#: bzrlib/errors.py:1903
5752
#: bzrlib/errors.py:1922
5609
5753
msgid "Key %(key)s is already present in map"
5610
5754
msgstr ""
5611
5755
5612
#: bzrlib/errors.py:1908
5756
#: bzrlib/errors.py:1927
5613
5757
msgid "The prefix %(prefix)s is in the help search path twice."
5614
5758
msgstr ""
5615
5759
5616
#: bzrlib/errors.py:1918
5760
#: bzrlib/errors.py:1937
5617
5761
msgid ""
5618
5762
"No final name for trans_id %(trans_id)r\n"
5619
5763
"file-id: %(file_id)r\n"
5620
5764
"root trans-id: %(root_trans_id)r\n"
5621
5765
msgstr ""
5622
5766
5623
#: bzrlib/errors.py:1950
5767
#: bzrlib/errors.py:1969
5624
5768
msgid "Attempt to reuse a transform that has already been applied."
5625
5769
msgstr ""
5626
5770
5627
#: bzrlib/errors.py:1955
5771
#: bzrlib/errors.py:1974
5628
5772
msgid "Moving the root directory is not supported at this time"
5629
5773
msgstr ""
5630
5774
5631
#: bzrlib/errors.py:1960
5775
#: bzrlib/errors.py:1979
5632
5776
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5633
5777
msgstr ""
5634
5778
5635
#: bzrlib/errors.py:1971
5779
#: bzrlib/errors.py:1990
5636
5780
msgid ""
5637
5781
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5638
5782
msgstr ""
5639
5783
5640
#: bzrlib/errors.py:2007
5784
#: bzrlib/errors.py:2026
5641
5785
msgid ""
5642
5786
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5643
5787
msgstr ""
5644
5788
5645
#: bzrlib/errors.py:2037
5789
#: bzrlib/errors.py:2056
5646
5790
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5647
5791
msgstr ""
5648
5792
5649
#: bzrlib/errors.py:2045
5793
#: bzrlib/errors.py:2064
5650
5794
msgid "Nothing to merge."
5651
5795
msgstr ""
5652
5796
5653
#: bzrlib/errors.py:2050
5797
#: bzrlib/errors.py:2069
5654
5798
msgid "Format %(format)s cannot be initialised by this version of bzr."
5655
5799
msgstr ""
5656
5800
5657
#: bzrlib/errors.py:2059
5801
#: bzrlib/errors.py:2078
5658
5802
msgid ""
5659
5803
"Cannot convert from format %(from_format)s to format %(format)s. "
5660
5804
"%(problem)s"
5661
5805
msgstr ""
5662
5806
5663
#: bzrlib/errors.py:2071
5807
#: bzrlib/errors.py:2090
5664
5808
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5665
5809
msgstr ""
5666
5810
5667
#: bzrlib/errors.py:2079
5811
#: bzrlib/errors.py:2098
5668
5812
msgid "%(exe_name)s could not be found on this machine"
5669
5813
msgstr ""
5670
5814
5671
#: bzrlib/errors.py:2087
5815
#: bzrlib/errors.py:2106
5672
5816
msgid "Diff is not installed on this machine: %(msg)s"
5673
5817
msgstr ""
5674
5818
5675
#: bzrlib/errors.py:2095
5819
#: bzrlib/errors.py:2114
5676
5820
msgid "Diff3 is not installed on this machine."
5677
5821
msgstr ""
5678
5822
5679
#: bzrlib/errors.py:2101
5823
#: bzrlib/errors.py:2120
5680
5824
msgid "The content being inserted is already present."
5681
5825
msgstr ""
5682
5826
5683
#: bzrlib/errors.py:2106
5827
#: bzrlib/errors.py:2125
5684
5828
msgid ""
5685
5829
"This tree contains left-over files from a failed operation.\n"
5686
5830
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5688
5832
" keep, and delete it when you are done."
5689
5833
msgstr ""
5690
5834
5691
#: bzrlib/errors.py:2117
5835
#: bzrlib/errors.py:2136
5692
5836
msgid ""
5693
5837
"This tree contains left-over files from a failed operation.\n"
5694
5838
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5695
5839
" wish to keep, and delete it when you are done."
5696
5840
msgstr ""
5697
5841
5698
#: bzrlib/errors.py:2127
5842
#: bzrlib/errors.py:2146
5699
5843
msgid ""
5700
5844
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5701
5845
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5703
5847
" keep, and delete it when you are done."
5704
5848
msgstr ""
5705
5849
5706
#: bzrlib/errors.py:2138
5850
#: bzrlib/errors.py:2157
5707
5851
msgid ""
5708
5852
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5709
5853
"examine %(pending_deletion)s to see if it contains any files you wish to "
5710
5854
"keep, and delete it when you are done."
5711
5855
msgstr ""
5712
5856
5713
#: bzrlib/errors.py:2148
5857
#: bzrlib/errors.py:2167
5714
5858
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5715
5859
msgstr ""
5716
5860
5717
#: bzrlib/errors.py:2162
5861
#: bzrlib/errors.py:2181
5718
5862
msgid ""
5719
5863
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5720
5864
msgstr ""
5721
5865
5722
#: bzrlib/errors.py:2175
5866
#: bzrlib/errors.py:2194
5723
5867
msgid "Error in merge modified format"
5724
5868
msgstr ""
5725
5869
5726
#: bzrlib/errors.py:2180
5870
#: bzrlib/errors.py:2199
5727
5871
msgid "Format error in conflict listings"
5728
5872
msgstr ""
5729
5873
5730
#: bzrlib/errors.py:2184
5874
#: bzrlib/errors.py:2203
5731
5875
msgid ""
5732
5876
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5733
5877
"Error: %(description)s"
5734
5878
msgstr ""
5735
5879
5736
#: bzrlib/errors.py:2195
5880
#: bzrlib/errors.py:2214
5737
5881
msgid ""
5738
5882
"An error has been detected in the repository %(repo_path)s.\n"
5739
5883
"Please run bzr reconcile on this repository."
5740
5884
msgstr ""
5741
5885
5742
#: bzrlib/errors.py:2206
5886
#: bzrlib/errors.py:2225
5743
5887
msgid ""
5744
5888
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5745
5889
"reason: %(reason)s"
5746
5890
msgstr ""
5747
5891
5748
#: bzrlib/errors.py:2219
5892
#: bzrlib/errors.py:2238
5749
5893
msgid ""
5750
5894
"An inconsistent delta was supplied: %(delta)r\n"
5751
5895
"reason: %(reason)s"
5752
5896
msgstr ""
5753
5897
5754
#: bzrlib/errors.py:2231
5898
#: bzrlib/errors.py:2250
5755
5899
msgid "To use this feature you must upgrade your branch at %(path)s."
5756
5900
msgstr ""
5757
5901
5758
#: bzrlib/errors.py:2240
5902
#: bzrlib/errors.py:2259
5759
5903
msgid "To use this feature you must upgrade your repository at %(path)s."
5760
5904
msgstr ""
5761
5905
5762
#: bzrlib/errors.py:2245
5906
#: bzrlib/errors.py:2264
5763
5907
msgid ""
5764
5908
"To use this feature you must upgrade your branch at %(path)s to a format "
5765
5909
"which supports rich roots."
5766
5910
msgstr ""
5767
5911
5768
#: bzrlib/errors.py:2251
5912
#: bzrlib/errors.py:2270
5769
5913
msgid "Cannot perform local-only commits on unbound branches."
5770
5914
msgstr ""
5771
5915
5772
#: bzrlib/errors.py:2256
5916
#: bzrlib/errors.py:2275
5773
5917
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5774
5918
msgstr ""
5775
5919
5776
#: bzrlib/errors.py:2277
5920
#: bzrlib/errors.py:2296
5777
5921
msgid "Ghost tags not supported by format %(format)r."
5778
5922
msgstr ""
5779
5923
5780
#: bzrlib/errors.py:2285
5924
#: bzrlib/errors.py:2304
5781
5925
msgid "File is binary but should be text."
5782
5926
msgstr ""
5783
5927
5784
#: bzrlib/errors.py:2290
5928
#: bzrlib/errors.py:2309
5785
5929
msgid "The path %(path)s is not permitted on this platform"
5786
5930
msgstr ""
5787
5931
5788
#: bzrlib/errors.py:2299
5932
#: bzrlib/errors.py:2318
5789
5933
msgid ""
5790
5934
"Testament did not match expected value.\n"
5791
5935
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5792
5936
" {%(measured)s}"
5793
5937
msgstr ""
5794
5938
5795
#: bzrlib/errors.py:2311
5939
#: bzrlib/errors.py:2330
5796
5940
msgid "Not a bzr revision-bundle: %(text)r"
5797
5941
msgstr ""
5798
5942
5799
#: bzrlib/errors.py:2320
5943
#: bzrlib/errors.py:2339
5800
5944
msgid "Bad bzr revision-bundle: %(text)r"
5801
5945
msgstr ""
5802
5946
5803
#: bzrlib/errors.py:2329
5947
#: bzrlib/errors.py:2348
5804
5948
msgid "Malformed bzr revision-bundle header: %(text)r"
5805
5949
msgstr ""
5806
5950
5807
#: bzrlib/errors.py:2334
5951
#: bzrlib/errors.py:2353
5808
5952
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5809
5953
msgstr ""
5810
5954
5811
#: bzrlib/errors.py:2339
5955
#: bzrlib/errors.py:2358
5812
5956
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5813
5957
msgstr ""
5814
5958
5815
#: bzrlib/errors.py:2344
5959
#: bzrlib/errors.py:2363
5816
5960
msgid "End of line marker was not \\n in bzr revision-bundle"
5817
5961
msgstr ""
5818
5962
5819
#: bzrlib/errors.py:2354
5963
#: bzrlib/errors.py:2373
5820
5964
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5821
5965
msgstr ""
5822
5966
5823
#: bzrlib/errors.py:2364
5967
#: bzrlib/errors.py:2383
5824
5968
msgid "Root class for inventory serialization errors"
5825
5969
msgstr ""
5826
5970
5827
#: bzrlib/errors.py:2368
5971
#: bzrlib/errors.py:2387
5828
5972
msgid ""
5829
5973
"The inventory was not in the expected format:\n"
5830
5974
" %(msg)s"
5831
5975
msgstr ""
5832
5976
5833
#: bzrlib/errors.py:2377
5977
#: bzrlib/errors.py:2396
5834
5978
msgid "This operation requires rich root data storage"
5835
5979
msgstr ""
5836
5980
5837
#: bzrlib/errors.py:2390
5981
#: bzrlib/errors.py:2409
5838
5982
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5839
5983
msgstr ""
5840
5984
5841
#: bzrlib/errors.py:2399
5985
#: bzrlib/errors.py:2418
5842
5986
msgid ""
5843
5987
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5844
5988
"variable."
5845
5989
msgstr ""
5846
5990
5847
#: bzrlib/errors.py:2406
5991
#: bzrlib/errors.py:2425
5848
5992
msgid ""
5849
5993
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5850
5994
"ghost at {%(ghost_revision_id)s}"
5851
5995
msgstr ""
5852
5996
5853
#: bzrlib/errors.py:2416
5997
#: bzrlib/errors.py:2435
5854
5998
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5855
5999
msgstr ""
5856
6000
5857
#: bzrlib/errors.py:2467
6001
#: bzrlib/errors.py:2486
5858
6002
msgid ""
5859
6003
"A merge directive must provide either a bundle or a public branch location."
5860
6004
msgstr ""
5861
6005
5862
#: bzrlib/errors.py:2474
6006
#: bzrlib/errors.py:2493
5863
6007
msgid "Bad merge directive payload %(start)r"
5864
6008
msgstr ""
5865
6009
5866
#: bzrlib/errors.py:2484
6010
#: bzrlib/errors.py:2503
5867
6011
msgid "Preview patch does not match requested changes."
5868
6012
msgstr ""
5869
6013
5870
#: bzrlib/errors.py:2490
6014
#: bzrlib/errors.py:2509
5871
6015
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5872
6016
msgstr ""
5873
6017
5874
#: bzrlib/errors.py:2500
6018
#: bzrlib/errors.py:2519
5875
6019
msgid ""
5876
6020
"Your branch does not have all of the revisions required in order to merge "
5877
6021
"this merge directive and the target location specified in the merge "
5878
6022
"directive is not a branch: %(location)s."
5879
6023
msgstr ""
5880
6024
5881
#: bzrlib/errors.py:2512
6025
#: bzrlib/errors.py:2531
5882
6026
msgid "Unsupported entry kind %(kind)s"
5883
6027
msgstr ""
5884
6028
5885
#: bzrlib/errors.py:2520
6029
#: bzrlib/errors.py:2539
5886
6030
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5887
6031
msgstr ""
5888
6032
5889
#: bzrlib/errors.py:2530
6033
#: bzrlib/errors.py:2549
5890
6034
msgid "Subsume target %(other_tree)s needs to be upgraded."
5891
6035
msgstr ""
5892
6036
5893
#: bzrlib/errors.py:2549
6037
#: bzrlib/errors.py:2568
5894
6038
msgid "No such tag: %(tag_name)s"
5895
6039
msgstr ""
5896
6040
5897
#: bzrlib/errors.py:2557
6041
#: bzrlib/errors.py:2576
5898
6042
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5899
6043
msgstr ""
5900
6044
5901
#: bzrlib/errors.py:2566
6045
#: bzrlib/errors.py:2585
5902
6046
msgid "Tag %(tag_name)s already exists."
5903
6047
msgstr ""
5904
6048
5905
#: bzrlib/errors.py:2574
6049
#: bzrlib/errors.py:2593
5906
6050
msgid ""
5907
6051
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5908
6052
"bugs\" for more information on this feature."
5909
6053
msgstr ""
5910
6054
5911
#: bzrlib/errors.py:2584
6055
#: bzrlib/errors.py:2603
5912
6056
msgid ""
5913
6057
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5914
6058
msgstr ""
5915
6059
5916
#: bzrlib/errors.py:2594
6060
#: bzrlib/errors.py:2613
5917
6061
msgid ""
5918
6062
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5919
6063
msgstr ""
5920
6064
5921
#: bzrlib/errors.py:2604
6065
#: bzrlib/errors.py:2623
5922
6066
msgid "Invalid line in bugs property: '%(line)s'"
5923
6067
msgstr ""
5924
6068
5925
#: bzrlib/errors.py:2612
6069
#: bzrlib/errors.py:2631
5926
6070
msgid "Invalid bug status: '%(status)s'"
5927
6071
msgstr ""
5928
6072
5929
#: bzrlib/errors.py:2620
6073
#: bzrlib/errors.py:2639
5930
6074
msgid "Could not understand response from smart server: %(response_tuple)r"
5931
6075
msgstr ""
5932
6076
5933
#: bzrlib/errors.py:2659
6077
#: bzrlib/errors.py:2678
5934
6078
msgid "Server sent an unexpected error: %(error_tuple)r"
5935
6079
msgstr ""
5936
6080
5937
#: bzrlib/errors.py:2678
6081
#: bzrlib/errors.py:2697
5938
6082
msgid "Unrecognised container format: %(container_format)r"
5939
6083
msgstr ""
5940
6084
5941
#: bzrlib/errors.py:2686
6085
#: bzrlib/errors.py:2705
5942
6086
msgid "Unexpected end of container stream"
5943
6087
msgstr ""
5944
6088
5945
#: bzrlib/errors.py:2691
6089
#: bzrlib/errors.py:2710
5946
6090
msgid "Unknown record type: %(record_type)r"
5947
6091
msgstr ""
5948
6092
5949
#: bzrlib/errors.py:2699
6093
#: bzrlib/errors.py:2718
5950
6094
msgid "Invalid record: %(reason)s"
5951
6095
msgstr ""
5952
6096
5953
#: bzrlib/errors.py:2707
6097
#: bzrlib/errors.py:2726
5954
6098
msgid "Container has data after end marker: %(excess)r"
5955
6099
msgstr ""
5956
6100
5957
#: bzrlib/errors.py:2715
6101
#: bzrlib/errors.py:2734
5958
6102
msgid "Container has multiple records with the same name: %(name)s"
5959
6103
msgstr ""
5960
6104
5961
#: bzrlib/errors.py:2728
6105
#: bzrlib/errors.py:2747
5962
6106
msgid "Corrupt or incompatible data stream: %(reason)s"
5963
6107
msgstr ""
5964
6108
5965
#: bzrlib/errors.py:2736
6109
#: bzrlib/errors.py:2755
5966
6110
msgid "SMTP error: %(error)s"
5967
6111
msgstr ""
5968
6112
5969
#: bzrlib/errors.py:2744
6113
#: bzrlib/errors.py:2763
5970
6114
msgid "No message supplied."
5971
6115
msgstr ""
5972
6116
5973
#: bzrlib/errors.py:2749
6117
#: bzrlib/errors.py:2768
5974
6118
msgid "No mail-to address (--mail-to) or output (-o) specified."
5975
6119
msgstr ""
5976
6120
5977
#: bzrlib/errors.py:2754
6121
#: bzrlib/errors.py:2773
5978
6122
msgid "Unknown mail client: %(mail_client)s"
5979
6123
msgstr ""
5980
6124
5981
#: bzrlib/errors.py:2762
6125
#: bzrlib/errors.py:2781
5982
6126
msgid ""
5983
6127
"Unable to find mail client with the following names: "
5984
6128
"%(mail_command_list_string)s"
5985
6129
msgstr ""
5986
6130
5987
#: bzrlib/errors.py:2772
6131
#: bzrlib/errors.py:2791
5988
6132
msgid "SMTP connection to %(host)s refused"
5989
6133
msgstr ""
5990
6134
5991
#: bzrlib/errors.py:2781
6135
#: bzrlib/errors.py:2800
5992
6136
msgid "Please specify smtp_server. No server at default %(host)s."
5993
6137
msgstr ""
5994
6138
5995
#: bzrlib/errors.py:2795
6139
#: bzrlib/errors.py:2814
5996
6140
msgid ""
5997
6141
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5998
6142
"reconfigure."
5999
6143
msgstr ""
6000
6144
6001
#: bzrlib/errors.py:2807
6145
#: bzrlib/errors.py:2826
6002
6146
msgid "'%(display_url)s' is already a branch."
6003
6147
msgstr ""
6004
6148
6005
#: bzrlib/errors.py:2812
6149
#: bzrlib/errors.py:2831
6006
6150
msgid "'%(display_url)s' is already a tree."
6007
6151
msgstr ""
6008
6152
6009
#: bzrlib/errors.py:2817
6153
#: bzrlib/errors.py:2836
6010
6154
msgid "'%(display_url)s' is already a checkout."
6011
6155
msgstr ""
6012
6156
6013
#: bzrlib/errors.py:2822
6157
#: bzrlib/errors.py:2841
6014
6158
msgid "'%(display_url)s' is already a lightweight checkout."
6015
6159
msgstr ""
6016
6160
6017
#: bzrlib/errors.py:2827
6161
#: bzrlib/errors.py:2846
6018
6162
msgid "'%(display_url)s' is already using a shared repository."
6019
6163
msgstr ""
6020
6164
6021
#: bzrlib/errors.py:2832
6165
#: bzrlib/errors.py:2851
6022
6166
msgid "'%(display_url)s' is already standalone."
6023
6167
msgstr ""
6024
6168
6025
#: bzrlib/errors.py:2837
6169
#: bzrlib/errors.py:2856
6026
6170
msgid "Shared repository '%(display_url)s' already creates working trees."
6027
6171
msgstr ""
6028
6172
6029
#: bzrlib/errors.py:2843
6173
#: bzrlib/errors.py:2862
6030
6174
msgid ""
6031
6175
"Shared repository '%(display_url)s' already doesn't create working trees."
6032
6176
msgstr ""
6033
6177
6034
#: bzrlib/errors.py:2849
6178
#: bzrlib/errors.py:2868
6035
6179
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6036
6180
msgstr ""
6037
6181
6038
#: bzrlib/errors.py:2854
6182
#: bzrlib/errors.py:2873
6039
6183
msgid "No location could be found to bind to at %(display_url)s."
6040
6184
msgstr ""
6041
6185
6042
#: bzrlib/errors.py:2859
6186
#: bzrlib/errors.py:2878
6043
6187
msgid ""
6044
6188
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6045
6189
"status).%(more)s"
6046
6190
msgstr ""
6047
6191
6048
#: bzrlib/errors.py:2878
6192
#: bzrlib/errors.py:2897
6049
6193
msgid ""
6050
6194
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6051
6195
"list).%(more)s"
6052
6196
msgstr ""
6053
6197
6054
#: bzrlib/errors.py:2884
6198
#: bzrlib/errors.py:2903
6055
6199
msgid "Variable {%(name)s} is not available."
6056
6200
msgstr ""
6057
6201
6058
#: bzrlib/errors.py:2892
6202
#: bzrlib/errors.py:2911
6059
6203
msgid "No template specified."
6060
6204
msgstr ""
6061
6205
6062
#: bzrlib/errors.py:2897
6206
#: bzrlib/errors.py:2916
6063
6207
msgid "Unable to create symlink %(path_str)son this platform"
6064
6208
msgstr ""
6065
6209
6066
#: bzrlib/errors.py:2912
6210
#: bzrlib/errors.py:2931
6067
6211
msgid ""
6068
6212
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6069
6213
"\"original\", \"local\"."
6070
6214
msgstr ""
6071
6215
6072
#: bzrlib/errors.py:2946
6216
#: bzrlib/errors.py:2965
6073
6217
msgid ""
6074
6218
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6075
6219
msgstr ""
6076
6220
6077
#: bzrlib/errors.py:2958
6221
#: bzrlib/errors.py:2977
6078
6222
msgid "The \"%(config_id)s\" configuration does not exist."
6079
6223
msgstr ""
6080
6224
6081
#: bzrlib/errors.py:2966
6225
#: bzrlib/errors.py:2985
6082
6226
msgid "The \"%(option_name)s\" configuration option does not exist."
6083
6227
msgstr ""
6084
6228
6085
#: bzrlib/errors.py:2974
6229
#: bzrlib/errors.py:2993
6086
6230
msgid "The alias \"%(alias_name)s\" does not exist."
6087
6231
msgstr ""
6088
6232
6089
#: bzrlib/errors.py:2988
6233
#: bzrlib/errors.py:3007
6090
6234
msgid "\"%(alias_name)s\" is not a valid location alias."
6091
6235
msgstr ""
6092
6236
6093
#: bzrlib/errors.py:2996
6237
#: bzrlib/errors.py:3015
6094
6238
msgid "No %(alias_name)s location assigned."
6095
6239
msgstr ""
6096
6240
6097
#: bzrlib/errors.py:3004
6241
#: bzrlib/errors.py:3023
6098
6242
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6099
6243
msgstr ""
6100
6244
6101
#: bzrlib/errors.py:3014
6245
#: bzrlib/errors.py:3033
6102
6246
msgid "Unknown rules detected: %(unknowns_str)s."
6103
6247
msgstr ""
6104
6248
6105
#: bzrlib/errors.py:3025
6249
#: bzrlib/errors.py:3044
6106
6250
msgid "Tip change rejected: %(msg)s"
6107
6251
msgstr ""
6108
6252
6109
#: bzrlib/errors.py:3033
6253
#: bzrlib/errors.py:3052
6110
6254
msgid "Shelf corrupt."
6111
6255
msgstr ""
6112
6256
6113
#: bzrlib/errors.py:3038
6257
#: bzrlib/errors.py:3057
6114
6258
msgid "Corruption while decompressing repository file%(orig_error)s"
6115
6259
msgstr ""
6116
6260
6117
#: bzrlib/errors.py:3050
6261
#: bzrlib/errors.py:3069
6118
6262
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6119
6263
msgstr ""
6120
6264
6121
#: bzrlib/errors.py:3058
6265
#: bzrlib/errors.py:3077
6122
6266
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6123
6267
msgstr ""
6124
6268
6125
#: bzrlib/errors.py:3066
6269
#: bzrlib/errors.py:3085
6126
6270
msgid ""
6127
6271
"An attempt to access a url outside the server jail was made: '%(url)s'."
6128
6272
msgstr ""
6129
6273
6130
#: bzrlib/errors.py:3074
6274
#: bzrlib/errors.py:3093
6131
6275
msgid "The user aborted the operation."
6132
6276
msgstr ""
6133
6277
6134
#: bzrlib/errors.py:3079
6278
#: bzrlib/errors.py:3098
6135
6279
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6136
6280
msgstr ""
6137
6281
6138
#: bzrlib/errors.py:3089
6282
#: bzrlib/errors.py:3108
6139
6283
msgid "No such view: %(view_name)s."
6140
6284
msgstr ""
6141
6285
6142
#: bzrlib/errors.py:3099
6286
#: bzrlib/errors.py:3118
6143
6287
msgid ""
6144
6288
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6145
6289
"to a later format."
6146
6290
msgstr ""
6147
6291
6148
#: bzrlib/errors.py:3108
6292
#: bzrlib/errors.py:3127
6149
6293
msgid ""
6150
6294
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6151
6295
msgstr ""
6152
6296
6153
#: bzrlib/errors.py:3175
6297
#: bzrlib/errors.py:3194
6154
6298
msgid "%(bzrdir)r does not support co-located branches."
6155
6299
msgstr ""
6156
6300
6157
#: bzrlib/errors.py:3181
6301
#: bzrlib/errors.py:3200
6158
6302
msgid ""
6159
6303
"Unable to determine your name.\n"
6160
6304
"Please, set your name with the 'whoami' command.\n"
6161
6305
"E.g. bzr whoami \"Your Name <name@example.com>\""
6162
6306
msgstr ""
6163
6307
6164
#: bzrlib/errors.py:3190
6308
#: bzrlib/errors.py:3209
6165
6309
msgid "Invalid pattern(s) found. %(msg)s"
6166
6310
msgstr ""
6167
6311
6168
#: bzrlib/errors.py:3198
6312
#: bzrlib/errors.py:3217
6169
6313
msgid ""
6170
6314
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6171
6315
"unbind` to fix."
6172
6316
msgstr ""
6173
6317
6174
#: bzrlib/errors.py:3209
6318
#: bzrlib/errors.py:3228
6175
6319
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6176
6320
msgstr ""
6177
6321
6178
#: bzrlib/errors.py:3218
6322
#: bzrlib/errors.py:3237
6179
6323
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6180
6324
msgstr ""
6181
6325
6182
#: bzrlib/errors.py:3227
6326
#: bzrlib/errors.py:3246
6183
6327
msgid ""
6184
6328
"No compatible object available for operations from %(source)r to %(target)r."
6185
6329
msgstr ""
6186
6330
6187
#: bzrlib/errors.py:3237
6331
#: bzrlib/errors.py:3256
6188
6332
msgid ""
6189
6333
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6190
6334
"%(arguments)s."
6191
6335
msgstr ""
6192
6336
6193
#: bzrlib/errors.py:3247
6337
#: bzrlib/errors.py:3266
6194
6338
msgid ""
6195
6339
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6196
6340
"format %(format)r"
6197
6341
msgstr ""
6198
6342
6199
#: bzrlib/errors.py:3259
6343
#: bzrlib/errors.py:3278
6200
6344
msgid ""
6201
6345
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6202
6346
"plugin."
6203
6347
msgstr ""
6204
6348
6205
#: bzrlib/errors.py:3272
6349
#: bzrlib/errors.py:3291
6206
6350
msgid "Binary files section encountered."
6207
6351
msgstr ""
6208
6352
6209
#: bzrlib/errors.py:3280
6353
#: bzrlib/errors.py:3299
6210
6354
msgid ""
6211
6355
"Malformed patch header. %(desc)s\n"
6212
6356
"%(line)r"
6213
6357
msgstr ""
6214
6358
6215
#: bzrlib/errors.py:3289
6359
#: bzrlib/errors.py:3308
6216
6360
msgid ""
6217
6361
"Malformed hunk header. %(desc)s\n"
6218
6362
"%(line)r"
6219
6363
msgstr ""
6220
6364
6221
#: bzrlib/errors.py:3298
6365
#: bzrlib/errors.py:3317
6222
6366
msgid ""
6223
6367
"Malformed line. %(desc)s\n"
6224
6368
"%(line)r"
6225
6369
msgstr ""
6226
6370
6227
#: bzrlib/errors.py:3308
6371
#: bzrlib/errors.py:3327
6228
6372
msgid ""
6229
6373
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6230
6374
"but patch says it should be \"%(patch_line)s\""
6231
6375
msgstr ""
6232
6376
6233
#: bzrlib/errors.py:3319
6377
#: bzrlib/errors.py:3338
6234
6378
msgid "The feature %(feature)s has already been registered."
6235
6379
msgstr ""
6236
6380
6346
6490
#: bzrlib/hooks.py:331
6347
6491
#, python-format
6348
6492
msgid "Introduced in: %s"
6349
msgstr ""
6493
msgstr "Introduzido em: %s"
6350
6494
6351
6495
#: bzrlib/hooks.py:334
6352
6496
#, python-format
6560
6704
msgid "lstat/stat of ({0!r}): {1!r}"
6561
6705
msgstr ""
6562
6706
6563
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6707
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6564
6708
#, python-format
6565
6709
msgid "sorry, %r not allowed in path"
6566
6710
msgstr ""
6567
6711
6568
#: bzrlib/osutils.py:1226
6712
#: bzrlib/osutils.py:1237
6569
6713
#, python-format
6570
6714
msgid "%r is too short to calculate a relative path"
6571
6715
msgstr ""
6708
6852
":Examples:\n"
6709
6853
" Show the Launchpad ID of the current user::"
6710
6854
msgstr ""
6855
":Exemplos:\n"
6856
" Mostra o ID do launchpad do usuário atual::"
6711
6857
6712
6858
#: bzrlib/plugins/launchpad/__init__.py:250
6713
6859
msgid " bzr launchpad-login"
6714
msgstr ""
6860
msgstr " bzr launchpad-login"
6715
6861
6716
6862
#: bzrlib/plugins/launchpad/__init__.py:252
6717
6863
msgid " Set the Launchpad ID of the current user to 'bob'::"
6718
msgstr ""
6864
msgstr " Define um ID do launchpad para o usuário 'bob'::"
6719
6865
6720
6866
#: bzrlib/plugins/launchpad/__init__.py:254
6721
6867
msgid " bzr launchpad-login bob"
6722
msgstr ""
6868
msgstr " bzr launchpad-login bob"
6723
6869
6724
6870
#: bzrlib/plugins/launchpad/__init__.py:261
6725
6871
msgid "Don't check that the user name is valid."
6726
msgstr ""
6872
msgstr "Não verifique se o nome de usuário é válido."
6727
6873
6728
6874
#: bzrlib/plugins/launchpad/__init__.py:276
6729
6875
#: bzrlib/plugins/launchpad/__init__.py:287
6732
6878
6733
6879
#: bzrlib/plugins/launchpad/__init__.py:279
6734
6880
msgid "No Launchpad user ID configured.\n"
6735
msgstr ""
6881
msgstr "Nenhum ID de usuário launchpad configurado.\n"
6736
6882
6737
6883
#: bzrlib/plugins/launchpad/__init__.py:290
6738
6884
#, python-format
6739
6885
msgid "Launchpad user ID set to '%s'.\n"
6740
msgstr ""
6886
msgstr "ID de usuário launchpad definido como '%s'.\n"
6741
6887
6742
6888
#: bzrlib/plugins/launchpad/__init__.py:298
6743
6889
msgid "Ask Launchpad to mirror a branch now."
6770
6916
6771
6917
#: bzrlib/plugins/launchpad/__init__.py:332
6772
6918
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6773
msgstr ""
6919
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
6774
6920
6775
6921
#: bzrlib/plugins/launchpad/__init__.py:334
6776
6922
msgid ""
7009
7155
msgid "Created new branch."
7010
7156
msgstr ""
7011
7157
7012
#: bzrlib/push.py:98
7158
#: bzrlib/push.py:97
7013
7159
#, python-format
7014
7160
msgid ""
7015
7161
"Target directory %s already contains a .bzr directory, but it is not valid."
7136
7282
msgid "%s is now not stacked\n"
7137
7283
msgstr ""
7138
7284
7139
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7285
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7140
7286
#, python-format
7141
7287
msgid "bzr: ERROR (ignored): %s"
7142
7288
msgstr ""
7143
7289
7144
#: bzrlib/remote.py:2493
7290
#: bzrlib/remote.py:2541
7145
7291
msgid "Copying repository content as tarball..."
7146
7292
msgstr ""
7147
7293
7356
7502
msgid "listening on port: %s"
7357
7503
msgstr ""
7358
7504
7359
#: bzrlib/switch.py:69
7505
#: bzrlib/switch.py:73
7360
7506
msgid "Pending merges must be committed or reverted before using switch."
7361
7507
msgstr ""
7362
7508
7363
#: bzrlib/switch.py:96
7509
#: bzrlib/switch.py:100
7364
7510
msgid ""
7365
7511
"Cannot switch as local commits found in the checkout. Commit these to the "
7366
7512
"bound branch or use --force to throw them away."
7367
7513
msgstr ""
7368
7514
7369
#: bzrlib/switch.py:101
7515
#: bzrlib/switch.py:105
7370
7516
#, python-format
7371
7517
msgid ""
7372
7518
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7373
7519
"anyway, use --force."
7374
7520
msgstr ""
7375
7521
7376
#: bzrlib/switch.py:110
7522
#: bzrlib/switch.py:125
7377
7523
msgid "Cannot switch a branch, only a checkout."
7378
7524
msgstr ""
7379
7525
7380
#: bzrlib/switch.py:146
7526
#: bzrlib/switch.py:163
7381
7527
#, python-format
7382
7528
msgid "Tree is up to date at revision %d."
7383
7529
msgstr ""
7384
7530
7385
#: bzrlib/switch.py:152
7531
#: bzrlib/switch.py:169
7386
7532
#, python-format
7387
7533
msgid "Updated to revision %d."
7388
7534
msgstr ""
7389
7535
7390
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7536
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7391
7537
msgid "Apply phase"
7392
7538
msgstr ""
7393
7539
7394
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7540
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7395
7541
msgid "removing file"
7396
7542
msgstr ""
7397
7543
7398
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7544
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7399
7545
msgid "adding file"
7400
7546
msgstr ""
7401
7547
7402
#: bzrlib/transform.py:2587
7548
#: bzrlib/transform.py:2591
7403
7549
msgid "Building tree"
7404
7550
msgstr ""
7405
7551
7406
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7552
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7407
7553
msgid "Adding file contents"
7408
7554
msgstr ""
7409
7555
7410
#: bzrlib/transform.py:3024
7556
#: bzrlib/transform.py:3028
7411
7557
msgid "Resolution pass"
7412
7558
msgstr ""
7413
7559
7556
7702
7557
7703
#: dummy/help_topics/basic/detail.txt:1
7558
7704
msgid ""
7559
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7705
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7560
7706
"http://bazaar.canonical.com/"
7561
7707
msgstr ""
7562
7708
8526
8672
8527
8673
#: en/help_topics/authentication.txt:25
8528
8674
msgid "Instead of using::"
8529
msgstr ""
8675
msgstr "Em vez de usar::"
8530
8676
8531
8677
#: en/help_topics/authentication.txt:27
8532
8678
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8533
msgstr ""
8679
msgstr " bzr branch ftp://joe:secret@host.com/caminho/para/meu/ramo"
8534
8680
8535
8681
#: en/help_topics/authentication.txt:29
8536
8682
msgid "you simply use::"
8537
msgstr ""
8683
msgstr "você simplesmente usa::"
8538
8684
8539
8685
#: en/help_topics/authentication.txt:31
8540
8686
msgid " bzr branch ftp://host.com/path/to/my/branch"
8541
msgstr ""
8687
msgstr " bzr branch ftp://host.com/caminho/para/meu/ramo"
8542
8688
8543
8689
#: en/help_topics/authentication.txt:33
8544
8690
msgid ""
8913
9059
"identifier\n"
8914
9060
"rather than a full URL. This looks like::"
8915
9061
msgstr ""
9062
"A opção ``--fixes`` permite a você especificar um rastreador de bug e um "
9063
"identificador de bug\n"
9064
"em vez de uma URL completa. Isso parece::"
8916
9065
8917
9066
#: en/help_topics/bugs.txt:11
8918
9067
msgid " bzr commit --fixes <tracker>:<id>"
8919
msgstr ""
9068
msgstr " bzr commit --fixes <tracker>:<id>"
8920
9069
8921
9070
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8922
9071
msgid "or::"
8923
msgstr ""
9072
msgstr "ou::"
8924
9073
8925
9074
#: en/help_topics/bugs.txt:15
8926
9075
msgid " bzr commit --fixes <id>"
8927
msgstr ""
9076
msgstr " bzr commit --fixes <id>"
8928
9077
8929
9078
#: en/help_topics/bugs.txt:17
8930
9079
msgid ""
8984
9133
"Launchpad\n"
8985
9134
"---------"
8986
9135
msgstr ""
9136
"Launchpad\n"
9137
"---------"
8987
9138
8988
9139
#: en/help_topics/bugs.txt:54
8989
9140
msgid ""
9184
9335
"Configuration Settings\n"
9185
9336
"======================="
9186
9337
msgstr ""
9338
"Definições de configuração\n"
9339
"======================="
9187
9340
9188
9341
#: en/help_topics/configuration.txt:4
9189
9342
msgid ""
9190
9343
"Environment settings\n"
9191
9344
"---------------------"
9192
9345
msgstr ""
9346
"Configurações de ambiente\n"
9347
"---------------------"
9193
9348
9194
9349
#: en/help_topics/configuration.txt:7
9195
9350
msgid ""
9209
9364
9210
9365
#: en/help_topics/configuration.txt:15
9211
9366
msgid " \"John Doe <jdoe@example.com>\""
9212
msgstr ""
9367
msgstr " \"John Doe <jdoe@exemplo.com>\""
9213
9368
9214
9369
#: en/help_topics/configuration.txt:17
9215
9370
msgid "See also the ``email`` configuration option."
9252
9407
"BZR_HOME\n"
9253
9408
"~~~~~~~~"
9254
9409
msgstr ""
9410
"BZR_HOME\n"
9411
"~~~~~~~~"
9255
9412
9256
9413
#: en/help_topics/configuration.txt:37
9257
9414
msgid "Override the home directory used by Bazaar."
9262
9419
"BZR_SSH\n"
9263
9420
"~~~~~~~"
9264
9421
msgstr ""
9422
"BZR_SSH\n"
9423
"~~~~~~~"
9265
9424
9266
9425
#: en/help_topics/configuration.txt:42
9267
9426
msgid "Select a different SSH implementation."
9272
9431
"BZR_PDB\n"
9273
9432
"~~~~~~~"
9274
9433
msgstr ""
9434
"BZR_PDB\n"
9435
"~~~~~~~"
9275
9436
9276
9437
#: en/help_topics/configuration.txt:47
9277
9438
msgid "Control whether to launch a debugger on error."
9288
9449
"BZR_REMOTE_PATH\n"
9289
9450
"~~~~~~~~~~~~~~~"
9290
9451
msgstr ""
9452
"BZR_REMOTE_PATH\n"
9453
"~~~~~~~~~~~~~~~"
9291
9454
9292
9455
#: en/help_topics/configuration.txt:55
9293
9456
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9302
9465
"BZR_EDITOR\n"
9303
9466
"~~~~~~~~~~"
9304
9467
msgstr ""
9468
"BZR_EDITOR\n"
9469
"~~~~~~~~~~"
9305
9470
9306
9471
#: en/help_topics/configuration.txt:62
9307
9472
msgid "Path to the editor Bazaar should use for commit messages, etc."
9312
9477
"BZR_LOG\n"
9313
9478
"~~~~~~~"
9314
9479
msgstr ""
9480
"BZR_LOG\n"
9481
"~~~~~~~"
9315
9482
9316
9483
#: en/help_topics/configuration.txt:67
9317
9484
msgid ""
9337
9504
"BZR_PLUGIN_PATH\n"
9338
9505
"~~~~~~~~~~~~~~~"
9339
9506
msgstr ""
9507
"\n"
9508
"BZR_PLUGIN_PATH\n"
9509
"~~~~~~~~~~~~~~~"
9340
9510
9341
9511
#: en/help_topics/configuration.txt:80
9342
9512
msgid ""
9418
9588
9419
9589
#: en/help_topics/configuration.txt:121
9420
9590
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9421
msgstr ""
9591
msgstr " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9422
9592
9423
9593
#: en/help_topics/configuration.txt:123
9424
9594
msgid "Disabling the site directory while retaining the user directory::"
9449
9619
"BZR_DISABLE_PLUGINS\n"
9450
9620
"~~~~~~~~~~~~~~~~~~~"
9451
9621
msgstr ""
9622
"BZR_DISABLE_PLUGINS\n"
9623
"~~~~~~~~~~~~~~~~~~~"
9452
9624
9453
9625
#: en/help_topics/configuration.txt:138
9454
9626
msgid ""
9478
9650
"BZR_PLUGINS_AT\n"
9479
9651
"~~~~~~~~~~~~~~"
9480
9652
msgstr ""
9653
"BZR_PLUGINS_AT\n"
9654
"~~~~~~~~~~~~~~"
9481
9655
9482
9656
#: en/help_topics/configuration.txt:154
9483
9657
msgid ""
9511
9685
"Example:\n"
9512
9686
"~~~~~~~~"
9513
9687
msgstr ""
9688
"Exemplo:\n"
9689
"~~~~~~~~"
9514
9690
9515
9691
#: en/help_topics/configuration.txt:175
9516
9692
msgid ""
9523
9699
"BZRPATH\n"
9524
9700
"~~~~~~~"
9525
9701
msgstr ""
9702
"BZRPATH\n"
9703
"~~~~~~~"
9526
9704
9527
9705
#: en/help_topics/configuration.txt:181
9528
9706
msgid "The path where Bazaar should look for shell plugin external commands."
9544
9722
" http_proxy=http://proxy.example.com:3128/ \n"
9545
9723
" https_proxy=http://proxy.example.com:3128/"
9546
9724
msgstr ""
9725
" http_proxy=http://proxy.example.com:3128/ \n"
9726
" https_proxy=http://proxy.example.com:3128/"
9547
9727
9548
9728
#: en/help_topics/configuration.txt:192
9549
9729
msgid ""
9551
9731
"Configuration files\n"
9552
9732
"-------------------"
9553
9733
msgstr ""
9734
"\n"
9735
"Arquivos de configuração\n"
9736
"-------------------"
9554
9737
9555
9738
#: en/help_topics/configuration.txt:196
9556
9739
msgid ""
9557
9740
"Location\n"
9558
9741
"~~~~~~~~"
9559
9742
msgstr ""
9743
"Localização\n"
9744
"~~~~~~~~"
9560
9745
9561
9746
#: en/help_topics/configuration.txt:199
9562
9747
msgid ""
9616
9801
"Comments\n"
9617
9802
"^^^^^^^^"
9618
9803
msgstr ""
9804
"Comentários\n"
9805
"^^^^^^^^"
9619
9806
9620
9807
#: en/help_topics/configuration.txt:229
9621
9808
msgid ""
9638
9825
9639
9826
#: en/help_topics/configuration.txt:239
9640
9827
msgid " [DEFAULT]"
9641
msgstr ""
9828
msgstr " [DEFAULT]"
9642
9829
9643
9830
#: en/help_topics/configuration.txt:241
9644
9831
msgid ""
9661
9848
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9662
9849
" [/home/jdoe/branches/]"
9663
9850
msgstr ""
9851
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9852
" [/home/jdoe/branches/]"
9664
9853
9665
9854
#: en/help_topics/configuration.txt:253
9666
9855
msgid ""
9680
9869
" email = John Doe <jdoe@isp.com>\n"
9681
9870
" gpg_signing_key = Amy Pond <amy@example.com>"
9682
9871
msgstr ""
9872
" email = John Doe <jdoe@isp.com>\n"
9873
" gpg_signing_key = Amy Pond <amy@example.com>"
9683
9874
9684
9875
#: en/help_topics/configuration.txt:263
9685
9876
msgid ""
9842
10033
" editor = /usr/bin/vim\n"
9843
10034
" create_signatures = when-required"
9844
10035
msgstr ""
10036
" [DEFAULT]\n"
10037
" email = John Doe <jdoe@isp.com>\n"
10038
" editor = /usr/bin/vim\n"
10039
" create_signatures = when-required"
9845
10040
9846
10041
#: en/help_topics/configuration.txt:356
9847
10042
msgid ""
9865
10060
" [/home/jdoe/branches/nethack]\n"
9866
10061
" email = Nethack Admin <nethack@nethack.com>"
9867
10062
msgstr ""
10063
" [/home/jdoe/branches/nethack]\n"
10064
" email = Nethack Admin <nethack@nethack.com>"
9868
10065
9869
10066
#: en/help_topics/configuration.txt:369
9870
10067
msgid ""
9871
10068
" [http://hypothetical.site.com/branches/devel-branch]\n"
9872
10069
" create_signatures = always"
9873
10070
msgstr ""
10071
" [http://hypothetical.site.com/branches/devel-branch]\n"
10072
" create_signatures = always"
9874
10073
9875
10074
#: en/help_topics/configuration.txt:372
9876
10075
msgid ""
9932
10131
"email\n"
9933
10132
"~~~~~"
9934
10133
msgstr ""
10134
"email\n"
10135
"~~~~~"
9935
10136
9936
10137
#: en/help_topics/configuration.txt:405
9937
10138
msgid ""
9948
10149
"editor\n"
9949
10150
"~~~~~~"
9950
10151
msgstr ""
10152
"editor\n"
10153
"~~~~~~"
9951
10154
9952
10155
#: en/help_topics/configuration.txt:413
9953
10156
msgid ""
10122
10325
"bzr_remote_path\n"
10123
10326
"~~~~~~~~~~~~~~~"
10124
10327
msgstr ""
10328
"bzr_remote_path\n"
10329
"~~~~~~~~~~~~~~~"
10125
10330
10126
10331
#: en/help_topics/configuration.txt:502
10127
10332
msgid ""
10146
10351
"smtp_server\n"
10147
10352
"~~~~~~~~~~~"
10148
10353
msgstr ""
10354
"smtp_server\n"
10355
"~~~~~~~~~~~"
10149
10356
10150
10357
#: en/help_topics/configuration.txt:514
10151
10358
msgid ""
10158
10365
"smtp_username, smtp_password\n"
10159
10366
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10160
10367
msgstr ""
10368
"smtp_username, smtp_password\n"
10369
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10161
10370
10162
10371
#: en/help_topics/configuration.txt:520
10163
10372
msgid ""
10186
10395
"mail_client\n"
10187
10396
"~~~~~~~~~~~"
10188
10397
msgstr ""
10398
"mail_client\n"
10399
"~~~~~~~~~~~"
10189
10400
10190
10401
#: en/help_topics/configuration.txt:536
10191
10402
msgid ""
10243
10454
"submit_branch\n"
10244
10455
"~~~~~~~~~~~~~"
10245
10456
msgstr ""
10457
"submit_branch\n"
10458
"~~~~~~~~~~~~~"
10246
10459
10247
10460
#: en/help_topics/configuration.txt:569
10248
10461
msgid ""
10258
10471
"public_branch\n"
10259
10472
"~~~~~~~~~~~~~"
10260
10473
msgstr ""
10474
"public_branch\n"
10475
"~~~~~~~~~~~~~"
10261
10476
10262
10477
#: en/help_topics/configuration.txt:576
10263
10478
msgid ""
10359
10574
"parent_location\n"
10360
10575
"~~~~~~~~~~~~~~~"
10361
10576
msgstr ""
10577
"parent_location\n"
10578
"~~~~~~~~~~~~~~~"
10362
10579
10363
10580
#: en/help_topics/configuration.txt:630
10364
10581
msgid ""
10373
10590
"push_location\n"
10374
10591
"~~~~~~~~~~~~~"
10375
10592
msgstr ""
10593
"push_location\n"
10594
"~~~~~~~~~~~~~"
10376
10595
10377
10596
#: en/help_topics/configuration.txt:637
10378
10597
msgid ""
10385
10604
"push_strict\n"
10386
10605
"~~~~~~~~~~~"
10387
10606
msgstr ""
10607
"push_strict\n"
10608
"~~~~~~~~~~~"
10388
10609
10389
10610
#: en/help_topics/configuration.txt:643
10390
10611
msgid ""
10397
10618
"dpush_strict\n"
10398
10619
"~~~~~~~~~~~~"
10399
10620
msgstr ""
10621
"dpush_strict\n"
10622
"~~~~~~~~~~~~"
10400
10623
10401
10624
#: en/help_topics/configuration.txt:649
10402
10625
msgid ""
11075
11298
" $ bzr commit ../other -m \"OTHER\"\n"
11076
11299
" $ bzr merge ../other"
11077
11300
msgstr ""
11301
" $ bzr init\n"
11302
" $ bzr mkdir white\n"
11303
" $ bzr mkdir black\n"
11304
" $ bzr commit -m \"BASE\"\n"
11305
" $ bzr branch . ../other\n"
11306
" $ bzr mv white black\n"
11307
" $ bzr commit -m \"THIS\"\n"
11308
" $ bzr mv ../other/black ../other/white\n"
11309
" $ bzr commit ../other -m \"OTHER\"\n"
11310
" $ bzr merge ../other"
11078
11311
11079
11312
#: en/help_topics/conflict-types.txt:322
11080
11313
msgid ""
11111
11344
"side\n"
11112
11345
"has changed the directory into a file or symlink. For example::"
11113
11346
msgstr ""
11347
"Isso acontece quando um lado adicionou arquivos para um diretório, e o outro "
11348
"lado\n"
11349
"foi alterado o diretório em arquivo ou link simbólico. Por exemplo::"
11114
11350
11115
11351
#: en/help_topics/conflict-types.txt:347
11116
11352
msgid ""
11125
11361
" $ bzr commit ../other -m \"OTHER\"\n"
11126
11362
" $ bzr merge ../other"
11127
11363
msgstr ""
11364
" $ bzr init\n"
11365
" $ bzr mkdir foo\n"
11366
" $ bzr commit -m \"BASE\"\n"
11367
" $ bzr branch . ../other\n"
11368
" $ rmdir foo\n"
11369
" $ touch foo\n"
11370
" $ bzr commit -m \"THIS\"\n"
11371
" $ bzr mkdir ../other/foo/bar\n"
11372
" $ bzr commit ../other -m \"OTHER\"\n"
11373
" $ bzr merge ../other"
11128
11374
11129
11375
#: en/help_topics/conflict-types.txt:358
11130
11376
msgid ""
11131
11377
"To resolve that kind of conflict, you have to decide what name should be\n"
11132
11378
"retained for the file, directory or symlink involved."
11133
11379
msgstr ""
11380
"Para resolver esse tipo de conflito, você tem que decidir o nome deve ser\n"
11381
"mantido para o arquivo, diretório, ou link simbólico envolvidos."
11134
11382
11135
11383
#: en/help_topics/conflict-types.txt:363
11136
11384
msgid ""
11140
11388
" ``bzr mv foo.new foo``,\n"
11141
11389
"* ``--action=done`` will just mark the conflict as resolved."
11142
11390
msgstr ""
11391
"* ``--action=take-this`` emitirá ``bzr rm --force foo.new`` e \n"
11392
" ``bzr add foo``,\n"
11393
"* ``--action=take-other`` emitirá ``bzr rm --force foo`` e \n"
11394
" ``bzr mv foo.new foo``,\n"
11395
"* ``--action=done`` apenas marcará o conflito como resolvido."
11143
11396
11144
11397
#: en/help_topics/conflict-types.txt:371
11145
11398
msgid ""
11184
11437
#: en/help_topics/content-filters.txt:16
11185
11438
msgid "To generalize, there are two content formats supported by Bazaar:"
11186
11439
msgstr ""
11440
"Para generalizar, existem dois formatos de conteúdo suportados pelo Bazaar:"
11187
11441
11188
11442
#: en/help_topics/content-filters.txt:18
11189
11443
msgid ""
11190
11444
"* a canonical format - how files are stored internally\n"
11191
11445
"* a convenience format - how files are created in a working tree."
11192
11446
msgstr ""
11447
"* Um formato canonical - como os arquivos são armazenados internamente.\n"
11448
"* Um formato conveniente - como os arquivos são criados em uma árvore de "
11449
"diretório."
11193
11450
11194
11451
#: en/help_topics/content-filters.txt:21
11195
11452
msgid ""
11775
12032
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11776
12033
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11777
12034
msgid "Introduced in: 2.2"
11778
msgstr ""
12035
msgstr "Introduzido em: 2.2"
11779
12036
11780
12037
#: en/help_topics/hooks.txt:40
11781
12038
msgid ""
11794
12051
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11795
12052
#: en/help_topics/hooks.txt:304
11796
12053
msgid "Introduced in: 1.8"
11797
msgstr ""
12054
msgstr "Introduzido em: 1.8"
11798
12055
11799
12056
#: en/help_topics/hooks.txt:50
11800
12057
msgid ""
11822
12079
"~~~~~~~~~~~~~~~~~~~~~~"
11823
12080
msgstr ""
11824
12081
11825
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
12082
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11826
12083
msgid "Introduced in: 1.4"
11827
msgstr ""
12084
msgstr "Introduzido em: 1.4"
11828
12085
11829
12086
#: en/help_topics/hooks.txt:68
11830
12087
msgid ""
11839
12096
"post_commit\n"
11840
12097
"~~~~~~~~~~~"
11841
12098
msgstr ""
12099
"post_commit\n"
12100
"~~~~~~~~~~~"
11842
12101
11843
12102
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11844
12103
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11845
12104
#: en/help_topics/hooks.txt:145
11846
12105
msgid "Introduced in: 0.15"
11847
msgstr ""
12106
msgstr "Introduzido em: 0.15"
11848
12107
11849
12108
#: en/help_topics/hooks.txt:78
11850
12109
msgid ""
11859
12118
"post_pull\n"
11860
12119
"~~~~~~~~~"
11861
12120
msgstr ""
12121
"post_pull\n"
12122
"~~~~~~~~~"
11862
12123
11863
12124
#: en/help_topics/hooks.txt:88
11864
12125
msgid ""
11871
12132
"post_push\n"
11872
12133
"~~~~~~~~~"
11873
12134
msgstr ""
12135
"post_push\n"
12136
"~~~~~~~~~"
11874
12137
11875
12138
#: en/help_topics/hooks.txt:96
11876
12139
msgid ""
11883
12146
"post_switch\n"
11884
12147
"~~~~~~~~~~~"
11885
12148
msgstr ""
12149
"post_switch\n"
12150
"~~~~~~~~~~~"
11886
12151
11887
12152
#: en/help_topics/hooks.txt:104
11888
12153
msgid ""
11895
12160
"post_uncommit\n"
11896
12161
"~~~~~~~~~~~~~"
11897
12162
msgstr ""
12163
"post_uncommit\n"
12164
"~~~~~~~~~~~~~"
11898
12165
11899
12166
#: en/help_topics/hooks.txt:112
11900
12167
msgid ""
11913
12180
11914
12181
#: en/help_topics/hooks.txt:121
11915
12182
msgid "Introduced in: 1.6"
11916
msgstr ""
12183
msgstr "Introduzido em: 1.6"
11917
12184
11918
12185
#: en/help_topics/hooks.txt:123
11919
12186
msgid ""
11928
12195
"pre_commit\n"
11929
12196
"~~~~~~~~~~"
11930
12197
msgstr ""
12198
"pre_commit\n"
12199
"~~~~~~~~~~"
11931
12200
11932
12201
#: en/help_topics/hooks.txt:131
11933
12202
msgid "Introduced in: 0.91"
11934
msgstr ""
12203
msgstr "Introduzido em: 0.91"
11935
12204
11936
12205
#: en/help_topics/hooks.txt:133
11937
12206
msgid ""
11968
12237
11969
12238
#: en/help_topics/hooks.txt:156
11970
12239
msgid "Introduced in: 1.9"
11971
msgstr ""
12240
msgstr "Introduzido em: 1.9"
11972
12241
11973
12242
#: en/help_topics/hooks.txt:158
11974
12243
msgid ""
11998
12267
11999
12268
#: en/help_topics/hooks.txt:175
12000
12269
msgid "Introduced in: 1.13"
12001
msgstr ""
12270
msgstr "Introduzido em: 1.13"
12002
12271
12003
12272
#: en/help_topics/hooks.txt:177
12004
12273
msgid ""
12014
12283
msgstr ""
12015
12284
12016
12285
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12017
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12286
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12018
12287
msgid "Introduced in: 1.17"
12019
msgstr ""
12288
msgstr "Introduzido em: 1.17"
12020
12289
12021
12290
#: en/help_topics/hooks.txt:186
12022
12291
msgid ""
12070
12339
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12071
12340
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12072
12341
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12073
#: en/help_topics/hooks.txt:427
12342
#: en/help_topics/hooks.txt:443
12074
12343
msgid "Introduced in: 2.4"
12075
msgstr ""
12344
msgstr "Introduzido em: 2.4"
12076
12345
12077
12346
#: en/help_topics/hooks.txt:220
12078
12347
msgid ""
12150
12419
12151
12420
#: en/help_topics/hooks.txt:267
12152
12421
msgid "Introduced in: 1.14"
12153
msgstr ""
12422
msgstr "Introduzido em: 1.14"
12154
12423
12155
12424
#: en/help_topics/hooks.txt:269
12156
12425
msgid ""
12171
12440
msgstr ""
12172
12441
12173
12442
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12174
#: en/help_topics/hooks.txt:505
12443
#: en/help_topics/hooks.txt:521
12175
12444
msgid "Introduced in: 1.15"
12176
msgstr ""
12445
msgstr "Introduzido em: 1.15.0"
12177
12446
12178
12447
#: en/help_topics/hooks.txt:280
12179
12448
msgid ""
12234
12503
12235
12504
#: en/help_topics/hooks.txt:314
12236
12505
msgid "Introduced in: 2.1"
12237
msgstr ""
12506
msgstr "Introduzido em: 2.1"
12238
12507
12239
12508
#: en/help_topics/hooks.txt:316
12240
12509
msgid ""
12253
12522
msgstr ""
12254
12523
12255
12524
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12256
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12525
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12526
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12257
12527
msgid "Introduced in: 2.5"
12258
msgstr ""
12528
msgstr "Introduzido em: 2.5"
12259
12529
12260
12530
#: en/help_topics/hooks.txt:328
12261
12531
msgid ""
12289
12559
12290
12560
#: en/help_topics/hooks.txt:345
12291
12561
msgid "Introduced in: 1.15.0"
12292
msgstr ""
12562
msgstr "Introduzido em: 1.15.0"
12293
12563
12294
12564
#: en/help_topics/hooks.txt:347
12295
12565
msgid ""
12312
12582
12313
12583
#: en/help_topics/hooks.txt:357
12314
12584
msgid "Introduced in: 1.10"
12315
msgstr ""
12585
msgstr "Introduzido em: 1.10"
12316
12586
12317
12587
#: en/help_topics/hooks.txt:359
12318
12588
msgid ""
12360
12630
12361
12631
#: en/help_topics/hooks.txt:392
12362
12632
msgid "Introduced in: 2.0"
12363
msgstr ""
12633
msgstr "Introduzido em: 2.0"
12364
12634
12365
12635
#: en/help_topics/hooks.txt:394
12366
12636
msgid ""
12372
12642
12373
12643
#: en/help_topics/hooks.txt:399
12374
12644
msgid ""
12645
"post_transform\n"
12646
"~~~~~~~~~~~~~~"
12647
msgstr ""
12648
12649
#: en/help_topics/hooks.txt:404
12650
msgid ""
12651
"Called after a tree transform has been performed on a tree. The hook\n"
12652
"is called with the tree that is being transformed and the transform."
12653
msgstr ""
12654
12655
#: en/help_topics/hooks.txt:407
12656
msgid ""
12657
"pre_transform\n"
12658
"~~~~~~~~~~~~~"
12659
msgstr ""
12660
12661
#: en/help_topics/hooks.txt:412
12662
msgid ""
12663
"Called before a tree transform on this tree. The hook is called with\n"
12664
"the tree that is being transformed and the transform."
12665
msgstr ""
12666
12667
#: en/help_topics/hooks.txt:415
12668
msgid ""
12375
12669
"start_commit\n"
12376
12670
"~~~~~~~~~~~~"
12377
12671
msgstr ""
12378
12672
12379
#: en/help_topics/hooks.txt:404
12673
#: en/help_topics/hooks.txt:420
12380
12674
msgid ""
12381
12675
"Called before a commit is performed on a tree. The start commit hook\n"
12382
12676
"is able to change the tree before the commit takes place. start_commit\n"
12384
12678
"being performed on."
12385
12679
msgstr ""
12386
12680
12387
#: en/help_topics/hooks.txt:409
12681
#: en/help_topics/hooks.txt:425
12388
12682
msgid ""
12389
12683
"SmartClientHooks\n"
12390
12684
"----------------"
12391
12685
msgstr ""
12392
12686
12393
#: en/help_topics/hooks.txt:412
12687
#: en/help_topics/hooks.txt:428
12394
12688
msgid ""
12395
12689
"call\n"
12396
12690
"~~~~"
12397
12691
msgstr ""
12398
12692
12399
#: en/help_topics/hooks.txt:415
12693
#: en/help_topics/hooks.txt:431
12400
12694
msgid "Introduced in: unknown"
12401
msgstr ""
12695
msgstr "Introduzido em: desconhecido"
12402
12696
12403
#: en/help_topics/hooks.txt:417
12697
#: en/help_topics/hooks.txt:433
12404
12698
msgid ""
12405
12699
"Called when the smart client is submitting a request to the smart\n"
12406
12700
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12407
12701
"Streaming request bodies, and responses, are not accessible."
12408
12702
msgstr ""
12409
12703
12410
#: en/help_topics/hooks.txt:421
12704
#: en/help_topics/hooks.txt:437
12411
12705
msgid ""
12412
12706
"SmartServerHooks\n"
12413
12707
"----------------"
12414
12708
msgstr ""
12415
12709
12416
#: en/help_topics/hooks.txt:424
12710
#: en/help_topics/hooks.txt:440
12417
12711
msgid ""
12418
12712
"server_exception\n"
12419
12713
"~~~~~~~~~~~~~~~~"
12420
12714
msgstr ""
12421
12715
12422
#: en/help_topics/hooks.txt:429
12716
#: en/help_topics/hooks.txt:445
12423
12717
msgid ""
12424
12718
"Called by the bzr server when an exception occurs. server_exception is\n"
12425
12719
"called with the sys.exc_info() tuple return true for the hook if the\n"
12427
12721
"normally."
12428
12722
msgstr ""
12429
12723
12430
#: en/help_topics/hooks.txt:434
12724
#: en/help_topics/hooks.txt:450
12431
12725
msgid ""
12432
12726
"server_started\n"
12433
12727
"~~~~~~~~~~~~~~"
12434
12728
msgstr ""
12435
12729
12436
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12730
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12437
12731
msgid "Introduced in: 0.16"
12438
msgstr ""
12732
msgstr "Introduzido em: 0.16"
12439
12733
12440
#: en/help_topics/hooks.txt:439
12734
#: en/help_topics/hooks.txt:455
12441
12735
msgid ""
12442
12736
"Called by the bzr server when it starts serving a directory.\n"
12443
12737
"server_started is called with (backing urls, public url), where\n"
12446
12740
"served."
12447
12741
msgstr ""
12448
12742
12449
#: en/help_topics/hooks.txt:445
12743
#: en/help_topics/hooks.txt:461
12450
12744
msgid ""
12451
12745
"server_started_ex\n"
12452
12746
"~~~~~~~~~~~~~~~~~"
12453
12747
msgstr ""
12454
12748
12455
#: en/help_topics/hooks.txt:450
12749
#: en/help_topics/hooks.txt:466
12456
12750
msgid ""
12457
12751
"Called by the bzr server when it starts serving a directory.\n"
12458
12752
"server_started is called with (backing_urls, server_obj)."
12459
12753
msgstr ""
12460
12754
12461
#: en/help_topics/hooks.txt:453
12755
#: en/help_topics/hooks.txt:469
12462
12756
msgid ""
12463
12757
"server_stopped\n"
12464
12758
"~~~~~~~~~~~~~~"
12465
12759
msgstr ""
12466
12760
12467
#: en/help_topics/hooks.txt:458
12761
#: en/help_topics/hooks.txt:474
12468
12762
msgid ""
12469
12763
"Called by the bzr server when it stops serving a directory.\n"
12470
12764
"server_stopped is called with the same parameters as the\n"
12471
12765
"server_started hook: (backing_urls, public_url)."
12472
12766
msgstr ""
12473
12767
12474
#: en/help_topics/hooks.txt:462
12768
#: en/help_topics/hooks.txt:478
12475
12769
msgid ""
12476
12770
"StatusHooks\n"
12477
12771
"-----------"
12478
12772
msgstr ""
12479
12773
12480
#: en/help_topics/hooks.txt:465
12774
#: en/help_topics/hooks.txt:481
12481
12775
msgid ""
12482
12776
"post_status\n"
12483
12777
"~~~~~~~~~~~"
12484
12778
msgstr ""
12485
12779
12486
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12780
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12487
12781
msgid "Introduced in: 2.3"
12488
msgstr ""
12782
msgstr "Introduzido em: 2.3"
12489
12783
12490
#: en/help_topics/hooks.txt:470
12784
#: en/help_topics/hooks.txt:486
12491
12785
msgid ""
12492
12786
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12493
12787
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12496
12790
"status command. to_file is the output stream for writing."
12497
12791
msgstr ""
12498
12792
12499
#: en/help_topics/hooks.txt:476
12793
#: en/help_topics/hooks.txt:492
12500
12794
msgid ""
12501
12795
"pre_status\n"
12502
12796
"~~~~~~~~~~"
12503
12797
msgstr ""
12504
12798
12505
#: en/help_topics/hooks.txt:481
12799
#: en/help_topics/hooks.txt:497
12506
12800
msgid ""
12507
12801
"Called with argument StatusHookParams before Bazaar displays the\n"
12508
12802
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12511
12805
"status command. to_file is the output stream for writing."
12512
12806
msgstr ""
12513
12807
12514
#: en/help_topics/hooks.txt:487
12808
#: en/help_topics/hooks.txt:503
12515
12809
msgid ""
12516
12810
"TransportHooks\n"
12517
12811
"--------------"
12518
12812
msgstr ""
12519
12813
12520
#: en/help_topics/hooks.txt:490
12814
#: en/help_topics/hooks.txt:506
12521
12815
msgid ""
12522
12816
"post_connect\n"
12523
12817
"~~~~~~~~~~~~"
12524
12818
msgstr ""
12525
12819
12526
#: en/help_topics/hooks.txt:495
12820
#: en/help_topics/hooks.txt:511
12527
12821
msgid ""
12528
12822
"Called after a new connection is established or a reconnect occurs.\n"
12529
12823
"The sole argument passed is either the connected transport or smart\n"
12530
12824
"medium instance."
12531
12825
msgstr ""
12532
12826
12533
#: en/help_topics/hooks.txt:499
12827
#: en/help_topics/hooks.txt:515
12534
12828
msgid ""
12535
12829
"RioVersionInfoBuilderHooks\n"
12536
12830
"--------------------------"
12537
12831
msgstr ""
12538
12832
12539
#: en/help_topics/hooks.txt:502
12833
#: en/help_topics/hooks.txt:518
12540
12834
msgid ""
12541
12835
"revision\n"
12542
12836
"~~~~~~~~"
12543
12837
msgstr ""
12544
12838
12545
#: en/help_topics/hooks.txt:507
12839
#: en/help_topics/hooks.txt:523
12546
12840
msgid ""
12547
12841
"Invoked when adding information about a revision to the RIO stanza\n"
12548
12842
"that is printed. revision is called with a revision object and a RIO\n"
12642
12936
12643
12937
#: en/help_topics/other-formats.txt:1
12644
12938
msgid "Other Storage Formats"
12645
msgstr ""
12939
msgstr "Outros formatos de armazenamento"
12646
12940
12647
12941
#: en/help_topics/other-formats.txt:3
12648
12942
msgid "Experimental formats are shown below."
12649
msgstr ""
12943
msgstr "Formatos experimentais são mostrados abaixo."
12650
12944
12651
12945
#: en/help_topics/other-formats.txt:5
12652
12946
msgid ""
12660
12954
"\n"
12661
12955
"Deprecated formats are shown below."
12662
12956
msgstr ""
12957
"\n"
12958
"Formatos obsoletos são mostrados abaixo."
12663
12959
12664
12960
#: en/help_topics/other-formats.txt:12
12665
12961
msgid ""
12867
13163
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12868
13164
#: en/help_topics/revisionspec.txt:153
12869
13165
msgid " Examples::"
12870
msgstr ""
13166
msgstr " Exemplos::"
12871
13167
12872
13168
#: en/help_topics/revisionspec.txt:79
12873
13169
msgid " $ bzr diff -r submit:"
12874
msgstr ""
13170
msgstr " $ bzr diff -r submit:"
12875
13171
12876
13172
#: en/help_topics/revisionspec.txt:81
12877
13173
msgid ":ancestor:"
12924
13220
12925
13221
#: en/help_topics/revisionspec.txt:115
12926
13222
msgid ":branch:"
12927
msgstr ""
13223
msgstr ":ramo:"
12928
13224
12929
13225
#: en/help_topics/revisionspec.txt:117
12930
13226
msgid " Supply the path to a branch to select its last revision."
12931
13227
msgstr ""
13228
" Fornecer o caminho de um ramo para selecionar sua última revisão."
12932
13229
12933
13230
#: en/help_topics/revisionspec.txt:121
12934
13231
msgid " branch:/path/to/branch"
12935
msgstr ""
13232
msgstr " branch:/caminho/para/ramo"
12936
13233
12937
13234
#: en/help_topics/revisionspec.txt:123
12938
13235
msgid ":tag:"
12939
msgstr ""
13236
msgstr ":tag:"
12940
13237
12941
13238
#: en/help_topics/revisionspec.txt:125
12942
13239
msgid " Tags are stored in the branch and created by the 'tag' command."
12943
msgstr ""
13240
msgstr " Tags são armazenadas no ramo e criadas pelo comando 'tag'."
12944
13241
12945
13242
#: en/help_topics/revisionspec.txt:127
12946
13243
msgid ":revno:"
12947
msgstr ""
13244
msgstr ":revno:"
12948
13245
12949
13246
#: en/help_topics/revisionspec.txt:129
12950
13247
msgid ""
13155
13452
13156
13453
#: en/help_topics/url-special-chars.txt:4
13157
13454
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13158
msgstr ""
13455
msgstr "Bazaar permite locais serem especificados de várias maneiras, seja:"
13159
13456
13160
13457
#: en/help_topics/url-special-chars.txt:6
13161
13458
msgid " * Fully qualified URLs"
13209
13506
" bzr log file://localhost/tmp/%252False\n"
13210
13507
" bzr log file:%252False"
13211
13508
msgstr ""
13509
" cd /tmp\n"
13510
" bzr log /tmp/%2False\n"
13511
" bzr log %2False\n"
13512
" bzr log file:///tmp/%252False\n"
13513
" bzr log file://localhost/tmp/%252False\n"
13514
" bzr log file:%252False"
13212
13515
13213
13516
#: en/help_topics/url-special-chars.txt:34
13214
13517
msgid "These are valid but do not refer to the same file::"
13215
msgstr ""
13518
msgstr "Estes são válidos, mas não se referem ao mesmo arquivo::"
13216
13519
13217
13520
#: en/help_topics/url-special-chars.txt:36
13218
13521
msgid ""
13249
13552
13250
13553
#: en/help_topics/urlspec.txt:1
13251
13554
msgid "URL Identifiers"
13252
msgstr ""
13555
msgstr "Identificadores de URL"
13253
13556
13254
13557
#: en/help_topics/urlspec.txt:3
13255
13558
msgid "Supported URL prefixes::"
13256
msgstr ""
13559
msgstr "Prefixos de URL suportados::"
13257
13560
13258
13561
#: en/help_topics/urlspec.txt:5
13259
13562
msgid ""
13267
13570
"SSL.\n"
13268
13571
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13269
13572
msgstr ""
13573
" aftp:// Acessa usando FTP ativo.\n"
13574
" bzr:// Acesso rápido usando o bazaar smart server.\n"
13575
" bzr+ssh:// Acesso rápido usando o Bazaar smart sobre SSH.\n"
13576
" file:// Acesso usando o sistema de arquivos (padrão)\n"
13577
" ftp:// Acesso usando FTP passivo.\n"
13578
" http:// Acesso somente leitura de ramos exportados na web.\n"
13579
" https:// Acesso somente leitura de ramos exportados na web usando SSL.\n"
13580
" sftp:// Acesso usando SFTP (a maioria dos servidores SSH fornecem acesso "
13581
"SFTP)."
13270
13582
13271
13583
#: en/help_topics/urlspec.txt:14
13272
13584
msgid "Supported modifiers::"
13273
msgstr ""
13585
msgstr "Modificadores suportados::"
13274
13586
13275
13587
#: en/help_topics/urlspec.txt:16
13276
13588
msgid " gio+ Access using any GIO supported protocols."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1