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'."
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."
213
#: bzrlib/builtins.py:277
213
#: bzrlib/builtins.py:365
214
214
msgid "Only show versioned files."
215
215
msgstr "Mostrar apenas arquivos versionados."
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."
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."
225
#: bzrlib/builtins.py:297
225
#: bzrlib/builtins.py:385
226
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
228
228
"bzr status --revision produz exatamente um ou dois especificadores de revisão"
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"
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"
238
#: bzrlib/builtins.py:351
238
#: bzrlib/builtins.py:439
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"
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}."
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."
251
#: bzrlib/builtins.py:461
251
#: bzrlib/builtins.py:549
252
252
msgid "Remove the working tree from a given branch/checkout."
254
254
"Remover a árvore de trabalho a partir de um determinado ramo/projeto obtido."
256
#: bzrlib/builtins.py:463
256
#: bzrlib/builtins.py:551
258
258
"Since a lightweight checkout is little more than a working tree\n"
259
259
"this will refuse to run against one."
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\"."
266
#: bzrlib/builtins.py:472
266
#: bzrlib/builtins.py:560
268
268
"Remove the working tree even if it has uncommitted or shelved changes."
270
270
"Remover a árvore de trabalho, mesmo que tenha mudanças não confirmadas ou "
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"
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"
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"
285
#: bzrlib/builtins.py:537
285
#: bzrlib/builtins.py:625
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."
299
299
", o cabeçalho parece estar corrompido, tente passar -r -1 para definir o "
300
300
"estado como última submissão"
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}"
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."
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."
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"
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"
321
321
"Tags podem apenas serem colocadas em uma revisão simples, não em um intervalo"
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."
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."
331
#: bzrlib/builtins.py:662
331
#: bzrlib/builtins.py:750
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"
432
432
"add.maximum_file_size serão pulados. Itens nomeados nunca são pulados\n"
433
433
"devido ao tamanho do arquivo."
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."
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"
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"
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."
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."
455
#: bzrlib/builtins.py:762
455
#: bzrlib/builtins.py:850
456
456
msgid "No error if existing, make parent directories as needed."
459
#: bzrlib/builtins.py:796
459
#: bzrlib/builtins.py:884
461
461
msgid "added %s\n"
462
462
msgstr "%s adicionado\n"
464
#: bzrlib/builtins.py:838
464
#: bzrlib/builtins.py:926
466
466
msgid "invalid kind %r specified"
467
467
msgstr "tipo especificado %r é inválido"
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."
473
#: bzrlib/builtins.py:877
473
#: bzrlib/builtins.py:965
474
474
msgid " bzr mv SOURCE... DESTINATION"
475
475
msgstr " bzr mv ORIGEM... DESTINO"
477
#: bzrlib/builtins.py:879
477
#: bzrlib/builtins.py:967
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"
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."
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."
505
#: bzrlib/builtins.py:896
505
#: bzrlib/builtins.py:984
507
507
"Move only the bzr identifier of the file, because the file has already been "
510
510
"Mover apenas o identificador bzr do arquivo, porque o arquivo já foi movido."
512
#: bzrlib/builtins.py:898
512
#: bzrlib/builtins.py:986
513
513
msgid "Automatically guess renames."
514
514
msgstr "Prever que será renomeado automaticamente."
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."
520
#: bzrlib/builtins.py:908
520
#: bzrlib/builtins.py:996
521
521
msgid "--dry-run requires --auto."
522
522
msgstr "--dry-run requer --auto."
524
#: bzrlib/builtins.py:912
524
#: bzrlib/builtins.py:1000
525
525
msgid "missing file argument"
526
526
msgstr "falta argumento de arquivo"
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"
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."
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."
540
#: bzrlib/builtins.py:962
540
#: bzrlib/builtins.py:1050
541
541
msgid "to mv multiple files the destination must be a versioned directory"
543
543
"para mover múltiplos arquivos, o destino deve ser um diretório versionado"
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."
549
#: bzrlib/builtins.py:1016
549
#: bzrlib/builtins.py:1104
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"
611
614
"ou na forma de um caminho para um arquivo contendo uma diretiva\n"
612
615
"de mesclagem gerada com bzr send."
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."
618
#: bzrlib/builtins.py:1048
621
#: bzrlib/builtins.py:1136
620
623
"Branch to pull into, rather than the one containing the working directory."
625
"Ramificação para extrair, ao invés de uma que contém o diretório de trabalho."
623
#: bzrlib/builtins.py:1051
627
#: bzrlib/builtins.py:1139
625
629
"Perform a local pull in a bound branch. Local pulls are not applied to the "
632
"Realizar uma extração local em uma ramificação limite. Extrações locais não "
633
"são aplicadas na ramificação mestre."
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."
633
#: bzrlib/builtins.py:1096
639
#: bzrlib/builtins.py:1184
634
640
msgid "No pull location known or specified."
641
msgstr "Nenhuma localização de extração conhecida ou especificada"
637
#: bzrlib/builtins.py:1102
643
#: bzrlib/builtins.py:1190
639
645
msgid "Using saved parent location: %s\n"
646
msgstr "Usando a localização pai salva: %s\n"
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"
650
msgstr "Não foi possível usar -r com diretivas mescladas ou empacotadas"
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."
650
#: bzrlib/builtins.py:1152
656
#: bzrlib/builtins.py:1240
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."
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."
656
#: bzrlib/builtins.py:1155
664
#: bzrlib/builtins.py:1243
658
666
"Some smart servers or protocols *may* put the working tree in place in\n"
662
670
"trabalho em vigor no\n"
665
#: bzrlib/builtins.py:1158
673
#: bzrlib/builtins.py:1246
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."
679
"Este comando funcionará apenas em ramificações que não possuem divergências. "
681
"são consideradas divergentes se a ramificação de destino possui envios mais "
683
"não pode ser fundida (direta ou indiretamente) pela ramificação de origem."
672
#: bzrlib/builtins.py:1162
685
#: bzrlib/builtins.py:1250
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."
690
"Se ramificações estão divergentes, você pode usar 'bzr push --overwrite' "
692
"a outra ramificação completamente, discartando mudanças não fundidas."
678
#: bzrlib/builtins.py:1165
694
#: bzrlib/builtins.py:1253
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'."
700
"Se você deseja certificar-se que possui mudanças diferentes em outra "
702
"faça um merge (veja bzr help merge) a partir da outra ramificação, e envie-"
704
"você será capaz de fazer um push sem \"'--overwrite\"."
685
#: bzrlib/builtins.py:1169
706
#: bzrlib/builtins.py:1257
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."
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."
693
#: bzrlib/builtins.py:1174
719
#: bzrlib/builtins.py:1262
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>."
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 "
728
"com -Olog_format=<outro_formato>"
700
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
730
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
702
732
"Branch to push from, rather than the one containing the working directory."
734
"Ramo para enviar a partir de, ao invés de uma que contém o diretório de "
705
#: bzrlib/builtins.py:1188
737
#: bzrlib/builtins.py:1276
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."
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 "
711
#: bzrlib/builtins.py:1193
746
#: bzrlib/builtins.py:1281
713
748
"Create a stacked branch that references the public location of the parent "
751
"Criar uma ramificação empilhada que referencia a localização pública do ramo "
717
#: bzrlib/builtins.py:1196
754
#: bzrlib/builtins.py:1284
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."
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 "
724
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
764
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
726
766
"Refuse to push if there are uncommitted changes in the working tree, --no-"
727
767
"strict disables the check."
769
"Recusa o envio se houver alterações não confirmadas na árvore de trabalho, --"
770
"no-strict desativa a verificação."
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."
775
"Não popular a árvore de trabalho, mesmo para protocolos que o suportam."
734
#: bzrlib/builtins.py:1248
777
#: bzrlib/builtins.py:1336
735
778
msgid "Could not determine branch to refer to."
779
msgstr "Não foi possível determinar uma ramificação a ser referenciada"
738
#: bzrlib/builtins.py:1257
781
#: bzrlib/builtins.py:1345
741
784
"No push location known or specified. To push to the parent branch (at %s), "
742
785
"use 'bzr push :parent'."
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."
790
msgstr "Sem local de envio conhecido ou especificado."
749
#: bzrlib/builtins.py:1267
792
#: bzrlib/builtins.py:1355
751
794
msgid "Using saved push location: %s"
795
msgstr "Usando localização de envio salvo: %s"
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."
799
msgstr "Criar um novo ramo que é uma cópia de um ramo existente."
758
#: bzrlib/builtins.py:1279
801
#: bzrlib/builtins.py:1367
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."
769
#: bzrlib/builtins.py:1286
812
#: bzrlib/builtins.py:1374
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\"."
817
"Para conseguir o ramo de uma revisão em particular, forneça o parâmetro --"
819
"como em \"branch foo/bar -r 5\"."
775
#: bzrlib/builtins.py:1289
821
#: bzrlib/builtins.py:1377
776
822
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
823
msgstr "Os sinônimos 'clone e 'get' para esse comando são obsoletos."
779
#: bzrlib/builtins.py:1299
825
#: bzrlib/builtins.py:1387
780
826
msgid "Create a branch without a working-tree."
827
msgstr "Criar um ramo sem uma árvore de trabalho."
783
#: bzrlib/builtins.py:1301
829
#: bzrlib/builtins.py:1389
784
830
msgid "Switch the checkout in the current directory to the new branch."
831
msgstr "Alterar o checkout no diretório atual para o novo ramo."
787
#: bzrlib/builtins.py:1304
833
#: bzrlib/builtins.py:1392
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."
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."
797
#: bzrlib/builtins.py:1310
843
#: bzrlib/builtins.py:1398
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."
803
#: bzrlib/builtins.py:1315
849
#: bzrlib/builtins.py:1403
804
850
msgid "Bind new branch to from location."
851
msgstr "Vincular novo ramo a partir da localização."
807
#: bzrlib/builtins.py:1362
853
#: bzrlib/builtins.py:1450
809
855
msgid "Target directory \"%s\" already exists."
856
msgstr "Diretório alvo \"%s\" já existe."
812
#: bzrlib/builtins.py:1374
858
#: bzrlib/builtins.py:1462
814
860
msgid "Parent of \"%s\" does not exist."
861
msgstr "Pasta pai de \"%s\" não existe."
817
#: bzrlib/builtins.py:1393
863
#: bzrlib/builtins.py:1481
818
864
msgid "The branch {0} has no revision {1}."
865
msgstr "O ramo {0} não tem revisão {1}."
821
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
867
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
823
869
msgid "Created new stacked branch referring to %s."
870
msgstr "Criado novo ramo empilhado referente a %s."
826
#: bzrlib/builtins.py:1407
872
#: bzrlib/builtins.py:1500
828
874
msgid "Branched %d revision."
829
875
msgid_plural "Branched %d revisions."
876
msgstr[0] "Revisão %d ramificada."
877
msgstr[1] "Revisões %d ramificadas."
833
#: bzrlib/builtins.py:1412
879
#: bzrlib/builtins.py:1505
835
881
msgid "New branch bound to %s"
882
msgstr "Novo ramo ligado a %s"
838
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
884
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
840
886
msgid "Switched to branch: %s"
887
msgstr "Trocado para o ramo: %s"
843
#: bzrlib/builtins.py:1422
889
#: bzrlib/builtins.py:1515
844
890
msgid "List the branches available at the current location."
891
msgstr "Lista os ramos disponíveis na localização atual."
847
#: bzrlib/builtins.py:1424
893
#: bzrlib/builtins.py:1517
849
895
"This command will print the names of all the branches at the current\n"
897
msgstr "Esse comando irá mostrar os nomes de todos os ramos no local atual."
853
#: bzrlib/builtins.py:1431
899
#: bzrlib/builtins.py:1524
855
901
"Recursively scan for branches rather than just looking in the specified "
904
"Pesquisar recursivamente por ramos ao invés de apenas procurar em um local "
859
#: bzrlib/builtins.py:1461
907
#: bzrlib/builtins.py:1554
860
908
msgid "(default)"
863
#: bzrlib/builtins.py:1473
911
#: bzrlib/builtins.py:1566
864
912
msgid "Create a new checkout of an existing branch."
913
msgstr "Criar um novo checkout de um ramo existente."
867
#: bzrlib/builtins.py:1475
915
#: bzrlib/builtins.py:1568
869
917
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
907
#: bzrlib/builtins.py:1504
955
#: bzrlib/builtins.py:1597
908
956
msgid "Get file contents from this tree."
957
msgstr "Obter o conteúdo do arquivo desta árvore."
911
#: bzrlib/builtins.py:1506
959
#: bzrlib/builtins.py:1599
912
960
msgid "Hard-link working tree files where possible."
961
msgstr "Use hard-link na árvore de trabalho sempre que possível."
915
#: bzrlib/builtins.py:1547
963
#: bzrlib/builtins.py:1640
917
965
"Show list of renamed files.\n"
968
"Mostrar a lista de arquivos renomeados.\n"
921
#: bzrlib/builtins.py:1577
971
#: bzrlib/builtins.py:1670
922
972
msgid "Update a working tree to a new revision."
973
msgstr "Atualizar a árvore de trabalho para a nova revisão."
925
#: bzrlib/builtins.py:1579
975
#: bzrlib/builtins.py:1672
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. "
932
#: bzrlib/builtins.py:1583
982
#: bzrlib/builtins.py:1676
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."
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."
938
#: bzrlib/builtins.py:1586
991
#: bzrlib/builtins.py:1679
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"
959
1014
"out the old content of that file to a new location."
962
#: bzrlib/builtins.py:1601
1017
#: bzrlib/builtins.py:1694
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."
969
#: bzrlib/builtins.py:1617
1024
#: bzrlib/builtins.py:1710
970
1025
msgid "bzr update --revision takes exactly one revision"
1026
msgstr "bzr update --revision tem exatamente uma revisão"
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"
1031
"bzr update só pode atualizar uma árvore inteira, e não um arquivo ou "
977
#: bzrlib/builtins.py:1656
1034
#: bzrlib/builtins.py:1749
978
1035
msgid "Tree is up to date at revision {0} of branch {1}"
1036
msgstr "Árvore está atualizada na revisão {0} do ramo {1}"
981
#: bzrlib/builtins.py:1672
1038
#: bzrlib/builtins.py:1765
982
1039
#, python-format
984
1041
"branch has no revision %s\n"
985
1042
"bzr update --revision only works for a revision in the branch history"
1044
"o ramo não tem revisão %s\n"
1045
"bzr update --revision só funciona para uma revisão no histórico da "
988
#: bzrlib/builtins.py:1678
1048
#: bzrlib/builtins.py:1771
989
1049
msgid "Updated to revision {0} of branch {1}"
1050
msgstr "Atualizado para a revisão {0} do ramo {1}"
992
#: bzrlib/builtins.py:1682
1052
#: bzrlib/builtins.py:1775
994
1054
"Your local commits will now show as pending merges with 'bzr status', and "
995
1055
"can be committed with 'bzr commit'."
998
#: bzrlib/builtins.py:1691
1058
#: bzrlib/builtins.py:1784
999
1059
msgid "Show information about a working tree, branch or repository."
1061
"Mostrar informações sobre uma árvore de trabalho, ramo ou repositório."
1002
#: bzrlib/builtins.py:1693
1063
#: bzrlib/builtins.py:1786
1004
1065
"This command will show all known locations and formats associated to the\n"
1005
1066
"tree, branch or repository."
1068
"Esse comando irá mostrar todos os locais conhecidos e formatos associados à\n"
1069
"árvore, ramo ou repositório."
1008
#: bzrlib/builtins.py:1696
1071
#: bzrlib/builtins.py:1789
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."
1015
#: bzrlib/builtins.py:1700
1078
#: bzrlib/builtins.py:1793
1016
1079
msgid "Branches and working trees will also report any missing revisions."
1081
"Ramos e árvores de trabalho irão também reportar qualquer falta de revisão."
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:"
1024
#: bzrlib/builtins.py:1704
1088
#: bzrlib/builtins.py:1797
1025
1089
msgid " Display information on the format and related locations:"
1090
msgstr " Exibir informações sobre o formato e locais relacionados:"
1028
#: bzrlib/builtins.py:1706
1092
#: bzrlib/builtins.py:1799
1029
1093
msgid " bzr info"
1032
#: bzrlib/builtins.py:1708
1096
#: bzrlib/builtins.py:1801
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):"
1039
#: bzrlib/builtins.py:1712
1103
#: bzrlib/builtins.py:1805
1040
1104
msgid " bzr info -v"
1105
msgstr " bzr info -v"
1043
#: bzrlib/builtins.py:1714
1107
#: bzrlib/builtins.py:1807
1044
1108
msgid " Display the above together with number of committers to the branch:"
1047
#: bzrlib/builtins.py:1716
1111
#: bzrlib/builtins.py:1809
1048
1112
msgid " bzr info -vv"
1113
msgstr " bzr info -vv"
1051
#: bzrlib/builtins.py:1735
1115
#: bzrlib/builtins.py:1828
1052
1116
msgid "Remove files or directories."
1117
msgstr "Remove arquivos ou diretórios."
1055
#: bzrlib/builtins.py:1737
1119
#: bzrlib/builtins.py:1830
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."
1064
#: bzrlib/builtins.py:1745
1128
#: bzrlib/builtins.py:1838
1065
1129
msgid "Only remove files that have never been committed."
1130
msgstr "Remover apenas arquivos que nunca foram enviados."
1068
#: bzrlib/builtins.py:1747
1132
#: bzrlib/builtins.py:1840
1069
1133
msgid "The file deletion mode to be used."
1134
msgstr "O modo de exclusão do arquivo a ser utilizado."
1072
#: bzrlib/builtins.py:1748
1136
#: bzrlib/builtins.py:1841
1073
1137
msgid "Deletion Strategy"
1138
msgstr "Estratégia de exclusão"
1076
#: bzrlib/builtins.py:1749
1140
#: bzrlib/builtins.py:1842
1077
1141
msgid "Backup changed files (default)."
1142
msgstr "Backup de arquivos alterados (padrão)."
1080
#: bzrlib/builtins.py:1750
1144
#: bzrlib/builtins.py:1843
1081
1145
msgid "Delete from bzr but leave the working copy."
1146
msgstr "Excluir do brz mas deixe a cópia de trabalho."
1084
#: bzrlib/builtins.py:1751
1148
#: bzrlib/builtins.py:1844
1085
1149
msgid "Don't backup changed files."
1150
msgstr "Não faça backup de arquivos alterados."
1088
#: bzrlib/builtins.py:1752
1152
#: bzrlib/builtins.py:1845
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)"
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-"
1094
#: bzrlib/builtins.py:1761
1161
#: bzrlib/builtins.py:1854
1095
1162
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1164
"(A opção --force é obsoleta, preferencialmente use --no-backup no futuro.)"
1098
#: bzrlib/builtins.py:1778
1166
#: bzrlib/builtins.py:1871
1099
1167
msgid "No matching files."
1168
msgstr "Nenhum arquivo correspondente."
1102
#: bzrlib/builtins.py:1839
1170
#: bzrlib/builtins.py:1932
1103
1171
msgid "Reconcile bzr metadata in a branch."
1172
msgstr "Reconciliar metadados bzr em um ramo."
1106
#: bzrlib/builtins.py:1841
1174
#: bzrlib/builtins.py:1934
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"
1119
1187
"correctly in both branches."
1122
#: bzrlib/builtins.py:1851
1190
#: bzrlib/builtins.py:1944
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."
1195
"No mesmo tempo em que ele é executado ele pode recompactar os dados, "
1197
"num potencial ganho de espaço em disco e desempenho."
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."
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
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"
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
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. "
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"
1149
#: bzrlib/builtins.py:1922
1220
#: bzrlib/builtins.py:2015
1150
1221
msgid "Make a directory into a versioned branch."
1222
msgstr "Crie um diretório em um ramo versionados."
1153
#: bzrlib/builtins.py:1924
1224
#: bzrlib/builtins.py:2017
1155
1226
"Use this to create an empty branch, or before importing an\n"
1156
1227
"existing project."
1229
"Use isso para criar um ramo vazio, ou antes de importar um\n"
1230
"projeto existente."
1159
#: bzrlib/builtins.py:1927
1232
#: bzrlib/builtins.py:2020
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"
1182
1255
" bzr status\n"
1183
1256
" bzr commit -m \"imported project\""
1262
" bzr commit -m \"projeto importado\""
1186
#: bzrlib/builtins.py:1948
1264
#: bzrlib/builtins.py:2041
1188
1266
"Create the path leading up to the branch if it does not already exist."
1267
msgstr "Criar o caminho que conduz até o ramo se ele não existir."
1191
#: bzrlib/builtins.py:1951
1269
#: bzrlib/builtins.py:2044
1192
1270
msgid "Specify a format for this branch. See \"help formats\"."
1271
msgstr "Especifique um formato para esse ramo. Consulte \"help formats\"."
1195
#: bzrlib/builtins.py:1959
1273
#: bzrlib/builtins.py:2052
1197
1275
"Never change revnos or the existing log. Append revisions to it only."
1200
#: bzrlib/builtins.py:1962
1278
#: bzrlib/builtins.py:2055
1201
1279
msgid "Create a branch without a working tree."
1280
msgstr "Criar um ramo sem uma árvore de trabalho."
1204
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1282
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1205
1283
#, python-format
1207
1285
"Parent directory of %s does not exist.\n"
1208
1286
"You may supply --create-prefix to create all leading parent directories."
1288
"Diretório pai de %s não existe.\n"
1289
"Você deve fornecer --create-prefix para criar todos os principais diretórios "
1211
#: bzrlib/builtins.py:2016
1292
#: bzrlib/builtins.py:2109
1213
1294
"This branch format cannot be set to append-revisions-only. Try --default."
1216
#: bzrlib/builtins.py:2027
1297
#: bzrlib/builtins.py:2120
1217
1298
msgid "Created a {0} (format: {1})\n"
1299
msgstr "Criou um {0} (formato: {1})\n"
1220
#: bzrlib/builtins.py:2036
1301
#: bzrlib/builtins.py:2129
1221
1302
#, python-format
1222
1303
msgid "Using shared repository: %s\n"
1304
msgstr "Usando repositório compartilhado: %s\n"
1225
#: bzrlib/builtins.py:2040
1306
#: bzrlib/builtins.py:2133
1226
1307
msgid "Create a shared repository for branches to share storage space."
1309
"Criar um repositório compartilhado de ramos para dividir espaço de "
1229
#: bzrlib/builtins.py:2042
1312
#: bzrlib/builtins.py:2135
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"
1244
1327
"branches, such as on a server."
1247
#: bzrlib/builtins.py:2054
1330
#: bzrlib/builtins.py:2147
1250
1333
" Create a shared repository holding just branches::"
1336
" Cria um repositório compartilhado contendo apenas ramos::"
1253
#: bzrlib/builtins.py:2057
1338
#: bzrlib/builtins.py:2150
1255
1340
" bzr init-repo --no-trees repo\n"
1256
1341
" bzr init repo/trunk"
1343
" bzr init-repo --no-trees repo\n"
1344
" bzr init repo/trunk"
1259
#: bzrlib/builtins.py:2060
1346
#: bzrlib/builtins.py:2153
1260
1347
msgid " Make a lightweight checkout elsewhere::"
1348
msgstr " Faça um leve checkout em outro lugar::"
1263
#: bzrlib/builtins.py:2062
1350
#: bzrlib/builtins.py:2155
1265
1352
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1266
1353
" cd trunk-checkout\n"
1267
1354
" (add files here)"
1356
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1357
" cd trunk-checkout\n"
1358
" (adicione arquivos aqui)"
1270
#: bzrlib/builtins.py:2070
1360
#: bzrlib/builtins.py:2163
1272
1362
"Specify a format for this repository. See \"bzr help formats\" for details."
1364
"Especifique um formato para este repositório. Veja \"bzr help formats\" para "
1275
#: bzrlib/builtins.py:2074
1367
#: bzrlib/builtins.py:2167
1276
1368
msgid "Repository format"
1369
msgstr "Formato de repositório"
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."
1374
"Ramos no repositório será o padrão para não ter uma árvore de trabalho."
1283
#: bzrlib/builtins.py:2102
1376
#: bzrlib/builtins.py:2195
1284
1377
msgid "Show differences in the working tree, between revisions or branches."
1379
"Mostrar diferenças na árvore de trabalho, entre as revisões ou ramos."
1287
#: bzrlib/builtins.py:2104
1381
#: bzrlib/builtins.py:2197
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"
1319
1413
" 0 - no change"
1415
":Valores de saída:\n"
1417
" 2 - mudanças irrepresentáveis\n"
1419
" 0 - Sem alteração"
1322
#: bzrlib/builtins.py:2127
1421
#: bzrlib/builtins.py:2220
1325
1424
" Shows the difference in the working tree versus the last commit::"
1427
" Mostra a diferença da árvore de trabalho em relação a última submissão::"
1328
#: bzrlib/builtins.py:2130
1429
#: bzrlib/builtins.py:2223
1329
1430
msgid " bzr diff"
1332
#: bzrlib/builtins.py:2132
1433
#: bzrlib/builtins.py:2225
1333
1434
msgid " Difference between the working tree and revision 1::"
1435
msgstr " Diferença entre a árvore de trabalho e a revisão 1::"
1336
#: bzrlib/builtins.py:2134
1437
#: bzrlib/builtins.py:2227
1337
1438
msgid " bzr diff -r1"
1439
msgstr " bzr diff -r1"
1340
#: bzrlib/builtins.py:2136
1441
#: bzrlib/builtins.py:2229
1341
1442
msgid " Difference between revision 3 and revision 1::"
1443
msgstr " Diferença entre a revisão 3 e a revisão 1::"
1344
#: bzrlib/builtins.py:2138
1445
#: bzrlib/builtins.py:2231
1345
1446
msgid " bzr diff -r1..3"
1447
msgstr " bzr diff -r1..3"
1348
#: bzrlib/builtins.py:2140
1449
#: bzrlib/builtins.py:2233
1349
1450
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1451
msgstr " Diferença entre a revisão 3 e a revisão 1 para o ramo xxx::"
1352
#: bzrlib/builtins.py:2142
1453
#: bzrlib/builtins.py:2235
1353
1454
msgid " bzr diff -r1..3 xxx"
1455
msgstr " bzr diff -r1..3 xxx"
1356
#: bzrlib/builtins.py:2144
1457
#: bzrlib/builtins.py:2237
1357
1458
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1460
" As alterações introduzidas pela revisão 2 (equivalente a -r1..2)::"
1360
#: bzrlib/builtins.py:2146
1462
#: bzrlib/builtins.py:2239
1361
1463
msgid " bzr diff -c2"
1464
msgstr " bzr diff -c2"
1364
#: bzrlib/builtins.py:2148
1466
#: bzrlib/builtins.py:2241
1366
1468
" To see the changes introduced by revision X::\n"
1368
1470
" bzr diff -cX"
1472
" Para ver as alterações introduzidas pela revisão X::\n"
1371
#: bzrlib/builtins.py:2152
1476
#: bzrlib/builtins.py:2245
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::"
1378
#: bzrlib/builtins.py:2156
1483
#: bzrlib/builtins.py:2249
1379
1484
msgid " bzr diff -r<chosen_parent>..X"
1382
#: bzrlib/builtins.py:2158
1487
#: bzrlib/builtins.py:2251
1384
1489
" The changes between the current revision and the previous revision\n"
1385
1490
" (equivalent to -c-1 and -r-2..-1)"
1388
#: bzrlib/builtins.py:2161
1493
#: bzrlib/builtins.py:2254
1389
1494
msgid " bzr diff -r-2.."
1495
msgstr " bzr diff -r-2.."
1392
#: bzrlib/builtins.py:2163
1497
#: bzrlib/builtins.py:2256
1393
1498
msgid " Show just the differences for file NEWS::"
1396
#: bzrlib/builtins.py:2165
1501
#: bzrlib/builtins.py:2258
1397
1502
msgid " bzr diff NEWS"
1503
msgstr " bzr diff NEWS"
1400
#: bzrlib/builtins.py:2167
1505
#: bzrlib/builtins.py:2260
1401
1506
msgid " Show the differences in working tree xxx for file NEWS::"
1404
#: bzrlib/builtins.py:2169
1509
#: bzrlib/builtins.py:2262
1405
1510
msgid " bzr diff xxx/NEWS"
1511
msgstr " bzr diff xxx/NEWS"
1408
#: bzrlib/builtins.py:2171
1513
#: bzrlib/builtins.py:2264
1409
1514
msgid " Show the differences from branch xxx to this working tree:"
1412
#: bzrlib/builtins.py:2173
1517
#: bzrlib/builtins.py:2266
1413
1518
msgid " bzr diff --old xxx"
1519
msgstr " bzr diff --old xxx"
1416
#: bzrlib/builtins.py:2175
1521
#: bzrlib/builtins.py:2268
1417
1522
msgid " Show the differences between two branches for file NEWS::"
1420
#: bzrlib/builtins.py:2177
1525
#: bzrlib/builtins.py:2270
1421
1526
msgid " bzr diff --old xxx --new yyy NEWS"
1424
#: bzrlib/builtins.py:2179
1529
#: bzrlib/builtins.py:2272
1425
1530
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1428
#: bzrlib/builtins.py:2181
1533
#: bzrlib/builtins.py:2274
1430
1535
" bzr diff --prefix old/:new/\n"
1434
1539
" bzr diff --using /usr/bin/diff --diff-options -wu"
1437
#: bzrlib/builtins.py:2191
1542
#: bzrlib/builtins.py:2284
1438
1543
msgid "Pass these options to the external diff program."
1441
#: bzrlib/builtins.py:2194
1546
#: bzrlib/builtins.py:2287
1443
1548
"Set prefixes added to old and new filenames, as two values separated by a "
1444
1549
"colon. (eg \"old/:new/\")."
1447
#: bzrlib/builtins.py:2197
1552
#: bzrlib/builtins.py:2290
1448
1553
msgid "Branch/tree to compare from."
1451
#: bzrlib/builtins.py:2201
1556
#: bzrlib/builtins.py:2294
1452
1557
msgid "Branch/tree to compare to."
1455
#: bzrlib/builtins.py:2207
1560
#: bzrlib/builtins.py:2300
1456
1561
msgid "Use this command to compare files."
1459
#: bzrlib/builtins.py:2212
1564
#: bzrlib/builtins.py:2305
1460
1565
msgid "Diff format to use."
1463
#: bzrlib/builtins.py:2214
1568
#: bzrlib/builtins.py:2307
1464
1569
msgid "Diff format"
1467
#: bzrlib/builtins.py:2236
1572
#: bzrlib/builtins.py:2329
1468
1573
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1471
#: bzrlib/builtins.py:2240
1576
#: bzrlib/builtins.py:2333
1472
1577
msgid "bzr diff --revision takes exactly one or two revision specifiers"
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"
1480
#: bzrlib/builtins.py:2265
1585
#: bzrlib/builtins.py:2358
1482
1587
"List files deleted in the working tree.\n"
1486
#: bzrlib/builtins.py:2343
1591
#: bzrlib/builtins.py:2436
1487
1592
msgid "Show the tree root directory."
1593
msgstr "Mostra o diretório raiz da árvore."
1490
#: bzrlib/builtins.py:2345
1595
#: bzrlib/builtins.py:2438
1492
1597
"The root is the nearest enclosing directory with a .bzr control\n"
1496
#: bzrlib/builtins.py:2360
1601
#: bzrlib/builtins.py:2453
1497
1602
msgid "The limit argument must be an integer."
1603
msgstr "O argumento de limite deve ser um inteiro."
1500
#: bzrlib/builtins.py:2368
1605
#: bzrlib/builtins.py:2461
1501
1606
msgid "The levels argument must be an integer."
1607
msgstr "O argumento de níveis deve ser um inteiro."
1504
#: bzrlib/builtins.py:2373
1609
#: bzrlib/builtins.py:2466
1505
1610
msgid "Show historical log for a branch or subset of a branch."
1508
#: bzrlib/builtins.py:2375
1613
#: bzrlib/builtins.py:2468
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"
1627
1732
" a nested merge revision and the log will be truncated accordingly."
1630
#: bzrlib/builtins.py:2449
1735
#: bzrlib/builtins.py:2542
1631
1736
msgid ":Path filtering:"
1634
#: bzrlib/builtins.py:2451
1739
#: bzrlib/builtins.py:2544
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."
1641
#: bzrlib/builtins.py:2455
1746
#: bzrlib/builtins.py:2548
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."
1648
#: bzrlib/builtins.py:2459
1753
#: bzrlib/builtins.py:2552
1650
1755
" Historical context is also important when interpreting pathnames of\n"
1651
1756
" renamed files/directories. Consider the following example:"
1654
#: bzrlib/builtins.py:2462
1759
#: bzrlib/builtins.py:2555
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"
1661
#: bzrlib/builtins.py:2466
1766
#: bzrlib/builtins.py:2559
1662
1767
msgid " In this case:"
1768
msgstr " Nesse caso:"
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"
1669
#: bzrlib/builtins.py:2470
1774
#: bzrlib/builtins.py:2563
1671
1776
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1674
#: bzrlib/builtins.py:2472
1779
#: bzrlib/builtins.py:2565
1676
1781
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1677
1782
" the original file in revision 2."
1680
#: bzrlib/builtins.py:2475
1785
#: bzrlib/builtins.py:2568
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."
1686
#: bzrlib/builtins.py:2478
1791
#: bzrlib/builtins.py:2571
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)."
1693
#: bzrlib/builtins.py:2482
1798
#: bzrlib/builtins.py:2575
1694
1799
msgid ":Other filtering:"
1697
#: bzrlib/builtins.py:2484
1802
#: bzrlib/builtins.py:2577
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"
1766
1875
" trading disk space for faster speed."
1769
#: bzrlib/builtins.py:2531
1878
#: bzrlib/builtins.py:2624
1770
1879
msgid "Show from oldest to newest."
1880
msgstr "Mostrar mais antiga para a mais recente."
1773
#: bzrlib/builtins.py:2534
1882
#: bzrlib/builtins.py:2627
1774
1883
msgid "Show files changed in each revision."
1884
msgstr "Mostrar os arquivos mudaram em cada revisão."
1777
#: bzrlib/builtins.py:2540
1886
#: bzrlib/builtins.py:2633
1778
1887
msgid "Show just the specified revision. See also \"help revisionspec\"."
1781
#: bzrlib/builtins.py:2544
1890
#: bzrlib/builtins.py:2637
1782
1891
msgid "What names to list as authors - first, all or committer."
1785
#: bzrlib/builtins.py:2545
1894
#: bzrlib/builtins.py:2638
1786
1895
msgid "Authors"
1789
#: bzrlib/builtins.py:2550
1898
#: bzrlib/builtins.py:2643
1790
1899
msgid "Number of levels to display - 0 for all, 1 for flat."
1793
#: bzrlib/builtins.py:2560
1902
#: bzrlib/builtins.py:2653
1794
1903
msgid "Limit the output to the first N revisions."
1797
#: bzrlib/builtins.py:2565
1906
#: bzrlib/builtins.py:2658
1798
1907
msgid "Show changes made in each revision as a patch."
1908
msgstr "Mostrar alterações feitas em cada revisão como um caminho."
1801
#: bzrlib/builtins.py:2567
1910
#: bzrlib/builtins.py:2660
1802
1911
msgid "Show merged revisions like --levels 0 does."
1805
#: bzrlib/builtins.py:2571
1914
#: bzrlib/builtins.py:2664
1806
1915
msgid "Do not report commits with more than one parent."
1809
#: bzrlib/builtins.py:2573
1918
#: bzrlib/builtins.py:2666
1811
1920
"Display only the revisions that are not part of both ancestries (require -"
1815
#: bzrlib/builtins.py:2577
1924
#: bzrlib/builtins.py:2670
1816
1925
msgid "Show digital signature validity."
1926
msgstr "Mostrar a validade da assinatura digital."
1819
#: bzrlib/builtins.py:2580
1928
#: bzrlib/builtins.py:2673
1820
1929
msgid "Show revisions whose properties match this expression."
1823
#: bzrlib/builtins.py:2584
1932
#: bzrlib/builtins.py:2677
1824
1933
msgid "Show revisions whose message matches this expression."
1827
#: bzrlib/builtins.py:2588
1936
#: bzrlib/builtins.py:2681
1828
1937
msgid "Show revisions whose committer matches this expression."
1831
#: bzrlib/builtins.py:2592
1940
#: bzrlib/builtins.py:2685
1832
1941
msgid "Show revisions whose authors match this expression."
1835
#: bzrlib/builtins.py:2596
1944
#: bzrlib/builtins.py:2689
1836
1945
msgid "Show revisions whose bugs match this expression."
1839
#: bzrlib/builtins.py:2650
1948
#: bzrlib/builtins.py:2743
1840
1949
msgid "--exclude-common-ancestry requires -r with two revisions"
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"
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."
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."
1858
#: bzrlib/builtins.py:2856
1967
#: bzrlib/builtins.py:2949
1860
1969
"List files in a tree.\n"
1972
"Lista os arquivos em uma árvore.\n"
1864
#: bzrlib/builtins.py:2865
1975
#: bzrlib/builtins.py:2958
1865
1976
msgid "Recurse into subdirectories."
1868
#: bzrlib/builtins.py:2867
1979
#: bzrlib/builtins.py:2960
1869
1980
msgid "Print paths relative to the root of the branch."
1872
#: bzrlib/builtins.py:2869
1983
#: bzrlib/builtins.py:2962
1873
1984
msgid "Print unknown files."
1985
msgstr "Imprimir arquivos desconhecidos."
1876
#: bzrlib/builtins.py:2870
1987
#: bzrlib/builtins.py:2963
1877
1988
msgid "Print versioned files."
1989
msgstr "Imprimir arquivos versionados."
1880
#: bzrlib/builtins.py:2873
1991
#: bzrlib/builtins.py:2966
1881
1992
msgid "Print ignored files."
1993
msgstr "Imprimir arquivos ignorados."
1884
#: bzrlib/builtins.py:2875
1995
#: bzrlib/builtins.py:2968
1885
1996
msgid "List entries of a particular kind: file, directory, symlink."
1888
#: bzrlib/builtins.py:2888
1999
#: bzrlib/builtins.py:2981
1889
2000
msgid "invalid kind specified"
1892
#: bzrlib/builtins.py:2891
2003
#: bzrlib/builtins.py:2984
1893
2004
msgid "Cannot set both --verbose and --null"
1896
#: bzrlib/builtins.py:2900
2007
#: bzrlib/builtins.py:2993
1897
2008
msgid "cannot specify both --from-root and PATH"
1900
#: bzrlib/builtins.py:2987
2011
#: bzrlib/builtins.py:3080
1901
2012
msgid "Ignore specified files or patterns."
1904
#: bzrlib/builtins.py:2989
2015
#: bzrlib/builtins.py:3082
1905
2016
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1908
#: bzrlib/builtins.py:2991
2019
#: bzrlib/builtins.py:3084
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"
1952
2063
" the shell on Unix."
1955
#: bzrlib/builtins.py:3020
2066
#: bzrlib/builtins.py:3113
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."
1961
#: bzrlib/builtins.py:3023
2072
#: bzrlib/builtins.py:3116
1964
2075
" Ignore the top level Makefile::"
1967
#: bzrlib/builtins.py:3026
2078
#: bzrlib/builtins.py:3119
1968
2079
msgid " bzr ignore ./Makefile"
2080
msgstr " bzr ignore ./Makefile"
1971
#: bzrlib/builtins.py:3028
2082
#: bzrlib/builtins.py:3121
1972
2083
msgid " Ignore .class files in all directories...::"
1975
#: bzrlib/builtins.py:3030
2086
#: bzrlib/builtins.py:3123
1976
2087
msgid " bzr ignore \"*.class\""
2088
msgstr " bzr ignore \"*.class\""
1979
#: bzrlib/builtins.py:3032
2090
#: bzrlib/builtins.py:3125
1980
2091
msgid " ...but do not ignore \"special.class\"::"
1983
#: bzrlib/builtins.py:3034
2094
#: bzrlib/builtins.py:3127
1984
2095
msgid " bzr ignore \"!special.class\""
2096
msgstr " bzr ignore \"!special.class\""
1987
#: bzrlib/builtins.py:3036
2098
#: bzrlib/builtins.py:3129
1988
2099
msgid " Ignore files whose name begins with the \"#\" character::"
1991
#: bzrlib/builtins.py:3038
2102
#: bzrlib/builtins.py:3131
1992
2103
msgid " bzr ignore \"RE:^#\""
2104
msgstr " bzr ignore \"RE:^#\""
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::"
1999
#: bzrlib/builtins.py:3042
2110
#: bzrlib/builtins.py:3135
2000
2111
msgid " bzr ignore \"lib/**/*.o\""
2112
msgstr " bzr ignore \"lib/**/*.o\""
2003
#: bzrlib/builtins.py:3046
2114
#: bzrlib/builtins.py:3139
2004
2115
msgid " bzr ignore \"RE:lib/.*\\.o\""
2116
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2007
#: bzrlib/builtins.py:3048
2118
#: bzrlib/builtins.py:3141
2008
2119
msgid " Ignore everything but the \"debian\" toplevel directory::"
2011
#: bzrlib/builtins.py:3050
2122
#: bzrlib/builtins.py:3143
2013
2124
" bzr ignore \"RE:(?!debian/).*\"\n"
2052
#: bzrlib/builtins.py:3116
2163
#: bzrlib/builtins.py:3209
2053
2164
msgid "List ignored files and the patterns that matched them."
2056
#: bzrlib/builtins.py:3118
2167
#: bzrlib/builtins.py:3211
2058
2169
"List all the ignored files and the ignore pattern that caused the file to\n"
2062
#: bzrlib/builtins.py:3121
2173
#: bzrlib/builtins.py:3214
2063
2174
msgid "Alternatively, to list just the files::"
2066
#: bzrlib/builtins.py:3123
2177
#: bzrlib/builtins.py:3216
2067
2178
msgid " bzr ls --ignored"
2179
msgstr " bzr ls --ignored"
2070
#: bzrlib/builtins.py:3157
2181
#: bzrlib/builtins.py:3250
2071
2182
#, python-format
2072
2183
msgid "not a valid revision-number: %r"
2075
#: bzrlib/builtins.py:3164
2186
#: bzrlib/builtins.py:3257
2077
2188
"Export current or past revision to a destination directory or archive."
2080
#: bzrlib/builtins.py:3166
2191
#: bzrlib/builtins.py:3259
2081
2192
msgid "If no revision is specified this exports the last committed revision."
2084
#: bzrlib/builtins.py:3168
2195
#: bzrlib/builtins.py:3261
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)."
2091
#: bzrlib/builtins.py:3172
2202
#: bzrlib/builtins.py:3265
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."
2098
#: bzrlib/builtins.py:3176
2209
#: bzrlib/builtins.py:3269
2100
2211
"If branch is omitted then the branch containing the current working\n"
2101
2212
"directory will be used."
2104
#: bzrlib/builtins.py:3179
2215
#: bzrlib/builtins.py:3272
2106
2217
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2109
#: bzrlib/builtins.py:3181
2220
#: bzrlib/builtins.py:3274
2111
2222
" ================= =========================\n"
2112
2223
" Supported formats Autodetected by extension\n"
2119
2230
" ================= ========================="
2122
#: bzrlib/builtins.py:3195
2233
#: bzrlib/builtins.py:3288
2123
2234
msgid "Type of file to export to."
2126
#: bzrlib/builtins.py:3198
2237
#: bzrlib/builtins.py:3291
2127
2238
msgid "Apply content filters to export the convenient form."
2130
#: bzrlib/builtins.py:3202
2241
#: bzrlib/builtins.py:3295
2131
2242
msgid "Name of the root directory inside the exported file."
2134
#: bzrlib/builtins.py:3204
2245
#: bzrlib/builtins.py:3297
2136
2247
"Set modification time of files to that of the last revision in which it was "
2140
#: bzrlib/builtins.py:3207
2251
#: bzrlib/builtins.py:3300
2142
2253
"Export the working tree contents rather than that of the last revision."
2145
#: bzrlib/builtins.py:3226
2256
#: bzrlib/builtins.py:3319
2146
2257
msgid "--uncommitted requires a working tree"
2149
#: bzrlib/builtins.py:3235
2260
#: bzrlib/builtins.py:3328
2150
2261
#, python-format
2151
2262
msgid "Unsupported export format: %s"
2154
#: bzrlib/builtins.py:3239
2265
#: bzrlib/builtins.py:3332
2156
2267
"Write the contents of a file as of a given revision to standard output."
2159
#: bzrlib/builtins.py:3241
2270
#: bzrlib/builtins.py:3334
2160
2271
msgid "If no revision is nominated, the last revision is used."
2163
#: bzrlib/builtins.py:3243
2274
#: bzrlib/builtins.py:3336
2165
2276
"Note: Take care to redirect standard output when using this command on a\n"
2169
#: bzrlib/builtins.py:3249
2280
#: bzrlib/builtins.py:3342
2170
2281
msgid "The path name in the old tree."
2173
#: bzrlib/builtins.py:3250
2284
#: bzrlib/builtins.py:3343
2174
2285
msgid "Apply content filters to display the convenience form."
2177
#: bzrlib/builtins.py:3261
2288
#: bzrlib/builtins.py:3354
2178
2289
msgid "bzr cat --revision takes exactly one revision specifier"
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}"
2185
#: bzrlib/builtins.py:3321
2296
#: bzrlib/builtins.py:3414
2186
2297
msgid "Commit changes into a new revision."
2189
#: bzrlib/builtins.py:3323
2300
#: bzrlib/builtins.py:3416
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."
2199
#: bzrlib/builtins.py:3330
2310
#: bzrlib/builtins.py:3423
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."
2206
#: bzrlib/builtins.py:3334
2317
#: bzrlib/builtins.py:3427
2207
2318
msgid ":Selective commits:"
2210
#: bzrlib/builtins.py:3336
2321
#: bzrlib/builtins.py:3429
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."
2217
#: bzrlib/builtins.py:3340
2328
#: bzrlib/builtins.py:3433
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::"
2224
#: bzrlib/builtins.py:3344
2335
#: bzrlib/builtins.py:3437
2225
2336
msgid " bzr commit foo -x foo/bar"
2337
msgstr " bzr commit foo -x foo/bar"
2228
#: bzrlib/builtins.py:3346
2339
#: bzrlib/builtins.py:3439
2229
2340
msgid " A selective commit after a merge is not yet supported."
2232
#: bzrlib/builtins.py:3348
2343
#: bzrlib/builtins.py:3441
2233
2344
msgid ":Custom authors:"
2236
#: bzrlib/builtins.py:3350
2347
#: bzrlib/builtins.py:3443
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"
2275
2386
" one or more bugs. See ``bzr help bugs`` for details."
2278
#: bzrlib/builtins.py:3381
2389
#: bzrlib/builtins.py:3474
2279
2390
msgid "Do not consider changes made to a given path."
2282
#: bzrlib/builtins.py:3384
2393
#: bzrlib/builtins.py:3477
2283
2394
msgid "Description of the new revision."
2395
msgstr "Descrição da nova revisão."
2286
#: bzrlib/builtins.py:3387
2397
#: bzrlib/builtins.py:3480
2287
2398
msgid "Commit even if nothing has changed."
2399
msgstr "Usar commit, mesmo que nada tenha mudado."
2290
#: bzrlib/builtins.py:3391
2401
#: bzrlib/builtins.py:3484
2291
2402
msgid "Take commit message from this file."
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."
2298
#: bzrlib/builtins.py:3396
2409
#: bzrlib/builtins.py:3489
2300
2411
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2301
2412
"08:00:00 +0100'."
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\")."
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."
2312
#: bzrlib/builtins.py:3405
2423
#: bzrlib/builtins.py:3498
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."
2318
#: bzrlib/builtins.py:3411
2429
#: bzrlib/builtins.py:3504
2320
2431
"When no message is supplied, show the diff along with the status summary in "
2321
2432
"the message editor."
2324
#: bzrlib/builtins.py:3414
2435
#: bzrlib/builtins.py:3507
2326
2437
"When committing to a foreign version control system do not push data that "
2327
2438
"can not be natively represented."
2330
#: bzrlib/builtins.py:3432
2441
#: bzrlib/builtins.py:3525
2331
2442
#, python-format
2333
2444
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2343
2454
"Commit refused."
2346
#: bzrlib/builtins.py:3450
2457
#: bzrlib/builtins.py:3543
2347
2458
#, python-format
2348
2459
msgid "Unrecognized bug %s. Commit refused."
2351
#: bzrlib/builtins.py:3453
2462
#: bzrlib/builtins.py:3546
2352
2463
#, python-format
2355
2466
"Commit refused."
2358
#: bzrlib/builtins.py:3477
2469
#: bzrlib/builtins.py:3570
2359
2470
msgid "Could not parse --commit-time: "
2362
#: bzrlib/builtins.py:3517
2473
#: bzrlib/builtins.py:3610
2363
2474
msgid "please specify either --message or --file"
2366
#: bzrlib/builtins.py:3546
2477
#: bzrlib/builtins.py:3639
2367
2478
msgid "please specify a commit message with either --message or --file"
2370
#: bzrlib/builtins.py:3549
2481
#: bzrlib/builtins.py:3642
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 \"\"."
2376
#: bzrlib/builtins.py:3569
2487
#: bzrlib/builtins.py:3662
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."
2382
#: bzrlib/builtins.py:3573
2493
#: bzrlib/builtins.py:3666
2384
2495
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2385
2496
"resolve FILE\" to resolve."
2388
#: bzrlib/builtins.py:3577
2499
#: bzrlib/builtins.py:3670
2389
2500
msgid "Commit refused because there are unknown files in the working tree."
2392
#: bzrlib/builtins.py:3580
2503
#: bzrlib/builtins.py:3673
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."
2399
#: bzrlib/builtins.py:3588
2510
#: bzrlib/builtins.py:3681
2401
2512
"Validate working tree structure, branch consistency and repository history."
2404
#: bzrlib/builtins.py:3590
2515
#: bzrlib/builtins.py:3683
2406
2517
"This command checks various invariants about branch and repository storage\n"
2407
2518
"to detect data corruption or bzr bugs."
2410
#: bzrlib/builtins.py:3593
2521
#: bzrlib/builtins.py:3686
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:"
2416
#: bzrlib/builtins.py:3596
2527
#: bzrlib/builtins.py:3689
2419
2530
" This is just the number of revisions checked. It doesn't\n"
2420
2531
" indicate a problem."
2423
#: bzrlib/builtins.py:3600
2534
#: bzrlib/builtins.py:3693
2425
2536
"versionedfiles\n"
2426
2537
" This is just the number of versionedfiles checked. It\n"
2427
2538
" doesn't indicate a problem."
2430
#: bzrlib/builtins.py:3604
2541
#: bzrlib/builtins.py:3697
2432
2543
"unreferenced ancestors\n"
2433
2544
" Texts that are ancestors of other texts, but\n"
2451
2562
" indicate a problem."
2454
#: bzrlib/builtins.py:3619
2565
#: bzrlib/builtins.py:3712
2456
2567
"If no restrictions are specified, all Bazaar data that is found at the "
2458
2569
"location will be checked."
2461
#: bzrlib/builtins.py:3624
2572
#: bzrlib/builtins.py:3717
2462
2573
msgid " Check the tree and branch at 'foo'::"
2465
#: bzrlib/builtins.py:3626
2576
#: bzrlib/builtins.py:3719
2466
2577
msgid " bzr check --tree --branch foo"
2578
msgstr " bzr check --tree --branch foo"
2469
#: bzrlib/builtins.py:3628
2580
#: bzrlib/builtins.py:3721
2470
2581
msgid " Check only the repository at 'bar'::"
2473
#: bzrlib/builtins.py:3630
2584
#: bzrlib/builtins.py:3723
2474
2585
msgid " bzr check --repo bar"
2586
msgstr " bzr check --repo bar"
2477
#: bzrlib/builtins.py:3632
2588
#: bzrlib/builtins.py:3725
2478
2589
msgid " Check everything at 'baz'::"
2481
#: bzrlib/builtins.py:3634
2592
#: bzrlib/builtins.py:3727
2482
2593
msgid " bzr check baz"
2594
msgstr " bzr check baz"
2485
#: bzrlib/builtins.py:3640
2596
#: bzrlib/builtins.py:3733
2486
2597
msgid "Check the branch related to the current directory."
2489
#: bzrlib/builtins.py:3642
2600
#: bzrlib/builtins.py:3735
2490
2601
msgid "Check the repository related to the current directory."
2493
#: bzrlib/builtins.py:3644
2604
#: bzrlib/builtins.py:3737
2494
2605
msgid "Check the working tree related to the current directory."
2497
#: bzrlib/builtins.py:3658
2608
#: bzrlib/builtins.py:3751
2498
2609
msgid "Upgrade a repository, branch or working tree to a newer format."
2501
#: bzrlib/builtins.py:3660
2612
#: bzrlib/builtins.py:3753
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"
2539
#: bzrlib/builtins.py:3686
2650
#: bzrlib/builtins.py:3779
2541
2652
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2542
2653
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2545
#: bzrlib/builtins.py:3694
2656
#: bzrlib/builtins.py:3787
2546
2657
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2549
#: bzrlib/builtins.py:3698
2660
#: bzrlib/builtins.py:3791
2550
2661
msgid "Branch format"
2553
#: bzrlib/builtins.py:3700
2664
#: bzrlib/builtins.py:3793
2554
2665
msgid "Remove the backup.bzr directory if successful."
2557
#: bzrlib/builtins.py:3702
2668
#: bzrlib/builtins.py:3795
2558
2669
msgid "Show what would be done, but don't actually do anything."
2561
#: bzrlib/builtins.py:3717
2672
#: bzrlib/builtins.py:3810
2562
2673
msgid "Show or set bzr user id."
2565
#: bzrlib/builtins.py:3719
2676
#: bzrlib/builtins.py:3812
2568
2679
" Show the email of the current user::"
2571
#: bzrlib/builtins.py:3722
2682
#: bzrlib/builtins.py:3815
2572
2683
msgid " bzr whoami --email"
2684
msgstr " bzr whoami --email"
2575
#: bzrlib/builtins.py:3724
2686
#: bzrlib/builtins.py:3817
2576
2687
msgid " Set the current user::"
2579
#: bzrlib/builtins.py:3726
2690
#: bzrlib/builtins.py:3819
2580
2691
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2692
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2583
#: bzrlib/builtins.py:3730
2694
#: bzrlib/builtins.py:3823
2584
2695
msgid "Display email address only."
2696
msgstr "Mostra apenas o endereço de email."
2587
#: bzrlib/builtins.py:3732
2698
#: bzrlib/builtins.py:3825
2588
2699
msgid "Set identity for the current branch instead of globally."
2591
#: bzrlib/builtins.py:3758
2702
#: bzrlib/builtins.py:3851
2592
2703
msgid "--email can only be used to display existing identity"
2595
#: bzrlib/builtins.py:3780
2706
#: bzrlib/builtins.py:3873
2596
2707
msgid "Print or set the branch nickname."
2599
#: bzrlib/builtins.py:3782
2710
#: bzrlib/builtins.py:3875
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."
2605
#: bzrlib/builtins.py:3785
2716
#: bzrlib/builtins.py:3878
2607
2718
"Bound branches use the nickname of its master branch unless it is set\n"
2611
#: bzrlib/builtins.py:3805
2722
#: bzrlib/builtins.py:3898
2612
2723
msgid "Set/unset and display aliases."
2615
#: bzrlib/builtins.py:3807
2726
#: bzrlib/builtins.py:3900
2618
2729
" Show the current aliases::"
2732
" Mostra os atalhos atuais::"
2621
#: bzrlib/builtins.py:3810
2734
#: bzrlib/builtins.py:3903
2622
2735
msgid " bzr alias"
2625
#: bzrlib/builtins.py:3812
2738
#: bzrlib/builtins.py:3905
2626
2739
msgid " Show the alias specified for 'll'::"
2629
#: bzrlib/builtins.py:3814
2742
#: bzrlib/builtins.py:3907
2630
2743
msgid " bzr alias ll"
2744
msgstr " bzr alias ll"
2633
#: bzrlib/builtins.py:3816
2746
#: bzrlib/builtins.py:3909
2634
2747
msgid " Set an alias for 'll'::"
2637
#: bzrlib/builtins.py:3818
2750
#: bzrlib/builtins.py:3911
2638
2751
msgid " bzr alias ll=\"log --line -r-10..-1\""
2752
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2641
#: bzrlib/builtins.py:3820
2754
#: bzrlib/builtins.py:3913
2642
2755
msgid " To remove an alias for 'll'::"
2645
#: bzrlib/builtins.py:3822
2758
#: bzrlib/builtins.py:3915
2646
2759
msgid " bzr alias --remove ll"
2760
msgstr " bzr alias --remove ll"
2649
#: bzrlib/builtins.py:3827
2762
#: bzrlib/builtins.py:3920
2650
2763
msgid "Remove the alias."
2764
msgstr "Remove o atalho."
2653
#: bzrlib/builtins.py:3845
2766
#: bzrlib/builtins.py:3938
2654
2767
msgid "bzr alias --remove expects an alias to remove."
2657
#: bzrlib/builtins.py:4026
2770
#: bzrlib/builtins.py:4119
2659
2772
"subunit not available. subunit needs to be installed to use --subunit."
2662
#: bzrlib/builtins.py:4043
2775
#: bzrlib/builtins.py:4136
2664
2777
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2667
#: bzrlib/builtins.py:4090
2780
#: bzrlib/builtins.py:4183
2668
2781
msgid "Show version of bzr."
2782
msgstr "Mostra a versão do bzr."
2671
#: bzrlib/builtins.py:4094
2784
#: bzrlib/builtins.py:4187
2672
2785
msgid "Print just the version number."
2786
msgstr "Mostra apenas o número da versão."
2675
#: bzrlib/builtins.py:4113
2788
#: bzrlib/builtins.py:4206
2676
2789
msgid "It sure does!\n"
2679
#: bzrlib/builtins.py:4137
2792
#: bzrlib/builtins.py:4230
2680
2793
#, python-format
2681
2794
msgid "merge base is revision %s\n"
2684
#: bzrlib/builtins.py:4141
2797
#: bzrlib/builtins.py:4234
2685
2798
msgid "Perform a three-way merge."
2688
#: bzrlib/builtins.py:4143
2801
#: bzrlib/builtins.py:4236
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"
2761
2874
"merge revision which has more than two parents."
2764
#: bzrlib/builtins.py:4190
2877
#: bzrlib/builtins.py:4283
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."
2771
#: bzrlib/builtins.py:4194
2884
#: bzrlib/builtins.py:4287
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\"."
2777
#: bzrlib/builtins.py:4197
2890
#: bzrlib/builtins.py:4290
2780
2893
" To merge all new revisions from bzr.dev::"
2783
#: bzrlib/builtins.py:4200
2896
#: bzrlib/builtins.py:4293
2784
2897
msgid " bzr merge ../bzr.dev"
2898
msgstr " bzr merge ../bzr.dev"
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::"
2791
#: bzrlib/builtins.py:4204
2904
#: bzrlib/builtins.py:4297
2792
2905
msgid " bzr merge -r 82 ../bzr.dev"
2906
msgstr " bzr merge -r 82 ../bzr.dev"
2795
#: bzrlib/builtins.py:4206
2908
#: bzrlib/builtins.py:4299
2796
2909
msgid " To merge the changes introduced by 82, without previous changes::"
2799
#: bzrlib/builtins.py:4208
2912
#: bzrlib/builtins.py:4301
2800
2913
msgid " bzr merge -r 81..82 ../bzr.dev"
2914
msgstr " bzr merge -r 81..82 ../bzr.dev"
2803
#: bzrlib/builtins.py:4210
2916
#: bzrlib/builtins.py:4303
2804
2917
msgid " To apply a merge directive contained in /tmp/merge::"
2807
#: bzrlib/builtins.py:4212
2920
#: bzrlib/builtins.py:4305
2808
2921
msgid " bzr merge /tmp/merge"
2922
msgstr " bzr merge /tmp/merge"
2811
#: bzrlib/builtins.py:4214
2924
#: bzrlib/builtins.py:4307
2813
2926
" To create a merge revision with three parents from two branches\n"
2814
2927
" feature1a and feature1b:"
2817
#: bzrlib/builtins.py:4217
2930
#: bzrlib/builtins.py:4310
2819
2932
" bzr merge ../feature1a\n"
2820
2933
" bzr merge ../feature1b --force\n"
2821
2934
" bzr commit -m 'revision with three parents'"
2936
" bzr merge ../feature1a\n"
2937
" bzr merge ../feature1b --force\n"
2938
" bzr commit -m 'revisão com três pais'"
2824
#: bzrlib/builtins.py:4229
2940
#: bzrlib/builtins.py:4322
2825
2941
msgid "Merge even if the destination tree has uncommitted changes."
2828
#: bzrlib/builtins.py:4235
2944
#: bzrlib/builtins.py:4328
2830
2946
"Apply uncommitted changes from a working copy, instead of branch changes."
2833
#: bzrlib/builtins.py:4237
2949
#: bzrlib/builtins.py:4330
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."
2840
#: bzrlib/builtins.py:4242
2956
#: bzrlib/builtins.py:4335
2842
2958
"Branch to merge into, rather than the one containing the working directory."
2845
#: bzrlib/builtins.py:4244
2961
#: bzrlib/builtins.py:4337
2846
2962
msgid "Instead of merging, show a diff of the merge."
2849
#: bzrlib/builtins.py:4246
2965
#: bzrlib/builtins.py:4339
2850
2966
msgid "Select changes interactively."
2967
msgstr "Selecione mudanças interativamente."
2853
#: bzrlib/builtins.py:4268
2969
#: bzrlib/builtins.py:4361
2855
2971
"Merging into empty branches not currently supported, "
2856
2972
"https://bugs.launchpad.net/bzr/+bug/308562"
2859
#: bzrlib/builtins.py:4295
2975
#: bzrlib/builtins.py:4388
2860
2976
msgid "Cannot use --uncommitted with bundles or merge directives."
2863
#: bzrlib/builtins.py:4306
2979
#: bzrlib/builtins.py:4399
2864
2980
msgid "Cannot use --uncommitted and --revision at the same time."
2867
#: bzrlib/builtins.py:4326
2983
#: bzrlib/builtins.py:4419
2868
2984
msgid "merger: "
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."
2875
#: bzrlib/builtins.py:4332
2991
#: bzrlib/builtins.py:4425
2876
2992
msgid "Cannot pull individual files"
2993
msgstr "Não foi possível obter os arquivos individuais"
2879
#: bzrlib/builtins.py:4340
2995
#: bzrlib/builtins.py:4433
2880
2996
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
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"
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."
2893
#: bzrlib/builtins.py:4411
3009
#: bzrlib/builtins.py:4504
2894
3010
msgid "Cannot do conflict reduction and show base."
2897
#: bzrlib/builtins.py:4522
3013
#: bzrlib/builtins.py:4615
2898
3014
msgid "No location specified or remembered"
2901
#: bzrlib/builtins.py:4524
3017
#: bzrlib/builtins.py:4617
2902
3018
msgid "{0} remembered {1} location {2}"
2905
#: bzrlib/builtins.py:4530
3021
#: bzrlib/builtins.py:4623
2906
3022
msgid "Redo a merge."
2909
#: bzrlib/builtins.py:4532
3025
#: bzrlib/builtins.py:4625
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."
2916
#: bzrlib/builtins.py:4536
3032
#: bzrlib/builtins.py:4629
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."
2923
#: bzrlib/builtins.py:4540
3039
#: bzrlib/builtins.py:4633
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::"
2930
#: bzrlib/builtins.py:4544
3046
#: bzrlib/builtins.py:4637
2931
3047
msgid " bzr remerge --show-base"
3048
msgstr " bzr remerge --show-base"
2934
#: bzrlib/builtins.py:4546
3050
#: bzrlib/builtins.py:4639
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::"
2940
#: bzrlib/builtins.py:4549
3056
#: bzrlib/builtins.py:4642
2941
3057
msgid " bzr remerge --merge-type weave --reprocess foobar"
3058
msgstr " bzr remerge --merge-type weave --reprocess foobar"
2944
#: bzrlib/builtins.py:4556
3060
#: bzrlib/builtins.py:4649
2945
3061
msgid "Show base revision text in conflicts."
2948
#: bzrlib/builtins.py:4568
3064
#: bzrlib/builtins.py:4661
2950
3066
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2954
#: bzrlib/builtins.py:4624
3070
#: bzrlib/builtins.py:4717
2955
3071
msgid "Revert files to a previous revision."
2958
#: bzrlib/builtins.py:4626
3074
#: bzrlib/builtins.py:4719
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."
2965
#: bzrlib/builtins.py:4630
3081
#: bzrlib/builtins.py:4723
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"
3057
3173
" 0 - no missing revisions"
3060
#: bzrlib/builtins.py:4754
3176
#: bzrlib/builtins.py:4847
3062
3178
" Determine the missing revisions between this and the branch at the\n"
3063
3179
" remembered pull location::"
3066
#: bzrlib/builtins.py:4757
3182
#: bzrlib/builtins.py:4850
3067
3183
msgid " bzr missing"
3184
msgstr " bzr missing"
3070
#: bzrlib/builtins.py:4759
3186
#: bzrlib/builtins.py:4852
3071
3187
msgid " Determine the missing revisions between this and another branch::"
3074
#: bzrlib/builtins.py:4761
3190
#: bzrlib/builtins.py:4854
3075
3191
msgid " bzr missing http://server/branch"
3192
msgstr " bzr missing http://server/branch"
3078
#: bzrlib/builtins.py:4763
3194
#: bzrlib/builtins.py:4856
3080
3196
" Determine the missing revisions up to a specific revision on the other\n"
3084
#: bzrlib/builtins.py:4766
3200
#: bzrlib/builtins.py:4859
3085
3201
msgid " bzr missing -r ..-10"
3202
msgstr " bzr missing -r ..-10"
3088
#: bzrlib/builtins.py:4768
3204
#: bzrlib/builtins.py:4861
3090
3206
" Determine the missing revisions up to a specific revision on this\n"
3094
#: bzrlib/builtins.py:4771
3210
#: bzrlib/builtins.py:4864
3095
3211
msgid " bzr missing --my-revision ..-10"
3212
msgstr " bzr missing --my-revision ..-10"
3098
#: bzrlib/builtins.py:4778
3214
#: bzrlib/builtins.py:4871
3099
3215
msgid "Reverse the order of revisions."
3216
msgstr "Inverter a ordem das revisões"
3102
#: bzrlib/builtins.py:4780
3218
#: bzrlib/builtins.py:4873
3103
3219
msgid "Display changes in the local branch only."
3220
msgstr "Mostrar mudanças somente no ramo local."
3106
#: bzrlib/builtins.py:4781
3222
#: bzrlib/builtins.py:4874
3107
3223
msgid "Same as --mine-only."
3110
#: bzrlib/builtins.py:4783
3226
#: bzrlib/builtins.py:4876
3111
3227
msgid "Display changes in the remote branch only."
3228
msgstr "Mostrar alterações somente no ramo remoto."
3114
#: bzrlib/builtins.py:4784
3230
#: bzrlib/builtins.py:4877
3115
3231
msgid "Same as --theirs-only."
3118
#: bzrlib/builtins.py:4789
3234
#: bzrlib/builtins.py:4882
3120
3236
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3124
#: bzrlib/builtins.py:4793
3240
#: bzrlib/builtins.py:4886
3126
3242
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3130
#: bzrlib/builtins.py:4796
3246
#: bzrlib/builtins.py:4889
3131
3247
msgid "Show all revisions in addition to the mainline ones."
3134
#: bzrlib/builtins.py:4850
3250
#: bzrlib/builtins.py:4943
3135
3251
msgid "No peer location known or specified."
3138
#: bzrlib/builtins.py:4854
3254
#: bzrlib/builtins.py:4947
3139
3255
msgid "Using saved parent location: {0}\n"
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"
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"
3269
msgstr[0] "Você tem %d revisão pendente:\n"
3270
msgstr[1] "Você tem %d revisões pendentes:\n"
3156
#: bzrlib/builtins.py:4915
3272
#: bzrlib/builtins.py:5008
3157
3273
msgid "This branch has no new revisions.\n"
3274
msgstr "Esse ramo não tem novas revisões.\n"
3160
#: bzrlib/builtins.py:4918
3276
#: bzrlib/builtins.py:5011
3161
3277
msgid "Other branch has no new revisions.\n"
3278
msgstr "Outro ramo não tem novas revisões.\n"
3164
#: bzrlib/builtins.py:4923
3280
#: bzrlib/builtins.py:5016
3165
3281
msgid "Branches are up to date.\n"
3282
msgstr "Ramos estão atualizados.\n"
3168
#: bzrlib/builtins.py:4934
3284
#: bzrlib/builtins.py:5027
3169
3285
msgid "Compress the data within a repository."
3286
msgstr "Comprimir os dados em um repositório."
3172
#: bzrlib/builtins.py:4936
3288
#: bzrlib/builtins.py:5029
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."
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."
3179
#: bzrlib/builtins.py:4940
3298
#: bzrlib/builtins.py:5033
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"
3228
3347
"plugins using the Python programming language."
3231
#: bzrlib/builtins.py:4998
3350
#: bzrlib/builtins.py:5091
3232
3351
msgid "Show testament (signing-form) of a revision."
3235
#: bzrlib/builtins.py:5001
3354
#: bzrlib/builtins.py:5094
3236
3355
msgid "Produce long-format testament."
3239
#: bzrlib/builtins.py:5003
3358
#: bzrlib/builtins.py:5096
3240
3359
msgid "Produce a strict-format testament."
3243
#: bzrlib/builtins.py:5029
3362
#: bzrlib/builtins.py:5122
3244
3363
msgid "Show the origin of each line in a file."
3364
msgstr "Mostra a origem de cada linha em um arquivo."
3247
#: bzrlib/builtins.py:5031
3366
#: bzrlib/builtins.py:5124
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."
3253
#: bzrlib/builtins.py:5034
3372
#: bzrlib/builtins.py:5127
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."
3259
#: bzrlib/builtins.py:5042
3378
#: bzrlib/builtins.py:5135
3260
3379
msgid "Show annotations on all lines."
3380
msgstr "Mostrar anotações em todas as linhas."
3263
#: bzrlib/builtins.py:5043
3382
#: bzrlib/builtins.py:5136
3264
3383
msgid "Show commit date in annotations."
3267
#: bzrlib/builtins.py:5130
3386
#: bzrlib/builtins.py:5223
3268
3387
msgid "Cannot sign a range of non-revision-history revisions"
3271
#: bzrlib/builtins.py:5142
3390
#: bzrlib/builtins.py:5235
3272
3391
msgid "Please supply either one revision, or a range."
3275
#: bzrlib/builtins.py:5146
3394
#: bzrlib/builtins.py:5239
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."
3281
#: bzrlib/builtins.py:5149
3400
#: bzrlib/builtins.py:5242
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."
3287
#: bzrlib/builtins.py:5152
3406
#: bzrlib/builtins.py:5245
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."
3294
#: bzrlib/builtins.py:5167
3413
#: bzrlib/builtins.py:5260
3295
3414
msgid "No location supplied. This format does not remember old locations."
3416
"Sem localização fornecida. Este formato não se lembra de locais antigos."
3298
#: bzrlib/builtins.py:5172
3418
#: bzrlib/builtins.py:5265
3299
3419
msgid "Branch is already bound"
3420
msgstr "O ramo já está ligado."
3302
#: bzrlib/builtins.py:5174
3422
#: bzrlib/builtins.py:5267
3303
3423
msgid "No location supplied and no previous location known"
3306
#: bzrlib/builtins.py:5180
3426
#: bzrlib/builtins.py:5273
3307
3427
msgid "These branches have diverged. Try merging, and then bind again."
3310
#: bzrlib/builtins.py:5187
3430
#: bzrlib/builtins.py:5280
3311
3431
msgid "Convert the current checkout into a regular branch."
3314
#: bzrlib/builtins.py:5189
3434
#: bzrlib/builtins.py:5282
3316
3436
"After unbinding, the local branch is considered independent and subsequent\n"
3317
3437
"commits will be local only."
3320
#: bzrlib/builtins.py:5200
3440
#: bzrlib/builtins.py:5293
3321
3441
msgid "Local branch is not bound"
3442
msgstr "O ramo local náo está associado"
3324
#: bzrlib/builtins.py:5204
3444
#: bzrlib/builtins.py:5297
3325
3445
msgid "Remove the last committed revision."
3446
msgstr "Remover a última revisão submetida."
3328
#: bzrlib/builtins.py:5206
3448
#: bzrlib/builtins.py:5299
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."
3335
#: bzrlib/builtins.py:5210
3455
#: bzrlib/builtins.py:5303
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."
3342
#: bzrlib/builtins.py:5214
3462
#: bzrlib/builtins.py:5307
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"
3349
#: bzrlib/builtins.py:5225
3469
#: bzrlib/builtins.py:5318
3350
3470
msgid "Don't actually make changes."
3471
msgstr "Na verdade, não fazer alterações."
3353
#: bzrlib/builtins.py:5226
3473
#: bzrlib/builtins.py:5319
3354
3474
msgid "Say yes to all questions."
3475
msgstr "Diga sim para todas as questões."
3357
#: bzrlib/builtins.py:5228
3477
#: bzrlib/builtins.py:5321
3358
3478
msgid "Keep tags that point to removed revisions."
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."
3365
#: bzrlib/builtins.py:5279
3485
#: bzrlib/builtins.py:5372
3366
3486
msgid "No revisions to uncommit.\n"
3369
#: bzrlib/builtins.py:5294
3489
#: bzrlib/builtins.py:5387
3370
3490
msgid "Dry-run, pretending to remove the above revisions.\n"
3373
#: bzrlib/builtins.py:5297
3493
#: bzrlib/builtins.py:5390
3374
3494
msgid "The above revision(s) will be removed.\n"
3377
#: bzrlib/builtins.py:5301
3497
#: bzrlib/builtins.py:5394
3378
3498
msgid "Uncommit these revisions"
3381
#: bzrlib/builtins.py:5304
3501
#: bzrlib/builtins.py:5397
3382
3502
msgid "Canceled\n"
3503
msgstr "Cancelado\n"
3385
#: bzrlib/builtins.py:5311
3505
#: bzrlib/builtins.py:5404
3386
3506
#, python-format
3388
3508
"You can restore the old tip by running:\n"
3389
3509
" bzr pull . -r revid:%s\n"
3392
#: bzrlib/builtins.py:5316
3512
#: bzrlib/builtins.py:5409
3393
3513
msgid "Break a dead lock."
3396
#: bzrlib/builtins.py:5318
3516
#: bzrlib/builtins.py:5411
3398
3518
"This command breaks a lock on a repository, branch, working directory or\n"
3402
#: bzrlib/builtins.py:5321
3522
#: bzrlib/builtins.py:5414
3404
3524
"CAUTION: Locks should only be broken when you are sure that the process\n"
3405
3525
"holding the lock has been stopped."
3408
#: bzrlib/builtins.py:5324
3528
#: bzrlib/builtins.py:5417
3410
3530
"You can get information on what locks are open via the 'bzr info\n"
3411
3531
"[location]' command."
3414
#: bzrlib/builtins.py:5327
3534
#: bzrlib/builtins.py:5420
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"
3543
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3544
" bzr break-lock --conf ~/.bazaar"
3422
#: bzrlib/builtins.py:5336
3546
#: bzrlib/builtins.py:5429
3423
3547
msgid "LOCATION is the directory where the config lock is."
3426
#: bzrlib/builtins.py:5338
3550
#: bzrlib/builtins.py:5431
3427
3551
msgid "Do not ask for confirmation before breaking the lock."
3430
#: bzrlib/builtins.py:5373
3554
#: bzrlib/builtins.py:5466
3431
3555
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3434
#: bzrlib/builtins.py:5374
3558
#: bzrlib/builtins.py:5467
3435
3559
msgid "Run the bzr server."
3560
msgstr "Execute o servidor bzr."
3438
#: bzrlib/builtins.py:5380
3562
#: bzrlib/builtins.py:5473
3439
3563
msgid "Serve on stdin/out for use from inetd or sshd."
3442
#: bzrlib/builtins.py:5381
3566
#: bzrlib/builtins.py:5474
3443
3567
msgid "protocol"
3446
#: bzrlib/builtins.py:5382
3570
#: bzrlib/builtins.py:5475
3447
3571
msgid "Protocol to serve."
3450
#: bzrlib/builtins.py:5386
3574
#: bzrlib/builtins.py:5479
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."
3457
#: bzrlib/builtins.py:5392
3581
#: bzrlib/builtins.py:5485
3458
3582
msgid "Serve contents of this directory."
3461
#: bzrlib/builtins.py:5394
3585
#: bzrlib/builtins.py:5487
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."
3470
#: bzrlib/builtins.py:5403
3594
#: bzrlib/builtins.py:5496
3471
3595
msgid "Override the default idle client timeout (5min)."
3474
#: bzrlib/builtins.py:5453
3598
#: bzrlib/builtins.py:5546
3475
3599
msgid "Combine a tree into its containing tree."
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."
3482
#: bzrlib/builtins.py:5457
3606
#: bzrlib/builtins.py:5550
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.)"
3489
#: bzrlib/builtins.py:5461
3613
#: bzrlib/builtins.py:5554
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."
3496
#: bzrlib/builtins.py:5479
3620
#: bzrlib/builtins.py:5572
3497
3621
#, python-format
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."
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}"
3507
#: bzrlib/builtins.py:5499
3631
#: bzrlib/builtins.py:5592
3508
3632
msgid "Split a subdirectory of a tree into a separate tree."
3511
#: bzrlib/builtins.py:5501
3635
#: bzrlib/builtins.py:5594
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'."
3518
#: bzrlib/builtins.py:5505
3642
#: bzrlib/builtins.py:5598
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."
3525
#: bzrlib/builtins.py:5585
3649
#: bzrlib/builtins.py:5678
3526
3650
msgid "No submit branch specified or known"
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"
3655
msgstr "Nenhum ramo público especificado ou conhecido"
3533
#: bzrlib/builtins.py:5598
3657
#: bzrlib/builtins.py:5691
3534
3658
msgid "bzr merge-directive takes at most two one revision identifiers"
3537
#: bzrlib/builtins.py:5607
3661
#: bzrlib/builtins.py:5700
3538
3662
msgid "No revisions to bundle."
3541
#: bzrlib/builtins.py:5626
3665
#: bzrlib/builtins.py:5719
3542
3666
msgid "Mail or create a merge-directive for submitting changes."
3545
#: bzrlib/builtins.py:5628
3669
#: bzrlib/builtins.py:5721
3546
3670
msgid "A merge directive provides many things needed for requesting merges:"
3549
#: bzrlib/builtins.py:5630
3673
#: bzrlib/builtins.py:5723
3550
3674
msgid "* A machine-readable description of the merge to perform"
3553
#: bzrlib/builtins.py:5632
3677
#: bzrlib/builtins.py:5725
3554
3678
msgid "* An optional patch that is a preview of the changes requested"
3557
#: bzrlib/builtins.py:5634
3681
#: bzrlib/builtins.py:5727
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"
3564
#: bzrlib/builtins.py:5638
3688
#: bzrlib/builtins.py:5731
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. "
3570
#: bzrlib/builtins.py:5641
3694
#: bzrlib/builtins.py:5734
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."
3577
#: bzrlib/builtins.py:5645
3701
#: bzrlib/builtins.py:5738
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"
3666
3790
"set them, and use `bzr info` to display them."
3669
#: bzrlib/builtins.py:5720
3793
#: bzrlib/builtins.py:5813
3670
3794
msgid "Write merge directive to this file or directory; use - for stdout."
3673
#: bzrlib/builtins.py:5724
3797
#: bzrlib/builtins.py:5817
3675
3799
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3676
3800
"strict disables the check."
3679
#: bzrlib/builtins.py:5726
3803
#: bzrlib/builtins.py:5819
3680
3804
msgid "Mail the request to this address."
3683
#: bzrlib/builtins.py:5730
3807
#: bzrlib/builtins.py:5823
3684
3808
msgid "Body for the email."
3809
msgstr "Corpo para o e-mail."
3687
#: bzrlib/builtins.py:5783
3811
#: bzrlib/builtins.py:5876
3688
3812
msgid "Do not include a bundle in the merge directive."
3691
#: bzrlib/builtins.py:5784
3815
#: bzrlib/builtins.py:5877
3692
3816
msgid "Do not include a preview patch in the merge directive."
3695
#: bzrlib/builtins.py:5787
3819
#: bzrlib/builtins.py:5880
3696
3820
msgid "Remember submit and public branch."
3699
#: bzrlib/builtins.py:5789
3823
#: bzrlib/builtins.py:5882
3701
3825
"Branch to generate the submission from, rather than the one containing the "
3702
3826
"working directory."
3705
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3829
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3709
#: bzrlib/builtins.py:5800
3833
#: bzrlib/builtins.py:5893
3710
3834
msgid "Use the specified output format."
3713
#: bzrlib/builtins.py:5822
3837
#: bzrlib/builtins.py:5915
3714
3838
msgid "Create, remove or modify a tag naming a revision."
3717
#: bzrlib/builtins.py:5824
3841
#: bzrlib/builtins.py:5917
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"
3724
#: bzrlib/builtins.py:5828
3848
#: bzrlib/builtins.py:5921
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."
3730
#: bzrlib/builtins.py:5831
3854
#: bzrlib/builtins.py:5924
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."
3736
#: bzrlib/builtins.py:5834
3860
#: bzrlib/builtins.py:5927
3738
3862
"To rename a tag (change the name but keep it on the same revsion), run "
3740
3864
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3743
#: bzrlib/builtins.py:5837
3867
#: bzrlib/builtins.py:5930
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"
3751
#: bzrlib/builtins.py:5847
3875
#: bzrlib/builtins.py:5940
3752
3876
msgid "Delete this tag rather than placing it."
3755
#: bzrlib/builtins.py:5850
3879
#: bzrlib/builtins.py:5943
3756
3880
msgid "Branch in which to place the tag."
3759
#: bzrlib/builtins.py:5852
3883
#: bzrlib/builtins.py:5945
3760
3884
msgid "Replace existing tags."
3885
msgstr "Substituir as tags existentes."
3763
#: bzrlib/builtins.py:5867
3887
#: bzrlib/builtins.py:5960
3764
3888
msgid "No tag specified to delete."
3889
msgstr "Sem tag especifica para apagar."
3767
#: bzrlib/builtins.py:5869
3891
#: bzrlib/builtins.py:5962
3768
3892
#, python-format
3769
3893
msgid "Deleted tag %s."
3894
msgstr "Tag %s apagada."
3772
#: bzrlib/builtins.py:5883
3896
#: bzrlib/builtins.py:5976
3773
3897
msgid "Please specify a tag name."
3898
msgstr "Por favor, especifique o nome da tag."
3776
#: bzrlib/builtins.py:5891
3900
#: bzrlib/builtins.py:5984
3777
3901
#, python-format
3778
3902
msgid "Tag %s already exists for that revision."
3903
msgstr "A tag %s já existe para aquela revisão."
3781
#: bzrlib/builtins.py:5895
3905
#: bzrlib/builtins.py:5988
3782
3906
#, python-format
3783
3907
msgid "Created tag %s."
3908
msgstr "Tag %s criada."
3786
#: bzrlib/builtins.py:5897
3910
#: bzrlib/builtins.py:5990
3787
3911
#, python-format
3788
3912
msgid "Updated tag %s."
3913
msgstr "Tag %s atualizada."
3791
#: bzrlib/builtins.py:5901
3915
#: bzrlib/builtins.py:5994
3792
3916
msgid "List tags."
3917
msgstr "Lista de tags."
3795
#: bzrlib/builtins.py:5903
3919
#: bzrlib/builtins.py:5996
3797
3921
"This command shows a table of tag names and the revisions they reference."
3800
#: bzrlib/builtins.py:5909
3924
#: bzrlib/builtins.py:6002
3801
3925
msgid "Branch whose tags should be displayed."
3804
#: bzrlib/builtins.py:5911
3928
#: bzrlib/builtins.py:6004
3805
3929
msgid "Sort tags by different criteria."
3808
#: bzrlib/builtins.py:5911
3932
#: bzrlib/builtins.py:6004
3809
3933
msgid "Sorting"
3812
#: bzrlib/builtins.py:5980
3936
#: bzrlib/builtins.py:6073
3813
3937
msgid "Reconfigure the type of a bzr directory."
3816
#: bzrlib/builtins.py:5982
3940
#: bzrlib/builtins.py:6075
3817
3941
msgid "A target configuration must be specified."
3820
#: bzrlib/builtins.py:5984
3944
#: bzrlib/builtins.py:6077
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."
3831
#: bzrlib/builtins.py:5998
3955
#: bzrlib/builtins.py:6091
3832
3956
msgid "Tree type"
3835
#: bzrlib/builtins.py:5999
3959
#: bzrlib/builtins.py:6092
3836
3960
msgid "The relation between branch and tree."
3839
#: bzrlib/builtins.py:6001
3963
#: bzrlib/builtins.py:6094
3840
3964
msgid "Reconfigure to be an unbound branch with no working tree."
3843
#: bzrlib/builtins.py:6002
3967
#: bzrlib/builtins.py:6095
3844
3968
msgid "Reconfigure to be an unbound branch with a working tree."
3847
#: bzrlib/builtins.py:6003
3971
#: bzrlib/builtins.py:6096
3848
3972
msgid "Reconfigure to be a bound branch with a working tree."
3851
#: bzrlib/builtins.py:6004
3975
#: bzrlib/builtins.py:6097
3852
3976
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3855
#: bzrlib/builtins.py:6009
3979
#: bzrlib/builtins.py:6102
3856
3980
msgid "Repository type"
3981
msgstr "Tipo de repositório"
3859
#: bzrlib/builtins.py:6010
3983
#: bzrlib/builtins.py:6103
3860
3984
msgid "Location fo the repository."
3985
msgstr "Local para o repositório."
3863
#: bzrlib/builtins.py:6012
3987
#: bzrlib/builtins.py:6105
3865
3989
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3868
#: bzrlib/builtins.py:6014
3992
#: bzrlib/builtins.py:6107
3869
3993
msgid "Reconfigure to use a shared repository."
3994
msgstr "Reconfigurar para usar um repositório compartilhado."
3872
#: bzrlib/builtins.py:6018
3996
#: bzrlib/builtins.py:6111
3873
3997
msgid "Trees in Repository"
3876
#: bzrlib/builtins.py:6019
4000
#: bzrlib/builtins.py:6112
3877
4001
msgid "Whether new branches in the repository have trees."
3880
#: bzrlib/builtins.py:6021
4004
#: bzrlib/builtins.py:6114
3882
4006
"Reconfigure repository to create working trees on branches by default."
3885
#: bzrlib/builtins.py:6023
4009
#: bzrlib/builtins.py:6116
3887
4011
"Reconfigure repository to not create working trees on branches by default."
3890
#: bzrlib/builtins.py:6026
4014
#: bzrlib/builtins.py:6119
3891
4015
msgid "Branch to bind checkout to."
3894
#: bzrlib/builtins.py:6028
4018
#: bzrlib/builtins.py:6121
3895
4019
msgid "Perform reconfiguration even if local changes will be lost."
3898
#: bzrlib/builtins.py:6031
4022
#: bzrlib/builtins.py:6124
3899
4023
msgid "Reconfigure a branch to be stacked on another branch."
3902
#: bzrlib/builtins.py:6035
4026
#: bzrlib/builtins.py:6128
3904
4028
"Reconfigure a branch to be unstacked. This may require copying substantial "
3905
4029
"data into it."
3908
#: bzrlib/builtins.py:6045
4032
#: bzrlib/builtins.py:6138
3909
4033
msgid "Can't use both --stacked-on and --unstacked"
3912
#: bzrlib/builtins.py:6059
4036
#: bzrlib/builtins.py:6152
3913
4037
msgid "No target configuration specified"
3916
#: bzrlib/builtins.py:6094
4040
#: bzrlib/builtins.py:6187
3917
4041
msgid "Set the branch of a checkout and update."
3920
#: bzrlib/builtins.py:6096
4044
#: bzrlib/builtins.py:6189
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"
3996
4120
"want to switch back to your view after that."
3999
#: bzrlib/builtins.py:6228
4123
#: bzrlib/builtins.py:6281
4002
4126
" To define the current view::"
4005
#: bzrlib/builtins.py:6231
4129
#: bzrlib/builtins.py:6284
4006
4130
msgid " bzr view file1 dir1 ..."
4009
#: bzrlib/builtins.py:6233
4133
#: bzrlib/builtins.py:6286
4010
4134
msgid " To list the current view::"
4013
#: bzrlib/builtins.py:6235
4137
#: bzrlib/builtins.py:6288
4014
4138
msgid " bzr view"
4017
#: bzrlib/builtins.py:6237
4141
#: bzrlib/builtins.py:6290
4018
4142
msgid " To delete the current view::"
4021
#: bzrlib/builtins.py:6239
4145
#: bzrlib/builtins.py:6292
4022
4146
msgid " bzr view --delete"
4147
msgstr " bzr view --delete"
4025
#: bzrlib/builtins.py:6241
4149
#: bzrlib/builtins.py:6294
4026
4150
msgid " To disable the current view without deleting it::"
4029
#: bzrlib/builtins.py:6243
4153
#: bzrlib/builtins.py:6296
4030
4154
msgid " bzr view --switch off"
4155
msgstr " bzr view --switch off"
4033
#: bzrlib/builtins.py:6245
4157
#: bzrlib/builtins.py:6298
4034
4158
msgid " To define a named view and switch to it::"
4037
#: bzrlib/builtins.py:6247
4161
#: bzrlib/builtins.py:6300
4038
4162
msgid " bzr view --name view-name file1 dir1 ..."
4041
#: bzrlib/builtins.py:6249
4165
#: bzrlib/builtins.py:6302
4042
4166
msgid " To list a named view::"
4045
#: bzrlib/builtins.py:6251
4169
#: bzrlib/builtins.py:6304
4046
4170
msgid " bzr view --name view-name"
4171
msgstr " bzr view --name view-name"
4049
#: bzrlib/builtins.py:6253
4173
#: bzrlib/builtins.py:6306
4050
4174
msgid " To delete a named view::"
4053
#: bzrlib/builtins.py:6255
4177
#: bzrlib/builtins.py:6308
4054
4178
msgid " bzr view --name view-name --delete"
4179
msgstr " bzr view --name view-name --delete"
4057
#: bzrlib/builtins.py:6257
4181
#: bzrlib/builtins.py:6310
4058
4182
msgid " To switch to a named view::"
4061
#: bzrlib/builtins.py:6259
4185
#: bzrlib/builtins.py:6312
4062
4186
msgid " bzr view --switch view-name"
4187
msgstr " bzr view --switch view-name"
4065
#: bzrlib/builtins.py:6261
4189
#: bzrlib/builtins.py:6314
4066
4190
msgid " To list all views defined::"
4069
#: bzrlib/builtins.py:6263
4193
#: bzrlib/builtins.py:6316
4070
4194
msgid " bzr view --all"
4195
msgstr " bzr view --all"
4073
#: bzrlib/builtins.py:6265
4197
#: bzrlib/builtins.py:6318
4074
4198
msgid " To delete all views::"
4077
#: bzrlib/builtins.py:6267
4201
#: bzrlib/builtins.py:6320
4078
4202
msgid " bzr view --delete --all"
4203
msgstr " bzr view --delete --all"
4081
#: bzrlib/builtins.py:6274
4205
#: bzrlib/builtins.py:6327
4082
4206
msgid "Apply list or delete action to all views."
4085
#: bzrlib/builtins.py:6277
4209
#: bzrlib/builtins.py:6330
4086
4210
msgid "Delete the view."
4089
#: bzrlib/builtins.py:6280
4213
#: bzrlib/builtins.py:6333
4090
4214
msgid "Name of the view to define, list or delete."
4093
#: bzrlib/builtins.py:6284
4217
#: bzrlib/builtins.py:6337
4094
4218
msgid "Name of the view to switch to."
4097
#: bzrlib/builtins.py:6303
4221
#: bzrlib/builtins.py:6356
4098
4222
msgid "Both --delete and a file list specified"
4101
#: bzrlib/builtins.py:6306
4225
#: bzrlib/builtins.py:6359
4102
4226
msgid "Both --delete and --switch specified"
4105
#: bzrlib/builtins.py:6309
4229
#: bzrlib/builtins.py:6362
4106
4230
msgid "Deleted all views.\n"
4109
#: bzrlib/builtins.py:6311
4233
#: bzrlib/builtins.py:6364
4110
4234
msgid "No current view to delete"
4113
#: bzrlib/builtins.py:6314
4237
#: bzrlib/builtins.py:6367
4114
4238
#, python-format
4115
4239
msgid "Deleted '%s' view.\n"
4118
#: bzrlib/builtins.py:6318
4242
#: bzrlib/builtins.py:6371
4119
4243
msgid "Both --switch and a file list specified"
4122
#: bzrlib/builtins.py:6321
4246
#: bzrlib/builtins.py:6374
4123
4247
msgid "Both --switch and --all specified"
4126
#: bzrlib/builtins.py:6324
4250
#: bzrlib/builtins.py:6377
4127
4251
msgid "No current view to disable"
4130
#: bzrlib/builtins.py:6326
4254
#: bzrlib/builtins.py:6379
4131
4255
#, python-format
4132
4256
msgid "Disabled '%s' view.\n"
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"
4139
#: bzrlib/builtins.py:6333
4263
#: bzrlib/builtins.py:6386
4140
4264
msgid "Views defined:\n"
4143
#: bzrlib/builtins.py:6342
4267
#: bzrlib/builtins.py:6395
4144
4268
msgid "No views defined.\n"
4147
#: bzrlib/builtins.py:6349
4271
#: bzrlib/builtins.py:6402
4148
4272
msgid "Cannot change the 'off' pseudo view"
4151
#: bzrlib/builtins.py:6357
4275
#: bzrlib/builtins.py:6410
4152
4276
msgid "No current view.\n"
4155
#: bzrlib/builtins.py:6360
4279
#: bzrlib/builtins.py:6413
4156
4280
msgid "'{0}' view is: {1}\n"
4159
#: bzrlib/builtins.py:6380
4283
#: bzrlib/builtins.py:6433
4160
4284
msgid " <no hooks installed>\n"
4163
#: bzrlib/builtins.py:6384
4287
#: bzrlib/builtins.py:6437
4164
4288
msgid "Remove a branch."
4167
#: bzrlib/builtins.py:6386
4291
#: bzrlib/builtins.py:6439
4169
4293
"This will remove the branch from the specified location but \n"
4170
4294
"will keep any working tree or repository in place."
4173
#: bzrlib/builtins.py:6391
4297
#: bzrlib/builtins.py:6444
4174
4298
msgid " Remove the branch at repo/trunk::"
4177
#: bzrlib/builtins.py:6393
4301
#: bzrlib/builtins.py:6446
4178
4302
msgid " bzr remove-branch repo/trunk"
4181
#: bzrlib/builtins.py:6408
4305
#: bzrlib/builtins.py:6461
4182
4306
msgid "Plaintext diff output."
4185
#: bzrlib/builtins.py:6409
4309
#: bzrlib/builtins.py:6462
4186
4310
msgid "Temporarily set aside some changes from the current tree."
4189
#: bzrlib/builtins.py:6411
4313
#: bzrlib/builtins.py:6464
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"
4247
#: bzrlib/builtins.py:6450
4371
#: bzrlib/builtins.py:6503
4248
4372
msgid "Shelve all changes."
4251
#: bzrlib/builtins.py:6452
4375
#: bzrlib/builtins.py:6505
4252
4376
msgid "Method to use for writing diffs."
4255
#: bzrlib/builtins.py:6452
4379
#: bzrlib/builtins.py:6505
4259
#: bzrlib/builtins.py:6456
4383
#: bzrlib/builtins.py:6509
4260
4384
msgid "List shelved changes."
4263
#: bzrlib/builtins.py:6458
4387
#: bzrlib/builtins.py:6511
4264
4388
msgid "Destroy removed changes instead of shelving them."
4267
#: bzrlib/builtins.py:6487
4391
#: bzrlib/builtins.py:6540
4268
4392
msgid "No shelved changes."
4271
#: bzrlib/builtins.py:6498
4395
#: bzrlib/builtins.py:6551
4272
4396
msgid "Restore shelved changes."
4275
#: bzrlib/builtins.py:6500
4399
#: bzrlib/builtins.py:6553
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."
4282
#: bzrlib/builtins.py:6509
4406
#: bzrlib/builtins.py:6562
4283
4407
msgid "The action to perform."
4286
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4410
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4290
#: bzrlib/builtins.py:6511
4414
#: bzrlib/builtins.py:6564
4291
4415
msgid "Apply changes and remove from the shelf."
4294
#: bzrlib/builtins.py:6512
4418
#: bzrlib/builtins.py:6565
4295
4419
msgid "Show changes, but do not apply or remove them."
4298
#: bzrlib/builtins.py:6513
4422
#: bzrlib/builtins.py:6566
4300
4424
"Instead of unshelving the changes, show the diff that would result from "
4304
#: bzrlib/builtins.py:6515
4428
#: bzrlib/builtins.py:6568
4305
4429
msgid "Delete changes without applying them."
4308
#: bzrlib/builtins.py:6516
4432
#: bzrlib/builtins.py:6569
4309
4433
msgid "Apply changes but don't delete them."
4312
#: bzrlib/builtins.py:6531
4436
#: bzrlib/builtins.py:6584
4313
4437
msgid "Remove unwanted files from working tree."
4316
#: bzrlib/builtins.py:6533
4440
#: bzrlib/builtins.py:6586
4318
4442
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4319
4443
"files are never deleted."
4322
#: bzrlib/builtins.py:6536
4446
#: bzrlib/builtins.py:6589
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"
4329
#: bzrlib/builtins.py:6540
4453
#: bzrlib/builtins.py:6593
4331
4455
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4332
4456
"flags are respected, and may be combined."
4335
#: bzrlib/builtins.py:6543
4459
#: bzrlib/builtins.py:6596
4336
4460
msgid "To check what clean-tree will do, use --dry-run."
4339
#: bzrlib/builtins.py:6546
4463
#: bzrlib/builtins.py:6599
4340
4464
msgid "Delete all ignored files."
4343
#: bzrlib/builtins.py:6547
4467
#: bzrlib/builtins.py:6600
4345
4469
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4348
#: bzrlib/builtins.py:6550
4472
#: bzrlib/builtins.py:6603
4349
4473
msgid "Delete files unknown to bzr (default)."
4352
#: bzrlib/builtins.py:6551
4476
#: bzrlib/builtins.py:6604
4353
4477
msgid "Show files to delete instead of deleting them."
4356
#: bzrlib/builtins.py:6553
4480
#: bzrlib/builtins.py:6606
4357
4481
msgid "Do not prompt before deleting."
5248
#: bzrlib/errors.py:799
5386
#: bzrlib/errors.py:809
5249
5387
msgid "Revision is not compatible with %(repo_format)s"
5252
#: bzrlib/errors.py:809
5390
#: bzrlib/errors.py:819
5253
5391
msgid "%(context_info)s%(path)s is already versioned."
5256
#: bzrlib/errors.py:830
5394
#: bzrlib/errors.py:840
5257
5395
msgid "%(context_info)s%(path)s is not versioned."
5260
#: bzrlib/errors.py:851
5398
#: bzrlib/errors.py:861
5261
5399
msgid "Path(s) are not versioned: %(paths_as_string)s"
5264
#: bzrlib/errors.py:862
5402
#: bzrlib/errors.py:872
5265
5403
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5268
#: bzrlib/errors.py:881
5406
#: bzrlib/errors.py:891
5269
5407
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5272
#: bzrlib/errors.py:889
5410
#: bzrlib/errors.py:899
5274
5412
"Filename %(filename)r is not valid in your current filesystem encoding "
5275
5413
"%(fs_encoding)s"
5278
#: bzrlib/errors.py:900
5416
#: bzrlib/errors.py:910
5279
5417
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
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."
5286
#: bzrlib/errors.py:957
5424
#: bzrlib/errors.py:967
5287
5425
msgid "Cannot lock %(lock)s: %(why)s"
5290
#: bzrlib/errors.py:967
5428
#: bzrlib/errors.py:977
5292
5430
"A transaction related operation was attempted after the transaction finished."
5295
#: bzrlib/errors.py:994
5433
#: bzrlib/errors.py:1004
5296
5434
msgid "Cannot lock: transport is read only: %(transport)s"
5299
#: bzrlib/errors.py:1002
5437
#: bzrlib/errors.py:1012
5300
5438
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5303
#: bzrlib/errors.py:1013
5441
#: bzrlib/errors.py:1023
5305
5443
"Lock was broken while still open: %(lock)s - check storage consistency!"
5308
#: bzrlib/errors.py:1024
5446
#: bzrlib/errors.py:1034
5310
5448
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5311
5449
"%(holder)r, wanted to break %(target)r"
5314
#: bzrlib/errors.py:1036
5452
#: bzrlib/errors.py:1046
5316
5454
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5317
5455
"Use 'bzr break-lock' to clear it"
5320
#: bzrlib/errors.py:1049
5458
#: bzrlib/errors.py:1059
5321
5459
msgid "Lock not held: %(lock)s"
5324
#: bzrlib/errors.py:1078
5462
#: bzrlib/errors.py:1088
5325
5463
msgid "No changes to commit"
5328
#: bzrlib/errors.py:1083
5466
#: bzrlib/errors.py:1093
5330
5468
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5333
#: bzrlib/errors.py:1093
5471
#: bzrlib/errors.py:1103
5335
5473
"Excluding paths during commit is not supported by repository at "
5336
5474
"%(repository)r."
5339
#: bzrlib/errors.py:1102
5477
#: bzrlib/errors.py:1112
5341
5479
"The specified commit message contains characters unsupported by the current "
5345
#: bzrlib/errors.py:1108
5483
#: bzrlib/errors.py:1118
5346
5484
msgid "Upgrade URL cannot work with readonly URLs."
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."
5353
#: bzrlib/errors.py:1136
5491
#: bzrlib/errors.py:1146
5354
5492
msgid "Option --change does not accept revision ranges"
5357
#: bzrlib/errors.py:1141
5495
#: bzrlib/errors.py:1151
5358
5496
msgid "No namespace registered for string: %(spec)r"
5361
#: bzrlib/errors.py:1160
5499
#: bzrlib/errors.py:1170
5363
5501
"Requested revision: '%(spec)s' does not exist in branch: "
5364
5502
"%(branch_url)s%(extra)s"
5367
#: bzrlib/errors.py:1174
5505
#: bzrlib/errors.py:1184
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\"."
5373
#: bzrlib/errors.py:1185
5511
#: bzrlib/errors.py:1195
5375
5513
"These branches have diverged. Use the missing command to see how.\n"
5376
5514
"Use the merge command to reconcile them."
5379
#: bzrlib/errors.py:1205
5517
#: bzrlib/errors.py:1215
5381
5519
"Branches have no common ancestor, and no merge base revision was specified."
5384
#: bzrlib/errors.py:1211
5522
#: bzrlib/errors.py:1221
5386
5524
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5389
#: bzrlib/errors.py:1217
5527
#: bzrlib/errors.py:1227
5390
5528
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5393
#: bzrlib/errors.py:1226
5531
#: bzrlib/errors.py:1236
5395
5533
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
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"
5402
#: bzrlib/errors.py:1244
5540
#: bzrlib/errors.py:1254
5403
5541
msgid "Branch %(branch)s has no commits."
5406
#: bzrlib/errors.py:1262
5544
#: bzrlib/errors.py:1272
5408
5546
"Bound branch %(branch)s is out of date with master branch "
5409
5547
"%(master)s.%(extra_help)s"
5412
#: bzrlib/errors.py:1274
5550
#: bzrlib/errors.py:1284
5414
5552
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5415
5553
"bound to %(remote)s."
5418
#: bzrlib/errors.py:1286
5556
#: bzrlib/errors.py:1296
5419
5557
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5422
#: bzrlib/errors.py:1295
5560
#: bzrlib/errors.py:1305
5424
5562
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5428
#: bzrlib/errors.py:1307
5566
#: bzrlib/errors.py:1317
5429
5567
msgid "Error in processing weave: %(msg)s"
5432
#: bzrlib/errors.py:1316
5570
#: bzrlib/errors.py:1326
5433
5571
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5436
#: bzrlib/errors.py:1327
5574
#: bzrlib/errors.py:1337
5437
5575
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5440
#: bzrlib/errors.py:1337
5578
#: bzrlib/errors.py:1347
5441
5579
msgid "Weave invariant violated: %(what)s"
5444
#: bzrlib/errors.py:1346
5582
#: bzrlib/errors.py:1356
5445
5583
msgid "Parents are mismatched between two revisions. %(msg)s"
5448
#: bzrlib/errors.py:1368
5586
#: bzrlib/errors.py:1378
5450
5588
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5454
#: bzrlib/errors.py:1380
5592
#: bzrlib/errors.py:1390
5455
5593
msgid "Versioned file error"
5458
#: bzrlib/errors.py:1385
5596
#: bzrlib/errors.py:1395
5459
5597
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5462
#: bzrlib/errors.py:1395
5600
#: bzrlib/errors.py:1405
5463
5601
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5466
#: bzrlib/errors.py:1405
5604
#: bzrlib/errors.py:1415
5467
5605
msgid "Text did not match its checksum: %(msg)s"
5470
#: bzrlib/errors.py:1531
5608
#: bzrlib/errors.py:1541
5471
5609
msgid "Export format %(format)r not supported"
5474
#: bzrlib/errors.py:1540
5612
#: bzrlib/errors.py:1550
5475
5613
msgid "Transport error: %(msg)s %(orig_error)s"
5478
#: bzrlib/errors.py:1566
5616
#: bzrlib/errors.py:1576
5479
5617
msgid "Generic bzr smart protocol error: %(details)s"
5482
#: bzrlib/errors.py:1574
5620
#: bzrlib/errors.py:1584
5483
5621
msgid "Received bad protocol version marker: %(marker)r"
5486
#: bzrlib/errors.py:1606
5624
#: bzrlib/errors.py:1616
5487
5625
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5490
#: bzrlib/errors.py:1611
5628
#: bzrlib/errors.py:1621
5491
5629
msgid "Connection error: %(msg)s %(orig_error)s"
5494
#: bzrlib/errors.py:1616
5632
#: bzrlib/errors.py:1626
5495
5633
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5498
#: bzrlib/errors.py:1637
5636
#: bzrlib/errors.py:1647
5499
5637
msgid "Connection closed: %(msg)s %(orig_error)s"
5502
#: bzrlib/errors.py:1642
5640
#: bzrlib/errors.py:1652
5503
5641
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5506
#: bzrlib/errors.py:1647
5644
#: bzrlib/errors.py:1657
5507
5645
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5510
#: bzrlib/errors.py:1657
5648
#: bzrlib/errors.py:1667
5511
5649
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5514
#: bzrlib/errors.py:1672
5652
#: bzrlib/errors.py:1682
5653
msgid "Certificate error: %(error)s"
5656
#: bzrlib/errors.py:1690
5515
5657
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5518
#: bzrlib/errors.py:1686
5660
#: bzrlib/errors.py:1704
5519
5661
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5522
#: bzrlib/errors.py:1694
5664
#: bzrlib/errors.py:1712
5523
5665
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5526
#: bzrlib/errors.py:1703
5668
#: bzrlib/errors.py:1721
5527
5669
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5530
#: bzrlib/errors.py:1717
5672
#: bzrlib/errors.py:1735
5531
5673
msgid "Too many redirections"
5534
#: bzrlib/errors.py:1722
5676
#: bzrlib/errors.py:1740
5535
5677
msgid "Working tree has conflicts."
5538
#: bzrlib/errors.py:1726
5680
#: bzrlib/errors.py:1744
5539
5681
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5542
#: bzrlib/errors.py:1735
5684
#: bzrlib/errors.py:1753
5544
5686
"Error(s) parsing config file %(filename)s:\n"
5548
#: bzrlib/errors.py:1746
5549
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5690
#: bzrlib/errors.py:1763
5692
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5693
"See ``bzr help %(name)s``"
5552
#: bzrlib/errors.py:1754
5696
#: bzrlib/errors.py:1773
5553
5697
msgid "%(username)r does not seem to contain a reasonable email address"
5556
#: bzrlib/errors.py:1763
5700
#: bzrlib/errors.py:1782
5557
5701
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5560
#: bzrlib/errors.py:1771
5704
#: bzrlib/errors.py:1790
5561
5705
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5564
#: bzrlib/errors.py:1779
5708
#: bzrlib/errors.py:1798
5565
5709
msgid "Unable to import library \"%(library)s\": %(error)s"
5568
#: bzrlib/errors.py:1787
5712
#: bzrlib/errors.py:1806
5569
5713
msgid "python-gpgme is not installed, it is needed to verify signatures"
5572
#: bzrlib/errors.py:1795
5716
#: bzrlib/errors.py:1814
5574
5718
"The working tree for %(basedir)s has changed since the last commit, but "
5575
5719
"weave merge requires that it be unchanged"
5578
#: bzrlib/errors.py:1805
5722
#: bzrlib/errors.py:1824
5580
5724
"Can't reprocess and show base, because reprocessing obscures the "
5581
5725
"relationship of conflicting lines to the base"
5584
#: bzrlib/errors.py:1811
5728
#: bzrlib/errors.py:1830
5585
5729
msgid "Cycle in graph %(graph)r"
5588
#: bzrlib/errors.py:1839
5732
#: bzrlib/errors.py:1858
5589
5733
msgid "File %(filename)s is not conflicted."
5592
#: bzrlib/errors.py:1861
5736
#: bzrlib/errors.py:1880
5593
5737
msgid "No bundle was found in \"%(filename)s\"."
5596
#: bzrlib/errors.py:1870
5740
#: bzrlib/errors.py:1889
5597
5741
msgid "Unable to handle bundle version %(version)s: %(msg)s"
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"
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"
5608
#: bzrlib/errors.py:1903
5752
#: bzrlib/errors.py:1922
5609
5753
msgid "Key %(key)s is already present in map"
5612
#: bzrlib/errors.py:1908
5756
#: bzrlib/errors.py:1927
5613
5757
msgid "The prefix %(prefix)s is in the help search path twice."
5616
#: bzrlib/errors.py:1918
5760
#: bzrlib/errors.py:1937
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"
5623
#: bzrlib/errors.py:1950
5767
#: bzrlib/errors.py:1969
5624
5768
msgid "Attempt to reuse a transform that has already been applied."
5627
#: bzrlib/errors.py:1955
5771
#: bzrlib/errors.py:1974
5628
5772
msgid "Moving the root directory is not supported at this time"
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"
5635
#: bzrlib/errors.py:1971
5779
#: bzrlib/errors.py:1990
5637
5781
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5640
#: bzrlib/errors.py:2007
5784
#: bzrlib/errors.py:2026
5642
5786
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5645
#: bzrlib/errors.py:2037
5789
#: bzrlib/errors.py:2056
5646
5790
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5649
#: bzrlib/errors.py:2045
5793
#: bzrlib/errors.py:2064
5650
5794
msgid "Nothing to merge."
5653
#: bzrlib/errors.py:2050
5797
#: bzrlib/errors.py:2069
5654
5798
msgid "Format %(format)s cannot be initialised by this version of bzr."
5657
#: bzrlib/errors.py:2059
5801
#: bzrlib/errors.py:2078
5659
5803
"Cannot convert from format %(from_format)s to format %(format)s. "
5663
#: bzrlib/errors.py:2071
5807
#: bzrlib/errors.py:2090
5664
5808
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5667
#: bzrlib/errors.py:2079
5811
#: bzrlib/errors.py:2098
5668
5812
msgid "%(exe_name)s could not be found on this machine"
5671
#: bzrlib/errors.py:2087
5815
#: bzrlib/errors.py:2106
5672
5816
msgid "Diff is not installed on this machine: %(msg)s"
5675
#: bzrlib/errors.py:2095
5819
#: bzrlib/errors.py:2114
5676
5820
msgid "Diff3 is not installed on this machine."
5679
#: bzrlib/errors.py:2101
5823
#: bzrlib/errors.py:2120
5680
5824
msgid "The content being inserted is already present."
5683
#: bzrlib/errors.py:2106
5827
#: bzrlib/errors.py:2125
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 "
5703
5847
" keep, and delete it when you are done."
5706
#: bzrlib/errors.py:2138
5850
#: bzrlib/errors.py:2157
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."
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"
5717
#: bzrlib/errors.py:2162
5861
#: bzrlib/errors.py:2181
5719
5863
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5722
#: bzrlib/errors.py:2175
5866
#: bzrlib/errors.py:2194
5723
5867
msgid "Error in merge modified format"
5726
#: bzrlib/errors.py:2180
5870
#: bzrlib/errors.py:2199
5727
5871
msgid "Format error in conflict listings"
5730
#: bzrlib/errors.py:2184
5874
#: bzrlib/errors.py:2203
5732
5876
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5733
5877
"Error: %(description)s"
5736
#: bzrlib/errors.py:2195
5880
#: bzrlib/errors.py:2214
5738
5882
"An error has been detected in the repository %(repo_path)s.\n"
5739
5883
"Please run bzr reconcile on this repository."
5742
#: bzrlib/errors.py:2206
5886
#: bzrlib/errors.py:2225
5744
5888
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5745
5889
"reason: %(reason)s"
5748
#: bzrlib/errors.py:2219
5892
#: bzrlib/errors.py:2238
5750
5894
"An inconsistent delta was supplied: %(delta)r\n"
5751
5895
"reason: %(reason)s"
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."
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."
5762
#: bzrlib/errors.py:2245
5906
#: bzrlib/errors.py:2264
5764
5908
"To use this feature you must upgrade your branch at %(path)s to a format "
5765
5909
"which supports rich roots."
5768
#: bzrlib/errors.py:2251
5912
#: bzrlib/errors.py:2270
5769
5913
msgid "Cannot perform local-only commits on unbound branches."
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."
5776
#: bzrlib/errors.py:2277
5920
#: bzrlib/errors.py:2296
5777
5921
msgid "Ghost tags not supported by format %(format)r."
5780
#: bzrlib/errors.py:2285
5924
#: bzrlib/errors.py:2304
5781
5925
msgid "File is binary but should be text."
5784
#: bzrlib/errors.py:2290
5928
#: bzrlib/errors.py:2309
5785
5929
msgid "The path %(path)s is not permitted on this platform"
5788
#: bzrlib/errors.py:2299
5932
#: bzrlib/errors.py:2318
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}"
5795
#: bzrlib/errors.py:2311
5939
#: bzrlib/errors.py:2330
5796
5940
msgid "Not a bzr revision-bundle: %(text)r"
5799
#: bzrlib/errors.py:2320
5943
#: bzrlib/errors.py:2339
5800
5944
msgid "Bad bzr revision-bundle: %(text)r"
5803
#: bzrlib/errors.py:2329
5947
#: bzrlib/errors.py:2348
5804
5948
msgid "Malformed bzr revision-bundle header: %(text)r"
5807
#: bzrlib/errors.py:2334
5951
#: bzrlib/errors.py:2353
5808
5952
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5811
#: bzrlib/errors.py:2339
5955
#: bzrlib/errors.py:2358
5812
5956
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5815
#: bzrlib/errors.py:2344
5959
#: bzrlib/errors.py:2363
5816
5960
msgid "End of line marker was not \\n in bzr revision-bundle"
5819
#: bzrlib/errors.py:2354
5963
#: bzrlib/errors.py:2373
5820
5964
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5823
#: bzrlib/errors.py:2364
5967
#: bzrlib/errors.py:2383
5824
5968
msgid "Root class for inventory serialization errors"
5827
#: bzrlib/errors.py:2368
5971
#: bzrlib/errors.py:2387
5829
5973
"The inventory was not in the expected format:\n"
5833
#: bzrlib/errors.py:2377
5977
#: bzrlib/errors.py:2396
5834
5978
msgid "This operation requires rich root data storage"
5837
#: bzrlib/errors.py:2390
5981
#: bzrlib/errors.py:2409
5838
5982
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5841
#: bzrlib/errors.py:2399
5985
#: bzrlib/errors.py:2418
5843
5987
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5847
#: bzrlib/errors.py:2406
5991
#: bzrlib/errors.py:2425
5849
5993
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5850
5994
"ghost at {%(ghost_revision_id)s}"
5853
#: bzrlib/errors.py:2416
5997
#: bzrlib/errors.py:2435
5854
5998
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5857
#: bzrlib/errors.py:2467
6001
#: bzrlib/errors.py:2486
5859
6003
"A merge directive must provide either a bundle or a public branch location."
5862
#: bzrlib/errors.py:2474
6006
#: bzrlib/errors.py:2493
5863
6007
msgid "Bad merge directive payload %(start)r"
5866
#: bzrlib/errors.py:2484
6010
#: bzrlib/errors.py:2503
5867
6011
msgid "Preview patch does not match requested changes."
5870
#: bzrlib/errors.py:2490
6014
#: bzrlib/errors.py:2509
5871
6015
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5874
#: bzrlib/errors.py:2500
6018
#: bzrlib/errors.py:2519
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."
5881
#: bzrlib/errors.py:2512
6025
#: bzrlib/errors.py:2531
5882
6026
msgid "Unsupported entry kind %(kind)s"
5885
#: bzrlib/errors.py:2520
6029
#: bzrlib/errors.py:2539
5886
6030
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5889
#: bzrlib/errors.py:2530
6033
#: bzrlib/errors.py:2549
5890
6034
msgid "Subsume target %(other_tree)s needs to be upgraded."
5893
#: bzrlib/errors.py:2549
6037
#: bzrlib/errors.py:2568
5894
6038
msgid "No such tag: %(tag_name)s"
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."
5901
#: bzrlib/errors.py:2566
6045
#: bzrlib/errors.py:2585
5902
6046
msgid "Tag %(tag_name)s already exists."
5905
#: bzrlib/errors.py:2574
6049
#: bzrlib/errors.py:2593
5907
6051
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5908
6052
"bugs\" for more information on this feature."
5911
#: bzrlib/errors.py:2584
6055
#: bzrlib/errors.py:2603
5913
6057
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5916
#: bzrlib/errors.py:2594
6060
#: bzrlib/errors.py:2613
5918
6062
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5921
#: bzrlib/errors.py:2604
6065
#: bzrlib/errors.py:2623
5922
6066
msgid "Invalid line in bugs property: '%(line)s'"
5925
#: bzrlib/errors.py:2612
6069
#: bzrlib/errors.py:2631
5926
6070
msgid "Invalid bug status: '%(status)s'"
5929
#: bzrlib/errors.py:2620
6073
#: bzrlib/errors.py:2639
5930
6074
msgid "Could not understand response from smart server: %(response_tuple)r"
5933
#: bzrlib/errors.py:2659
6077
#: bzrlib/errors.py:2678
5934
6078
msgid "Server sent an unexpected error: %(error_tuple)r"
5937
#: bzrlib/errors.py:2678
6081
#: bzrlib/errors.py:2697
5938
6082
msgid "Unrecognised container format: %(container_format)r"
5941
#: bzrlib/errors.py:2686
6085
#: bzrlib/errors.py:2705
5942
6086
msgid "Unexpected end of container stream"
5945
#: bzrlib/errors.py:2691
6089
#: bzrlib/errors.py:2710
5946
6090
msgid "Unknown record type: %(record_type)r"
5949
#: bzrlib/errors.py:2699
6093
#: bzrlib/errors.py:2718
5950
6094
msgid "Invalid record: %(reason)s"
5953
#: bzrlib/errors.py:2707
6097
#: bzrlib/errors.py:2726
5954
6098
msgid "Container has data after end marker: %(excess)r"
5957
#: bzrlib/errors.py:2715
6101
#: bzrlib/errors.py:2734
5958
6102
msgid "Container has multiple records with the same name: %(name)s"
5961
#: bzrlib/errors.py:2728
6105
#: bzrlib/errors.py:2747
5962
6106
msgid "Corrupt or incompatible data stream: %(reason)s"
5965
#: bzrlib/errors.py:2736
6109
#: bzrlib/errors.py:2755
5966
6110
msgid "SMTP error: %(error)s"
5969
#: bzrlib/errors.py:2744
6113
#: bzrlib/errors.py:2763
5970
6114
msgid "No message supplied."
5973
#: bzrlib/errors.py:2749
6117
#: bzrlib/errors.py:2768
5974
6118
msgid "No mail-to address (--mail-to) or output (-o) specified."
5977
#: bzrlib/errors.py:2754
6121
#: bzrlib/errors.py:2773
5978
6122
msgid "Unknown mail client: %(mail_client)s"
5981
#: bzrlib/errors.py:2762
6125
#: bzrlib/errors.py:2781
5983
6127
"Unable to find mail client with the following names: "
5984
6128
"%(mail_command_list_string)s"
5987
#: bzrlib/errors.py:2772
6131
#: bzrlib/errors.py:2791
5988
6132
msgid "SMTP connection to %(host)s refused"
5991
#: bzrlib/errors.py:2781
6135
#: bzrlib/errors.py:2800
5992
6136
msgid "Please specify smtp_server. No server at default %(host)s."
5995
#: bzrlib/errors.py:2795
6139
#: bzrlib/errors.py:2814
5997
6141
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6001
#: bzrlib/errors.py:2807
6145
#: bzrlib/errors.py:2826
6002
6146
msgid "'%(display_url)s' is already a branch."
6005
#: bzrlib/errors.py:2812
6149
#: bzrlib/errors.py:2831
6006
6150
msgid "'%(display_url)s' is already a tree."
6009
#: bzrlib/errors.py:2817
6153
#: bzrlib/errors.py:2836
6010
6154
msgid "'%(display_url)s' is already a checkout."
6013
#: bzrlib/errors.py:2822
6157
#: bzrlib/errors.py:2841
6014
6158
msgid "'%(display_url)s' is already a lightweight checkout."
6017
#: bzrlib/errors.py:2827
6161
#: bzrlib/errors.py:2846
6018
6162
msgid "'%(display_url)s' is already using a shared repository."
6021
#: bzrlib/errors.py:2832
6165
#: bzrlib/errors.py:2851
6022
6166
msgid "'%(display_url)s' is already standalone."
6025
#: bzrlib/errors.py:2837
6169
#: bzrlib/errors.py:2856
6026
6170
msgid "Shared repository '%(display_url)s' already creates working trees."
6029
#: bzrlib/errors.py:2843
6173
#: bzrlib/errors.py:2862
6031
6175
"Shared repository '%(display_url)s' already doesn't create working trees."
6034
#: bzrlib/errors.py:2849
6178
#: bzrlib/errors.py:2868
6035
6179
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
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."
6042
#: bzrlib/errors.py:2859
6186
#: bzrlib/errors.py:2878
6044
6188
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6045
6189
"status).%(more)s"
6048
#: bzrlib/errors.py:2878
6192
#: bzrlib/errors.py:2897
6050
6194
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6051
6195
"list).%(more)s"
6054
#: bzrlib/errors.py:2884
6198
#: bzrlib/errors.py:2903
6055
6199
msgid "Variable {%(name)s} is not available."
6058
#: bzrlib/errors.py:2892
6202
#: bzrlib/errors.py:2911
6059
6203
msgid "No template specified."
6062
#: bzrlib/errors.py:2897
6206
#: bzrlib/errors.py:2916
6063
6207
msgid "Unable to create symlink %(path_str)son this platform"
6066
#: bzrlib/errors.py:2912
6210
#: bzrlib/errors.py:2931
6068
6212
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6069
6213
"\"original\", \"local\"."
6072
#: bzrlib/errors.py:2946
6216
#: bzrlib/errors.py:2965
6074
6218
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6077
#: bzrlib/errors.py:2958
6221
#: bzrlib/errors.py:2977
6078
6222
msgid "The \"%(config_id)s\" configuration does not exist."
6081
#: bzrlib/errors.py:2966
6225
#: bzrlib/errors.py:2985
6082
6226
msgid "The \"%(option_name)s\" configuration option does not exist."
6085
#: bzrlib/errors.py:2974
6229
#: bzrlib/errors.py:2993
6086
6230
msgid "The alias \"%(alias_name)s\" does not exist."
6089
#: bzrlib/errors.py:2988
6233
#: bzrlib/errors.py:3007
6090
6234
msgid "\"%(alias_name)s\" is not a valid location alias."
6093
#: bzrlib/errors.py:2996
6237
#: bzrlib/errors.py:3015
6094
6238
msgid "No %(alias_name)s location assigned."
6097
#: bzrlib/errors.py:3004
6241
#: bzrlib/errors.py:3023
6098
6242
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6101
#: bzrlib/errors.py:3014
6245
#: bzrlib/errors.py:3033
6102
6246
msgid "Unknown rules detected: %(unknowns_str)s."
6105
#: bzrlib/errors.py:3025
6249
#: bzrlib/errors.py:3044
6106
6250
msgid "Tip change rejected: %(msg)s"
6109
#: bzrlib/errors.py:3033
6253
#: bzrlib/errors.py:3052
6110
6254
msgid "Shelf corrupt."
6113
#: bzrlib/errors.py:3038
6257
#: bzrlib/errors.py:3057
6114
6258
msgid "Corruption while decompressing repository file%(orig_error)s"
6117
#: bzrlib/errors.py:3050
6261
#: bzrlib/errors.py:3069
6118
6262
msgid "No changes are shelved with id \"%(shelf_id)d\"."
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."
6125
#: bzrlib/errors.py:3066
6269
#: bzrlib/errors.py:3085
6127
6271
"An attempt to access a url outside the server jail was made: '%(url)s'."
6130
#: bzrlib/errors.py:3074
6274
#: bzrlib/errors.py:3093
6131
6275
msgid "The user aborted the operation."
6134
#: bzrlib/errors.py:3079
6278
#: bzrlib/errors.py:3098
6135
6279
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6138
#: bzrlib/errors.py:3089
6282
#: bzrlib/errors.py:3108
6139
6283
msgid "No such view: %(view_name)s."
6142
#: bzrlib/errors.py:3099
6286
#: bzrlib/errors.py:3118
6144
6288
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6145
6289
"to a later format."
6148
#: bzrlib/errors.py:3108
6292
#: bzrlib/errors.py:3127
6150
6294
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6153
#: bzrlib/errors.py:3175
6297
#: bzrlib/errors.py:3194
6154
6298
msgid "%(bzrdir)r does not support co-located branches."
6157
#: bzrlib/errors.py:3181
6301
#: bzrlib/errors.py:3200
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>\""
6164
#: bzrlib/errors.py:3190
6308
#: bzrlib/errors.py:3209
6165
6309
msgid "Invalid pattern(s) found. %(msg)s"
6168
#: bzrlib/errors.py:3198
6312
#: bzrlib/errors.py:3217
6170
6314
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6171
6315
"unbind` to fix."
6174
#: bzrlib/errors.py:3209
6318
#: bzrlib/errors.py:3228
6175
6319
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6178
#: bzrlib/errors.py:3218
6322
#: bzrlib/errors.py:3237
6179
6323
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6182
#: bzrlib/errors.py:3227
6326
#: bzrlib/errors.py:3246
6184
6328
"No compatible object available for operations from %(source)r to %(target)r."
6187
#: bzrlib/errors.py:3237
6331
#: bzrlib/errors.py:3256
6189
6333
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6190
6334
"%(arguments)s."
6193
#: bzrlib/errors.py:3247
6337
#: bzrlib/errors.py:3266
6195
6339
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6196
6340
"format %(format)r"
6199
#: bzrlib/errors.py:3259
6343
#: bzrlib/errors.py:3278
6201
6345
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6205
#: bzrlib/errors.py:3272
6349
#: bzrlib/errors.py:3291
6206
6350
msgid "Binary files section encountered."
6209
#: bzrlib/errors.py:3280
6353
#: bzrlib/errors.py:3299
6211
6355
"Malformed patch header. %(desc)s\n"
6215
#: bzrlib/errors.py:3289
6359
#: bzrlib/errors.py:3308
6217
6361
"Malformed hunk header. %(desc)s\n"
6221
#: bzrlib/errors.py:3298
6365
#: bzrlib/errors.py:3317
6223
6367
"Malformed line. %(desc)s\n"
6227
#: bzrlib/errors.py:3308
6371
#: bzrlib/errors.py:3327
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\""
6233
#: bzrlib/errors.py:3319
6377
#: bzrlib/errors.py:3338
6234
6378
msgid "The feature %(feature)s has already been registered."