153
133
"the no-pending option or specify a file/directory."
156
#: bzrlib/builtins.py:363
136
#: breezy/builtins.py:363
158
138
"To compare the working directory to a specific revision, pass a\n"
159
139
"single revision to the revision argument."
162
#: bzrlib/builtins.py:366
142
#: breezy/builtins.py:366
164
144
"To see which files have changed in a specific revision, or between\n"
165
145
"two revisions, pass a revision range to the revision argument.\n"
166
"This will produce the same results as calling 'bzr diff --summarize'."
146
"This will produce the same results as calling 'brz diff --summarize'."
169
#: bzrlib/builtins.py:375
149
# help of 'short' option of 'status' command
150
#: breezy/builtins.py:375
170
151
msgid "Use short status indicators."
171
msgstr "Koristiti kratki indikator stanja."
173
#: bzrlib/builtins.py:377
154
# help of 'versioned' option of 'status' command
155
#: breezy/builtins.py:377
174
156
msgid "Only show versioned files."
175
msgstr "Prikaži samo verzirane datoteke."
177
#: bzrlib/builtins.py:379
159
# help of 'no-pending' option of 'status' command
160
#: breezy/builtins.py:379
178
161
msgid "Don't show pending merges."
179
msgstr "Ne prikazuj spajanja u toku."
181
#: bzrlib/builtins.py:382
164
# help of 'no-classify' option of 'status' command
165
#: breezy/builtins.py:382
182
166
msgid "Do not mark object type using indicator."
185
#: bzrlib/builtins.py:397
186
msgid "bzr status --revision takes exactly one or two revision specifiers"
169
#: breezy/builtins.py:397
170
msgid "brz status --revision takes exactly one or two revision specifiers"
189
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
173
#: breezy/builtins.py:441 breezy/builtins.py:5229
190
174
msgid "You can only supply one of revision_id or --revision"
191
msgstr "Možete predati samo jednog revision_id ili --revision"
193
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
177
#: breezy/builtins.py:444 breezy/builtins.py:5231
194
178
msgid "You must supply either --revision or a revision_id"
195
msgstr "Morate predati --revision ili revision_id"
197
#: bzrlib/builtins.py:451
181
#: breezy/builtins.py:451
199
183
msgid "Repository %r does not support access to raw revision texts"
202
#: bzrlib/builtins.py:462
186
#: breezy/builtins.py:462
187
#, python-brace-format
203
188
msgid "The repository {0} contains no revision {1}."
206
#: bzrlib/builtins.py:469
191
#: breezy/builtins.py:469
207
192
msgid "You cannot specify a NULL revision."
208
msgstr "Ne možete specifirati praznu reviziju."
210
#: bzrlib/builtins.py:561
195
#: breezy/builtins.py:561
211
196
msgid "Remove the working tree from a given branch/checkout."
214
#: bzrlib/builtins.py:563
199
#: breezy/builtins.py:563
216
201
"Since a lightweight checkout is little more than a working tree\n"
217
202
"this will refuse to run against one."
220
#: bzrlib/builtins.py:566
221
msgid "To re-create the working tree, use \"bzr checkout\"."
224
#: bzrlib/builtins.py:572
226
"Remove the working tree even if it has uncommitted or shelved changes."
229
#: bzrlib/builtins.py:586
205
#: breezy/builtins.py:566
206
msgid "To re-create the working tree, use \"brz checkout\"."
209
# help of 'force' option of 'remove-tree' command
210
#: breezy/builtins.py:572
211
msgid "Remove the working tree even if it has uncommitted or shelved changes."
214
#: breezy/builtins.py:586
230
215
msgid "No working tree to remove"
231
msgstr "Nema radno drvo za uklonjanje"
233
#: bzrlib/builtins.py:588
218
#: breezy/builtins.py:588
234
219
msgid "You cannot remove the working tree of a remote path"
237
#: bzrlib/builtins.py:597
222
#: breezy/builtins.py:597
238
223
msgid "You cannot remove the working tree from a lightweight checkout"
241
#: bzrlib/builtins.py:637
226
#: breezy/builtins.py:637
243
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
228
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
244
229
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
#: bzrlib/builtins.py:648
232
#: breezy/builtins.py:648
249
234
", the header appears corrupt, try passing -r -1 to set the state to the last "
253
#: bzrlib/builtins.py:652
238
#: breezy/builtins.py:652
239
#, python-brace-format
254
240
msgid "failed to reset the tree state{0}"
257
#: bzrlib/builtins.py:656
243
#: breezy/builtins.py:656
258
244
msgid "Show current revision number."
259
msgstr "Prikaži broj vaše trenutne revizije."
261
#: bzrlib/builtins.py:658
247
#: breezy/builtins.py:658
262
248
msgid "This is equal to the number of revisions on this branch."
265
#: bzrlib/builtins.py:671
251
#: breezy/builtins.py:671
266
252
msgid "--tree and --revision can not be used together"
269
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
270
msgid "Tags can only be placed on a single revision, not on a range"
255
#: breezy/builtins.py:688
256
msgid "Revision numbers only make sense for single revisions, not ranges"
273
#: bzrlib/builtins.py:712
259
# help of 'tree' option of 'revno' command
260
#: breezy/builtins.py:712
274
261
msgid "Show revno of working tree."
277
#: bzrlib/builtins.py:760
264
#: breezy/builtins.py:760
278
265
msgid "Add specified files or directories."
279
msgstr "Dodaj specifirane datoteke ili mape."
281
#: bzrlib/builtins.py:762
268
#: breezy/builtins.py:762
283
270
"In non-recursive mode, all the named items are added, regardless\n"
284
271
"of whether they were previously ignored. A warning is given if\n"
285
272
"any of the named files are already versioned."
288
#: bzrlib/builtins.py:766
275
#: breezy/builtins.py:766
290
277
"In recursive mode (the default), files are treated the same way\n"
291
278
"but the behaviour for directories is different. Directories that\n"
570
567
"value will only be saved if the remote location can be accessed."
573
#: bzrlib/builtins.py:1285
570
#: breezy/builtins.py:1284
575
572
"The --verbose option will display the revisions pushed using the log_format\n"
576
573
"configuration option. You can use a different format by overriding it with\n"
577
574
"-Olog_format=<other_format>."
580
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
577
# help of 'directory' option of 'dpush' command
578
# help of 'directory' option of 'push' command
579
#: breezy/builtins.py:1295 breezy/foreign.py:272
582
581
"Branch to push from, rather than the one containing the working directory."
585
#: bzrlib/builtins.py:1299
584
# help of 'use-existing-dir' option of 'push' command
585
#: breezy/builtins.py:1298
587
587
"By default push will fail if the target directory exists, but does not "
588
588
"already have a control directory. This flag will allow push to proceed."
591
#: bzrlib/builtins.py:1304
591
# help of 'stacked' option of 'push' command
592
#: breezy/builtins.py:1303
593
594
"Create a stacked branch that references the public location of the parent "
597
#: bzrlib/builtins.py:1307
598
# help of 'stacked-on' option of 'push' command
599
#: breezy/builtins.py:1306
599
601
"Create a stacked branch that refers to another branch for the commit "
600
602
"history. Only the work not present in the referenced branch is included in "
601
603
"the branch created."
604
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
606
# help of 'strict' option of 'dpush' command
607
# help of 'strict' option of 'push' command
608
#: breezy/builtins.py:1311 breezy/foreign.py:279
606
610
"Refuse to push if there are uncommitted changes in the working tree, --no-"
607
611
"strict disables the check."
610
#: bzrlib/builtins.py:1315
614
# help of 'no-tree' option of 'push' command
615
#: breezy/builtins.py:1314
611
616
msgid "Don't populate the working tree, even for protocols that support it."
614
#: bzrlib/builtins.py:1318
619
# help of 'overwrite-tags' option of 'pull' command
620
# help of 'overwrite-tags' option of 'push' command
621
#: breezy/builtins.py:1317
615
622
msgid "Overwrite tags only."
618
#: bzrlib/builtins.py:1369
625
#: breezy/builtins.py:1368
619
626
msgid "Could not determine branch to refer to."
622
#: bzrlib/builtins.py:1378
629
#: breezy/builtins.py:1377
625
632
"No push location known or specified. To push to the parent branch (at %s), "
626
"use 'bzr push :parent'."
633
"use 'brz push :parent'."
629
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
636
#: breezy/builtins.py:1383 breezy/foreign.py:306
630
637
msgid "No push location known or specified."
633
#: bzrlib/builtins.py:1388
640
#: breezy/builtins.py:1387
635
642
msgid "Using saved push location: %s"
638
#: bzrlib/builtins.py:1398
645
#: breezy/builtins.py:1397
639
646
msgid "Create a new branch that is a copy of an existing branch."
642
#: bzrlib/builtins.py:1400
649
#: breezy/builtins.py:1399
644
651
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
645
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
652
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
647
654
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
648
655
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
649
656
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
650
657
"create ./foo-bar."
653
#: bzrlib/builtins.py:1407
660
#: breezy/builtins.py:1406
655
662
"To retrieve the branch as of a particular revision, supply the --revision\n"
656
663
"parameter, as in \"branch foo/bar -r 5\"."
659
#: bzrlib/builtins.py:1410
666
#: breezy/builtins.py:1409
660
667
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
663
#: bzrlib/builtins.py:1420
670
# help of 'no-tree' option of 'branch' command
671
#: breezy/builtins.py:1419
664
672
msgid "Create a branch without a working-tree."
667
#: bzrlib/builtins.py:1422
675
# help of 'switch' option of 'branch' command
676
#: breezy/builtins.py:1421
668
677
msgid "Switch the checkout in the current directory to the new branch."
671
#: bzrlib/builtins.py:1425
680
# help of 'stacked' option of 'branch' command
681
#: breezy/builtins.py:1424
673
683
"Create a stacked branch referring to the source branch. The new branch will "
674
684
"depend on the availability of the source branch for all operations."
677
#: bzrlib/builtins.py:1429
687
# help of 'standalone' option of 'branch' command
688
#: breezy/builtins.py:1428
678
689
msgid "Do not use a shared repository, even if available."
681
#: bzrlib/builtins.py:1431
692
# help of 'use-existing-dir' option of 'branch' command
693
#: breezy/builtins.py:1430
683
695
"By default branch will fail if the target directory exists, but does not "
684
696
"already have a control directory. This flag will allow branch to proceed."
687
#: bzrlib/builtins.py:1436
699
# help of 'bind' option of 'branch' command
700
#: breezy/builtins.py:1435
688
701
msgid "Bind new branch to from location."
691
#: bzrlib/builtins.py:1483
704
#: breezy/builtins.py:1482
693
706
msgid "Target directory \"%s\" already exists."
696
#: bzrlib/builtins.py:1495
709
#: breezy/builtins.py:1494
698
711
msgid "Parent of \"%s\" does not exist."
701
#: bzrlib/builtins.py:1514
714
#: breezy/builtins.py:1513
715
#, python-brace-format
702
716
msgid "The branch {0} has no revision {1}."
705
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
719
#: breezy/builtins.py:1528 breezy/push.py:53
707
721
msgid "Created new stacked branch referring to %s."
710
#: bzrlib/builtins.py:1533
724
#: breezy/builtins.py:1532
712
726
msgid "Branched %d revision."
713
727
msgid_plural "Branched %d revisions."
717
#: bzrlib/builtins.py:1538
731
#: breezy/builtins.py:1537
719
733
msgid "New branch bound to %s"
722
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
736
#: breezy/builtins.py:1542 breezy/builtins.py:6283
724
738
msgid "Switched to branch: %s"
727
#: bzrlib/builtins.py:1548
741
#: breezy/builtins.py:1547
728
742
msgid "List the branches available at the current location."
731
#: bzrlib/builtins.py:1550
745
#: breezy/builtins.py:1549
733
747
"This command will print the names of all the branches at the current\n"
737
#: bzrlib/builtins.py:1557
751
# help of 'recursive' option of 'branches' command
752
#: breezy/builtins.py:1556
739
754
"Recursively scan for branches rather than just looking in the specified "
743
#: bzrlib/builtins.py:1586
758
#: breezy/builtins.py:1585
744
759
msgid "(default)"
747
#: bzrlib/builtins.py:1598
762
#: breezy/builtins.py:1597
748
763
msgid "Create a new checkout of an existing branch."
751
#: bzrlib/builtins.py:1600
766
#: breezy/builtins.py:1599
753
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
791
#: bzrlib/builtins.py:1629
807
# help of 'files-from' option of 'branch' command
808
# help of 'files-from' option of 'checkout' command
809
#: breezy/builtins.py:1628
792
810
msgid "Get file contents from this tree."
795
#: bzrlib/builtins.py:1631
813
# help of 'hardlink' option of 'branch' command
814
# help of 'hardlink' option of 'checkout' command
815
#: breezy/builtins.py:1630
796
816
msgid "Hard-link working tree files where possible."
799
#: bzrlib/builtins.py:1672
819
#: breezy/builtins.py:1671
801
821
"Show list of renamed files.\n"
805
#: bzrlib/builtins.py:1700
825
#: breezy/builtins.py:1699
806
826
msgid "Update a working tree to a new revision."
809
#: bzrlib/builtins.py:1702
829
#: breezy/builtins.py:1701
811
831
"This will perform a merge of the destination revision (the tip of the\n"
812
832
"branch, or the specified revision) into the working tree, and then make\n"
813
833
"that revision the basis revision for the working tree. "
816
#: bzrlib/builtins.py:1706
836
#: breezy/builtins.py:1705
818
838
"You can use this to visit an older revision, or to update a working tree\n"
819
839
"that is out of date from its branch."
822
#: bzrlib/builtins.py:1709
842
#: breezy/builtins.py:1708
824
844
"If there are any uncommitted changes in the tree, they will be carried\n"
825
845
"across and remain as uncommitted changes after the update. To discard\n"
826
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
846
"these changes, use 'brz revert'. The uncommitted changes may conflict\n"
827
847
"with the changes brought in by the change in basis revision."
830
#: bzrlib/builtins.py:1714
850
#: breezy/builtins.py:1713
832
"If the tree's branch is bound to a master branch, bzr will also update\n"
852
"If the tree's branch is bound to a master branch, brz will also update\n"
833
853
"the branch from the master."
836
#: bzrlib/builtins.py:1717
856
#: breezy/builtins.py:1716
838
858
"You cannot update just a single file or directory, because each Bazaar\n"
839
859
"working tree has just a single basis revision. If you want to restore a\n"
840
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
860
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
841
861
"update'. If you want to restore a file to its state in a previous\n"
842
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
862
"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n"
843
863
"out the old content of that file to a new location."
846
#: bzrlib/builtins.py:1724
866
#: breezy/builtins.py:1723
848
868
"The 'dir' argument, if given, must be the location of the root of a\n"
849
869
"working tree to update. By default, the working tree that contains the \n"
850
870
"current working directory is used."
853
#: bzrlib/builtins.py:1740
854
msgid "bzr update --revision takes exactly one revision"
857
#: bzrlib/builtins.py:1748
858
msgid "bzr update can only update a whole tree, not a file or subdirectory"
861
#: bzrlib/builtins.py:1779
873
#: breezy/builtins.py:1739
874
msgid "brz update --revision takes exactly one revision"
877
#: breezy/builtins.py:1747
878
msgid "brz update can only update a whole tree, not a file or subdirectory"
881
#: breezy/builtins.py:1778
882
#, python-brace-format
862
883
msgid "Tree is up to date at revision {0} of branch {1}"
865
#: bzrlib/builtins.py:1795
886
#: breezy/builtins.py:1794
868
889
"branch has no revision %s\n"
869
"bzr update --revision only works for a revision in the branch history"
890
"brz update --revision only works for a revision in the branch history"
872
#: bzrlib/builtins.py:1801
893
#: breezy/builtins.py:1800
894
#, python-brace-format
873
895
msgid "Updated to revision {0} of branch {1}"
876
#: bzrlib/builtins.py:1805
898
#: breezy/builtins.py:1804
878
"Your local commits will now show as pending merges with 'bzr status', and "
879
"can be committed with 'bzr commit'."
900
"Your local commits will now show as pending merges with 'brz status', and "
901
"can be committed with 'brz commit'."
882
#: bzrlib/builtins.py:1814
904
#: breezy/builtins.py:1813
883
905
msgid "Show information about a working tree, branch or repository."
886
#: bzrlib/builtins.py:1816
908
#: breezy/builtins.py:1815
888
910
"This command will show all known locations and formats associated to the\n"
889
911
"tree, branch or repository."
892
#: bzrlib/builtins.py:1819
914
#: breezy/builtins.py:1818
894
916
"In verbose mode, statistical information is included with each report.\n"
895
917
"To see extended statistic information, use a verbosity level of 2 or\n"
896
918
"higher by specifying the verbose option multiple times, e.g. -vv."
899
#: bzrlib/builtins.py:1823
921
#: breezy/builtins.py:1822
900
922
msgid "Branches and working trees will also report any missing revisions."
903
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
904
#: bzrlib/builtins.py:6466
925
#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
926
#: breezy/builtins.py:6469
905
927
msgid ":Examples:"
908
#: bzrlib/builtins.py:1827
930
#: breezy/builtins.py:1826
909
931
msgid " Display information on the format and related locations:"
912
#: bzrlib/builtins.py:1829
934
#: breezy/builtins.py:1828
916
#: bzrlib/builtins.py:1831
938
#: breezy/builtins.py:1830
918
940
" Display the above together with extended format information and\n"
919
941
" basic statistics (like the number of files in the working tree and\n"
920
942
" number of revisions in the branch and repository):"
923
#: bzrlib/builtins.py:1835
945
#: breezy/builtins.py:1834
927
#: bzrlib/builtins.py:1837
949
#: breezy/builtins.py:1836
928
950
msgid " Display the above together with number of committers to the branch:"
931
#: bzrlib/builtins.py:1839
932
msgid " bzr info -vv"
953
#: breezy/builtins.py:1838
954
msgid " brz info -vv"
935
#: bzrlib/builtins.py:1858
957
#: breezy/builtins.py:1857
936
958
msgid "Remove files or directories."
939
#: bzrlib/builtins.py:1860
961
#: breezy/builtins.py:1859
941
963
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
942
964
"delete them if they can easily be recovered using revert otherwise they\n"
945
967
"Bazaar but missing in your tree and stop tracking them for you."
948
#: bzrlib/builtins.py:1868
970
# help of 'new' option of 'remove' command
971
#: breezy/builtins.py:1867
949
972
msgid "Only remove files that have never been committed."
952
#: bzrlib/builtins.py:1870
975
# help of 'file-deletion-strategy' option of 'remove' command
976
#: breezy/builtins.py:1869
953
977
msgid "The file deletion mode to be used."
956
#: bzrlib/builtins.py:1871
980
# title of 'file-deletion-strategy' option of 'remove' command
981
#: breezy/builtins.py:1870
957
982
msgid "Deletion Strategy"
960
#: bzrlib/builtins.py:1872
985
# help of 'file-deletion-strategy=safe' option of 'remove' command
986
#: breezy/builtins.py:1871
961
987
msgid "Backup changed files (default)."
964
#: bzrlib/builtins.py:1873
965
msgid "Delete from bzr but leave the working copy."
990
# help of 'file-deletion-strategy=keep' option of 'remove' command
991
#: breezy/builtins.py:1872
992
msgid "Delete from brz but leave the working copy."
968
#: bzrlib/builtins.py:1874
995
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
996
#: breezy/builtins.py:1873
969
997
msgid "Don't backup changed files."
972
#: bzrlib/builtins.py:1875
974
"Delete all the specified files, even if they can not be recovered and even "
975
"if they are non-empty directories. (deprecated, use no-backup)"
978
#: bzrlib/builtins.py:1884
979
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
982
#: bzrlib/builtins.py:1901
1000
#: breezy/builtins.py:1894
983
1001
msgid "No matching files."
986
#: bzrlib/builtins.py:1962
987
msgid "Reconcile bzr metadata in a branch."
1004
#: breezy/builtins.py:1955
1005
msgid "Reconcile brz metadata in a branch."
990
#: bzrlib/builtins.py:1964
1008
#: breezy/builtins.py:1957
992
1010
"This can correct data mismatches that may have been caused by\n"
993
"previous ghost operations or bzr upgrades. You should only\n"
994
"need to run this command if 'bzr check' or a bzr developer\n"
1011
"previous ghost operations or brz upgrades. You should only\n"
1012
"need to run this command if 'brz check' or a brz developer\n"
995
1013
"advises you to run it."
998
#: bzrlib/builtins.py:1969
1016
#: breezy/builtins.py:1962
1000
1018
"If a second branch is provided, cross-branch reconciliation is\n"
1001
1019
"also attempted, which will check that data like the tree root\n"
1002
"id which was not present in very early bzr versions is represented\n"
1020
"id which was not present in very early brz versions is represented\n"
1003
1021
"correctly in both branches."
1006
#: bzrlib/builtins.py:1974
1024
#: breezy/builtins.py:1967
1008
1026
"At the same time it is run it may recompress data resulting in\n"
1009
1027
"a potential saving in disk space or performance gain."
1012
#: bzrlib/builtins.py:1977
1030
#: breezy/builtins.py:1970
1013
1031
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1016
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1034
# help of 'format=2a' option of 'init' command
1035
# help of 'format=default' option of 'init' command
1036
# help of 'format=2a' option of 'init-repository' command
1037
# help of 'format=default' option of 'init-repository' command
1038
# help of 'format=2a' option of 'upgrade' command
1039
# help of 'format=default' option of 'upgrade' command
1040
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1018
1042
"Format for the bzr 2.0 series.\n"
1019
1043
"Uses group-compress storage.\n"
1020
1044
"Provides rich roots which are a one-way transition.\n"
1023
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1047
# help of 'format=pack-0.92' option of 'init' command
1048
# help of 'format=pack-0.92' option of 'init-repository' command
1049
# help of 'format=pack-0.92' option of 'upgrade' command
1050
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1025
1052
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1026
1053
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1029
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1056
# help of 'format=development-colo' option of 'init' command
1057
# help of 'format=development-colo' option of 'init-repository' command
1058
# help of 'format=development-colo' option of 'upgrade' command
1059
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1030
1060
msgid "The 2a format with experimental support for colocated branches.\n"
1033
#: bzrlib/builtins.py:2045
1063
#: breezy/builtins.py:2038
1034
1064
msgid "Make a directory into a versioned branch."
1037
#: bzrlib/builtins.py:2047
1067
#: breezy/builtins.py:2040
1039
1069
"Use this to create an empty branch, or before importing an\n"
1040
1070
"existing project."
1043
#: bzrlib/builtins.py:2050
1073
#: breezy/builtins.py:2043
1045
1075
"If there is a repository in a parent directory of the location, then\n"
1046
1076
"the history of the branch will be stored in the repository. Otherwise\n"
1203
1240
" 0 - no change"
1206
#: bzrlib/builtins.py:2250
1243
#: breezy/builtins.py:2243
1209
1246
" Shows the difference in the working tree versus the last commit::"
1212
#: bzrlib/builtins.py:2253
1249
#: breezy/builtins.py:2246
1216
#: bzrlib/builtins.py:2255
1253
#: breezy/builtins.py:2248
1217
1254
msgid " Difference between the working tree and revision 1::"
1220
#: bzrlib/builtins.py:2257
1221
msgid " bzr diff -r1"
1257
#: breezy/builtins.py:2250
1258
msgid " brz diff -r1"
1224
#: bzrlib/builtins.py:2259
1261
#: breezy/builtins.py:2252
1225
1262
msgid " Difference between revision 3 and revision 1::"
1228
#: bzrlib/builtins.py:2261
1229
msgid " bzr diff -r1..3"
1265
#: breezy/builtins.py:2254
1266
msgid " brz diff -r1..3"
1232
#: bzrlib/builtins.py:2263
1269
#: breezy/builtins.py:2256
1233
1270
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1236
#: bzrlib/builtins.py:2265
1237
msgid " bzr diff -r1..3 xxx"
1273
#: breezy/builtins.py:2258
1274
msgid " brz diff -r1..3 xxx"
1240
#: bzrlib/builtins.py:2267
1277
#: breezy/builtins.py:2260
1241
1278
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1244
#: bzrlib/builtins.py:2269
1245
msgid " bzr diff -c2"
1281
#: breezy/builtins.py:2262
1282
msgid " brz diff -c2"
1248
#: bzrlib/builtins.py:2271
1285
#: breezy/builtins.py:2264
1250
1287
" To see the changes introduced by revision X::\n"
1255
#: bzrlib/builtins.py:2275
1292
#: breezy/builtins.py:2268
1257
1294
" Note that in the case of a merge, the -c option shows the changes\n"
1258
1295
" compared to the left hand parent. To see the changes against\n"
1259
1296
" another parent, use::"
1262
#: bzrlib/builtins.py:2279
1263
msgid " bzr diff -r<chosen_parent>..X"
1299
#: breezy/builtins.py:2272
1300
msgid " brz diff -r<chosen_parent>..X"
1266
#: bzrlib/builtins.py:2281
1303
#: breezy/builtins.py:2274
1268
1305
" The changes between the current revision and the previous revision\n"
1269
1306
" (equivalent to -c-1 and -r-2..-1)"
1272
#: bzrlib/builtins.py:2284
1273
msgid " bzr diff -r-2.."
1309
#: breezy/builtins.py:2277
1310
msgid " brz diff -r-2.."
1276
#: bzrlib/builtins.py:2286
1313
#: breezy/builtins.py:2279
1277
1314
msgid " Show just the differences for file NEWS::"
1280
#: bzrlib/builtins.py:2288
1281
msgid " bzr diff NEWS"
1317
#: breezy/builtins.py:2281
1318
msgid " brz diff NEWS"
1284
#: bzrlib/builtins.py:2290
1321
#: breezy/builtins.py:2283
1285
1322
msgid " Show the differences in working tree xxx for file NEWS::"
1288
#: bzrlib/builtins.py:2292
1289
msgid " bzr diff xxx/NEWS"
1325
#: breezy/builtins.py:2285
1326
msgid " brz diff xxx/NEWS"
1292
#: bzrlib/builtins.py:2294
1329
#: breezy/builtins.py:2287
1293
1330
msgid " Show the differences from branch xxx to this working tree:"
1296
#: bzrlib/builtins.py:2296
1297
msgid " bzr diff --old xxx"
1333
#: breezy/builtins.py:2289
1334
msgid " brz diff --old xxx"
1300
#: bzrlib/builtins.py:2298
1337
#: breezy/builtins.py:2291
1301
1338
msgid " Show the differences between two branches for file NEWS::"
1304
#: bzrlib/builtins.py:2300
1305
msgid " bzr diff --old xxx --new yyy NEWS"
1308
#: bzrlib/builtins.py:2302
1309
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1312
#: bzrlib/builtins.py:2304
1341
#: breezy/builtins.py:2293
1342
msgid " brz diff --old xxx --new yyy NEWS"
1345
#: breezy/builtins.py:2295
1346
msgid " Same as 'brz diff' but prefix paths with old/ and new/::"
1349
#: breezy/builtins.py:2297
1314
" bzr diff --prefix old/:new/\n"
1351
" brz diff --prefix old/:new/\n"
1316
1353
" Show the differences using a custom diff program with options::\n"
1318
" bzr diff --using /usr/bin/diff --diff-options -wu"
1355
" brz diff --using /usr/bin/diff --diff-options -wu"
1321
#: bzrlib/builtins.py:2314
1358
# help of 'diff-options' option of 'diff' command
1359
#: breezy/builtins.py:2307
1322
1360
msgid "Pass these options to the external diff program."
1325
#: bzrlib/builtins.py:2317
1363
# help of 'prefix' option of 'diff' command
1364
#: breezy/builtins.py:2310
1327
1366
"Set prefixes added to old and new filenames, as two values separated by a "
1328
1367
"colon. (eg \"old/:new/\")."
1331
#: bzrlib/builtins.py:2320
1370
# help of 'old' option of 'diff' command
1371
#: breezy/builtins.py:2313
1332
1372
msgid "Branch/tree to compare from."
1335
#: bzrlib/builtins.py:2324
1375
# help of 'new' option of 'diff' command
1376
#: breezy/builtins.py:2317
1336
1377
msgid "Branch/tree to compare to."
1339
#: bzrlib/builtins.py:2330
1380
# help of 'using' option of 'diff' command
1381
#: breezy/builtins.py:2323
1340
1382
msgid "Use this command to compare files."
1343
#: bzrlib/builtins.py:2335
1385
# help of 'format' option of 'diff' command
1386
#: breezy/builtins.py:2328
1344
1387
msgid "Diff format to use."
1347
#: bzrlib/builtins.py:2337
1390
# title of 'format' option of 'diff' command
1391
#: breezy/builtins.py:2330
1348
1392
msgid "Diff format"
1351
#: bzrlib/builtins.py:2359
1395
# help of 'context' option of 'diff' command
1396
#: breezy/builtins.py:2332
1397
msgid "How many lines of context to show."
1400
#: breezy/builtins.py:2357
1352
1401
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1355
#: bzrlib/builtins.py:2363
1356
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1404
#: breezy/builtins.py:2361
1405
msgid "brz diff --revision takes exactly one or two revision specifiers"
1359
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1360
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1408
#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1409
#: breezy/builtins.py:2784 breezy/builtins.py:4957
1410
#, python-brace-format
1361
1411
msgid "{0} and {1} are mutually exclusive"
1364
#: bzrlib/builtins.py:2388
1414
#: breezy/builtins.py:2386
1366
1416
"List files deleted in the working tree.\n"
1370
#: bzrlib/builtins.py:2465
1420
#: breezy/builtins.py:2463
1371
1421
msgid "Show the tree root directory."
1374
#: bzrlib/builtins.py:2467
1424
#: breezy/builtins.py:2465
1376
1426
"The root is the nearest enclosing directory with a .bzr control\n"
1380
#: bzrlib/builtins.py:2482
1430
#: breezy/builtins.py:2480
1381
1431
msgid "The limit argument must be an integer."
1384
#: bzrlib/builtins.py:2490
1434
#: breezy/builtins.py:2488
1385
1435
msgid "The levels argument must be an integer."
1388
#: bzrlib/builtins.py:2495
1438
#: breezy/builtins.py:2493
1389
1439
msgid "Show historical log for a branch or subset of a branch."
1392
#: bzrlib/builtins.py:2497
1442
#: breezy/builtins.py:2495
1394
"log is bzr's default tool for exploring the history of a branch.\n"
1444
"log is brz's default tool for exploring the history of a branch.\n"
1395
1445
"The branch to use is taken from the first parameter. If no parameters\n"
1396
1446
"are given, the branch containing the working directory is logged.\n"
1397
1447
"Here are some simple examples::"
1400
#: bzrlib/builtins.py:2502
1450
#: breezy/builtins.py:2500
1402
" bzr log log the current branch\n"
1403
" bzr log foo.py log a file in its branch\n"
1404
" bzr log http://server/branch log a branch on a server"
1452
" brz log log the current branch\n"
1453
" brz log foo.py log a file in its branch\n"
1454
" brz log http://server/branch log a branch on a server"
1407
#: bzrlib/builtins.py:2506
1457
#: breezy/builtins.py:2504
1409
1459
"The filtering, ordering and information shown for each revision can\n"
1410
1460
"be controlled as explained below. By default, all revisions are\n"
1650
1698
" trading disk space for faster speed."
1653
#: bzrlib/builtins.py:2653
1701
# help of 'forward' option of 'log' command
1702
#: breezy/builtins.py:2651
1654
1703
msgid "Show from oldest to newest."
1657
#: bzrlib/builtins.py:2656
1706
# help of 'verbose' option of 'log' command
1707
#: breezy/builtins.py:2654
1658
1708
msgid "Show files changed in each revision."
1661
#: bzrlib/builtins.py:2662
1711
# help of 'change' option of 'log' command
1712
#: breezy/builtins.py:2660
1662
1713
msgid "Show just the specified revision. See also \"help revisionspec\"."
1665
#: bzrlib/builtins.py:2666
1716
# help of 'authors' option of 'log' command
1717
#: breezy/builtins.py:2664
1666
1718
msgid "What names to list as authors - first, all or committer."
1669
#: bzrlib/builtins.py:2667
1721
# title of 'authors' option of 'log' command
1722
#: breezy/builtins.py:2665
1670
1723
msgid "Authors"
1673
#: bzrlib/builtins.py:2672
1726
# help of 'levels' option of 'log' command
1727
#: breezy/builtins.py:2670
1674
1728
msgid "Number of levels to display - 0 for all, 1 for flat."
1677
#: bzrlib/builtins.py:2682
1731
# help of 'limit' option of 'log' command
1732
#: breezy/builtins.py:2680
1678
1733
msgid "Limit the output to the first N revisions."
1681
#: bzrlib/builtins.py:2687
1736
# help of 'show-diff' option of 'log' command
1737
#: breezy/builtins.py:2685
1682
1738
msgid "Show changes made in each revision as a patch."
1685
#: bzrlib/builtins.py:2689
1741
# help of 'include-merged' option of 'log' command
1742
#: breezy/builtins.py:2687
1686
1743
msgid "Show merged revisions like --levels 0 does."
1689
#: bzrlib/builtins.py:2693
1746
# help of 'omit-merges' option of 'log' command
1747
#: breezy/builtins.py:2691
1690
1748
msgid "Do not report commits with more than one parent."
1693
#: bzrlib/builtins.py:2695
1751
# help of 'exclude-common-ancestry' option of 'log' command
1752
#: breezy/builtins.py:2693
1695
1754
"Display only the revisions that are not part of both ancestries (require -"
1699
#: bzrlib/builtins.py:2699
1758
# help of 'signatures' option of 'log' command
1759
#: breezy/builtins.py:2697
1700
1760
msgid "Show digital signature validity."
1703
#: bzrlib/builtins.py:2702
1763
# help of 'match' option of 'log' command
1764
#: breezy/builtins.py:2700
1704
1765
msgid "Show revisions whose properties match this expression."
1707
#: bzrlib/builtins.py:2706
1768
# help of 'match-message' option of 'log' command
1769
#: breezy/builtins.py:2704
1708
1770
msgid "Show revisions whose message matches this expression."
1711
#: bzrlib/builtins.py:2710
1773
# help of 'match-committer' option of 'log' command
1774
#: breezy/builtins.py:2708
1712
1775
msgid "Show revisions whose committer matches this expression."
1715
#: bzrlib/builtins.py:2714
1778
# help of 'match-author' option of 'log' command
1779
#: breezy/builtins.py:2712
1716
1780
msgid "Show revisions whose authors match this expression."
1719
#: bzrlib/builtins.py:2718
1783
# help of 'match-bugs' option of 'log' command
1784
#: breezy/builtins.py:2716
1720
1785
msgid "Show revisions whose bugs match this expression."
1723
#: bzrlib/builtins.py:2772
1788
#: breezy/builtins.py:2770
1724
1789
msgid "--exclude-common-ancestry requires -r with two revisions"
1727
#: bzrlib/builtins.py:2800
1792
#: breezy/builtins.py:2798
1728
1793
#, python-format
1729
1794
msgid "Path unknown at end or start of revision range: %s"
1732
#: bzrlib/builtins.py:2917
1734
msgid "bzr %s doesn't accept two revisions in different branches."
1737
#: bzrlib/builtins.py:2933
1739
msgid "bzr %s --revision takes one or two values."
1742
#: bzrlib/builtins.py:2978
1797
#: breezy/builtins.py:2915
1799
msgid "brz %s doesn't accept two revisions in different branches."
1802
#: breezy/builtins.py:2931
1804
msgid "brz %s --revision takes one or two values."
1807
#: breezy/builtins.py:2976
1744
1809
"List files in a tree.\n"
1748
#: bzrlib/builtins.py:2987
1813
# help of 'recursive' option of 'ls' command
1814
#: breezy/builtins.py:2985
1749
1815
msgid "Recurse into subdirectories."
1752
#: bzrlib/builtins.py:2989
1818
# help of 'from-root' option of 'ls' command
1819
#: breezy/builtins.py:2987
1753
1820
msgid "Print paths relative to the root of the branch."
1756
#: bzrlib/builtins.py:2991
1823
# help of 'unknown' option of 'ls' command
1824
#: breezy/builtins.py:2989
1757
1825
msgid "Print unknown files."
1760
#: bzrlib/builtins.py:2992
1828
# help of 'versioned' option of 'ls' command
1829
#: breezy/builtins.py:2990
1761
1830
msgid "Print versioned files."
1764
#: bzrlib/builtins.py:2995
1833
# help of 'ignored' option of 'ls' command
1834
#: breezy/builtins.py:2993
1765
1835
msgid "Print ignored files."
1768
#: bzrlib/builtins.py:2997
1838
# help of 'kind' option of 'ls' command
1839
#: breezy/builtins.py:2995
1769
1840
msgid "List entries of a particular kind: file, directory, symlink."
1772
#: bzrlib/builtins.py:3010
1843
#: breezy/builtins.py:3008
1773
1844
msgid "invalid kind specified"
1776
#: bzrlib/builtins.py:3013
1847
#: breezy/builtins.py:3011
1777
1848
msgid "Cannot set both --verbose and --null"
1780
#: bzrlib/builtins.py:3022
1851
#: breezy/builtins.py:3020
1781
1852
msgid "cannot specify both --from-root and PATH"
1784
#: bzrlib/builtins.py:3109
1855
#: breezy/builtins.py:3107
1785
1856
msgid "Ignore specified files or patterns."
1788
#: bzrlib/builtins.py:3111
1789
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1859
#: breezy/builtins.py:3109
1860
msgid "See ``brz help patterns`` for details on the syntax of patterns."
1792
#: bzrlib/builtins.py:3113
1863
#: breezy/builtins.py:3111
1794
1865
"If a .bzrignore file does not exist, the ignore command\n"
1795
1866
"will create one and add the specified files or patterns to the newly\n"
1836
1907
" the shell on Unix."
1839
#: bzrlib/builtins.py:3142
1910
#: breezy/builtins.py:3140
1841
1912
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1842
1913
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1845
#: bzrlib/builtins.py:3145
1916
#: breezy/builtins.py:3143
1848
1919
" Ignore the top level Makefile::"
1851
#: bzrlib/builtins.py:3148
1852
msgid " bzr ignore ./Makefile"
1922
#: breezy/builtins.py:3146
1923
msgid " brz ignore ./Makefile"
1855
#: bzrlib/builtins.py:3150
1926
#: breezy/builtins.py:3148
1856
1927
msgid " Ignore .class files in all directories...::"
1859
#: bzrlib/builtins.py:3152
1860
msgid " bzr ignore \"*.class\""
1930
#: breezy/builtins.py:3150
1931
msgid " brz ignore \"*.class\""
1863
#: bzrlib/builtins.py:3154
1934
#: breezy/builtins.py:3152
1864
1935
msgid " ...but do not ignore \"special.class\"::"
1867
#: bzrlib/builtins.py:3156
1868
msgid " bzr ignore \"!special.class\""
1938
#: breezy/builtins.py:3154
1939
msgid " brz ignore \"!special.class\""
1871
#: bzrlib/builtins.py:3158
1942
#: breezy/builtins.py:3156
1872
1943
msgid " Ignore files whose name begins with the \"#\" character::"
1875
#: bzrlib/builtins.py:3160
1876
msgid " bzr ignore \"RE:^#\""
1946
#: breezy/builtins.py:3158
1947
msgid " brz ignore \"RE:^#\""
1879
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1950
#: breezy/builtins.py:3160 breezy/builtins.py:3164
1880
1951
msgid " Ignore .o files under the lib directory::"
1883
#: bzrlib/builtins.py:3164
1884
msgid " bzr ignore \"lib/**/*.o\""
1887
#: bzrlib/builtins.py:3168
1888
msgid " bzr ignore \"RE:lib/.*\\.o\""
1891
#: bzrlib/builtins.py:3170
1954
#: breezy/builtins.py:3162
1955
msgid " brz ignore \"lib/**/*.o\""
1958
#: breezy/builtins.py:3166
1959
msgid " brz ignore \"RE:lib/.*\\.o\""
1962
#: breezy/builtins.py:3168
1892
1963
msgid " Ignore everything but the \"debian\" toplevel directory::"
1895
#: bzrlib/builtins.py:3172
1966
#: breezy/builtins.py:3170
1897
" bzr ignore \"RE:(?!debian/).*\"\n"
1968
" brz ignore \"RE:(?!debian/).*\"\n"
1899
1970
" Ignore everything except the \"local\" toplevel directory,\n"
1900
1971
" but always ignore autosave files ending in ~, even under local/::\n"
1902
" bzr ignore \"*\"\n"
1903
" bzr ignore \"!./local\"\n"
1904
" bzr ignore \"!!*~\""
1907
#: bzrlib/builtins.py:3186
1908
msgid "Display the default ignore rules that bzr uses."
1911
#: bzrlib/builtins.py:3198
1973
" brz ignore \"*\"\n"
1974
" brz ignore \"!./local\"\n"
1975
" brz ignore \"!!*~\""
1978
# help of 'default-rules' option of 'ignore' command
1979
#: breezy/builtins.py:3184
1980
msgid "Display the default ignore rules that brz uses."
1983
#: breezy/builtins.py:3196
1912
1984
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1915
#: bzrlib/builtins.py:3209
1987
#: breezy/builtins.py:3207
1916
1988
#, python-format
1917
1989
msgid "Invalid ignore pattern found. %s"
1918
1990
msgid_plural "Invalid ignore patterns found. %s"
1922
#: bzrlib/builtins.py:3218
1994
#: breezy/builtins.py:3216
1923
1995
msgid "NAME_PATTERN should not be an absolute path"
1926
#: bzrlib/builtins.py:3231
1998
#: breezy/builtins.py:3229
1927
1999
#, python-format
1929
2001
"Warning: the following files are version controlled and match your ignore "
1932
"These files will continue to be version controlled unless you 'bzr remove' "
2004
"These files will continue to be version controlled unless you 'brz remove' "
1936
#: bzrlib/builtins.py:3238
2008
#: breezy/builtins.py:3236
1937
2009
msgid "List ignored files and the patterns that matched them."
1940
#: bzrlib/builtins.py:3240
2012
#: breezy/builtins.py:3238
1942
2014
"List all the ignored files and the ignore pattern that caused the file to\n"
1946
#: bzrlib/builtins.py:3243
2018
#: breezy/builtins.py:3241
1947
2019
msgid "Alternatively, to list just the files::"
1950
#: bzrlib/builtins.py:3245
1951
msgid " bzr ls --ignored"
2022
#: breezy/builtins.py:3243
2023
msgid " brz ls --ignored"
1954
#: bzrlib/builtins.py:3279
2026
#: breezy/builtins.py:3277
1955
2027
#, python-format
1956
2028
msgid "not a valid revision-number: %r"
1959
#: bzrlib/builtins.py:3286
1961
"Export current or past revision to a destination directory or archive."
2031
#: breezy/builtins.py:3284
2032
msgid "Export current or past revision to a destination directory or archive."
1964
#: bzrlib/builtins.py:3288
2035
#: breezy/builtins.py:3286
1965
2036
msgid "If no revision is specified this exports the last committed revision."
1968
#: bzrlib/builtins.py:3290
2039
#: breezy/builtins.py:3288
1970
2041
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1971
2042
"given, try to find the format with the extension. If no extension\n"
1972
2043
"is found exports to a directory (equivalent to --format=dir)."
1975
#: bzrlib/builtins.py:3294
2046
#: breezy/builtins.py:3292
1977
2048
"If root is supplied, it will be used as the root directory inside\n"
1978
2049
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1979
2050
"to the exported filename. The root option has no effect for 'dir' format."
1982
#: bzrlib/builtins.py:3298
2053
#: breezy/builtins.py:3296
1984
2055
"If branch is omitted then the branch containing the current working\n"
1985
2056
"directory will be used."
1988
#: bzrlib/builtins.py:3301
1990
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2059
#: breezy/builtins.py:3299
2060
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1993
#: bzrlib/builtins.py:3303
2063
#: breezy/builtins.py:3301
1995
2065
" ================= =========================\n"
1996
2066
" Supported formats Autodetected by extension\n"
2130
#: bzrlib/builtins.py:3479
2205
#: breezy/builtins.py:3477
2131
2206
msgid ":Checks:"
2134
#: bzrlib/builtins.py:3481
2209
#: breezy/builtins.py:3479
2136
2211
" A common mistake is to forget to add a new file or directory before\n"
2137
2212
" running the commit command. The --strict option checks for unknown\n"
2138
2213
" files and aborts the commit if any are found. More advanced pre-commit\n"
2139
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2214
" checks can be implemented by defining hooks. See ``brz help hooks``\n"
2140
2215
" for details."
2143
#: bzrlib/builtins.py:3487
2218
#: breezy/builtins.py:3485
2144
2219
msgid ":Things to note:"
2147
#: bzrlib/builtins.py:3489
2222
#: breezy/builtins.py:3487
2149
2224
" If you accidentially commit the wrong changes or make a spelling\n"
2150
2225
" mistake in the commit message say, you can use the uncommit command\n"
2151
" to undo it. See ``bzr help uncommit`` for details."
2226
" to undo it. See ``brz help uncommit`` for details."
2154
#: bzrlib/builtins.py:3493
2229
#: breezy/builtins.py:3491
2156
2231
" Hooks can also be configured to run after a commit. This allows you\n"
2157
2232
" to trigger updates to external systems like bug trackers. The --fixes\n"
2158
2233
" option can be used to record the association between a revision and\n"
2159
" one or more bugs. See ``bzr help bugs`` for details."
2234
" one or more bugs. See ``brz help bugs`` for details."
2162
#: bzrlib/builtins.py:3503
2237
# help of 'exclude' option of 'commit' command
2238
#: breezy/builtins.py:3501
2163
2239
msgid "Do not consider changes made to a given path."
2166
#: bzrlib/builtins.py:3506
2242
# help of 'message' option of 'commit' command
2243
#: breezy/builtins.py:3504
2167
2244
msgid "Description of the new revision."
2170
#: bzrlib/builtins.py:3509
2247
# help of 'unchanged' option of 'commit' command
2248
#: breezy/builtins.py:3507
2171
2249
msgid "Commit even if nothing has changed."
2174
#: bzrlib/builtins.py:3513
2252
# help of 'file' option of 'commit' command
2253
#: breezy/builtins.py:3511
2175
2254
msgid "Take commit message from this file."
2178
#: bzrlib/builtins.py:3515
2257
# help of 'strict' option of 'commit' command
2258
#: breezy/builtins.py:3513
2179
2259
msgid "Refuse to commit if there are unknown files in the working tree."
2182
#: bzrlib/builtins.py:3518
2262
# help of 'commit-time' option of 'commit' command
2263
#: breezy/builtins.py:3516
2184
2265
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2185
2266
"08:00:00 +0100'."
2188
#: bzrlib/builtins.py:3521
2189
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2269
# help of 'fixes' option of 'commit' command
2270
#: breezy/builtins.py:3519
2271
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
2192
#: bzrlib/builtins.py:3524
2274
# help of 'author' option of 'commit' command
2275
#: breezy/builtins.py:3522
2193
2276
msgid "Set the author's name, if it's different from the committer."
2196
#: bzrlib/builtins.py:3527
2279
# help of 'local' option of 'commit' command
2280
#: breezy/builtins.py:3525
2198
2282
"Perform a local commit in a bound branch. Local commits are not pushed to "
2199
2283
"the master branch until a normal commit is performed."
2202
#: bzrlib/builtins.py:3533
2286
# help of 'show-diff' option of 'commit' command
2287
#: breezy/builtins.py:3531
2204
2289
"When no message is supplied, show the diff along with the status summary in "
2205
2290
"the message editor."
2208
#: bzrlib/builtins.py:3536
2293
# help of 'lossy' option of 'commit' command
2294
#: breezy/builtins.py:3534
2210
2296
"When committing to a foreign version control system do not push data that "
2211
2297
"can not be natively represented."
2214
#: bzrlib/builtins.py:3554
2300
#: breezy/builtins.py:3552
2215
2301
#, python-format
2217
2303
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2218
2304
"default bug tracker using the `bugtracker` option.\n"
2219
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2305
"See \"brz help bugs\" for more information on this feature. Commit refused."
2222
#: bzrlib/builtins.py:3563
2308
#: breezy/builtins.py:3561
2223
2309
#, python-format
2225
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2311
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
2226
2312
"for more information on this feature.\n"
2227
2313
"Commit refused."
2230
#: bzrlib/builtins.py:3572
2316
#: breezy/builtins.py:3570
2231
2317
#, python-format
2232
2318
msgid "Unrecognized bug %s. Commit refused."
2235
#: bzrlib/builtins.py:3575
2321
#: breezy/builtins.py:3573
2236
2322
#, python-format
2239
2325
"Commit refused."
2242
#: bzrlib/builtins.py:3599
2328
#: breezy/builtins.py:3597
2243
2329
msgid "Could not parse --commit-time: "
2246
#: bzrlib/builtins.py:3639
2332
#: breezy/builtins.py:3637
2247
2333
msgid "please specify either --message or --file"
2250
#: bzrlib/builtins.py:3668
2336
#: breezy/builtins.py:3666
2251
2337
msgid "please specify a commit message with either --message or --file"
2254
#: bzrlib/builtins.py:3671
2256
"Empty commit message specified. Please specify a commit message with either -"
2257
"-message or --file or leave a blank message with --message \"\"."
2260
#: bzrlib/builtins.py:3691
2262
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2263
"-unchanged to force an empty commit."
2266
#: bzrlib/builtins.py:3695
2268
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2340
#: breezy/builtins.py:3669
2342
"Empty commit message specified. Please specify a commit message with either "
2343
"--message or --file or leave a blank message with --message \"\"."
2346
#: breezy/builtins.py:3689
2348
"No changes to commit. Please 'brz add' the files you want to commit, or use "
2349
"--unchanged to force an empty commit."
2352
#: breezy/builtins.py:3693
2354
"Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz "
2269
2355
"resolve FILE\" to resolve."
2272
#: bzrlib/builtins.py:3699
2358
#: breezy/builtins.py:3697
2273
2359
msgid "Commit refused because there are unknown files in the working tree."
2276
#: bzrlib/builtins.py:3702
2362
#: breezy/builtins.py:3700
2279
2365
"To commit to master branch, run update and then commit.\n"
2280
2366
"You can also pass --local to commit to continue working disconnected."
2283
#: bzrlib/builtins.py:3710
2369
#: breezy/builtins.py:3708
2285
2371
"Validate working tree structure, branch consistency and repository history."
2288
#: bzrlib/builtins.py:3712
2374
#: breezy/builtins.py:3710
2290
2376
"This command checks various invariants about branch and repository storage\n"
2291
"to detect data corruption or bzr bugs."
2377
"to detect data corruption or brz bugs."
2294
#: bzrlib/builtins.py:3715
2380
#: breezy/builtins.py:3713
2296
2382
"The working tree and branch checks will only give output if a problem is\n"
2297
2383
"detected. The output fields of the repository check are:"
2300
#: bzrlib/builtins.py:3718
2386
#: breezy/builtins.py:3716
2303
2389
" This is just the number of revisions checked. It doesn't\n"
2304
2390
" indicate a problem."
2307
#: bzrlib/builtins.py:3722
2393
#: breezy/builtins.py:3720
2309
2395
"versionedfiles\n"
2310
2396
" This is just the number of versionedfiles checked. It\n"
2311
2397
" doesn't indicate a problem."
2314
#: bzrlib/builtins.py:3726
2400
#: breezy/builtins.py:3724
2316
2402
"unreferenced ancestors\n"
2317
2403
" Texts that are ancestors of other texts, but\n"
2423
#: bzrlib/builtins.py:3808
2512
#: breezy/builtins.py:3806
2425
2514
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2426
2515
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2429
#: bzrlib/builtins.py:3816
2430
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2518
# help of 'format' option of 'upgrade' command
2519
#: breezy/builtins.py:3814
2520
msgid "Upgrade to a specific format. See \"brz help formats\" for details."
2433
#: bzrlib/builtins.py:3820
2523
# title of 'format' option of 'init' command
2524
# title of 'format' option of 'upgrade' command
2525
#: breezy/builtins.py:3818
2434
2526
msgid "Branch format"
2437
#: bzrlib/builtins.py:3822
2529
# help of 'clean' option of 'upgrade' command
2530
#: breezy/builtins.py:3820
2438
2531
msgid "Remove the backup.bzr directory if successful."
2441
#: bzrlib/builtins.py:3824
2534
# help of 'dry-run' option of 'add' command
2535
# help of 'dry-run' option of 'upgrade' command
2536
#: breezy/builtins.py:3822
2442
2537
msgid "Show what would be done, but don't actually do anything."
2445
#: bzrlib/builtins.py:3839
2446
msgid "Show or set bzr user id."
2540
#: breezy/builtins.py:3837
2541
msgid "Show or set brz user id."
2449
#: bzrlib/builtins.py:3841
2544
#: breezy/builtins.py:3839
2452
2547
" Show the email of the current user::"
2455
#: bzrlib/builtins.py:3844
2456
msgid " bzr whoami --email"
2550
#: breezy/builtins.py:3842
2551
msgid " brz whoami --email"
2459
#: bzrlib/builtins.py:3846
2554
#: breezy/builtins.py:3844
2460
2555
msgid " Set the current user::"
2463
#: bzrlib/builtins.py:3848
2464
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2558
#: breezy/builtins.py:3846
2559
msgid " brz whoami \"Frank Chu <fchu@example.com>\""
2467
#: bzrlib/builtins.py:3852
2562
# help of 'email' option of 'whoami' command
2563
#: breezy/builtins.py:3850
2468
2564
msgid "Display email address only."
2471
#: bzrlib/builtins.py:3854
2567
# help of 'branch' option of 'whoami' command
2568
#: breezy/builtins.py:3852
2472
2569
msgid "Set identity for the current branch instead of globally."
2475
#: bzrlib/builtins.py:3880
2572
#: breezy/builtins.py:3878
2476
2573
msgid "--email can only be used to display existing identity"
2479
#: bzrlib/builtins.py:3904
2576
#: breezy/builtins.py:3902
2480
2577
msgid "Print or set the branch nickname."
2483
#: bzrlib/builtins.py:3906
2580
#: breezy/builtins.py:3904
2485
2582
"If unset, the colocated branch name is used for colocated branches, and\n"
2486
2583
"the branch directory name is used for other branches. To print the\n"
2487
2584
"current nickname, execute with no argument."
2490
#: bzrlib/builtins.py:3910
2587
#: breezy/builtins.py:3908
2492
2589
"Bound branches use the nickname of its master branch unless it is set\n"
2496
#: bzrlib/builtins.py:3930
2593
#: breezy/builtins.py:3928
2497
2594
msgid "Set/unset and display aliases."
2500
#: bzrlib/builtins.py:3932
2597
#: breezy/builtins.py:3930
2503
2600
" Show the current aliases::"
2506
#: bzrlib/builtins.py:3935
2603
#: breezy/builtins.py:3933
2510
#: bzrlib/builtins.py:3937
2607
#: breezy/builtins.py:3935
2511
2608
msgid " Show the alias specified for 'll'::"
2514
#: bzrlib/builtins.py:3939
2515
msgid " bzr alias ll"
2611
#: breezy/builtins.py:3937
2612
msgid " brz alias ll"
2518
#: bzrlib/builtins.py:3941
2615
#: breezy/builtins.py:3939
2519
2616
msgid " Set an alias for 'll'::"
2522
#: bzrlib/builtins.py:3943
2523
msgid " bzr alias ll=\"log --line -r-10..-1\""
2619
#: breezy/builtins.py:3941
2620
msgid " brz alias ll=\"log --line -r-10..-1\""
2526
#: bzrlib/builtins.py:3945
2623
#: breezy/builtins.py:3943
2527
2624
msgid " To remove an alias for 'll'::"
2530
#: bzrlib/builtins.py:3947
2531
msgid " bzr alias --remove ll"
2627
#: breezy/builtins.py:3945
2628
msgid " brz alias --remove ll"
2534
#: bzrlib/builtins.py:3952
2631
# help of 'remove' option of 'alias' command
2632
#: breezy/builtins.py:3950
2535
2633
msgid "Remove the alias."
2538
#: bzrlib/builtins.py:3970
2539
msgid "bzr alias --remove expects an alias to remove."
2542
#: bzrlib/builtins.py:4151
2544
"subunit not available. subunit needs to be installed to use --subunit."
2547
#: bzrlib/builtins.py:4168
2549
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2552
#: bzrlib/builtins.py:4215
2553
msgid "Show version of bzr."
2556
#: bzrlib/builtins.py:4219
2636
#: breezy/builtins.py:3968
2637
msgid "brz alias --remove expects an alias to remove."
2640
#: breezy/builtins.py:4149
2641
msgid "subunit not available. subunit needs to be installed to use --subunit."
2644
#: breezy/builtins.py:4166
2646
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
2649
#: breezy/builtins.py:4213
2650
msgid "Show version of brz."
2653
# help of 'short' option of 'version' command
2654
#: breezy/builtins.py:4217
2557
2655
msgid "Print just the version number."
2560
#: bzrlib/builtins.py:4238
2658
#: breezy/builtins.py:4236
2561
2659
msgid "It sure does!\n"
2564
#: bzrlib/builtins.py:4262
2662
#: breezy/builtins.py:4260
2565
2663
#, python-format
2566
2664
msgid "merge base is revision %s\n"
2569
#: bzrlib/builtins.py:4266
2667
#: breezy/builtins.py:4264
2570
2668
msgid "Perform a three-way merge."
2573
#: bzrlib/builtins.py:4268
2671
#: breezy/builtins.py:4266
2575
2673
"The source of the merge can be specified either in the form of a branch,\n"
2576
2674
"or in the form of a path to a file containing a merge directive generated\n"
2577
"with bzr send. If neither is specified, the default is the upstream branch\n"
2675
"with brz send. If neither is specified, the default is the upstream branch\n"
2578
2676
"or the branch most recently merged using --remember. The source of the\n"
2579
2677
"merge may also be specified in the form of a path to a file in another\n"
2580
2678
"branch: in this case, only the modifications to that file are merged into\n"
2581
2679
"the current working tree."
2584
#: bzrlib/builtins.py:4276
2682
#: breezy/builtins.py:4274
2586
"When merging from a branch, by default bzr will try to merge in all new\n"
2684
"When merging from a branch, by default brz will try to merge in all new\n"
2587
2685
"work from the other branch, automatically determining an appropriate base\n"
2588
2686
"revision. If this fails, you may need to give an explicit base."
2591
#: bzrlib/builtins.py:4280
2689
#: breezy/builtins.py:4278
2593
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2691
"To pick a different ending revision, pass \"--revision OTHER\". brz will\n"
2594
2692
"try to merge in all new work up to and including revision OTHER."
2597
#: bzrlib/builtins.py:4283
2695
#: breezy/builtins.py:4281
2599
2697
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2600
2698
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2646
2743
"merge revision which has more than two parents."
2649
#: bzrlib/builtins.py:4315
2746
#: breezy/builtins.py:4313
2651
2748
"If one would like to merge changes from the working tree of the other\n"
2652
2749
"branch without merging any committed revisions, the --uncommitted option\n"
2653
2750
"can be given."
2656
#: bzrlib/builtins.py:4319
2753
#: breezy/builtins.py:4317
2658
2755
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2659
2756
"you to apply each diff hunk and file change, similar to \"shelve\"."
2662
#: bzrlib/builtins.py:4322
2759
#: breezy/builtins.py:4320
2665
" To merge all new revisions from bzr.dev::"
2668
#: bzrlib/builtins.py:4325
2669
msgid " bzr merge ../bzr.dev"
2672
#: bzrlib/builtins.py:4327
2673
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2676
#: bzrlib/builtins.py:4329
2677
msgid " bzr merge -r 82 ../bzr.dev"
2680
#: bzrlib/builtins.py:4331
2762
" To merge all new revisions from brz.dev::"
2765
#: breezy/builtins.py:4323
2766
msgid " brz merge ../brz.dev"
2769
#: breezy/builtins.py:4325
2770
msgid " To merge changes up to and including revision 82 from brz.dev::"
2773
#: breezy/builtins.py:4327
2774
msgid " brz merge -r 82 ../brz.dev"
2777
#: breezy/builtins.py:4329
2681
2778
msgid " To merge the changes introduced by 82, without previous changes::"
2684
#: bzrlib/builtins.py:4333
2685
msgid " bzr merge -r 81..82 ../bzr.dev"
2781
#: breezy/builtins.py:4331
2782
msgid " brz merge -r 81..82 ../brz.dev"
2688
#: bzrlib/builtins.py:4335
2785
#: breezy/builtins.py:4333
2689
2786
msgid " To apply a merge directive contained in /tmp/merge::"
2692
#: bzrlib/builtins.py:4337
2693
msgid " bzr merge /tmp/merge"
2789
#: breezy/builtins.py:4335
2790
msgid " brz merge /tmp/merge"
2696
#: bzrlib/builtins.py:4339
2793
#: breezy/builtins.py:4337
2698
2795
" To create a merge revision with three parents from two branches\n"
2699
2796
" feature1a and feature1b:"
2702
#: bzrlib/builtins.py:4342
2799
#: breezy/builtins.py:4340
2704
" bzr merge ../feature1a\n"
2705
" bzr merge ../feature1b --force\n"
2706
" bzr commit -m 'revision with three parents'"
2801
" brz merge ../feature1a\n"
2802
" brz merge ../feature1b --force\n"
2803
" brz commit -m 'revision with three parents'"
2709
#: bzrlib/builtins.py:4354
2806
# help of 'force' option of 'merge' command
2807
#: breezy/builtins.py:4352
2710
2808
msgid "Merge even if the destination tree has uncommitted changes."
2713
#: bzrlib/builtins.py:4360
2811
# help of 'uncommitted' option of 'merge' command
2812
#: breezy/builtins.py:4358
2715
2814
"Apply uncommitted changes from a working copy, instead of branch changes."
2718
#: bzrlib/builtins.py:4362
2817
# help of 'pull' option of 'merge' command
2818
#: breezy/builtins.py:4360
2720
2820
"If the destination is already completely merged into the source, pull from "
2721
2821
"the source rather than merging. When this happens, you do not need to "
2722
2822
"commit the result."
2725
#: bzrlib/builtins.py:4367
2825
# help of 'directory' option of 'merge' command
2826
#: breezy/builtins.py:4365
2727
2828
"Branch to merge into, rather than the one containing the working directory."
2730
#: bzrlib/builtins.py:4369
2831
# help of 'preview' option of 'merge' command
2832
#: breezy/builtins.py:4367
2731
2833
msgid "Instead of merging, show a diff of the merge."
2734
#: bzrlib/builtins.py:4371
2836
# help of 'interactive' option of 'merge' command
2837
#: breezy/builtins.py:4369
2735
2838
msgid "Select changes interactively."
2738
#: bzrlib/builtins.py:4393
2841
#: breezy/builtins.py:4391
2740
"Merging into empty branches not currently supported, "
2741
"https://bugs.launchpad.net/bzr/+bug/308562"
2843
"Merging into empty branches not currently supported, https://bugs.launchpad."
2844
"net/brz/+bug/308562"
2744
#: bzrlib/builtins.py:4420
2847
#: breezy/builtins.py:4418
2745
2848
msgid "Cannot use --uncommitted with bundles or merge directives."
2748
#: bzrlib/builtins.py:4431
2851
#: breezy/builtins.py:4429
2749
2852
msgid "Cannot use --uncommitted and --revision at the same time."
2752
#: bzrlib/builtins.py:4451
2855
#: breezy/builtins.py:4449
2753
2856
msgid "merger: "
2756
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2859
#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
2757
2860
msgid "Nothing to do."
2760
#: bzrlib/builtins.py:4457
2863
#: breezy/builtins.py:4455
2761
2864
msgid "Cannot pull individual files"
2764
#: bzrlib/builtins.py:4465
2765
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2867
#: breezy/builtins.py:4463
2868
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
2768
#: bzrlib/builtins.py:4523
2871
#: breezy/builtins.py:4521
2769
2872
#, python-format
2770
2873
msgid "Show-base is not supported for this merge type. %s"
2773
#: bzrlib/builtins.py:4532
2876
#: breezy/builtins.py:4530
2774
2877
#, python-format
2775
2878
msgid "Conflict reduction is not supported for merge type %s."
2778
#: bzrlib/builtins.py:4536
2881
#: breezy/builtins.py:4534
2779
2882
msgid "Cannot do conflict reduction and show base."
2782
#: bzrlib/builtins.py:4647
2885
#: breezy/builtins.py:4645
2783
2886
msgid "No location specified or remembered"
2786
#: bzrlib/builtins.py:4649
2889
#: breezy/builtins.py:4647
2890
#, python-brace-format
2787
2891
msgid "{0} remembered {1} location {2}"
2790
#: bzrlib/builtins.py:4655
2894
#: breezy/builtins.py:4653
2791
2895
msgid "Redo a merge."
2794
#: bzrlib/builtins.py:4657
2898
#: breezy/builtins.py:4655
2796
2900
"Use this if you want to try a different merge technique while resolving\n"
2797
2901
"conflicts. Some merge techniques are better than others, and remerge\n"
2798
2902
"lets you try different ones on different files."
2801
#: bzrlib/builtins.py:4661
2905
#: breezy/builtins.py:4659
2803
2907
"The options for remerge have the same meaning and defaults as the ones for\n"
2804
2908
"merge. The difference is that remerge can (only) be run when there is a\n"
2805
2909
"pending merge, and it lets you specify particular files."
2808
#: bzrlib/builtins.py:4665
2912
#: breezy/builtins.py:4663
2811
2915
" Re-do the merge of all conflicted files, and show the base text in\n"
2812
2916
" conflict regions, in addition to the usual THIS and OTHER texts::"
2815
#: bzrlib/builtins.py:4669
2816
msgid " bzr remerge --show-base"
2919
#: breezy/builtins.py:4667
2920
msgid " brz remerge --show-base"
2819
#: bzrlib/builtins.py:4671
2923
#: breezy/builtins.py:4669
2821
2925
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2822
2926
" additional processing to reduce the size of conflict regions::"
2825
#: bzrlib/builtins.py:4674
2826
msgid " bzr remerge --merge-type weave --reprocess foobar"
2929
#: breezy/builtins.py:4672
2930
msgid " brz remerge --merge-type weave --reprocess foobar"
2829
#: bzrlib/builtins.py:4681
2933
# help of 'show-base' option of 'merge' command
2934
# help of 'show-base' option of 'pull' command
2935
# help of 'show-base' option of 'remerge' command
2936
# help of 'show-base' option of 'update' command
2937
#: breezy/builtins.py:4679
2830
2938
msgid "Show base revision text in conflicts."
2833
#: bzrlib/builtins.py:4693
2941
#: breezy/builtins.py:4691
2835
2943
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2839
#: bzrlib/builtins.py:4751
2947
#: breezy/builtins.py:4749
2841
2949
"Set files in the working tree back to the contents of a previous revision."
2844
#: bzrlib/builtins.py:4753
2952
#: breezy/builtins.py:4751
2846
2954
"Giving a list of files will revert only those files. Otherwise, all files\n"
2847
2955
"will be reverted. If the revision is not specified with '--revision', the\n"
2949
3060
" 0 - no missing revisions"
2952
#: bzrlib/builtins.py:4887
3063
#: breezy/builtins.py:4885
2954
3065
" Determine the missing revisions between this and the branch at the\n"
2955
3066
" remembered pull location::"
2958
#: bzrlib/builtins.py:4890
2959
msgid " bzr missing"
3069
#: breezy/builtins.py:4888
3070
msgid " brz missing"
2962
#: bzrlib/builtins.py:4892
3073
#: breezy/builtins.py:4890
2963
3074
msgid " Determine the missing revisions between this and another branch::"
2966
#: bzrlib/builtins.py:4894
2967
msgid " bzr missing http://server/branch"
3077
#: breezy/builtins.py:4892
3078
msgid " brz missing http://server/branch"
2970
#: bzrlib/builtins.py:4896
3081
#: breezy/builtins.py:4894
2972
3083
" Determine the missing revisions up to a specific revision on the other\n"
2976
#: bzrlib/builtins.py:4899
2977
msgid " bzr missing -r ..-10"
3087
#: breezy/builtins.py:4897
3088
msgid " brz missing -r ..-10"
2980
#: bzrlib/builtins.py:4901
3091
#: breezy/builtins.py:4899
2982
3093
" Determine the missing revisions up to a specific revision on this\n"
2986
#: bzrlib/builtins.py:4904
2987
msgid " bzr missing --my-revision ..-10"
3097
#: breezy/builtins.py:4902
3098
msgid " brz missing --my-revision ..-10"
2990
#: bzrlib/builtins.py:4911
3101
# help of 'reverse' option of 'missing' command
3102
#: breezy/builtins.py:4909
2991
3103
msgid "Reverse the order of revisions."
2994
#: bzrlib/builtins.py:4913
3106
# help of 'mine-only' option of 'missing' command
3107
#: breezy/builtins.py:4911
2995
3108
msgid "Display changes in the local branch only."
2998
#: bzrlib/builtins.py:4914
3111
# help of 'this' option of 'missing' command
3112
#: breezy/builtins.py:4912
2999
3113
msgid "Same as --mine-only."
3002
#: bzrlib/builtins.py:4916
3116
# help of 'theirs-only' option of 'missing' command
3117
#: breezy/builtins.py:4914
3003
3118
msgid "Display changes in the remote branch only."
3006
#: bzrlib/builtins.py:4917
3121
# help of 'other' option of 'missing' command
3122
#: breezy/builtins.py:4915
3007
3123
msgid "Same as --theirs-only."
3010
#: bzrlib/builtins.py:4922
3126
# help of 'revision' option of 'missing' command
3127
#: breezy/builtins.py:4920
3012
3129
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3016
#: bzrlib/builtins.py:4926
3133
# help of 'my-revision' option of 'missing' command
3134
#: breezy/builtins.py:4924
3018
3136
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3022
#: bzrlib/builtins.py:4929
3140
# help of 'include-merged' option of 'missing' command
3141
#: breezy/builtins.py:4927
3023
3142
msgid "Show all revisions in addition to the mainline ones."
3026
#: bzrlib/builtins.py:4983
3145
#: breezy/builtins.py:4981
3027
3146
msgid "No peer location known or specified."
3030
#: bzrlib/builtins.py:4987
3149
#: breezy/builtins.py:4985
3150
#, python-brace-format
3031
3151
msgid "Using saved parent location: {0}\n"
3034
#: bzrlib/builtins.py:5020
3154
#: breezy/builtins.py:5018
3035
3155
#, python-format
3036
3156
msgid "You have %d extra revision:\n"
3037
3157
msgid_plural "You have %d extra revisions:\n"
3041
#: bzrlib/builtins.py:5040
3161
#: breezy/builtins.py:5038
3042
3162
#, python-format
3043
3163
msgid "You are missing %d revision:\n"
3044
3164
msgid_plural "You are missing %d revisions:\n"
3048
#: bzrlib/builtins.py:5055
3168
#: breezy/builtins.py:5053
3049
3169
msgid "This branch has no new revisions.\n"
3052
#: bzrlib/builtins.py:5058
3172
#: breezy/builtins.py:5056
3053
3173
msgid "Other branch has no new revisions.\n"
3056
#: bzrlib/builtins.py:5063
3176
#: breezy/builtins.py:5061
3057
3177
msgid "Branches are up to date.\n"
3060
#: bzrlib/builtins.py:5074
3180
#: breezy/builtins.py:5072
3061
3181
msgid "Compress the data within a repository."
3064
#: bzrlib/builtins.py:5076
3184
#: breezy/builtins.py:5074
3066
3186
"This operation compresses the data within a bazaar repository. As\n"
3067
3187
"bazaar supports automatic packing of repository, this operation is\n"
3068
3188
"normally not required to be done manually."
3071
#: bzrlib/builtins.py:5080
3191
#: breezy/builtins.py:5078
3073
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3074
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3120
3241
"plugins using the Python programming language."
3123
#: bzrlib/builtins.py:5138
3244
#: breezy/builtins.py:5136
3124
3245
msgid "Show testament (signing-form) of a revision."
3127
#: bzrlib/builtins.py:5141
3248
# help of 'long' option of 'testament' command
3249
#: breezy/builtins.py:5139
3128
3250
msgid "Produce long-format testament."
3131
#: bzrlib/builtins.py:5143
3253
# help of 'strict' option of 'testament' command
3254
#: breezy/builtins.py:5141
3132
3255
msgid "Produce a strict-format testament."
3135
#: bzrlib/builtins.py:5169
3258
#: breezy/builtins.py:5168
3136
3259
msgid "Show the origin of each line in a file."
3139
#: bzrlib/builtins.py:5171
3262
#: breezy/builtins.py:5170
3141
3264
"This prints out the given file with an annotation on the left side\n"
3142
3265
"indicating which revision, author and date introduced the change."
3145
#: bzrlib/builtins.py:5174
3268
#: breezy/builtins.py:5173
3147
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3148
3271
"shown only at the top, unless the --all option is given."
3151
#: bzrlib/builtins.py:5182
3274
# help of 'all' option of 'annotate' command
3275
#: breezy/builtins.py:5181
3152
3276
msgid "Show annotations on all lines."
3155
#: bzrlib/builtins.py:5183
3279
# help of 'long' option of 'annotate' command
3280
#: breezy/builtins.py:5182
3156
3281
msgid "Show commit date in annotations."
3159
#: bzrlib/builtins.py:5270
3284
#: breezy/builtins.py:5269
3160
3285
msgid "Cannot sign a range of non-revision-history revisions"
3163
#: bzrlib/builtins.py:5282
3288
#: breezy/builtins.py:5281
3164
3289
msgid "Please supply either one revision, or a range."
3167
#: bzrlib/builtins.py:5286
3292
#: breezy/builtins.py:5285
3169
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3170
3295
"If no branch is supplied, rebind to the last bound location."
3173
#: bzrlib/builtins.py:5289
3298
#: breezy/builtins.py:5288
3175
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3176
3301
"before they will be applied to the local branch."
3179
#: bzrlib/builtins.py:5292
3304
#: breezy/builtins.py:5291
3181
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3182
3307
"locally, in which case binding will update the local nickname to be\n"
3183
3308
"that of the master."
3186
#: bzrlib/builtins.py:5307
3311
#: breezy/builtins.py:5306
3187
3312
msgid "No location supplied. This format does not remember old locations."
3190
#: bzrlib/builtins.py:5313
3315
#: breezy/builtins.py:5312
3191
3316
msgid "Branch is already bound"
3194
#: bzrlib/builtins.py:5316
3319
#: breezy/builtins.py:5315
3195
3320
msgid "No location supplied and no previous location known"
3198
#: bzrlib/builtins.py:5322
3323
#: breezy/builtins.py:5321
3199
3324
msgid "These branches have diverged. Try merging, and then bind again."
3202
#: bzrlib/builtins.py:5329
3327
#: breezy/builtins.py:5328
3203
3328
msgid "Convert the current checkout into a regular branch."
3206
#: bzrlib/builtins.py:5331
3331
#: breezy/builtins.py:5330
3208
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3209
3334
"commits will be local only."
3212
#: bzrlib/builtins.py:5342
3337
#: breezy/builtins.py:5341
3213
3338
msgid "Local branch is not bound"
3216
#: bzrlib/builtins.py:5346
3341
#: breezy/builtins.py:5345
3217
3342
msgid "Remove the last committed revision."
3220
#: bzrlib/builtins.py:5348
3345
#: breezy/builtins.py:5347
3222
3347
"--verbose will print out what is being removed.\n"
3223
3348
"--dry-run will go through all the motions, but not actually\n"
3224
3349
"remove anything."
3227
#: bzrlib/builtins.py:5352
3352
#: breezy/builtins.py:5351
3229
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3230
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3355
"specified revision. For example, \"brz uncommit -r 15\" will leave the\n"
3231
3356
"branch at revision 15."
3234
#: bzrlib/builtins.py:5356
3359
#: breezy/builtins.py:5355
3236
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3237
3362
"it may make is to restore any pending merges that were present before\n"
3241
#: bzrlib/builtins.py:5367
3366
# help of 'dry-run' option of 'uncommit' command
3367
#: breezy/builtins.py:5366
3242
3368
msgid "Don't actually make changes."
3245
#: bzrlib/builtins.py:5368
3371
# help of 'force' option of 'uncommit' command
3372
#: breezy/builtins.py:5367
3246
3373
msgid "Say yes to all questions."
3249
#: bzrlib/builtins.py:5370
3376
# help of 'keep-tags' option of 'uncommit' command
3377
#: breezy/builtins.py:5369
3250
3378
msgid "Keep tags that point to removed revisions."
3253
#: bzrlib/builtins.py:5372
3381
# help of 'local' option of 'uncommit' command
3382
#: breezy/builtins.py:5371
3254
3383
msgid "Only remove the commits from the local branch when in a checkout."
3257
#: bzrlib/builtins.py:5421
3386
#: breezy/builtins.py:5420
3258
3387
msgid "No revisions to uncommit.\n"
3261
#: bzrlib/builtins.py:5436
3390
#: breezy/builtins.py:5435
3262
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3265
#: bzrlib/builtins.py:5439
3394
#: breezy/builtins.py:5438
3266
3395
msgid "The above revision(s) will be removed.\n"
3269
#: bzrlib/builtins.py:5443
3398
#: breezy/builtins.py:5442
3270
3399
msgid "Uncommit these revisions"
3273
#: bzrlib/builtins.py:5446
3402
#: breezy/builtins.py:5445
3274
3403
msgid "Canceled\n"
3277
#: bzrlib/builtins.py:5453
3406
#: breezy/builtins.py:5452
3278
3407
#, python-format
3280
3409
"You can restore the old tip by running:\n"
3281
" bzr pull . -r revid:%s\n"
3410
" brz pull . -r revid:%s\n"
3284
#: bzrlib/builtins.py:5458
3413
#: breezy/builtins.py:5457
3285
3414
msgid "Break a dead lock."
3288
#: bzrlib/builtins.py:5460
3417
#: breezy/builtins.py:5459
3290
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3294
#: bzrlib/builtins.py:5463
3423
#: breezy/builtins.py:5462
3296
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3297
3426
"holding the lock has been stopped."
3300
#: bzrlib/builtins.py:5466
3429
#: breezy/builtins.py:5465
3302
"You can get information on what locks are open via the 'bzr info\n"
3431
"You can get information on what locks are open via the 'brz info\n"
3303
3432
"[location]' command."
3306
#: bzrlib/builtins.py:5469
3435
#: breezy/builtins.py:5468
3310
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3311
" bzr break-lock --conf ~/.bazaar"
3439
" brz break-lock brz+ssh://example.com/brz/foo\n"
3440
" brz break-lock --conf ~/.bazaar"
3314
#: bzrlib/builtins.py:5478
3443
# help of 'config' option of 'break-lock' command
3444
#: breezy/builtins.py:5477
3315
3445
msgid "LOCATION is the directory where the config lock is."
3318
#: bzrlib/builtins.py:5480
3448
# help of 'force' option of 'break-lock' command
3449
#: breezy/builtins.py:5479
3319
3450
msgid "Do not ask for confirmation before breaking the lock."
3322
#: bzrlib/builtins.py:5515
3453
# help of 'protocol=bzr' option of 'serve' command
3454
#: breezy/builtins.py:5514
3323
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3326
#: bzrlib/builtins.py:5516
3327
msgid "Run the bzr server."
3458
#: breezy/builtins.py:5515
3459
msgid "Run the brz server."
3330
#: bzrlib/builtins.py:5522
3462
# help of 'inet' option of 'serve' command
3463
#: breezy/builtins.py:5521
3331
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3334
#: bzrlib/builtins.py:5523
3467
# title of 'protocol' option of 'serve' command
3468
#: breezy/builtins.py:5522
3335
3469
msgid "protocol"
3338
#: bzrlib/builtins.py:5524
3472
# help of 'protocol' option of 'serve' command
3473
#: breezy/builtins.py:5523
3339
3474
msgid "Protocol to serve."
3342
#: bzrlib/builtins.py:5528
3477
# help of 'listen' option of 'serve' command
3478
#: breezy/builtins.py:5527
3343
3479
msgid "Listen for connections on nominated address."
3346
#: bzrlib/builtins.py:5530
3482
# help of 'port' option of 'serve' command
3483
#: breezy/builtins.py:5529
3348
3485
"Listen for connections on nominated port. Passing 0 as the port number will "
3349
3486
"result in a dynamically allocated port. The default port depends on the "
3353
#: bzrlib/builtins.py:5535
3490
# help of 'directory' option of 'serve' command
3491
#: breezy/builtins.py:5534
3354
3492
msgid "Serve contents of this directory."
3357
#: bzrlib/builtins.py:5537
3495
# help of 'allow-writes' option of 'serve' command
3496
#: breezy/builtins.py:5536
3359
3498
"By default the server is a readonly server. Supplying --allow-writes "
3360
3499
"enables write access to the contents of the served directory and below. "
3361
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3500
"Note that ``brz serve`` does not perform authentication, so unless some form "
3362
3501
"of external authentication is arranged supplying this option leads to global "
3363
3502
"uncontrolled write access to your file system."
3366
#: bzrlib/builtins.py:5546
3505
# help of 'client-timeout' option of 'serve' command
3506
#: breezy/builtins.py:5545
3367
3507
msgid "Override the default idle client timeout (5min)."
3370
#: bzrlib/builtins.py:5564
3510
#: breezy/builtins.py:5563
3371
3511
msgid "Combine a tree into its containing tree."
3374
#: bzrlib/builtins.py:5566
3514
#: breezy/builtins.py:5565
3375
3515
msgid "This command requires the target tree to be in a rich-root format."
3378
#: bzrlib/builtins.py:5568
3518
#: breezy/builtins.py:5567
3380
3520
"The TREE argument should be an independent tree, inside another tree, but\n"
3381
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3382
"running \"bzr branch\" with the target inside a tree.)"
3521
"not part of it. (Such trees can be produced by \"brz split\", but also by\n"
3522
"running \"brz branch\" with the target inside a tree.)"
3385
#: bzrlib/builtins.py:5572
3525
#: breezy/builtins.py:5571
3387
3527
"The result is a combined tree, with the subtree no longer an independent\n"
3388
3528
"part. This is marked as a merge of the subtree into the containing tree,\n"
3389
3529
"and all history is preserved."
3392
#: bzrlib/builtins.py:5590
3532
#: breezy/builtins.py:5589
3393
3533
#, python-format
3395
3535
"Can't join trees because %s doesn't support rich root data.\n"
3396
"You can use bzr upgrade on the repository."
3536
"You can use brz upgrade on the repository."
3399
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3539
#: breezy/builtins.py:5599 breezy/builtins.py:5605
3540
#, python-brace-format
3400
3541
msgid "Cannot join {0}. {1}"
3403
#: bzrlib/builtins.py:5610
3544
#: breezy/builtins.py:5609
3404
3545
msgid "Split a subdirectory of a tree into a separate tree."
3407
#: bzrlib/builtins.py:5612
3548
#: breezy/builtins.py:5611
3409
3550
"This command will produce a target tree in a format that supports\n"
3410
3551
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3411
3552
"converted into earlier formats like 'dirstate-tags'."
3414
#: bzrlib/builtins.py:5616
3555
#: breezy/builtins.py:5615
3416
3557
"The TREE argument should be a subdirectory of a working tree. That\n"
3417
3558
"subdirectory will be converted into an independent tree, with its own\n"
3418
3559
"branch. Commits in the top-level tree will not apply to the new subtree."
3421
#: bzrlib/builtins.py:5696
3562
#: breezy/builtins.py:5695
3422
3563
msgid "No submit branch specified or known"
3425
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3566
#: breezy/builtins.py:5704 breezy/send.py:109
3426
3567
msgid "No public branch specified or known"
3429
#: bzrlib/builtins.py:5710
3430
msgid "bzr merge-directive takes at most two one revision identifiers"
3570
#: breezy/builtins.py:5709
3571
msgid "brz merge-directive takes at most two one revision identifiers"
3433
#: bzrlib/builtins.py:5719
3574
#: breezy/builtins.py:5718
3434
3575
msgid "No revisions to bundle."
3437
#: bzrlib/builtins.py:5738
3578
#: breezy/builtins.py:5737
3438
3579
msgid "Mail or create a merge-directive for submitting changes."
3441
#: bzrlib/builtins.py:5740
3582
#: breezy/builtins.py:5739
3442
3583
msgid "A merge directive provides many things needed for requesting merges:"
3445
#: bzrlib/builtins.py:5742
3586
#: breezy/builtins.py:5741
3446
3587
msgid "* A machine-readable description of the merge to perform"
3449
#: bzrlib/builtins.py:5744
3590
#: breezy/builtins.py:5743
3450
3591
msgid "* An optional patch that is a preview of the changes requested"
3453
#: bzrlib/builtins.py:5746
3594
#: breezy/builtins.py:5745
3455
3596
"* An optional bundle of revision data, so that the changes can be applied\n"
3456
3597
" directly from the merge directive, without retrieving data from a\n"
3460
#: bzrlib/builtins.py:5750
3601
#: breezy/builtins.py:5749
3462
"`bzr send` creates a compact data set that, when applied using bzr\n"
3603
"`brz send` creates a compact data set that, when applied using brz\n"
3463
3604
"merge, has the same effect as merging from the source branch. "
3466
#: bzrlib/builtins.py:5753
3607
#: breezy/builtins.py:5752
3468
3609
"By default the merge directive is self-contained and can be applied to any\n"
3469
3610
"branch containing submit_branch in its ancestory without needing access to\n"
3470
3611
"the source branch."
3473
#: bzrlib/builtins.py:5757
3614
#: breezy/builtins.py:5756
3475
3616
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3476
3617
"revisions, but only a structured request to merge from the\n"
3548
3689
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3551
#: bzrlib/builtins.py:5805
3692
#: breezy/builtins.py:5804
3553
"The merge directives created by bzr send may be applied using bzr merge or\n"
3554
"bzr pull by specifying a file containing a merge directive as the location."
3694
"The merge directives created by brz send may be applied using brz merge or\n"
3695
"brz pull by specifying a file containing a merge directive as the location."
3557
#: bzrlib/builtins.py:5808
3698
#: breezy/builtins.py:5807
3559
"bzr send makes extensive use of public locations to map local locations "
3700
"brz send makes extensive use of public locations to map local locations "
3561
"URLs that can be used by other people. See `bzr help configuration` to\n"
3562
"set them, and use `bzr info` to display them."
3702
"URLs that can be used by other people. See `brz help configuration` to\n"
3703
"set them, and use `brz info` to display them."
3565
#: bzrlib/builtins.py:5832
3706
# help of 'output' option of 'send' command
3707
#: breezy/builtins.py:5831
3566
3708
msgid "Write merge directive to this file or directory; use - for stdout."
3569
#: bzrlib/builtins.py:5836
3711
# help of 'strict' option of 'send' command
3712
#: breezy/builtins.py:5835
3571
3714
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3572
3715
"strict disables the check."
3575
#: bzrlib/builtins.py:5838
3718
# help of 'mail-to' option of 'send' command
3719
#: breezy/builtins.py:5837
3576
3720
msgid "Mail the request to this address."
3579
#: bzrlib/builtins.py:5842
3723
# help of 'body' option of 'send' command
3724
#: breezy/builtins.py:5841
3580
3725
msgid "Body for the email."
3583
#: bzrlib/builtins.py:5895
3728
# help of 'no-bundle' option of 'send' command
3729
#: breezy/builtins.py:5894
3584
3730
msgid "Do not include a bundle in the merge directive."
3587
#: bzrlib/builtins.py:5896
3733
# help of 'no-patch' option of 'send' command
3734
#: breezy/builtins.py:5895
3588
3735
msgid "Do not include a preview patch in the merge directive."
3591
#: bzrlib/builtins.py:5899
3738
# help of 'remember' option of 'send' command
3739
#: breezy/builtins.py:5898
3592
3740
msgid "Remember submit and public branch."
3595
#: bzrlib/builtins.py:5901
3743
# help of 'from' option of 'send' command
3744
#: breezy/builtins.py:5900
3597
3746
"Branch to generate the submission from, rather than the one containing the "
3598
3747
"working directory."
3601
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3750
# title of 'format' option of 'send' command
3751
# title of 'format' option of 'version-info' command
3752
#: breezy/builtins.py:5910 breezy/cmd_version_info.py:76
3605
#: bzrlib/builtins.py:5912
3756
# help of 'format' option of 'send' command
3757
#: breezy/builtins.py:5911
3606
3758
msgid "Use the specified output format."
3609
#: bzrlib/builtins.py:5934
3761
#: breezy/builtins.py:5933
3610
3762
msgid "Create, remove or modify a tag naming a revision."
3613
#: bzrlib/builtins.py:5936
3765
#: breezy/builtins.py:5935
3615
3767
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3616
3768
"(--revision) option can be given -rtag:X, where X is any previously\n"
3620
#: bzrlib/builtins.py:5940
3772
#: breezy/builtins.py:5939
3622
3774
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3623
3775
"along when you branch, push, pull or merge."
3626
#: bzrlib/builtins.py:5943
3778
#: breezy/builtins.py:5942
3628
3780
"It is an error to give a tag name that already exists unless you pass\n"
3629
3781
"--force, in which case the tag is moved to point to the new revision."
3632
#: bzrlib/builtins.py:5946
3784
#: breezy/builtins.py:5945
3634
3786
"To rename a tag (change the name but keep it on the same revsion), run "
3636
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3788
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
3639
#: bzrlib/builtins.py:5949
3791
#: breezy/builtins.py:5948
3641
3793
"If no tag name is specified it will be determined through the \n"
3642
3794
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3643
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3795
"upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
3647
#: bzrlib/builtins.py:5959
3799
# help of 'delete' option of 'tag' command
3800
#: breezy/builtins.py:5958
3648
3801
msgid "Delete this tag rather than placing it."
3651
#: bzrlib/builtins.py:5962
3804
# help of 'directory' option of 'tag' command
3805
#: breezy/builtins.py:5961
3652
3806
msgid "Branch in which to place the tag."
3655
#: bzrlib/builtins.py:5964
3809
# help of 'force' option of 'tag' command
3810
#: breezy/builtins.py:5963
3656
3811
msgid "Replace existing tags."
3659
#: bzrlib/builtins.py:5979
3814
#: breezy/builtins.py:5978
3660
3815
msgid "No tag specified to delete."
3663
#: bzrlib/builtins.py:5981
3818
#: breezy/builtins.py:5980
3664
3819
#, python-format
3665
3820
msgid "Deleted tag %s."
3668
#: bzrlib/builtins.py:5995
3823
#: breezy/builtins.py:5985
3824
msgid "Tags can only be placed on a single revision, not on a range"
3827
#: breezy/builtins.py:5994
3669
3828
msgid "Please specify a tag name."
3672
#: bzrlib/builtins.py:6003
3831
#: breezy/builtins.py:6002
3673
3832
#, python-format
3674
3833
msgid "Tag %s already exists for that revision."
3677
#: bzrlib/builtins.py:6007
3836
#: breezy/builtins.py:6006
3678
3837
#, python-format
3679
3838
msgid "Created tag %s."
3682
#: bzrlib/builtins.py:6009
3841
#: breezy/builtins.py:6008
3683
3842
#, python-format
3684
3843
msgid "Updated tag %s."
3687
#: bzrlib/builtins.py:6013
3846
#: breezy/builtins.py:6012
3688
3847
msgid "List tags."
3691
#: bzrlib/builtins.py:6015
3850
#: breezy/builtins.py:6014
3693
3852
"This command shows a table of tag names and the revisions they reference."
3696
#: bzrlib/builtins.py:6021
3855
# help of 'directory' option of 'tags' command
3856
#: breezy/builtins.py:6020
3697
3857
msgid "Branch whose tags should be displayed."
3700
#: bzrlib/builtins.py:6023
3860
# help of 'sort' option of 'tags' command
3861
#: breezy/builtins.py:6022
3701
3862
msgid "Sort tags by different criteria."
3704
#: bzrlib/builtins.py:6023
3865
# title of 'sort' option of 'tags' command
3866
#: breezy/builtins.py:6022
3705
3867
msgid "Sorting"
3708
#: bzrlib/builtins.py:6092
3709
msgid "Reconfigure the type of a bzr directory."
3870
#: breezy/builtins.py:6091
3871
msgid "Reconfigure the type of a brz directory."
3712
#: bzrlib/builtins.py:6094
3874
#: breezy/builtins.py:6093
3713
3875
msgid "A target configuration must be specified."
3716
#: bzrlib/builtins.py:6096
3878
#: breezy/builtins.py:6095
3718
3880
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3719
3881
"The order of preference is\n"
3724
3886
"If none of these is available, --bind-to must be specified."
3727
#: bzrlib/builtins.py:6110
3889
# title of 'tree_type' option of 'reconfigure' command
3890
#: breezy/builtins.py:6109
3728
3891
msgid "Tree type"
3731
#: bzrlib/builtins.py:6111
3894
# help of 'tree_type' option of 'reconfigure' command
3895
#: breezy/builtins.py:6110
3732
3896
msgid "The relation between branch and tree."
3735
#: bzrlib/builtins.py:6113
3899
# help of 'tree_type=branch' option of 'reconfigure' command
3900
#: breezy/builtins.py:6112
3736
3901
msgid "Reconfigure to be an unbound branch with no working tree."
3739
#: bzrlib/builtins.py:6114
3904
# help of 'tree_type=tree' option of 'reconfigure' command
3905
#: breezy/builtins.py:6113
3740
3906
msgid "Reconfigure to be an unbound branch with a working tree."
3743
#: bzrlib/builtins.py:6115
3909
# help of 'tree_type=checkout' option of 'reconfigure' command
3910
#: breezy/builtins.py:6114
3744
3911
msgid "Reconfigure to be a bound branch with a working tree."
3747
#: bzrlib/builtins.py:6116
3914
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3915
#: breezy/builtins.py:6115
3748
3916
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3751
#: bzrlib/builtins.py:6121
3919
# title of 'repository_type' option of 'reconfigure' command
3920
#: breezy/builtins.py:6120
3752
3921
msgid "Repository type"
3755
#: bzrlib/builtins.py:6122
3924
# help of 'repository_type' option of 'reconfigure' command
3925
#: breezy/builtins.py:6121
3756
3926
msgid "Location fo the repository."
3759
#: bzrlib/builtins.py:6124
3929
# help of 'repository_type=standalone' option of 'reconfigure' command
3930
#: breezy/builtins.py:6123
3761
3932
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3764
#: bzrlib/builtins.py:6126
3935
# help of 'repository_type=use-shared' option of 'reconfigure' command
3936
#: breezy/builtins.py:6125
3765
3937
msgid "Reconfigure to use a shared repository."
3768
#: bzrlib/builtins.py:6130
3940
# title of 'repository_trees' option of 'reconfigure' command
3941
#: breezy/builtins.py:6129
3769
3942
msgid "Trees in Repository"
3772
#: bzrlib/builtins.py:6131
3945
# help of 'repository_trees' option of 'reconfigure' command
3946
#: breezy/builtins.py:6130
3773
3947
msgid "Whether new branches in the repository have trees."
3776
#: bzrlib/builtins.py:6133
3778
"Reconfigure repository to create working trees on branches by default."
3950
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3951
#: breezy/builtins.py:6132
3952
msgid "Reconfigure repository to create working trees on branches by default."
3781
#: bzrlib/builtins.py:6135
3955
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3956
#: breezy/builtins.py:6134
3783
3958
"Reconfigure repository to not create working trees on branches by default."
3786
#: bzrlib/builtins.py:6138
3961
# help of 'bind-to' option of 'reconfigure' command
3962
#: breezy/builtins.py:6137
3787
3963
msgid "Branch to bind checkout to."
3790
#: bzrlib/builtins.py:6140
3966
# help of 'force' option of 'reconfigure' command
3967
#: breezy/builtins.py:6139
3791
3968
msgid "Perform reconfiguration even if local changes will be lost."
3794
#: bzrlib/builtins.py:6143
3971
# help of 'stacked-on' option of 'reconfigure' command
3972
#: breezy/builtins.py:6142
3795
3973
msgid "Reconfigure a branch to be stacked on another branch."
3798
#: bzrlib/builtins.py:6147
3976
# help of 'unstacked' option of 'reconfigure' command
3977
#: breezy/builtins.py:6146
3800
3979
"Reconfigure a branch to be unstacked. This may require copying substantial "
3801
3980
"data into it."
3804
#: bzrlib/builtins.py:6157
3983
#: breezy/builtins.py:6156
3805
3984
msgid "Can't use both --stacked-on and --unstacked"
3808
#: bzrlib/builtins.py:6171
3987
#: breezy/builtins.py:6170
3809
3988
msgid "No target configuration specified"
3812
#: bzrlib/builtins.py:6206
3991
#: breezy/builtins.py:6205
3813
3992
msgid "Set the branch of a checkout and update."
3816
#: bzrlib/builtins.py:6208
3995
#: breezy/builtins.py:6207
3818
3997
"For lightweight checkouts, this changes the branch being referenced.\n"
3819
3998
"For heavyweight checkouts, this checks that there are no local commits\n"
3892
4078
"want to switch back to your view after that."
3895
#: bzrlib/builtins.py:6305
4081
#: breezy/builtins.py:6308
3898
4084
" To define the current view::"
3901
#: bzrlib/builtins.py:6308
3902
msgid " bzr view file1 dir1 ..."
4087
#: breezy/builtins.py:6311
4088
msgid " brz view file1 dir1 ..."
3905
#: bzrlib/builtins.py:6310
4091
#: breezy/builtins.py:6313
3906
4092
msgid " To list the current view::"
3909
#: bzrlib/builtins.py:6312
4095
#: breezy/builtins.py:6315
3913
#: bzrlib/builtins.py:6314
4099
#: breezy/builtins.py:6317
3914
4100
msgid " To delete the current view::"
3917
#: bzrlib/builtins.py:6316
3918
msgid " bzr view --delete"
4103
#: breezy/builtins.py:6319
4104
msgid " brz view --delete"
3921
#: bzrlib/builtins.py:6318
4107
#: breezy/builtins.py:6321
3922
4108
msgid " To disable the current view without deleting it::"
3925
#: bzrlib/builtins.py:6320
3926
msgid " bzr view --switch off"
4111
#: breezy/builtins.py:6323
4112
msgid " brz view --switch off"
3929
#: bzrlib/builtins.py:6322
4115
#: breezy/builtins.py:6325
3930
4116
msgid " To define a named view and switch to it::"
3933
#: bzrlib/builtins.py:6324
3934
msgid " bzr view --name view-name file1 dir1 ..."
4119
#: breezy/builtins.py:6327
4120
msgid " brz view --name view-name file1 dir1 ..."
3937
#: bzrlib/builtins.py:6326
4123
#: breezy/builtins.py:6329
3938
4124
msgid " To list a named view::"
3941
#: bzrlib/builtins.py:6328
3942
msgid " bzr view --name view-name"
4127
#: breezy/builtins.py:6331
4128
msgid " brz view --name view-name"
3945
#: bzrlib/builtins.py:6330
4131
#: breezy/builtins.py:6333
3946
4132
msgid " To delete a named view::"
3949
#: bzrlib/builtins.py:6332
3950
msgid " bzr view --name view-name --delete"
4135
#: breezy/builtins.py:6335
4136
msgid " brz view --name view-name --delete"
3953
#: bzrlib/builtins.py:6334
4139
#: breezy/builtins.py:6337
3954
4140
msgid " To switch to a named view::"
3957
#: bzrlib/builtins.py:6336
3958
msgid " bzr view --switch view-name"
4143
#: breezy/builtins.py:6339
4144
msgid " brz view --switch view-name"
3961
#: bzrlib/builtins.py:6338
4147
#: breezy/builtins.py:6341
3962
4148
msgid " To list all views defined::"
3965
#: bzrlib/builtins.py:6340
3966
msgid " bzr view --all"
4151
#: breezy/builtins.py:6343
4152
msgid " brz view --all"
3969
#: bzrlib/builtins.py:6342
4155
#: breezy/builtins.py:6345
3970
4156
msgid " To delete all views::"
3973
#: bzrlib/builtins.py:6344
3974
msgid " bzr view --delete --all"
4159
#: breezy/builtins.py:6347
4160
msgid " brz view --delete --all"
3977
#: bzrlib/builtins.py:6351
4163
# help of 'all' option of 'view' command
4164
#: breezy/builtins.py:6354
3978
4165
msgid "Apply list or delete action to all views."
3981
#: bzrlib/builtins.py:6354
4168
# help of 'delete' option of 'view' command
4169
#: breezy/builtins.py:6357
3982
4170
msgid "Delete the view."
3985
#: bzrlib/builtins.py:6357
4173
# help of 'name' option of 'view' command
4174
#: breezy/builtins.py:6360
3986
4175
msgid "Name of the view to define, list or delete."
3989
#: bzrlib/builtins.py:6361
4178
# help of 'switch' option of 'view' command
4179
#: breezy/builtins.py:6364
3990
4180
msgid "Name of the view to switch to."
3993
#: bzrlib/builtins.py:6380
4183
#: breezy/builtins.py:6383
3994
4184
msgid "Both --delete and a file list specified"
3997
#: bzrlib/builtins.py:6383
4187
#: breezy/builtins.py:6386
3998
4188
msgid "Both --delete and --switch specified"
4001
#: bzrlib/builtins.py:6386
4191
#: breezy/builtins.py:6389
4002
4192
msgid "Deleted all views.\n"
4005
#: bzrlib/builtins.py:6388
4195
#: breezy/builtins.py:6391
4006
4196
msgid "No current view to delete"
4009
#: bzrlib/builtins.py:6391
4199
#: breezy/builtins.py:6394
4010
4200
#, python-format
4011
4201
msgid "Deleted '%s' view.\n"
4014
#: bzrlib/builtins.py:6395
4204
#: breezy/builtins.py:6398
4015
4205
msgid "Both --switch and a file list specified"
4018
#: bzrlib/builtins.py:6398
4208
#: breezy/builtins.py:6401
4019
4209
msgid "Both --switch and --all specified"
4022
#: bzrlib/builtins.py:6401
4212
#: breezy/builtins.py:6404
4023
4213
msgid "No current view to disable"
4026
#: bzrlib/builtins.py:6403
4216
#: breezy/builtins.py:6406
4027
4217
#, python-format
4028
4218
msgid "Disabled '%s' view.\n"
4031
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4221
#: breezy/builtins.py:6410 breezy/builtins.py:6432
4222
#, python-brace-format
4032
4223
msgid "Using '{0}' view: {1}\n"
4035
#: bzrlib/builtins.py:6410
4226
#: breezy/builtins.py:6413
4036
4227
msgid "Views defined:\n"
4039
#: bzrlib/builtins.py:6419
4230
#: breezy/builtins.py:6422
4040
4231
msgid "No views defined.\n"
4043
#: bzrlib/builtins.py:6426
4234
#: breezy/builtins.py:6429
4044
4235
msgid "Cannot change the 'off' pseudo view"
4047
#: bzrlib/builtins.py:6434
4238
#: breezy/builtins.py:6437
4048
4239
msgid "No current view.\n"
4051
#: bzrlib/builtins.py:6437
4242
#: breezy/builtins.py:6440
4243
#, python-brace-format
4052
4244
msgid "'{0}' view is: {1}\n"
4055
#: bzrlib/builtins.py:6457
4247
#: breezy/builtins.py:6460
4056
4248
msgid " <no hooks installed>\n"
4059
#: bzrlib/builtins.py:6461
4251
#: breezy/builtins.py:6464
4060
4252
msgid "Remove a branch."
4063
#: bzrlib/builtins.py:6463
4255
#: breezy/builtins.py:6466
4065
4257
"This will remove the branch from the specified location but \n"
4066
4258
"will keep any working tree or repository in place."
4069
#: bzrlib/builtins.py:6468
4261
#: breezy/builtins.py:6471
4070
4262
msgid " Remove the branch at repo/trunk::"
4073
#: bzrlib/builtins.py:6470
4265
#: breezy/builtins.py:6473
4074
4266
msgid " bzr remove-branch repo/trunk"
4077
#: bzrlib/builtins.py:6477
4269
# help of 'force' option of 'remove-branch' command
4270
#: breezy/builtins.py:6480
4078
4271
msgid "Remove branch even if it is the active branch."
4081
#: bzrlib/builtins.py:6491
4274
#: breezy/builtins.py:6494
4082
4275
msgid "Branch is active. Use --force to remove it."
4085
#: bzrlib/builtins.py:6495
4278
# help of 'writer=plain' option of 'shelve' command
4279
#: breezy/builtins.py:6498
4086
4280
msgid "Plaintext diff output."
4089
#: bzrlib/builtins.py:6496
4283
#: breezy/builtins.py:6499
4090
4284
msgid "Temporarily set aside some changes from the current tree."
4093
#: bzrlib/builtins.py:6498
4287
#: breezy/builtins.py:6501
4095
4289
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4096
4290
"ie. out of the way, until a later time when you can bring them back from\n"
4151
#: bzrlib/builtins.py:6537
4345
# help of 'all' option of 'shelve' command
4346
#: breezy/builtins.py:6540
4152
4347
msgid "Shelve all changes."
4155
#: bzrlib/builtins.py:6539
4350
# help of 'writer' option of 'shelve' command
4351
#: breezy/builtins.py:6542
4156
4352
msgid "Method to use for writing diffs."
4159
#: bzrlib/builtins.py:6539
4355
# title of 'writer' option of 'shelve' command
4356
#: breezy/builtins.py:6542
4163
#: bzrlib/builtins.py:6543
4360
# help of 'list' option of 'shelve' command
4361
#: breezy/builtins.py:6546
4164
4362
msgid "List shelved changes."
4167
#: bzrlib/builtins.py:6545
4365
# help of 'destroy' option of 'shelve' command
4366
#: breezy/builtins.py:6548
4168
4367
msgid "Destroy removed changes instead of shelving them."
4171
#: bzrlib/builtins.py:6574
4370
#: breezy/builtins.py:6577
4172
4371
msgid "No shelved changes."
4175
#: bzrlib/builtins.py:6585
4374
#: breezy/builtins.py:6588
4176
4375
msgid "Restore shelved changes."
4179
#: bzrlib/builtins.py:6587
4378
#: breezy/builtins.py:6590
4181
4380
"By default, the most recently shelved changes are restored. However if you\n"
4182
4381
"specify a shelf by id those changes will be restored instead. This works\n"
4183
4382
"best when the changes don't depend on each other."
4186
#: bzrlib/builtins.py:6596
4385
# help of 'action' option of 'unshelve' command
4386
#: breezy/builtins.py:6599
4187
4387
msgid "The action to perform."
4190
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4390
# title of 'action' option of 'resolve' command
4391
# title of 'action' option of 'unshelve' command
4392
#: breezy/builtins.py:6599 breezy/conflicts.py:694
4194
#: bzrlib/builtins.py:6598
4396
# help of 'action=apply' option of 'unshelve' command
4397
#: breezy/builtins.py:6601
4195
4398
msgid "Apply changes and remove from the shelf."
4198
#: bzrlib/builtins.py:6599
4401
# help of 'action=dry-run' option of 'unshelve' command
4402
#: breezy/builtins.py:6602
4199
4403
msgid "Show changes, but do not apply or remove them."
4202
#: bzrlib/builtins.py:6600
4406
# help of 'action=preview' option of 'unshelve' command
4407
#: breezy/builtins.py:6603
4204
4409
"Instead of unshelving the changes, show the diff that would result from "
4208
#: bzrlib/builtins.py:6602
4413
# help of 'action=delete-only' option of 'unshelve' command
4414
#: breezy/builtins.py:6605
4209
4415
msgid "Delete changes without applying them."
4212
#: bzrlib/builtins.py:6603
4418
# help of 'action=keep' option of 'unshelve' command
4419
#: breezy/builtins.py:6606
4213
4420
msgid "Apply changes but don't delete them."
4216
#: bzrlib/builtins.py:6618
4423
#: breezy/builtins.py:6621
4217
4424
msgid "Remove unwanted files from working tree."
4220
#: bzrlib/builtins.py:6620
4427
#: breezy/builtins.py:6623
4222
4429
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4223
4430
"files are never deleted."
4226
#: bzrlib/builtins.py:6623
4433
#: breezy/builtins.py:6626
4228
"Another class is 'detritus', which includes files emitted by bzr during\n"
4435
"Another class is 'detritus', which includes files emitted by brz during\n"
4229
4436
"normal operations and selftests. (The value of these files decreases with\n"
4233
#: bzrlib/builtins.py:6627
4440
#: breezy/builtins.py:6630
4235
4442
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4236
4443
"flags are respected, and may be combined."
4239
#: bzrlib/builtins.py:6630
4446
#: breezy/builtins.py:6633
4240
4447
msgid "To check what clean-tree will do, use --dry-run."
4243
#: bzrlib/builtins.py:6633
4450
# help of 'ignored' option of 'clean-tree' command
4451
#: breezy/builtins.py:6636
4244
4452
msgid "Delete all ignored files."
4247
#: bzrlib/builtins.py:6634
4455
# help of 'detritus' option of 'clean-tree' command
4456
#: breezy/builtins.py:6637
4249
4458
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4252
#: bzrlib/builtins.py:6637
4253
msgid "Delete files unknown to bzr (default)."
4461
# help of 'unknown' option of 'clean-tree' command
4462
#: breezy/builtins.py:6640
4463
msgid "Delete files unknown to brz (default)."
4256
#: bzrlib/builtins.py:6638
4466
# help of 'dry-run' option of 'clean-tree' command
4467
#: breezy/builtins.py:6641
4257
4468
msgid "Show files to delete instead of deleting them."
4260
#: bzrlib/builtins.py:6640
4471
# help of 'force' option of 'clean-tree' command
4472
#: breezy/builtins.py:6643
4261
4473
msgid "Do not prompt before deleting."
4264
#: bzrlib/bundle/__init__.py:59
4476
#: breezy/bundle/__init__.py:59
4265
4477
msgid "A directory cannot be a bundle"
4268
#: bzrlib/bundle/apply_bundle.py:40
4480
#: breezy/bundle/apply_bundle.py:40
4269
4481
msgid "Install revisions"
4272
#: bzrlib/bundle/commands.py:64
4484
#: breezy/bundle/commands.py:64
4273
4485
msgid "--verbose requires a merge directive"
4276
#: bzrlib/bundle/commands.py:67
4488
#: breezy/bundle/commands.py:67
4277
4489
msgid "Bundle format not supported"
4280
#: bzrlib/bundle/commands.py:77
4492
#: breezy/bundle/commands.py:77
4281
4493
msgid "Records\n"
4284
#: bzrlib/bundle/commands.py:81
4496
#: breezy/bundle/commands.py:81
4497
#, python-brace-format
4285
4498
msgid "{0}: {1} ({2} multiparent)\n"
4288
#: bzrlib/bundle/commands.py:83
4501
#: breezy/bundle/commands.py:83
4289
4502
#, python-format
4290
4503
msgid "unique files: %d\n"
4293
#: bzrlib/bundle/commands.py:92
4506
#: breezy/bundle/commands.py:92
4294
4507
msgid "Revisions\n"
4297
#: bzrlib/bundle/commands.py:93
4510
#: breezy/bundle/commands.py:93
4298
4511
#, python-format
4299
4512
msgid "nicks: %s\n"
4302
#: bzrlib/bundle/commands.py:95
4515
#: breezy/bundle/commands.py:95
4303
4516
#, python-format
4305
4518
"committers: \n"
4309
#: bzrlib/bundle/commands.py:103
4522
#: breezy/bundle/commands.py:103
4310
4523
msgid "Decoded contents\n"
4313
#: bzrlib/bundle/serializer/v4.py:327
4526
#: breezy/bundle/serializer/v4.py:327
4314
4527
#, python-format
4315
4528
msgid "Bundling %d revision."
4316
4529
msgid_plural "Bundling %d revisions."
4320
#: bzrlib/bzrdir.py:487
4533
#: breezy/bzrdir.py:487
4534
#, python-brace-format
4322
4536
"making backup of {0}\n"
4326
#: bzrlib/bzrdir.py:510
4540
#: breezy/bzrdir.py:510
4541
#, python-brace-format
4327
4542
msgid "renamed {0} to {1}"
4330
#: bzrlib/bzrdir.py:1639
4545
#: breezy/bzrdir.py:1639
4331
4546
#, python-format
4333
4548
"Source repository format does not support stacking, using format:\n"
4337
#: bzrlib/bzrdir.py:1659
4552
#: breezy/bzrdir.py:1659
4338
4553
#, python-format
4340
4555
"Source branch format does not support stacking, using format:\n"
4344
#: bzrlib/bzrdir.py:1805
4559
#: breezy/bzrdir.py:1805
4345
4560
msgid "starting repository conversion"
4348
#: bzrlib/bzrdir.py:2026
4563
#: breezy/bzrdir.py:2026
4564
#, python-brace-format
4349
4565
msgid "Using default stacking branch {0} at {1}"
4352
#: bzrlib/check.py:108
4568
#: breezy/check.py:108
4356
#: bzrlib/check.py:110
4572
#: breezy/check.py:110
4357
4573
msgid "checking revisions"
4360
#: bzrlib/check.py:112
4576
#: breezy/check.py:112
4361
4577
msgid "checking commit contents"
4364
#: bzrlib/check.py:114
4580
#: breezy/check.py:114
4365
4581
msgid "checking file graphs"
4368
#: bzrlib/check.py:118
4584
#: breezy/check.py:118
4369
4585
msgid "checking branches and trees"
4372
#: bzrlib/check.py:205
4588
#: breezy/check.py:205
4589
#, python-brace-format
4373
4590
msgid "checked repository {0} format {1}"
4376
#: bzrlib/check.py:208
4593
#: breezy/check.py:208
4377
4594
#, python-format
4378
4595
msgid "%6d revisions"
4381
#: bzrlib/check.py:209
4598
#: breezy/check.py:209
4382
4599
#, python-format
4383
4600
msgid "%6d file-ids"
4386
#: bzrlib/check.py:211
4603
#: breezy/check.py:211
4387
4604
#, python-format
4388
4605
msgid "%6d unreferenced text versions"
4391
#: bzrlib/check.py:215
4608
#: breezy/check.py:215
4609
#, python-brace-format
4392
4610
msgid "unreferenced version: {{{0}}} in {1}"
4395
#: bzrlib/check.py:218
4613
#: breezy/check.py:218
4396
4614
#, python-format
4397
4615
msgid "%6d revisions are missing inventory_sha1"
4400
#: bzrlib/check.py:221
4618
#: breezy/check.py:221
4401
4619
#, python-format
4402
4620
msgid "%6d revisions are mentioned but not present"
4405
#: bzrlib/check.py:224
4623
#: breezy/check.py:224
4406
4624
#, python-format
4407
4625
msgid "%6d ghost revisions"
4410
#: bzrlib/check.py:229
4628
#: breezy/check.py:229
4411
4629
#, python-format
4412
4630
msgid "%6d revisions missing parents in ancestry"
4415
#: bzrlib/check.py:233
4633
#: breezy/check.py:233
4416
4634
#, python-format
4417
4635
msgid " %s should be in the ancestry for:"
4420
#: bzrlib/check.py:237
4638
#: breezy/check.py:237
4421
4639
#, python-format
4422
4640
msgid "%6d inconsistent parents"
4425
#: bzrlib/check.py:241
4643
#: breezy/check.py:241
4426
4644
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4429
#: bzrlib/check.py:247
4647
#: breezy/check.py:247
4430
4648
#, python-format
4431
4649
msgid "%6d revisions have incorrect parents in the revision index"
4434
#: bzrlib/check.py:253
4652
#: breezy/check.py:253
4435
4653
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4438
#: bzrlib/check.py:267
4656
#: breezy/check.py:267
4657
#, python-brace-format
4439
4658
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4442
#: bzrlib/check.py:296
4661
#: breezy/check.py:296
4662
#, python-brace-format
4444
4664
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4448
#: bzrlib/check.py:354
4668
#: breezy/check.py:354
4449
4669
#, python-format
4450
4670
msgid "Checking branch at '%s'."
4453
#: bzrlib/check.py:374
4673
#: breezy/check.py:374
4454
4674
#, python-format
4455
4675
msgid "Checking working tree at '%s'."
4458
#: bzrlib/check.py:427 bzrlib/check.py:441
4678
#: breezy/check.py:427 breezy/check.py:441
4459
4679
msgid "No branch found at specified location."
4462
#: bzrlib/check.py:429 bzrlib/check.py:439
4682
#: breezy/check.py:429 breezy/check.py:439
4463
4683
msgid "No working tree found at specified location."
4466
#: bzrlib/check.py:432
4686
#: breezy/check.py:432
4467
4687
#, python-format
4468
4688
msgid "Checking repository at '%s'."
4471
#: bzrlib/check.py:443
4691
#: breezy/check.py:443
4472
4692
msgid "No repository found at specified location."
4475
#: bzrlib/clean_tree.py:63
4695
#: breezy/clean_tree.py:63
4476
4696
msgid "Nothing to delete."
4479
#: bzrlib/clean_tree.py:68
4699
#: breezy/clean_tree.py:68
4480
4700
msgid "Are you sure you wish to delete these"
4483
#: bzrlib/clean_tree.py:70
4703
#: breezy/clean_tree.py:70
4484
4704
msgid "Canceled"
4487
#: bzrlib/clean_tree.py:107
4707
#: breezy/clean_tree.py:107
4488
4708
#, python-format
4489
4709
msgid "unable to remove %s"
4492
#: bzrlib/clean_tree.py:111
4712
#: breezy/clean_tree.py:111
4493
4713
msgid "deleting paths:"
4496
#: bzrlib/clean_tree.py:125
4716
#: breezy/clean_tree.py:125
4717
#, python-brace-format
4497
4718
msgid "unable to remove \"{0}\": {1}."
4500
#: bzrlib/clean_tree.py:130
4721
#: breezy/clean_tree.py:130
4501
4722
msgid "No files deleted."
4504
#: bzrlib/cmd_version_info.py:47
4725
#: breezy/cmd_version_info.py:47
4726
#, python-brace-format
4505
4727
msgid "No known version info format {0}. Supported types are: {1}"
4508
#: bzrlib/cmd_version_info.py:52
4730
# help of 'format=custom' option of 'version-info' command
4731
#: breezy/cmd_version_info.py:52
4509
4732
msgid "Version info in Custom template-based format."
4512
#: bzrlib/cmd_version_info.py:52
4735
# help of 'format=python' option of 'version-info' command
4736
#: breezy/cmd_version_info.py:52
4513
4737
msgid "Version info in Python format."
4516
#: bzrlib/cmd_version_info.py:52
4740
# help of 'format=rio' option of 'version-info' command
4741
#: breezy/cmd_version_info.py:52
4517
4742
msgid "Version info in RIO (simple text) format (default)."
4520
#: bzrlib/cmd_version_info.py:53
4745
#: breezy/cmd_version_info.py:53
4521
4746
msgid "Show version information about this tree."
4524
#: bzrlib/cmd_version_info.py:55
4749
#: breezy/cmd_version_info.py:55
4526
4751
"You can use this command to add information about version into\n"
4527
4752
"source code of an application. The output can be in one of the\n"
4528
4753
"supported formats or in a custom format based on a template."
4531
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4532
#: en/help_topics/configuration.txt:722
4756
#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4757
#: en/help_topics/configuration.txt:738
4533
4758
msgid "For example::"
4536
#: bzrlib/cmd_version_info.py:61
4761
#: breezy/cmd_version_info.py:61
4538
4763
" bzr version-info --custom \\\n"
4539
4764
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4542
#: bzrlib/cmd_version_info.py:64
4767
#: breezy/cmd_version_info.py:64
4544
4769
"will produce a C header file with formatted string containing the\n"
4545
4770
"current revision number. Other supported variables in templates are:"
4548
#: bzrlib/cmd_version_info.py:67
4773
#: breezy/cmd_version_info.py:67
4550
4775
" * {date} - date of the last revision\n"
4551
4776
" * {build_date} - current date\n"
4626
#: bzrlib/commands.py:533
4857
#: breezy/commands.py:533
4627
4858
#, python-format
4629
4860
"See bzr help %s for more details and examples.\n"
4633
#: bzrlib/commands.py:538
4864
#: breezy/commands.py:538
4634
4865
msgid ":Aliases: "
4637
#: bzrlib/commands.py:542
4868
#: breezy/commands.py:542
4638
4869
#, python-format
4639
4870
msgid ":From: plugin \"%s\"\n"
4642
#: bzrlib/commands.py:554
4873
#: breezy/commands.py:554
4874
#, python-brace-format
4643
4875
msgid ":doc:`{0} <{1}-help>`"
4646
#: bzrlib/commands.py:558
4878
#: breezy/commands.py:558
4647
4879
#, python-format
4648
4880
msgid ":See also: %s"
4651
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4883
#: breezy/commands.py:826
4652
4884
msgid "Only ASCII permitted in option names"
4655
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4887
#: breezy/commands.py:851 breezy/commands.py:859
4656
4888
msgid "command {0!r} needs one or more {1}"
4659
#: bzrlib/commands.py:868
4891
#: breezy/commands.py:868
4660
4892
msgid "command {0!r} requires argument {1}"
4663
#: bzrlib/commands.py:875
4895
#: breezy/commands.py:875
4896
#, python-brace-format
4664
4897
msgid "extra argument to command {0}: {1}"
4667
#: bzrlib/commands.py:972
4900
#: breezy/commands.py:952
4668
4901
#, python-format
4669
4902
msgid "Profile data written to \"%s\"."
4672
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4905
#: breezy/commit.py:117 breezy/commit.py:740
4676
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4909
#: breezy/commit.py:117 breezy/commit.py:748
4677
4910
msgid "modified"
4680
#: bzrlib/commit.py:131
4913
#: breezy/commit.py:131
4681
4914
#, python-format
4682
4915
msgid "Committing%s"
4685
#: bzrlib/commit.py:134
4918
#: breezy/commit.py:134
4686
4919
#, python-format
4687
4920
msgid "Committed revision %d."
4690
#: bzrlib/commit.py:143
4923
#: breezy/commit.py:143
4691
4924
#, python-format
4692
4925
msgid "deleted %s"
4695
#: bzrlib/commit.py:146
4928
#: breezy/commit.py:146
4696
4929
#, python-format
4697
4930
msgid "missing %s"
4700
#: bzrlib/commit.py:511
4933
#: breezy/commit.py:511
4934
#, python-brace-format
4702
4936
"Conflicting tags in bound branch:\n"
4706
#: bzrlib/commit.py:742
4940
#: breezy/commit.py:742
4707
4941
msgid "renamed"
4710
#: bzrlib/commit.py:976
4944
#: breezy/commit.py:976
4711
4945
msgid "unchanged"
4714
#: bzrlib/commit.py:998
4948
#: breezy/commit.py:998
4949
#, python-brace-format
4715
4950
msgid "{0} [{1}] - Stage"
4718
#: bzrlib/commit.py:1001
4953
#: breezy/commit.py:1001
4719
4954
#, python-format
4720
4955
msgid "%s - Stage"
4723
#: bzrlib/commit_signature_commands.py:34
4958
#: breezy/commit_signature_commands.py:34
4724
4959
msgid "Sign all commits by a given committer."
4727
#: bzrlib/commit_signature_commands.py:36
4962
#: breezy/commit_signature_commands.py:36
4729
4964
"If location is not specified the local tree is used.\n"
4730
4965
"If committer is not specified the default committer is used."
4733
#: bzrlib/commit_signature_commands.py:39
4968
#: breezy/commit_signature_commands.py:39
4734
4969
msgid "This does not sign commits that already have signatures."
4737
#: bzrlib/commit_signature_commands.py:47
4972
# help of 'dry-run' option of 'sign-my-commits' command
4973
#: breezy/commit_signature_commands.py:47
4739
4975
"Don't actually sign anything, just print the revisions that would be signed."
4742
#: bzrlib/commit_signature_commands.py:98
4978
#: breezy/commit_signature_commands.py:98
4743
4979
#, python-format
4744
4980
msgid "Signed %d revision.\n"
4745
4981
msgid_plural "Signed %d revisions.\n"
4749
#: bzrlib/commit_signature_commands.py:103
4985
#: breezy/commit_signature_commands.py:103
4750
4986
msgid "Verify all commit signatures."
4753
#: bzrlib/commit_signature_commands.py:105
4755
"Verifies that all commits in the branch are signed by known GnuPG keys."
4989
#: breezy/commit_signature_commands.py:105
4990
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4758
#: bzrlib/commit_signature_commands.py:110
4993
# help of 'acceptable-keys' option of 'verify-signatures' command
4994
#: breezy/commit_signature_commands.py:110
4760
4996
"Comma separated list of GPG key patterns which are acceptable for "
4761
4997
"verification."
4764
#: bzrlib/commit_signature_commands.py:148
5000
#: breezy/commit_signature_commands.py:148
4765
5001
msgid "Cannot verify a range of non-revision-history revisions"
4768
#: bzrlib/commit_signature_commands.py:166
5004
#: breezy/commit_signature_commands.py:166
4769
5005
msgid "All commits signed with verifiable keys"
4772
#: bzrlib/config.py:436
5008
#: breezy/config.py:438
4773
5009
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4776
#: bzrlib/config.py:2452
5012
#: breezy/config.py:2465
5013
#, python-brace-format
4777
5014
msgid "{0} is not an SI unit."
4780
#: bzrlib/config.py:2971
5017
#: breezy/config.py:3013
5018
#, python-brace-format
4782
5020
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4783
5021
"will be saved."
4786
#: bzrlib/config.py:3116
5024
#: breezy/config.py:3158
4787
5025
#, python-format
4788
5026
msgid "Invalid '%s', should be of the form 'name=value'"
4791
#: bzrlib/config.py:4018
5029
#: breezy/config.py:4096
4792
5030
msgid "Display, set or remove a configuration option."
4795
#: bzrlib/config.py:4020
4796
msgid "Display the active value for a given option."
5033
#: breezy/config.py:4098
5034
msgid "Display the active value for option NAME."
4799
#: bzrlib/config.py:4022
5037
#: breezy/config.py:4100
4801
5039
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4802
"matching options are displayed mentioning their scope. The active value\n"
4803
"that bzr will take into account is the first one displayed for each option."
4806
#: bzrlib/config.py:4026
4807
msgid "If no NAME is given, --all .* is implied."
4810
#: bzrlib/config.py:4028
4812
"Setting a value is achieved by using name=value without spaces. The value\n"
5040
"matching options are displayed mentioning their scope and without resolving\n"
5041
"option references in the value). The active value that bzr will take into\n"
5042
"account is the first one displayed for each option."
5045
#: breezy/config.py:4105
5047
"If NAME is not given, --all .* is implied (all options are displayed for "
5052
#: breezy/config.py:4108
5054
"Setting a value is achieved by using NAME=value without spaces. The value\n"
4813
5055
"is set in the most relevant scope and can be checked by displaying the\n"
4814
5056
"option again."
4817
#: bzrlib/config.py:4040
5059
#: breezy/config.py:4112
5060
msgid "Removing a value is achieved by using --remove NAME."
5063
# help of 'scope' option of 'config' command
5064
#: breezy/config.py:4122
4818
5065
msgid "Reduce the scope to the specified configuration file."
4821
#: bzrlib/config.py:4044
5068
# help of 'all' option of 'config' command
5069
#: breezy/config.py:4126
4822
5070
msgid "Display all the defined values for the matching options."
4825
#: bzrlib/config.py:4046
5073
# help of 'remove' option of 'config' command
5074
#: breezy/config.py:4128
4826
5075
msgid "Remove the option from the configuration file."
4829
#: bzrlib/conflicts.py:50
5078
#: breezy/conflicts.py:50
4830
5079
msgid "List files with conflicts."
4833
#: bzrlib/conflicts.py:57
5082
#: breezy/conflicts.py:57
4835
5084
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4836
5085
"is supplied, the pathnames of files with text conflicts are listed,\n"
4837
5086
"instead. (This is useful for editing all files with text conflicts.)"
4840
#: bzrlib/conflicts.py:61
5089
#: breezy/conflicts.py:61
4841
5090
msgid "Use bzr resolve when you have fixed a problem."
4844
#: bzrlib/conflicts.py:66
5093
# help of 'text' option of 'conflicts' command
5094
#: breezy/conflicts.py:66
4845
5095
msgid "List paths of files with text conflicts."
4848
#: bzrlib/conflicts.py:85
5098
# help of 'action=done' option of 'resolve' command
5099
#: breezy/conflicts.py:85
4849
5100
msgid "Marks the conflict as resolved."
4852
#: bzrlib/conflicts.py:88
5103
# help of 'action=take-this' option of 'resolve' command
5104
#: breezy/conflicts.py:88
4853
5105
msgid "Resolve the conflict preserving the version in the working tree."
4856
#: bzrlib/conflicts.py:91
5108
# help of 'action=take-other' option of 'resolve' command
5109
#: breezy/conflicts.py:91
4857
5110
msgid "Resolve the conflict taking the merged version into account."
4860
#: bzrlib/conflicts.py:98
5113
# help of 'action' option of 'resolve' command
5114
#: breezy/conflicts.py:98
4861
5115
msgid "How to resolve the conflict."
4864
#: bzrlib/conflicts.py:104
5118
#: breezy/conflicts.py:104
4865
5119
msgid "Mark a conflict as resolved."
4868
#: bzrlib/conflicts.py:111
5122
#: breezy/conflicts.py:111
4870
5124
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4871
5125
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4873
5127
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4876
#: bzrlib/conflicts.py:119
5130
# help of 'all' option of 'resolve' command
5131
#: breezy/conflicts.py:119
4877
5132
msgid "Resolve all conflicts in this tree."
4880
#: bzrlib/conflicts.py:126
5135
#: breezy/conflicts.py:126
4881
5136
msgid "If --all is specified, no FILE may be provided"
4884
#: bzrlib/conflicts.py:151
5139
#: breezy/conflicts.py:151
4885
5140
#, python-format
4886
5141
msgid "%d conflict auto-resolved."
4887
5142
msgid_plural "%d conflicts auto-resolved."
4891
#: bzrlib/conflicts.py:154
5146
#: breezy/conflicts.py:154
4892
5147
msgid "Remaining conflicts:"
4895
#: bzrlib/conflicts.py:159
5150
#: breezy/conflicts.py:159
4896
5151
msgid "All conflicts resolved."
4899
#: bzrlib/conflicts.py:168
5154
#: breezy/conflicts.py:168
5155
#, python-brace-format
4900
5156
msgid "{0} conflict resolved, {1} remaining"
4901
5157
msgid_plural "{0} conflicts resolved, {1} remaining"
4905
#: bzrlib/controldir.py:712
5161
#: breezy/controldir.py:712
5162
#, python-brace-format
4906
5163
msgid "{0} is{1} redirected to {2}"
4909
#: bzrlib/diff.py:399
5166
#: breezy/diff.py:413
4910
5167
#, python-format
4911
5168
msgid "*** Ignoring files outside view. View is %s"
4914
#: bzrlib/errors.py:157
5171
#: breezy/errors.py:157
4915
5172
msgid "The tree builder is already building a tree."
4918
#: bzrlib/errors.py:178
5175
#: breezy/errors.py:178
4919
5176
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4922
#: bzrlib/errors.py:197
5179
#: breezy/errors.py:197
4924
5181
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4925
5182
"versions \"%(minimum)s\" to \"%(current)s\"."
4928
#: bzrlib/errors.py:209
5185
#: breezy/errors.py:209
4929
5186
msgid "The transport '%(transport)s' is only accessible within this process."
4932
#: bzrlib/errors.py:227
5189
#: breezy/errors.py:227
4933
5190
msgid "Invalid revision number %(revno)s"
4936
#: bzrlib/errors.py:236
5193
#: breezy/errors.py:236
4937
5194
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4940
#: bzrlib/errors.py:247
5197
#: breezy/errors.py:247
4941
5198
msgid "Reserved revision-id {%(revision_id)s}"
4944
#: bzrlib/errors.py:261
5201
#: breezy/errors.py:261
4945
5202
msgid "There is no public branch set for \"%(branch_url)s\"."
4948
#: bzrlib/errors.py:271
5205
#: breezy/errors.py:271
4950
5207
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4951
5208
"obtain a list of topics."
4954
#: bzrlib/errors.py:280
5211
#: breezy/errors.py:280
4955
5212
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4958
#: bzrlib/errors.py:290
5215
#: breezy/errors.py:290
4960
5217
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4963
#: bzrlib/errors.py:299
5220
#: breezy/errors.py:299
4964
5221
msgid "The branch '%(branch)s' is not stacked."
4967
#: bzrlib/errors.py:313
5224
#: breezy/errors.py:313
4968
5225
msgid "No WorkingTree exists for \"%(base)s\"."
4971
#: bzrlib/errors.py:322
5228
#: breezy/errors.py:322
4972
5229
msgid "Not currently building a tree."
4975
#: bzrlib/errors.py:327
5232
#: breezy/errors.py:327
4976
5233
msgid "%(url)s is not a local path."
4979
#: bzrlib/errors.py:355
5236
#: breezy/errors.py:355
4980
5237
msgid "%(not_locked)r is not write locked but needs to be."
4983
#: bzrlib/errors.py:363
5240
#: breezy/errors.py:363
4984
5241
msgid "Error in command line options"
4987
#: bzrlib/errors.py:368
5244
#: breezy/errors.py:368
4988
5245
msgid "%(value)s is not an index of type %(_type)s."
4991
#: bzrlib/errors.py:378
5248
#: breezy/errors.py:378
4992
5249
msgid "Error in data for index %(value)s."
4995
#: bzrlib/errors.py:387
5252
#: breezy/errors.py:387
4996
5253
msgid "The key '%(key)s' is already in index '%(index)s'."
4999
#: bzrlib/errors.py:397
5256
#: breezy/errors.py:397
5000
5257
msgid "The key '%(key)s' is not a valid key."
5003
#: bzrlib/errors.py:406
5260
#: breezy/errors.py:406
5004
5261
msgid "Could not parse options for index %(value)s."
5007
#: bzrlib/errors.py:415
5264
#: breezy/errors.py:415
5008
5265
msgid "The value '%(value)s' is not a valid value."
5011
#: bzrlib/errors.py:424
5268
#: breezy/errors.py:424
5012
5269
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5015
#: bzrlib/errors.py:443
5272
#: breezy/errors.py:443
5016
5273
msgid "Generic path error: %(path)r%(extra)s)"
5019
#: bzrlib/errors.py:456
5276
#: breezy/errors.py:456
5020
5277
msgid "No such file: %(path)r%(extra)s"
5023
#: bzrlib/errors.py:461
5280
#: breezy/errors.py:461
5024
5281
msgid "File exists: %(path)r%(extra)s"
5027
#: bzrlib/errors.py:467
5284
#: breezy/errors.py:467
5029
5286
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5030
5287
"after to tell bzr about a rename that has already happened)%(extra)s"
5033
#: bzrlib/errors.py:483
5290
#: breezy/errors.py:483
5034
5291
msgid "\"%(path)s\" is not a directory %(extra)s"
5037
#: bzrlib/errors.py:488
5294
#: breezy/errors.py:488
5038
5295
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5041
#: bzrlib/errors.py:493
5298
#: breezy/errors.py:493
5042
5299
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5045
#: bzrlib/errors.py:498
5302
#: breezy/errors.py:498
5046
5303
msgid "Hard-linking \"%(path)s\" is not supported"
5049
#: bzrlib/errors.py:513
5306
#: breezy/errors.py:513
5050
5307
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5053
#: bzrlib/errors.py:518
5310
#: breezy/errors.py:518
5054
5311
msgid "Permission denied: \"%(path)s\"%(extra)s"
5057
#: bzrlib/errors.py:523
5314
#: breezy/errors.py:523
5058
5315
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5061
#: bzrlib/errors.py:528
5318
#: breezy/errors.py:528
5062
5319
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5065
#: bzrlib/errors.py:539
5322
#: breezy/errors.py:539
5066
5323
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5069
#: bzrlib/errors.py:561
5070
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5326
#: breezy/errors.py:561
5327
msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy."
5073
#: bzrlib/errors.py:571
5330
#: breezy/errors.py:571
5074
5331
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5077
#: bzrlib/errors.py:579
5334
#: breezy/errors.py:579
5079
5336
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5080
5337
"upgrade the branch to permit branch stacking."
5083
#: bzrlib/errors.py:590
5340
#: breezy/errors.py:590
5084
5341
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5087
#: bzrlib/errors.py:600
5344
#: breezy/errors.py:600
5089
5346
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5090
5347
"need to upgrade the repository to permit branch stacking."
5093
#: bzrlib/errors.py:611
5350
#: breezy/errors.py:611
5094
5351
msgid "Error reading from %(path)r."
5097
#: bzrlib/errors.py:630
5354
#: breezy/errors.py:630
5098
5355
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5101
#: bzrlib/errors.py:646
5358
#: breezy/errors.py:646
5102
5359
msgid "Path \"%(path)s\" is not unicode normalized"
5105
#: bzrlib/errors.py:654
5362
#: breezy/errors.py:654
5106
5363
msgid "Not a branch: \"%(path)s\"%(detail)s."
5109
#: bzrlib/errors.py:696
5366
#: breezy/errors.py:696
5110
5367
msgid "No submit branch available for branch \"%(path)s\""
5113
#: bzrlib/errors.py:705
5370
#: breezy/errors.py:705
5114
5371
msgid "A control directory already exists: \"%(path)s\"."
5117
#: bzrlib/errors.py:710
5374
#: breezy/errors.py:710
5118
5375
msgid "Already a branch: \"%(path)s\"."
5121
#: bzrlib/errors.py:715
5378
#: breezy/errors.py:715
5122
5379
msgid "Invalid branch name: %(name)s"
5125
#: bzrlib/errors.py:724
5382
#: breezy/errors.py:724
5126
5383
msgid "Parent branch already exists: \"%(path)s\"."
5129
#: bzrlib/errors.py:730
5386
#: breezy/errors.py:730
5131
5388
"Directory contains a branch, but no working tree (use bzr checkout if you "
5132
5389
"wish to build a working tree): \"%(path)s\""
5135
#: bzrlib/errors.py:735
5392
#: breezy/errors.py:735
5137
5394
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5140
#: bzrlib/errors.py:745
5397
#: breezy/errors.py:745
5142
5399
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5145
#: bzrlib/errors.py:755
5402
#: breezy/errors.py:755
5146
5403
msgid "No repository present: \"%(path)s\""
5149
#: bzrlib/errors.py:762
5406
#: breezy/errors.py:762
5151
5408
"Unsupported branch format: %(format)s\n"
5152
5409
"Please run 'bzr upgrade'"
5155
#: bzrlib/errors.py:768
5412
#: breezy/errors.py:768
5156
5413
msgid "Unknown %(kind)s format: %(format)r"
5159
#: bzrlib/errors.py:777
5416
#: breezy/errors.py:777
5160
5417
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5163
#: bzrlib/errors.py:787
5420
#: breezy/errors.py:787
5164
5421
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5167
#: bzrlib/errors.py:802
5424
#: breezy/errors.py:802
5170
5427
"is not compatible with\n"
5175
#: bzrlib/errors.py:818
5432
#: breezy/errors.py:818
5176
5433
msgid "Revision is not compatible with %(repo_format)s"
5179
#: bzrlib/errors.py:828
5436
#: breezy/errors.py:828
5180
5437
msgid "%(context_info)s%(path)s is already versioned."
5183
#: bzrlib/errors.py:849
5440
#: breezy/errors.py:849
5184
5441
msgid "%(context_info)s%(path)s is not versioned."
5187
#: bzrlib/errors.py:870
5444
#: breezy/errors.py:870
5188
5445
msgid "Path(s) are not versioned: %(paths_as_string)s"
5191
#: bzrlib/errors.py:881
5448
#: breezy/errors.py:881
5192
5449
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5195
#: bzrlib/errors.py:900
5452
#: breezy/errors.py:900
5196
5453
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5199
#: bzrlib/errors.py:908
5456
#: breezy/errors.py:908
5201
5458
"Filename %(filename)r is not valid in your current filesystem encoding "
5202
5459
"%(fs_encoding)s"
5205
#: bzrlib/errors.py:919
5462
#: breezy/errors.py:919
5206
5463
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5209
#: bzrlib/errors.py:937
5466
#: breezy/errors.py:937
5210
5467
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5213
#: bzrlib/errors.py:976
5470
#: breezy/errors.py:976
5214
5471
msgid "Cannot lock %(lock)s: %(why)s"
5217
#: bzrlib/errors.py:986
5474
#: breezy/errors.py:986
5219
5476
"A transaction related operation was attempted after the transaction finished."
5222
#: bzrlib/errors.py:1013
5479
#: breezy/errors.py:1013
5223
5480
msgid "Cannot lock: transport is read only: %(transport)s"
5226
#: bzrlib/errors.py:1021
5483
#: breezy/errors.py:1021
5227
5484
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5230
#: bzrlib/errors.py:1032
5232
"Lock was broken while still open: %(lock)s - check storage consistency!"
5487
#: breezy/errors.py:1032
5488
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5235
#: bzrlib/errors.py:1043
5491
#: breezy/errors.py:1043
5237
5493
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5238
5494
"%(holder)r, wanted to break %(target)r"
5241
#: bzrlib/errors.py:1055
5497
#: breezy/errors.py:1055
5243
5499
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5244
5500
"Use 'bzr break-lock' to clear it"
5247
#: bzrlib/errors.py:1068
5503
#: breezy/errors.py:1068
5248
5504
msgid "Lock not held: %(lock)s"
5251
#: bzrlib/errors.py:1097
5507
#: breezy/errors.py:1097
5252
5508
msgid "No changes to commit"
5255
#: bzrlib/errors.py:1102
5511
#: breezy/errors.py:1102
5257
5513
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5260
#: bzrlib/errors.py:1112
5516
#: breezy/errors.py:1112
5262
5518
"Excluding paths during commit is not supported by repository at "
5263
5519
"%(repository)r."
5266
#: bzrlib/errors.py:1121
5522
#: breezy/errors.py:1121
5268
5524
"The specified commit message contains characters unsupported by the current "
5272
#: bzrlib/errors.py:1127
5528
#: breezy/errors.py:1127
5273
5529
msgid "Upgrade URL cannot work with readonly URLs."
5276
#: bzrlib/errors.py:1132
5532
#: breezy/errors.py:1132
5277
5533
msgid "The branch format %(format)s is already at the most recent format."
5280
#: bzrlib/errors.py:1155
5536
#: breezy/errors.py:1155
5281
5537
msgid "Option --change does not accept revision ranges"
5284
#: bzrlib/errors.py:1160
5540
#: breezy/errors.py:1160
5285
5541
msgid "No namespace registered for string: %(spec)r"
5288
#: bzrlib/errors.py:1179
5544
#: breezy/errors.py:1179
5290
"Requested revision: '%(spec)s' does not exist in branch: "
5291
"%(branch_url)s%(extra)s"
5546
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5294
#: bzrlib/errors.py:1193
5550
#: breezy/errors.py:1193
5296
5552
"Operation denied because it would change the main history, which is not "
5297
5553
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5300
#: bzrlib/errors.py:1204
5556
#: breezy/errors.py:1204
5302
5558
"These branches have diverged. Use the missing command to see how.\n"
5303
5559
"Use the merge command to reconcile them."
5306
#: bzrlib/errors.py:1224
5562
#: breezy/errors.py:1224
5308
5564
"Branches have no common ancestor, and no merge base revision was specified."
5311
#: bzrlib/errors.py:1230
5567
#: breezy/errors.py:1230
5313
5569
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5316
#: bzrlib/errors.py:1236
5572
#: breezy/errors.py:1236
5317
5573
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5320
#: bzrlib/errors.py:1245
5576
#: breezy/errors.py:1245
5322
5578
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5325
#: bzrlib/errors.py:1254
5581
#: breezy/errors.py:1254
5326
5582
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5329
#: bzrlib/errors.py:1263
5585
#: breezy/errors.py:1263
5330
5586
msgid "Branch %(branch)s has no commits."
5333
#: bzrlib/errors.py:1281
5589
#: breezy/errors.py:1281
5335
"Bound branch %(branch)s is out of date with master branch "
5336
"%(master)s.%(extra_help)s"
5591
"Bound branch %(branch)s is out of date with master branch %(master)s."
5339
#: bzrlib/errors.py:1293
5595
#: breezy/errors.py:1293
5341
5597
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5342
5598
"bound to %(remote)s."
5345
#: bzrlib/errors.py:1305
5601
#: breezy/errors.py:1305
5346
5602
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5349
#: bzrlib/errors.py:1314
5605
#: breezy/errors.py:1314
5351
5607
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5355
#: bzrlib/errors.py:1326
5611
#: breezy/errors.py:1326
5356
5612
msgid "Error in processing weave: %(msg)s"
5359
#: bzrlib/errors.py:1335
5615
#: breezy/errors.py:1335
5360
5616
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5363
#: bzrlib/errors.py:1346
5619
#: breezy/errors.py:1346
5364
5620
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5367
#: bzrlib/errors.py:1356
5623
#: breezy/errors.py:1356
5368
5624
msgid "Weave invariant violated: %(what)s"
5371
#: bzrlib/errors.py:1365
5627
#: breezy/errors.py:1365
5372
5628
msgid "Parents are mismatched between two revisions. %(msg)s"
5375
#: bzrlib/errors.py:1387
5631
#: breezy/errors.py:1387
5377
5633
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5381
#: bzrlib/errors.py:1399
5637
#: breezy/errors.py:1399
5382
5638
msgid "Versioned file error"
5385
#: bzrlib/errors.py:1404
5641
#: breezy/errors.py:1404
5386
5642
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5389
#: bzrlib/errors.py:1414
5645
#: breezy/errors.py:1414
5390
5646
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5393
#: bzrlib/errors.py:1424
5649
#: breezy/errors.py:1424
5394
5650
msgid "Text did not match its checksum: %(msg)s"
5397
#: bzrlib/errors.py:1550
5653
#: breezy/errors.py:1550
5398
5654
msgid "Export format %(format)r not supported"
5401
#: bzrlib/errors.py:1559
5657
#: breezy/errors.py:1559
5402
5658
msgid "Transport error: %(msg)s %(orig_error)s"
5405
#: bzrlib/errors.py:1585
5661
#: breezy/errors.py:1585
5406
5662
msgid "Generic bzr smart protocol error: %(details)s"
5409
#: bzrlib/errors.py:1593
5665
#: breezy/errors.py:1593
5410
5666
msgid "Received bad protocol version marker: %(marker)r"
5413
#: bzrlib/errors.py:1625
5669
#: breezy/errors.py:1625
5414
5670
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5417
#: bzrlib/errors.py:1630
5673
#: breezy/errors.py:1630
5418
5674
msgid "Connection error: %(msg)s %(orig_error)s"
5421
#: bzrlib/errors.py:1635
5677
#: breezy/errors.py:1635
5422
5678
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5425
#: bzrlib/errors.py:1656
5681
#: breezy/errors.py:1656
5426
5682
msgid "Connection closed: %(msg)s %(orig_error)s"
5429
#: bzrlib/errors.py:1661
5685
#: breezy/errors.py:1661
5430
5686
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5433
#: bzrlib/errors.py:1666
5689
#: breezy/errors.py:1666
5434
5690
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5437
#: bzrlib/errors.py:1676
5693
#: breezy/errors.py:1676
5438
5694
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5441
#: bzrlib/errors.py:1691
5442
msgid "Certificate error: %(error)s"
5445
#: bzrlib/errors.py:1699
5697
#: breezy/errors.py:1691
5446
5698
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5449
#: bzrlib/errors.py:1713
5701
#: breezy/errors.py:1705
5450
5702
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5453
#: bzrlib/errors.py:1721
5705
#: breezy/errors.py:1713
5454
5706
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5457
#: bzrlib/errors.py:1730
5709
#: breezy/errors.py:1722
5458
5710
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5461
#: bzrlib/errors.py:1744
5713
#: breezy/errors.py:1736
5462
5714
msgid "Too many redirections"
5465
#: bzrlib/errors.py:1749
5717
#: breezy/errors.py:1741
5466
5718
msgid "Working tree has conflicts."
5469
#: bzrlib/errors.py:1753
5721
#: breezy/errors.py:1745
5470
5722
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5473
#: bzrlib/errors.py:1762
5725
#: breezy/errors.py:1754
5475
5727
"Error(s) parsing config file %(filename)s:\n"
5479
#: bzrlib/errors.py:1772
5731
#: breezy/errors.py:1764
5481
5733
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5482
5734
"See ``bzr help %(name)s``"
5485
#: bzrlib/errors.py:1782
5737
#: breezy/errors.py:1774
5486
5738
msgid "%(username)r does not seem to contain a reasonable email address"
5489
#: bzrlib/errors.py:1791
5741
#: breezy/errors.py:1783
5490
5742
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5493
#: bzrlib/errors.py:1799
5745
#: breezy/errors.py:1791
5494
5746
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5497
#: bzrlib/errors.py:1807
5749
#: breezy/errors.py:1799
5498
5750
msgid "Unable to import library \"%(library)s\": %(error)s"
5501
#: bzrlib/errors.py:1815
5753
#: breezy/errors.py:1807
5502
5754
msgid "python-gpgme is not installed, it is needed to verify signatures"
5505
#: bzrlib/errors.py:1823
5757
#: breezy/errors.py:1815
5507
5759
"The working tree for %(basedir)s has changed since the last commit, but "
5508
5760
"weave merge requires that it be unchanged"
5511
#: bzrlib/errors.py:1833
5763
#: breezy/errors.py:1825
5513
5765
"Can't reprocess and show base, because reprocessing obscures the "
5514
5766
"relationship of conflicting lines to the base"
5517
#: bzrlib/errors.py:1839
5769
#: breezy/errors.py:1831
5518
5770
msgid "Cycle in graph %(graph)r"
5521
#: bzrlib/errors.py:1867
5773
#: breezy/errors.py:1859
5522
5774
msgid "File %(filename)s is not conflicted."
5525
#: bzrlib/errors.py:1889
5777
#: breezy/errors.py:1881
5526
5778
msgid "No bundle was found in \"%(filename)s\"."
5529
#: bzrlib/errors.py:1898
5781
#: breezy/errors.py:1890
5530
5782
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5533
#: bzrlib/errors.py:1908
5785
#: breezy/errors.py:1900
5534
5786
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5537
#: bzrlib/errors.py:1921
5789
#: breezy/errors.py:1913
5538
5790
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5541
#: bzrlib/errors.py:1931
5793
#: breezy/errors.py:1923
5542
5794
msgid "Key %(key)s is already present in map"
5545
#: bzrlib/errors.py:1936
5797
#: breezy/errors.py:1928
5546
5798
msgid "The prefix %(prefix)s is in the help search path twice."
5549
#: bzrlib/errors.py:1946
5801
#: breezy/errors.py:1938
5551
5803
"No final name for trans_id %(trans_id)r\n"
5552
5804
"file-id: %(file_id)r\n"
5553
5805
"root trans-id: %(root_trans_id)r\n"
5556
#: bzrlib/errors.py:1978
5808
#: breezy/errors.py:1970
5557
5809
msgid "Attempt to reuse a transform that has already been applied."
5560
#: bzrlib/errors.py:1983
5812
#: breezy/errors.py:1975
5561
5813
msgid "Moving the root directory is not supported at this time"
5564
#: bzrlib/errors.py:1988
5816
#: breezy/errors.py:1980
5565
5817
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5568
#: bzrlib/errors.py:1999
5820
#: breezy/errors.py:1991
5570
5822
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5573
#: bzrlib/errors.py:2035
5825
#: breezy/errors.py:2027
5575
5827
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5578
#: bzrlib/errors.py:2065
5830
#: breezy/errors.py:2057
5579
5831
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5582
#: bzrlib/errors.py:2073
5834
#: breezy/errors.py:2065
5583
5835
msgid "Nothing to merge."
5586
#: bzrlib/errors.py:2078
5838
#: breezy/errors.py:2070
5587
5839
msgid "Format %(format)s cannot be initialised by this version of bzr."
5590
#: bzrlib/errors.py:2087
5842
#: breezy/errors.py:2079
5592
5844
"Cannot convert from format %(from_format)s to format %(format)s. "
5596
#: bzrlib/errors.py:2099
5848
#: breezy/errors.py:2091
5597
5849
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5600
#: bzrlib/errors.py:2107
5852
#: breezy/errors.py:2099
5601
5853
msgid "%(exe_name)s could not be found on this machine"
5604
#: bzrlib/errors.py:2115
5856
#: breezy/errors.py:2107
5605
5857
msgid "Diff is not installed on this machine: %(msg)s"
5608
#: bzrlib/errors.py:2123
5860
#: breezy/errors.py:2115
5609
5861
msgid "Diff3 is not installed on this machine."
5612
#: bzrlib/errors.py:2129
5864
#: breezy/errors.py:2121
5613
5865
msgid "The content being inserted is already present."
5616
#: bzrlib/errors.py:2134
5868
#: breezy/errors.py:2126
5618
5870
"This tree contains left-over files from a failed operation.\n"
5619
5871
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5636
5888
" keep, and delete it when you are done."
5639
#: bzrlib/errors.py:2166
5891
#: breezy/errors.py:2158
5641
5893
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5642
5894
"examine %(pending_deletion)s to see if it contains any files you wish to "
5643
5895
"keep, and delete it when you are done."
5646
#: bzrlib/errors.py:2176
5898
#: breezy/errors.py:2168
5647
5899
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5650
#: bzrlib/errors.py:2190
5652
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5902
#: breezy/errors.py:2182
5903
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5655
#: bzrlib/errors.py:2203
5906
#: breezy/errors.py:2195
5656
5907
msgid "Error in merge modified format"
5659
#: bzrlib/errors.py:2208
5910
#: breezy/errors.py:2200
5660
5911
msgid "Format error in conflict listings"
5663
#: bzrlib/errors.py:2212
5914
#: breezy/errors.py:2204
5665
5916
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5666
5917
"Error: %(description)s"
5669
#: bzrlib/errors.py:2223
5920
#: breezy/errors.py:2215
5671
5922
"An error has been detected in the repository %(repo_path)s.\n"
5672
5923
"Please run bzr reconcile on this repository."
5675
#: bzrlib/errors.py:2234
5926
#: breezy/errors.py:2226
5677
5928
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5678
5929
"reason: %(reason)s"
5681
#: bzrlib/errors.py:2247
5932
#: breezy/errors.py:2239
5683
5934
"An inconsistent delta was supplied: %(delta)r\n"
5684
5935
"reason: %(reason)s"
5687
#: bzrlib/errors.py:2259
5938
#: breezy/errors.py:2251
5688
5939
msgid "To use this feature you must upgrade your branch at %(path)s."
5691
#: bzrlib/errors.py:2268
5942
#: breezy/errors.py:2260
5692
5943
msgid "To use this feature you must upgrade your repository at %(path)s."
5695
#: bzrlib/errors.py:2273
5946
#: breezy/errors.py:2265
5697
5948
"To use this feature you must upgrade your branch at %(path)s to a format "
5698
5949
"which supports rich roots."
5701
#: bzrlib/errors.py:2279
5952
#: breezy/errors.py:2271
5702
5953
msgid "Cannot perform local-only commits on unbound branches."
5705
#: bzrlib/errors.py:2284
5956
#: breezy/errors.py:2276
5706
5957
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5709
#: bzrlib/errors.py:2305
5960
#: breezy/errors.py:2297
5710
5961
msgid "Ghost tags not supported by format %(format)r."
5713
#: bzrlib/errors.py:2313
5964
#: breezy/errors.py:2305
5714
5965
msgid "File is binary but should be text."
5717
#: bzrlib/errors.py:2318
5968
#: breezy/errors.py:2310
5718
5969
msgid "The path %(path)s is not permitted on this platform"
5721
#: bzrlib/errors.py:2327
5972
#: breezy/errors.py:2319
5723
5974
"Testament did not match expected value.\n"
5724
5975
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5725
5976
" {%(measured)s}"
5728
#: bzrlib/errors.py:2339
5979
#: breezy/errors.py:2331
5729
5980
msgid "Not a bzr revision-bundle: %(text)r"
5732
#: bzrlib/errors.py:2348
5983
#: breezy/errors.py:2340
5733
5984
msgid "Bad bzr revision-bundle: %(text)r"
5736
#: bzrlib/errors.py:2357
5987
#: breezy/errors.py:2349
5737
5988
msgid "Malformed bzr revision-bundle header: %(text)r"
5740
#: bzrlib/errors.py:2362
5991
#: breezy/errors.py:2354
5741
5992
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5744
#: bzrlib/errors.py:2367
5995
#: breezy/errors.py:2359
5745
5996
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5748
#: bzrlib/errors.py:2372
5999
#: breezy/errors.py:2364
5749
6000
msgid "End of line marker was not \\n in bzr revision-bundle"
5752
#: bzrlib/errors.py:2382
6003
#: breezy/errors.py:2374
5753
6004
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5756
#: bzrlib/errors.py:2392
6007
#: breezy/errors.py:2384
5757
6008
msgid "Root class for inventory serialization errors"
5760
#: bzrlib/errors.py:2396
6011
#: breezy/errors.py:2388
5762
6013
"The inventory was not in the expected format:\n"
5766
#: bzrlib/errors.py:2405
6017
#: breezy/errors.py:2397
5767
6018
msgid "This operation requires rich root data storage"
5770
#: bzrlib/errors.py:2418
5771
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6021
#: breezy/errors.py:2410
6022
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
5774
#: bzrlib/errors.py:2427
6025
#: breezy/errors.py:2419
5776
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6027
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
5780
#: bzrlib/errors.py:2434
6031
#: breezy/errors.py:2426
5782
6033
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5783
6034
"ghost at {%(ghost_revision_id)s}"
5786
#: bzrlib/errors.py:2444
6037
#: breezy/errors.py:2436
5787
6038
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5790
#: bzrlib/errors.py:2495
6041
#: breezy/errors.py:2487
5792
6043
"A merge directive must provide either a bundle or a public branch location."
5795
#: bzrlib/errors.py:2502
6046
#: breezy/errors.py:2494
5796
6047
msgid "Bad merge directive payload %(start)r"
5799
#: bzrlib/errors.py:2512
6050
#: breezy/errors.py:2504
5800
6051
msgid "Preview patch does not match requested changes."
5803
#: bzrlib/errors.py:2518
6054
#: breezy/errors.py:2510
5804
6055
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5807
#: bzrlib/errors.py:2528
6058
#: breezy/errors.py:2520
5809
6060
"Your branch does not have all of the revisions required in order to merge "
5810
6061
"this merge directive and the target location specified in the merge "
5811
6062
"directive is not a branch: %(location)s."
5814
#: bzrlib/errors.py:2540
6065
#: breezy/errors.py:2532
5815
6066
msgid "Unsupported entry kind %(kind)s"
5818
#: bzrlib/errors.py:2548
6069
#: breezy/errors.py:2540
5819
6070
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5822
#: bzrlib/errors.py:2558
6073
#: breezy/errors.py:2550
5823
6074
msgid "Subsume target %(other_tree)s needs to be upgraded."
5826
#: bzrlib/errors.py:2577
6077
#: breezy/errors.py:2569
5827
6078
msgid "No such tag: %(tag_name)s"
5830
#: bzrlib/errors.py:2585
6081
#: breezy/errors.py:2577
5831
6082
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5834
#: bzrlib/errors.py:2594
6085
#: breezy/errors.py:2586
5835
6086
msgid "Tag %(tag_name)s already exists."
5838
#: bzrlib/errors.py:2602
6089
#: breezy/errors.py:2594
5840
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5841
"bugs\" for more information on this feature."
6091
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6092
"\" for more information on this feature."
5844
#: bzrlib/errors.py:2612
6095
#: breezy/errors.py:2604
5846
6097
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5849
#: bzrlib/errors.py:2622
6100
#: breezy/errors.py:2614
5851
6102
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5854
#: bzrlib/errors.py:2632
6105
#: breezy/errors.py:2624
5855
6106
msgid "Invalid line in bugs property: '%(line)s'"
5858
#: bzrlib/errors.py:2640
6109
#: breezy/errors.py:2632
5859
6110
msgid "Invalid bug status: '%(status)s'"
5862
#: bzrlib/errors.py:2648
6113
#: breezy/errors.py:2640
5863
6114
msgid "Could not understand response from smart server: %(response_tuple)r"
5866
#: bzrlib/errors.py:2687
6117
#: breezy/errors.py:2679
5867
6118
msgid "Server sent an unexpected error: %(error_tuple)r"
5870
#: bzrlib/errors.py:2706
6121
#: breezy/errors.py:2698
5871
6122
msgid "Unrecognised container format: %(container_format)r"
5874
#: bzrlib/errors.py:2714
6125
#: breezy/errors.py:2706
5875
6126
msgid "Unexpected end of container stream"
5878
#: bzrlib/errors.py:2719
6129
#: breezy/errors.py:2711
5879
6130
msgid "Unknown record type: %(record_type)r"
5882
#: bzrlib/errors.py:2727
6133
#: breezy/errors.py:2719
5883
6134
msgid "Invalid record: %(reason)s"
5886
#: bzrlib/errors.py:2735
6137
#: breezy/errors.py:2727
5887
6138
msgid "Container has data after end marker: %(excess)r"
5890
#: bzrlib/errors.py:2743
6141
#: breezy/errors.py:2735
5891
6142
msgid "Container has multiple records with the same name: %(name)s"
5894
#: bzrlib/errors.py:2756
6145
#: breezy/errors.py:2748
5895
6146
msgid "Corrupt or incompatible data stream: %(reason)s"
5898
#: bzrlib/errors.py:2764
6149
#: breezy/errors.py:2756
5899
6150
msgid "SMTP error: %(error)s"
5902
#: bzrlib/errors.py:2772
6153
#: breezy/errors.py:2764
5903
6154
msgid "No message supplied."
5906
#: bzrlib/errors.py:2777
6157
#: breezy/errors.py:2769
5907
6158
msgid "No mail-to address (--mail-to) or output (-o) specified."
5910
#: bzrlib/errors.py:2782
6161
#: breezy/errors.py:2774
5912
6163
"Unable to find mail client with the following names: "
5913
6164
"%(mail_command_list_string)s"
5916
#: bzrlib/errors.py:2792
6167
#: breezy/errors.py:2784
5917
6168
msgid "SMTP connection to %(host)s refused"
5920
#: bzrlib/errors.py:2801
6171
#: breezy/errors.py:2793
5921
6172
msgid "Please specify smtp_server. No server at default %(host)s."
5924
#: bzrlib/errors.py:2815
6175
#: breezy/errors.py:2807
5926
6177
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5930
#: bzrlib/errors.py:2827
6181
#: breezy/errors.py:2819
5931
6182
msgid "'%(display_url)s' is already a branch."
5934
#: bzrlib/errors.py:2832
6185
#: breezy/errors.py:2824
5935
6186
msgid "'%(display_url)s' is already a tree."
5938
#: bzrlib/errors.py:2837
6189
#: breezy/errors.py:2829
5939
6190
msgid "'%(display_url)s' is already a checkout."
5942
#: bzrlib/errors.py:2842
6193
#: breezy/errors.py:2834
5943
6194
msgid "'%(display_url)s' is already a lightweight checkout."
5946
#: bzrlib/errors.py:2847
6197
#: breezy/errors.py:2839
5947
6198
msgid "'%(display_url)s' is already using a shared repository."
5950
#: bzrlib/errors.py:2852
6201
#: breezy/errors.py:2844
5951
6202
msgid "'%(display_url)s' is already standalone."
5954
#: bzrlib/errors.py:2857
6205
#: breezy/errors.py:2849
5955
6206
msgid "Shared repository '%(display_url)s' already creates working trees."
5958
#: bzrlib/errors.py:2863
6209
#: breezy/errors.py:2855
5960
6211
"Shared repository '%(display_url)s' already doesn't create working trees."
5963
#: bzrlib/errors.py:2869
6214
#: breezy/errors.py:2861
5964
6215
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5967
#: bzrlib/errors.py:2874
6218
#: breezy/errors.py:2866
5968
6219
msgid "No location could be found to bind to at %(display_url)s."
5971
#: bzrlib/errors.py:2879
5973
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5977
#: bzrlib/errors.py:2898
5979
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5983
#: bzrlib/errors.py:2904
6222
#: breezy/errors.py:2871
6224
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6228
#: breezy/errors.py:2890
6230
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6233
#: breezy/errors.py:2905
6235
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6239
#: breezy/errors.py:2911
5984
6240
msgid "Variable {%(name)s} is not available."
5987
#: bzrlib/errors.py:2912
6243
#: breezy/errors.py:2919
5988
6244
msgid "No template specified."
5991
#: bzrlib/errors.py:2917
6247
#: breezy/errors.py:2924
5992
6248
msgid "Unable to create symlink %(path_str)son this platform"
5995
#: bzrlib/errors.py:2932
6251
#: breezy/errors.py:2939
5997
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5998
"\"original\", \"local\"."
6253
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6001
#: bzrlib/errors.py:2966
6257
#: breezy/errors.py:2973
6003
6259
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6006
#: bzrlib/errors.py:2978
6262
#: breezy/errors.py:2985
6007
6263
msgid "The \"%(config_id)s\" configuration does not exist."
6010
#: bzrlib/errors.py:2986
6266
#: breezy/errors.py:2993
6011
6267
msgid "The \"%(option_name)s\" configuration option does not exist."
6014
#: bzrlib/errors.py:2994
6270
#: breezy/errors.py:3001
6015
6271
msgid "The alias \"%(alias_name)s\" does not exist."
6018
#: bzrlib/errors.py:3008
6274
#: breezy/errors.py:3015
6019
6275
msgid "\"%(alias_name)s\" is not a valid location alias."
6022
#: bzrlib/errors.py:3016
6278
#: breezy/errors.py:3023
6023
6279
msgid "No %(alias_name)s location assigned."
6026
#: bzrlib/errors.py:3024
6282
#: breezy/errors.py:3031
6027
6283
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6030
#: bzrlib/errors.py:3034
6286
#: breezy/errors.py:3041
6031
6287
msgid "Unknown rules detected: %(unknowns_str)s."
6034
#: bzrlib/errors.py:3045
6290
#: breezy/errors.py:3052
6035
6291
msgid "Tip change rejected: %(msg)s"
6038
#: bzrlib/errors.py:3053
6294
#: breezy/errors.py:3060
6039
6295
msgid "Shelf corrupt."
6042
#: bzrlib/errors.py:3058
6298
#: breezy/errors.py:3065
6043
6299
msgid "Corruption while decompressing repository file%(orig_error)s"
6046
#: bzrlib/errors.py:3070
6302
#: breezy/errors.py:3077
6047
6303
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6050
#: bzrlib/errors.py:3078
6306
#: breezy/errors.py:3085
6051
6307
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6054
#: bzrlib/errors.py:3086
6056
"An attempt to access a url outside the server jail was made: '%(url)s'."
6310
#: breezy/errors.py:3093
6311
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6059
#: bzrlib/errors.py:3094
6314
#: breezy/errors.py:3101
6060
6315
msgid "The user aborted the operation."
6063
#: bzrlib/errors.py:3099
6318
#: breezy/errors.py:3106
6064
6319
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6067
#: bzrlib/errors.py:3109
6322
#: breezy/errors.py:3116
6068
6323
msgid "No such view: %(view_name)s."
6071
#: bzrlib/errors.py:3119
6326
#: breezy/errors.py:3126
6073
6328
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6074
6329
"to a later format."
6077
#: bzrlib/errors.py:3128
6332
#: breezy/errors.py:3135
6079
6334
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6082
#: bzrlib/errors.py:3195
6337
#: breezy/errors.py:3202
6083
6338
msgid "%(bzrdir)r does not support co-located branches."
6086
#: bzrlib/errors.py:3201
6341
#: breezy/errors.py:3208
6088
6343
"Unable to determine your name.\n"
6089
6344
"Please, set your name with the 'whoami' command.\n"
6090
6345
"E.g. bzr whoami \"Your Name <name@example.com>\""
6093
#: bzrlib/errors.py:3210
6348
#: breezy/errors.py:3217
6094
6349
msgid "Invalid pattern(s) found. %(msg)s"
6097
#: bzrlib/errors.py:3218
6352
#: breezy/errors.py:3225
6099
6354
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6100
6355
"unbind` to fix."
6103
#: bzrlib/errors.py:3229
6358
#: breezy/errors.py:3236
6104
6359
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6107
#: bzrlib/errors.py:3238
6108
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6111
#: bzrlib/errors.py:3247
6362
#: breezy/errors.py:3245
6363
msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"."
6366
#: breezy/errors.py:3254
6367
msgid "Option \"%(name)s\" is not allowed."
6370
#: breezy/errors.py:3262
6113
6372
"No compatible object available for operations from %(source)r to %(target)r."
6116
#: bzrlib/errors.py:3257
6375
#: breezy/errors.py:3272
6118
6377
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6119
6378
"%(arguments)s."
6122
#: bzrlib/errors.py:3267
6381
#: breezy/errors.py:3282
6124
6383
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6125
6384
"format %(format)r"
6128
#: bzrlib/errors.py:3279
6387
#: breezy/errors.py:3294
6130
6389
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6134
#: bzrlib/errors.py:3292
6393
#: breezy/errors.py:3307
6135
6394
msgid "Binary files section encountered."
6138
#: bzrlib/errors.py:3300
6397
#: breezy/errors.py:3315
6140
6399
"Malformed patch header. %(desc)s\n"
6144
#: bzrlib/errors.py:3309
6403
#: breezy/errors.py:3324
6146
6405
"Malformed hunk header. %(desc)s\n"
6150
#: bzrlib/errors.py:3318
6409
#: breezy/errors.py:3333
6152
6411
"Malformed line. %(desc)s\n"
6156
#: bzrlib/errors.py:3328
6415
#: breezy/errors.py:3343
6158
6417
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6159
6418
"but patch says it should be \"%(patch_line)s\""
6162
#: bzrlib/errors.py:3339
6421
#: breezy/errors.py:3354
6163
6422
msgid "The feature %(feature)s has already been registered."
6166
#: bzrlib/export_pot.py:252
6425
#: breezy/errors.py:3362
6427
"Cannot store uncommitted changes because this branch already stores "
6428
"uncommitted changes."
6431
#: breezy/export_pot.py:252
6167
6432
#, python-format
6168
6433
msgid "Exporting messages from builtin command: %s"
6171
#: bzrlib/export_pot.py:271
6436
#: breezy/export_pot.py:271
6437
#, python-brace-format
6172
6438
msgid "Exporting messages from plugin command: {0} in {1}"
6175
#: bzrlib/export_pot.py:292
6441
#: breezy/export_pot.py:292
6176
6442
#, python-format
6177
6443
msgid "Exporting message from error: %s"
6180
#: bzrlib/fetch.py:98
6446
#: breezy/fetch.py:98
6181
6447
msgid "Finding revisions"
6184
#: bzrlib/fetch.py:103
6450
#: breezy/fetch.py:103
6185
6451
msgid "Fetching revisions"
6188
#: bzrlib/foreign.py:262
6454
#: breezy/foreign.py:262
6189
6455
msgid "Push into a different VCS without any custom bzr metadata."
6192
#: bzrlib/foreign.py:264
6458
#: breezy/foreign.py:264
6194
6460
"This will afterwards rebase the local branch on the remote\n"
6195
6461
"branch unless the --no-rebase option is used, in which case \n"
6196
6462
"the two branches will be out of sync after the push. "
6199
#: bzrlib/foreign.py:277
6465
# help of 'no-rebase' option of 'dpush' command
6466
#: breezy/foreign.py:277
6200
6467
msgid "Do not rebase after push."
6203
#: bzrlib/foreign.py:311
6470
#: breezy/foreign.py:311
6204
6471
#, python-format
6205
6472
msgid "Using saved location: %s\n"
6208
#: bzrlib/foreign.py:321
6475
#: breezy/foreign.py:321
6210
6477
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6211
6478
"regular push."
6214
#: bzrlib/gpg.py:366
6481
#: breezy/gpg.py:358
6482
#, python-brace-format
6215
6483
msgid "No GnuPG key results for pattern: {0}"
6218
#: bzrlib/gpg.py:439
6486
#: breezy/gpg.py:431
6487
#, python-brace-format
6219
6488
msgid "{0} commits with valid signatures"
6222
#: bzrlib/gpg.py:445
6491
#: breezy/gpg.py:437
6492
#, python-brace-format
6223
6493
msgid "{0} commit with unknown key"
6224
6494
msgid_plural "{0} commits with unknown keys"
6228
#: bzrlib/gpg.py:453
6498
#: breezy/gpg.py:445
6499
#, python-brace-format
6229
6500
msgid "{0} commit not valid"
6230
6501
msgid_plural "{0} commits not valid"
6234
#: bzrlib/gpg.py:461
6505
#: breezy/gpg.py:453
6506
#, python-brace-format
6235
6507
msgid "{0} commit not signed"
6236
6508
msgid_plural "{0} commits not signed"
6240
#: bzrlib/gpg.py:469
6512
#: breezy/gpg.py:461
6513
#, python-brace-format
6241
6514
msgid "{0} commit with key now expired"
6242
6515
msgid_plural "{0} commits with key now expired"
6246
#: bzrlib/gpg.py:489
6519
#: breezy/gpg.py:481
6520
#, python-brace-format
6247
6521
msgid "{0} commit by author {1} with key {2} now expired"
6248
6522
msgid_plural "{0} commits by author {1} with key {2} now expired"
6252
#: bzrlib/gpg.py:505
6526
#: breezy/gpg.py:497
6527
#, python-brace-format
6253
6528
msgid "{0} signed {1} commit"
6254
6529
msgid_plural "{0} signed {1} commits"
6258
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6533
#: breezy/gpg.py:514 breezy/gpg.py:531
6534
#, python-brace-format
6259
6535
msgid "{0} commit by author {1}"
6260
6536
msgid_plural "{0} commits by author {1}"
6264
#: bzrlib/gpg.py:554
6540
#: breezy/gpg.py:546
6541
#, python-brace-format
6265
6542
msgid "Unknown key {0} signed {1} commit"
6266
6543
msgid_plural "Unknown key {0} signed {1} commits"
6270
#: bzrlib/groupcompress.py:1739
6547
#: breezy/groupcompress.py:1739
6271
6548
#, python-format
6272
6549
msgid "Insert claimed random_id=True, but then inserted %r two times"
6275
#: bzrlib/hooks.py:313
6552
#: breezy/hooks.py:313
6276
6553
#, python-format
6277
6554
msgid "Introduced in: %s"
6280
#: bzrlib/hooks.py:316
6557
#: breezy/hooks.py:316
6281
6558
#, python-format
6282
6559
msgid "Deprecated in: %s"
6285
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6562
#: breezy/knit.py:1766 breezy/knit.py:1802
6286
6563
msgid "Walking content"
6289
#: bzrlib/knit.py:3330
6566
#: breezy/knit.py:3330
6290
6567
msgid "annotating"
6293
#: bzrlib/lock.py:548
6570
#: breezy/lock.py:549
6294
6571
msgid "{0!r} was {1} locked again"
6297
#: bzrlib/lockdir.py:321
6574
#: breezy/lockdir.py:321
6298
6575
#, python-format
6299
6576
msgid "error removing pending lock: %s"
6302
#: bzrlib/lockdir.py:616
6579
#: breezy/lockdir.py:616
6303
6580
msgid "Unable to obtain"
6306
#: bzrlib/lockdir.py:618
6583
#: breezy/lockdir.py:618
6307
6584
msgid "Lock owner changed for"
6310
#: bzrlib/lockdir.py:620
6587
#: breezy/lockdir.py:620
6588
#, python-brace-format
6311
6589
msgid "{0} lock {1} {2}."
6314
#: bzrlib/lockdir.py:627
6592
#: breezy/lockdir.py:627
6315
6593
#, python-format
6316
6594
msgid "Will continue to try until %s, unless you press Ctrl-C."
6319
#: bzrlib/lockdir.py:629
6597
#: breezy/lockdir.py:629
6320
6598
msgid "See \"bzr help break-lock\" for more."
6323
#: bzrlib/lockdir.py:739
6601
#: breezy/lockdir.py:739
6324
6602
#, python-format
6326
6604
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6329
#: bzrlib/log.py:563
6607
#: breezy/log.py:563
6330
6608
msgid "--exclude-common-ancestry requires two different revisions"
6333
#: bzrlib/log.py:565
6611
#: breezy/log.py:565
6334
6612
#, python-format
6335
6613
msgid "invalid direction %r"
6338
#: bzrlib/log.py:653
6616
#: breezy/log.py:653
6339
6617
msgid "Start revision not found in history of end revision."
6342
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6620
#: breezy/log.py:1071 breezy/log.py:1129
6343
6621
msgid "Logging revision 0 is invalid."
6346
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6624
#: breezy/log.py:1073 breezy/log.py:1131
6347
6625
msgid "Start revision must be older than the end revision."
6350
#: bzrlib/log.py:1818
6628
#: breezy/log.py:1818
6351
6629
#, python-format
6352
6630
msgid "unknown log formatter: %r"
6355
#: bzrlib/log.py:2114
6633
#: breezy/log.py:2114
6356
6634
msgid "fixes bug"
6357
6635
msgid_plural "fixes bugs"
6361
#: bzrlib/merge.py:689
6639
#: breezy/merge.py:689
6362
6640
msgid "All changes applied successfully."
6365
#: bzrlib/merge.py:691
6643
#: breezy/merge.py:691
6366
6644
#, python-format
6367
6645
msgid "%d conflicts encountered."
6370
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6648
#: breezy/merge.py:845 breezy/merge.py:1868
6371
6649
msgid "Preparing file merge"
6374
#: bzrlib/multiparent.py:426
6652
#: breezy/multiparent.py:426
6375
6653
msgid "Importing revisions"
6378
#: bzrlib/option.py:526
6656
# help of 'help' option
6657
#: breezy/option.py:526
6379
6658
msgid "Show help message."
6382
#: bzrlib/option.py:528
6661
# help of 'quiet' option
6662
#: breezy/option.py:528
6383
6663
msgid "Only display errors and warnings."
6386
#: bzrlib/option.py:531
6666
# help of 'usage' option
6667
#: breezy/option.py:531
6387
6668
msgid "Show usage message and options."
6390
#: bzrlib/option.py:533
6671
# help of 'verbose' option
6672
#: breezy/option.py:533
6391
6673
msgid "Display more information."
6394
#: bzrlib/option.py:541
6676
# help of 'change' option
6677
#: breezy/option.py:541
6396
6679
"Select changes introduced by the specified revision. See also \"help "
6397
6680
"revisionspec\"."
6400
#: bzrlib/option.py:543
6683
# help of 'directory' option
6684
#: breezy/option.py:543
6401
6685
msgid "Branch to operate on, instead of working directory."
6404
#: bzrlib/option.py:545
6688
# help of 'log-format=long' option
6689
#: breezy/option.py:545
6405
6690
msgid "Detailed log format."
6408
#: bzrlib/option.py:545
6693
# help of 'log-format=gnu-changelog' option
6694
#: breezy/option.py:545
6409
6695
msgid "Format used by GNU ChangeLog files."
6412
#: bzrlib/option.py:545
6698
# help of 'log-format=line' option
6699
#: breezy/option.py:545
6413
6700
msgid "Log format with one line per revision."
6416
#: bzrlib/option.py:545
6703
# help of 'log-format=short' option
6704
#: breezy/option.py:545
6417
6705
msgid "Moderately short log format."
6420
#: bzrlib/option.py:545
6708
# help of 'log-format' option
6709
#: breezy/option.py:545
6421
6710
msgid "Use specified log format."
6424
#: bzrlib/option.py:547
6713
# title of 'log-format' option
6714
#: breezy/option.py:547
6425
6715
msgid "Log format"
6428
#: bzrlib/option.py:549
6718
# help of 'merge-type=lca' option
6719
#: breezy/option.py:549
6429
6720
msgid "LCA-newness merge."
6432
#: bzrlib/option.py:549
6723
# help of 'merge-type=diff3' option
6724
#: breezy/option.py:549
6433
6725
msgid "Merge using external diff3."
6436
#: bzrlib/option.py:549
6728
# help of 'merge-type=merge3' option
6729
#: breezy/option.py:549
6437
6730
msgid "Native diff3-style merge."
6440
#: bzrlib/option.py:549
6733
# help of 'merge-type' option
6734
#: breezy/option.py:549
6441
6735
msgid "Select a particular merge algorithm."
6444
#: bzrlib/option.py:549
6738
# help of 'merge-type=weave' option
6739
#: breezy/option.py:549
6445
6740
msgid "Weave-based merge."
6448
#: bzrlib/option.py:551
6743
# title of 'merge-type' option
6744
#: breezy/option.py:551
6449
6745
msgid "Merge algorithm"
6452
#: bzrlib/option.py:554
6748
# help of 'message' option
6749
#: breezy/option.py:554
6453
6750
msgid "Message string."
6456
#: bzrlib/option.py:556
6753
# help of 'null' option
6754
#: breezy/option.py:556
6457
6755
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6460
#: bzrlib/option.py:558
6758
# help of 'overwrite' option
6759
#: breezy/option.py:558
6461
6760
msgid "Ignore differences between branches and overwrite unconditionally."
6464
#: bzrlib/option.py:560
6763
# help of 'remember' option
6764
#: breezy/option.py:560
6465
6765
msgid "Remember the specified location as a default."
6468
#: bzrlib/option.py:562
6768
# help of 'reprocess' option
6769
#: breezy/option.py:562
6469
6770
msgid "Reprocess to reduce spurious conflicts."
6472
#: bzrlib/option.py:566
6773
# help of 'revision' option
6774
#: breezy/option.py:566
6473
6775
msgid "See \"help revisionspec\" for details."
6476
#: bzrlib/option.py:568
6778
# help of 'show-ids' option
6779
#: breezy/option.py:568
6477
6780
msgid "Show internal object ids."
6480
#: bzrlib/option.py:571
6783
# help of 'timezone' option
6784
#: breezy/option.py:571
6481
6785
msgid "Display timezone as local, original, or utc."
6484
#: bzrlib/osutils.py:100
6788
#: breezy/osutils.py:101
6485
6789
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6488
#: bzrlib/osutils.py:220
6792
#: breezy/osutils.py:221
6489
6793
msgid "lstat/stat of ({0!r}): {1!r}"
6492
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6796
#: breezy/osutils.py:1041 breezy/osutils.py:1052
6493
6797
#, python-format
6494
6798
msgid "sorry, %r not allowed in path"
6497
#: bzrlib/osutils.py:1259
6801
#: breezy/osutils.py:1270
6498
6802
#, python-format
6499
6803
msgid "%r is too short to calculate a relative path"
6502
#: bzrlib/plugin.py:143
6806
#: breezy/plugin.py:143
6503
6807
#, python-format
6504
6808
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6507
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6811
# help of 'plugin' option of 'bash-completion' command
6812
#: breezy/plugins/bash_completion/bashcomp.py:411
6508
6813
msgid "Enable completions for the selected plugin (default: all plugins)"
6511
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6816
#: breezy/plugins/bash_completion/bashcomp.py:412
6512
6817
msgid "Generate a shell function for bash command line completion."
6515
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6820
#: breezy/plugins/bash_completion/bashcomp.py:414
6517
6822
"This command generates a shell function which can be used by bash to\n"
6518
6823
"automatically complete the currently typed command when the user presses\n"
6519
6824
"the completion key (usually tab)."
6522
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6827
#: breezy/plugins/bash_completion/bashcomp.py:418
6524
6829
"Commonly used like this:\n"
6525
6830
" eval \"`bzr bash-completion`\""
6528
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6833
# help of 'function-name' option of 'bash-completion' command
6834
#: breezy/plugins/bash_completion/bashcomp.py:424
6529
6835
msgid "Name of the generated function (default: _bzr)"
6532
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6838
# help of 'function-only' option of 'bash-completion' command
6839
#: breezy/plugins/bash_completion/bashcomp.py:426
6533
6840
msgid "Generate only the shell function, don't enable it"
6536
#: bzrlib/plugins/launchpad/account.py:66
6843
#: breezy/plugins/grep/cmds.py:77
6844
msgid "Print lines matching PATTERN for specified files and revisions."
6847
#: breezy/plugins/grep/cmds.py:79
6849
"This command searches the specified files and revisions for a given\n"
6850
"pattern. The pattern is specified as a Python regular expressions[1]."
6853
#: breezy/plugins/grep/cmds.py:82
6855
"If the file name is not specified, the revisions starting with the\n"
6856
"current directory are searched recursively. If the revision number is\n"
6857
"not specified, the working copy is searched. To search the last committed\n"
6858
"revision, use the '-r -1' or '-r last:1' option."
6861
#: breezy/plugins/grep/cmds.py:87
6863
"Unversioned files are not searched unless explicitly specified on the\n"
6864
"command line. Unversioned directores are not searched."
6867
#: breezy/plugins/grep/cmds.py:90
6869
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6870
"format. If a revision is explicitly searched, the output is shown as\n"
6871
"'filepath~N:string', where N is the revision number."
6874
#: breezy/plugins/grep/cmds.py:94
6876
"--include and --exclude options can be used to search only (or exclude\n"
6877
"from search) files with base name matches the specified Unix style GLOB\n"
6878
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6879
"to quote wildcard or backslash character literally. Note that the glob\n"
6880
"pattern is not a regular expression."
6883
#: breezy/plugins/grep/cmds.py:100
6884
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6887
# help of 'color' option of 'grep' command
6888
#: breezy/plugins/grep/cmds.py:109
6889
msgid "Show match in color. WHEN is never, always or auto."
6892
# help of 'diff' option of 'grep' command
6893
#: breezy/plugins/grep/cmds.py:111
6894
msgid "Grep for pattern in changeset for each revision."
6897
# help of 'exclude' option of 'grep' command
6898
#: breezy/plugins/grep/cmds.py:113
6899
msgid "Skip files whose base name matches GLOB."
6902
# help of 'include' option of 'grep' command
6903
#: breezy/plugins/grep/cmds.py:115
6904
msgid "Search only files whose base name matches GLOB."
6907
# help of 'files-with-matches' option of 'grep' command
6908
#: breezy/plugins/grep/cmds.py:117
6909
msgid "Print only the name of each input file in which PATTERN is found."
6912
# help of 'files-without-match' option of 'grep' command
6913
#: breezy/plugins/grep/cmds.py:120
6914
msgid "Print only the name of each input file in which PATTERN is not found."
6917
# help of 'fixed-string' option of 'grep' command
6918
#: breezy/plugins/grep/cmds.py:123
6919
msgid "Interpret PATTERN is a single fixed string (not regex)."
6922
# help of 'from-root' option of 'grep' command
6923
#: breezy/plugins/grep/cmds.py:125
6925
"Search for pattern starting from the root of the branch. (implies --"
6929
# help of 'ignore-case' option of 'grep' command
6930
#: breezy/plugins/grep/cmds.py:128
6931
msgid "ignore case distinctions while matching."
6934
# help of 'levels' option of 'grep' command
6935
#: breezy/plugins/grep/cmds.py:130
6937
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6940
# help of 'line-number' option of 'grep' command
6941
#: breezy/plugins/grep/cmds.py:135
6942
msgid "show 1-based line number."
6945
# help of 'no-recursive' option of 'grep' command
6946
#: breezy/plugins/grep/cmds.py:137
6947
msgid "Don't recurse into subdirectories. (default is --recursive)"
6950
# help of 'null' option of 'grep' command
6951
#: breezy/plugins/grep/cmds.py:139
6953
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6957
#: breezy/plugins/launchpad/account.py:66
6537
6958
msgid "Setting ssh/sftp usernames for launchpad.net."
6540
#: bzrlib/plugins/launchpad/cmds.py:44
6961
#: breezy/plugins/launchpad/cmds.py:43
6541
6962
msgid "Register a branch with launchpad.net."
6544
#: bzrlib/plugins/launchpad/cmds.py:46
6965
#: breezy/plugins/launchpad/cmds.py:45
6546
6967
"This command lists a bzr branch in the directory of branches on\n"
6547
6968
"launchpad.net. Registration allows the branch to be associated with\n"
6548
6969
"bugs or specifications."
6551
#: bzrlib/plugins/launchpad/cmds.py:50
6972
#: breezy/plugins/launchpad/cmds.py:49
6553
6974
"Before using this command you must register the project to which the\n"
6554
6975
"branch belongs, and create an account for yourself on launchpad.net."
6557
#: bzrlib/plugins/launchpad/cmds.py:53
6978
#: breezy/plugins/launchpad/cmds.py:52
6560
6981
" public_url: The publicly visible url for the branch to register.\n"
6566
6987
" otherwise error."
6569
#: bzrlib/plugins/launchpad/cmds.py:62
6990
#: breezy/plugins/launchpad/cmds.py:61
6572
6993
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6573
6994
" --project fooproject"
6576
#: bzrlib/plugins/launchpad/cmds.py:69
6997
# help of 'project' option of 'register-branch' command
6998
#: breezy/plugins/launchpad/cmds.py:68
6577
6999
msgid "Launchpad project short name to associate with the branch."
6580
#: bzrlib/plugins/launchpad/cmds.py:76
7002
# help of 'branch-name' option of 'register-branch' command
7003
#: breezy/plugins/launchpad/cmds.py:75
6582
7005
"Short name for the branch; by default taken from the last component of the "
6586
#: bzrlib/plugins/launchpad/cmds.py:80
7009
# help of 'branch-title' option of 'register-branch' command
7010
#: breezy/plugins/launchpad/cmds.py:79
6587
7011
msgid "One-sentence description of the branch."
6590
#: bzrlib/plugins/launchpad/cmds.py:83
7014
# help of 'branch-description' option of 'register-branch' command
7015
#: breezy/plugins/launchpad/cmds.py:82
6591
7016
msgid "Longer description of the purpose or contents of the branch."
6594
#: bzrlib/plugins/launchpad/cmds.py:86
7019
# help of 'author' option of 'register-branch' command
7020
#: breezy/plugins/launchpad/cmds.py:85
6595
7021
msgid "Branch author's email address, if not yourself."
6598
#: bzrlib/plugins/launchpad/cmds.py:89
7024
# help of 'link-bug' option of 'register-branch' command
7025
#: breezy/plugins/launchpad/cmds.py:88
6599
7026
msgid "The bug this branch fixes."
6602
#: bzrlib/plugins/launchpad/cmds.py:92
7029
# help of 'dry-run' option of 'register-branch' command
7030
#: breezy/plugins/launchpad/cmds.py:91
6603
7031
msgid "Prepare the request but don't actually send it."
6606
#: bzrlib/plugins/launchpad/cmds.py:114
7034
#: breezy/plugins/launchpad/cmds.py:113
6608
7036
"register-branch requires a public branch url - see bzr help register-branch."
6611
#: bzrlib/plugins/launchpad/cmds.py:122
7039
#: breezy/plugins/launchpad/cmds.py:121
6612
7040
msgid "--product is deprecated; please use --project."
6615
#: bzrlib/plugins/launchpad/cmds.py:152
7043
#: breezy/plugins/launchpad/cmds.py:151
6616
7044
msgid "Open a Launchpad branch page in your web browser."
6619
#: bzrlib/plugins/launchpad/cmds.py:157
7047
# help of 'dry-run' option of 'launchpad-open' command
7048
#: breezy/plugins/launchpad/cmds.py:156
6620
7049
msgid "Do not actually open the browser. Just say the URL we would use."
6623
#: bzrlib/plugins/launchpad/cmds.py:192
7052
#: breezy/plugins/launchpad/cmds.py:191
6624
7053
#, python-format
6625
7054
msgid "Opening %s in web browser"
6628
#: bzrlib/plugins/launchpad/cmds.py:200
7057
#: breezy/plugins/launchpad/cmds.py:199
6629
7058
msgid "Show or set the Launchpad user ID."
6632
#: bzrlib/plugins/launchpad/cmds.py:202
7061
#: breezy/plugins/launchpad/cmds.py:201
6634
7063
"When communicating with Launchpad, some commands need to know your\n"
6635
7064
"Launchpad user ID. This command can be used to set or show the\n"
6636
7065
"user ID that Bazaar will use for such communication."
6639
#: bzrlib/plugins/launchpad/cmds.py:206
7068
#: breezy/plugins/launchpad/cmds.py:205
6642
7071
" Show the Launchpad ID of the current user::"
6645
#: bzrlib/plugins/launchpad/cmds.py:209
7074
#: breezy/plugins/launchpad/cmds.py:208
6646
7075
msgid " bzr launchpad-login"
6649
#: bzrlib/plugins/launchpad/cmds.py:211
7078
#: breezy/plugins/launchpad/cmds.py:210
6650
7079
msgid " Set the Launchpad ID of the current user to 'bob'::"
6653
#: bzrlib/plugins/launchpad/cmds.py:213
7082
#: breezy/plugins/launchpad/cmds.py:212
6654
7083
msgid " bzr launchpad-login bob"
6657
#: bzrlib/plugins/launchpad/cmds.py:220
7086
# help of 'no-check' option of 'launchpad-login' command
7087
#: breezy/plugins/launchpad/cmds.py:219
6658
7088
msgid "Don't check that the user name is valid."
6661
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7091
#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245
6662
7092
msgid "Launchpad user ID exists and has SSH keys.\n"
6665
#: bzrlib/plugins/launchpad/cmds.py:238
7095
#: breezy/plugins/launchpad/cmds.py:237
6666
7096
msgid "No Launchpad user ID configured.\n"
6669
#: bzrlib/plugins/launchpad/cmds.py:249
7099
#: breezy/plugins/launchpad/cmds.py:248
6670
7100
#, python-format
6671
7101
msgid "Launchpad user ID set to '%s'.\n"
6674
#: bzrlib/plugins/launchpad/cmds.py:255
7104
#: breezy/plugins/launchpad/cmds.py:254
6675
7105
msgid "Ask Launchpad to mirror a branch now."
6678
#: bzrlib/plugins/launchpad/cmds.py:272
7108
#: breezy/plugins/launchpad/cmds.py:271
6679
7109
msgid "Propose merging a branch on Launchpad."
6682
#: bzrlib/plugins/launchpad/cmds.py:274
7112
#: breezy/plugins/launchpad/cmds.py:273
6684
7114
"This will open your usual editor to provide the initial comment. When it\n"
6685
7115
"has created the proposal, it will open it in your default web browser."
6688
#: bzrlib/plugins/launchpad/cmds.py:277
7118
#: breezy/plugins/launchpad/cmds.py:276
6690
7120
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6691
7121
"is not supplied, the remembered submit branch will be used. If no submit\n"
6692
7122
"branch is remembered, the development focus will be used."
6695
#: bzrlib/plugins/launchpad/cmds.py:281
7125
#: breezy/plugins/launchpad/cmds.py:280
6697
7127
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6698
7128
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6700
7130
"may optionally be followed by '=' and the review type. For example:"
6703
#: bzrlib/plugins/launchpad/cmds.py:286
7133
#: breezy/plugins/launchpad/cmds.py:285
6704
7134
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6707
#: bzrlib/plugins/launchpad/cmds.py:288
7137
#: breezy/plugins/launchpad/cmds.py:287
6709
7139
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6710
7140
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6713
#: bzrlib/plugins/launchpad/cmds.py:293
7143
# help of 'staging' option of 'lp-propose-merge' command
7144
#: breezy/plugins/launchpad/cmds.py:292
6714
7145
msgid "Propose the merge on staging."
6717
#: bzrlib/plugins/launchpad/cmds.py:295
7148
# help of 'message' option of 'lp-propose-merge' command
7149
#: breezy/plugins/launchpad/cmds.py:294
6718
7150
msgid "Commit message."
6721
#: bzrlib/plugins/launchpad/cmds.py:297
6722
msgid "Mark the proposal as approved immediately."
7153
# help of 'approve' option of 'lp-propose-merge' command
7154
#: breezy/plugins/launchpad/cmds.py:296
7156
"Mark the proposal as approved immediately, setting the approved revision to "
6725
#: bzrlib/plugins/launchpad/cmds.py:298
7160
# help of 'fixes' option of 'lp-propose-merge' command
7161
#: breezy/plugins/launchpad/cmds.py:298
6726
7162
msgid "The bug this proposal fixes."
6729
#: bzrlib/plugins/launchpad/cmds.py:300
7165
# help of 'review' option of 'lp-propose-merge' command
7166
#: breezy/plugins/launchpad/cmds.py:300
6730
7167
msgid "Requested reviewer and optional type."
6733
#: bzrlib/plugins/launchpad/cmds.py:335
7170
#: breezy/plugins/launchpad/cmds.py:335
6734
7171
msgid "Find the proposal to merge this revision."
6737
#: bzrlib/plugins/launchpad/cmds.py:337
7174
#: breezy/plugins/launchpad/cmds.py:337
6739
7176
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6740
"This works only if the selected branch was the merge proposal target, and\n"
6741
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6742
"are opened in a web browser."
7177
"This works only if the if the merged_revno was recorded for the merge\n"
7178
"proposal. The proposal(s) are opened in a web browser."
6745
#: bzrlib/plugins/launchpad/cmds.py:342
7181
#: breezy/plugins/launchpad/cmds.py:341
6747
"Any revision involved in the merge may be specified-- the revision in\n"
6748
"which the merge was performed, or one of the revisions that was merged."
7183
"Only the revision specified is searched for. To find the mainline\n"
7184
"revision that merged it into mainline, use the \"mainline\" revision spec."
6751
#: bzrlib/plugins/launchpad/cmds.py:345
7187
#: breezy/plugins/launchpad/cmds.py:344
6752
7188
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6755
#: bzrlib/plugins/launchpad/cmds.py:347
6756
msgid " bzr lp-find-proposal -r annotate:README:1"
7191
#: breezy/plugins/launchpad/cmds.py:346
7192
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
6759
#: bzrlib/plugins/launchpad/cmds.py:363
7195
#: breezy/plugins/launchpad/cmds.py:365
6760
7196
msgid "No review found."
6763
#: bzrlib/plugins/launchpad/cmds.py:364
7199
#: breezy/plugins/launchpad/cmds.py:366
6764
7200
#, python-format
6765
7201
msgid "%d proposals(s) found."
6768
#: bzrlib/plugins/launchpad/cmds.py:374
6769
msgid "Finding revision-id"
6772
#: bzrlib/plugins/launchpad/cmds.py:381
6773
msgid "Finding merge"
6776
#: bzrlib/plugins/launchpad/cmds.py:386
6777
msgid "Finding revno"
6780
#: bzrlib/plugins/launchpad/cmds.py:392
6781
msgid "Finding Launchpad branch"
6784
#: bzrlib/plugins/launchpad/cmds.py:395
7204
#: breezy/plugins/launchpad/cmds.py:378
6785
7205
msgid "Finding proposals"
6788
#: bzrlib/plugins/launchpad/lp_api.py:241
6789
#: bzrlib/plugins/launchpad/lp_api.py:246
7208
#: breezy/plugins/launchpad/lp_api.py:231
7209
#: breezy/plugins/launchpad/lp_api.py:236
6790
7210
#, python-format
6791
7211
msgid "%s is not registered on Launchpad"
6794
#: bzrlib/plugins/launchpad/lp_api.py:256
7214
#: breezy/plugins/launchpad/lp_api.py:246
6795
7215
#, python-format
6796
7216
msgid "%s has no development focus."
6799
#: bzrlib/plugins/launchpad/lp_api.py:261
7219
#: breezy/plugins/launchpad/lp_api.py:251
6800
7220
#, python-format
6801
7221
msgid "development focus %s has no branch."
6804
#: bzrlib/plugins/launchpad/lp_api.py:266
7224
#: breezy/plugins/launchpad/lp_api.py:256
6805
7225
#, python-format
6806
7226
msgid "source package %s has no branch."
6809
#: bzrlib/plugins/launchpad/lp_api.py:270
7229
#: breezy/plugins/launchpad/lp_api.py:260
6810
7230
#, python-format
6811
7231
msgid "%s has no associated product or source package."
6814
#: bzrlib/plugins/launchpad/lp_api.py:282
7234
#: breezy/plugins/launchpad/lp_api.py:272
6815
7235
#, python-format
6816
7236
msgid "%s is already up-to-date."
6819
#: bzrlib/plugins/launchpad/lp_api.py:289
7239
#: breezy/plugins/launchpad/lp_api.py:279
6820
7240
#, python-format
6821
7241
msgid "Pushing to %s"
6824
#: bzrlib/plugins/launchpad/lp_directory.py:170
7244
#: breezy/plugins/launchpad/lp_directory.py:170
7245
#, python-brace-format
6826
7247
"resolution for {0}\n"
6827
7248
" local: {1}\n"
6831
#: bzrlib/plugins/launchpad/lp_propose.py:150
7252
#: breezy/plugins/launchpad/lp_propose.py:161
6832
7253
#, python-format
6833
7254
msgid "There is already a branch merge proposal: %s"
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7257
#: breezy/plugins/weave_fmt/bzrdir.py:237
6837
7258
msgid "pb parameter to convert() is deprecated"
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7261
#: breezy/plugins/weave_fmt/bzrdir.py:240
6841
7262
msgid "starting upgrade from format 4 to 5"
6844
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7265
#: breezy/plugins/weave_fmt/bzrdir.py:250
6845
7266
msgid "note: upgrade may be faster if all store files are ungzipped first"
6848
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7269
#: breezy/plugins/weave_fmt/bzrdir.py:279
6849
7270
msgid "converting revision"
6852
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7273
#: breezy/plugins/weave_fmt/bzrdir.py:284
6853
7274
msgid "upgraded to weaves:"
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7277
#: breezy/plugins/weave_fmt/bzrdir.py:285
6857
7278
#, python-format
6858
7279
msgid "%6d revisions and inventories"
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7282
#: breezy/plugins/weave_fmt/bzrdir.py:287
6862
7283
#, python-format
6863
7284
msgid "%6d revisions not present"
6866
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7287
#: breezy/plugins/weave_fmt/bzrdir.py:289
6867
7288
#, python-format
6868
7289
msgid "%6d texts"
6871
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7292
#: breezy/plugins/weave_fmt/bzrdir.py:325
6872
7293
msgid "writing weave"
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7296
#: breezy/plugins/weave_fmt/bzrdir.py:329
7297
#: breezy/plugins/weave_fmt/bzrdir.py:331
6877
7298
msgid "inventory"
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7301
#: breezy/plugins/weave_fmt/bzrdir.py:348
6881
7302
msgid "write revision"
6884
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7305
#: breezy/plugins/weave_fmt/bzrdir.py:362
6885
7306
msgid "loading revision"
6888
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7309
#: breezy/plugins/weave_fmt/bzrdir.py:367
6889
7310
#, python-format
6890
7311
msgid "revision {%s} not present in branch; will be converted as a ghost"
6893
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7314
#: breezy/plugins/weave_fmt/bzrdir.py:507
6894
7315
msgid "starting upgrade from format 5 to 6"
6897
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7318
#: breezy/plugins/weave_fmt/bzrdir.py:517
6898
7319
#, python-format
6899
7320
msgid "adding prefixes to %s"
6902
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7323
#: breezy/plugins/weave_fmt/bzrdir.py:557
6903
7324
msgid "starting upgrade from format 6 to metadir"
6906
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7327
#: breezy/plugins/weave_fmt/bzrdir.py:565
6907
7328
msgid "Removing ancestry.weave"
6910
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7331
#: breezy/plugins/weave_fmt/bzrdir.py:570
6911
7332
msgid "Finding branch files"
6914
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7335
#: breezy/plugins/weave_fmt/bzrdir.py:580
6915
7336
msgid "Upgrading repository"
6918
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7339
#: breezy/plugins/weave_fmt/bzrdir.py:590
6919
7340
msgid "Upgrading branch"
6922
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7343
#: breezy/plugins/weave_fmt/bzrdir.py:613
6923
7344
msgid "No working tree."
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7347
#: breezy/plugins/weave_fmt/bzrdir.py:620
6927
7348
msgid "Upgrading working tree"
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7351
#: breezy/plugins/weave_fmt/bzrdir.py:641
6931
7352
#, python-format
6932
7353
msgid "Make %s lock"
6935
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7356
#: breezy/plugins/weave_fmt/bzrdir.py:652
6936
7357
#, python-format
6937
7358
msgid "Moving %s"
6940
#: bzrlib/push.py:56
7361
#: breezy/push.py:56
6941
7362
msgid "Created new branch."
6944
#: bzrlib/push.py:97
7365
#: breezy/push.py:97
6945
7366
#, python-format
6947
7368
"Target directory %s already contains a .bzr directory, but it is not valid."
6950
#: bzrlib/push.py:101
7371
#: breezy/push.py:101
6951
7372
#, python-format
6953
7374
"Target directory %s already exists, but does not have a .bzr directory. "
6954
7375
"Supply --use-existing-dir to push there anyway."
6957
#: bzrlib/push.py:122
7378
#: breezy/push.py:122
6958
7379
#, python-format
6959
7380
msgid "Too many redirections trying to make %s."
6962
#: bzrlib/push.py:148
7383
#: breezy/push.py:148
6964
7385
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6968
#: bzrlib/push.py:152
7389
#: breezy/push.py:152
6969
7390
#, python-format
6971
7392
"It is not possible to losslessly push to %s. You may want to use dpush "
6975
#: bzrlib/push.py:158
7396
#: breezy/push.py:158
6976
7397
#, python-format
6978
7399
"At %s you have a valid .bzr control directory, but not a branch or "
6980
7401
"directory out of the way and try again."
6983
#: bzrlib/reconcile.py:97
7404
#: breezy/reconcile.py:97
6984
7405
#, python-format
6985
7406
msgid "Reconciling branch %s"
6988
#: bzrlib/reconcile.py:103
7409
#: breezy/reconcile.py:103
6989
7410
#, python-format
6990
7411
msgid "Reconciling repository %s"
6993
#: bzrlib/reconcile.py:105
7414
#: breezy/reconcile.py:105
6994
7415
msgid "Reconciling repository"
6997
#: bzrlib/reconcile.py:111
7418
#: breezy/reconcile.py:111
6998
7419
#, python-format
6999
7420
msgid "%s cannot canonicalize CHKs."
7002
#: bzrlib/reconcile.py:119
7423
#: breezy/reconcile.py:119
7003
7424
msgid "Reconcile aborted: revision index has inconsistent parents."
7006
#: bzrlib/reconcile.py:121
7427
#: breezy/reconcile.py:121
7007
7428
msgid "Run \"bzr check\" for more details."
7010
#: bzrlib/reconcile.py:123
7431
#: breezy/reconcile.py:123
7011
7432
msgid "Reconciliation complete."
7014
#: bzrlib/reconcile.py:166
7435
#: breezy/reconcile.py:166
7436
#, python-brace-format
7015
7437
msgid "Fixing last revision info {0} => {1}"
7018
#: bzrlib/reconcile.py:173
7440
#: breezy/reconcile.py:173
7019
7441
msgid "revision_history ok."
7022
#: bzrlib/reconcile.py:234
7444
#: breezy/reconcile.py:234
7023
7445
msgid "Reading inventory data"
7026
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7448
#: breezy/reconcile.py:254 breezy/reconcile.py:384
7027
7449
msgid "Inventory ok."
7030
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7452
#: breezy/reconcile.py:256 breezy/reconcile.py:386
7031
7453
msgid "Backing up inventory"
7034
#: bzrlib/reconcile.py:258
7456
#: breezy/reconcile.py:258
7035
7457
msgid "Backup inventory created."
7038
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7460
#: breezy/reconcile.py:274 breezy/reconcile.py:405
7039
7461
msgid "Writing weave"
7042
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7464
#: breezy/reconcile.py:277 breezy/reconcile.py:408
7043
7465
msgid "Inventory regenerated."
7046
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7468
#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376
7047
7469
msgid "Reading indexes"
7050
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7472
#: breezy/reconcile.py:380 breezy/reconcile.py:382
7051
7473
msgid "Checking unused inventories"
7054
#: bzrlib/reconcile.py:388
7476
#: breezy/reconcile.py:388
7055
7477
msgid "Backup Inventory created"
7058
#: bzrlib/reconcile.py:446
7480
#: breezy/reconcile.py:446
7059
7481
msgid "Fixing text parents"
7062
#: bzrlib/reconfigure.py:54
7484
#: breezy/reconfigure.py:54
7485
#, python-brace-format
7063
7486
msgid "{0} is now stacked on {1}\n"
7066
#: bzrlib/reconfigure.py:69
7489
#: breezy/reconfigure.py:69
7067
7490
#, python-format
7068
7491
msgid "%s is now not stacked\n"
7071
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7494
#: breezy/remote.py:1228 breezy/repository.py:289
7072
7495
#, python-format
7073
7496
msgid "bzr: ERROR (ignored): %s"
7076
#: bzrlib/remote.py:2534
7499
#: breezy/remote.py:2534
7077
7500
msgid "Copying repository content as tarball..."
7080
#: bzrlib/rename_map.py:69
7503
#: breezy/rename_map.py:69
7081
7504
msgid "Calculating hashes"
7084
#: bzrlib/rename_map.py:107
7507
#: breezy/rename_map.py:107
7085
7508
msgid "Determining hash hits"
7088
#: bzrlib/rename_map.py:242
7511
#: breezy/rename_map.py:242
7512
#, python-brace-format
7089
7513
msgid "{0} => {1}"
7092
#: bzrlib/repository.py:1738
7516
#: breezy/repository.py:1738
7093
7517
msgid "Moving repository to repository.backup"
7096
#: bzrlib/repository.py:1745
7520
#: breezy/repository.py:1745
7097
7521
msgid "Creating new repository"
7100
#: bzrlib/repository.py:1750
7524
#: breezy/repository.py:1750
7101
7525
msgid "Copying content"
7104
#: bzrlib/repository.py:1754
7528
#: breezy/repository.py:1754
7105
7529
msgid "Deleting old repository content"
7108
#: bzrlib/repository.py:1756
7532
#: breezy/repository.py:1756
7109
7533
msgid "repository converted"
7112
#: bzrlib/revisionspec.py:903
7536
#: breezy/revisionspec.py:903
7537
#, python-brace-format
7113
7538
msgid "Using {0} {1}"
7116
#: bzrlib/send.py:59
7541
#: breezy/send.py:59
7117
7542
#, python-format
7118
7543
msgid "Mail client \"%s\" does not support specifying body"
7121
#: bzrlib/send.py:63
7546
#: breezy/send.py:63
7122
7547
msgid "--remember requires a branch to be specified."
7125
#: bzrlib/send.py:78
7550
#: breezy/send.py:78
7126
7551
msgid "No submit branch known or specified"
7129
#: bzrlib/send.py:81
7554
#: breezy/send.py:81
7555
#, python-brace-format
7130
7556
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7133
#: bzrlib/send.py:99
7559
#: breezy/send.py:99
7134
7560
#, python-format
7135
7561
msgid "No such send format '%s'."
7138
#: bzrlib/send.py:115
7564
#: breezy/send.py:115
7139
7565
msgid "bzr send takes at most two one revision identifiers"
7142
#: bzrlib/send.py:128
7568
#: breezy/send.py:128
7143
7569
msgid "No revisions to submit."
7146
#: bzrlib/send.py:140
7572
#: breezy/send.py:140
7148
7574
"- not supported for merge directives that use more than one output file."
7151
#: bzrlib/send.py:186
7577
#: breezy/send.py:186
7152
7578
msgid "Format 0.9 does not permit bundle with no patch"
7155
#: bzrlib/shelf_ui.py:46
7581
#: breezy/shelf_ui.py:46
7156
7582
#, python-format
7157
7583
msgid "Shelve adding file \"%(path)s\"?"
7160
#: bzrlib/shelf_ui.py:47
7586
#: breezy/shelf_ui.py:47
7161
7587
msgid "Shelve binary changes?"
7164
#: bzrlib/shelf_ui.py:48
7590
#: breezy/shelf_ui.py:48
7165
7591
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7168
#: bzrlib/shelf_ui.py:50
7594
#: breezy/shelf_ui.py:50
7169
7595
#, python-format
7170
7596
msgid "Shelve removing file \"%(path)s\"?"
7173
#: bzrlib/shelf_ui.py:51
7599
#: breezy/shelf_ui.py:51
7174
7600
#, python-format
7175
7601
msgid "Shelve %d change(s)?"
7178
#: bzrlib/shelf_ui.py:52
7604
#: breezy/shelf_ui.py:52
7179
7605
msgid "Shelve?"
7182
#: bzrlib/shelf_ui.py:53
7608
#: breezy/shelf_ui.py:53
7183
7609
#, python-format
7185
7611
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7188
#: bzrlib/shelf_ui.py:55
7614
#: breezy/shelf_ui.py:55
7189
7615
#, python-format
7190
7616
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7193
#: bzrlib/shelf_ui.py:70
7619
#: breezy/shelf_ui.py:70
7194
7620
#, python-format
7195
7621
msgid "Changes shelved with id \"%d\"."
7198
#: bzrlib/shelf_ui.py:74
7624
#: breezy/shelf_ui.py:74
7199
7625
msgid "Selected changes destroyed."
7202
#: bzrlib/shelf_ui.py:78
7628
#: breezy/shelf_ui.py:78
7203
7629
msgid "Selected changes:"
7206
#: bzrlib/shelf_ui.py:98
7632
#: breezy/shelf_ui.py:98
7207
7633
#, python-format
7208
7634
msgid "Delete file \"%(path)s\"?"
7211
#: bzrlib/shelf_ui.py:99
7637
#: breezy/shelf_ui.py:99
7212
7638
msgid "Apply binary changes?"
7215
#: bzrlib/shelf_ui.py:100
7641
#: breezy/shelf_ui.py:100
7216
7642
#, python-format
7217
7643
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7220
#: bzrlib/shelf_ui.py:102
7646
#: breezy/shelf_ui.py:102
7221
7647
#, python-format
7222
7648
msgid "Add file \"%(path)s\"?"
7225
#: bzrlib/shelf_ui.py:103
7651
#: breezy/shelf_ui.py:103
7226
7652
#, python-format
7227
7653
msgid "Apply %d change(s)?"
7230
#: bzrlib/shelf_ui.py:104
7656
#: breezy/shelf_ui.py:104
7231
7657
msgid "Apply change?"
7234
#: bzrlib/shelf_ui.py:105
7660
#: breezy/shelf_ui.py:105
7235
7661
#, python-format
7236
7662
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7239
#: bzrlib/shelf_ui.py:107
7665
#: breezy/shelf_ui.py:107
7240
7666
#, python-format
7241
7667
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7244
#: bzrlib/shelf_ui.py:402
7670
#: breezy/shelf_ui.py:402
7245
7671
msgid "No changes are shelved."
7248
#: bzrlib/shelf_ui.py:460
7674
#: breezy/shelf_ui.py:460
7249
7675
#, python-format
7250
7676
msgid "Using changes with id \"%d\"."
7253
#: bzrlib/shelf_ui.py:464
7679
#: breezy/shelf_ui.py:464
7254
7680
#, python-format
7255
7681
msgid "Message: %s"
7258
#: bzrlib/shelf_ui.py:476
7684
#: breezy/shelf_ui.py:476
7259
7685
#, python-format
7260
7686
msgid "Deleted changes with id \"%d\"."
7263
#: bzrlib/smart/medium.py:714
7689
#: breezy/smart/medium.py:714
7690
#, python-brace-format
7264
7691
msgid "HPSS calls: {0} ({1} vfs) {2}"
7267
#: bzrlib/smart/server.py:169
7694
#: breezy/smart/ping.py:32
7695
msgid "Pings a Bazaar smart server."
7698
#: breezy/smart/ping.py:34
7700
"This command sends a 'hello' request to the given location using the bzr\n"
7701
"smart protocol, and reports the response."
7704
#: breezy/smart/server.py:169
7268
7705
msgid "Requested to stop gracefully"
7271
#: bzrlib/smart/server.py:179
7708
#: breezy/smart/server.py:179
7272
7709
#, python-format
7273
7710
msgid "Waiting for %d client(s) to finish"
7276
#: bzrlib/smart/server.py:185
7713
#: breezy/smart/server.py:185
7277
7714
#, python-format
7278
7715
msgid "Still waiting for %d client(s) to finish"
7281
#: bzrlib/smart/server.py:219
7718
#: breezy/smart/server.py:219
7282
7719
#, python-format
7283
7720
msgid "listening socket error: %s"
7286
#: bzrlib/smart/server.py:452
7723
#: breezy/smart/server.py:452
7287
7724
#, python-format
7288
7725
msgid "listening on port: %s"
7291
#: bzrlib/switch.py:73
7728
#: breezy/switch.py:84
7292
7729
msgid "Pending merges must be committed or reverted before using switch."
7295
#: bzrlib/switch.py:100
7732
#: breezy/switch.py:111
7297
7734
"Cannot switch as local commits found in the checkout. Commit these to the "
7298
7735
"bound branch or use --force to throw them away."
7301
#: bzrlib/switch.py:105
7738
#: breezy/switch.py:116
7302
7739
#, python-format
7304
7741
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7305
7742
"anyway, use --force."
7308
#: bzrlib/switch.py:129
7745
#: breezy/switch.py:140
7309
7746
msgid "Cannot switch a branch, only a checkout."
7312
#: bzrlib/switch.py:167
7749
#: breezy/switch.py:183
7313
7750
#, python-format
7314
7751
msgid "Tree is up to date at revision %d."
7317
#: bzrlib/switch.py:173
7754
#: breezy/switch.py:190
7318
7755
#, python-format
7319
7756
msgid "Updated to revision %d."
7322
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7759
#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736
7323
7760
msgid "Apply phase"
7326
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7763
#: breezy/transform.py:1762 breezy/transform.py:1830
7327
7764
msgid "removing file"
7330
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7767
#: breezy/transform.py:1780 breezy/transform.py:1865
7331
7768
msgid "adding file"
7334
#: bzrlib/transform.py:2598
7771
#: breezy/transform.py:2598
7335
7772
msgid "Building tree"
7338
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7775
#: breezy/transform.py:2688 breezy/transform.py:2715
7339
7776
msgid "Adding file contents"
7342
#: bzrlib/transform.py:3017
7779
#: breezy/transform.py:3017
7343
7780
msgid "Resolution pass"
7346
#: bzrlib/transport/ftp/_gssapi.py:88
7783
#: breezy/transport/ftp/_gssapi.py:88
7347
7784
#, python-format
7348
7785
msgid "Authenticated as %s"
7351
#: bzrlib/tree.py:647
7788
#: breezy/tree.py:647
7352
7789
msgid "*** {0} content-filter: {1} => {2!r}"
7355
#: bzrlib/upgrade.py:77
7792
#: breezy/upgrade.py:77
7356
7793
#, python-format
7357
7794
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7360
#: bzrlib/upgrade.py:100
7797
#: breezy/upgrade.py:100
7361
7798
#, python-format
7362
7799
msgid "cannot upgrade from bzrdir format %s"
7365
#: bzrlib/upgrade.py:103
7802
#: breezy/upgrade.py:103
7366
7803
#, python-format
7367
7804
msgid "starting upgrade of %s"
7370
#: bzrlib/upgrade.py:110
7807
#: breezy/upgrade.py:110
7371
7808
msgid "finished"
7374
#: bzrlib/upgrade.py:120
7811
#: breezy/upgrade.py:120
7375
7812
msgid "Deleting backup.bzr"
7378
#: bzrlib/upgrade.py:151
7815
#: breezy/upgrade.py:151
7816
#, python-brace-format
7381
7819
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7384
#: bzrlib/upgrade.py:208
7822
#: breezy/upgrade.py:208
7385
7823
#, python-format
7386
7824
msgid "Found %d dependent branches - upgrading ..."
7389
#: bzrlib/upgrade.py:276
7827
#: breezy/upgrade.py:276
7390
7828
msgid "Upgrading bzrdirs"
7393
#: bzrlib/upgrade.py:282
7831
#: breezy/upgrade.py:282
7394
7832
#, python-format
7395
7833
msgid "Upgrading %s"
7398
#: bzrlib/upgrade.py:283
7836
#: breezy/upgrade.py:283
7837
#, python-brace-format
7399
7838
msgid "Upgrading {0} {1} ..."
7402
#: bzrlib/upgrade.py:301
7841
#: breezy/upgrade.py:301
7403
7842
msgid "Removing backup ..."
7406
#: bzrlib/upgrade.py:305
7845
#: breezy/upgrade.py:305
7846
#, python-brace-format
7407
7847
msgid "failed to clean-up {0}: {1}"
7410
#: bzrlib/vf_repository.py:1091
7850
#: breezy/vf_repository.py:1091
7411
7851
msgid "inventories"
7414
#: bzrlib/vf_repository.py:1117
7854
#: breezy/vf_repository.py:1117
7418
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7858
#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631
7419
7859
msgid "Calculating text parents"
7422
#: bzrlib/vf_repository.py:1707
7862
#: breezy/vf_repository.py:1707
7423
7863
msgid "Fetch texts"
7426
#: bzrlib/vf_repository.py:2536
7866
#: breezy/vf_repository.py:2536
7427
7867
msgid "loading text store"
7430
#: bzrlib/vf_repository.py:2542
7870
#: breezy/vf_repository.py:2542
7431
7871
msgid "checking text graph"
7434
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7435
#: bzrlib/vf_repository.py:3127
7874
#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012
7875
#: breezy/vf_repository.py:3127
7436
7876
msgid "Transferring revisions"
7439
#: bzrlib/win32utils.py:146
7879
#: breezy/win32utils.py:146
7440
7880
msgid "Failed to GetProcessMemoryInfo()"
7443
#: bzrlib/win32utils.py:167
7883
#: breezy/win32utils.py:167
7444
7884
msgid "Cannot debug memory on win32 without ctypes or win32process"
7447
#: bzrlib/win32utils.py:172
7887
#: breezy/win32utils.py:172
7888
#, python-brace-format
7448
7889
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7451
#: bzrlib/win32utils.py:180
7892
#: breezy/win32utils.py:180
7452
7893
#, python-format
7453
7894
msgid "WorkingSize %8d KiB"
7456
#: bzrlib/win32utils.py:181
7897
#: breezy/win32utils.py:181
7457
7898
#, python-format
7458
7899
msgid "PeakWorking %8d KiB"
7461
#: bzrlib/win32utils.py:182
7902
#: breezy/win32utils.py:182
7462
7903
#, python-format
7463
7904
msgid "PagefileUsage %8d KiB"
7466
#: bzrlib/win32utils.py:183
7907
#: breezy/win32utils.py:183
7467
7908
#, python-format
7468
7909
msgid "PeakPagefileUsage %8d KiB"
7471
#: bzrlib/win32utils.py:185
7912
#: breezy/win32utils.py:185
7472
7913
#, python-format
7473
7914
msgid "PrivateUsage %8d KiB"
7476
#: bzrlib/win32utils.py:186
7917
#: breezy/win32utils.py:186
7477
7918
#, python-format
7478
7919
msgid "PageFaultCount %8d"
7481
#: bzrlib/workingtree.py:1482
7922
#: breezy/workingtree.py:1516
7482
7923
msgid "Rerun update after fixing the conflicts."