« back to all changes in this revision
Viewing changes to po/ru.po
- browse files at revision 6093.4.149
- compare with another revision
- compare with revision 1684.1.3
- download diff
- download tarball
- view history from revision 6093.4.149
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-07-11 04:34:44 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120711043444-s6bhpt1r22h4fpi1
Launchpad automatic translations update.
added
removed
po/ru.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-03-15 10:20+0100\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
11
"PO-Revision-Date: 2012-01-21 16:45+0000\n"
12
12
"Last-Translator: Sergey Basalaev <SBasalaev@gmail.com>\n"
13
13
"Language-Team: Russian <ru@li.org>\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18
18
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19
"X-Launchpad-Export-Date: 2012-03-16 04:32+0000\n"
20
"X-Generator: Launchpad (build 14951)\n"
19
"X-Launchpad-Export-Date: 2012-07-11 04:33+0000\n"
20
"X-Generator: Launchpad (build 15593)\n"
21
21
22
22
#: bzrlib/add.py:93
23
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
27
27
msgid "Unstacking"
28
28
msgstr "Извлечение из стека"
29
29
30
#: bzrlib/branch.py:3121
30
#: bzrlib/branch.py:2955
31
31
#, python-format
32
32
msgid "Pushed up to revision %d."
33
33
msgstr "Отправлено до ревизии %d включительно."
34
34
35
#: bzrlib/branch.py:3123
35
#: bzrlib/branch.py:2957
36
36
#, python-format
37
37
msgid "%d tag updated."
38
38
msgid_plural "%d tags updated."
40
40
msgstr[1] "%d тега обновлено."
41
41
msgstr[2] "%d тегов обновлено."
42
42
43
#: bzrlib/branch.py:3126
43
#: bzrlib/branch.py:2960
44
44
msgid "No new revisions or tags to push."
45
45
msgstr "Нет новых ревизий или тегов для отправки."
46
46
47
#: bzrlib/branch.py:3128
47
#: bzrlib/branch.py:2962
48
48
msgid "No new revisions to push."
49
49
msgstr "Нет новых ревизий для отправки."
50
50
51
#: bzrlib/branch.py:3148
51
#: bzrlib/branch.py:2982
52
52
msgid "checked branch {0} format {1}"
53
53
msgstr "проверена ветвь {0} формата {1}"
54
54
55
#: bzrlib/branch.py:3151
55
#: bzrlib/branch.py:2985
56
56
#, python-format
57
57
msgid "found error:%s"
58
58
msgstr "обнаружена ошибка:%s"
59
59
60
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3026 bzrlib/workingtree.py:323
60
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
61
61
#, python-format
62
62
msgid "Ignoring files outside view. View is %s"
63
63
msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
227
227
msgstr ""
228
228
"bzr status --revision принимает ровно один или два идентификатора ревизии"
229
229
230
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5197
230
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
231
231
msgid "You can only supply one of revision_id or --revision"
232
232
msgstr "Вы можете указать только одно из revision_id или --revision"
233
233
234
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5199
234
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
235
235
msgid "You must supply either --revision or a revision_id"
236
236
msgstr "Вы должны предоставить --revision или revision_id"
237
237
315
315
msgid "--tree and --revision can not be used together"
316
316
msgstr "--tree и --revision не могут использоваться вместе"
317
317
318
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5953
318
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
319
319
msgid "Tags can only be placed on a single revision, not on a range"
320
320
msgstr "Тегом можно пометить только отдельную ревизию, не интервал"
321
321
631
631
"Сделать локальный приём в связанную ветвь. Локальный приём не накладывается "
632
632
"на основную ветвь."
633
633
634
#: bzrlib/builtins.py:1180
634
#: bzrlib/builtins.py:1189
635
635
msgid "Need working tree for --show-base."
636
636
msgstr "Для --show-base необходимо рабочее дерево."
637
637
638
#: bzrlib/builtins.py:1196
638
#: bzrlib/builtins.py:1205
639
639
msgid "No pull location known or specified."
640
640
msgstr "Местоположение для приёма неизвестно и не указано."
641
641
642
#: bzrlib/builtins.py:1202
642
#: bzrlib/builtins.py:1211
643
643
#, python-format
644
644
msgid "Using saved parent location: %s\n"
645
645
msgstr "Используется сохранённое местоположение родителя: %s\n"
646
646
647
#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406
647
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
648
648
msgid "Cannot use -r with merge directives or bundles"
649
649
msgstr "Нельзя использовать -r с директивами слияния или пакетами"
650
650
651
#: bzrlib/builtins.py:1252
651
#: bzrlib/builtins.py:1261
652
652
msgid "Update a mirror of this branch."
653
653
msgstr "Обновить зеркало этой ветви."
654
654
655
#: bzrlib/builtins.py:1254
655
#: bzrlib/builtins.py:1263
656
656
msgid ""
657
657
"The target branch will not have its working tree populated because this\n"
658
658
"is both expensive, and is not supported on remote file systems."
660
660
"Целевая ветвь не будет иметь рабочего дерева, поскольку это накладно\n"
661
661
"и не поддерживается удалёнными файловыми системами."
662
662
663
#: bzrlib/builtins.py:1257
663
#: bzrlib/builtins.py:1266
664
664
msgid ""
665
665
"Some smart servers or protocols *may* put the working tree in place in\n"
666
666
"the future."
668
668
"Некоторые умные серверы или протоколы *может быть* будут размещать\n"
669
669
"рабочее дерево в месте назначения в будущем."
670
670
671
#: bzrlib/builtins.py:1260
671
#: bzrlib/builtins.py:1269
672
672
msgid ""
673
673
"This command only works on branches that have not diverged. Branches are\n"
674
674
"considered diverged if the destination branch's most recent commit is one\n"
679
679
"закрепление в ветви назначения не было совмещено (явно или\n"
680
680
"неявно) с родителем."
681
681
682
#: bzrlib/builtins.py:1264
682
#: bzrlib/builtins.py:1273
683
683
msgid ""
684
684
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
685
685
"the other branch completely, discarding its unmerged changes."
688
688
"чтобы полностью заменить другую ветвь, убирая все её несовмещённые\n"
689
689
"изменения."
690
690
691
#: bzrlib/builtins.py:1267
691
#: bzrlib/builtins.py:1276
692
692
msgid ""
693
693
"If you want to ensure you have the different changes in the other branch,\n"
694
694
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
699
699
"изменения. После этого вы сможете делать push без необходимости указывать\n"
700
700
"опцию '--overwrite'."
701
701
702
#: bzrlib/builtins.py:1271
702
#: bzrlib/builtins.py:1280
703
703
msgid ""
704
704
"If there is no default push location set, the first push will set it (use\n"
705
705
"--no-remember to avoid setting it). After that, you can omit the\n"
713
713
"используйте опцию --remember. Значение будет сохранено, только если\n"
714
714
"доступ к удалённой локации будет успешен."
715
715
716
#: bzrlib/builtins.py:1276
716
#: bzrlib/builtins.py:1285
717
717
msgid ""
718
718
"The --verbose option will display the revisions pushed using the log_format\n"
719
719
"configuration option. You can use a different format by overriding it with\n"
723
723
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
724
724
"её опцией -Olog_format=<другой_формат>."
725
725
726
#: bzrlib/builtins.py:1287 bzrlib/foreign.py:272
726
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
727
727
msgid ""
728
728
"Branch to push from, rather than the one containing the working directory."
729
729
msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."
730
730
731
#: bzrlib/builtins.py:1290
731
#: bzrlib/builtins.py:1299
732
732
msgid ""
733
733
"By default push will fail if the target directory exists, but does not "
734
734
"already have a control directory. This flag will allow push to proceed."
737
737
"существует, но не содержит управляющих метаданных. Этот флаг позволит "
738
738
"отправке изменений продолжаться."
739
739
740
#: bzrlib/builtins.py:1295
740
#: bzrlib/builtins.py:1304
741
741
msgid ""
742
742
"Create a stacked branch that references the public location of the parent "
743
743
"branch."
745
745
"Создать стековую ветвь, которая ссылается на публичное местоположение "
746
746
"родительской ветви."
747
747
748
#: bzrlib/builtins.py:1298
748
#: bzrlib/builtins.py:1307
749
749
msgid ""
750
750
"Create a stacked branch that refers to another branch for the commit "
751
751
"history. Only the work not present in the referenced branch is included in "
755
755
"истории фиксаций. В созданную ветвь помещается только работа, не "
756
756
"существующая в исходной ветви."
757
757
758
#: bzrlib/builtins.py:1303 bzrlib/foreign.py:279
758
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
759
759
msgid ""
760
760
"Refuse to push if there are uncommitted changes in the working tree, --no-"
761
761
"strict disables the check."
763
763
"Отказывать в отсылке изменений, если в рабочем дереве есть незакреплённые "
764
764
"изменения, --no-strict запрещает проверку."
765
765
766
#: bzrlib/builtins.py:1306
766
#: bzrlib/builtins.py:1315
767
767
msgid "Don't populate the working tree, even for protocols that support it."
768
768
msgstr ""
769
769
"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."
770
770
771
#: bzrlib/builtins.py:1350
771
#: bzrlib/builtins.py:1318
772
msgid "Overwrite tags only."
773
msgstr ""
774
775
#: bzrlib/builtins.py:1369
772
776
msgid "Could not determine branch to refer to."
773
777
msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
774
778
775
#: bzrlib/builtins.py:1359
779
#: bzrlib/builtins.py:1378
776
780
#, python-format
777
781
msgid ""
778
782
"No push location known or specified. To push to the parent branch (at %s), "
779
783
"use 'bzr push :parent'."
780
784
msgstr ""
781
785
782
#: bzrlib/builtins.py:1365 bzrlib/foreign.py:306
786
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
783
787
msgid "No push location known or specified."
784
788
msgstr "Местоположение для отсылки изменений неизвестно и не указано."
785
789
786
#: bzrlib/builtins.py:1369
790
#: bzrlib/builtins.py:1388
787
791
#, python-format
788
792
msgid "Using saved push location: %s"
789
793
msgstr "Используется сохранённое местоположение отсылки: %s"
790
794
791
#: bzrlib/builtins.py:1379
795
#: bzrlib/builtins.py:1398
792
796
msgid "Create a new branch that is a copy of an existing branch."
793
797
msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
794
798
795
#: bzrlib/builtins.py:1381
799
#: bzrlib/builtins.py:1400
796
800
msgid ""
797
801
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
798
802
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
808
812
"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
809
813
"попытается создать ./foo-bar."
810
814
811
#: bzrlib/builtins.py:1388
815
#: bzrlib/builtins.py:1407
812
816
msgid ""
813
817
"To retrieve the branch as of a particular revision, supply the --revision\n"
814
818
"parameter, as in \"branch foo/bar -r 5\"."
816
820
"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
817
821
"--revision, напр. «branch foo/bar -r 5»."
818
822
819
#: bzrlib/builtins.py:1391
823
#: bzrlib/builtins.py:1410
820
824
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
821
825
msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
822
826
823
#: bzrlib/builtins.py:1401
827
#: bzrlib/builtins.py:1420
824
828
msgid "Create a branch without a working-tree."
825
829
msgstr "Создать ветвь без рабочего дерева."
826
830
827
#: bzrlib/builtins.py:1403
831
#: bzrlib/builtins.py:1422
828
832
msgid "Switch the checkout in the current directory to the new branch."
829
833
msgstr "Заменить рабочую копию в текущей директории новой ветвью."
830
834
831
#: bzrlib/builtins.py:1406
835
#: bzrlib/builtins.py:1425
832
836
msgid ""
833
837
"Create a stacked branch referring to the source branch. The new branch will "
834
838
"depend on the availability of the source branch for all operations."
836
840
"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
837
841
"новой ветвью будут зависеть от доступности старой ветви."
838
842
839
#: bzrlib/builtins.py:1410
843
#: bzrlib/builtins.py:1429
840
844
msgid "Do not use a shared repository, even if available."
841
845
msgstr "Не использовать общий репозиторий, даже если доступен."
842
846
843
#: bzrlib/builtins.py:1412
847
#: bzrlib/builtins.py:1431
844
848
msgid ""
845
849
"By default branch will fail if the target directory exists, but does not "
846
850
"already have a control directory. This flag will allow branch to proceed."
849
853
"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
850
854
"продолжаться."
851
855
852
#: bzrlib/builtins.py:1417
856
#: bzrlib/builtins.py:1436
853
857
msgid "Bind new branch to from location."
854
858
msgstr "Связать новую ветвь с FROM_LOCATION"
855
859
856
#: bzrlib/builtins.py:1464
860
#: bzrlib/builtins.py:1483
857
861
#, python-format
858
862
msgid "Target directory \"%s\" already exists."
859
863
msgstr "Целевая директория «%s» уже существует."
860
864
861
#: bzrlib/builtins.py:1476
865
#: bzrlib/builtins.py:1495
862
866
#, python-format
863
867
msgid "Parent of \"%s\" does not exist."
864
868
msgstr "Родитель «%s» не существует."
865
869
866
#: bzrlib/builtins.py:1495
870
#: bzrlib/builtins.py:1514
867
871
msgid "The branch {0} has no revision {1}."
868
872
msgstr "В ветви {0} отсутствует ревизия {1}."
869
873
870
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
874
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
871
875
#, python-format
872
876
msgid "Created new stacked branch referring to %s."
873
877
msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
874
878
875
#: bzrlib/builtins.py:1514
879
#: bzrlib/builtins.py:1533
876
880
#, python-format
877
881
msgid "Branched %d revision."
878
882
msgid_plural "Branched %d revisions."
880
884
msgstr[1] "Ответвлены %d ревизии."
881
885
msgstr[2] "Ответвлены %d ревизий."
882
886
883
#: bzrlib/builtins.py:1519
887
#: bzrlib/builtins.py:1538
884
888
#, python-format
885
889
msgid "New branch bound to %s"
886
890
msgstr "Новая ветвь, связанная с %s"
887
891
888
#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247
892
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
889
893
#, python-format
890
894
msgid "Switched to branch: %s"
891
895
msgstr "Переключение на ветвь: %s"
892
896
893
#: bzrlib/builtins.py:1529
897
#: bzrlib/builtins.py:1548
894
898
msgid "List the branches available at the current location."
895
899
msgstr "Вывести список ветвей, доступных в текущем местоположении."
896
900
897
#: bzrlib/builtins.py:1531
901
#: bzrlib/builtins.py:1550
898
902
msgid ""
899
903
"This command will print the names of all the branches at the current\n"
900
904
"location."
901
905
msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
902
906
903
#: bzrlib/builtins.py:1538
907
#: bzrlib/builtins.py:1557
904
908
msgid ""
905
909
"Recursively scan for branches rather than just looking in the specified "
906
910
"location."
907
911
msgstr ""
908
912
"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
909
913
910
#: bzrlib/builtins.py:1567
914
#: bzrlib/builtins.py:1586
911
915
msgid "(default)"
912
916
msgstr "(по умолчанию)"
913
917
914
#: bzrlib/builtins.py:1579
918
#: bzrlib/builtins.py:1598
915
919
msgid "Create a new checkout of an existing branch."
916
920
msgstr "Создать новую рабочую копию текущей ветви."
917
921
918
#: bzrlib/builtins.py:1581
922
#: bzrlib/builtins.py:1600
919
923
msgid ""
920
924
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
921
925
"for\n"
928
932
"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
929
933
"или если вы никогда не создавали его."
930
934
931
#: bzrlib/builtins.py:1586
935
#: bzrlib/builtins.py:1605
932
936
msgid ""
933
937
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
934
938
"will\n"
945
949
"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
946
950
"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
947
951
948
#: bzrlib/builtins.py:1593
952
#: bzrlib/builtins.py:1612
949
953
msgid ""
950
954
"To retrieve the branch as of a particular revision, supply the --revision\n"
951
955
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
959
963
"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
960
964
"полезно, к примеру, для просмотра старого кода."
961
965
962
#: bzrlib/builtins.py:1603
966
#: bzrlib/builtins.py:1622
963
967
msgid ""
964
968
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
965
969
"the branch for every operation. Normal checkouts can perform common "
971
975
"производить стандартные операции, как diff и status, без такого доступа, а "
972
976
"также поддерживают локальные закрепления."
973
977
974
#: bzrlib/builtins.py:1610
978
#: bzrlib/builtins.py:1629
975
979
msgid "Get file contents from this tree."
976
980
msgstr "Получить содержимое файла из этого дерева."
977
981
978
#: bzrlib/builtins.py:1612
982
#: bzrlib/builtins.py:1631
979
983
msgid "Hard-link working tree files where possible."
980
984
msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
981
985
982
#: bzrlib/builtins.py:1653
986
#: bzrlib/builtins.py:1672
983
987
msgid ""
984
988
"Show list of renamed files.\n"
985
989
" "
987
991
"Показать список переименованных файлов.\n"
988
992
" "
989
993
990
#: bzrlib/builtins.py:1681
994
#: bzrlib/builtins.py:1700
991
995
msgid "Update a working tree to a new revision."
992
996
msgstr "Обновить рабочее дерево до новой ревизии."
993
997
994
#: bzrlib/builtins.py:1683
998
#: bzrlib/builtins.py:1702
995
999
msgid ""
996
1000
"This will perform a merge of the destination revision (the tip of the\n"
997
1001
"branch, or the specified revision) into the working tree, and then make\n"
998
1002
"that revision the basis revision for the working tree. "
999
1003
msgstr ""
1000
1004
1001
#: bzrlib/builtins.py:1687
1005
#: bzrlib/builtins.py:1706
1002
1006
msgid ""
1003
1007
"You can use this to visit an older revision, or to update a working tree\n"
1004
1008
"that is out of date from its branch."
1005
1009
msgstr ""
1006
1010
1007
#: bzrlib/builtins.py:1690
1011
#: bzrlib/builtins.py:1709
1008
1012
msgid ""
1009
1013
"If there are any uncommitted changes in the tree, they will be carried\n"
1010
1014
"across and remain as uncommitted changes after the update. To discard\n"
1012
1016
"with the changes brought in by the change in basis revision."
1013
1017
msgstr ""
1014
1018
1015
#: bzrlib/builtins.py:1695
1019
#: bzrlib/builtins.py:1714
1016
1020
msgid ""
1017
1021
"If the tree's branch is bound to a master branch, bzr will also update\n"
1018
1022
"the branch from the master."
1019
1023
msgstr ""
1020
1024
1021
#: bzrlib/builtins.py:1698
1025
#: bzrlib/builtins.py:1717
1022
1026
msgid ""
1023
1027
"You cannot update just a single file or directory, because each Bazaar\n"
1024
1028
"working tree has just a single basis revision. If you want to restore a\n"
1035
1039
"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
1036
1040
"в новое местоположение."
1037
1041
1038
#: bzrlib/builtins.py:1705
1042
#: bzrlib/builtins.py:1724
1039
1043
msgid ""
1040
1044
"The 'dir' argument, if given, must be the location of the root of a\n"
1041
1045
"working tree to update. By default, the working tree that contains the \n"
1042
1046
"current working directory is used."
1043
1047
msgstr ""
1044
1048
1045
#: bzrlib/builtins.py:1721
1049
#: bzrlib/builtins.py:1740
1046
1050
msgid "bzr update --revision takes exactly one revision"
1047
1051
msgstr "bzr update --revision принимает ровно одну ревизию"
1048
1052
1049
#: bzrlib/builtins.py:1729
1053
#: bzrlib/builtins.py:1748
1050
1054
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1051
1055
msgstr ""
1052
1056
"bzr update может обновить только всё дерево, не файл или поддиректорию"
1053
1057
1054
#: bzrlib/builtins.py:1760
1058
#: bzrlib/builtins.py:1779
1055
1059
msgid "Tree is up to date at revision {0} of branch {1}"
1056
1060
msgstr "Дерево в актуальной ревизии {0} ветви {1}"
1057
1061
1058
#: bzrlib/builtins.py:1776
1062
#: bzrlib/builtins.py:1795
1059
1063
#, python-format
1060
1064
msgid ""
1061
1065
"branch has no revision %s\n"
1064
1068
"в ветви нет ревизии %s\n"
1065
1069
"bzr update --revision работает только для ревизий в истории ветви"
1066
1070
1067
#: bzrlib/builtins.py:1782
1071
#: bzrlib/builtins.py:1801
1068
1072
msgid "Updated to revision {0} of branch {1}"
1069
1073
msgstr "Обновлено до ревизии {0} ветви {1}"
1070
1074
1071
#: bzrlib/builtins.py:1786
1075
#: bzrlib/builtins.py:1805
1072
1076
msgid ""
1073
1077
"Your local commits will now show as pending merges with 'bzr status', and "
1074
1078
"can be committed with 'bzr commit'."
1076
1080
"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
1077
1081
"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
1078
1082
1079
#: bzrlib/builtins.py:1795
1083
#: bzrlib/builtins.py:1814
1080
1084
msgid "Show information about a working tree, branch or repository."
1081
1085
msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
1082
1086
1083
#: bzrlib/builtins.py:1797
1087
#: bzrlib/builtins.py:1816
1084
1088
msgid ""
1085
1089
"This command will show all known locations and formats associated to the\n"
1086
1090
"tree, branch or repository."
1088
1092
"Эта команда выведет все известные местоположения и форматы, связанные\n"
1089
1093
"с деревом, ветвью или репозиторием."
1090
1094
1091
#: bzrlib/builtins.py:1800
1095
#: bzrlib/builtins.py:1819
1092
1096
msgid ""
1093
1097
"In verbose mode, statistical information is included with each report.\n"
1094
1098
"To see extended statistic information, use a verbosity level of 2 or\n"
1098
1102
"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
1099
1103
"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
1100
1104
1101
#: bzrlib/builtins.py:1804
1105
#: bzrlib/builtins.py:1823
1102
1106
msgid "Branches and working trees will also report any missing revisions."
1103
1107
msgstr ""
1104
1108
"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
1105
1109
1106
#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859
1107
#: bzrlib/builtins.py:6433
1110
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1111
#: bzrlib/builtins.py:6466
1108
1112
msgid ":Examples:"
1109
1113
msgstr ":Примеры:"
1110
1114
1111
#: bzrlib/builtins.py:1808
1115
#: bzrlib/builtins.py:1827
1112
1116
msgid " Display information on the format and related locations:"
1113
1117
msgstr " Вывести информацию о формате и связанных местоположениях:"
1114
1118
1115
#: bzrlib/builtins.py:1810
1119
#: bzrlib/builtins.py:1829
1116
1120
msgid " bzr info"
1117
1121
msgstr " bzr info"
1118
1122
1119
#: bzrlib/builtins.py:1812
1123
#: bzrlib/builtins.py:1831
1120
1124
msgid ""
1121
1125
" Display the above together with extended format information and\n"
1122
1126
" basic statistics (like the number of files in the working tree and\n"
1126
1130
" и базовую статистику (как число файлов в рабочем дереве и число\n"
1127
1131
" ревизий в ветви и репозитории):"
1128
1132
1129
#: bzrlib/builtins.py:1816
1133
#: bzrlib/builtins.py:1835
1130
1134
msgid " bzr info -v"
1131
1135
msgstr " bzr info -v"
1132
1136
1133
#: bzrlib/builtins.py:1818
1137
#: bzrlib/builtins.py:1837
1134
1138
msgid " Display the above together with number of committers to the branch:"
1135
1139
msgstr " Вывести то же, что и выше, а также число участников ветви:"
1136
1140
1137
#: bzrlib/builtins.py:1820
1141
#: bzrlib/builtins.py:1839
1138
1142
msgid " bzr info -vv"
1139
1143
msgstr " bzr info -vv"
1140
1144
1141
#: bzrlib/builtins.py:1839
1145
#: bzrlib/builtins.py:1858
1142
1146
msgid "Remove files or directories."
1143
1147
msgstr "Исключить файлы или директории."
1144
1148
1145
#: bzrlib/builtins.py:1841
1149
#: bzrlib/builtins.py:1860
1146
1150
msgid ""
1147
1151
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1148
1152
"delete them if they can easily be recovered using revert otherwise they\n"
1149
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1153
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1150
1154
"parameters are given Bazaar will scan for files that are being tracked by\n"
1151
1155
"Bazaar but missing in your tree and stop tracking them for you."
1152
1156
msgstr ""
1153
"Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
1154
"если их можно легко восстановить с помощью revert, иначе будут созданы\n"
1155
"их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
1156
"ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
1157
"в рабочем дереве и прекратит их отслеживать."
1158
1157
1159
#: bzrlib/builtins.py:1849
1158
#: bzrlib/builtins.py:1868
1160
1159
msgid "Only remove files that have never been committed."
1161
1160
msgstr "Исключать только файлы, которые никогда не были закреплены."
1162
1161
1163
#: bzrlib/builtins.py:1851
1162
#: bzrlib/builtins.py:1870
1164
1163
msgid "The file deletion mode to be used."
1165
1164
msgstr "Используемый способ удаления файлов."
1166
1165
1167
#: bzrlib/builtins.py:1852
1166
#: bzrlib/builtins.py:1871
1168
1167
msgid "Deletion Strategy"
1169
1168
msgstr "Стратегия удаления"
1170
1169
1171
#: bzrlib/builtins.py:1853
1170
#: bzrlib/builtins.py:1872
1172
1171
msgid "Backup changed files (default)."
1173
1172
msgstr ""
1174
1173
1175
#: bzrlib/builtins.py:1854
1174
#: bzrlib/builtins.py:1873
1176
1175
msgid "Delete from bzr but leave the working copy."
1177
1176
msgstr "Удалить из bzr, но оставить рабочую копию."
1178
1177
1179
#: bzrlib/builtins.py:1855
1178
#: bzrlib/builtins.py:1874
1180
1179
msgid "Don't backup changed files."
1181
1180
msgstr "Не создавать резервные копии изменённых файлов."
1182
1181
1183
#: bzrlib/builtins.py:1856
1182
#: bzrlib/builtins.py:1875
1184
1183
msgid ""
1185
1184
"Delete all the specified files, even if they can not be recovered and even "
1186
1185
"if they are non-empty directories. (deprecated, use no-backup)"
1188
1187
"Удалить все указанные файлы, даже если их нельзя восстановить или они "
1189
1188
"являются непустыми директориями. (устарело, используйте no-backup)"
1190
1189
1191
#: bzrlib/builtins.py:1865
1190
#: bzrlib/builtins.py:1884
1192
1191
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1193
1192
msgstr ""
1194
1193
"(Опция --force устарела, в будущем следует использовать --no-backup.)"
1195
1194
1196
#: bzrlib/builtins.py:1882
1195
#: bzrlib/builtins.py:1901
1197
1196
msgid "No matching files."
1198
1197
msgstr "Нет файлов, удовлетворяющих критерию."
1199
1198
1200
#: bzrlib/builtins.py:1943
1199
#: bzrlib/builtins.py:1962
1201
1200
msgid "Reconcile bzr metadata in a branch."
1202
1201
msgstr "Согласовать метаданные bzr в ветви."
1203
1202
1204
#: bzrlib/builtins.py:1945
1203
#: bzrlib/builtins.py:1964
1205
1204
msgid ""
1206
1205
"This can correct data mismatches that may have been caused by\n"
1207
1206
"previous ghost operations or bzr upgrades. You should only\n"
1212
1211
"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
1213
1212
"bzr предложат вам сделать это."
1214
1213
1215
#: bzrlib/builtins.py:1950
1214
#: bzrlib/builtins.py:1969
1216
1215
msgid ""
1217
1216
"If a second branch is provided, cross-branch reconciliation is\n"
1218
1217
"also attempted, which will check that data like the tree root\n"
1224
1223
"присутствовавшие в ранних версиях bzr, корректно представлены\n"
1225
1224
"в обоих ветвях."
1226
1225
1227
#: bzrlib/builtins.py:1955
1226
#: bzrlib/builtins.py:1974
1228
1227
msgid ""
1229
1228
"At the same time it is run it may recompress data resulting in\n"
1230
1229
"a potential saving in disk space or performance gain."
1233
1232
"уменьшающее размер занимаемого пространства и повышающее\n"
1234
1233
"производительность."
1235
1234
1236
#: bzrlib/builtins.py:1958
1235
#: bzrlib/builtins.py:1977
1237
1236
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1238
1237
msgstr ""
1239
1238
"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
1240
1239
"локальный диск или SFTP."
1241
1240
1242
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1241
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1243
1242
msgid ""
1244
1243
"Format for the bzr 2.0 series.\n"
1245
1244
"Uses group-compress storage.\n"
1246
1245
"Provides rich roots which are a one-way transition.\n"
1247
1246
msgstr ""
1248
1247
1249
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1248
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1250
1249
msgid ""
1251
1250
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1252
1251
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1253
1252
msgstr ""
1254
1253
1255
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1254
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1256
1255
msgid "The 2a format with experimental support for colocated branches.\n"
1257
1256
msgstr ""
1258
1257
1259
#: bzrlib/builtins.py:2026
1258
#: bzrlib/builtins.py:2045
1260
1259
msgid "Make a directory into a versioned branch."
1261
1260
msgstr "Преобразовать директорию в ветвь системы контроля версий."
1262
1261
1263
#: bzrlib/builtins.py:2028
1262
#: bzrlib/builtins.py:2047
1264
1263
msgid ""
1265
1264
"Use this to create an empty branch, or before importing an\n"
1266
1265
"existing project."
1268
1267
"Используйте эту команду для создания пустой ветви или\n"
1269
1268
"перед импортом существующего проекта."
1270
1269
1271
#: bzrlib/builtins.py:2031
1270
#: bzrlib/builtins.py:2050
1272
1271
msgid ""
1273
1272
"If there is a repository in a parent directory of the location, then\n"
1274
1273
"the history of the branch will be stored in the repository. Otherwise\n"
1279
1278
"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
1280
1279
"которая несёт историю с собой в директории .bzr."
1281
1280
1282
#: bzrlib/builtins.py:2036
1281
#: bzrlib/builtins.py:2055
1283
1282
msgid ""
1284
1283
"If there is already a branch at the location but it has no working tree,\n"
1285
1284
"the tree can be populated with 'bzr checkout'."
1287
1286
"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
1288
1287
"создаётся с помощью 'bzr checkout'."
1289
1288
1290
#: bzrlib/builtins.py:2039
1289
#: bzrlib/builtins.py:2058
1291
1290
msgid "Recipe for importing a tree of files::"
1292
1291
msgstr "Рецепт для импорта дерева файлов::"
1293
1292
1294
#: bzrlib/builtins.py:2041
1293
#: bzrlib/builtins.py:2060
1295
1294
msgid ""
1296
1295
" cd ~/project\n"
1297
1296
" bzr init\n"
1305
1304
" bzr status\n"
1306
1305
" bzr commit -m \"проект импортирован\""
1307
1306
1308
#: bzrlib/builtins.py:2052
1307
#: bzrlib/builtins.py:2071
1309
1308
msgid ""
1310
1309
"Create the path leading up to the branch if it does not already exist."
1311
1310
msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
1312
1311
1313
#: bzrlib/builtins.py:2055
1312
#: bzrlib/builtins.py:2074
1314
1313
msgid "Specify a format for this branch. See \"help formats\"."
1315
1314
msgstr "Указать формат данной ветви. См. «help formats»."
1316
1315
1317
#: bzrlib/builtins.py:2063
1316
#: bzrlib/builtins.py:2082
1318
1317
msgid ""
1319
1318
"Never change revnos or the existing log. Append revisions to it only."
1320
1319
msgstr ""
1321
1320
"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
1322
1321
"к нему ревизии."
1323
1322
1324
#: bzrlib/builtins.py:2066
1323
#: bzrlib/builtins.py:2085
1325
1324
msgid "Create a branch without a working tree."
1326
1325
msgstr "Создать ветвь без рабочего дерева."
1327
1326
1328
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1327
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1329
1328
#, python-format
1330
1329
msgid ""
1331
1330
"Parent directory of %s does not exist.\n"
1335
1334
"Вы может предоставить --create-prefix, чтобы создать все родительские "
1336
1335
"директории."
1337
1336
1338
#: bzrlib/builtins.py:2120
1337
#: bzrlib/builtins.py:2139
1339
1338
msgid ""
1340
1339
"This branch format cannot be set to append-revisions-only. Try --default."
1341
1340
msgstr ""
1342
1341
"Формат этой ветви не может быть установлен в append-revisions-only. "
1343
1342
"Попробуйте --default."
1344
1343
1345
#: bzrlib/builtins.py:2131
1344
#: bzrlib/builtins.py:2150
1346
1345
msgid "Created a {0} (format: {1})\n"
1347
1346
msgstr "Создана {0} в формате {1}\n"
1348
1347
1349
#: bzrlib/builtins.py:2140
1348
#: bzrlib/builtins.py:2159
1350
1349
#, python-format
1351
1350
msgid "Using shared repository: %s\n"
1352
1351
msgstr "Используется общий репозиторий: %s\n"
1353
1352
1354
#: bzrlib/builtins.py:2144
1353
#: bzrlib/builtins.py:2163
1355
1354
msgid "Create a shared repository for branches to share storage space."
1356
1355
msgstr ""
1357
1356
"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
1358
1357
1359
#: bzrlib/builtins.py:2146
1358
#: bzrlib/builtins.py:2165
1360
1359
msgid ""
1361
1360
"New branches created under the repository directory will store their\n"
1362
1361
"revisions in the repository, not in the branch directory. For branches\n"
1368
1367
"Для ветвей с общей историей это уменьшает размер необходимого\n"
1369
1368
"пространства и ускоряет создание новых ветвей."
1370
1369
1371
#: bzrlib/builtins.py:2151
1370
#: bzrlib/builtins.py:2170
1372
1371
msgid ""
1373
1372
"If the --no-trees option is given then the branches in the repository\n"
1374
1373
"will not have working trees by default. They will still exist as \n"
1384
1383
"хранящих ветви, работа с которыми производится через рабочие копии\n"
1385
1384
"или через удалённые ветви, например на сервере."
1386
1385
1387
#: bzrlib/builtins.py:2158
1386
#: bzrlib/builtins.py:2177
1388
1387
msgid ""
1389
1388
":Examples:\n"
1390
1389
" Create a shared repository holding just branches::"
1392
1391
":Примеры:\n"
1393
1392
" Создать общий репозиторий, хранящий только ветви::"
1394
1393
1395
#: bzrlib/builtins.py:2161
1394
#: bzrlib/builtins.py:2180
1396
1395
msgid ""
1397
1396
" bzr init-repo --no-trees repo\n"
1398
1397
" bzr init repo/trunk"
1400
1399
" bzr init-repo --no-trees repo\n"
1401
1400
" bzr init repo/trunk"
1402
1401
1403
#: bzrlib/builtins.py:2164
1402
#: bzrlib/builtins.py:2183
1404
1403
msgid " Make a lightweight checkout elsewhere::"
1405
1404
msgstr " Создать легковесную рабочую копию где-нибудь ещё::"
1406
1405
1407
#: bzrlib/builtins.py:2166
1406
#: bzrlib/builtins.py:2185
1408
1407
msgid ""
1409
1408
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1410
1409
" cd trunk-checkout\n"
1414
1413
" cd trunk-checkout\n"
1415
1414
" (здесь добавляйте файлы)"
1416
1415
1417
#: bzrlib/builtins.py:2174
1416
#: bzrlib/builtins.py:2193
1418
1417
msgid ""
1419
1418
"Specify a format for this repository. See \"bzr help formats\" for details."
1420
1419
msgstr ""
1421
1420
"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
1422
1421
"formats»."
1423
1422
1424
#: bzrlib/builtins.py:2178
1423
#: bzrlib/builtins.py:2197
1425
1424
msgid "Repository format"
1426
1425
msgstr "Формат репозитория"
1427
1426
1428
#: bzrlib/builtins.py:2180
1427
#: bzrlib/builtins.py:2199
1429
1428
msgid "Branches in the repository will default to not having a working tree."
1430
1429
msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
1431
1430
1432
#: bzrlib/builtins.py:2206
1431
#: bzrlib/builtins.py:2225
1433
1432
msgid "Show differences in the working tree, between revisions or branches."
1434
1433
msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
1435
1434
1436
#: bzrlib/builtins.py:2208
1435
#: bzrlib/builtins.py:2227
1437
1436
msgid ""
1438
1437
"If no arguments are given, all changes for the current tree are listed.\n"
1439
1438
"If files are given, only the changes in those files are listed.\n"
1448
1447
"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
1449
1448
"аргумента или из текущего дерева, если не дано аргументов."
1450
1449
1451
#: bzrlib/builtins.py:2215
1450
#: bzrlib/builtins.py:2234
1452
1451
msgid ""
1453
1452
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1454
1453
"produces patches suitable for \"patch -p1\"."
1456
1455
"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
1457
1456
"создаёт патчи, подходящие для «patch -p1»."
1458
1457
1459
#: bzrlib/builtins.py:2218
1458
#: bzrlib/builtins.py:2237
1460
1459
msgid ""
1461
1460
"Note that when using the -r argument with a range of revisions, the\n"
1462
1461
"differences are computed between the two specified revisions. That\n"
1471
1470
"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
1472
1471
"которая включает первую ревизию интервала."
1473
1472
1474
#: bzrlib/builtins.py:2225
1473
#: bzrlib/builtins.py:2244
1475
1474
msgid ""
1476
1475
":Exit values:\n"
1477
1476
" 1 - changed\n"
1485
1484
" 3 - ошибка\n"
1486
1485
" 0 - нет изменений"
1487
1486
1488
#: bzrlib/builtins.py:2231
1487
#: bzrlib/builtins.py:2250
1489
1488
msgid ""
1490
1489
":Examples:\n"
1491
1490
" Shows the difference in the working tree versus the last commit::"
1493
1492
":Примеры:\n"
1494
1493
" Показывает отличия рабочего дерева от последнего закрепления::"
1495
1494
1496
#: bzrlib/builtins.py:2234
1495
#: bzrlib/builtins.py:2253
1497
1496
msgid " bzr diff"
1498
1497
msgstr " bzr diff"
1499
1498
1500
#: bzrlib/builtins.py:2236
1499
#: bzrlib/builtins.py:2255
1501
1500
msgid " Difference between the working tree and revision 1::"
1502
1501
msgstr " Различия между рабочим деревом и ревизией 1::"
1503
1502
1504
#: bzrlib/builtins.py:2238
1503
#: bzrlib/builtins.py:2257
1505
1504
msgid " bzr diff -r1"
1506
1505
msgstr " bzr diff -r1"
1507
1506
1508
#: bzrlib/builtins.py:2240
1507
#: bzrlib/builtins.py:2259
1509
1508
msgid " Difference between revision 3 and revision 1::"
1510
1509
msgstr " Различия между ревизией 3 и ревизией 1::"
1511
1510
1512
#: bzrlib/builtins.py:2242
1511
#: bzrlib/builtins.py:2261
1513
1512
msgid " bzr diff -r1..3"
1514
1513
msgstr " bzr diff -r1..3"
1515
1514
1516
#: bzrlib/builtins.py:2244
1515
#: bzrlib/builtins.py:2263
1517
1516
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1518
1517
msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"
1519
1518
1520
#: bzrlib/builtins.py:2246
1519
#: bzrlib/builtins.py:2265
1521
1520
msgid " bzr diff -r1..3 xxx"
1522
1521
msgstr " bzr diff -r1..3 xxx"
1523
1522
1524
#: bzrlib/builtins.py:2248
1523
#: bzrlib/builtins.py:2267
1525
1524
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1526
1525
msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
1527
1526
1528
#: bzrlib/builtins.py:2250
1527
#: bzrlib/builtins.py:2269
1529
1528
msgid " bzr diff -c2"
1530
1529
msgstr " bzr diff -c2"
1531
1530
1532
#: bzrlib/builtins.py:2252
1531
#: bzrlib/builtins.py:2271
1533
1532
msgid ""
1534
1533
" To see the changes introduced by revision X::\n"
1535
1534
" \n"
1539
1538
" \n"
1540
1539
" bzr diff -cX"
1541
1540
1542
#: bzrlib/builtins.py:2256
1541
#: bzrlib/builtins.py:2275
1543
1542
msgid ""
1544
1543
" Note that in the case of a merge, the -c option shows the changes\n"
1545
1544
" compared to the left hand parent. To see the changes against\n"
1549
1548
" относительно левого родителя. Чтобы увидеть изменения относительно\n"
1550
1549
" правого родителя, используйте::"
1551
1550
1552
#: bzrlib/builtins.py:2260
1551
#: bzrlib/builtins.py:2279
1553
1552
msgid " bzr diff -r<chosen_parent>..X"
1554
1553
msgstr " bzr diff -r<выбранный_родитель>..X"
1555
1554
1556
#: bzrlib/builtins.py:2262
1555
#: bzrlib/builtins.py:2281
1557
1556
msgid ""
1558
1557
" The changes between the current revision and the previous revision\n"
1559
1558
" (equivalent to -c-1 and -r-2..-1)"
1561
1560
" Изменения между текущей ревизией и предыдущей\n"
1562
1561
" (эквивалент -c-1 и -r-2..-1)"
1563
1562
1564
#: bzrlib/builtins.py:2265
1563
#: bzrlib/builtins.py:2284
1565
1564
msgid " bzr diff -r-2.."
1566
1565
msgstr " bzr diff -r-2.."
1567
1566
1568
#: bzrlib/builtins.py:2267
1567
#: bzrlib/builtins.py:2286
1569
1568
msgid " Show just the differences for file NEWS::"
1570
1569
msgstr " Показать изменения только для файла NEWS::"
1571
1570
1572
#: bzrlib/builtins.py:2269
1571
#: bzrlib/builtins.py:2288
1573
1572
msgid " bzr diff NEWS"
1574
1573
msgstr " bzr diff NEWS"
1575
1574
1576
#: bzrlib/builtins.py:2271
1575
#: bzrlib/builtins.py:2290
1577
1576
msgid " Show the differences in working tree xxx for file NEWS::"
1578
1577
msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"
1579
1578
1580
#: bzrlib/builtins.py:2273
1579
#: bzrlib/builtins.py:2292
1581
1580
msgid " bzr diff xxx/NEWS"
1582
1581
msgstr " bzr diff xxx/NEWS"
1583
1582
1584
#: bzrlib/builtins.py:2275
1583
#: bzrlib/builtins.py:2294
1585
1584
msgid " Show the differences from branch xxx to this working tree:"
1586
1585
msgstr " Показать изменения рабочего дерева относительно ветви xxx:"
1587
1586
1588
#: bzrlib/builtins.py:2277
1587
#: bzrlib/builtins.py:2296
1589
1588
msgid " bzr diff --old xxx"
1590
1589
msgstr " bzr diff --old xxx"
1591
1590
1592
#: bzrlib/builtins.py:2279
1591
#: bzrlib/builtins.py:2298
1593
1592
msgid " Show the differences between two branches for file NEWS::"
1594
1593
msgstr " Показать различия в файле NEWS между двумя ветвями::"
1595
1594
1596
#: bzrlib/builtins.py:2281
1595
#: bzrlib/builtins.py:2300
1597
1596
msgid " bzr diff --old xxx --new yyy NEWS"
1598
1597
msgstr " bzr diff --old xxx --new yyy NEWS"
1599
1598
1600
#: bzrlib/builtins.py:2283
1599
#: bzrlib/builtins.py:2302
1601
1600
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1602
1601
msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
1603
1602
1604
#: bzrlib/builtins.py:2285
1603
#: bzrlib/builtins.py:2304
1605
1604
msgid ""
1606
1605
" bzr diff --prefix old/:new/\n"
1607
1606
" \n"
1616
1615
" \n"
1617
1616
" bzr diff --using /usr/bin/diff --diff-options -wu"
1618
1617
1619
#: bzrlib/builtins.py:2295
1618
#: bzrlib/builtins.py:2314
1620
1619
msgid "Pass these options to the external diff program."
1621
1620
msgstr "Передать эти опции внешней программе diff."
1622
1621
1623
#: bzrlib/builtins.py:2298
1622
#: bzrlib/builtins.py:2317
1624
1623
msgid ""
1625
1624
"Set prefixes added to old and new filenames, as two values separated by a "
1626
1625
"colon. (eg \"old/:new/\")."
1628
1627
"Установить префиксы, добавляемые к старым и новым именам файлов, как "
1629
1628
"значения, разделённые двоеточием (напр. «old/:new/»)."
1630
1629
1631
#: bzrlib/builtins.py:2301
1630
#: bzrlib/builtins.py:2320
1632
1631
msgid "Branch/tree to compare from."
1633
1632
msgstr "Ветвь или дерево, которое сравнивать."
1634
1633
1635
#: bzrlib/builtins.py:2305
1634
#: bzrlib/builtins.py:2324
1636
1635
msgid "Branch/tree to compare to."
1637
1636
msgstr "Ветвь или дерево, с которым сравнивать."
1638
1637
1639
#: bzrlib/builtins.py:2311
1638
#: bzrlib/builtins.py:2330
1640
1639
msgid "Use this command to compare files."
1641
1640
msgstr "Использовать эту команду для сравнения."
1642
1641
1643
#: bzrlib/builtins.py:2316
1642
#: bzrlib/builtins.py:2335
1644
1643
msgid "Diff format to use."
1645
1644
msgstr "Используемый формат diff."
1646
1645
1647
#: bzrlib/builtins.py:2318
1646
#: bzrlib/builtins.py:2337
1648
1647
msgid "Diff format"
1649
1648
msgstr "Формат diff"
1650
1649
1651
#: bzrlib/builtins.py:2340
1650
#: bzrlib/builtins.py:2359
1652
1651
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1653
1652
msgstr ""
1654
1653
"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
1655
1654
1656
#: bzrlib/builtins.py:2344
1655
#: bzrlib/builtins.py:2363
1657
1656
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1658
1657
msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
1659
1658
1660
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1661
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1659
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1660
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1662
1661
msgid "{0} and {1} are mutually exclusive"
1663
1662
msgstr "{0} и {1} взаимоисключающи"
1664
1663
1665
#: bzrlib/builtins.py:2369
1664
#: bzrlib/builtins.py:2388
1666
1665
msgid ""
1667
1666
"List files deleted in the working tree.\n"
1668
1667
" "
1670
1669
"Вывести список файлов, удалённых в рабочем дереве.\n"
1671
1670
" "
1672
1671
1673
#: bzrlib/builtins.py:2446
1672
#: bzrlib/builtins.py:2465
1674
1673
msgid "Show the tree root directory."
1675
1674
msgstr "Показать корневую директорию дерева."
1676
1675
1677
#: bzrlib/builtins.py:2448
1676
#: bzrlib/builtins.py:2467
1678
1677
msgid ""
1679
1678
"The root is the nearest enclosing directory with a .bzr control\n"
1680
1679
"directory."
1682
1681
"Корень это ближайшая родительская директория с управляющей\n"
1683
1682
"директорией .bzr."
1684
1683
1685
#: bzrlib/builtins.py:2463
1684
#: bzrlib/builtins.py:2482
1686
1685
msgid "The limit argument must be an integer."
1687
1686
msgstr "Аргумент предела должен быть целым числом."
1688
1687
1689
#: bzrlib/builtins.py:2471
1688
#: bzrlib/builtins.py:2490
1690
1689
msgid "The levels argument must be an integer."
1691
1690
msgstr "Аргументы пределов должны быть целыми числами."
1692
1691
1693
#: bzrlib/builtins.py:2476
1692
#: bzrlib/builtins.py:2495
1694
1693
msgid "Show historical log for a branch or subset of a branch."
1695
1694
msgstr "Показать журнал истории ветви или подмножества ветви."
1696
1695
1697
#: bzrlib/builtins.py:2478
1696
#: bzrlib/builtins.py:2497
1698
1697
msgid ""
1699
1698
"log is bzr's default tool for exploring the history of a branch.\n"
1700
1699
"The branch to use is taken from the first parameter. If no parameters\n"
1706
1705
"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
1707
1706
"Вот несколько простых примеров::"
1708
1707
1709
#: bzrlib/builtins.py:2483
1708
#: bzrlib/builtins.py:2502
1710
1709
msgid ""
1711
1710
" bzr log log the current branch\n"
1712
1711
" bzr log foo.py log a file in its branch\n"
1716
1715
" bzr log foo.py журнал файла в его ветви\n"
1717
1716
" bzr log http://server/branch журнал ветви на сервере"
1718
1717
1719
#: bzrlib/builtins.py:2487
1718
#: bzrlib/builtins.py:2506
1720
1719
msgid ""
1721
1720
"The filtering, ordering and information shown for each revision can\n"
1722
1721
"be controlled as explained below. By default, all revisions are\n"
1732
1731
"отображаются, то они отображаются с отступом, относительно ревизии,\n"
1733
1732
"в которой происходило слияние."
1734
1733
1735
#: bzrlib/builtins.py:2494
1734
#: bzrlib/builtins.py:2513
1736
1735
msgid ":Output control:"
1737
1736
msgstr ":Управление выводом:"
1738
1737
1739
#: bzrlib/builtins.py:2496
1738
#: bzrlib/builtins.py:2515
1740
1739
msgid ""
1741
1740
" The log format controls how information about each revision is\n"
1742
1741
" displayed. The standard log formats are called ``long``, ``short``\n"
1748
1747
" и «line». По умолчание используется long. Подробности о форматах\n"
1749
1748
" смотрите в «bzr help log-formats»."
1750
1749
1751
#: bzrlib/builtins.py:2501
1750
#: bzrlib/builtins.py:2520
1752
1751
msgid ""
1753
1752
" The following options can be used to control what information is\n"
1754
1753
" displayed::"
1756
1755
" Следующие опции могут использоваться для управления отображением\n"
1757
1756
" информации::"
1758
1757
1759
#: bzrlib/builtins.py:2504
1758
#: bzrlib/builtins.py:2523
1760
1759
msgid ""
1761
1760
" -l N display a maximum of N revisions\n"
1762
1761
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1770
1769
" -p выводить различия diff для каждой ревизии\n"
1771
1770
" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"
1772
1771
1773
#: bzrlib/builtins.py:2510
1772
#: bzrlib/builtins.py:2529
1774
1773
msgid ""
1775
1774
" Note that the default number of levels to display is a function of the\n"
1776
1775
" log format. If the -n option is not used, the standard log formats show\n"
1780
1779
" Если используется не опция -n, стандартные форматы журнала показывают\n"
1781
1780
" верхний уровень (основную линию)."
1782
1781
1783
#: bzrlib/builtins.py:2514
1782
#: bzrlib/builtins.py:2533
1784
1783
msgid ""
1785
1784
" Status summaries are shown using status flags like A, M, etc. To see\n"
1786
1785
" the changes explained using words like ``added`` and ``modified``\n"
1790
1789
" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
1791
1790
" используйте опцию -vv."
1792
1791
1793
#: bzrlib/builtins.py:2518
1792
#: bzrlib/builtins.py:2537
1794
1793
msgid ":Ordering control:"
1795
1794
msgstr ":Управление порядком:"
1796
1795
1797
#: bzrlib/builtins.py:2520
1796
#: bzrlib/builtins.py:2539
1798
1797
msgid ""
1799
1798
" To display revisions from oldest to newest, use the --forward option.\n"
1800
1799
" In most cases, using this option will have little impact on the total\n"
1806
1805
" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
1807
1806
" как это делает --reverse."
1808
1807
1809
#: bzrlib/builtins.py:2525
1808
#: bzrlib/builtins.py:2544
1810
1809
msgid ":Revision filtering:"
1811
1810
msgstr ":Фильтрация ревизий:"
1812
1811
1813
#: bzrlib/builtins.py:2527
1812
#: bzrlib/builtins.py:2546
1814
1813
msgid ""
1815
1814
" The -r option can be used to specify what revision or range of revisions\n"
1816
1815
" to filter against. The various forms are shown below::"
1818
1817
" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
1819
1818
" для фильтрации. Различные формы показаны ниже::"
1820
1819
1821
#: bzrlib/builtins.py:2530
1820
#: bzrlib/builtins.py:2549
1822
1821
msgid ""
1823
1822
" -rX display revision X\n"
1824
1823
" -rX.. display revision X and later\n"
1830
1829
" -r..Y вывести до и включая ревизию Y\n"
1831
1830
" -rX..Y вывести от X до Y включительно"
1832
1831
1833
#: bzrlib/builtins.py:2535
1832
#: bzrlib/builtins.py:2554
1834
1833
msgid ""
1835
1834
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1836
1835
" Some common examples are given below::"
1838
1837
" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
1839
1838
" Ниже приведеные некоторые распространённые примеры::"
1840
1839
1841
#: bzrlib/builtins.py:2538
1840
#: bzrlib/builtins.py:2557
1842
1841
msgid ""
1843
1842
" -r-1 show just the tip\n"
1844
1843
" -r-10.. show the last 10 mainline revisions\n"
1854
1853
" этой ветви и указанной в пути\n"
1855
1854
" -rdate:yesterday.. показать изменения со вчерашнего дня"
1856
1855
1857
#: bzrlib/builtins.py:2545
1856
#: bzrlib/builtins.py:2564
1858
1857
msgid ""
1859
1858
" When logging a range of revisions using -rX..Y, log starts at\n"
1860
1859
" revision Y and searches back in history through the primary\n"
1864
1863
" a nested merge revision and the log will be truncated accordingly."
1865
1864
msgstr ""
1866
1865
1867
#: bzrlib/builtins.py:2552
1866
#: bzrlib/builtins.py:2571
1868
1867
msgid ":Path filtering:"
1869
1868
msgstr ":Фильтрация пути:"
1870
1869
1871
#: bzrlib/builtins.py:2554
1870
#: bzrlib/builtins.py:2573
1872
1871
msgid ""
1873
1872
" If parameters are given and the first one is not a branch, the log\n"
1874
1873
" will be filtered to show only those revisions that changed the\n"
1877
1876
" Если заданы параметры и первый не является ветвью, будут отображаться\n"
1878
1877
" только те ревизии, которые изменяли указанные файлы или директории."
1879
1878
1880
#: bzrlib/builtins.py:2558
1879
#: bzrlib/builtins.py:2577
1881
1880
msgid ""
1882
1881
" Filenames are interpreted within their historical context. To log a\n"
1883
1882
" deleted file, specify a revision range so that the file existed at\n"
1887
1886
" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
1888
1887
" существует от начала до конца интервала."
1889
1888
1890
#: bzrlib/builtins.py:2562
1889
#: bzrlib/builtins.py:2581
1891
1890
msgid ""
1892
1891
" Historical context is also important when interpreting pathnames of\n"
1893
1892
" renamed files/directories. Consider the following example:"
1895
1894
" Исторический контекст также важен при интерпретации путей\n"
1896
1895
" переименованных файлов и директорий. Рассмотрим следующий пример:"
1897
1896
1898
#: bzrlib/builtins.py:2565
1897
#: bzrlib/builtins.py:2584
1899
1898
msgid ""
1900
1899
" * revision 1: add tutorial.txt\n"
1901
1900
" * revision 2: modify tutorial.txt\n"
1905
1904
" * ревизия 2: изменён tutorial.txt\n"
1906
1905
" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
1907
1906
1908
#: bzrlib/builtins.py:2569
1907
#: bzrlib/builtins.py:2588
1909
1908
msgid " In this case:"
1910
1909
msgstr " В этом случае:"
1911
1910
1912
#: bzrlib/builtins.py:2571
1911
#: bzrlib/builtins.py:2590
1913
1912
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1914
1913
msgstr ""
1915
1914
" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
1916
1915
1917
#: bzrlib/builtins.py:2573
1916
#: bzrlib/builtins.py:2592
1918
1917
msgid ""
1919
1918
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1920
1919
msgstr ""
1921
1920
" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
1922
1921
" в ревизии 3"
1923
1922
1924
#: bzrlib/builtins.py:2575
1923
#: bzrlib/builtins.py:2594
1925
1924
msgid ""
1926
1925
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1927
1926
" the original file in revision 2."
1929
1928
" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
1930
1929
" файла в ревизии 2."
1931
1930
1932
#: bzrlib/builtins.py:2578
1931
#: bzrlib/builtins.py:2597
1933
1932
msgid ""
1934
1933
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1935
1934
" was no file called guide.txt in revision 2."
1937
1936
" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
1938
1937
" в ревизии 2 нет файла guide.txt."
1939
1938
1940
#: bzrlib/builtins.py:2581
1939
#: bzrlib/builtins.py:2600
1941
1940
msgid ""
1942
1941
" Renames are always followed by log. By design, there is no need to\n"
1943
1942
" explicitly ask for this (and no way to stop logging a file back\n"
1944
1943
" until it was last renamed)."
1945
1944
msgstr ""
1946
1945
1947
#: bzrlib/builtins.py:2585
1946
#: bzrlib/builtins.py:2604
1948
1947
msgid ":Other filtering:"
1949
1948
msgstr ":Другая фильтрация:"
1950
1949
1951
#: bzrlib/builtins.py:2587
1950
#: bzrlib/builtins.py:2606
1952
1951
msgid ""
1953
1952
" The --match option can be used for finding revisions that match a\n"
1954
1953
" regular expression in a commit message, committer, author or bug.\n"
1963
1962
" полям можно использовать опции --match-author, --match-bugs,\n"
1964
1963
" --match-committer и --match-message."
1965
1964
1966
#: bzrlib/builtins.py:2593
1965
#: bzrlib/builtins.py:2612
1967
1966
msgid ":Tips & tricks:"
1968
1967
msgstr ":Советы и трюки:"
1969
1968
1970
#: bzrlib/builtins.py:2595
1969
#: bzrlib/builtins.py:2614
1971
1970
msgid ""
1972
1971
" GUI tools and IDEs are often better at exploring history than command\n"
1973
1972
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1981
1980
" <http://doc.bazaar.canonical.com/plugins/en/> и\n"
1982
1981
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1983
1982
1984
#: bzrlib/builtins.py:2601
1983
#: bzrlib/builtins.py:2620
1985
1984
msgid ""
1986
1985
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1987
1986
msgstr ""
1988
1987
" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
1989
1988
1990
#: bzrlib/builtins.py:2603
1989
#: bzrlib/builtins.py:2622
1991
1990
msgid ""
1992
1991
" [ALIASES]\n"
1993
1992
" tip = log -r-1\n"
1999
1998
" top = log -l10 --line\n"
2000
1999
" show = log -v -p"
2001
2000
2002
#: bzrlib/builtins.py:2608
2001
#: bzrlib/builtins.py:2627
2003
2002
msgid ""
2004
2003
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2005
2004
" will show the last 10 mainline revisions. To see the details of a\n"
2009
2008
" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
2010
2009
" ревизии X, используйте «bzr show -rX»."
2011
2010
2012
#: bzrlib/builtins.py:2612
2011
#: bzrlib/builtins.py:2631
2013
2012
msgid ""
2014
2013
" If you are interested in looking deeper into a particular merge X,\n"
2015
2014
" use ``bzr log -n0 -rX``."
2017
2016
" Если вы хотите подробно рассмотреть определённое слияние X,\n"
2018
2017
" используйте «bzr log -n0 -rX»."
2019
2018
2020
#: bzrlib/builtins.py:2615
2019
#: bzrlib/builtins.py:2634
2021
2020
msgid ""
2022
2021
" ``bzr log -v`` on a branch with lots of history is currently\n"
2023
2022
" very slow. A fix for this issue is currently under development.\n"
2029
2028
" недостатка. Независимо от того, будет это исправлено или нет,\n"
2030
2029
" рекомендуется задавать интервал ревизий с помощью опции -v."
2031
2030
2032
#: bzrlib/builtins.py:2620
2031
#: bzrlib/builtins.py:2639
2033
2032
msgid ""
2034
2033
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2035
2034
" used to find revisions matching user names, commit messages, etc.\n"
2037
2036
" a list of words but not others."
2038
2037
msgstr ""
2039
2038
2040
#: bzrlib/builtins.py:2625
2039
#: bzrlib/builtins.py:2644
2041
2040
msgid ""
2042
2041
" When exploring non-mainline history on large projects with deep\n"
2043
2042
" history, the performance of log can be greatly improved by installing\n"
2045
2044
" trading disk space for faster speed."
2046
2045
msgstr ""
2047
2046
2048
#: bzrlib/builtins.py:2634
2047
#: bzrlib/builtins.py:2653
2049
2048
msgid "Show from oldest to newest."
2050
2049
msgstr "Выводить от старых к новым."
2051
2050
2052
#: bzrlib/builtins.py:2637
2051
#: bzrlib/builtins.py:2656
2053
2052
msgid "Show files changed in each revision."
2054
2053
msgstr "Показывать файлы, изменённые в каждой ревизии."
2055
2054
2056
#: bzrlib/builtins.py:2643
2055
#: bzrlib/builtins.py:2662
2057
2056
msgid "Show just the specified revision. See also \"help revisionspec\"."
2058
2057
msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
2059
2058
2060
#: bzrlib/builtins.py:2647
2059
#: bzrlib/builtins.py:2666
2061
2060
msgid "What names to list as authors - first, all or committer."
2062
2061
msgstr "Какие имена выводить, как авторов — first, all или committer."
2063
2062
2064
#: bzrlib/builtins.py:2648
2063
#: bzrlib/builtins.py:2667
2065
2064
msgid "Authors"
2066
2065
msgstr "Авторы"
2067
2066
2068
#: bzrlib/builtins.py:2653
2067
#: bzrlib/builtins.py:2672
2069
2068
msgid "Number of levels to display - 0 for all, 1 for flat."
2070
2069
msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
2071
2070
2072
#: bzrlib/builtins.py:2663
2071
#: bzrlib/builtins.py:2682
2073
2072
msgid "Limit the output to the first N revisions."
2074
2073
msgstr "Ограничить вывод лишь первыми N ревизиями."
2075
2074
2076
#: bzrlib/builtins.py:2668
2075
#: bzrlib/builtins.py:2687
2077
2076
msgid "Show changes made in each revision as a patch."
2078
2077
msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
2079
2078
2080
#: bzrlib/builtins.py:2670
2079
#: bzrlib/builtins.py:2689
2081
2080
msgid "Show merged revisions like --levels 0 does."
2082
2081
msgstr "Показывать слияния, как это делает --levels 0."
2083
2082
2084
#: bzrlib/builtins.py:2674
2083
#: bzrlib/builtins.py:2693
2085
2084
msgid "Do not report commits with more than one parent."
2086
2085
msgstr "Не сообщать о закреплениях с более, чем одним родителем."
2087
2086
2088
#: bzrlib/builtins.py:2676
2087
#: bzrlib/builtins.py:2695
2089
2088
msgid ""
2090
2089
"Display only the revisions that are not part of both ancestries (require -"
2091
2090
"rX..Y)."
2093
2092
"Показать только ревизии, которые не являются частью обоих предков (требует -"
2094
2093
"rX..Y)."
2095
2094
2096
#: bzrlib/builtins.py:2680
2095
#: bzrlib/builtins.py:2699
2097
2096
msgid "Show digital signature validity."
2098
2097
msgstr ""
2099
2098
2100
#: bzrlib/builtins.py:2683
2099
#: bzrlib/builtins.py:2702
2101
2100
msgid "Show revisions whose properties match this expression."
2102
2101
msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
2103
2102
2104
#: bzrlib/builtins.py:2687
2103
#: bzrlib/builtins.py:2706
2105
2104
msgid "Show revisions whose message matches this expression."
2106
2105
msgstr ""
2107
2106
"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
2108
2107
2109
#: bzrlib/builtins.py:2691
2108
#: bzrlib/builtins.py:2710
2110
2109
msgid "Show revisions whose committer matches this expression."
2111
2110
msgstr ""
2112
2111
"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
2113
2112
2114
#: bzrlib/builtins.py:2695
2113
#: bzrlib/builtins.py:2714
2115
2114
msgid "Show revisions whose authors match this expression."
2116
2115
msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
2117
2116
2118
#: bzrlib/builtins.py:2699
2117
#: bzrlib/builtins.py:2718
2119
2118
msgid "Show revisions whose bugs match this expression."
2120
2119
msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
2121
2120
2122
#: bzrlib/builtins.py:2753
2121
#: bzrlib/builtins.py:2772
2123
2122
msgid "--exclude-common-ancestry requires -r with two revisions"
2124
2123
msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
2125
2124
2126
#: bzrlib/builtins.py:2781
2125
#: bzrlib/builtins.py:2800
2127
2126
#, python-format
2128
2127
msgid "Path unknown at end or start of revision range: %s"
2129
2128
msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
2130
2129
2131
#: bzrlib/builtins.py:2898
2130
#: bzrlib/builtins.py:2917
2132
2131
#, python-format
2133
2132
msgid "bzr %s doesn't accept two revisions in different branches."
2134
2133
msgstr "bzr %s не принимает две ревизии в различных ветвях."
2135
2134
2136
#: bzrlib/builtins.py:2914
2135
#: bzrlib/builtins.py:2933
2137
2136
#, python-format
2138
2137
msgid "bzr %s --revision takes one or two values."
2139
2138
msgstr "bzr %s --revision принимает одно или два значения."
2140
2139
2141
#: bzrlib/builtins.py:2959
2140
#: bzrlib/builtins.py:2978
2142
2141
msgid ""
2143
2142
"List files in a tree.\n"
2144
2143
" "
2146
2145
"Вывести список файлов в дереве.\n"
2147
2146
" "
2148
2147
2149
#: bzrlib/builtins.py:2968
2148
#: bzrlib/builtins.py:2987
2150
2149
msgid "Recurse into subdirectories."
2151
2150
msgstr "Рекурсивно входить в поддиректории."
2152
2151
2153
#: bzrlib/builtins.py:2970
2152
#: bzrlib/builtins.py:2989
2154
2153
msgid "Print paths relative to the root of the branch."
2155
2154
msgstr "Выводить пути относительно корня ветви."
2156
2155
2157
#: bzrlib/builtins.py:2972
2156
#: bzrlib/builtins.py:2991
2158
2157
msgid "Print unknown files."
2159
2158
msgstr "Выводить неизвестные файлы."
2160
2159
2161
#: bzrlib/builtins.py:2973
2160
#: bzrlib/builtins.py:2992
2162
2161
msgid "Print versioned files."
2163
2162
msgstr "Выводить файлы под контролем системы версий."
2164
2163
2165
#: bzrlib/builtins.py:2976
2164
#: bzrlib/builtins.py:2995
2166
2165
msgid "Print ignored files."
2167
2166
msgstr "Выводить игнорируемые файлы."
2168
2167
2169
#: bzrlib/builtins.py:2978
2168
#: bzrlib/builtins.py:2997
2170
2169
msgid "List entries of a particular kind: file, directory, symlink."
2171
2170
msgstr "Выводить файлы определённого типа: file, directory, symlink."
2172
2171
2173
#: bzrlib/builtins.py:2991
2172
#: bzrlib/builtins.py:3010
2174
2173
msgid "invalid kind specified"
2175
2174
msgstr "указан неверный вид файла"
2176
2175
2177
#: bzrlib/builtins.py:2994
2176
#: bzrlib/builtins.py:3013
2178
2177
msgid "Cannot set both --verbose and --null"
2179
2178
msgstr "Нельзя установить оба --verbose и --null"
2180
2179
2181
#: bzrlib/builtins.py:3003
2180
#: bzrlib/builtins.py:3022
2182
2181
msgid "cannot specify both --from-root and PATH"
2183
2182
msgstr "нельзя указать оба --from-root и PATH"
2184
2183
2185
#: bzrlib/builtins.py:3090
2184
#: bzrlib/builtins.py:3109
2186
2185
msgid "Ignore specified files or patterns."
2187
2186
msgstr "Игнорировать указанные файлы или шаблоны."
2188
2187
2189
#: bzrlib/builtins.py:3092
2188
#: bzrlib/builtins.py:3111
2190
2189
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2191
2190
msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
2192
2191
2193
#: bzrlib/builtins.py:3094
2192
#: bzrlib/builtins.py:3113
2194
2193
msgid ""
2195
2194
"If a .bzrignore file does not exist, the ignore command\n"
2196
2195
"will create one and add the specified files or patterns to the newly\n"
2204
2203
"к системе версий. Создание файла .bzrignore без использования\n"
2205
2204
"команды ignore потребует явного добавления командой add."
2206
2205
2207
#: bzrlib/builtins.py:3100
2206
#: bzrlib/builtins.py:3119
2208
2207
msgid ""
2209
2208
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2210
2209
"After adding, editing or deleting that file either indirectly by\n"
2216
2215
"файла, как неявно с помощью этой команды, так и явно при помощи\n"
2217
2216
"редактора, не забывайте закреплять его."
2218
2217
2219
#: bzrlib/builtins.py:3105
2218
#: bzrlib/builtins.py:3124
2220
2219
msgid ""
2221
2220
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2222
2221
"the global ignore file can be found in the application data directory as\n"
2232
2231
"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
2233
2232
"отредактирован вручную с помощью текстового редактора."
2234
2233
2235
#: bzrlib/builtins.py:3111
2234
#: bzrlib/builtins.py:3130
2236
2235
msgid ""
2237
2236
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2238
2237
"precedence over regular ignores. Such exceptions are used to specify\n"
2243
2242
"указания файлов, которые должны попасть под контроль системы версий, но\n"
2244
2243
"по умолчанию игнорируются."
2245
2244
2246
#: bzrlib/builtins.py:3115
2245
#: bzrlib/builtins.py:3134
2247
2246
msgid ""
2248
2247
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2249
2248
"precedence over the '!' exception patterns."
2251
2250
"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
2252
2251
"приоритет над шаблонами исключений '!'."
2253
2252
2254
#: bzrlib/builtins.py:3118
2253
#: bzrlib/builtins.py:3137
2255
2254
msgid ""
2256
2255
":Notes: \n"
2257
2256
" \n"
2263
2262
"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
2264
2263
" должны быть заключены в кавычки при указании в командной строке."
2265
2264
2266
#: bzrlib/builtins.py:3123
2265
#: bzrlib/builtins.py:3142
2267
2266
msgid ""
2268
2267
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2269
2268
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2272
2271
" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
2273
2272
" префикс \"RE:\"."
2274
2273
2275
#: bzrlib/builtins.py:3126
2274
#: bzrlib/builtins.py:3145
2276
2275
msgid ""
2277
2276
":Examples:\n"
2278
2277
" Ignore the top level Makefile::"
2280
2279
":Примеры:\n"
2281
2280
" Игнорировать файл Makefile на верхнем уровне::"
2282
2281
2283
#: bzrlib/builtins.py:3129
2282
#: bzrlib/builtins.py:3148
2284
2283
msgid " bzr ignore ./Makefile"
2285
2284
msgstr " bzr ignore ./Makefile"
2286
2285
2287
#: bzrlib/builtins.py:3131
2286
#: bzrlib/builtins.py:3150
2288
2287
msgid " Ignore .class files in all directories...::"
2289
2288
msgstr " Игнорировать файлы .class во всех директориях...::"
2290
2289
2291
#: bzrlib/builtins.py:3133
2290
#: bzrlib/builtins.py:3152
2292
2291
msgid " bzr ignore \"*.class\""
2293
2292
msgstr " bzr ignore \"*.class\""
2294
2293
2295
#: bzrlib/builtins.py:3135
2294
#: bzrlib/builtins.py:3154
2296
2295
msgid " ...but do not ignore \"special.class\"::"
2297
2296
msgstr " ...но не игнорировать \"special.class\"::"
2298
2297
2299
#: bzrlib/builtins.py:3137
2298
#: bzrlib/builtins.py:3156
2300
2299
msgid " bzr ignore \"!special.class\""
2301
2300
msgstr " bzr ignore \"!special.class\""
2302
2301
2303
#: bzrlib/builtins.py:3139
2302
#: bzrlib/builtins.py:3158
2304
2303
msgid " Ignore files whose name begins with the \"#\" character::"
2305
2304
msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"
2306
2305
2307
#: bzrlib/builtins.py:3141
2306
#: bzrlib/builtins.py:3160
2308
2307
msgid " bzr ignore \"RE:^#\""
2309
2308
msgstr " bzr ignore \"RE:^#\""
2310
2309
2311
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
2310
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2312
2311
msgid " Ignore .o files under the lib directory::"
2313
2312
msgstr " Игнорировать файлы .o в директории lib::"
2314
2313
2315
#: bzrlib/builtins.py:3145
2314
#: bzrlib/builtins.py:3164
2316
2315
msgid " bzr ignore \"lib/**/*.o\""
2317
2316
msgstr " bzr ignore \"lib/**/*.o\""
2318
2317
2319
#: bzrlib/builtins.py:3149
2318
#: bzrlib/builtins.py:3168
2320
2319
msgid " bzr ignore \"RE:lib/.*\\.o\""
2321
2320
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2322
2321
2323
#: bzrlib/builtins.py:3151
2322
#: bzrlib/builtins.py:3170
2324
2323
msgid " Ignore everything but the \"debian\" toplevel directory::"
2325
2324
msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"
2326
2325
2327
#: bzrlib/builtins.py:3153
2326
#: bzrlib/builtins.py:3172
2328
2327
msgid ""
2329
2328
" bzr ignore \"RE:(?!debian/).*\"\n"
2330
2329
" \n"
2344
2343
" bzr ignore \"!./local\"\n"
2345
2344
" bzr ignore \"!!*~\""
2346
2345
2347
#: bzrlib/builtins.py:3167
2346
#: bzrlib/builtins.py:3186
2348
2347
msgid "Display the default ignore rules that bzr uses."
2349
2348
msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
2350
2349
2351
#: bzrlib/builtins.py:3179
2350
#: bzrlib/builtins.py:3198
2352
2351
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2353
2352
msgstr ""
2354
2353
"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
2355
2354
2356
#: bzrlib/builtins.py:3190
2355
#: bzrlib/builtins.py:3209
2357
2356
#, python-format
2358
2357
msgid "Invalid ignore pattern found. %s"
2359
2358
msgid_plural "Invalid ignore patterns found. %s"
2361
2360
msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
2362
2361
msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
2363
2362
2364
#: bzrlib/builtins.py:3199
2363
#: bzrlib/builtins.py:3218
2365
2364
msgid "NAME_PATTERN should not be an absolute path"
2366
2365
msgstr "NAME_PATTERN не должен быть абсолютным путём"
2367
2366
2368
#: bzrlib/builtins.py:3212
2367
#: bzrlib/builtins.py:3231
2369
2368
#, python-format
2370
2369
msgid ""
2371
2370
"Warning: the following files are version controlled and match your ignore "
2380
2379
"Эти файлы будут продолжать под контролем системы версий, пока вы не "
2381
2380
"выполните 'bzr remove'.\n"
2382
2381
2383
#: bzrlib/builtins.py:3219
2382
#: bzrlib/builtins.py:3238
2384
2383
msgid "List ignored files and the patterns that matched them."
2385
2384
msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
2386
2385
2387
#: bzrlib/builtins.py:3221
2386
#: bzrlib/builtins.py:3240
2388
2387
msgid ""
2389
2388
"List all the ignored files and the ignore pattern that caused the file to\n"
2390
2389
"be ignored."
2392
2391
"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
2393
2392
"файлы игнорируются."
2394
2393
2395
#: bzrlib/builtins.py:3224
2394
#: bzrlib/builtins.py:3243
2396
2395
msgid "Alternatively, to list just the files::"
2397
2396
msgstr "Альтернативно, чтобы вывести только файлы::"
2398
2397
2399
#: bzrlib/builtins.py:3226
2398
#: bzrlib/builtins.py:3245
2400
2399
msgid " bzr ls --ignored"
2401
2400
msgstr " bzr ls --ignored"
2402
2401
2403
#: bzrlib/builtins.py:3260
2402
#: bzrlib/builtins.py:3279
2404
2403
#, python-format
2405
2404
msgid "not a valid revision-number: %r"
2406
2405
msgstr "некорректный номер ревизии: %r"
2407
2406
2408
#: bzrlib/builtins.py:3267
2407
#: bzrlib/builtins.py:3286
2409
2408
msgid ""
2410
2409
"Export current or past revision to a destination directory or archive."
2411
2410
msgstr ""
2412
2411
"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
2413
2412
"или архив."
2414
2413
2415
#: bzrlib/builtins.py:3269
2414
#: bzrlib/builtins.py:3288
2416
2415
msgid "If no revision is specified this exports the last committed revision."
2417
2416
msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
2418
2417
2419
#: bzrlib/builtins.py:3271
2418
#: bzrlib/builtins.py:3290
2420
2419
msgid ""
2421
2420
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2422
2421
"given, try to find the format with the extension. If no extension\n"
2426
2425
"Если не указан, формат определяется по расширению. Если расширение\n"
2427
2426
"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
2428
2427
2429
#: bzrlib/builtins.py:3275
2428
#: bzrlib/builtins.py:3294
2430
2429
msgid ""
2431
2430
"If root is supplied, it will be used as the root directory inside\n"
2432
2431
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2437
2436
"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
2438
2437
"эффекта для формата 'dir'."
2439
2438
2440
#: bzrlib/builtins.py:3279
2439
#: bzrlib/builtins.py:3298
2441
2440
msgid ""
2442
2441
"If branch is omitted then the branch containing the current working\n"
2443
2442
"directory will be used."
2445
2444
"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
2446
2445
"директорию."
2447
2446
2448
#: bzrlib/builtins.py:3282
2447
#: bzrlib/builtins.py:3301
2449
2448
msgid ""
2450
2449
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2451
2450
msgstr ""
2452
2451
"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
2453
2452
"символы, не поддерживается."
2454
2453
2455
#: bzrlib/builtins.py:3284
2454
#: bzrlib/builtins.py:3303
2456
2455
msgid ""
2457
2456
" ================= =========================\n"
2458
2457
" Supported formats Autodetected by extension\n"
2474
2473
" zip .zip\n"
2475
2474
" ====================== ============================="
2476
2475
2477
#: bzrlib/builtins.py:3298
2476
#: bzrlib/builtins.py:3317
2478
2477
msgid "Type of file to export to."
2479
2478
msgstr "Тип файла для экспорта."
2480
2479
2481
#: bzrlib/builtins.py:3301
2480
#: bzrlib/builtins.py:3320
2482
2481
msgid "Apply content filters to export the convenient form."
2483
2482
msgstr ""
2484
2483
2485
#: bzrlib/builtins.py:3305
2484
#: bzrlib/builtins.py:3324
2486
2485
msgid "Name of the root directory inside the exported file."
2487
2486
msgstr "Имя корневой директории внутри экспортируемого файла."
2488
2487
2489
#: bzrlib/builtins.py:3307
2488
#: bzrlib/builtins.py:3326
2490
2489
msgid ""
2491
2490
"Set modification time of files to that of the last revision in which it was "
2492
2491
"changed."
2494
2493
"Установить время изменения файлов на время последней ревизии, в которой они "
2495
2494
"были изменены."
2496
2495
2497
#: bzrlib/builtins.py:3310
2496
#: bzrlib/builtins.py:3329
2498
2497
msgid ""
2499
2498
"Export the working tree contents rather than that of the last revision."
2500
2499
msgstr ""
2501
2500
2502
#: bzrlib/builtins.py:3329
2501
#: bzrlib/builtins.py:3348
2503
2502
msgid "--uncommitted requires a working tree"
2504
2503
msgstr "--uncommitted требует рабочее дерево"
2505
2504
2506
#: bzrlib/builtins.py:3338
2505
#: bzrlib/builtins.py:3357
2507
2506
#, python-format
2508
2507
msgid "Unsupported export format: %s"
2509
2508
msgstr "Неподдерживаемый формат экспорта: %s"
2510
2509
2511
#: bzrlib/builtins.py:3342
2510
#: bzrlib/builtins.py:3361
2512
2511
msgid ""
2513
2512
"Write the contents of a file as of a given revision to standard output."
2514
2513
msgstr ""
2515
2514
"Вывести содержимое файла из определённой ревизии на стандартный вывод."
2516
2515
2517
#: bzrlib/builtins.py:3344
2516
#: bzrlib/builtins.py:3363
2518
2517
msgid "If no revision is nominated, the last revision is used."
2519
2518
msgstr "Если ревизия не указана, используется последняя."
2520
2519
2521
#: bzrlib/builtins.py:3346
2520
#: bzrlib/builtins.py:3365
2522
2521
msgid ""
2523
2522
"Note: Take care to redirect standard output when using this command on a\n"
2524
2523
"binary file."
2526
2525
"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
2527
2526
"этой команды на двоичном файле."
2528
2527
2529
#: bzrlib/builtins.py:3352
2528
#: bzrlib/builtins.py:3371
2530
2529
msgid "The path name in the old tree."
2531
2530
msgstr "Имя пути в старом дереве."
2532
2531
2533
#: bzrlib/builtins.py:3353
2532
#: bzrlib/builtins.py:3372
2534
2533
msgid "Apply content filters to display the convenience form."
2535
2534
msgstr "Применить фильтры содержимого для отображения в удобной форме."
2536
2535
2537
#: bzrlib/builtins.py:3364
2536
#: bzrlib/builtins.py:3383
2538
2537
msgid "bzr cat --revision takes exactly one revision specifier"
2539
2538
msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
2540
2539
2541
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2540
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2542
2541
msgid "{0!r} is not present in revision {1}"
2543
2542
msgstr "{0!r} не представлен в ревизии {1}"
2544
2543
2545
#: bzrlib/builtins.py:3424
2544
#: bzrlib/builtins.py:3443
2546
2545
msgid "Commit changes into a new revision."
2547
2546
msgstr "Закрепить изменения в новой ревизии."
2548
2547
2549
#: bzrlib/builtins.py:3426
2548
#: bzrlib/builtins.py:3445
2550
2549
msgid ""
2551
2550
"An explanatory message needs to be given for each commit. This is\n"
2552
2551
"often done by using the --message option (getting the message from the\n"
2556
2555
"boilerplate text loaded into the editor, use the --show-diff option."
2557
2556
msgstr ""
2558
2557
2559
#: bzrlib/builtins.py:3433
2558
#: bzrlib/builtins.py:3452
2560
2559
msgid ""
2561
2560
"By default, the entire tree is committed and the person doing the\n"
2562
2561
"commit is assumed to be the author. These defaults can be overridden\n"
2565
2564
"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
2566
2565
"Эти умолчания могут быть перезаписаны, как объяснено ниже."
2567
2566
2568
#: bzrlib/builtins.py:3437
2567
#: bzrlib/builtins.py:3456
2569
2568
msgid ":Selective commits:"
2570
2569
msgstr ":Выборочные закрепления:"
2571
2570
2572
#: bzrlib/builtins.py:3439
2571
#: bzrlib/builtins.py:3458
2573
2572
msgid ""
2574
2573
" If selected files are specified, only changes to those files are\n"
2575
2574
" committed. If a directory is specified then the directory and\n"
2579
2578
" Если указана директория, то закрепляется директория и всё её\n"
2580
2579
" содержимое."
2581
2580
2582
#: bzrlib/builtins.py:3443
2581
#: bzrlib/builtins.py:3462
2583
2582
msgid ""
2584
2583
" When excludes are given, they take precedence over selected files.\n"
2585
2584
" For example, to commit only changes within foo, but not changes\n"
2589
2588
" Например, чтобы закрепить изменения внутри foo, но не изменения\n"
2590
2589
" в foo/bar::"
2591
2590
2592
#: bzrlib/builtins.py:3447
2591
#: bzrlib/builtins.py:3466
2593
2592
msgid " bzr commit foo -x foo/bar"
2594
2593
msgstr " bzr commit foo -x foo/bar"
2595
2594
2596
#: bzrlib/builtins.py:3449
2595
#: bzrlib/builtins.py:3468
2597
2596
msgid " A selective commit after a merge is not yet supported."
2598
2597
msgstr " Выборочные закрепления после слияния пока не поддерживаются."
2599
2598
2600
#: bzrlib/builtins.py:3451
2599
#: bzrlib/builtins.py:3470
2601
2600
msgid ":Custom authors:"
2602
2601
msgstr ":Выбор автора:"
2603
2602
2604
#: bzrlib/builtins.py:3453
2603
#: bzrlib/builtins.py:3472
2605
2604
msgid ""
2606
2605
" If the author of the change is not the same person as the committer,\n"
2607
2606
" you can specify the author's name using the --author option. The\n"
2616
2615
" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
2617
2616
" чем один автор, вы можете указать эту опцию несколько раз."
2618
2617
2619
#: bzrlib/builtins.py:3460
2618
#: bzrlib/builtins.py:3479
2620
2619
msgid ":Checks:"
2621
2620
msgstr ":Проверки:"
2622
2621
2623
#: bzrlib/builtins.py:3462
2622
#: bzrlib/builtins.py:3481
2624
2623
msgid ""
2625
2624
" A common mistake is to forget to add a new file or directory before\n"
2626
2625
" running the commit command. The --strict option checks for unknown\n"
2634
2633
" быть реализованы определением обработчиков. Подробности можно найти,\n"
2635
2634
" выполнив команду ``bzr help hooks''."
2636
2635
2637
#: bzrlib/builtins.py:3468
2636
#: bzrlib/builtins.py:3487
2638
2637
msgid ":Things to note:"
2639
2638
msgstr ":На заметку:"
2640
2639
2641
#: bzrlib/builtins.py:3470
2640
#: bzrlib/builtins.py:3489
2642
2641
msgid ""
2643
2642
" If you accidentially commit the wrong changes or make a spelling\n"
2644
2643
" mistake in the commit message say, you can use the uncommit command\n"
2649
2648
" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
2650
2649
" в «bzr help uncommit»."
2651
2650
2652
#: bzrlib/builtins.py:3474
2651
#: bzrlib/builtins.py:3493
2653
2652
msgid ""
2654
2653
" Hooks can also be configured to run after a commit. This allows you\n"
2655
2654
" to trigger updates to external systems like bug trackers. The --fixes\n"
2657
2656
" one or more bugs. See ``bzr help bugs`` for details."
2658
2657
msgstr ""
2659
2658
2660
#: bzrlib/builtins.py:3484
2659
#: bzrlib/builtins.py:3503
2661
2660
msgid "Do not consider changes made to a given path."
2662
2661
msgstr "Не рассматривать изменения, сделанные в заданном пути."
2663
2662
2664
#: bzrlib/builtins.py:3487
2663
#: bzrlib/builtins.py:3506
2665
2664
msgid "Description of the new revision."
2666
2665
msgstr "Описание новой ревизии."
2667
2666
2668
#: bzrlib/builtins.py:3490
2667
#: bzrlib/builtins.py:3509
2669
2668
msgid "Commit even if nothing has changed."
2670
2669
msgstr "Закрепить, даже если ничего не изменилось."
2671
2670
2672
#: bzrlib/builtins.py:3494
2671
#: bzrlib/builtins.py:3513
2673
2672
msgid "Take commit message from this file."
2674
2673
msgstr "Взять сообщение о закреплении из этого файла."
2675
2674
2676
#: bzrlib/builtins.py:3496
2675
#: bzrlib/builtins.py:3515
2677
2676
msgid "Refuse to commit if there are unknown files in the working tree."
2678
2677
msgstr ""
2679
2678
"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
2680
2679
2681
#: bzrlib/builtins.py:3499
2680
#: bzrlib/builtins.py:3518
2682
2681
msgid ""
2683
2682
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2684
2683
"08:00:00 +0100'."
2686
2685
"Вручную установить время закрепления, используя формат даты закрепления, "
2687
2686
"напр. '2009-10-10 08:00:00 +0100'."
2688
2687
2689
#: bzrlib/builtins.py:3502
2688
#: bzrlib/builtins.py:3521
2690
2689
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2691
2690
msgstr ""
2692
2691
"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
2693
2692
2694
#: bzrlib/builtins.py:3505
2693
#: bzrlib/builtins.py:3524
2695
2694
msgid "Set the author's name, if it's different from the committer."
2696
2695
msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
2697
2696
2698
#: bzrlib/builtins.py:3508
2697
#: bzrlib/builtins.py:3527
2699
2698
msgid ""
2700
2699
"Perform a local commit in a bound branch. Local commits are not pushed to "
2701
2700
"the master branch until a normal commit is performed."
2704
2703
"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
2705
2704
"закрепление."
2706
2705
2707
#: bzrlib/builtins.py:3514
2706
#: bzrlib/builtins.py:3533
2708
2707
msgid ""
2709
2708
"When no message is supplied, show the diff along with the status summary in "
2710
2709
"the message editor."
2712
2711
"Если не указано сообщение, показывать изменения формате diff вместе с "
2713
2712
"обзором состояния в редакторе сообщения."
2714
2713
2715
#: bzrlib/builtins.py:3517
2714
#: bzrlib/builtins.py:3536
2716
2715
msgid ""
2717
2716
"When committing to a foreign version control system do not push data that "
2718
2717
"can not be natively represented."
2720
2719
"При закреплении в иной системе контроля версий, не выгружать данные, которые "
2721
2720
"нельзя в ней представить."
2722
2721
2723
#: bzrlib/builtins.py:3535
2722
#: bzrlib/builtins.py:3554
2724
2723
#, python-format
2725
2724
msgid ""
2726
2725
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2732
2731
"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
2733
2732
"Закрепление отклонено."
2734
2733
2735
#: bzrlib/builtins.py:3544
2734
#: bzrlib/builtins.py:3563
2736
2735
#, python-format
2737
2736
msgid ""
2738
2737
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2743
2742
"информации об этом можно узнать, выполнив «bzr help bugs».\n"
2744
2743
"Закрепление отклонено."
2745
2744
2746
#: bzrlib/builtins.py:3553
2745
#: bzrlib/builtins.py:3572
2747
2746
#, python-format
2748
2747
msgid "Unrecognized bug %s. Commit refused."
2749
2748
msgstr "Ошибка %s не распознана. Закрепление отклонено."
2750
2749
2751
#: bzrlib/builtins.py:3556
2750
#: bzrlib/builtins.py:3575
2752
2751
#, python-format
2753
2752
msgid ""
2754
2753
"%s\n"
2757
2756
"%s\n"
2758
2757
"Закрепление отклонено."
2759
2758
2760
#: bzrlib/builtins.py:3580
2759
#: bzrlib/builtins.py:3599
2761
2760
msgid "Could not parse --commit-time: "
2762
2761
msgstr "Не удалось разобрать --commit-time: "
2763
2762
2764
#: bzrlib/builtins.py:3620
2763
#: bzrlib/builtins.py:3639
2765
2764
msgid "please specify either --message or --file"
2766
2765
msgstr "укажите либо --message, либо --file"
2767
2766
2768
#: bzrlib/builtins.py:3649
2767
#: bzrlib/builtins.py:3668
2769
2768
msgid "please specify a commit message with either --message or --file"
2770
2769
msgstr "укажите сообщение о закреплении, используя --message либо --file"
2771
2770
2772
#: bzrlib/builtins.py:3652
2771
#: bzrlib/builtins.py:3671
2773
2772
msgid ""
2774
2773
"Empty commit message specified. Please specify a commit message with either -"
2775
2774
"-message or --file or leave a blank message with --message \"\"."
2777
2776
"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
2778
2777
"--message либо --file или оставьте пустым, указав --message \"\"."
2779
2778
2780
#: bzrlib/builtins.py:3672
2779
#: bzrlib/builtins.py:3691
2781
2780
msgid ""
2782
2781
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2783
2782
"-unchanged to force an empty commit."
2786
2785
"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
2787
2786
"пустое закрепление."
2788
2787
2789
#: bzrlib/builtins.py:3676
2788
#: bzrlib/builtins.py:3695
2790
2789
msgid ""
2791
2790
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2792
2791
"resolve FILE\" to resolve."
2794
2793
"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
2795
2794
"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
2796
2795
2797
#: bzrlib/builtins.py:3680
2796
#: bzrlib/builtins.py:3699
2798
2797
msgid "Commit refused because there are unknown files in the working tree."
2799
2798
msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
2800
2799
2801
#: bzrlib/builtins.py:3683
2800
#: bzrlib/builtins.py:3702
2802
2801
msgid ""
2803
2802
"\n"
2804
2803
"To commit to master branch, run update and then commit.\n"
2805
2804
"You can also pass --local to commit to continue working disconnected."
2806
2805
msgstr ""
2807
2806
2808
#: bzrlib/builtins.py:3691
2807
#: bzrlib/builtins.py:3710
2809
2808
msgid ""
2810
2809
"Validate working tree structure, branch consistency and repository history."
2811
2810
msgstr ""
2812
2811
2813
#: bzrlib/builtins.py:3693
2812
#: bzrlib/builtins.py:3712
2814
2813
msgid ""
2815
2814
"This command checks various invariants about branch and repository storage\n"
2816
2815
"to detect data corruption or bzr bugs."
2817
2816
msgstr ""
2818
2817
2819
#: bzrlib/builtins.py:3696
2818
#: bzrlib/builtins.py:3715
2820
2819
msgid ""
2821
2820
"The working tree and branch checks will only give output if a problem is\n"
2822
2821
"detected. The output fields of the repository check are:"
2824
2823
"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"
2825
2824
"обнаружения проблемы. Поля вывода проверки репозитория следующие:"
2826
2825
2827
#: bzrlib/builtins.py:3699
2826
#: bzrlib/builtins.py:3718
2828
2827
msgid ""
2829
2828
"revisions\n"
2830
2829
" This is just the number of revisions checked. It doesn't\n"
2834
2833
" Это просто число проверенных ревизий. Оно не указывает\n"
2835
2834
" на проблему."
2836
2835
2837
#: bzrlib/builtins.py:3703
2836
#: bzrlib/builtins.py:3722
2838
2837
msgid ""
2839
2838
"versionedfiles\n"
2840
2839
" This is just the number of versionedfiles checked. It\n"
2844
2843
" Это просто число проверенных файлов под контролем системы\n"
2845
2844
" версий. Оно не указывает на проблему."
2846
2845
2847
#: bzrlib/builtins.py:3707
2846
#: bzrlib/builtins.py:3726
2848
2847
msgid ""
2849
2848
"unreferenced ancestors\n"
2850
2849
" Texts that are ancestors of other texts, but\n"
2856
2855
" корректных ссылок в истории ревизии. Это небольшая\n"
2857
2856
" проблема, с которой Bazaar может разобраться."
2858
2857
2859
#: bzrlib/builtins.py:3712
2858
#: bzrlib/builtins.py:3731
2860
2859
msgid ""
2861
2860
"unique file texts\n"
2862
2861
" This is the total number of unique file contents\n"
2866
2865
" Это общее число уникального содержимого файлов, встреченного\n"
2867
2866
" в проверенных ревизиях. Оно не указывает на проблему."
2868
2867
2869
#: bzrlib/builtins.py:3716
2868
#: bzrlib/builtins.py:3735
2870
2869
msgid ""
2871
2870
"repeated file texts\n"
2872
2871
" This is the total number of repeated texts seen\n"
2880
2879
" файлов изменились, но их содержимое осталось прежним. Оно не\n"
2881
2880
" указывает на проблему."
2882
2881
2883
#: bzrlib/builtins.py:3722
2882
#: bzrlib/builtins.py:3741
2884
2883
msgid ""
2885
2884
"If no restrictions are specified, all Bazaar data that is found at the "
2886
2885
"given\n"
2887
2886
"location will be checked."
2888
2887
msgstr ""
2889
2888
2890
#: bzrlib/builtins.py:3727
2889
#: bzrlib/builtins.py:3746
2891
2890
msgid " Check the tree and branch at 'foo'::"
2892
2891
msgstr " Проверить рабочее дерево и ветвь в 'foo'::"
2893
2892
2894
#: bzrlib/builtins.py:3729
2893
#: bzrlib/builtins.py:3748
2895
2894
msgid " bzr check --tree --branch foo"
2896
2895
msgstr " bzr check --tree --branch foo"
2897
2896
2898
#: bzrlib/builtins.py:3731
2897
#: bzrlib/builtins.py:3750
2899
2898
msgid " Check only the repository at 'bar'::"
2900
2899
msgstr " Проверить только репозиторий в 'bar'::"
2901
2900
2902
#: bzrlib/builtins.py:3733
2901
#: bzrlib/builtins.py:3752
2903
2902
msgid " bzr check --repo bar"
2904
2903
msgstr " bzr check --repo bar"
2905
2904
2906
#: bzrlib/builtins.py:3735
2905
#: bzrlib/builtins.py:3754
2907
2906
msgid " Check everything at 'baz'::"
2908
2907
msgstr " Проверить всё в 'baz'::"
2909
2908
2910
#: bzrlib/builtins.py:3737
2909
#: bzrlib/builtins.py:3756
2911
2910
msgid " bzr check baz"
2912
2911
msgstr " bzr check baz"
2913
2912
2914
#: bzrlib/builtins.py:3743
2913
#: bzrlib/builtins.py:3762
2915
2914
msgid "Check the branch related to the current directory."
2916
2915
msgstr "Проверить ветвь, относящуюся к текущей директории."
2917
2916
2918
#: bzrlib/builtins.py:3745
2917
#: bzrlib/builtins.py:3764
2919
2918
msgid "Check the repository related to the current directory."
2920
2919
msgstr "Проверить репозиторий, относящийся к текущей директории."
2921
2920
2922
#: bzrlib/builtins.py:3747
2921
#: bzrlib/builtins.py:3766
2923
2922
msgid "Check the working tree related to the current directory."
2924
2923
msgstr "Проверить рабочее дерево, относящееся к текущей директории."
2925
2924
2926
#: bzrlib/builtins.py:3761
2925
#: bzrlib/builtins.py:3780
2927
2926
msgid "Upgrade a repository, branch or working tree to a newer format."
2928
2927
msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."
2929
2928
2930
#: bzrlib/builtins.py:3763
2929
#: bzrlib/builtins.py:3782
2931
2930
msgid ""
2932
2931
"When the default format has changed after a major new release of\n"
2933
2932
"Bazaar, you may be informed during certain operations that you\n"
2936
2935
"with older repositories or with older versions of Bazaar."
2937
2936
msgstr ""
2938
2937
2939
#: bzrlib/builtins.py:3769
2938
#: bzrlib/builtins.py:3788
2940
2939
msgid ""
2941
2940
"If you wish to upgrade to a particular format rather than the\n"
2942
2941
"current default, that can be specified using the --format option.\n"
2946
2945
"2.x default) so downgrading is not always possible."
2947
2946
msgstr ""
2948
2947
2949
#: bzrlib/builtins.py:3776
2948
#: bzrlib/builtins.py:3795
2950
2949
msgid ""
2951
2950
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2952
2951
"process (where # is a number). By default, this is left there on\n"
2957
2956
"afterwards."
2958
2957
msgstr ""
2959
2958
2960
#: bzrlib/builtins.py:3784
2959
#: bzrlib/builtins.py:3803
2961
2960
msgid ""
2962
2961
"If the location given is a shared repository, dependent branches\n"
2963
2962
"are also converted provided the repository converts successfully.\n"
2965
2964
"tried."
2966
2965
msgstr ""
2967
2966
2968
#: bzrlib/builtins.py:3789
2967
#: bzrlib/builtins.py:3808
2969
2968
msgid ""
2970
2969
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2971
2970
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2972
2971
msgstr ""
2973
2972
2974
#: bzrlib/builtins.py:3797
2973
#: bzrlib/builtins.py:3816
2975
2974
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2976
2975
msgstr ""
2977
2976
"Обновить до определённого формата. Подробности см. в «bzr help formats»."
2978
2977
2979
#: bzrlib/builtins.py:3801
2978
#: bzrlib/builtins.py:3820
2980
2979
msgid "Branch format"
2981
2980
msgstr "Формат ветви"
2982
2981
2983
#: bzrlib/builtins.py:3803
2982
#: bzrlib/builtins.py:3822
2984
2983
msgid "Remove the backup.bzr directory if successful."
2985
2984
msgstr "Удалить директорию backup.bzr при успешном завершении."
2986
2985
2987
#: bzrlib/builtins.py:3805
2986
#: bzrlib/builtins.py:3824
2988
2987
msgid "Show what would be done, but don't actually do anything."
2989
2988
msgstr ""
2990
2989
2991
#: bzrlib/builtins.py:3820
2990
#: bzrlib/builtins.py:3839
2992
2991
msgid "Show or set bzr user id."
2993
2992
msgstr ""
2994
2993
2995
#: bzrlib/builtins.py:3822
2994
#: bzrlib/builtins.py:3841
2996
2995
msgid ""
2997
2996
":Examples:\n"
2998
2997
" Show the email of the current user::"
3000
2999
":Примеры:\n"
3001
3000
" Показать email текущего пользователя::"
3002
3001
3003
#: bzrlib/builtins.py:3825
3002
#: bzrlib/builtins.py:3844
3004
3003
msgid " bzr whoami --email"
3005
3004
msgstr " bzr whoami --email"
3006
3005
3007
#: bzrlib/builtins.py:3827
3006
#: bzrlib/builtins.py:3846
3008
3007
msgid " Set the current user::"
3009
3008
msgstr " Установить текущего пользователя::"
3010
3009
3011
#: bzrlib/builtins.py:3829
3010
#: bzrlib/builtins.py:3848
3012
3011
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3013
3012
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3014
3013
3015
#: bzrlib/builtins.py:3833
3014
#: bzrlib/builtins.py:3852
3016
3015
msgid "Display email address only."
3017
3016
msgstr "Показать только адрес email."
3018
3017
3019
#: bzrlib/builtins.py:3835
3018
#: bzrlib/builtins.py:3854
3020
3019
msgid "Set identity for the current branch instead of globally."
3021
3020
msgstr ""
3022
3021
3023
#: bzrlib/builtins.py:3861
3022
#: bzrlib/builtins.py:3880
3024
3023
msgid "--email can only be used to display existing identity"
3025
3024
msgstr ""
3026
3025
3027
#: bzrlib/builtins.py:3885
3026
#: bzrlib/builtins.py:3904
3028
3027
msgid "Print or set the branch nickname."
3029
3028
msgstr "Вывести или установить имя ветви."
3030
3029
3031
#: bzrlib/builtins.py:3887
3030
#: bzrlib/builtins.py:3906
3032
3031
msgid ""
3033
3032
"If unset, the colocated branch name is used for colocated branches, and\n"
3034
3033
"the branch directory name is used for other branches. To print the\n"
3035
3034
"current nickname, execute with no argument."
3036
3035
msgstr ""
3037
3036
3038
#: bzrlib/builtins.py:3891
3037
#: bzrlib/builtins.py:3910
3039
3038
msgid ""
3040
3039
"Bound branches use the nickname of its master branch unless it is set\n"
3041
3040
"locally."
3042
3041
msgstr ""
3043
3042
3044
#: bzrlib/builtins.py:3911
3043
#: bzrlib/builtins.py:3930
3045
3044
msgid "Set/unset and display aliases."
3046
3045
msgstr "Установить, удалить или отобразить псевдонимы."
3047
3046
3048
#: bzrlib/builtins.py:3913
3047
#: bzrlib/builtins.py:3932
3049
3048
msgid ""
3050
3049
":Examples:\n"
3051
3050
" Show the current aliases::"
3053
3052
":Примеры:\n"
3054
3053
" Показать текущие псевдонимы::"
3055
3054
3056
#: bzrlib/builtins.py:3916
3055
#: bzrlib/builtins.py:3935
3057
3056
msgid " bzr alias"
3058
3057
msgstr " bzr alias"
3059
3058
3060
#: bzrlib/builtins.py:3918
3059
#: bzrlib/builtins.py:3937
3061
3060
msgid " Show the alias specified for 'll'::"
3062
3061
msgstr " Показать псевдоним для 'll'::"
3063
3062
3064
#: bzrlib/builtins.py:3920
3063
#: bzrlib/builtins.py:3939
3065
3064
msgid " bzr alias ll"
3066
3065
msgstr " bzr alias ll"
3067
3066
3068
#: bzrlib/builtins.py:3922
3067
#: bzrlib/builtins.py:3941
3069
3068
msgid " Set an alias for 'll'::"
3070
3069
msgstr " Установить псевдоним для 'll'::"
3071
3070
3072
#: bzrlib/builtins.py:3924
3071
#: bzrlib/builtins.py:3943
3073
3072
msgid " bzr alias ll=\"log --line -r-10..-1\""
3074
3073
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3075
3074
3076
#: bzrlib/builtins.py:3926
3075
#: bzrlib/builtins.py:3945
3077
3076
msgid " To remove an alias for 'll'::"
3078
3077
msgstr " Удалить псевдоним для 'll'::"
3079
3078
3080
#: bzrlib/builtins.py:3928
3079
#: bzrlib/builtins.py:3947
3081
3080
msgid " bzr alias --remove ll"
3082
3081
msgstr " bzr alias --remove ll"
3083
3082
3084
#: bzrlib/builtins.py:3933
3083
#: bzrlib/builtins.py:3952
3085
3084
msgid "Remove the alias."
3086
3085
msgstr "Удалить псевдоним."
3087
3086
3088
#: bzrlib/builtins.py:3951
3087
#: bzrlib/builtins.py:3970
3089
3088
msgid "bzr alias --remove expects an alias to remove."
3090
3089
msgstr "bzr alias --remove требуется псевдоним для удаления."
3091
3090
3092
#: bzrlib/builtins.py:4132
3091
#: bzrlib/builtins.py:4151
3093
3092
msgid ""
3094
3093
"subunit not available. subunit needs to be installed to use --subunit."
3095
3094
msgstr ""
3096
3095
"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."
3097
3096
3098
#: bzrlib/builtins.py:4149
3097
#: bzrlib/builtins.py:4168
3099
3098
msgid ""
3100
3099
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3101
3100
msgstr ""
3102
3101
"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "
3103
3102
"используйте bzr-usertest"
3104
3103
3105
#: bzrlib/builtins.py:4196
3104
#: bzrlib/builtins.py:4215
3106
3105
msgid "Show version of bzr."
3107
3106
msgstr "Вывести версию bzr."
3108
3107
3109
#: bzrlib/builtins.py:4200
3108
#: bzrlib/builtins.py:4219
3110
3109
msgid "Print just the version number."
3111
3110
msgstr "Вывести только номер версии."
3112
3111
3113
#: bzrlib/builtins.py:4219
3112
#: bzrlib/builtins.py:4238
3114
3113
msgid "It sure does!\n"
3115
3114
msgstr "Да, он крут!\n"
3116
3115
3117
#: bzrlib/builtins.py:4243
3116
#: bzrlib/builtins.py:4262
3118
3117
#, python-format
3119
3118
msgid "merge base is revision %s\n"
3120
3119
msgstr ""
3121
3120
3122
#: bzrlib/builtins.py:4247
3121
#: bzrlib/builtins.py:4266
3123
3122
msgid "Perform a three-way merge."
3124
3123
msgstr ""
3125
3124
3126
#: bzrlib/builtins.py:4249
3125
#: bzrlib/builtins.py:4268
3127
3126
msgid ""
3128
3127
"The source of the merge can be specified either in the form of a branch,\n"
3129
3128
"or in the form of a path to a file containing a merge directive generated\n"
3134
3133
"the current working tree."
3135
3134
msgstr ""
3136
3135
3137
#: bzrlib/builtins.py:4257
3136
#: bzrlib/builtins.py:4276
3138
3137
msgid ""
3139
3138
"When merging from a branch, by default bzr will try to merge in all new\n"
3140
3139
"work from the other branch, automatically determining an appropriate base\n"
3141
3140
"revision. If this fails, you may need to give an explicit base."
3142
3141
msgstr ""
3143
3142
3144
#: bzrlib/builtins.py:4261
3143
#: bzrlib/builtins.py:4280
3145
3144
msgid ""
3146
3145
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3147
3146
"try to merge in all new work up to and including revision OTHER."
3148
3147
msgstr ""
3149
3148
3150
#: bzrlib/builtins.py:4264
3149
#: bzrlib/builtins.py:4283
3151
3150
msgid ""
3152
3151
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3153
3152
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3158
3157
"changes from the other branch is not stored in the commit."
3159
3158
msgstr ""
3160
3159
3161
#: bzrlib/builtins.py:4272
3160
#: bzrlib/builtins.py:4291
3162
3161
msgid "Revision numbers are always relative to the source branch."
3163
3162
msgstr ""
3164
3163
3165
#: bzrlib/builtins.py:4274 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3164
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3166
3165
msgid ""
3167
3166
"Merge will do its best to combine the changes in two branches, but there\n"
3168
3167
"are some kinds of problems only a human can fix. When it encounters those,\n"
3170
3169
"before you can commit."
3171
3170
msgstr ""
3172
3171
3173
#: bzrlib/builtins.py:4279
3172
#: bzrlib/builtins.py:4298
3174
3173
msgid ""
3175
3174
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3176
3175
msgstr ""
3177
3176
3178
#: bzrlib/builtins.py:4281
3177
#: bzrlib/builtins.py:4300
3179
3178
msgid ""
3180
3179
"If there is no default branch set, the first merge will set it (use\n"
3181
3180
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3183
3182
"only be saved if the remote location can be accessed."
3184
3183
msgstr ""
3185
3184
3186
#: bzrlib/builtins.py:4286
3185
#: bzrlib/builtins.py:4305
3187
3186
msgid ""
3188
3187
"The results of the merge are placed into the destination working\n"
3189
3188
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3190
3189
"committed to record the result of the merge."
3191
3190
msgstr ""
3192
3191
3193
#: bzrlib/builtins.py:4290
3192
#: bzrlib/builtins.py:4309
3194
3193
msgid ""
3195
3194
"merge refuses to run if there are any uncommitted changes, unless\n"
3196
3195
"--force is given. If --force is given, then the changes from the source \n"
3199
3198
"merge revision which has more than two parents."
3200
3199
msgstr ""
3201
3200
3202
#: bzrlib/builtins.py:4296
3201
#: bzrlib/builtins.py:4315
3203
3202
msgid ""
3204
3203
"If one would like to merge changes from the working tree of the other\n"
3205
3204
"branch without merging any committed revisions, the --uncommitted option\n"
3206
3205
"can be given."
3207
3206
msgstr ""
3208
3207
3209
#: bzrlib/builtins.py:4300
3208
#: bzrlib/builtins.py:4319
3210
3209
msgid ""
3211
3210
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3212
3211
"you to apply each diff hunk and file change, similar to \"shelve\"."
3213
3212
msgstr ""
3214
3213
3215
#: bzrlib/builtins.py:4303
3214
#: bzrlib/builtins.py:4322
3216
3215
msgid ""
3217
3216
":Examples:\n"
3218
3217
" To merge all new revisions from bzr.dev::"
3219
3218
msgstr ""
3220
3219
3221
#: bzrlib/builtins.py:4306
3220
#: bzrlib/builtins.py:4325
3222
3221
msgid " bzr merge ../bzr.dev"
3223
3222
msgstr ""
3224
3223
3225
#: bzrlib/builtins.py:4308
3224
#: bzrlib/builtins.py:4327
3226
3225
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3227
3226
msgstr ""
3228
3227
3229
#: bzrlib/builtins.py:4310
3228
#: bzrlib/builtins.py:4329
3230
3229
msgid " bzr merge -r 82 ../bzr.dev"
3231
3230
msgstr ""
3232
3231
3233
#: bzrlib/builtins.py:4312
3232
#: bzrlib/builtins.py:4331
3234
3233
msgid " To merge the changes introduced by 82, without previous changes::"
3235
3234
msgstr ""
3236
3235
3237
#: bzrlib/builtins.py:4314
3236
#: bzrlib/builtins.py:4333
3238
3237
msgid " bzr merge -r 81..82 ../bzr.dev"
3239
3238
msgstr ""
3240
3239
3241
#: bzrlib/builtins.py:4316
3240
#: bzrlib/builtins.py:4335
3242
3241
msgid " To apply a merge directive contained in /tmp/merge::"
3243
3242
msgstr ""
3244
3243
3245
#: bzrlib/builtins.py:4318
3244
#: bzrlib/builtins.py:4337
3246
3245
msgid " bzr merge /tmp/merge"
3247
3246
msgstr ""
3248
3247
3249
#: bzrlib/builtins.py:4320
3248
#: bzrlib/builtins.py:4339
3250
3249
msgid ""
3251
3250
" To create a merge revision with three parents from two branches\n"
3252
3251
" feature1a and feature1b:"
3253
3252
msgstr ""
3254
3253
3255
#: bzrlib/builtins.py:4323
3254
#: bzrlib/builtins.py:4342
3256
3255
msgid ""
3257
3256
" bzr merge ../feature1a\n"
3258
3257
" bzr merge ../feature1b --force\n"
3259
3258
" bzr commit -m 'revision with three parents'"
3260
3259
msgstr ""
3261
3260
3262
#: bzrlib/builtins.py:4335
3261
#: bzrlib/builtins.py:4354
3263
3262
msgid "Merge even if the destination tree has uncommitted changes."
3264
3263
msgstr ""
3265
3264
3266
#: bzrlib/builtins.py:4341
3265
#: bzrlib/builtins.py:4360
3267
3266
msgid ""
3268
3267
"Apply uncommitted changes from a working copy, instead of branch changes."
3269
3268
msgstr ""
3270
3269
3271
#: bzrlib/builtins.py:4343
3270
#: bzrlib/builtins.py:4362
3272
3271
msgid ""
3273
3272
"If the destination is already completely merged into the source, pull from "
3274
3273
"the source rather than merging. When this happens, you do not need to "
3275
3274
"commit the result."
3276
3275
msgstr ""
3277
3276
3278
#: bzrlib/builtins.py:4348
3277
#: bzrlib/builtins.py:4367
3279
3278
msgid ""
3280
3279
"Branch to merge into, rather than the one containing the working directory."
3281
3280
msgstr ""
3282
3281
3283
#: bzrlib/builtins.py:4350
3282
#: bzrlib/builtins.py:4369
3284
3283
msgid "Instead of merging, show a diff of the merge."
3285
3284
msgstr ""
3286
3285
3287
#: bzrlib/builtins.py:4352
3286
#: bzrlib/builtins.py:4371
3288
3287
msgid "Select changes interactively."
3289
3288
msgstr ""
3290
3289
3291
#: bzrlib/builtins.py:4374
3290
#: bzrlib/builtins.py:4393
3292
3291
msgid ""
3293
3292
"Merging into empty branches not currently supported, "
3294
3293
"https://bugs.launchpad.net/bzr/+bug/308562"
3295
3294
msgstr ""
3296
3295
3297
#: bzrlib/builtins.py:4401
3296
#: bzrlib/builtins.py:4420
3298
3297
msgid "Cannot use --uncommitted with bundles or merge directives."
3299
3298
msgstr ""
3300
3299
3301
#: bzrlib/builtins.py:4412
3300
#: bzrlib/builtins.py:4431
3302
3301
msgid "Cannot use --uncommitted and --revision at the same time."
3303
3302
msgstr ""
3304
3303
3305
#: bzrlib/builtins.py:4432
3304
#: bzrlib/builtins.py:4451
3306
3305
msgid "merger: "
3307
3306
msgstr ""
3308
3307
3309
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
3308
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3310
3309
msgid "Nothing to do."
3311
3310
msgstr ""
3312
3311
3313
#: bzrlib/builtins.py:4438
3312
#: bzrlib/builtins.py:4457
3314
3313
msgid "Cannot pull individual files"
3315
3314
msgstr ""
3316
3315
3317
#: bzrlib/builtins.py:4446
3316
#: bzrlib/builtins.py:4465
3318
3317
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3319
3318
msgstr ""
3320
3319
3321
#: bzrlib/builtins.py:4504
3320
#: bzrlib/builtins.py:4523
3322
3321
#, python-format
3323
3322
msgid "Show-base is not supported for this merge type. %s"
3324
3323
msgstr ""
3325
3324
3326
#: bzrlib/builtins.py:4513
3325
#: bzrlib/builtins.py:4532
3327
3326
#, python-format
3328
3327
msgid "Conflict reduction is not supported for merge type %s."
3329
3328
msgstr ""
3330
3329
3331
#: bzrlib/builtins.py:4517
3330
#: bzrlib/builtins.py:4536
3332
3331
msgid "Cannot do conflict reduction and show base."
3333
3332
msgstr ""
3334
3333
3335
#: bzrlib/builtins.py:4628
3334
#: bzrlib/builtins.py:4647
3336
3335
msgid "No location specified or remembered"
3337
3336
msgstr ""
3338
3337
3339
#: bzrlib/builtins.py:4630
3338
#: bzrlib/builtins.py:4649
3340
3339
msgid "{0} remembered {1} location {2}"
3341
3340
msgstr ""
3342
3341
3343
#: bzrlib/builtins.py:4636
3342
#: bzrlib/builtins.py:4655
3344
3343
msgid "Redo a merge."
3345
3344
msgstr ""
3346
3345
3347
#: bzrlib/builtins.py:4638
3346
#: bzrlib/builtins.py:4657
3348
3347
msgid ""
3349
3348
"Use this if you want to try a different merge technique while resolving\n"
3350
3349
"conflicts. Some merge techniques are better than others, and remerge\n"
3351
3350
"lets you try different ones on different files."
3352
3351
msgstr ""
3353
3352
3354
#: bzrlib/builtins.py:4642
3353
#: bzrlib/builtins.py:4661
3355
3354
msgid ""
3356
3355
"The options for remerge have the same meaning and defaults as the ones for\n"
3357
3356
"merge. The difference is that remerge can (only) be run when there is a\n"
3358
3357
"pending merge, and it lets you specify particular files."
3359
3358
msgstr ""
3360
3359
3361
#: bzrlib/builtins.py:4646
3360
#: bzrlib/builtins.py:4665
3362
3361
msgid ""
3363
3362
":Examples:\n"
3364
3363
" Re-do the merge of all conflicted files, and show the base text in\n"
3365
3364
" conflict regions, in addition to the usual THIS and OTHER texts::"
3366
3365
msgstr ""
3367
3366
3368
#: bzrlib/builtins.py:4650
3367
#: bzrlib/builtins.py:4669
3369
3368
msgid " bzr remerge --show-base"
3370
3369
msgstr ""
3371
3370
3372
#: bzrlib/builtins.py:4652
3371
#: bzrlib/builtins.py:4671
3373
3372
msgid ""
3374
3373
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3375
3374
" additional processing to reduce the size of conflict regions::"
3376
3375
msgstr ""
3377
3376
3378
#: bzrlib/builtins.py:4655
3377
#: bzrlib/builtins.py:4674
3379
3378
msgid " bzr remerge --merge-type weave --reprocess foobar"
3380
3379
msgstr ""
3381
3380
3382
#: bzrlib/builtins.py:4662
3381
#: bzrlib/builtins.py:4681
3383
3382
msgid "Show base revision text in conflicts."
3384
3383
msgstr ""
3385
3384
3386
#: bzrlib/builtins.py:4674
3385
#: bzrlib/builtins.py:4693
3387
3386
msgid ""
3388
3387
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3389
3388
"merges."
3390
3389
msgstr ""
3391
3390
3392
#: bzrlib/builtins.py:4731
3393
msgid "Revert files to a previous revision."
3391
#: bzrlib/builtins.py:4751
3392
msgid ""
3393
"Set files in the working tree back to the contents of a previous revision."
3394
3394
msgstr ""
3395
3395
3396
#: bzrlib/builtins.py:4733
3396
#: bzrlib/builtins.py:4753
3397
3397
msgid ""
3398
3398
"Giving a list of files will revert only those files. Otherwise, all files\n"
3399
3399
"will be reverted. If the revision is not specified with '--revision', the\n"
3400
"last committed revision is used."
3400
"working tree basis revision is used. A revert operation affects only the\n"
3401
"working tree, not any revision history like the branch and repository or\n"
3402
"the working tree basis revision."
3401
3403
msgstr ""
3402
3404
3403
#: bzrlib/builtins.py:4737
3405
#: bzrlib/builtins.py:4759
3404
3406
msgid ""
3405
3407
"To remove only some changes, without reverting to a prior version, use\n"
3406
3408
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3407
3409
"will remove the changes introduced by the second last commit (-2), without\n"
3408
3410
"affecting the changes introduced by the last commit (-1). To remove\n"
3409
"certain changes on a hunk-by-hunk basis, see the shelve command."
3411
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3412
"To update the branch to a specific revision or the latest revision and\n"
3413
"update the working tree accordingly while preserving local changes, see the\n"
3414
"update command."
3410
3415
msgstr ""
3411
3416
3412
#: bzrlib/builtins.py:4743
3417
#: bzrlib/builtins.py:4768
3413
3418
msgid ""
3414
"By default, any files that have been manually changed will be backed up\n"
3415
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3416
"'.~#~' appended to their name, where # is a number."
3419
"Uncommitted changes to files that are reverted will be discarded.\n"
3420
"Howver, by default, any files that have been manually changed will be\n"
3421
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3422
"files have '.~#~' appended to their name, where # is a number."
3417
3423
msgstr ""
3418
3424
3419
#: bzrlib/builtins.py:4747
3425
#: bzrlib/builtins.py:4773
3420
3426
msgid ""
3421
3427
"When you provide files, you can use their current pathname or the pathname\n"
3422
3428
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3424
3430
"reverted."
3425
3431
msgstr ""
3426
3432
3427
#: bzrlib/builtins.py:4752
3433
#: bzrlib/builtins.py:4778
3428
3434
msgid ""
3429
3435
"If you have newly added files since the target revision, they will be\n"
3430
3436
"removed. If the files to be removed have been changed, backups will be\n"
3432
3438
"deleted."
3433
3439
msgstr ""
3434
3440
3435
#: bzrlib/builtins.py:4757
3441
#: bzrlib/builtins.py:4783
3436
3442
msgid ""
3437
3443
"The working tree contains a list of revisions that have been merged but\n"
3438
3444
"not yet committed. These revisions will be included as additional parents\n"
3444
3450
"reverting any files."
3445
3451
msgstr ""
3446
3452
3447
#: bzrlib/builtins.py:4766
3453
#: bzrlib/builtins.py:4792
3448
3454
msgid ""
3449
3455
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3450
3456
"changes from a branch in a single revision. To do this, perform the merge\n"
3458
3464
"target branches."
3459
3465
msgstr ""
3460
3466
3461
#: bzrlib/builtins.py:4780
3467
#: bzrlib/builtins.py:4806
3462
3468
msgid "Do not save backups of reverted files."
3463
3469
msgstr ""
3464
3470
3465
#: bzrlib/builtins.py:4782
3471
#: bzrlib/builtins.py:4808
3466
3472
msgid "Remove pending merge marker, without changing any files."
3467
3473
msgstr ""
3468
3474
3469
#: bzrlib/builtins.py:4813
3475
#: bzrlib/builtins.py:4839
3470
3476
msgid ""
3471
3477
"Show help on a command or other topic.\n"
3472
3478
" "
3473
3479
msgstr ""
3474
3480
3475
#: bzrlib/builtins.py:4818
3481
#: bzrlib/builtins.py:4844
3476
3482
msgid "Show help on all commands."
3477
3483
msgstr ""
3478
3484
3479
#: bzrlib/builtins.py:4847
3485
#: bzrlib/builtins.py:4873
3480
3486
msgid "Show unmerged/unpulled revisions between two branches."
3481
3487
msgstr ""
3482
3488
3483
#: bzrlib/builtins.py:4849
3489
#: bzrlib/builtins.py:4875
3484
3490
msgid "OTHER_BRANCH may be local or remote."
3485
3491
msgstr ""
3486
3492
3487
#: bzrlib/builtins.py:4851
3493
#: bzrlib/builtins.py:4877
3488
3494
msgid ""
3489
3495
"To filter on a range of revisions, you can use the command -r begin..end\n"
3490
3496
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3495
3501
" 0 - no missing revisions"
3496
3502
msgstr ""
3497
3503
3498
#: bzrlib/builtins.py:4861
3504
#: bzrlib/builtins.py:4887
3499
3505
msgid ""
3500
3506
" Determine the missing revisions between this and the branch at the\n"
3501
3507
" remembered pull location::"
3502
3508
msgstr ""
3503
3509
3504
#: bzrlib/builtins.py:4864
3510
#: bzrlib/builtins.py:4890
3505
3511
msgid " bzr missing"
3506
3512
msgstr ""
3507
3513
3508
#: bzrlib/builtins.py:4866
3514
#: bzrlib/builtins.py:4892
3509
3515
msgid " Determine the missing revisions between this and another branch::"
3510
3516
msgstr ""
3511
3517
3512
#: bzrlib/builtins.py:4868
3518
#: bzrlib/builtins.py:4894
3513
3519
msgid " bzr missing http://server/branch"
3514
3520
msgstr ""
3515
3521
3516
#: bzrlib/builtins.py:4870
3522
#: bzrlib/builtins.py:4896
3517
3523
msgid ""
3518
3524
" Determine the missing revisions up to a specific revision on the other\n"
3519
3525
" branch::"
3520
3526
msgstr ""
3521
3527
3522
#: bzrlib/builtins.py:4873
3528
#: bzrlib/builtins.py:4899
3523
3529
msgid " bzr missing -r ..-10"
3524
3530
msgstr ""
3525
3531
3526
#: bzrlib/builtins.py:4875
3532
#: bzrlib/builtins.py:4901
3527
3533
msgid ""
3528
3534
" Determine the missing revisions up to a specific revision on this\n"
3529
3535
" branch::"
3530
3536
msgstr ""
3531
3537
3532
#: bzrlib/builtins.py:4878
3538
#: bzrlib/builtins.py:4904
3533
3539
msgid " bzr missing --my-revision ..-10"
3534
3540
msgstr ""
3535
3541
3536
#: bzrlib/builtins.py:4885
3542
#: bzrlib/builtins.py:4911
3537
3543
msgid "Reverse the order of revisions."
3538
3544
msgstr ""
3539
3545
3540
#: bzrlib/builtins.py:4887
3546
#: bzrlib/builtins.py:4913
3541
3547
msgid "Display changes in the local branch only."
3542
3548
msgstr ""
3543
3549
3544
#: bzrlib/builtins.py:4888
3550
#: bzrlib/builtins.py:4914
3545
3551
msgid "Same as --mine-only."
3546
3552
msgstr ""
3547
3553
3548
#: bzrlib/builtins.py:4890
3554
#: bzrlib/builtins.py:4916
3549
3555
msgid "Display changes in the remote branch only."
3550
3556
msgstr ""
3551
3557
3552
#: bzrlib/builtins.py:4891
3558
#: bzrlib/builtins.py:4917
3553
3559
msgid "Same as --theirs-only."
3554
3560
msgstr ""
3555
3561
3556
#: bzrlib/builtins.py:4896
3562
#: bzrlib/builtins.py:4922
3557
3563
msgid ""
3558
3564
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3559
3565
"details."
3560
3566
msgstr ""
3561
3567
3562
#: bzrlib/builtins.py:4900
3568
#: bzrlib/builtins.py:4926
3563
3569
msgid ""
3564
3570
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3565
3571
"details."
3566
3572
msgstr ""
3567
3573
3568
#: bzrlib/builtins.py:4903
3574
#: bzrlib/builtins.py:4929
3569
3575
msgid "Show all revisions in addition to the mainline ones."
3570
3576
msgstr ""
3571
3577
3572
#: bzrlib/builtins.py:4957
3578
#: bzrlib/builtins.py:4983
3573
3579
msgid "No peer location known or specified."
3574
3580
msgstr ""
3575
3581
3576
#: bzrlib/builtins.py:4961
3582
#: bzrlib/builtins.py:4987
3577
3583
msgid "Using saved parent location: {0}\n"
3578
3584
msgstr ""
3579
3585
3580
#: bzrlib/builtins.py:4994
3586
#: bzrlib/builtins.py:5020
3581
3587
#, python-format
3582
3588
msgid "You have %d extra revision:\n"
3583
3589
msgid_plural "You have %d extra revisions:\n"
3584
3590
msgstr[0] ""
3585
3591
msgstr[1] ""
3586
3592
3587
#: bzrlib/builtins.py:5010
3593
#: bzrlib/builtins.py:5040
3588
3594
#, python-format
3589
3595
msgid "You are missing %d revision:\n"
3590
3596
msgid_plural "You are missing %d revisions:\n"
3591
3597
msgstr[0] ""
3592
3598
msgstr[1] ""
3593
3599
3594
#: bzrlib/builtins.py:5022
3600
#: bzrlib/builtins.py:5055
3595
3601
msgid "This branch has no new revisions.\n"
3596
3602
msgstr ""
3597
3603
3598
#: bzrlib/builtins.py:5025
3604
#: bzrlib/builtins.py:5058
3599
3605
msgid "Other branch has no new revisions.\n"
3600
3606
msgstr ""
3601
3607
3602
#: bzrlib/builtins.py:5030
3608
#: bzrlib/builtins.py:5063
3603
3609
msgid "Branches are up to date.\n"
3604
3610
msgstr ""
3605
3611
3606
#: bzrlib/builtins.py:5041
3612
#: bzrlib/builtins.py:5074
3607
3613
msgid "Compress the data within a repository."
3608
3614
msgstr ""
3609
3615
3610
#: bzrlib/builtins.py:5043
3616
#: bzrlib/builtins.py:5076
3611
3617
msgid ""
3612
3618
"This operation compresses the data within a bazaar repository. As\n"
3613
3619
"bazaar supports automatic packing of repository, this operation is\n"
3614
3620
"normally not required to be done manually."
3615
3621
msgstr ""
3616
3622
3617
#: bzrlib/builtins.py:5047
3623
#: bzrlib/builtins.py:5080
3618
3624
msgid ""
3619
3625
"During the pack operation, bazaar takes a backup of existing repository\n"
3620
3626
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3623
3629
"used."
3624
3630
msgstr ""
3625
3631
3626
#: bzrlib/builtins.py:5053
3632
#: bzrlib/builtins.py:5086
3627
3633
msgid ""
3628
3634
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3629
3635
"during or immediately after repacking, you may be left with a state\n"
3631
3637
"been. In this case the repository may be unusable."
3632
3638
msgstr ""
3633
3639
3634
#: bzrlib/builtins.py:5062
3640
#: bzrlib/builtins.py:5095
3635
3641
msgid "Delete obsolete packs to save disk space."
3636
3642
msgstr ""
3637
3643
3638
#: bzrlib/builtins.py:5076
3644
#: bzrlib/builtins.py:5109
3639
3645
msgid "List the installed plugins."
3640
3646
msgstr ""
3641
3647
3642
#: bzrlib/builtins.py:5078
3648
#: bzrlib/builtins.py:5111
3643
3649
msgid ""
3644
3650
"This command displays the list of installed plugins including\n"
3645
3651
"version of plugin and a short description of each."
3646
3652
msgstr ""
3647
3653
3648
#: bzrlib/builtins.py:5081
3654
#: bzrlib/builtins.py:5114
3649
3655
msgid "--verbose shows the path where each plugin is located."
3650
3656
msgstr ""
3651
3657
3652
#: bzrlib/builtins.py:5083
3658
#: bzrlib/builtins.py:5116
3653
3659
msgid ""
3654
3660
"A plugin is an external component for Bazaar that extends the\n"
3655
3661
"revision control system, by adding or replacing code in Bazaar.\n"
3658
3664
"customizing log output."
3659
3665
msgstr ""
3660
3666
3661
#: bzrlib/builtins.py:5089
3667
#: bzrlib/builtins.py:5122
3662
3668
msgid ""
3663
3669
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3664
3670
"for further information on plugins including where to find them and how to\n"
3666
3672
"plugins using the Python programming language."
3667
3673
msgstr ""
3668
3674
3669
#: bzrlib/builtins.py:5105
3675
#: bzrlib/builtins.py:5138
3670
3676
msgid "Show testament (signing-form) of a revision."
3671
3677
msgstr ""
3672
3678
3673
#: bzrlib/builtins.py:5108
3679
#: bzrlib/builtins.py:5141
3674
3680
msgid "Produce long-format testament."
3675
3681
msgstr ""
3676
3682
3677
#: bzrlib/builtins.py:5110
3683
#: bzrlib/builtins.py:5143
3678
3684
msgid "Produce a strict-format testament."
3679
3685
msgstr ""
3680
3686
3681
#: bzrlib/builtins.py:5136
3687
#: bzrlib/builtins.py:5169
3682
3688
msgid "Show the origin of each line in a file."
3683
3689
msgstr ""
3684
3690
3685
#: bzrlib/builtins.py:5138
3691
#: bzrlib/builtins.py:5171
3686
3692
msgid ""
3687
3693
"This prints out the given file with an annotation on the left side\n"
3688
3694
"indicating which revision, author and date introduced the change."
3689
3695
msgstr ""
3690
3696
3691
#: bzrlib/builtins.py:5141
3697
#: bzrlib/builtins.py:5174
3692
3698
msgid ""
3693
3699
"If the origin is the same for a run of consecutive lines, it is\n"
3694
3700
"shown only at the top, unless the --all option is given."
3695
3701
msgstr ""
3696
3702
3697
#: bzrlib/builtins.py:5149
3703
#: bzrlib/builtins.py:5182
3698
3704
msgid "Show annotations on all lines."
3699
3705
msgstr ""
3700
3706
3701
#: bzrlib/builtins.py:5150
3707
#: bzrlib/builtins.py:5183
3702
3708
msgid "Show commit date in annotations."
3703
3709
msgstr ""
3704
3710
3705
#: bzrlib/builtins.py:5237
3711
#: bzrlib/builtins.py:5270
3706
3712
msgid "Cannot sign a range of non-revision-history revisions"
3707
3713
msgstr ""
3708
3714
3709
#: bzrlib/builtins.py:5249
3715
#: bzrlib/builtins.py:5282
3710
3716
msgid "Please supply either one revision, or a range."
3711
3717
msgstr ""
3712
3718
3713
#: bzrlib/builtins.py:5253
3719
#: bzrlib/builtins.py:5286
3714
3720
msgid ""
3715
3721
"Convert the current branch into a checkout of the supplied branch.\n"
3716
3722
"If no branch is supplied, rebind to the last bound location."
3718
3724
"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
3719
3725
"Если ветвь не указаны, перепривязать последнее расположение привязки."
3720
3726
3721
#: bzrlib/builtins.py:5256
3727
#: bzrlib/builtins.py:5289
3722
3728
msgid ""
3723
3729
"Once converted into a checkout, commits must succeed on the master branch\n"
3724
3730
"before they will be applied to the local branch."
3726
3732
"После преобразования в рабочую копию, закрепления должны производиться\n"
3727
3733
"над основной ветвью, прежде чем они могут быть применены к локальной."
3728
3734
3729
#: bzrlib/builtins.py:5259
3735
#: bzrlib/builtins.py:5292
3730
3736
msgid ""
3731
3737
"Bound branches use the nickname of its master branch unless it is set\n"
3732
3738
"locally, in which case binding will update the local nickname to be\n"
3733
3739
"that of the master."
3734
3740
msgstr ""
3735
3741
3736
#: bzrlib/builtins.py:5274
3742
#: bzrlib/builtins.py:5307
3737
3743
msgid "No location supplied. This format does not remember old locations."
3738
3744
msgstr ""
3739
3745
3740
#: bzrlib/builtins.py:5280
3746
#: bzrlib/builtins.py:5313
3741
3747
msgid "Branch is already bound"
3742
3748
msgstr ""
3743
3749
3744
#: bzrlib/builtins.py:5283
3750
#: bzrlib/builtins.py:5316
3745
3751
msgid "No location supplied and no previous location known"
3746
3752
msgstr ""
3747
3753
3748
#: bzrlib/builtins.py:5289
3754
#: bzrlib/builtins.py:5322
3749
3755
msgid "These branches have diverged. Try merging, and then bind again."
3750
3756
msgstr ""
3751
3757
3752
#: bzrlib/builtins.py:5296
3758
#: bzrlib/builtins.py:5329
3753
3759
msgid "Convert the current checkout into a regular branch."
3754
3760
msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
3755
3761
3756
#: bzrlib/builtins.py:5298
3762
#: bzrlib/builtins.py:5331
3757
3763
msgid ""
3758
3764
"After unbinding, the local branch is considered independent and subsequent\n"
3759
3765
"commits will be local only."
3760
3766
msgstr ""
3761
3767
3762
#: bzrlib/builtins.py:5309
3768
#: bzrlib/builtins.py:5342
3763
3769
msgid "Local branch is not bound"
3764
3770
msgstr ""
3765
3771
3766
#: bzrlib/builtins.py:5313
3772
#: bzrlib/builtins.py:5346
3767
3773
msgid "Remove the last committed revision."
3768
3774
msgstr ""
3769
3775
3770
#: bzrlib/builtins.py:5315
3776
#: bzrlib/builtins.py:5348
3771
3777
msgid ""
3772
3778
"--verbose will print out what is being removed.\n"
3773
3779
"--dry-run will go through all the motions, but not actually\n"
3774
3780
"remove anything."
3775
3781
msgstr ""
3776
3782
3777
#: bzrlib/builtins.py:5319
3783
#: bzrlib/builtins.py:5352
3778
3784
msgid ""
3779
3785
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3780
3786
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3781
3787
"branch at revision 15."
3782
3788
msgstr ""
3783
3789
3784
#: bzrlib/builtins.py:5323
3790
#: bzrlib/builtins.py:5356
3785
3791
msgid ""
3786
3792
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3787
3793
"it may make is to restore any pending merges that were present before\n"
3788
3794
"the commit."
3789
3795
msgstr ""
3790
3796
3791
#: bzrlib/builtins.py:5334
3797
#: bzrlib/builtins.py:5367
3792
3798
msgid "Don't actually make changes."
3793
3799
msgstr ""
3794
3800
3795
#: bzrlib/builtins.py:5335
3801
#: bzrlib/builtins.py:5368
3796
3802
msgid "Say yes to all questions."
3797
3803
msgstr ""
3798
3804
3799
#: bzrlib/builtins.py:5337
3805
#: bzrlib/builtins.py:5370
3800
3806
msgid "Keep tags that point to removed revisions."
3801
3807
msgstr ""
3802
3808
3803
#: bzrlib/builtins.py:5339
3809
#: bzrlib/builtins.py:5372
3804
3810
msgid "Only remove the commits from the local branch when in a checkout."
3805
3811
msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
3806
3812
3807
#: bzrlib/builtins.py:5388
3813
#: bzrlib/builtins.py:5421
3808
3814
msgid "No revisions to uncommit.\n"
3809
3815
msgstr ""
3810
3816
3811
#: bzrlib/builtins.py:5403
3817
#: bzrlib/builtins.py:5436
3812
3818
msgid "Dry-run, pretending to remove the above revisions.\n"
3813
3819
msgstr ""
3814
3820
3815
#: bzrlib/builtins.py:5406
3821
#: bzrlib/builtins.py:5439
3816
3822
msgid "The above revision(s) will be removed.\n"
3817
3823
msgstr ""
3818
3824
3819
#: bzrlib/builtins.py:5410
3825
#: bzrlib/builtins.py:5443
3820
3826
msgid "Uncommit these revisions"
3821
3827
msgstr ""
3822
3828
3823
#: bzrlib/builtins.py:5413
3829
#: bzrlib/builtins.py:5446
3824
3830
msgid "Canceled\n"
3825
3831
msgstr ""
3826
3832
3827
#: bzrlib/builtins.py:5420
3833
#: bzrlib/builtins.py:5453
3828
3834
#, python-format
3829
3835
msgid ""
3830
3836
"You can restore the old tip by running:\n"
3831
3837
" bzr pull . -r revid:%s\n"
3832
3838
msgstr ""
3833
3839
3834
#: bzrlib/builtins.py:5425
3840
#: bzrlib/builtins.py:5458
3835
3841
msgid "Break a dead lock."
3836
3842
msgstr ""
3837
3843
3838
#: bzrlib/builtins.py:5427
3844
#: bzrlib/builtins.py:5460
3839
3845
msgid ""
3840
3846
"This command breaks a lock on a repository, branch, working directory or\n"
3841
3847
"config file."
3842
3848
msgstr ""
3843
3849
3844
#: bzrlib/builtins.py:5430
3850
#: bzrlib/builtins.py:5463
3845
3851
msgid ""
3846
3852
"CAUTION: Locks should only be broken when you are sure that the process\n"
3847
3853
"holding the lock has been stopped."
3848
3854
msgstr ""
3849
3855
3850
#: bzrlib/builtins.py:5433
3856
#: bzrlib/builtins.py:5466
3851
3857
msgid ""
3852
3858
"You can get information on what locks are open via the 'bzr info\n"
3853
3859
"[location]' command."
3854
3860
msgstr ""
3855
3861
3856
#: bzrlib/builtins.py:5436
3862
#: bzrlib/builtins.py:5469
3857
3863
msgid ""
3858
3864
":Examples:\n"
3859
3865
" bzr break-lock\n"
3861
3867
" bzr break-lock --conf ~/.bazaar"
3862
3868
msgstr ""
3863
3869
3864
#: bzrlib/builtins.py:5445
3870
#: bzrlib/builtins.py:5478
3865
3871
msgid "LOCATION is the directory where the config lock is."
3866
3872
msgstr ""
3867
3873
3868
#: bzrlib/builtins.py:5447
3874
#: bzrlib/builtins.py:5480
3869
3875
msgid "Do not ask for confirmation before breaking the lock."
3870
3876
msgstr ""
3871
3877
3872
#: bzrlib/builtins.py:5482
3878
#: bzrlib/builtins.py:5515
3873
3879
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3874
3880
msgstr ""
3875
3881
3876
#: bzrlib/builtins.py:5483
3882
#: bzrlib/builtins.py:5516
3877
3883
msgid "Run the bzr server."
3878
3884
msgstr ""
3879
3885
3880
#: bzrlib/builtins.py:5489
3886
#: bzrlib/builtins.py:5522
3881
3887
msgid "Serve on stdin/out for use from inetd or sshd."
3882
3888
msgstr ""
3883
3889
3884
#: bzrlib/builtins.py:5490
3890
#: bzrlib/builtins.py:5523
3885
3891
msgid "protocol"
3886
3892
msgstr ""
3887
3893
3888
#: bzrlib/builtins.py:5491
3894
#: bzrlib/builtins.py:5524
3889
3895
msgid "Protocol to serve."
3890
3896
msgstr ""
3891
3897
3892
#: bzrlib/builtins.py:5495
3898
#: bzrlib/builtins.py:5528
3893
3899
msgid "Listen for connections on nominated address."
3894
3900
msgstr ""
3895
3901
3896
#: bzrlib/builtins.py:5497
3902
#: bzrlib/builtins.py:5530
3897
3903
msgid ""
3898
3904
"Listen for connections on nominated port. Passing 0 as the port number will "
3899
3905
"result in a dynamically allocated port. The default port depends on the "
3900
3906
"protocol."
3901
3907
msgstr ""
3902
3908
3903
#: bzrlib/builtins.py:5502
3909
#: bzrlib/builtins.py:5535
3904
3910
msgid "Serve contents of this directory."
3905
3911
msgstr ""
3906
3912
3907
#: bzrlib/builtins.py:5504
3913
#: bzrlib/builtins.py:5537
3908
3914
msgid ""
3909
3915
"By default the server is a readonly server. Supplying --allow-writes "
3910
3916
"enables write access to the contents of the served directory and below. "
3913
3919
"uncontrolled write access to your file system."
3914
3920
msgstr ""
3915
3921
3916
#: bzrlib/builtins.py:5513
3922
#: bzrlib/builtins.py:5546
3917
3923
msgid "Override the default idle client timeout (5min)."
3918
3924
msgstr ""
3919
3925
3920
#: bzrlib/builtins.py:5531
3926
#: bzrlib/builtins.py:5564
3921
3927
msgid "Combine a tree into its containing tree."
3922
3928
msgstr ""
3923
3929
3924
#: bzrlib/builtins.py:5533
3930
#: bzrlib/builtins.py:5566
3925
3931
msgid "This command requires the target tree to be in a rich-root format."
3926
3932
msgstr ""
3927
3933
3928
#: bzrlib/builtins.py:5535
3934
#: bzrlib/builtins.py:5568
3929
3935
msgid ""
3930
3936
"The TREE argument should be an independent tree, inside another tree, but\n"
3931
3937
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3932
3938
"running \"bzr branch\" with the target inside a tree.)"
3933
3939
msgstr ""
3934
3940
3935
#: bzrlib/builtins.py:5539
3941
#: bzrlib/builtins.py:5572
3936
3942
msgid ""
3937
3943
"The result is a combined tree, with the subtree no longer an independent\n"
3938
3944
"part. This is marked as a merge of the subtree into the containing tree,\n"
3939
3945
"and all history is preserved."
3940
3946
msgstr ""
3941
3947
3942
#: bzrlib/builtins.py:5557
3948
#: bzrlib/builtins.py:5590
3943
3949
#, python-format
3944
3950
msgid ""
3945
3951
"Can't join trees because %s doesn't support rich root data.\n"
3946
3952
"You can use bzr upgrade on the repository."
3947
3953
msgstr ""
3948
3954
3949
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
3955
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3950
3956
msgid "Cannot join {0}. {1}"
3951
3957
msgstr ""
3952
3958
3953
#: bzrlib/builtins.py:5577
3959
#: bzrlib/builtins.py:5610
3954
3960
msgid "Split a subdirectory of a tree into a separate tree."
3955
3961
msgstr ""
3956
3962
3957
#: bzrlib/builtins.py:5579
3963
#: bzrlib/builtins.py:5612
3958
3964
msgid ""
3959
3965
"This command will produce a target tree in a format that supports\n"
3960
3966
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3961
3967
"converted into earlier formats like 'dirstate-tags'."
3962
3968
msgstr ""
3963
3969
3964
#: bzrlib/builtins.py:5583
3970
#: bzrlib/builtins.py:5616
3965
3971
msgid ""
3966
3972
"The TREE argument should be a subdirectory of a working tree. That\n"
3967
3973
"subdirectory will be converted into an independent tree, with its own\n"
3968
3974
"branch. Commits in the top-level tree will not apply to the new subtree."
3969
3975
msgstr ""
3970
3976
3971
#: bzrlib/builtins.py:5663
3977
#: bzrlib/builtins.py:5696
3972
3978
msgid "No submit branch specified or known"
3973
3979
msgstr ""
3974
3980
3975
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
3981
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3976
3982
msgid "No public branch specified or known"
3977
3983
msgstr ""
3978
3984
3979
#: bzrlib/builtins.py:5677
3985
#: bzrlib/builtins.py:5710
3980
3986
msgid "bzr merge-directive takes at most two one revision identifiers"
3981
3987
msgstr ""
3982
3988
3983
#: bzrlib/builtins.py:5686
3989
#: bzrlib/builtins.py:5719
3984
3990
msgid "No revisions to bundle."
3985
3991
msgstr ""
3986
3992
3987
#: bzrlib/builtins.py:5705
3993
#: bzrlib/builtins.py:5738
3988
3994
msgid "Mail or create a merge-directive for submitting changes."
3989
3995
msgstr ""
3990
3996
3991
#: bzrlib/builtins.py:5707
3997
#: bzrlib/builtins.py:5740
3992
3998
msgid "A merge directive provides many things needed for requesting merges:"
3993
3999
msgstr ""
3994
4000
3995
#: bzrlib/builtins.py:5709
4001
#: bzrlib/builtins.py:5742
3996
4002
msgid "* A machine-readable description of the merge to perform"
3997
4003
msgstr ""
3998
4004
3999
#: bzrlib/builtins.py:5711
4005
#: bzrlib/builtins.py:5744
4000
4006
msgid "* An optional patch that is a preview of the changes requested"
4001
4007
msgstr ""
4002
4008
4003
#: bzrlib/builtins.py:5713
4009
#: bzrlib/builtins.py:5746
4004
4010
msgid ""
4005
4011
"* An optional bundle of revision data, so that the changes can be applied\n"
4006
4012
" directly from the merge directive, without retrieving data from a\n"
4007
4013
" branch."
4008
4014
msgstr ""
4009
4015
4010
#: bzrlib/builtins.py:5717
4016
#: bzrlib/builtins.py:5750
4011
4017
msgid ""
4012
4018
"`bzr send` creates a compact data set that, when applied using bzr\n"
4013
4019
"merge, has the same effect as merging from the source branch. "
4014
4020
msgstr ""
4015
4021
4016
#: bzrlib/builtins.py:5720
4022
#: bzrlib/builtins.py:5753
4017
4023
msgid ""
4018
4024
"By default the merge directive is self-contained and can be applied to any\n"
4019
4025
"branch containing submit_branch in its ancestory without needing access to\n"
4020
4026
"the source branch."
4021
4027
msgstr ""
4022
4028
4023
#: bzrlib/builtins.py:5724
4029
#: bzrlib/builtins.py:5757
4024
4030
msgid ""
4025
4031
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4026
4032
"revisions, but only a structured request to merge from the\n"
4029
4035
"included if known, so that people can check it later."
4030
4036
msgstr ""
4031
4037
4032
#: bzrlib/builtins.py:5730
4038
#: bzrlib/builtins.py:5763
4033
4039
msgid ""
4034
4040
"The submit branch defaults to the parent of the source branch, but can be\n"
4035
4041
"overridden. Both submit branch and public branch will be remembered in\n"
4038
4044
"be changed using --from."
4039
4045
msgstr ""
4040
4046
4041
#: bzrlib/builtins.py:5736
4047
#: bzrlib/builtins.py:5769
4042
4048
msgid ""
4043
4049
"Both the submit branch and the public branch follow the usual behavior with\n"
4044
4050
"respect to --remember: If there is no default location set, the first send\n"
4047
4053
"--remember. The value will only be saved if the location can be accessed."
4048
4054
msgstr ""
4049
4055
4050
#: bzrlib/builtins.py:5742
4056
#: bzrlib/builtins.py:5775
4051
4057
msgid ""
4052
4058
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4053
4059
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4055
4061
"in the merge directive."
4056
4062
msgstr ""
4057
4063
4058
#: bzrlib/builtins.py:5747
4064
#: bzrlib/builtins.py:5780
4059
4065
msgid ""
4060
4066
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4061
4067
"given, in which case it is sent to a file."
4062
4068
msgstr ""
4063
4069
4064
#: bzrlib/builtins.py:5750
4070
#: bzrlib/builtins.py:5783
4065
4071
msgid ""
4066
4072
"Mail is sent using your preferred mail program. This should be transparent\n"
4067
4073
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4068
4074
"If the preferred client can't be found (or used), your editor will be used."
4069
4075
msgstr ""
4070
4076
4071
#: bzrlib/builtins.py:5754
4077
#: bzrlib/builtins.py:5787
4072
4078
msgid ""
4073
4079
"To use a specific mail program, set the mail_client configuration option.\n"
4074
4080
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4080
4086
"supported clients."
4081
4087
msgstr ""
4082
4088
4083
#: bzrlib/builtins.py:5761
4089
#: bzrlib/builtins.py:5794
4084
4090
msgid ""
4085
4091
"If mail is being sent, a to address is required. This can be supplied\n"
4086
4092
"either on the commandline, by setting the submit_to configuration\n"
4088
4094
"in the submit branch."
4089
4095
msgstr ""
4090
4096
4091
#: bzrlib/builtins.py:5766
4097
#: bzrlib/builtins.py:5799
4092
4098
msgid ""
4093
4099
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4094
4100
"and\n"
4098
4104
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4099
4105
msgstr ""
4100
4106
4101
#: bzrlib/builtins.py:5772
4107
#: bzrlib/builtins.py:5805
4102
4108
msgid ""
4103
4109
"The merge directives created by bzr send may be applied using bzr merge or\n"
4104
4110
"bzr pull by specifying a file containing a merge directive as the location."
4105
4111
msgstr ""
4106
4112
4107
#: bzrlib/builtins.py:5775
4113
#: bzrlib/builtins.py:5808
4108
4114
msgid ""
4109
4115
"bzr send makes extensive use of public locations to map local locations "
4110
4116
"into\n"
4112
4118
"set them, and use `bzr info` to display them."
4113
4119
msgstr ""
4114
4120
4115
#: bzrlib/builtins.py:5799
4121
#: bzrlib/builtins.py:5832
4116
4122
msgid "Write merge directive to this file or directory; use - for stdout."
4117
4123
msgstr ""
4118
4124
4119
#: bzrlib/builtins.py:5803
4125
#: bzrlib/builtins.py:5836
4120
4126
msgid ""
4121
4127
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4122
4128
"strict disables the check."
4123
4129
msgstr ""
4124
4130
4125
#: bzrlib/builtins.py:5805
4131
#: bzrlib/builtins.py:5838
4126
4132
msgid "Mail the request to this address."
4127
4133
msgstr ""
4128
4134
4129
#: bzrlib/builtins.py:5809
4135
#: bzrlib/builtins.py:5842
4130
4136
msgid "Body for the email."
4131
4137
msgstr ""
4132
4138
4133
#: bzrlib/builtins.py:5862
4139
#: bzrlib/builtins.py:5895
4134
4140
msgid "Do not include a bundle in the merge directive."
4135
4141
msgstr ""
4136
4142
4137
#: bzrlib/builtins.py:5863
4143
#: bzrlib/builtins.py:5896
4138
4144
msgid "Do not include a preview patch in the merge directive."
4139
4145
msgstr ""
4140
4146
4141
#: bzrlib/builtins.py:5866
4147
#: bzrlib/builtins.py:5899
4142
4148
msgid "Remember submit and public branch."
4143
4149
msgstr ""
4144
4150
4145
#: bzrlib/builtins.py:5868
4151
#: bzrlib/builtins.py:5901
4146
4152
msgid ""
4147
4153
"Branch to generate the submission from, rather than the one containing the "
4148
4154
"working directory."
4149
4155
msgstr ""
4150
4156
4151
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
4157
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4152
4158
msgid "format"
4153
4159
msgstr ""
4154
4160
4155
#: bzrlib/builtins.py:5879
4161
#: bzrlib/builtins.py:5912
4156
4162
msgid "Use the specified output format."
4157
4163
msgstr ""
4158
4164
4159
#: bzrlib/builtins.py:5901
4165
#: bzrlib/builtins.py:5934
4160
4166
msgid "Create, remove or modify a tag naming a revision."
4161
4167
msgstr ""
4162
4168
4163
#: bzrlib/builtins.py:5903
4169
#: bzrlib/builtins.py:5936
4164
4170
msgid ""
4165
4171
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4166
4172
"(--revision) option can be given -rtag:X, where X is any previously\n"
4167
4173
"created tag."
4168
4174
msgstr ""
4169
4175
4170
#: bzrlib/builtins.py:5907
4176
#: bzrlib/builtins.py:5940
4171
4177
msgid ""
4172
4178
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4173
4179
"along when you branch, push, pull or merge."
4174
4180
msgstr ""
4175
4181
4176
#: bzrlib/builtins.py:5910
4182
#: bzrlib/builtins.py:5943
4177
4183
msgid ""
4178
4184
"It is an error to give a tag name that already exists unless you pass\n"
4179
4185
"--force, in which case the tag is moved to point to the new revision."
4180
4186
msgstr ""
4181
4187
4182
#: bzrlib/builtins.py:5913
4188
#: bzrlib/builtins.py:5946
4183
4189
msgid ""
4184
4190
"To rename a tag (change the name but keep it on the same revsion), run "
4185
4191
"``bzr\n"
4186
4192
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4187
4193
msgstr ""
4188
4194
4189
#: bzrlib/builtins.py:5916
4195
#: bzrlib/builtins.py:5949
4190
4196
msgid ""
4191
4197
"If no tag name is specified it will be determined through the \n"
4192
4198
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4194
4200
"details."
4195
4201
msgstr ""
4196
4202
4197
#: bzrlib/builtins.py:5926
4203
#: bzrlib/builtins.py:5959
4198
4204
msgid "Delete this tag rather than placing it."
4199
4205
msgstr ""
4200
4206
4201
#: bzrlib/builtins.py:5929
4207
#: bzrlib/builtins.py:5962
4202
4208
msgid "Branch in which to place the tag."
4203
4209
msgstr ""
4204
4210
4205
#: bzrlib/builtins.py:5931
4211
#: bzrlib/builtins.py:5964
4206
4212
msgid "Replace existing tags."
4207
4213
msgstr ""
4208
4214
4209
#: bzrlib/builtins.py:5946
4215
#: bzrlib/builtins.py:5979
4210
4216
msgid "No tag specified to delete."
4211
4217
msgstr ""
4212
4218
4213
#: bzrlib/builtins.py:5948
4219
#: bzrlib/builtins.py:5981
4214
4220
#, python-format
4215
4221
msgid "Deleted tag %s."
4216
4222
msgstr ""
4217
4223
4218
#: bzrlib/builtins.py:5962
4224
#: bzrlib/builtins.py:5995
4219
4225
msgid "Please specify a tag name."
4220
4226
msgstr ""
4221
4227
4222
#: bzrlib/builtins.py:5970
4228
#: bzrlib/builtins.py:6003
4223
4229
#, python-format
4224
4230
msgid "Tag %s already exists for that revision."
4225
4231
msgstr ""
4226
4232
4227
#: bzrlib/builtins.py:5974
4233
#: bzrlib/builtins.py:6007
4228
4234
#, python-format
4229
4235
msgid "Created tag %s."
4230
4236
msgstr ""
4231
4237
4232
#: bzrlib/builtins.py:5976
4238
#: bzrlib/builtins.py:6009
4233
4239
#, python-format
4234
4240
msgid "Updated tag %s."
4235
4241
msgstr ""
4236
4242
4237
#: bzrlib/builtins.py:5980
4243
#: bzrlib/builtins.py:6013
4238
4244
msgid "List tags."
4239
4245
msgstr ""
4240
4246
4241
#: bzrlib/builtins.py:5982
4247
#: bzrlib/builtins.py:6015
4242
4248
msgid ""
4243
4249
"This command shows a table of tag names and the revisions they reference."
4244
4250
msgstr ""
4245
4251
4246
#: bzrlib/builtins.py:5988
4252
#: bzrlib/builtins.py:6021
4247
4253
msgid "Branch whose tags should be displayed."
4248
4254
msgstr ""
4249
4255
4250
#: bzrlib/builtins.py:5990
4256
#: bzrlib/builtins.py:6023
4251
4257
msgid "Sort tags by different criteria."
4252
4258
msgstr ""
4253
4259
4254
#: bzrlib/builtins.py:5990
4260
#: bzrlib/builtins.py:6023
4255
4261
msgid "Sorting"
4256
4262
msgstr ""
4257
4263
4258
#: bzrlib/builtins.py:6059
4264
#: bzrlib/builtins.py:6092
4259
4265
msgid "Reconfigure the type of a bzr directory."
4260
4266
msgstr ""
4261
4267
4262
#: bzrlib/builtins.py:6061
4268
#: bzrlib/builtins.py:6094
4263
4269
msgid "A target configuration must be specified."
4264
4270
msgstr ""
4265
4271
4266
#: bzrlib/builtins.py:6063
4272
#: bzrlib/builtins.py:6096
4267
4273
msgid ""
4268
4274
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4269
4275
"The order of preference is\n"
4274
4280
"If none of these is available, --bind-to must be specified."
4275
4281
msgstr ""
4276
4282
4277
#: bzrlib/builtins.py:6077
4283
#: bzrlib/builtins.py:6110
4278
4284
msgid "Tree type"
4279
4285
msgstr ""
4280
4286
4281
#: bzrlib/builtins.py:6078
4287
#: bzrlib/builtins.py:6111
4282
4288
msgid "The relation between branch and tree."
4283
4289
msgstr ""
4284
4290
4285
#: bzrlib/builtins.py:6080
4291
#: bzrlib/builtins.py:6113
4286
4292
msgid "Reconfigure to be an unbound branch with no working tree."
4287
4293
msgstr ""
4288
4294
4289
#: bzrlib/builtins.py:6081
4295
#: bzrlib/builtins.py:6114
4290
4296
msgid "Reconfigure to be an unbound branch with a working tree."
4291
4297
msgstr ""
4292
4298
4293
#: bzrlib/builtins.py:6082
4299
#: bzrlib/builtins.py:6115
4294
4300
msgid "Reconfigure to be a bound branch with a working tree."
4295
4301
msgstr ""
4296
4302
4297
#: bzrlib/builtins.py:6083
4303
#: bzrlib/builtins.py:6116
4298
4304
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4299
4305
msgstr ""
4300
4306
4301
#: bzrlib/builtins.py:6088
4307
#: bzrlib/builtins.py:6121
4302
4308
msgid "Repository type"
4303
4309
msgstr ""
4304
4310
4305
#: bzrlib/builtins.py:6089
4311
#: bzrlib/builtins.py:6122
4306
4312
msgid "Location fo the repository."
4307
4313
msgstr ""
4308
4314
4309
#: bzrlib/builtins.py:6091
4315
#: bzrlib/builtins.py:6124
4310
4316
msgid ""
4311
4317
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4312
4318
msgstr ""
4313
4319
4314
#: bzrlib/builtins.py:6093
4320
#: bzrlib/builtins.py:6126
4315
4321
msgid "Reconfigure to use a shared repository."
4316
4322
msgstr ""
4317
4323
4318
#: bzrlib/builtins.py:6097
4324
#: bzrlib/builtins.py:6130
4319
4325
msgid "Trees in Repository"
4320
4326
msgstr ""
4321
4327
4322
#: bzrlib/builtins.py:6098
4328
#: bzrlib/builtins.py:6131
4323
4329
msgid "Whether new branches in the repository have trees."
4324
4330
msgstr ""
4325
4331
4326
#: bzrlib/builtins.py:6100
4332
#: bzrlib/builtins.py:6133
4327
4333
msgid ""
4328
4334
"Reconfigure repository to create working trees on branches by default."
4329
4335
msgstr ""
4330
4336
4331
#: bzrlib/builtins.py:6102
4337
#: bzrlib/builtins.py:6135
4332
4338
msgid ""
4333
4339
"Reconfigure repository to not create working trees on branches by default."
4334
4340
msgstr ""
4335
4341
4336
#: bzrlib/builtins.py:6105
4342
#: bzrlib/builtins.py:6138
4337
4343
msgid "Branch to bind checkout to."
4338
4344
msgstr "Ветвь, с которой связать рабочую копию."
4339
4345
4340
#: bzrlib/builtins.py:6107
4346
#: bzrlib/builtins.py:6140
4341
4347
msgid "Perform reconfiguration even if local changes will be lost."
4342
4348
msgstr ""
4343
4349
4344
#: bzrlib/builtins.py:6110
4350
#: bzrlib/builtins.py:6143
4345
4351
msgid "Reconfigure a branch to be stacked on another branch."
4346
4352
msgstr ""
4347
4353
4348
#: bzrlib/builtins.py:6114
4354
#: bzrlib/builtins.py:6147
4349
4355
msgid ""
4350
4356
"Reconfigure a branch to be unstacked. This may require copying substantial "
4351
4357
"data into it."
4352
4358
msgstr ""
4353
4359
4354
#: bzrlib/builtins.py:6124
4360
#: bzrlib/builtins.py:6157
4355
4361
msgid "Can't use both --stacked-on and --unstacked"
4356
4362
msgstr ""
4357
4363
4358
#: bzrlib/builtins.py:6138
4364
#: bzrlib/builtins.py:6171
4359
4365
msgid "No target configuration specified"
4360
4366
msgstr ""
4361
4367
4362
#: bzrlib/builtins.py:6173
4368
#: bzrlib/builtins.py:6206
4363
4369
msgid "Set the branch of a checkout and update."
4364
4370
msgstr "Выбрать ветвь рабочей копии и обновить."
4365
4371
4366
#: bzrlib/builtins.py:6175
4372
#: bzrlib/builtins.py:6208
4367
4373
msgid ""
4368
4374
"For lightweight checkouts, this changes the branch being referenced.\n"
4369
4375
"For heavyweight checkouts, this checks that there are no local commits\n"
4371
4377
"of the new location and binds to it."
4372
4378
msgstr ""
4373
4379
4374
#: bzrlib/builtins.py:6180
4380
#: bzrlib/builtins.py:6213
4375
4381
msgid ""
4376
4382
"In both cases, the working tree is updated and uncommitted changes\n"
4377
4383
"are merged. The user can commit or revert these as they desire."
4378
4384
msgstr ""
4379
4385
4380
#: bzrlib/builtins.py:6183
4386
#: bzrlib/builtins.py:6216
4381
4387
msgid "Pending merges need to be committed or reverted before using switch."
4382
4388
msgstr ""
4383
4389
4384
#: bzrlib/builtins.py:6185
4390
#: bzrlib/builtins.py:6218
4385
4391
msgid ""
4386
4392
"The path to the branch to switch to can be specified relative to the parent\n"
4387
4393
"directory of the current branch. For example, if you are currently in a\n"
4389
4395
"/path/to/newbranch."
4390
4396
msgstr ""
4391
4397
4392
#: bzrlib/builtins.py:6190
4398
#: bzrlib/builtins.py:6223
4393
4399
msgid ""
4394
4400
"Bound branches use the nickname of its master branch unless it is set\n"
4395
4401
"locally, in which case switching will update the local nickname to be\n"
4396
4402
"that of the master."
4397
4403
msgstr ""
4398
4404
4399
#: bzrlib/builtins.py:6198
4405
#: bzrlib/builtins.py:6231
4400
4406
msgid "Switch even if local commits will be lost."
4401
4407
msgstr ""
4402
4408
4403
#: bzrlib/builtins.py:6201
4409
#: bzrlib/builtins.py:6234
4404
4410
msgid "Create the target branch from this one before switching to it."
4405
4411
msgstr ""
4406
4412
4407
#: bzrlib/builtins.py:6215
4413
#: bzrlib/builtins.py:6248
4408
4414
msgid "You must supply either a revision or a location"
4409
4415
msgstr ""
4410
4416
4411
#: bzrlib/builtins.py:6228
4417
#: bzrlib/builtins.py:6261
4412
4418
msgid "cannot create branch without source branch"
4413
4419
msgstr ""
4414
4420
4415
#: bzrlib/builtins.py:6253
4421
#: bzrlib/builtins.py:6286
4416
4422
msgid "Manage filtered views."
4417
4423
msgstr ""
4418
4424
4419
#: bzrlib/builtins.py:6255
4425
#: bzrlib/builtins.py:6288
4420
4426
msgid ""
4421
4427
"Views provide a mask over the tree so that users can focus on\n"
4422
4428
"a subset of a tree when doing their work. After creating a view,\n"
4426
4432
"must be within the current view."
4427
4433
msgstr ""
4428
4434
4429
#: bzrlib/builtins.py:6262
4435
#: bzrlib/builtins.py:6295
4430
4436
msgid ""
4431
4437
"In most cases, a view has a short life-span: it is created to make\n"
4432
4438
"a selected change and is deleted once that change is committed.\n"
4434
4440
"and switch between them."
4435
4441
msgstr ""
4436
4442
4437
#: bzrlib/builtins.py:6267
4443
#: bzrlib/builtins.py:6300
4438
4444
msgid ""
4439
4445
"To disable the current view without deleting it, you can switch to\n"
4440
4446
"the pseudo view called ``off``. This can be useful when you need\n"
4442
4448
"want to switch back to your view after that."
4443
4449
msgstr ""
4444
4450
4445
#: bzrlib/builtins.py:6272
4451
#: bzrlib/builtins.py:6305
4446
4452
msgid ""
4447
4453
":Examples:\n"
4448
4454
" To define the current view::"
4449
4455
msgstr ""
4450
4456
4451
#: bzrlib/builtins.py:6275
4457
#: bzrlib/builtins.py:6308
4452
4458
msgid " bzr view file1 dir1 ..."
4453
4459
msgstr ""
4454
4460
4455
#: bzrlib/builtins.py:6277
4461
#: bzrlib/builtins.py:6310
4456
4462
msgid " To list the current view::"
4457
4463
msgstr ""
4458
4464
4459
#: bzrlib/builtins.py:6279
4465
#: bzrlib/builtins.py:6312
4460
4466
msgid " bzr view"
4461
4467
msgstr ""
4462
4468
4463
#: bzrlib/builtins.py:6281
4469
#: bzrlib/builtins.py:6314
4464
4470
msgid " To delete the current view::"
4465
4471
msgstr ""
4466
4472
4467
#: bzrlib/builtins.py:6283
4473
#: bzrlib/builtins.py:6316
4468
4474
msgid " bzr view --delete"
4469
4475
msgstr ""
4470
4476
4471
#: bzrlib/builtins.py:6285
4477
#: bzrlib/builtins.py:6318
4472
4478
msgid " To disable the current view without deleting it::"
4473
4479
msgstr ""
4474
4480
4475
#: bzrlib/builtins.py:6287
4481
#: bzrlib/builtins.py:6320
4476
4482
msgid " bzr view --switch off"
4477
4483
msgstr ""
4478
4484
4479
#: bzrlib/builtins.py:6289
4485
#: bzrlib/builtins.py:6322
4480
4486
msgid " To define a named view and switch to it::"
4481
4487
msgstr ""
4482
4488
4483
#: bzrlib/builtins.py:6291
4489
#: bzrlib/builtins.py:6324
4484
4490
msgid " bzr view --name view-name file1 dir1 ..."
4485
4491
msgstr ""
4486
4492
4487
#: bzrlib/builtins.py:6293
4493
#: bzrlib/builtins.py:6326
4488
4494
msgid " To list a named view::"
4489
4495
msgstr ""
4490
4496
4491
#: bzrlib/builtins.py:6295
4497
#: bzrlib/builtins.py:6328
4492
4498
msgid " bzr view --name view-name"
4493
4499
msgstr ""
4494
4500
4495
#: bzrlib/builtins.py:6297
4501
#: bzrlib/builtins.py:6330
4496
4502
msgid " To delete a named view::"
4497
4503
msgstr ""
4498
4504
4499
#: bzrlib/builtins.py:6299
4505
#: bzrlib/builtins.py:6332
4500
4506
msgid " bzr view --name view-name --delete"
4501
4507
msgstr ""
4502
4508
4503
#: bzrlib/builtins.py:6301
4509
#: bzrlib/builtins.py:6334
4504
4510
msgid " To switch to a named view::"
4505
4511
msgstr ""
4506
4512
4507
#: bzrlib/builtins.py:6303
4513
#: bzrlib/builtins.py:6336
4508
4514
msgid " bzr view --switch view-name"
4509
4515
msgstr ""
4510
4516
4511
#: bzrlib/builtins.py:6305
4517
#: bzrlib/builtins.py:6338
4512
4518
msgid " To list all views defined::"
4513
4519
msgstr ""
4514
4520
4515
#: bzrlib/builtins.py:6307
4521
#: bzrlib/builtins.py:6340
4516
4522
msgid " bzr view --all"
4517
4523
msgstr ""
4518
4524
4519
#: bzrlib/builtins.py:6309
4525
#: bzrlib/builtins.py:6342
4520
4526
msgid " To delete all views::"
4521
4527
msgstr ""
4522
4528
4523
#: bzrlib/builtins.py:6311
4529
#: bzrlib/builtins.py:6344
4524
4530
msgid " bzr view --delete --all"
4525
4531
msgstr ""
4526
4532
4527
#: bzrlib/builtins.py:6318
4533
#: bzrlib/builtins.py:6351
4528
4534
msgid "Apply list or delete action to all views."
4529
4535
msgstr ""
4530
4536
4531
#: bzrlib/builtins.py:6321
4537
#: bzrlib/builtins.py:6354
4532
4538
msgid "Delete the view."
4533
4539
msgstr ""
4534
4540
4535
#: bzrlib/builtins.py:6324
4541
#: bzrlib/builtins.py:6357
4536
4542
msgid "Name of the view to define, list or delete."
4537
4543
msgstr ""
4538
4544
4539
#: bzrlib/builtins.py:6328
4545
#: bzrlib/builtins.py:6361
4540
4546
msgid "Name of the view to switch to."
4541
4547
msgstr ""
4542
4548
4543
#: bzrlib/builtins.py:6347
4549
#: bzrlib/builtins.py:6380
4544
4550
msgid "Both --delete and a file list specified"
4545
4551
msgstr ""
4546
4552
4547
#: bzrlib/builtins.py:6350
4553
#: bzrlib/builtins.py:6383
4548
4554
msgid "Both --delete and --switch specified"
4549
4555
msgstr ""
4550
4556
4551
#: bzrlib/builtins.py:6353
4557
#: bzrlib/builtins.py:6386
4552
4558
msgid "Deleted all views.\n"
4553
4559
msgstr ""
4554
4560
4555
#: bzrlib/builtins.py:6355
4561
#: bzrlib/builtins.py:6388
4556
4562
msgid "No current view to delete"
4557
4563
msgstr ""
4558
4564
4559
#: bzrlib/builtins.py:6358
4565
#: bzrlib/builtins.py:6391
4560
4566
#, python-format
4561
4567
msgid "Deleted '%s' view.\n"
4562
4568
msgstr ""
4563
4569
4564
#: bzrlib/builtins.py:6362
4570
#: bzrlib/builtins.py:6395
4565
4571
msgid "Both --switch and a file list specified"
4566
4572
msgstr ""
4567
4573
4568
#: bzrlib/builtins.py:6365
4574
#: bzrlib/builtins.py:6398
4569
4575
msgid "Both --switch and --all specified"
4570
4576
msgstr ""
4571
4577
4572
#: bzrlib/builtins.py:6368
4578
#: bzrlib/builtins.py:6401
4573
4579
msgid "No current view to disable"
4574
4580
msgstr ""
4575
4581
4576
#: bzrlib/builtins.py:6370
4582
#: bzrlib/builtins.py:6403
4577
4583
#, python-format
4578
4584
msgid "Disabled '%s' view.\n"
4579
4585
msgstr ""
4580
4586
4581
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4587
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4582
4588
msgid "Using '{0}' view: {1}\n"
4583
4589
msgstr ""
4584
4590
4585
#: bzrlib/builtins.py:6377
4591
#: bzrlib/builtins.py:6410
4586
4592
msgid "Views defined:\n"
4587
4593
msgstr ""
4588
4594
4589
#: bzrlib/builtins.py:6386
4595
#: bzrlib/builtins.py:6419
4590
4596
msgid "No views defined.\n"
4591
4597
msgstr ""
4592
4598
4593
#: bzrlib/builtins.py:6393
4599
#: bzrlib/builtins.py:6426
4594
4600
msgid "Cannot change the 'off' pseudo view"
4595
4601
msgstr ""
4596
4602
4597
#: bzrlib/builtins.py:6401
4603
#: bzrlib/builtins.py:6434
4598
4604
msgid "No current view.\n"
4599
4605
msgstr ""
4600
4606
4601
#: bzrlib/builtins.py:6404
4607
#: bzrlib/builtins.py:6437
4602
4608
msgid "'{0}' view is: {1}\n"
4603
4609
msgstr ""
4604
4610
4605
#: bzrlib/builtins.py:6424
4611
#: bzrlib/builtins.py:6457
4606
4612
msgid " <no hooks installed>\n"
4607
4613
msgstr ""
4608
4614
4609
#: bzrlib/builtins.py:6428
4615
#: bzrlib/builtins.py:6461
4610
4616
msgid "Remove a branch."
4611
4617
msgstr ""
4612
4618
4613
#: bzrlib/builtins.py:6430
4619
#: bzrlib/builtins.py:6463
4614
4620
msgid ""
4615
4621
"This will remove the branch from the specified location but \n"
4616
4622
"will keep any working tree or repository in place."
4617
4623
msgstr ""
4618
4624
4619
#: bzrlib/builtins.py:6435
4625
#: bzrlib/builtins.py:6468
4620
4626
msgid " Remove the branch at repo/trunk::"
4621
4627
msgstr ""
4622
4628
4623
#: bzrlib/builtins.py:6437
4629
#: bzrlib/builtins.py:6470
4624
4630
msgid " bzr remove-branch repo/trunk"
4625
4631
msgstr ""
4626
4632
4627
#: bzrlib/builtins.py:6444
4633
#: bzrlib/builtins.py:6477
4628
4634
msgid "Remove branch even if it is the active branch."
4629
4635
msgstr ""
4630
4636
4631
#: bzrlib/builtins.py:6458
4637
#: bzrlib/builtins.py:6491
4632
4638
msgid "Branch is active. Use --force to remove it."
4633
4639
msgstr ""
4634
4640
4635
#: bzrlib/builtins.py:6462
4641
#: bzrlib/builtins.py:6495
4636
4642
msgid "Plaintext diff output."
4637
4643
msgstr ""
4638
4644
4639
#: bzrlib/builtins.py:6463
4645
#: bzrlib/builtins.py:6496
4640
4646
msgid "Temporarily set aside some changes from the current tree."
4641
4647
msgstr ""
4642
4648
4643
#: bzrlib/builtins.py:6465
4649
#: bzrlib/builtins.py:6498
4644
4650
msgid ""
4645
4651
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4646
4652
"ie. out of the way, until a later time when you can bring them back from\n"
4649
4655
"will they survive its deletion."
4650
4656
msgstr ""
4651
4657
4652
#: bzrlib/builtins.py:6471
4658
#: bzrlib/builtins.py:6504
4653
4659
msgid "If shelve --list is specified, previously-shelved changes are listed."
4654
4660
msgstr ""
4655
4661
4656
#: bzrlib/builtins.py:6473
4662
#: bzrlib/builtins.py:6506
4657
4663
msgid ""
4658
4664
"Shelve is intended to help separate several sets of changes that have\n"
4659
4665
"been inappropriately mingled. If you just want to get rid of all changes\n"
4661
4667
"shelve all text changes at once, use shelve --all."
4662
4668
msgstr ""
4663
4669
4664
#: bzrlib/builtins.py:6478
4670
#: bzrlib/builtins.py:6511
4665
4671
msgid ""
4666
4672
"If filenames are specified, only the changes to those files will be\n"
4667
4673
"shelved. Other files will be left untouched."
4668
4674
msgstr ""
4669
4675
4670
#: bzrlib/builtins.py:6481
4676
#: bzrlib/builtins.py:6514
4671
4677
msgid ""
4672
4678
"If a revision is specified, changes since that revision will be shelved."
4673
4679
msgstr ""
4674
4680
4675
#: bzrlib/builtins.py:6483
4681
#: bzrlib/builtins.py:6516
4676
4682
msgid ""
4677
4683
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4678
4684
"restore the most recently shelved changes."
4679
4685
msgstr ""
4680
4686
4681
#: bzrlib/builtins.py:6486
4687
#: bzrlib/builtins.py:6519
4682
4688
msgid ""
4683
4689
"For complicated changes, it is possible to edit the changes in a separate\n"
4684
4690
"editor program to decide what the file remaining in the working copy\n"
4685
4691
"should look like. To do this, add the configuration option"
4686
4692
msgstr ""
4687
4693
4688
#: bzrlib/builtins.py:6490
4694
#: bzrlib/builtins.py:6523
4689
4695
msgid " change_editor = PROGRAM @new_path @old_path"
4690
4696
msgstr ""
4691
4697
4692
#: bzrlib/builtins.py:6492
4698
#: bzrlib/builtins.py:6525
4693
4699
msgid ""
4694
4700
"where @new_path is replaced with the path of the new version of the \n"
4695
4701
"file and @old_path is replaced with the path of the old version of \n"
4698
4704
" "
4699
4705
msgstr ""
4700
4706
4701
#: bzrlib/builtins.py:6504
4707
#: bzrlib/builtins.py:6537
4702
4708
msgid "Shelve all changes."
4703
4709
msgstr ""
4704
4710
4705
#: bzrlib/builtins.py:6506
4711
#: bzrlib/builtins.py:6539
4706
4712
msgid "Method to use for writing diffs."
4707
4713
msgstr ""
4708
4714
4709
#: bzrlib/builtins.py:6506
4715
#: bzrlib/builtins.py:6539
4710
4716
msgid "writer"
4711
4717
msgstr ""
4712
4718
4713
#: bzrlib/builtins.py:6510
4719
#: bzrlib/builtins.py:6543
4714
4720
msgid "List shelved changes."
4715
4721
msgstr ""
4716
4722
4717
#: bzrlib/builtins.py:6512
4723
#: bzrlib/builtins.py:6545
4718
4724
msgid "Destroy removed changes instead of shelving them."
4719
4725
msgstr ""
4720
4726
4721
#: bzrlib/builtins.py:6541
4727
#: bzrlib/builtins.py:6574
4722
4728
msgid "No shelved changes."
4723
4729
msgstr ""
4724
4730
4725
#: bzrlib/builtins.py:6552
4731
#: bzrlib/builtins.py:6585
4726
4732
msgid "Restore shelved changes."
4727
4733
msgstr ""
4728
4734
4729
#: bzrlib/builtins.py:6554
4735
#: bzrlib/builtins.py:6587
4730
4736
msgid ""
4731
4737
"By default, the most recently shelved changes are restored. However if you\n"
4732
4738
"specify a shelf by id those changes will be restored instead. This works\n"
4733
4739
"best when the changes don't depend on each other."
4734
4740
msgstr ""
4735
4741
4736
#: bzrlib/builtins.py:6563
4742
#: bzrlib/builtins.py:6596
4737
4743
msgid "The action to perform."
4738
4744
msgstr ""
4739
4745
4740
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4746
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4741
4747
msgid "action"
4742
4748
msgstr ""
4743
4749
4744
#: bzrlib/builtins.py:6565
4750
#: bzrlib/builtins.py:6598
4745
4751
msgid "Apply changes and remove from the shelf."
4746
4752
msgstr ""
4747
4753
4748
#: bzrlib/builtins.py:6566
4754
#: bzrlib/builtins.py:6599
4749
4755
msgid "Show changes, but do not apply or remove them."
4750
4756
msgstr ""
4751
4757
4752
#: bzrlib/builtins.py:6567
4758
#: bzrlib/builtins.py:6600
4753
4759
msgid ""
4754
4760
"Instead of unshelving the changes, show the diff that would result from "
4755
4761
"unshelving."
4756
4762
msgstr ""
4757
4763
4758
#: bzrlib/builtins.py:6569
4764
#: bzrlib/builtins.py:6602
4759
4765
msgid "Delete changes without applying them."
4760
4766
msgstr ""
4761
4767
4762
#: bzrlib/builtins.py:6570
4768
#: bzrlib/builtins.py:6603
4763
4769
msgid "Apply changes but don't delete them."
4764
4770
msgstr ""
4765
4771
4766
#: bzrlib/builtins.py:6585
4772
#: bzrlib/builtins.py:6618
4767
4773
msgid "Remove unwanted files from working tree."
4768
4774
msgstr ""
4769
4775
4770
#: bzrlib/builtins.py:6587
4776
#: bzrlib/builtins.py:6620
4771
4777
msgid ""
4772
4778
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4773
4779
"files are never deleted."
4774
4780
msgstr ""
4775
4781
4776
#: bzrlib/builtins.py:6590
4782
#: bzrlib/builtins.py:6623
4777
4783
msgid ""
4778
4784
"Another class is 'detritus', which includes files emitted by bzr during\n"
4779
4785
"normal operations and selftests. (The value of these files decreases with\n"
4780
4786
"time.)"
4781
4787
msgstr ""
4782
4788
4783
#: bzrlib/builtins.py:6594
4789
#: bzrlib/builtins.py:6627
4784
4790
msgid ""
4785
4791
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4786
4792
"flags are respected, and may be combined."
4787
4793
msgstr ""
4788
4794
4789
#: bzrlib/builtins.py:6597
4795
#: bzrlib/builtins.py:6630
4790
4796
msgid "To check what clean-tree will do, use --dry-run."
4791
4797
msgstr ""
4792
4798
4793
#: bzrlib/builtins.py:6600
4799
#: bzrlib/builtins.py:6633
4794
4800
msgid "Delete all ignored files."
4795
4801
msgstr ""
4796
4802
4797
#: bzrlib/builtins.py:6601
4803
#: bzrlib/builtins.py:6634
4798
4804
msgid ""
4799
4805
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4800
4806
msgstr ""
4801
4807
4802
#: bzrlib/builtins.py:6604
4808
#: bzrlib/builtins.py:6637
4803
4809
msgid "Delete files unknown to bzr (default)."
4804
4810
msgstr ""
4805
4811
4806
#: bzrlib/builtins.py:6605
4812
#: bzrlib/builtins.py:6638
4807
4813
msgid "Show files to delete instead of deleting them."
4808
4814
msgstr ""
4809
4815
4810
#: bzrlib/builtins.py:6607
4816
#: bzrlib/builtins.py:6640
4811
4817
msgid "Do not prompt before deleting."
4812
4818
msgstr ""
4813
4819
4867
4873
msgstr[0] ""
4868
4874
msgstr[1] ""
4869
4875
4870
#: bzrlib/bzrdir.py:486
4876
#: bzrlib/bzrdir.py:487
4871
4877
msgid ""
4872
4878
"making backup of {0}\n"
4873
4879
" to {1}"
4874
4880
msgstr ""
4875
4881
4876
#: bzrlib/bzrdir.py:509
4882
#: bzrlib/bzrdir.py:510
4877
4883
msgid "renamed {0} to {1}"
4878
4884
msgstr ""
4879
4885
4880
#: bzrlib/bzrdir.py:1638
4886
#: bzrlib/bzrdir.py:1639
4881
4887
#, python-format
4882
4888
msgid ""
4883
4889
"Source repository format does not support stacking, using format:\n"
4884
4890
" %s"
4885
4891
msgstr ""
4886
4892
4887
#: bzrlib/bzrdir.py:1658
4893
#: bzrlib/bzrdir.py:1659
4888
4894
#, python-format
4889
4895
msgid ""
4890
4896
"Source branch format does not support stacking, using format:\n"
4891
4897
" %s"
4892
4898
msgstr ""
4893
4899
4894
#: bzrlib/bzrdir.py:1804
4900
#: bzrlib/bzrdir.py:1805
4895
4901
msgid "starting repository conversion"
4896
4902
msgstr ""
4897
4903
4898
#: bzrlib/bzrdir.py:2025
4904
#: bzrlib/bzrdir.py:2026
4899
4905
msgid "Using default stacking branch {0} at {1}"
4900
4906
msgstr ""
4901
4907
5078
5084
"supported formats or in a custom format based on a template."
5079
5085
msgstr ""
5080
5086
5081
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5082
#: en/help_topics/configuration.txt:710
5087
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5088
#: en/help_topics/configuration.txt:722
5083
5089
msgid "For example::"
5084
5090
msgstr ""
5085
5091
5330
5336
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5331
5337
msgstr ""
5332
5338
5333
#: bzrlib/config.py:2451
5339
#: bzrlib/config.py:2452
5334
5340
msgid "{0} is not an SI unit."
5335
5341
msgstr ""
5336
5342
5337
#: bzrlib/config.py:2970
5343
#: bzrlib/config.py:2971
5338
5344
msgid ""
5339
5345
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5340
5346
"will be saved."
5341
5347
msgstr ""
5342
5348
5343
#: bzrlib/config.py:3114
5349
#: bzrlib/config.py:3116
5344
5350
#, python-format
5345
5351
msgid "Invalid '%s', should be of the form 'name=value'"
5346
5352
msgstr ""
5347
5353
5348
#: bzrlib/config.py:4004
5354
#: bzrlib/config.py:4018
5349
5355
msgid "Display, set or remove a configuration option."
5350
5356
msgstr ""
5351
5357
5352
#: bzrlib/config.py:4006
5358
#: bzrlib/config.py:4020
5353
5359
msgid "Display the active value for a given option."
5354
5360
msgstr ""
5355
5361
5356
#: bzrlib/config.py:4008
5362
#: bzrlib/config.py:4022
5357
5363
msgid ""
5358
5364
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5359
5365
"matching options are displayed mentioning their scope. The active value\n"
5360
5366
"that bzr will take into account is the first one displayed for each option."
5361
5367
msgstr ""
5362
5368
5363
#: bzrlib/config.py:4012
5369
#: bzrlib/config.py:4026
5364
5370
msgid "If no NAME is given, --all .* is implied."
5365
5371
msgstr ""
5366
5372
5367
#: bzrlib/config.py:4014
5373
#: bzrlib/config.py:4028
5368
5374
msgid ""
5369
5375
"Setting a value is achieved by using name=value without spaces. The value\n"
5370
5376
"is set in the most relevant scope and can be checked by displaying the\n"
5371
5377
"option again."
5372
5378
msgstr ""
5373
5379
5374
#: bzrlib/config.py:4026
5380
#: bzrlib/config.py:4040
5375
5381
msgid "Reduce the scope to the specified configuration file."
5376
5382
msgstr ""
5377
5383
5378
#: bzrlib/config.py:4030
5384
#: bzrlib/config.py:4044
5379
5385
msgid "Display all the defined values for the matching options."
5380
5386
msgstr ""
5381
5387
5382
#: bzrlib/config.py:4032
5388
#: bzrlib/config.py:4046
5383
5389
msgid "Remove the option from the configuration file."
5384
5390
msgstr ""
5385
5391
7640
7646
msgid "bzr: ERROR (ignored): %s"
7641
7647
msgstr "bzr: ОШИБКА (игнорирована): %s"
7642
7648
7643
#: bzrlib/remote.py:2541
7649
#: bzrlib/remote.py:2534
7644
7650
msgid "Copying repository content as tarball..."
7645
7651
msgstr "Копирование содержимого репозитория в тарбол..."
7646
7652
7656
7662
msgid "{0} => {1}"
7657
7663
msgstr "{0} => {1}"
7658
7664
7659
#: bzrlib/repository.py:1799
7665
#: bzrlib/repository.py:1738
7660
7666
msgid "Moving repository to repository.backup"
7661
7667
msgstr "Перемещение репозитория в repository.backup"
7662
7668
7663
#: bzrlib/repository.py:1806
7669
#: bzrlib/repository.py:1745
7664
7670
msgid "Creating new repository"
7665
7671
msgstr "Создание нового репозитория"
7666
7672
7667
#: bzrlib/repository.py:1811
7673
#: bzrlib/repository.py:1750
7668
7674
msgid "Copying content"
7669
7675
msgstr "Копирование содержимого"
7670
7676
7671
#: bzrlib/repository.py:1815
7677
#: bzrlib/repository.py:1754
7672
7678
msgid "Deleting old repository content"
7673
7679
msgstr "Удаление старого содержимого репозитория"
7674
7680
7675
#: bzrlib/repository.py:1817
7681
#: bzrlib/repository.py:1756
7676
7682
msgid "repository converted"
7677
7683
msgstr "репозиторий преобразован"
7678
7684
7904
7910
msgid "adding file"
7905
7911
msgstr "добавление файла"
7906
7912
7907
#: bzrlib/transform.py:2590
7913
#: bzrlib/transform.py:2598
7908
7914
msgid "Building tree"
7909
7915
msgstr "Построение дерева"
7910
7916
7911
#: bzrlib/transform.py:2680 bzrlib/transform.py:2707
7917
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7912
7918
msgid "Adding file contents"
7913
7919
msgstr "Добавление содержимого файлй"
7914
7920
7915
#: bzrlib/transform.py:3009
7921
#: bzrlib/transform.py:3017
7916
7922
msgid "Resolution pass"
7917
7923
msgstr ""
7918
7924
7921
7927
msgid "Authenticated as %s"
7922
7928
msgstr ""
7923
7929
7924
#: bzrlib/tree.py:637
7930
#: bzrlib/tree.py:647
7925
7931
msgid "*** {0} content-filter: {1} => {2!r}"
7926
7932
msgstr "*** {0} content-filter: {1} => {2!r}"
7927
7933
8064
8070
8065
8071
#: dummy/help_topics/basic/detail.txt:1
8066
8072
msgid ""
8067
"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"
8073
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8068
8074
"http://bazaar.canonical.com/"
8069
8075
msgstr ""
8070
8076
8400
8406
msgid "How to fix diverged branches"
8401
8407
msgstr "Как исправлять отклонения ветвей"
8402
8408
8403
#: dummy/help_topics/env-variables/detail.txt:1
8404
msgid "Environment Variables"
8405
msgstr "Переменные окружения"
8406
8407
#: dummy/help_topics/env-variables/detail.txt:3
8408
msgid ""
8409
"=================== "
8410
"===========================================================\n"
8411
"BZRPATH Path where bzr is to look for shell plugin external\n"
8412
" commands.\n"
8413
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8414
"EMAIL E-Mail address of the user.\n"
8415
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8416
"EDITOR Editor for editing commit messages.\n"
8417
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8418
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8419
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8420
"BZR_PLUGIN_PATH.\n"
8421
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8422
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8423
"and\n"
8424
" HOME.\n"
8425
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8426
"URLs).\n"
8427
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8428
"sshcorp,\n"
8429
" plink or lsh.\n"
8430
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8431
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8432
"BZR_COLUMNS Override implicit terminal width.\n"
8433
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8434
"(selftest)\n"
8435
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8436
"'text'.\n"
8437
"BZR_PDB Control whether to launch a debugger on error.\n"
8438
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8439
" breakin debugger.\n"
8440
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8441
"(instead\n"
8442
" of char-based).\n"
8443
"=================== "
8444
"===========================================================\n"
8445
msgstr ""
8446
8447
8409
#: dummy/help_topics/env-variables/summary.txt:1
8448
8410
msgid "Environment variable names and values"
8449
8411
msgstr "Имена и значения переменных окружения"
9464
9426
msgid " bzr commit --fixes <tracker>:<id>"
9465
9427
msgstr ""
9466
9428
9467
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9429
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9468
9430
msgid "or::"
9469
9431
msgstr ""
9470
9432
9699
9661
"remove-tree Remove the working tree from a given branch/checkout.\n"
9700
9662
"renames Show list of renamed files.\n"
9701
9663
"resolve Mark a conflict as resolved.\n"
9702
"revert Revert files to a previous revision.\n"
9664
"revert Set files in the working tree back to the contents of a\n"
9665
" previous revision.\n"
9703
9666
"revno Show current revision number.\n"
9704
9667
"root Show the tree root directory.\n"
9705
9668
"send Mail or create a merge-directive for submitting changes.\n"
10357
10320
10358
10321
#: en/help_topics/configuration.txt:336
10359
10322
msgid ""
10323
"Another such option is ``branchname``, which refers to the name of a "
10324
"colocated\n"
10325
"branch. For non-colocated branches, it behaves like basename. It can be "
10326
"used\n"
10327
"like this::"
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:340
10331
msgid ""
10332
" [/home/vila/src/bzr/bugs]\n"
10333
" mypush = lp:~vila/bzr/{branchname}"
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:343
10337
msgid ""
10338
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10339
"get::"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:345
10343
msgid ""
10344
" bzr config mypush\n"
10345
" lp:~vila/bzr/832013-expand-in-stack"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:348
10349
msgid ""
10360
10350
"When an option is local to a Section, it cannot be referred to from option\n"
10361
10351
"values in any other section from the same ``Store`` nor from any other\n"
10362
10352
"``Store``."
10363
10353
msgstr ""
10364
10354
10365
#: en/help_topics/configuration.txt:340
10355
#: en/help_topics/configuration.txt:352
10366
10356
msgid ""
10367
10357
"\n"
10368
10358
"The main configuration file, bazaar.conf\n"
10369
10359
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10370
10360
msgstr ""
10371
10361
10372
#: en/help_topics/configuration.txt:344
10362
#: en/help_topics/configuration.txt:356
10373
10363
msgid ""
10374
10364
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10375
10365
"The default section contains the default\n"
10377
10367
"overriden by providing a branch-specific section in ``locations.conf``."
10378
10368
msgstr ""
10379
10369
10380
#: en/help_topics/configuration.txt:349
10370
#: en/help_topics/configuration.txt:361
10381
10371
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10382
10372
msgstr ""
10383
10373
10384
#: en/help_topics/configuration.txt:351
10374
#: en/help_topics/configuration.txt:363
10385
10375
msgid ""
10386
10376
" [DEFAULT]\n"
10387
10377
" email = John Doe <jdoe@isp.com>\n"
10389
10379
" create_signatures = when-required"
10390
10380
msgstr ""
10391
10381
10392
#: en/help_topics/configuration.txt:356
10382
#: en/help_topics/configuration.txt:368
10393
10383
msgid ""
10394
10384
"\n"
10395
10385
"The branch location configuration file, locations.conf\n"
10396
10386
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10397
10387
msgstr ""
10398
10388
10399
#: en/help_topics/configuration.txt:360
10389
#: en/help_topics/configuration.txt:372
10400
10390
msgid ""
10401
10391
"``locations.conf`` allows one to specify overriding settings for\n"
10402
10392
"a specific branch. The format is almost identical to the default section in\n"
10406
10396
"for. The '?' and '*' wildcards are supported::"
10407
10397
msgstr ""
10408
10398
10409
#: en/help_topics/configuration.txt:366
10399
#: en/help_topics/configuration.txt:378
10410
10400
msgid ""
10411
10401
" [/home/jdoe/branches/nethack]\n"
10412
10402
" email = Nethack Admin <nethack@nethack.com>"
10413
10403
msgstr ""
10414
10404
10415
#: en/help_topics/configuration.txt:369
10405
#: en/help_topics/configuration.txt:381
10416
10406
msgid ""
10417
10407
" [http://hypothetical.site.com/branches/devel-branch]\n"
10418
10408
" create_signatures = always"
10419
10409
msgstr ""
10420
10410
10421
#: en/help_topics/configuration.txt:372
10411
#: en/help_topics/configuration.txt:384
10422
10412
msgid ""
10423
10413
"The authentication configuration file, authentication.conf\n"
10424
10414
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10425
10415
msgstr ""
10426
10416
10427
#: en/help_topics/configuration.txt:375
10417
#: en/help_topics/configuration.txt:387
10428
10418
msgid ""
10429
10419
"``authentication.conf`` allows one to specify credentials for\n"
10430
10420
"remote servers. This can be used for all the supported transports and any "
10432
10422
"of bzr that requires authentication (smtp for example)."
10433
10423
msgstr ""
10434
10424
10435
#: en/help_topics/configuration.txt:379
10425
#: en/help_topics/configuration.txt:391
10436
10426
msgid ""
10437
10427
"The syntax of the file obeys the same rules as the others except for the\n"
10438
10428
"option policies which don't apply."
10439
10429
msgstr ""
10440
10430
10441
#: en/help_topics/configuration.txt:382
10431
#: en/help_topics/configuration.txt:394
10442
10432
msgid ""
10443
10433
"For more information on the possible uses of the authentication "
10444
10434
"configuration\n"
10445
10435
"file see :doc:`authentication-help`."
10446
10436
msgstr ""
10447
10437
10448
#: en/help_topics/configuration.txt:385
10438
#: en/help_topics/configuration.txt:397
10449
10439
msgid ""
10450
10440
"\n"
10451
10441
"Common options\n"
10452
10442
"--------------"
10453
10443
msgstr ""
10454
10444
10455
#: en/help_topics/configuration.txt:389
10445
#: en/help_topics/configuration.txt:401
10456
10446
msgid ""
10457
10447
"debug_flags\n"
10458
10448
"~~~~~~~~~~~"
10459
10449
msgstr ""
10460
10450
10461
#: en/help_topics/configuration.txt:392
10451
#: en/help_topics/configuration.txt:404
10462
10452
msgid ""
10463
10453
"A comma-separated list of debugging options to turn on. The same values\n"
10464
10454
"can be used as with the -D command-line option (see `help global-options`).\n"
10465
10455
"For example::"
10466
10456
msgstr ""
10467
10457
10468
#: en/help_topics/configuration.txt:396
10458
#: en/help_topics/configuration.txt:408
10469
10459
msgid " debug_flags = hpss"
10470
10460
msgstr ""
10471
10461
10472
#: en/help_topics/configuration.txt:400
10462
#: en/help_topics/configuration.txt:412
10473
10463
msgid " debug_flags = hpss,evil"
10474
10464
msgstr ""
10475
10465
10476
#: en/help_topics/configuration.txt:402
10466
#: en/help_topics/configuration.txt:414
10477
10467
msgid ""
10478
10468
"email\n"
10479
10469
"~~~~~"
10480
10470
msgstr ""
10481
10471
10482
#: en/help_topics/configuration.txt:405
10472
#: en/help_topics/configuration.txt:417
10483
10473
msgid ""
10484
10474
"The email address to use when committing a branch. Typically takes the form\n"
10485
10475
"of::"
10486
10476
msgstr ""
10487
10477
10488
#: en/help_topics/configuration.txt:408
10478
#: en/help_topics/configuration.txt:420
10489
10479
msgid " email = Full Name <account@hostname.tld>"
10490
10480
msgstr ""
10491
10481
10492
#: en/help_topics/configuration.txt:410
10482
#: en/help_topics/configuration.txt:422
10493
10483
msgid ""
10494
10484
"editor\n"
10495
10485
"~~~~~~"
10496
10486
msgstr ""
10497
10487
10498
#: en/help_topics/configuration.txt:413
10488
#: en/help_topics/configuration.txt:425
10499
10489
msgid ""
10500
10490
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10501
10491
"a commit message. This setting is trumped by the environment variable\n"
10503
10493
"variables."
10504
10494
msgstr ""
10505
10495
10506
#: en/help_topics/configuration.txt:418
10496
#: en/help_topics/configuration.txt:430
10507
10497
msgid ""
10508
10498
"log_format\n"
10509
10499
"~~~~~~~~~~"
10510
10500
msgstr ""
10511
10501
10512
#: en/help_topics/configuration.txt:421
10502
#: en/help_topics/configuration.txt:433
10513
10503
msgid ""
10514
10504
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10515
10505
"and ``line``. Additional formats may be provided by plugins. The default\n"
10516
10506
"value is ``long``."
10517
10507
msgstr ""
10518
10508
10519
#: en/help_topics/configuration.txt:425
10509
#: en/help_topics/configuration.txt:437
10520
10510
msgid ""
10521
10511
"check_signatures\n"
10522
10512
"~~~~~~~~~~~~~~~~"
10523
10513
msgstr ""
10524
10514
10525
#: en/help_topics/configuration.txt:428
10515
#: en/help_topics/configuration.txt:440
10526
10516
msgid ""
10527
10517
"Reserved for future use. These options will allow a policy for branches to\n"
10528
10518
"require signatures."
10529
10519
msgstr ""
10530
10520
10531
#: en/help_topics/configuration.txt:431
10521
#: en/help_topics/configuration.txt:443
10532
10522
msgid ""
10533
10523
"require\n"
10534
10524
" The gnupg signature for revisions must be present and must be valid."
10535
10525
msgstr ""
10536
10526
10537
#: en/help_topics/configuration.txt:434
10527
#: en/help_topics/configuration.txt:446
10538
10528
msgid ""
10539
10529
"ignore\n"
10540
10530
" Do not check gnupg signatures of revisions."
10541
10531
msgstr ""
10542
10532
10543
#: en/help_topics/configuration.txt:437
10533
#: en/help_topics/configuration.txt:449
10544
10534
msgid ""
10545
10535
"check-available\n"
10546
10536
" (default) If gnupg signatures for revisions are present, check them.\n"
10548
10538
" no signature is present."
10549
10539
msgstr ""
10550
10540
10551
#: en/help_topics/configuration.txt:442
10541
#: en/help_topics/configuration.txt:454
10552
10542
msgid ""
10553
10543
"create_signatures\n"
10554
10544
"~~~~~~~~~~~~~~~~~"
10555
10545
msgstr ""
10556
10546
10557
#: en/help_topics/configuration.txt:445
10547
#: en/help_topics/configuration.txt:457
10558
10548
msgid ""
10559
10549
"Defines the behaviour of signing revisions on commits. By default bzr will "
10560
10550
"not\n"
10561
10551
"sign new commits."
10562
10552
msgstr ""
10563
10553
10564
#: en/help_topics/configuration.txt:448
10554
#: en/help_topics/configuration.txt:460
10565
10555
msgid ""
10566
10556
"always\n"
10567
10557
" Sign every new revision that is committed. If the signing fails then "
10569
10559
" commit will not be made."
10570
10560
msgstr ""
10571
10561
10572
#: en/help_topics/configuration.txt:452
10562
#: en/help_topics/configuration.txt:464
10573
10563
msgid ""
10574
10564
"when-required\n"
10575
10565
" Reserved for future use."
10576
10566
msgstr ""
10577
10567
10578
#: en/help_topics/configuration.txt:455
10568
#: en/help_topics/configuration.txt:467
10579
10569
msgid ""
10580
10570
"never\n"
10581
10571
" Reserved for future use."
10582
10572
msgstr ""
10583
10573
10584
#: en/help_topics/configuration.txt:458
10574
#: en/help_topics/configuration.txt:470
10585
10575
msgid ""
10586
10576
"In future it is planned that ``when-required`` will sign newly\n"
10587
10577
"committed revisions only when the branch requires them. ``never`` will "
10589
10579
"to sign newly committed revisions, even if the branch requires signatures."
10590
10580
msgstr ""
10591
10581
10592
#: en/help_topics/configuration.txt:462
10582
#: en/help_topics/configuration.txt:474
10593
10583
msgid ""
10594
10584
"dirstate.fdatasync\n"
10595
10585
"~~~~~~~~~~~~~~~~~~"
10596
10586
msgstr ""
10597
10587
10598
#: en/help_topics/configuration.txt:465
10588
#: en/help_topics/configuration.txt:477
10599
10589
msgid ""
10600
10590
"If true (default), working tree metadata changes are flushed through the\n"
10601
10591
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10602
10592
"should not be lost if the machine crashes. See also repository.fdatasync."
10603
10593
msgstr ""
10604
10594
10605
#: en/help_topics/configuration.txt:469
10595
#: en/help_topics/configuration.txt:481
10606
10596
msgid ""
10607
10597
"gpg_signing_key\n"
10608
10598
"~~~~~~~~~~~~~~~"
10609
10599
msgstr ""
10610
10600
10611
#: en/help_topics/configuration.txt:472
10601
#: en/help_topics/configuration.txt:484
10612
10602
msgid ""
10613
10603
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10614
10604
"address, key fingerprint or full key ID. When unset or when set to\n"
10615
10605
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10616
10606
msgstr ""
10617
10607
10618
#: en/help_topics/configuration.txt:476
10608
#: en/help_topics/configuration.txt:488
10619
10609
msgid ""
10620
10610
"recurse\n"
10621
10611
"~~~~~~~"
10622
10612
msgstr ""
10623
10613
10624
#: en/help_topics/configuration.txt:479
10614
#: en/help_topics/configuration.txt:491
10625
10615
msgid ""
10626
10616
"Only useful in ``locations.conf``. Defines whether or not the\n"
10627
10617
"configuration for this section applies to subdirectories:"
10628
10618
msgstr ""
10629
10619
10630
#: en/help_topics/configuration.txt:482
10620
#: en/help_topics/configuration.txt:494
10631
10621
msgid ""
10632
10622
"true\n"
10633
10623
" (default) This section applies to subdirectories as well."
10634
10624
msgstr ""
10635
10625
10636
#: en/help_topics/configuration.txt:485
10626
#: en/help_topics/configuration.txt:497
10637
10627
msgid ""
10638
10628
"false\n"
10639
10629
" This section only applies to the branch at this directory and not\n"
10640
10630
" branches below it."
10641
10631
msgstr ""
10642
10632
10643
#: en/help_topics/configuration.txt:489
10633
#: en/help_topics/configuration.txt:501
10644
10634
msgid ""
10645
10635
"gpg_signing_command\n"
10646
10636
"~~~~~~~~~~~~~~~~~~~"
10647
10637
msgstr ""
10648
10638
10649
#: en/help_topics/configuration.txt:492
10639
#: en/help_topics/configuration.txt:504
10650
10640
msgid ""
10651
10641
"(Default: \"gpg\"). Which program should be used to sign and check "
10652
10642
"revisions.\n"
10653
10643
"For example::"
10654
10644
msgstr ""
10655
10645
10656
#: en/help_topics/configuration.txt:495
10646
#: en/help_topics/configuration.txt:507
10657
10647
msgid " gpg_signing_command = /usr/bin/gnpg"
10658
10648
msgstr ""
10659
10649
10660
#: en/help_topics/configuration.txt:497
10650
#: en/help_topics/configuration.txt:509
10661
10651
msgid ""
10662
10652
"The specified command must accept the options \"--clearsign\" and \"-u "
10663
10653
"<email>\"."
10664
10654
msgstr ""
10665
10655
10666
#: en/help_topics/configuration.txt:499
10656
#: en/help_topics/configuration.txt:511
10667
10657
msgid ""
10668
10658
"bzr_remote_path\n"
10669
10659
"~~~~~~~~~~~~~~~"
10670
10660
msgstr ""
10671
10661
10672
#: en/help_topics/configuration.txt:502
10662
#: en/help_topics/configuration.txt:514
10673
10663
msgid ""
10674
10664
"(Default: \"bzr\"). The path to the command that should be used to run the "
10675
10665
"smart\n"
10676
10666
"server for bzr. This value may only be specified in locations.conf, because:"
10677
10667
msgstr ""
10678
10668
10679
#: en/help_topics/configuration.txt:505
10669
#: en/help_topics/configuration.txt:517
10680
10670
msgid ""
10681
10671
"- it's needed before branch.conf is accessible\n"
10682
10672
"- allowing remote branch.conf files to specify commands would be a security\n"
10683
10673
" risk"
10684
10674
msgstr ""
10685
10675
10686
#: en/help_topics/configuration.txt:509
10676
#: en/help_topics/configuration.txt:521
10687
10677
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10688
10678
msgstr ""
10689
10679
10690
#: en/help_topics/configuration.txt:511
10680
#: en/help_topics/configuration.txt:523
10691
10681
msgid ""
10692
10682
"smtp_server\n"
10693
10683
"~~~~~~~~~~~"
10694
10684
msgstr ""
10695
10685
10696
#: en/help_topics/configuration.txt:514
10686
#: en/help_topics/configuration.txt:526
10697
10687
msgid ""
10698
10688
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10699
10689
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10700
10690
msgstr ""
10701
10691
10702
#: en/help_topics/configuration.txt:517
10692
#: en/help_topics/configuration.txt:529
10703
10693
msgid ""
10704
10694
"smtp_username, smtp_password\n"
10705
10695
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10706
10696
msgstr ""
10707
10697
10708
#: en/help_topics/configuration.txt:520
10698
#: en/help_topics/configuration.txt:532
10709
10699
msgid ""
10710
10700
"User and password to authenticate to the SMTP server. If smtp_username\n"
10711
10701
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10713
10703
"to send mail."
10714
10704
msgstr ""
10715
10705
10716
#: en/help_topics/configuration.txt:525
10706
#: en/help_topics/configuration.txt:537
10717
10707
msgid ""
10718
10708
"locks.steal_dead\n"
10719
10709
"~~~~~~~~~~~~~~~~"
10720
10710
msgstr ""
10721
10711
10722
#: en/help_topics/configuration.txt:528
10712
#: en/help_topics/configuration.txt:540
10723
10713
msgid ""
10724
10714
"If set to true, bzr will automatically break locks held by processes from\n"
10725
10715
"the same machine and user that are no longer alive. Otherwise, it will\n"
10727
10717
"the object is no longer in use."
10728
10718
msgstr ""
10729
10719
10730
#: en/help_topics/configuration.txt:533
10720
#: en/help_topics/configuration.txt:545
10731
10721
msgid ""
10732
10722
"mail_client\n"
10733
10723
"~~~~~~~~~~~"
10734
10724
msgstr ""
10735
10725
10736
#: en/help_topics/configuration.txt:536
10726
#: en/help_topics/configuration.txt:548
10737
10727
msgid ""
10738
10728
"A mail client to use for sending merge requests.\n"
10739
10729
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10742
10732
"``editor``."
10743
10733
msgstr ""
10744
10734
10745
#: en/help_topics/configuration.txt:541
10735
#: en/help_topics/configuration.txt:553
10746
10736
msgid "Supported values for specific clients:"
10747
10737
msgstr ""
10748
10738
10749
#: en/help_topics/configuration.txt:543
10739
#: en/help_topics/configuration.txt:555
10750
10740
msgid ""
10751
10741
":claws: Use Claws. This skips a dialog for attaching files.\n"
10752
10742
":evolution: Use Evolution.\n"
10757
10747
" this works around some bugs that xdg-email doesn't handle."
10758
10748
msgstr ""
10759
10749
10760
#: en/help_topics/configuration.txt:550
10750
#: en/help_topics/configuration.txt:562
10761
10751
msgid "Supported generic values are:"
10762
10752
msgstr ""
10763
10753
10764
#: en/help_topics/configuration.txt:552
10754
#: en/help_topics/configuration.txt:564
10765
10755
msgid ""
10766
10756
":default: See above.\n"
10767
10757
":editor: Use your editor to compose the merge request. This also uses\n"
10771
10761
":xdg-email: Use xdg-email to run your preferred mail program"
10772
10762
msgstr ""
10773
10763
10774
#: en/help_topics/configuration.txt:559
10764
#: en/help_topics/configuration.txt:571
10775
10765
msgid ""
10776
10766
"repository.fdatasync\n"
10777
10767
"~~~~~~~~~~~~~~~~~~~~"
10778
10768
msgstr ""
10779
10769
10780
#: en/help_topics/configuration.txt:562
10770
#: en/help_topics/configuration.txt:574
10781
10771
msgid ""
10782
10772
"If true (default), repository changes are flushed through the OS buffers\n"
10783
10773
"to physical disk. This is somewhat slower, but means data should not be\n"
10784
10774
"lost if the machine crashes. See also dirstate.fdatasync."
10785
10775
msgstr ""
10786
10776
10787
#: en/help_topics/configuration.txt:566
10777
#: en/help_topics/configuration.txt:578
10788
10778
msgid ""
10789
10779
"submit_branch\n"
10790
10780
"~~~~~~~~~~~~~"
10791
10781
msgstr ""
10792
10782
10793
#: en/help_topics/configuration.txt:569
10783
#: en/help_topics/configuration.txt:581
10794
10784
msgid ""
10795
10785
"The branch you intend to submit your current work to. This is "
10796
10786
"automatically\n"
10799
10789
"should usually be set on a per-branch or per-location basis."
10800
10790
msgstr ""
10801
10791
10802
#: en/help_topics/configuration.txt:573
10792
#: en/help_topics/configuration.txt:585
10803
10793
msgid ""
10804
10794
"public_branch\n"
10805
10795
"~~~~~~~~~~~~~"
10806
10796
msgstr ""
10807
10797
10808
#: en/help_topics/configuration.txt:576
10798
#: en/help_topics/configuration.txt:588
10809
10799
msgid ""
10810
10800
"A publically-accessible version of this branch (implying that this version "
10811
10801
"is\n"
10812
10802
"not publically-accessible). Used (and set) by ``bzr send``."
10813
10803
msgstr ""
10814
10804
10815
#: en/help_topics/configuration.txt:579
10805
#: en/help_topics/configuration.txt:591
10816
10806
msgid ""
10817
10807
"suppress_warnings\n"
10818
10808
"~~~~~~~~~~~~~~~~~"
10819
10809
msgstr ""
10820
10810
10821
#: en/help_topics/configuration.txt:582
10811
#: en/help_topics/configuration.txt:594
10822
10812
msgid ""
10823
10813
"A list of strings, each string represent a warning that can be emitted by\n"
10824
10814
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10825
10815
msgstr ""
10826
10816
10827
#: en/help_topics/configuration.txt:585
10817
#: en/help_topics/configuration.txt:597
10828
10818
msgid "Valid values:"
10829
10819
msgstr ""
10830
10820
10831
#: en/help_topics/configuration.txt:587
10821
#: en/help_topics/configuration.txt:599
10832
10822
msgid ""
10833
10823
"* ``format_deprecation``:\n"
10834
10824
" whether the format deprecation warning is shown on repositories that "
10836
10826
" using deprecated formats."
10837
10827
msgstr ""
10838
10828
10839
#: en/help_topics/configuration.txt:591
10829
#: en/help_topics/configuration.txt:603
10840
10830
msgid ""
10841
10831
"default_format\n"
10842
10832
"~~~~~~~~~~~~~~"
10843
10833
msgstr ""
10844
10834
10845
#: en/help_topics/configuration.txt:594
10835
#: en/help_topics/configuration.txt:606
10846
10836
msgid ""
10847
10837
"A format name for the default format used when creating branches. See "
10848
10838
"``bzr\n"
10849
10839
"help formats`` for possible values."
10850
10840
msgstr ""
10851
10841
10852
#: en/help_topics/configuration.txt:597
10842
#: en/help_topics/configuration.txt:609
10853
10843
msgid ""
10854
10844
"\n"
10855
10845
"Unicode options\n"
10856
10846
"---------------"
10857
10847
msgstr ""
10858
10848
10859
#: en/help_topics/configuration.txt:601
10849
#: en/help_topics/configuration.txt:613
10860
10850
msgid ""
10861
10851
"output_encoding\n"
10862
10852
"~~~~~~~~~~~~~~~"
10863
10853
msgstr ""
10864
10854
10865
#: en/help_topics/configuration.txt:604
10855
#: en/help_topics/configuration.txt:616
10866
10856
msgid ""
10867
10857
"A Python unicode encoding name for text output from bzr, such as log\n"
10868
10858
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10869
10859
"is the terminal encoding prefered by the operating system."
10870
10860
msgstr ""
10871
10861
10872
#: en/help_topics/configuration.txt:608
10862
#: en/help_topics/configuration.txt:620
10873
10863
msgid ""
10874
10864
"\n"
10875
10865
"Branch type specific options\n"
10876
10866
"----------------------------"
10877
10867
msgstr ""
10878
10868
10879
#: en/help_topics/configuration.txt:612
10869
#: en/help_topics/configuration.txt:624
10880
10870
msgid ""
10881
10871
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10882
10872
"later format. They\n"
10884
10874
"manually set in ``locations.conf`` or ``bazaar.conf``."
10885
10875
msgstr ""
10886
10876
10887
#: en/help_topics/configuration.txt:617
10877
#: en/help_topics/configuration.txt:629
10888
10878
msgid ""
10889
10879
"append_revisions_only\n"
10890
10880
"~~~~~~~~~~~~~~~~~~~~~"
10891
10881
msgstr ""
10892
10882
10893
#: en/help_topics/configuration.txt:620
10883
#: en/help_topics/configuration.txt:632
10894
10884
msgid ""
10895
10885
"If set to \"True\" then revisions can only be appended to the log, not\n"
10896
10886
"removed. A branch with this setting enabled can only pull from another\n"
10900
10890
"compatibility with previous bzr versions (older than 2.2)."
10901
10891
msgstr ""
10902
10892
10903
#: en/help_topics/configuration.txt:627
10893
#: en/help_topics/configuration.txt:639
10904
10894
msgid ""
10905
10895
"parent_location\n"
10906
10896
"~~~~~~~~~~~~~~~"
10907
10897
msgstr ""
10908
10898
10909
#: en/help_topics/configuration.txt:630
10899
#: en/help_topics/configuration.txt:642
10910
10900
msgid ""
10911
10901
"If present, the location of the default branch for pull or merge. This "
10912
10902
"option\n"
10914
10904
"--remember``."
10915
10905
msgstr ""
10916
10906
10917
#: en/help_topics/configuration.txt:634
10907
#: en/help_topics/configuration.txt:646
10918
10908
msgid ""
10919
10909
"push_location\n"
10920
10910
"~~~~~~~~~~~~~"
10921
10911
msgstr ""
10922
10912
10923
#: en/help_topics/configuration.txt:637
10913
#: en/help_topics/configuration.txt:649
10924
10914
msgid ""
10925
10915
"If present, the location of the default branch for push. This option\n"
10926
10916
"is normally set by the first ``push`` or ``push --remember``."
10927
10917
msgstr ""
10928
10918
10929
#: en/help_topics/configuration.txt:640
10919
#: en/help_topics/configuration.txt:652
10930
10920
msgid ""
10931
10921
"push_strict\n"
10932
10922
"~~~~~~~~~~~"
10933
10923
msgstr ""
10934
10924
10935
#: en/help_topics/configuration.txt:643
10925
#: en/help_topics/configuration.txt:655
10936
10926
msgid ""
10937
10927
"If present, defines the ``--strict`` option default value for checking\n"
10938
10928
"uncommitted changes before pushing."
10939
10929
msgstr ""
10940
10930
10941
#: en/help_topics/configuration.txt:646
10931
#: en/help_topics/configuration.txt:658
10942
10932
msgid ""
10943
10933
"dpush_strict\n"
10944
10934
"~~~~~~~~~~~~"
10945
10935
msgstr ""
10946
10936
10947
#: en/help_topics/configuration.txt:649
10937
#: en/help_topics/configuration.txt:661
10948
10938
msgid ""
10949
10939
"If present, defines the ``--strict`` option default value for checking\n"
10950
10940
"uncommitted changes before pushing into a different VCS without any\n"
10951
10941
"custom bzr metadata."
10952
10942
msgstr ""
10953
10943
10954
#: en/help_topics/configuration.txt:653
10944
#: en/help_topics/configuration.txt:665
10955
10945
msgid ""
10956
10946
"bound_location\n"
10957
10947
"~~~~~~~~~~~~~~"
10958
10948
msgstr ""
10959
10949
10960
#: en/help_topics/configuration.txt:656
10950
#: en/help_topics/configuration.txt:668
10961
10951
msgid ""
10962
10952
"The location that commits should go to when acting as a checkout.\n"
10963
10953
"This option is normally set by ``bind``."
10964
10954
msgstr ""
10965
10955
10966
#: en/help_topics/configuration.txt:659
10956
#: en/help_topics/configuration.txt:671
10967
10957
msgid ""
10968
10958
"bound\n"
10969
10959
"~~~~~"
10970
10960
msgstr ""
10971
10961
10972
#: en/help_topics/configuration.txt:662
10962
#: en/help_topics/configuration.txt:674
10973
10963
msgid ""
10974
10964
"If set to \"True\", the branch should act as a checkout, and push each "
10975
10965
"commit to\n"
10976
10966
"the bound_location. This option is normally set by ``bind``/``unbind``."
10977
10967
msgstr ""
10978
10968
10979
#: en/help_topics/configuration.txt:665
10969
#: en/help_topics/configuration.txt:677
10980
10970
msgid ""
10981
10971
"send_strict\n"
10982
10972
"~~~~~~~~~~~"
10983
10973
msgstr ""
10984
10974
10985
#: en/help_topics/configuration.txt:668
10975
#: en/help_topics/configuration.txt:680
10986
10976
msgid ""
10987
10977
"If present, defines the ``--strict`` option default value for checking\n"
10988
10978
"uncommitted changes before sending a merge directive."
10989
10979
msgstr ""
10990
10980
10991
#: en/help_topics/configuration.txt:671
10981
#: en/help_topics/configuration.txt:683
10992
10982
msgid ""
10993
10983
"add.maximum_file_size\n"
10994
10984
"~~~~~~~~~~~~~~~~~~~~~"
10995
10985
msgstr ""
10996
10986
10997
#: en/help_topics/configuration.txt:674
10987
#: en/help_topics/configuration.txt:686
10998
10988
msgid ""
10999
10989
"Defines the maximum file size the command line \"add\" operation will allow\n"
11000
10990
"in recursive mode, with files larger than this value being skipped. You may "
11006
10996
"will disable skipping."
11007
10997
msgstr ""
11008
10998
11009
#: en/help_topics/configuration.txt:680
10999
#: en/help_topics/configuration.txt:692
11010
11000
msgid ""
11011
11001
"External Merge Tools\n"
11012
11002
"--------------------"
11013
11003
msgstr ""
11014
11004
11015
#: en/help_topics/configuration.txt:683
11005
#: en/help_topics/configuration.txt:695
11016
11006
msgid ""
11017
11007
"bzr.mergetool.<name>\n"
11018
11008
"~~~~~~~~~~~~~~~~~~~~"
11019
11009
msgstr ""
11020
11010
11021
#: en/help_topics/configuration.txt:686
11011
#: en/help_topics/configuration.txt:698
11022
11012
msgid ""
11023
11013
"Defines an external merge tool called <name> with the given command-line.\n"
11024
11014
"Arguments containing spaces should be quoted using single or double quotes. "
11026
11016
"executable may omit its path if it can be found on the PATH."
11027
11017
msgstr ""
11028
11018
11029
#: en/help_topics/configuration.txt:690
11019
#: en/help_topics/configuration.txt:702
11030
11020
msgid ""
11031
11021
"The following markers can be used in the command-line to substitute "
11032
11022
"filenames\n"
11033
11023
"involved in the merge conflict::"
11034
11024
msgstr ""
11035
11025
11036
#: en/help_topics/configuration.txt:693
11026
#: en/help_topics/configuration.txt:705
11037
11027
msgid ""
11038
11028
" {base} file.BASE\n"
11039
11029
" {this} file.THIS\n"
11044
11034
" succeeds."
11045
11035
msgstr ""
11046
11036
11047
#: en/help_topics/configuration.txt:702
11037
#: en/help_topics/configuration.txt:714
11048
11038
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11049
11039
msgstr ""
11050
11040
11051
#: en/help_topics/configuration.txt:704
11041
#: en/help_topics/configuration.txt:716
11052
11042
msgid ""
11053
11043
"bzr.default_mergetool\n"
11054
11044
"~~~~~~~~~~~~~~~~~~~~~"
11055
11045
msgstr ""
11056
11046
11057
#: en/help_topics/configuration.txt:707
11047
#: en/help_topics/configuration.txt:719
11058
11048
msgid ""
11059
11049
"Specifies which external merge tool (as defined above) should be selected "
11060
11050
"by\n"
11061
11051
"default in tools such as ``bzr qconflicts``."
11062
11052
msgstr ""
11063
11053
11064
#: en/help_topics/configuration.txt:712
11054
#: en/help_topics/configuration.txt:724
11065
11055
msgid " bzr.default_mergetool = kdiff3\n"
11066
11056
msgstr ""
11067
11057
12012
12002
"branch can now be pushed to the mainline.\n"
12013
12003
msgstr ""
12014
12004
12005
#: en/help_topics/env-variables.txt:1
12006
msgid "Environment Variables"
12007
msgstr "Переменные окружения"
12008
12009
#: en/help_topics/env-variables.txt:3
12010
msgid ""
12011
"=================== "
12012
"===========================================================\n"
12013
"BZRPATH Path where bzr is to look for shell plugin external\n"
12014
" commands.\n"
12015
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12016
"EMAIL E-Mail address of the user.\n"
12017
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12018
"EDITOR Editor for editing commit messages.\n"
12019
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12020
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12021
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12022
"BZR_PLUGIN_PATH.\n"
12023
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12024
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12025
"and\n"
12026
" HOME.\n"
12027
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12028
"URLs).\n"
12029
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12030
"sshcorp,\n"
12031
" plink or lsh.\n"
12032
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12033
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12034
"BZR_COLUMNS Override implicit terminal width.\n"
12035
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12036
"(selftest)\n"
12037
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12038
"'text'.\n"
12039
"BZR_PDB Control whether to launch a debugger on error.\n"
12040
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12041
" breakin debugger.\n"
12042
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12043
"(instead\n"
12044
" of char-based).\n"
12045
"=================== "
12046
"===========================================================\n"
12047
msgstr ""
12048
12015
12049
#: en/help_topics/eol.txt:1
12016
12050
msgid ""
12017
12051
"End of Line Conversion\n"
13893
13927
"Many commands that accept URLs also accept location aliases too.\n"
13894
13928
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13895
13929
msgstr ""
13930
13931
#~ msgid ""
13932
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
13933
#~ "delete them if they can easily be recovered using revert otherwise they\n"
13934
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
13935
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
13936
#~ "Bazaar but missing in your tree and stop tracking them for you."
13937
#~ msgstr ""
13938
#~ "Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
13939
#~ "если их можно легко восстановить с помощью revert, иначе будут созданы\n"
13940
#~ "их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
13941
#~ "ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
13942
#~ "в рабочем дереве и прекратит их отслеживать."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1