149
149
# help of 'short' option of 'status' command
150
#: brzlib/builtins.py:375
150
#: breezy/builtins.py:375
151
151
msgid "Use short status indicators."
154
154
# help of 'versioned' option of 'status' command
155
#: brzlib/builtins.py:377
155
#: breezy/builtins.py:377
156
156
msgid "Only show versioned files."
159
159
# help of 'no-pending' option of 'status' command
160
#: brzlib/builtins.py:379
160
#: breezy/builtins.py:379
161
161
msgid "Don't show pending merges."
164
164
# help of 'no-classify' option of 'status' command
165
#: brzlib/builtins.py:382
165
#: breezy/builtins.py:382
166
166
msgid "Do not mark object type using indicator."
169
#: brzlib/builtins.py:397
169
#: breezy/builtins.py:397
170
170
msgid "brz status --revision takes exactly one or two revision specifiers"
173
#: brzlib/builtins.py:441 brzlib/builtins.py:5229
173
#: breezy/builtins.py:441 breezy/builtins.py:5229
174
174
msgid "You can only supply one of revision_id or --revision"
177
#: brzlib/builtins.py:444 brzlib/builtins.py:5231
177
#: breezy/builtins.py:444 breezy/builtins.py:5231
178
178
msgid "You must supply either --revision or a revision_id"
181
#: brzlib/builtins.py:451
181
#: breezy/builtins.py:451
183
183
msgid "Repository %r does not support access to raw revision texts"
186
#: brzlib/builtins.py:462
186
#: breezy/builtins.py:462
187
187
#, python-brace-format
188
188
msgid "The repository {0} contains no revision {1}."
191
#: brzlib/builtins.py:469
191
#: breezy/builtins.py:469
192
192
msgid "You cannot specify a NULL revision."
195
#: brzlib/builtins.py:561
195
#: breezy/builtins.py:561
196
196
msgid "Remove the working tree from a given branch/checkout."
199
#: brzlib/builtins.py:563
199
#: breezy/builtins.py:563
201
201
"Since a lightweight checkout is little more than a working tree\n"
202
202
"this will refuse to run against one."
205
#: brzlib/builtins.py:566
205
#: breezy/builtins.py:566
206
206
msgid "To re-create the working tree, use \"brz checkout\"."
209
209
# help of 'force' option of 'remove-tree' command
210
#: brzlib/builtins.py:572
210
#: breezy/builtins.py:572
211
211
msgid "Remove the working tree even if it has uncommitted or shelved changes."
214
#: brzlib/builtins.py:586
214
#: breezy/builtins.py:586
215
215
msgid "No working tree to remove"
218
#: brzlib/builtins.py:588
218
#: breezy/builtins.py:588
219
219
msgid "You cannot remove the working tree of a remote path"
222
#: brzlib/builtins.py:597
222
#: breezy/builtins.py:597
223
223
msgid "You cannot remove the working tree from a lightweight checkout"
226
#: brzlib/builtins.py:637
226
#: breezy/builtins.py:637
228
228
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
229
229
"instead. Use \"--force\" if you are sure you want to reset the working tree."
232
#: brzlib/builtins.py:648
232
#: breezy/builtins.py:648
234
234
", the header appears corrupt, try passing -r -1 to set the state to the last "
238
#: brzlib/builtins.py:652
238
#: breezy/builtins.py:652
239
239
#, python-brace-format
240
240
msgid "failed to reset the tree state{0}"
243
#: brzlib/builtins.py:656
243
#: breezy/builtins.py:656
244
244
msgid "Show current revision number."
247
#: brzlib/builtins.py:658
247
#: breezy/builtins.py:658
248
248
msgid "This is equal to the number of revisions on this branch."
251
#: brzlib/builtins.py:671
251
#: breezy/builtins.py:671
252
252
msgid "--tree and --revision can not be used together"
255
#: brzlib/builtins.py:688
255
#: breezy/builtins.py:688
256
256
msgid "Revision numbers only make sense for single revisions, not ranges"
259
259
# help of 'tree' option of 'revno' command
260
#: brzlib/builtins.py:712
260
#: breezy/builtins.py:712
261
261
msgid "Show revno of working tree."
264
#: brzlib/builtins.py:760
264
#: breezy/builtins.py:760
265
265
msgid "Add specified files or directories."
268
#: brzlib/builtins.py:762
268
#: breezy/builtins.py:762
270
270
"In non-recursive mode, all the named items are added, regardless\n"
271
271
"of whether they were previously ignored. A warning is given if\n"
272
272
"any of the named files are already versioned."
275
#: brzlib/builtins.py:766
275
#: breezy/builtins.py:766
277
277
"In recursive mode (the default), files are treated the same way\n"
278
278
"but the behaviour for directories is different. Directories that\n"
491
491
# help of 'verbose' option of 'pull' command
492
#: brzlib/builtins.py:1146
492
#: breezy/builtins.py:1146
493
493
msgid "Show logs of pulled revisions."
496
496
# help of 'directory' option of 'pull' command
497
#: brzlib/builtins.py:1148
497
#: breezy/builtins.py:1148
499
499
"Branch to pull into, rather than the one containing the working directory."
502
502
# help of 'local' option of 'pull' command
503
#: brzlib/builtins.py:1151
503
#: breezy/builtins.py:1151
505
505
"Perform a local pull in a bound branch. Local pulls are not applied to the "
509
#: brzlib/builtins.py:1188
509
#: breezy/builtins.py:1188
510
510
msgid "No working tree, ignoring --show-base"
513
#: brzlib/builtins.py:1204
513
#: breezy/builtins.py:1204
514
514
msgid "No pull location known or specified."
517
#: brzlib/builtins.py:1210
517
#: breezy/builtins.py:1210
519
519
msgid "Using saved parent location: %s\n"
522
#: brzlib/builtins.py:1217 brzlib/builtins.py:4423
522
#: breezy/builtins.py:1217 breezy/builtins.py:4423
523
523
msgid "Cannot use -r with merge directives or bundles"
526
#: brzlib/builtins.py:1260
526
#: breezy/builtins.py:1260
527
527
msgid "Update a mirror of this branch."
530
#: brzlib/builtins.py:1262
530
#: breezy/builtins.py:1262
532
532
"The target branch will not have its working tree populated because this\n"
533
533
"is both expensive, and is not supported on remote file systems."
536
#: brzlib/builtins.py:1265
536
#: breezy/builtins.py:1265
538
538
"Some smart servers or protocols *may* put the working tree in place in\n"
542
#: brzlib/builtins.py:1268
542
#: breezy/builtins.py:1268
544
544
"This command only works on branches that have not diverged. Branches are\n"
545
545
"considered diverged if the destination branch's most recent commit is one\n"
546
546
"that has not been merged (directly or indirectly) by the source branch."
549
#: brzlib/builtins.py:1272
549
#: breezy/builtins.py:1272
551
551
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
552
552
"the other branch completely, discarding its unmerged changes."
555
#: brzlib/builtins.py:1275
555
#: breezy/builtins.py:1275
557
557
"If you want to ensure you have the different changes in the other branch,\n"
558
558
"do a merge (see brz help merge) from the other branch, and commit that.\n"
559
559
"After that you will be able to do a push without '--overwrite'."
562
#: brzlib/builtins.py:1279
562
#: breezy/builtins.py:1279
564
564
"If there is no default push location set, the first push will set it (use\n"
565
565
"--no-remember to avoid setting it). After that, you can omit the\n"
657
657
"create ./foo-bar."
660
#: brzlib/builtins.py:1406
660
#: breezy/builtins.py:1406
662
662
"To retrieve the branch as of a particular revision, supply the --revision\n"
663
663
"parameter, as in \"branch foo/bar -r 5\"."
666
#: brzlib/builtins.py:1409
666
#: breezy/builtins.py:1409
667
667
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
670
670
# help of 'no-tree' option of 'branch' command
671
#: brzlib/builtins.py:1419
671
#: breezy/builtins.py:1419
672
672
msgid "Create a branch without a working-tree."
675
675
# help of 'switch' option of 'branch' command
676
#: brzlib/builtins.py:1421
676
#: breezy/builtins.py:1421
677
677
msgid "Switch the checkout in the current directory to the new branch."
680
680
# help of 'stacked' option of 'branch' command
681
#: brzlib/builtins.py:1424
681
#: breezy/builtins.py:1424
683
683
"Create a stacked branch referring to the source branch. The new branch will "
684
684
"depend on the availability of the source branch for all operations."
687
687
# help of 'standalone' option of 'branch' command
688
#: brzlib/builtins.py:1428
688
#: breezy/builtins.py:1428
689
689
msgid "Do not use a shared repository, even if available."
692
692
# help of 'use-existing-dir' option of 'branch' command
693
#: brzlib/builtins.py:1430
693
#: breezy/builtins.py:1430
695
695
"By default branch will fail if the target directory exists, but does not "
696
696
"already have a control directory. This flag will allow branch to proceed."
699
699
# help of 'bind' option of 'branch' command
700
#: brzlib/builtins.py:1435
700
#: breezy/builtins.py:1435
701
701
msgid "Bind new branch to from location."
704
#: brzlib/builtins.py:1482
704
#: breezy/builtins.py:1482
706
706
msgid "Target directory \"%s\" already exists."
709
#: brzlib/builtins.py:1494
709
#: breezy/builtins.py:1494
711
711
msgid "Parent of \"%s\" does not exist."
714
#: brzlib/builtins.py:1513
714
#: breezy/builtins.py:1513
715
715
#, python-brace-format
716
716
msgid "The branch {0} has no revision {1}."
719
#: brzlib/builtins.py:1528 brzlib/push.py:53
719
#: breezy/builtins.py:1528 breezy/push.py:53
721
721
msgid "Created new stacked branch referring to %s."
724
#: brzlib/builtins.py:1532
724
#: breezy/builtins.py:1532
726
726
msgid "Branched %d revision."
727
727
msgid_plural "Branched %d revisions."
731
#: brzlib/builtins.py:1537
731
#: breezy/builtins.py:1537
733
733
msgid "New branch bound to %s"
736
#: brzlib/builtins.py:1542 brzlib/builtins.py:6283
736
#: breezy/builtins.py:1542 breezy/builtins.py:6283
738
738
msgid "Switched to branch: %s"
741
#: brzlib/builtins.py:1547
741
#: breezy/builtins.py:1547
742
742
msgid "List the branches available at the current location."
745
#: brzlib/builtins.py:1549
745
#: breezy/builtins.py:1549
747
747
"This command will print the names of all the branches at the current\n"
751
751
# help of 'recursive' option of 'branches' command
752
#: brzlib/builtins.py:1556
752
#: breezy/builtins.py:1556
754
754
"Recursively scan for branches rather than just looking in the specified "
758
#: brzlib/builtins.py:1585
758
#: breezy/builtins.py:1585
759
759
msgid "(default)"
762
#: brzlib/builtins.py:1597
762
#: breezy/builtins.py:1597
763
763
msgid "Create a new checkout of an existing branch."
766
#: brzlib/builtins.py:1599
766
#: breezy/builtins.py:1599
768
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
863
863
"out the old content of that file to a new location."
866
#: brzlib/builtins.py:1723
866
#: breezy/builtins.py:1723
868
868
"The 'dir' argument, if given, must be the location of the root of a\n"
869
869
"working tree to update. By default, the working tree that contains the \n"
870
870
"current working directory is used."
873
#: brzlib/builtins.py:1739
873
#: breezy/builtins.py:1739
874
874
msgid "brz update --revision takes exactly one revision"
877
#: brzlib/builtins.py:1747
877
#: breezy/builtins.py:1747
878
878
msgid "brz update can only update a whole tree, not a file or subdirectory"
881
#: brzlib/builtins.py:1778
881
#: breezy/builtins.py:1778
882
882
#, python-brace-format
883
883
msgid "Tree is up to date at revision {0} of branch {1}"
886
#: brzlib/builtins.py:1794
886
#: breezy/builtins.py:1794
889
889
"branch has no revision %s\n"
890
890
"brz update --revision only works for a revision in the branch history"
893
#: brzlib/builtins.py:1800
893
#: breezy/builtins.py:1800
894
894
#, python-brace-format
895
895
msgid "Updated to revision {0} of branch {1}"
898
#: brzlib/builtins.py:1804
898
#: breezy/builtins.py:1804
900
900
"Your local commits will now show as pending merges with 'brz status', and "
901
901
"can be committed with 'brz commit'."
904
#: brzlib/builtins.py:1813
904
#: breezy/builtins.py:1813
905
905
msgid "Show information about a working tree, branch or repository."
908
#: brzlib/builtins.py:1815
908
#: breezy/builtins.py:1815
910
910
"This command will show all known locations and formats associated to the\n"
911
911
"tree, branch or repository."
914
#: brzlib/builtins.py:1818
914
#: breezy/builtins.py:1818
916
916
"In verbose mode, statistical information is included with each report.\n"
917
917
"To see extended statistic information, use a verbosity level of 2 or\n"
918
918
"higher by specifying the verbose option multiple times, e.g. -vv."
921
#: brzlib/builtins.py:1822
921
#: breezy/builtins.py:1822
922
922
msgid "Branches and working trees will also report any missing revisions."
925
#: brzlib/builtins.py:1824 brzlib/builtins.py:3742 brzlib/builtins.py:4883
926
#: brzlib/builtins.py:6469
925
#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
926
#: breezy/builtins.py:6469
927
927
msgid ":Examples:"
930
#: brzlib/builtins.py:1826
930
#: breezy/builtins.py:1826
931
931
msgid " Display information on the format and related locations:"
934
#: brzlib/builtins.py:1828
934
#: breezy/builtins.py:1828
935
935
msgid " brz info"
938
#: brzlib/builtins.py:1830
938
#: breezy/builtins.py:1830
940
940
" Display the above together with extended format information and\n"
941
941
" basic statistics (like the number of files in the working tree and\n"
942
942
" number of revisions in the branch and repository):"
945
#: brzlib/builtins.py:1834
945
#: breezy/builtins.py:1834
946
946
msgid " brz info -v"
949
#: brzlib/builtins.py:1836
949
#: breezy/builtins.py:1836
950
950
msgid " Display the above together with number of committers to the branch:"
953
#: brzlib/builtins.py:1838
953
#: breezy/builtins.py:1838
954
954
msgid " brz info -vv"
957
#: brzlib/builtins.py:1857
957
#: breezy/builtins.py:1857
958
958
msgid "Remove files or directories."
961
#: brzlib/builtins.py:1859
961
#: breezy/builtins.py:1859
963
963
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
964
964
"delete them if they can easily be recovered using revert otherwise they\n"
1240
1240
" 0 - no change"
1243
#: brzlib/builtins.py:2243
1243
#: breezy/builtins.py:2243
1246
1246
" Shows the difference in the working tree versus the last commit::"
1249
#: brzlib/builtins.py:2246
1249
#: breezy/builtins.py:2246
1250
1250
msgid " brz diff"
1253
#: brzlib/builtins.py:2248
1253
#: breezy/builtins.py:2248
1254
1254
msgid " Difference between the working tree and revision 1::"
1257
#: brzlib/builtins.py:2250
1257
#: breezy/builtins.py:2250
1258
1258
msgid " brz diff -r1"
1261
#: brzlib/builtins.py:2252
1261
#: breezy/builtins.py:2252
1262
1262
msgid " Difference between revision 3 and revision 1::"
1265
#: brzlib/builtins.py:2254
1265
#: breezy/builtins.py:2254
1266
1266
msgid " brz diff -r1..3"
1269
#: brzlib/builtins.py:2256
1269
#: breezy/builtins.py:2256
1270
1270
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1273
#: brzlib/builtins.py:2258
1273
#: breezy/builtins.py:2258
1274
1274
msgid " brz diff -r1..3 xxx"
1277
#: brzlib/builtins.py:2260
1277
#: breezy/builtins.py:2260
1278
1278
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1281
#: brzlib/builtins.py:2262
1281
#: breezy/builtins.py:2262
1282
1282
msgid " brz diff -c2"
1285
#: brzlib/builtins.py:2264
1285
#: breezy/builtins.py:2264
1287
1287
" To see the changes introduced by revision X::\n"
1289
1289
" brz diff -cX"
1292
#: brzlib/builtins.py:2268
1292
#: breezy/builtins.py:2268
1294
1294
" Note that in the case of a merge, the -c option shows the changes\n"
1295
1295
" compared to the left hand parent. To see the changes against\n"
1296
1296
" another parent, use::"
1299
#: brzlib/builtins.py:2272
1299
#: breezy/builtins.py:2272
1300
1300
msgid " brz diff -r<chosen_parent>..X"
1303
#: brzlib/builtins.py:2274
1303
#: breezy/builtins.py:2274
1305
1305
" The changes between the current revision and the previous revision\n"
1306
1306
" (equivalent to -c-1 and -r-2..-1)"
1309
#: brzlib/builtins.py:2277
1309
#: breezy/builtins.py:2277
1310
1310
msgid " brz diff -r-2.."
1313
#: brzlib/builtins.py:2279
1313
#: breezy/builtins.py:2279
1314
1314
msgid " Show just the differences for file NEWS::"
1317
#: brzlib/builtins.py:2281
1317
#: breezy/builtins.py:2281
1318
1318
msgid " brz diff NEWS"
1321
#: brzlib/builtins.py:2283
1321
#: breezy/builtins.py:2283
1322
1322
msgid " Show the differences in working tree xxx for file NEWS::"
1325
#: brzlib/builtins.py:2285
1325
#: breezy/builtins.py:2285
1326
1326
msgid " brz diff xxx/NEWS"
1329
#: brzlib/builtins.py:2287
1329
#: breezy/builtins.py:2287
1330
1330
msgid " Show the differences from branch xxx to this working tree:"
1333
#: brzlib/builtins.py:2289
1333
#: breezy/builtins.py:2289
1334
1334
msgid " brz diff --old xxx"
1337
#: brzlib/builtins.py:2291
1337
#: breezy/builtins.py:2291
1338
1338
msgid " Show the differences between two branches for file NEWS::"
1341
#: brzlib/builtins.py:2293
1341
#: breezy/builtins.py:2293
1342
1342
msgid " brz diff --old xxx --new yyy NEWS"
1345
#: brzlib/builtins.py:2295
1345
#: breezy/builtins.py:2295
1346
1346
msgid " Same as 'brz diff' but prefix paths with old/ and new/::"
1349
#: brzlib/builtins.py:2297
1349
#: breezy/builtins.py:2297
1351
1351
" brz diff --prefix old/:new/\n"
1358
1358
# help of 'diff-options' option of 'diff' command
1359
#: brzlib/builtins.py:2307
1359
#: breezy/builtins.py:2307
1360
1360
msgid "Pass these options to the external diff program."
1363
1363
# help of 'prefix' option of 'diff' command
1364
#: brzlib/builtins.py:2310
1364
#: breezy/builtins.py:2310
1366
1366
"Set prefixes added to old and new filenames, as two values separated by a "
1367
1367
"colon. (eg \"old/:new/\")."
1370
1370
# help of 'old' option of 'diff' command
1371
#: brzlib/builtins.py:2313
1371
#: breezy/builtins.py:2313
1372
1372
msgid "Branch/tree to compare from."
1375
1375
# help of 'new' option of 'diff' command
1376
#: brzlib/builtins.py:2317
1376
#: breezy/builtins.py:2317
1377
1377
msgid "Branch/tree to compare to."
1380
1380
# help of 'using' option of 'diff' command
1381
#: brzlib/builtins.py:2323
1381
#: breezy/builtins.py:2323
1382
1382
msgid "Use this command to compare files."
1385
1385
# help of 'format' option of 'diff' command
1386
#: brzlib/builtins.py:2328
1386
#: breezy/builtins.py:2328
1387
1387
msgid "Diff format to use."
1390
1390
# title of 'format' option of 'diff' command
1391
#: brzlib/builtins.py:2330
1391
#: breezy/builtins.py:2330
1392
1392
msgid "Diff format"
1395
1395
# help of 'context' option of 'diff' command
1396
#: brzlib/builtins.py:2332
1396
#: breezy/builtins.py:2332
1397
1397
msgid "How many lines of context to show."
1400
#: brzlib/builtins.py:2357
1400
#: breezy/builtins.py:2357
1401
1401
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1404
#: brzlib/builtins.py:2361
1404
#: breezy/builtins.py:2361
1405
1405
msgid "brz diff --revision takes exactly one or two revision specifiers"
1408
#: brzlib/builtins.py:2366 brzlib/builtins.py:2763 brzlib/builtins.py:2776
1409
#: brzlib/builtins.py:2784 brzlib/builtins.py:4957
1408
#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1409
#: breezy/builtins.py:2784 breezy/builtins.py:4957
1410
1410
#, python-brace-format
1411
1411
msgid "{0} and {1} are mutually exclusive"
1414
#: brzlib/builtins.py:2386
1414
#: breezy/builtins.py:2386
1416
1416
"List files deleted in the working tree.\n"
1420
#: brzlib/builtins.py:2463
1420
#: breezy/builtins.py:2463
1421
1421
msgid "Show the tree root directory."
1424
#: brzlib/builtins.py:2465
1424
#: breezy/builtins.py:2465
1426
1426
"The root is the nearest enclosing directory with a .bzr control\n"
1430
#: brzlib/builtins.py:2480
1430
#: breezy/builtins.py:2480
1431
1431
msgid "The limit argument must be an integer."
1434
#: brzlib/builtins.py:2488
1434
#: breezy/builtins.py:2488
1435
1435
msgid "The levels argument must be an integer."
1438
#: brzlib/builtins.py:2493
1438
#: breezy/builtins.py:2493
1439
1439
msgid "Show historical log for a branch or subset of a branch."
1442
#: brzlib/builtins.py:2495
1442
#: breezy/builtins.py:2495
1444
1444
"log is brz's default tool for exploring the history of a branch.\n"
1445
1445
"The branch to use is taken from the first parameter. If no parameters\n"
1561
1561
" a nested merge revision and the log will be truncated accordingly."
1564
#: brzlib/builtins.py:2569
1564
#: breezy/builtins.py:2569
1565
1565
msgid ":Path filtering:"
1568
#: brzlib/builtins.py:2571
1568
#: breezy/builtins.py:2571
1570
1570
" If parameters are given and the first one is not a branch, the log\n"
1571
1571
" will be filtered to show only those revisions that changed the\n"
1572
1572
" nominated files or directories."
1575
#: brzlib/builtins.py:2575
1575
#: breezy/builtins.py:2575
1577
1577
" Filenames are interpreted within their historical context. To log a\n"
1578
1578
" deleted file, specify a revision range so that the file existed at\n"
1579
1579
" the end or start of the range."
1582
#: brzlib/builtins.py:2579
1582
#: breezy/builtins.py:2579
1584
1584
" Historical context is also important when interpreting pathnames of\n"
1585
1585
" renamed files/directories. Consider the following example:"
1588
#: brzlib/builtins.py:2582
1588
#: breezy/builtins.py:2582
1590
1590
" * revision 1: add tutorial.txt\n"
1591
1591
" * revision 2: modify tutorial.txt\n"
1592
1592
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1595
#: brzlib/builtins.py:2586
1595
#: breezy/builtins.py:2586
1596
1596
msgid " In this case:"
1599
#: brzlib/builtins.py:2588
1599
#: breezy/builtins.py:2588
1600
1600
msgid " * ``brz log guide.txt`` will log the file added in revision 1"
1603
#: brzlib/builtins.py:2590
1603
#: breezy/builtins.py:2590
1604
1604
msgid " * ``brz log tutorial.txt`` will log the new file added in revision 3"
1607
#: brzlib/builtins.py:2592
1607
#: breezy/builtins.py:2592
1609
1609
" * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
1610
1610
" the original file in revision 2."
1613
#: brzlib/builtins.py:2595
1613
#: breezy/builtins.py:2595
1615
1615
" * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
1616
1616
" was no file called guide.txt in revision 2."
1619
#: brzlib/builtins.py:2598
1619
#: breezy/builtins.py:2598
1621
1621
" Renames are always followed by log. By design, there is no need to\n"
1622
1622
" explicitly ask for this (and no way to stop logging a file back\n"
1623
1623
" until it was last renamed)."
1626
#: brzlib/builtins.py:2602
1626
#: breezy/builtins.py:2602
1627
1627
msgid ":Other filtering:"
1630
#: brzlib/builtins.py:2604
1630
#: breezy/builtins.py:2604
1632
1632
" The --match option can be used for finding revisions that match a\n"
1633
1633
" regular expression in a commit message, committer, author or bug.\n"
1701
1701
# help of 'forward' option of 'log' command
1702
#: brzlib/builtins.py:2651
1702
#: breezy/builtins.py:2651
1703
1703
msgid "Show from oldest to newest."
1706
1706
# help of 'verbose' option of 'log' command
1707
#: brzlib/builtins.py:2654
1707
#: breezy/builtins.py:2654
1708
1708
msgid "Show files changed in each revision."
1711
1711
# help of 'change' option of 'log' command
1712
#: brzlib/builtins.py:2660
1712
#: breezy/builtins.py:2660
1713
1713
msgid "Show just the specified revision. See also \"help revisionspec\"."
1716
1716
# help of 'authors' option of 'log' command
1717
#: brzlib/builtins.py:2664
1717
#: breezy/builtins.py:2664
1718
1718
msgid "What names to list as authors - first, all or committer."
1721
1721
# title of 'authors' option of 'log' command
1722
#: brzlib/builtins.py:2665
1722
#: breezy/builtins.py:2665
1723
1723
msgid "Authors"
1726
1726
# help of 'levels' option of 'log' command
1727
#: brzlib/builtins.py:2670
1727
#: breezy/builtins.py:2670
1728
1728
msgid "Number of levels to display - 0 for all, 1 for flat."
1731
1731
# help of 'limit' option of 'log' command
1732
#: brzlib/builtins.py:2680
1732
#: breezy/builtins.py:2680
1733
1733
msgid "Limit the output to the first N revisions."
1736
1736
# help of 'show-diff' option of 'log' command
1737
#: brzlib/builtins.py:2685
1737
#: breezy/builtins.py:2685
1738
1738
msgid "Show changes made in each revision as a patch."
1741
1741
# help of 'include-merged' option of 'log' command
1742
#: brzlib/builtins.py:2687
1742
#: breezy/builtins.py:2687
1743
1743
msgid "Show merged revisions like --levels 0 does."
1746
1746
# help of 'omit-merges' option of 'log' command
1747
#: brzlib/builtins.py:2691
1747
#: breezy/builtins.py:2691
1748
1748
msgid "Do not report commits with more than one parent."
1751
1751
# help of 'exclude-common-ancestry' option of 'log' command
1752
#: brzlib/builtins.py:2693
1752
#: breezy/builtins.py:2693
1754
1754
"Display only the revisions that are not part of both ancestries (require -"
1758
1758
# help of 'signatures' option of 'log' command
1759
#: brzlib/builtins.py:2697
1759
#: breezy/builtins.py:2697
1760
1760
msgid "Show digital signature validity."
1763
1763
# help of 'match' option of 'log' command
1764
#: brzlib/builtins.py:2700
1764
#: breezy/builtins.py:2700
1765
1765
msgid "Show revisions whose properties match this expression."
1768
1768
# help of 'match-message' option of 'log' command
1769
#: brzlib/builtins.py:2704
1769
#: breezy/builtins.py:2704
1770
1770
msgid "Show revisions whose message matches this expression."
1773
1773
# help of 'match-committer' option of 'log' command
1774
#: brzlib/builtins.py:2708
1774
#: breezy/builtins.py:2708
1775
1775
msgid "Show revisions whose committer matches this expression."
1778
1778
# help of 'match-author' option of 'log' command
1779
#: brzlib/builtins.py:2712
1779
#: breezy/builtins.py:2712
1780
1780
msgid "Show revisions whose authors match this expression."
1783
1783
# help of 'match-bugs' option of 'log' command
1784
#: brzlib/builtins.py:2716
1784
#: breezy/builtins.py:2716
1785
1785
msgid "Show revisions whose bugs match this expression."
1788
#: brzlib/builtins.py:2770
1788
#: breezy/builtins.py:2770
1789
1789
msgid "--exclude-common-ancestry requires -r with two revisions"
1792
#: brzlib/builtins.py:2798
1792
#: breezy/builtins.py:2798
1793
1793
#, python-format
1794
1794
msgid "Path unknown at end or start of revision range: %s"
1797
#: brzlib/builtins.py:2915
1797
#: breezy/builtins.py:2915
1798
1798
#, python-format
1799
1799
msgid "brz %s doesn't accept two revisions in different branches."
1802
#: brzlib/builtins.py:2931
1802
#: breezy/builtins.py:2931
1803
1803
#, python-format
1804
1804
msgid "brz %s --revision takes one or two values."
1807
#: brzlib/builtins.py:2976
1807
#: breezy/builtins.py:2976
1809
1809
"List files in a tree.\n"
1813
1813
# help of 'recursive' option of 'ls' command
1814
#: brzlib/builtins.py:2985
1814
#: breezy/builtins.py:2985
1815
1815
msgid "Recurse into subdirectories."
1818
1818
# help of 'from-root' option of 'ls' command
1819
#: brzlib/builtins.py:2987
1819
#: breezy/builtins.py:2987
1820
1820
msgid "Print paths relative to the root of the branch."
1823
1823
# help of 'unknown' option of 'ls' command
1824
#: brzlib/builtins.py:2989
1824
#: breezy/builtins.py:2989
1825
1825
msgid "Print unknown files."
1828
1828
# help of 'versioned' option of 'ls' command
1829
#: brzlib/builtins.py:2990
1829
#: breezy/builtins.py:2990
1830
1830
msgid "Print versioned files."
1833
1833
# help of 'ignored' option of 'ls' command
1834
#: brzlib/builtins.py:2993
1834
#: breezy/builtins.py:2993
1835
1835
msgid "Print ignored files."
1838
1838
# help of 'kind' option of 'ls' command
1839
#: brzlib/builtins.py:2995
1839
#: breezy/builtins.py:2995
1840
1840
msgid "List entries of a particular kind: file, directory, symlink."
1843
#: brzlib/builtins.py:3008
1843
#: breezy/builtins.py:3008
1844
1844
msgid "invalid kind specified"
1847
#: brzlib/builtins.py:3011
1847
#: breezy/builtins.py:3011
1848
1848
msgid "Cannot set both --verbose and --null"
1851
#: brzlib/builtins.py:3020
1851
#: breezy/builtins.py:3020
1852
1852
msgid "cannot specify both --from-root and PATH"
1855
#: brzlib/builtins.py:3107
1855
#: breezy/builtins.py:3107
1856
1856
msgid "Ignore specified files or patterns."
1859
#: brzlib/builtins.py:3109
1859
#: breezy/builtins.py:3109
1860
1860
msgid "See ``brz help patterns`` for details on the syntax of patterns."
1863
#: brzlib/builtins.py:3111
1863
#: breezy/builtins.py:3111
1865
1865
"If a .bzrignore file does not exist, the ignore command\n"
1866
1866
"will create one and add the specified files or patterns to the newly\n"
2008
#: brzlib/builtins.py:3236
2008
#: breezy/builtins.py:3236
2009
2009
msgid "List ignored files and the patterns that matched them."
2012
#: brzlib/builtins.py:3238
2012
#: breezy/builtins.py:3238
2014
2014
"List all the ignored files and the ignore pattern that caused the file to\n"
2018
#: brzlib/builtins.py:3241
2018
#: breezy/builtins.py:3241
2019
2019
msgid "Alternatively, to list just the files::"
2022
#: brzlib/builtins.py:3243
2022
#: breezy/builtins.py:3243
2023
2023
msgid " brz ls --ignored"
2026
#: brzlib/builtins.py:3277
2026
#: breezy/builtins.py:3277
2027
2027
#, python-format
2028
2028
msgid "not a valid revision-number: %r"
2031
#: brzlib/builtins.py:3284
2031
#: breezy/builtins.py:3284
2032
2032
msgid "Export current or past revision to a destination directory or archive."
2035
#: brzlib/builtins.py:3286
2035
#: breezy/builtins.py:3286
2036
2036
msgid "If no revision is specified this exports the last committed revision."
2039
#: brzlib/builtins.py:3288
2039
#: breezy/builtins.py:3288
2041
2041
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2042
2042
"given, try to find the format with the extension. If no extension\n"
2043
2043
"is found exports to a directory (equivalent to --format=dir)."
2046
#: brzlib/builtins.py:3292
2046
#: breezy/builtins.py:3292
2048
2048
"If root is supplied, it will be used as the root directory inside\n"
2049
2049
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2050
2050
"to the exported filename. The root option has no effect for 'dir' format."
2053
#: brzlib/builtins.py:3296
2053
#: breezy/builtins.py:3296
2055
2055
"If branch is omitted then the branch containing the current working\n"
2056
2056
"directory will be used."
2059
#: brzlib/builtins.py:3299
2059
#: breezy/builtins.py:3299
2060
2060
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2063
#: brzlib/builtins.py:3301
2063
#: breezy/builtins.py:3301
2065
2065
" ================= =========================\n"
2066
2066
" Supported formats Autodetected by extension\n"
2076
2076
# help of 'format' option of 'export' command
2077
#: brzlib/builtins.py:3315
2077
#: breezy/builtins.py:3315
2078
2078
msgid "Type of file to export to."
2081
2081
# help of 'filters' option of 'export' command
2082
#: brzlib/builtins.py:3318
2082
#: breezy/builtins.py:3318
2083
2083
msgid "Apply content filters to export the convenient form."
2086
2086
# help of 'root' option of 'export' command
2087
#: brzlib/builtins.py:3322
2087
#: breezy/builtins.py:3322
2088
2088
msgid "Name of the root directory inside the exported file."
2091
2091
# help of 'per-file-timestamps' option of 'export' command
2092
#: brzlib/builtins.py:3324
2092
#: breezy/builtins.py:3324
2094
2094
"Set modification time of files to that of the last revision in which it was "
2098
2098
# help of 'uncommitted' option of 'export' command
2099
#: brzlib/builtins.py:3327
2099
#: breezy/builtins.py:3327
2100
2100
msgid "Export the working tree contents rather than that of the last revision."
2103
#: brzlib/builtins.py:3346
2103
#: breezy/builtins.py:3346
2104
2104
msgid "--uncommitted requires a working tree"
2107
#: brzlib/builtins.py:3355
2107
#: breezy/builtins.py:3355
2108
2108
#, python-format
2109
2109
msgid "Unsupported export format: %s"
2112
#: brzlib/builtins.py:3359
2112
#: breezy/builtins.py:3359
2113
2113
msgid "Write the contents of a file as of a given revision to standard output."
2116
#: brzlib/builtins.py:3361
2116
#: breezy/builtins.py:3361
2117
2117
msgid "If no revision is nominated, the last revision is used."
2120
#: brzlib/builtins.py:3363
2120
#: breezy/builtins.py:3363
2122
2122
"Note: Take care to redirect standard output when using this command on a\n"
2126
2126
# help of 'name-from-revision' option of 'cat' command
2127
#: brzlib/builtins.py:3369
2127
#: breezy/builtins.py:3369
2128
2128
msgid "The path name in the old tree."
2131
2131
# help of 'filters' option of 'cat' command
2132
#: brzlib/builtins.py:3370
2132
#: breezy/builtins.py:3370
2133
2133
msgid "Apply content filters to display the convenience form."
2136
#: brzlib/builtins.py:3381
2136
#: breezy/builtins.py:3381
2137
2137
msgid "brz cat --revision takes exactly one revision specifier"
2140
#: brzlib/builtins.py:3406 brzlib/builtins.py:3418
2140
#: breezy/builtins.py:3406 breezy/builtins.py:3418
2141
2141
msgid "{0!r} is not present in revision {1}"
2144
#: brzlib/builtins.py:3441
2144
#: breezy/builtins.py:3441
2145
2145
msgid "Commit changes into a new revision."
2148
#: brzlib/builtins.py:3443
2148
#: breezy/builtins.py:3443
2150
2150
"An explanatory message needs to be given for each commit. This is\n"
2151
2151
"often done by using the --message option (getting the message from the\n"
2237
2237
# help of 'exclude' option of 'commit' command
2238
#: brzlib/builtins.py:3501
2238
#: breezy/builtins.py:3501
2239
2239
msgid "Do not consider changes made to a given path."
2242
2242
# help of 'message' option of 'commit' command
2243
#: brzlib/builtins.py:3504
2243
#: breezy/builtins.py:3504
2244
2244
msgid "Description of the new revision."
2247
2247
# help of 'unchanged' option of 'commit' command
2248
#: brzlib/builtins.py:3507
2248
#: breezy/builtins.py:3507
2249
2249
msgid "Commit even if nothing has changed."
2252
2252
# help of 'file' option of 'commit' command
2253
#: brzlib/builtins.py:3511
2253
#: breezy/builtins.py:3511
2254
2254
msgid "Take commit message from this file."
2257
2257
# help of 'strict' option of 'commit' command
2258
#: brzlib/builtins.py:3513
2258
#: breezy/builtins.py:3513
2259
2259
msgid "Refuse to commit if there are unknown files in the working tree."
2262
2262
# help of 'commit-time' option of 'commit' command
2263
#: brzlib/builtins.py:3516
2263
#: breezy/builtins.py:3516
2265
2265
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2266
2266
"08:00:00 +0100'."
2269
2269
# help of 'fixes' option of 'commit' command
2270
#: brzlib/builtins.py:3519
2270
#: breezy/builtins.py:3519
2271
2271
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
2274
2274
# help of 'author' option of 'commit' command
2275
#: brzlib/builtins.py:3522
2275
#: breezy/builtins.py:3522
2276
2276
msgid "Set the author's name, if it's different from the committer."
2279
2279
# help of 'local' option of 'commit' command
2280
#: brzlib/builtins.py:3525
2280
#: breezy/builtins.py:3525
2282
2282
"Perform a local commit in a bound branch. Local commits are not pushed to "
2283
2283
"the master branch until a normal commit is performed."
2286
2286
# help of 'show-diff' option of 'commit' command
2287
#: brzlib/builtins.py:3531
2287
#: breezy/builtins.py:3531
2289
2289
"When no message is supplied, show the diff along with the status summary in "
2290
2290
"the message editor."
2293
2293
# help of 'lossy' option of 'commit' command
2294
#: brzlib/builtins.py:3534
2294
#: breezy/builtins.py:3534
2296
2296
"When committing to a foreign version control system do not push data that "
2297
2297
"can not be natively represented."
2300
#: brzlib/builtins.py:3552
2300
#: breezy/builtins.py:3552
2301
2301
#, python-format
2303
2303
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2313
2313
"Commit refused."
2316
#: brzlib/builtins.py:3570
2316
#: breezy/builtins.py:3570
2317
2317
#, python-format
2318
2318
msgid "Unrecognized bug %s. Commit refused."
2321
#: brzlib/builtins.py:3573
2321
#: breezy/builtins.py:3573
2322
2322
#, python-format
2325
2325
"Commit refused."
2328
#: brzlib/builtins.py:3597
2328
#: breezy/builtins.py:3597
2329
2329
msgid "Could not parse --commit-time: "
2332
#: brzlib/builtins.py:3637
2332
#: breezy/builtins.py:3637
2333
2333
msgid "please specify either --message or --file"
2336
#: brzlib/builtins.py:3666
2336
#: breezy/builtins.py:3666
2337
2337
msgid "please specify a commit message with either --message or --file"
2340
#: brzlib/builtins.py:3669
2340
#: breezy/builtins.py:3669
2342
2342
"Empty commit message specified. Please specify a commit message with either "
2343
2343
"--message or --file or leave a blank message with --message \"\"."
2346
#: brzlib/builtins.py:3689
2346
#: breezy/builtins.py:3689
2348
2348
"No changes to commit. Please 'brz add' the files you want to commit, or use "
2349
2349
"--unchanged to force an empty commit."
2352
#: brzlib/builtins.py:3693
2352
#: breezy/builtins.py:3693
2354
2354
"Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz "
2355
2355
"resolve FILE\" to resolve."
2358
#: brzlib/builtins.py:3697
2358
#: breezy/builtins.py:3697
2359
2359
msgid "Commit refused because there are unknown files in the working tree."
2362
#: brzlib/builtins.py:3700
2362
#: breezy/builtins.py:3700
2365
2365
"To commit to master branch, run update and then commit.\n"
2366
2366
"You can also pass --local to commit to continue working disconnected."
2369
#: brzlib/builtins.py:3708
2369
#: breezy/builtins.py:3708
2371
2371
"Validate working tree structure, branch consistency and repository history."
2374
#: brzlib/builtins.py:3710
2374
#: breezy/builtins.py:3710
2376
2376
"This command checks various invariants about branch and repository storage\n"
2377
2377
"to detect data corruption or brz bugs."
2380
#: brzlib/builtins.py:3713
2380
#: breezy/builtins.py:3713
2382
2382
"The working tree and branch checks will only give output if a problem is\n"
2383
2383
"detected. The output fields of the repository check are:"
2386
#: brzlib/builtins.py:3716
2386
#: breezy/builtins.py:3716
2389
2389
" This is just the number of revisions checked. It doesn't\n"
2390
2390
" indicate a problem."
2393
#: brzlib/builtins.py:3720
2393
#: breezy/builtins.py:3720
2395
2395
"versionedfiles\n"
2396
2396
" This is just the number of versionedfiles checked. It\n"
2397
2397
" doesn't indicate a problem."
2400
#: brzlib/builtins.py:3724
2400
#: breezy/builtins.py:3724
2402
2402
"unreferenced ancestors\n"
2403
2403
" Texts that are ancestors of other texts, but\n"
2512
#: brzlib/builtins.py:3806
2512
#: breezy/builtins.py:3806
2514
2514
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2515
2515
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2518
2518
# help of 'format' option of 'upgrade' command
2519
#: brzlib/builtins.py:3814
2519
#: breezy/builtins.py:3814
2520
2520
msgid "Upgrade to a specific format. See \"brz help formats\" for details."
2523
2523
# title of 'format' option of 'init' command
2524
2524
# title of 'format' option of 'upgrade' command
2525
#: brzlib/builtins.py:3818
2525
#: breezy/builtins.py:3818
2526
2526
msgid "Branch format"
2529
2529
# help of 'clean' option of 'upgrade' command
2530
#: brzlib/builtins.py:3820
2530
#: breezy/builtins.py:3820
2531
2531
msgid "Remove the backup.bzr directory if successful."
2534
2534
# help of 'dry-run' option of 'add' command
2535
2535
# help of 'dry-run' option of 'upgrade' command
2536
#: brzlib/builtins.py:3822
2536
#: breezy/builtins.py:3822
2537
2537
msgid "Show what would be done, but don't actually do anything."
2540
#: brzlib/builtins.py:3837
2540
#: breezy/builtins.py:3837
2541
2541
msgid "Show or set brz user id."
2544
#: brzlib/builtins.py:3839
2544
#: breezy/builtins.py:3839
2547
2547
" Show the email of the current user::"
2550
#: brzlib/builtins.py:3842
2550
#: breezy/builtins.py:3842
2551
2551
msgid " brz whoami --email"
2554
#: brzlib/builtins.py:3844
2554
#: breezy/builtins.py:3844
2555
2555
msgid " Set the current user::"
2558
#: brzlib/builtins.py:3846
2558
#: breezy/builtins.py:3846
2559
2559
msgid " brz whoami \"Frank Chu <fchu@example.com>\""
2562
2562
# help of 'email' option of 'whoami' command
2563
#: brzlib/builtins.py:3850
2563
#: breezy/builtins.py:3850
2564
2564
msgid "Display email address only."
2567
2567
# help of 'branch' option of 'whoami' command
2568
#: brzlib/builtins.py:3852
2568
#: breezy/builtins.py:3852
2569
2569
msgid "Set identity for the current branch instead of globally."
2572
#: brzlib/builtins.py:3878
2572
#: breezy/builtins.py:3878
2573
2573
msgid "--email can only be used to display existing identity"
2576
#: brzlib/builtins.py:3902
2576
#: breezy/builtins.py:3902
2577
2577
msgid "Print or set the branch nickname."
2580
#: brzlib/builtins.py:3904
2580
#: breezy/builtins.py:3904
2582
2582
"If unset, the colocated branch name is used for colocated branches, and\n"
2583
2583
"the branch directory name is used for other branches. To print the\n"
2584
2584
"current nickname, execute with no argument."
2587
#: brzlib/builtins.py:3908
2587
#: breezy/builtins.py:3908
2589
2589
"Bound branches use the nickname of its master branch unless it is set\n"
2593
#: brzlib/builtins.py:3928
2593
#: breezy/builtins.py:3928
2594
2594
msgid "Set/unset and display aliases."
2597
#: brzlib/builtins.py:3930
2597
#: breezy/builtins.py:3930
2600
2600
" Show the current aliases::"
2603
#: brzlib/builtins.py:3933
2603
#: breezy/builtins.py:3933
2604
2604
msgid " brz alias"
2607
#: brzlib/builtins.py:3935
2607
#: breezy/builtins.py:3935
2608
2608
msgid " Show the alias specified for 'll'::"
2611
#: brzlib/builtins.py:3937
2611
#: breezy/builtins.py:3937
2612
2612
msgid " brz alias ll"
2615
#: brzlib/builtins.py:3939
2615
#: breezy/builtins.py:3939
2616
2616
msgid " Set an alias for 'll'::"
2619
#: brzlib/builtins.py:3941
2619
#: breezy/builtins.py:3941
2620
2620
msgid " brz alias ll=\"log --line -r-10..-1\""
2623
#: brzlib/builtins.py:3943
2623
#: breezy/builtins.py:3943
2624
2624
msgid " To remove an alias for 'll'::"
2627
#: brzlib/builtins.py:3945
2627
#: breezy/builtins.py:3945
2628
2628
msgid " brz alias --remove ll"
2631
2631
# help of 'remove' option of 'alias' command
2632
#: brzlib/builtins.py:3950
2632
#: breezy/builtins.py:3950
2633
2633
msgid "Remove the alias."
2636
#: brzlib/builtins.py:3968
2636
#: breezy/builtins.py:3968
2637
2637
msgid "brz alias --remove expects an alias to remove."
2640
#: brzlib/builtins.py:4149
2640
#: breezy/builtins.py:4149
2641
2641
msgid "subunit not available. subunit needs to be installed to use --subunit."
2644
#: brzlib/builtins.py:4166
2644
#: breezy/builtins.py:4166
2646
2646
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
2649
#: brzlib/builtins.py:4213
2649
#: breezy/builtins.py:4213
2650
2650
msgid "Show version of brz."
2653
2653
# help of 'short' option of 'version' command
2654
#: brzlib/builtins.py:4217
2654
#: breezy/builtins.py:4217
2655
2655
msgid "Print just the version number."
2658
#: brzlib/builtins.py:4236
2658
#: breezy/builtins.py:4236
2659
2659
msgid "It sure does!\n"
2662
#: brzlib/builtins.py:4260
2662
#: breezy/builtins.py:4260
2663
2663
#, python-format
2664
2664
msgid "merge base is revision %s\n"
2667
#: brzlib/builtins.py:4264
2667
#: breezy/builtins.py:4264
2668
2668
msgid "Perform a three-way merge."
2671
#: brzlib/builtins.py:4266
2671
#: breezy/builtins.py:4266
2673
2673
"The source of the merge can be specified either in the form of a branch,\n"
2674
2674
"or in the form of a path to a file containing a merge directive generated\n"
2825
2825
# help of 'directory' option of 'merge' command
2826
#: brzlib/builtins.py:4365
2826
#: breezy/builtins.py:4365
2828
2828
"Branch to merge into, rather than the one containing the working directory."
2831
2831
# help of 'preview' option of 'merge' command
2832
#: brzlib/builtins.py:4367
2832
#: breezy/builtins.py:4367
2833
2833
msgid "Instead of merging, show a diff of the merge."
2836
2836
# help of 'interactive' option of 'merge' command
2837
#: brzlib/builtins.py:4369
2837
#: breezy/builtins.py:4369
2838
2838
msgid "Select changes interactively."
2841
#: brzlib/builtins.py:4391
2841
#: breezy/builtins.py:4391
2843
2843
"Merging into empty branches not currently supported, https://bugs.launchpad."
2844
2844
"net/brz/+bug/308562"
2847
#: brzlib/builtins.py:4418
2847
#: breezy/builtins.py:4418
2848
2848
msgid "Cannot use --uncommitted with bundles or merge directives."
2851
#: brzlib/builtins.py:4429
2851
#: breezy/builtins.py:4429
2852
2852
msgid "Cannot use --uncommitted and --revision at the same time."
2855
#: brzlib/builtins.py:4449
2855
#: breezy/builtins.py:4449
2856
2856
msgid "merger: "
2859
#: brzlib/builtins.py:4451 brzlib/bundle/apply_bundle.py:71
2859
#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
2860
2860
msgid "Nothing to do."
2863
#: brzlib/builtins.py:4455
2863
#: breezy/builtins.py:4455
2864
2864
msgid "Cannot pull individual files"
2867
#: brzlib/builtins.py:4463
2867
#: breezy/builtins.py:4463
2868
2868
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
2871
#: brzlib/builtins.py:4521
2871
#: breezy/builtins.py:4521
2872
2872
#, python-format
2873
2873
msgid "Show-base is not supported for this merge type. %s"
2876
#: brzlib/builtins.py:4530
2876
#: breezy/builtins.py:4530
2877
2877
#, python-format
2878
2878
msgid "Conflict reduction is not supported for merge type %s."
2881
#: brzlib/builtins.py:4534
2881
#: breezy/builtins.py:4534
2882
2882
msgid "Cannot do conflict reduction and show base."
2885
#: brzlib/builtins.py:4645
2885
#: breezy/builtins.py:4645
2886
2886
msgid "No location specified or remembered"
2889
#: brzlib/builtins.py:4647
2889
#: breezy/builtins.py:4647
2890
2890
#, python-brace-format
2891
2891
msgid "{0} remembered {1} location {2}"
2894
#: brzlib/builtins.py:4653
2894
#: breezy/builtins.py:4653
2895
2895
msgid "Redo a merge."
2898
#: brzlib/builtins.py:4655
2898
#: breezy/builtins.py:4655
2900
2900
"Use this if you want to try a different merge technique while resolving\n"
2901
2901
"conflicts. Some merge techniques are better than others, and remerge\n"
2902
2902
"lets you try different ones on different files."
2905
#: brzlib/builtins.py:4659
2905
#: breezy/builtins.py:4659
2907
2907
"The options for remerge have the same meaning and defaults as the ones for\n"
2908
2908
"merge. The difference is that remerge can (only) be run when there is a\n"
2909
2909
"pending merge, and it lets you specify particular files."
2912
#: brzlib/builtins.py:4663
2912
#: breezy/builtins.py:4663
2915
2915
" Re-do the merge of all conflicted files, and show the base text in\n"
2916
2916
" conflict regions, in addition to the usual THIS and OTHER texts::"
2919
#: brzlib/builtins.py:4667
2919
#: breezy/builtins.py:4667
2920
2920
msgid " brz remerge --show-base"
2923
#: brzlib/builtins.py:4669
2923
#: breezy/builtins.py:4669
2925
2925
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2926
2926
" additional processing to reduce the size of conflict regions::"
2929
#: brzlib/builtins.py:4672
2929
#: breezy/builtins.py:4672
2930
2930
msgid " brz remerge --merge-type weave --reprocess foobar"
3060
3060
" 0 - no missing revisions"
3063
#: brzlib/builtins.py:4885
3063
#: breezy/builtins.py:4885
3065
3065
" Determine the missing revisions between this and the branch at the\n"
3066
3066
" remembered pull location::"
3069
#: brzlib/builtins.py:4888
3069
#: breezy/builtins.py:4888
3070
3070
msgid " brz missing"
3073
#: brzlib/builtins.py:4890
3073
#: breezy/builtins.py:4890
3074
3074
msgid " Determine the missing revisions between this and another branch::"
3077
#: brzlib/builtins.py:4892
3077
#: breezy/builtins.py:4892
3078
3078
msgid " brz missing http://server/branch"
3081
#: brzlib/builtins.py:4894
3081
#: breezy/builtins.py:4894
3083
3083
" Determine the missing revisions up to a specific revision on the other\n"
3087
#: brzlib/builtins.py:4897
3087
#: breezy/builtins.py:4897
3088
3088
msgid " brz missing -r ..-10"
3091
#: brzlib/builtins.py:4899
3091
#: breezy/builtins.py:4899
3093
3093
" Determine the missing revisions up to a specific revision on this\n"
3097
#: brzlib/builtins.py:4902
3097
#: breezy/builtins.py:4902
3098
3098
msgid " brz missing --my-revision ..-10"
3101
3101
# help of 'reverse' option of 'missing' command
3102
#: brzlib/builtins.py:4909
3102
#: breezy/builtins.py:4909
3103
3103
msgid "Reverse the order of revisions."
3106
3106
# help of 'mine-only' option of 'missing' command
3107
#: brzlib/builtins.py:4911
3107
#: breezy/builtins.py:4911
3108
3108
msgid "Display changes in the local branch only."
3111
3111
# help of 'this' option of 'missing' command
3112
#: brzlib/builtins.py:4912
3112
#: breezy/builtins.py:4912
3113
3113
msgid "Same as --mine-only."
3116
3116
# help of 'theirs-only' option of 'missing' command
3117
#: brzlib/builtins.py:4914
3117
#: breezy/builtins.py:4914
3118
3118
msgid "Display changes in the remote branch only."
3121
3121
# help of 'other' option of 'missing' command
3122
#: brzlib/builtins.py:4915
3122
#: breezy/builtins.py:4915
3123
3123
msgid "Same as --theirs-only."
3126
3126
# help of 'revision' option of 'missing' command
3127
#: brzlib/builtins.py:4920
3127
#: breezy/builtins.py:4920
3129
3129
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3133
3133
# help of 'my-revision' option of 'missing' command
3134
#: brzlib/builtins.py:4924
3134
#: breezy/builtins.py:4924
3136
3136
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3140
3140
# help of 'include-merged' option of 'missing' command
3141
#: brzlib/builtins.py:4927
3141
#: breezy/builtins.py:4927
3142
3142
msgid "Show all revisions in addition to the mainline ones."
3145
#: brzlib/builtins.py:4981
3145
#: breezy/builtins.py:4981
3146
3146
msgid "No peer location known or specified."
3149
#: brzlib/builtins.py:4985
3149
#: breezy/builtins.py:4985
3150
3150
#, python-brace-format
3151
3151
msgid "Using saved parent location: {0}\n"
3154
#: brzlib/builtins.py:5018
3154
#: breezy/builtins.py:5018
3155
3155
#, python-format
3156
3156
msgid "You have %d extra revision:\n"
3157
3157
msgid_plural "You have %d extra revisions:\n"
3161
#: brzlib/builtins.py:5038
3161
#: breezy/builtins.py:5038
3162
3162
#, python-format
3163
3163
msgid "You are missing %d revision:\n"
3164
3164
msgid_plural "You are missing %d revisions:\n"
3168
#: brzlib/builtins.py:5053
3168
#: breezy/builtins.py:5053
3169
3169
msgid "This branch has no new revisions.\n"
3172
#: brzlib/builtins.py:5056
3172
#: breezy/builtins.py:5056
3173
3173
msgid "Other branch has no new revisions.\n"
3176
#: brzlib/builtins.py:5061
3176
#: breezy/builtins.py:5061
3177
3177
msgid "Branches are up to date.\n"
3180
#: brzlib/builtins.py:5072
3180
#: breezy/builtins.py:5072
3181
3181
msgid "Compress the data within a repository."
3184
#: brzlib/builtins.py:5074
3184
#: breezy/builtins.py:5074
3186
3186
"This operation compresses the data within a bazaar repository. As\n"
3187
3187
"bazaar supports automatic packing of repository, this operation is\n"
3188
3188
"normally not required to be done manually."
3191
#: brzlib/builtins.py:5078
3191
#: breezy/builtins.py:5078
3193
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3194
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3241
3241
"plugins using the Python programming language."
3244
#: brzlib/builtins.py:5136
3244
#: breezy/builtins.py:5136
3245
3245
msgid "Show testament (signing-form) of a revision."
3248
3248
# help of 'long' option of 'testament' command
3249
#: brzlib/builtins.py:5139
3249
#: breezy/builtins.py:5139
3250
3250
msgid "Produce long-format testament."
3253
3253
# help of 'strict' option of 'testament' command
3254
#: brzlib/builtins.py:5141
3254
#: breezy/builtins.py:5141
3255
3255
msgid "Produce a strict-format testament."
3258
#: brzlib/builtins.py:5168
3258
#: breezy/builtins.py:5168
3259
3259
msgid "Show the origin of each line in a file."
3262
#: brzlib/builtins.py:5170
3262
#: breezy/builtins.py:5170
3264
3264
"This prints out the given file with an annotation on the left side\n"
3265
3265
"indicating which revision, author and date introduced the change."
3268
#: brzlib/builtins.py:5173
3268
#: breezy/builtins.py:5173
3270
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3271
3271
"shown only at the top, unless the --all option is given."
3274
3274
# help of 'all' option of 'annotate' command
3275
#: brzlib/builtins.py:5181
3275
#: breezy/builtins.py:5181
3276
3276
msgid "Show annotations on all lines."
3279
3279
# help of 'long' option of 'annotate' command
3280
#: brzlib/builtins.py:5182
3280
#: breezy/builtins.py:5182
3281
3281
msgid "Show commit date in annotations."
3284
#: brzlib/builtins.py:5269
3284
#: breezy/builtins.py:5269
3285
3285
msgid "Cannot sign a range of non-revision-history revisions"
3288
#: brzlib/builtins.py:5281
3288
#: breezy/builtins.py:5281
3289
3289
msgid "Please supply either one revision, or a range."
3292
#: brzlib/builtins.py:5285
3292
#: breezy/builtins.py:5285
3294
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3295
3295
"If no branch is supplied, rebind to the last bound location."
3298
#: brzlib/builtins.py:5288
3298
#: breezy/builtins.py:5288
3300
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3301
3301
"before they will be applied to the local branch."
3304
#: brzlib/builtins.py:5291
3304
#: breezy/builtins.py:5291
3306
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3307
3307
"locally, in which case binding will update the local nickname to be\n"
3308
3308
"that of the master."
3311
#: brzlib/builtins.py:5306
3311
#: breezy/builtins.py:5306
3312
3312
msgid "No location supplied. This format does not remember old locations."
3315
#: brzlib/builtins.py:5312
3315
#: breezy/builtins.py:5312
3316
3316
msgid "Branch is already bound"
3319
#: brzlib/builtins.py:5315
3319
#: breezy/builtins.py:5315
3320
3320
msgid "No location supplied and no previous location known"
3323
#: brzlib/builtins.py:5321
3323
#: breezy/builtins.py:5321
3324
3324
msgid "These branches have diverged. Try merging, and then bind again."
3327
#: brzlib/builtins.py:5328
3327
#: breezy/builtins.py:5328
3328
3328
msgid "Convert the current checkout into a regular branch."
3331
#: brzlib/builtins.py:5330
3331
#: breezy/builtins.py:5330
3333
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3334
3334
"commits will be local only."
3337
#: brzlib/builtins.py:5341
3337
#: breezy/builtins.py:5341
3338
3338
msgid "Local branch is not bound"
3341
#: brzlib/builtins.py:5345
3341
#: breezy/builtins.py:5345
3342
3342
msgid "Remove the last committed revision."
3345
#: brzlib/builtins.py:5347
3345
#: breezy/builtins.py:5347
3347
3347
"--verbose will print out what is being removed.\n"
3348
3348
"--dry-run will go through all the motions, but not actually\n"
3349
3349
"remove anything."
3352
#: brzlib/builtins.py:5351
3352
#: breezy/builtins.py:5351
3354
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3355
3355
"specified revision. For example, \"brz uncommit -r 15\" will leave the\n"
3356
3356
"branch at revision 15."
3359
#: brzlib/builtins.py:5355
3359
#: breezy/builtins.py:5355
3361
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3362
3362
"it may make is to restore any pending merges that were present before\n"
3366
3366
# help of 'dry-run' option of 'uncommit' command
3367
#: brzlib/builtins.py:5366
3367
#: breezy/builtins.py:5366
3368
3368
msgid "Don't actually make changes."
3371
3371
# help of 'force' option of 'uncommit' command
3372
#: brzlib/builtins.py:5367
3372
#: breezy/builtins.py:5367
3373
3373
msgid "Say yes to all questions."
3376
3376
# help of 'keep-tags' option of 'uncommit' command
3377
#: brzlib/builtins.py:5369
3377
#: breezy/builtins.py:5369
3378
3378
msgid "Keep tags that point to removed revisions."
3381
3381
# help of 'local' option of 'uncommit' command
3382
#: brzlib/builtins.py:5371
3382
#: breezy/builtins.py:5371
3383
3383
msgid "Only remove the commits from the local branch when in a checkout."
3386
#: brzlib/builtins.py:5420
3386
#: breezy/builtins.py:5420
3387
3387
msgid "No revisions to uncommit.\n"
3390
#: brzlib/builtins.py:5435
3390
#: breezy/builtins.py:5435
3391
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3394
#: brzlib/builtins.py:5438
3394
#: breezy/builtins.py:5438
3395
3395
msgid "The above revision(s) will be removed.\n"
3398
#: brzlib/builtins.py:5442
3398
#: breezy/builtins.py:5442
3399
3399
msgid "Uncommit these revisions"
3402
#: brzlib/builtins.py:5445
3402
#: breezy/builtins.py:5445
3403
3403
msgid "Canceled\n"
3406
#: brzlib/builtins.py:5452
3406
#: breezy/builtins.py:5452
3407
3407
#, python-format
3409
3409
"You can restore the old tip by running:\n"
3410
3410
" brz pull . -r revid:%s\n"
3413
#: brzlib/builtins.py:5457
3413
#: breezy/builtins.py:5457
3414
3414
msgid "Break a dead lock."
3417
#: brzlib/builtins.py:5459
3417
#: breezy/builtins.py:5459
3419
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3423
#: brzlib/builtins.py:5462
3423
#: breezy/builtins.py:5462
3425
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3426
3426
"holding the lock has been stopped."
3429
#: brzlib/builtins.py:5465
3429
#: breezy/builtins.py:5465
3431
3431
"You can get information on what locks are open via the 'brz info\n"
3432
3432
"[location]' command."
3435
#: brzlib/builtins.py:5468
3435
#: breezy/builtins.py:5468
3438
3438
" brz break-lock\n"
3505
3505
# help of 'client-timeout' option of 'serve' command
3506
#: brzlib/builtins.py:5545
3506
#: breezy/builtins.py:5545
3507
3507
msgid "Override the default idle client timeout (5min)."
3510
#: brzlib/builtins.py:5563
3510
#: breezy/builtins.py:5563
3511
3511
msgid "Combine a tree into its containing tree."
3514
#: brzlib/builtins.py:5565
3514
#: breezy/builtins.py:5565
3515
3515
msgid "This command requires the target tree to be in a rich-root format."
3518
#: brzlib/builtins.py:5567
3518
#: breezy/builtins.py:5567
3520
3520
"The TREE argument should be an independent tree, inside another tree, but\n"
3521
3521
"not part of it. (Such trees can be produced by \"brz split\", but also by\n"
3522
3522
"running \"brz branch\" with the target inside a tree.)"
3525
#: brzlib/builtins.py:5571
3525
#: breezy/builtins.py:5571
3527
3527
"The result is a combined tree, with the subtree no longer an independent\n"
3528
3528
"part. This is marked as a merge of the subtree into the containing tree,\n"
3529
3529
"and all history is preserved."
3532
#: brzlib/builtins.py:5589
3532
#: breezy/builtins.py:5589
3533
3533
#, python-format
3535
3535
"Can't join trees because %s doesn't support rich root data.\n"
3536
3536
"You can use brz upgrade on the repository."
3539
#: brzlib/builtins.py:5599 brzlib/builtins.py:5605
3539
#: breezy/builtins.py:5599 breezy/builtins.py:5605
3540
3540
#, python-brace-format
3541
3541
msgid "Cannot join {0}. {1}"
3544
#: brzlib/builtins.py:5609
3544
#: breezy/builtins.py:5609
3545
3545
msgid "Split a subdirectory of a tree into a separate tree."
3548
#: brzlib/builtins.py:5611
3548
#: breezy/builtins.py:5611
3550
3550
"This command will produce a target tree in a format that supports\n"
3551
3551
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3552
3552
"converted into earlier formats like 'dirstate-tags'."
3555
#: brzlib/builtins.py:5615
3555
#: breezy/builtins.py:5615
3557
3557
"The TREE argument should be a subdirectory of a working tree. That\n"
3558
3558
"subdirectory will be converted into an independent tree, with its own\n"
3559
3559
"branch. Commits in the top-level tree will not apply to the new subtree."
3562
#: brzlib/builtins.py:5695
3562
#: breezy/builtins.py:5695
3563
3563
msgid "No submit branch specified or known"
3566
#: brzlib/builtins.py:5704 brzlib/send.py:109
3566
#: breezy/builtins.py:5704 breezy/send.py:109
3567
3567
msgid "No public branch specified or known"
3570
#: brzlib/builtins.py:5709
3570
#: breezy/builtins.py:5709
3571
3571
msgid "brz merge-directive takes at most two one revision identifiers"
3574
#: brzlib/builtins.py:5718
3574
#: breezy/builtins.py:5718
3575
3575
msgid "No revisions to bundle."
3578
#: brzlib/builtins.py:5737
3578
#: breezy/builtins.py:5737
3579
3579
msgid "Mail or create a merge-directive for submitting changes."
3582
#: brzlib/builtins.py:5739
3582
#: breezy/builtins.py:5739
3583
3583
msgid "A merge directive provides many things needed for requesting merges:"
3586
#: brzlib/builtins.py:5741
3586
#: breezy/builtins.py:5741
3587
3587
msgid "* A machine-readable description of the merge to perform"
3590
#: brzlib/builtins.py:5743
3590
#: breezy/builtins.py:5743
3591
3591
msgid "* An optional patch that is a preview of the changes requested"
3594
#: brzlib/builtins.py:5745
3594
#: breezy/builtins.py:5745
3596
3596
"* An optional bundle of revision data, so that the changes can be applied\n"
3597
3597
" directly from the merge directive, without retrieving data from a\n"
3601
#: brzlib/builtins.py:5749
3601
#: breezy/builtins.py:5749
3603
3603
"`brz send` creates a compact data set that, when applied using brz\n"
3604
3604
"merge, has the same effect as merging from the source branch. "
3607
#: brzlib/builtins.py:5752
3607
#: breezy/builtins.py:5752
3609
3609
"By default the merge directive is self-contained and can be applied to any\n"
3610
3610
"branch containing submit_branch in its ancestory without needing access to\n"
3611
3611
"the source branch."
3614
#: brzlib/builtins.py:5756
3614
#: breezy/builtins.py:5756
3616
3616
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3617
3617
"revisions, but only a structured request to merge from the\n"
3799
3799
# help of 'delete' option of 'tag' command
3800
#: brzlib/builtins.py:5958
3800
#: breezy/builtins.py:5958
3801
3801
msgid "Delete this tag rather than placing it."
3804
3804
# help of 'directory' option of 'tag' command
3805
#: brzlib/builtins.py:5961
3805
#: breezy/builtins.py:5961
3806
3806
msgid "Branch in which to place the tag."
3809
3809
# help of 'force' option of 'tag' command
3810
#: brzlib/builtins.py:5963
3810
#: breezy/builtins.py:5963
3811
3811
msgid "Replace existing tags."
3814
#: brzlib/builtins.py:5978
3814
#: breezy/builtins.py:5978
3815
3815
msgid "No tag specified to delete."
3818
#: brzlib/builtins.py:5980
3818
#: breezy/builtins.py:5980
3819
3819
#, python-format
3820
3820
msgid "Deleted tag %s."
3823
#: brzlib/builtins.py:5985
3823
#: breezy/builtins.py:5985
3824
3824
msgid "Tags can only be placed on a single revision, not on a range"
3827
#: brzlib/builtins.py:5994
3827
#: breezy/builtins.py:5994
3828
3828
msgid "Please specify a tag name."
3831
#: brzlib/builtins.py:6002
3831
#: breezy/builtins.py:6002
3832
3832
#, python-format
3833
3833
msgid "Tag %s already exists for that revision."
3836
#: brzlib/builtins.py:6006
3836
#: breezy/builtins.py:6006
3837
3837
#, python-format
3838
3838
msgid "Created tag %s."
3841
#: brzlib/builtins.py:6008
3841
#: breezy/builtins.py:6008
3842
3842
#, python-format
3843
3843
msgid "Updated tag %s."
3846
#: brzlib/builtins.py:6012
3846
#: breezy/builtins.py:6012
3847
3847
msgid "List tags."
3850
#: brzlib/builtins.py:6014
3850
#: breezy/builtins.py:6014
3852
3852
"This command shows a table of tag names and the revisions they reference."
3855
3855
# help of 'directory' option of 'tags' command
3856
#: brzlib/builtins.py:6020
3856
#: breezy/builtins.py:6020
3857
3857
msgid "Branch whose tags should be displayed."
3860
3860
# help of 'sort' option of 'tags' command
3861
#: brzlib/builtins.py:6022
3861
#: breezy/builtins.py:6022
3862
3862
msgid "Sort tags by different criteria."
3865
3865
# title of 'sort' option of 'tags' command
3866
#: brzlib/builtins.py:6022
3866
#: breezy/builtins.py:6022
3867
3867
msgid "Sorting"
3870
#: brzlib/builtins.py:6091
3870
#: breezy/builtins.py:6091
3871
3871
msgid "Reconfigure the type of a brz directory."
3874
#: brzlib/builtins.py:6093
3874
#: breezy/builtins.py:6093
3875
3875
msgid "A target configuration must be specified."
3878
#: brzlib/builtins.py:6095
3878
#: breezy/builtins.py:6095
3880
3880
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3881
3881
"The order of preference is\n"
3889
3889
# title of 'tree_type' option of 'reconfigure' command
3890
#: brzlib/builtins.py:6109
3890
#: breezy/builtins.py:6109
3891
3891
msgid "Tree type"
3894
3894
# help of 'tree_type' option of 'reconfigure' command
3895
#: brzlib/builtins.py:6110
3895
#: breezy/builtins.py:6110
3896
3896
msgid "The relation between branch and tree."
3899
3899
# help of 'tree_type=branch' option of 'reconfigure' command
3900
#: brzlib/builtins.py:6112
3900
#: breezy/builtins.py:6112
3901
3901
msgid "Reconfigure to be an unbound branch with no working tree."
3904
3904
# help of 'tree_type=tree' option of 'reconfigure' command
3905
#: brzlib/builtins.py:6113
3905
#: breezy/builtins.py:6113
3906
3906
msgid "Reconfigure to be an unbound branch with a working tree."
3909
3909
# help of 'tree_type=checkout' option of 'reconfigure' command
3910
#: brzlib/builtins.py:6114
3910
#: breezy/builtins.py:6114
3911
3911
msgid "Reconfigure to be a bound branch with a working tree."
3914
3914
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3915
#: brzlib/builtins.py:6115
3915
#: breezy/builtins.py:6115
3916
3916
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3919
3919
# title of 'repository_type' option of 'reconfigure' command
3920
#: brzlib/builtins.py:6120
3920
#: breezy/builtins.py:6120
3921
3921
msgid "Repository type"
3924
3924
# help of 'repository_type' option of 'reconfigure' command
3925
#: brzlib/builtins.py:6121
3925
#: breezy/builtins.py:6121
3926
3926
msgid "Location fo the repository."
3929
3929
# help of 'repository_type=standalone' option of 'reconfigure' command
3930
#: brzlib/builtins.py:6123
3930
#: breezy/builtins.py:6123
3932
3932
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3935
3935
# help of 'repository_type=use-shared' option of 'reconfigure' command
3936
#: brzlib/builtins.py:6125
3936
#: breezy/builtins.py:6125
3937
3937
msgid "Reconfigure to use a shared repository."
3940
3940
# title of 'repository_trees' option of 'reconfigure' command
3941
#: brzlib/builtins.py:6129
3941
#: breezy/builtins.py:6129
3942
3942
msgid "Trees in Repository"
3945
3945
# help of 'repository_trees' option of 'reconfigure' command
3946
#: brzlib/builtins.py:6130
3946
#: breezy/builtins.py:6130
3947
3947
msgid "Whether new branches in the repository have trees."
3950
3950
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3951
#: brzlib/builtins.py:6132
3951
#: breezy/builtins.py:6132
3952
3952
msgid "Reconfigure repository to create working trees on branches by default."
3955
3955
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3956
#: brzlib/builtins.py:6134
3956
#: breezy/builtins.py:6134
3958
3958
"Reconfigure repository to not create working trees on branches by default."
3961
3961
# help of 'bind-to' option of 'reconfigure' command
3962
#: brzlib/builtins.py:6137
3962
#: breezy/builtins.py:6137
3963
3963
msgid "Branch to bind checkout to."
3966
3966
# help of 'force' option of 'reconfigure' command
3967
#: brzlib/builtins.py:6139
3967
#: breezy/builtins.py:6139
3968
3968
msgid "Perform reconfiguration even if local changes will be lost."
3971
3971
# help of 'stacked-on' option of 'reconfigure' command
3972
#: brzlib/builtins.py:6142
3972
#: breezy/builtins.py:6142
3973
3973
msgid "Reconfigure a branch to be stacked on another branch."
3976
3976
# help of 'unstacked' option of 'reconfigure' command
3977
#: brzlib/builtins.py:6146
3977
#: breezy/builtins.py:6146
3979
3979
"Reconfigure a branch to be unstacked. This may require copying substantial "
3980
3980
"data into it."
3983
#: brzlib/builtins.py:6156
3983
#: breezy/builtins.py:6156
3984
3984
msgid "Can't use both --stacked-on and --unstacked"
3987
#: brzlib/builtins.py:6170
3987
#: breezy/builtins.py:6170
3988
3988
msgid "No target configuration specified"
3991
#: brzlib/builtins.py:6205
3991
#: breezy/builtins.py:6205
3992
3992
msgid "Set the branch of a checkout and update."
3995
#: brzlib/builtins.py:6207
3995
#: breezy/builtins.py:6207
3997
3997
"For lightweight checkouts, this changes the branch being referenced.\n"
3998
3998
"For heavyweight checkouts, this checks that there are no local commits\n"
4078
4078
"want to switch back to your view after that."
4081
#: brzlib/builtins.py:6308
4081
#: breezy/builtins.py:6308
4084
4084
" To define the current view::"
4087
#: brzlib/builtins.py:6311
4087
#: breezy/builtins.py:6311
4088
4088
msgid " brz view file1 dir1 ..."
4091
#: brzlib/builtins.py:6313
4091
#: breezy/builtins.py:6313
4092
4092
msgid " To list the current view::"
4095
#: brzlib/builtins.py:6315
4095
#: breezy/builtins.py:6315
4096
4096
msgid " brz view"
4099
#: brzlib/builtins.py:6317
4099
#: breezy/builtins.py:6317
4100
4100
msgid " To delete the current view::"
4103
#: brzlib/builtins.py:6319
4103
#: breezy/builtins.py:6319
4104
4104
msgid " brz view --delete"
4107
#: brzlib/builtins.py:6321
4107
#: breezy/builtins.py:6321
4108
4108
msgid " To disable the current view without deleting it::"
4111
#: brzlib/builtins.py:6323
4111
#: breezy/builtins.py:6323
4112
4112
msgid " brz view --switch off"
4115
#: brzlib/builtins.py:6325
4115
#: breezy/builtins.py:6325
4116
4116
msgid " To define a named view and switch to it::"
4119
#: brzlib/builtins.py:6327
4119
#: breezy/builtins.py:6327
4120
4120
msgid " brz view --name view-name file1 dir1 ..."
4123
#: brzlib/builtins.py:6329
4123
#: breezy/builtins.py:6329
4124
4124
msgid " To list a named view::"
4127
#: brzlib/builtins.py:6331
4127
#: breezy/builtins.py:6331
4128
4128
msgid " brz view --name view-name"
4131
#: brzlib/builtins.py:6333
4131
#: breezy/builtins.py:6333
4132
4132
msgid " To delete a named view::"
4135
#: brzlib/builtins.py:6335
4135
#: breezy/builtins.py:6335
4136
4136
msgid " brz view --name view-name --delete"
4139
#: brzlib/builtins.py:6337
4139
#: breezy/builtins.py:6337
4140
4140
msgid " To switch to a named view::"
4143
#: brzlib/builtins.py:6339
4143
#: breezy/builtins.py:6339
4144
4144
msgid " brz view --switch view-name"
4147
#: brzlib/builtins.py:6341
4147
#: breezy/builtins.py:6341
4148
4148
msgid " To list all views defined::"
4151
#: brzlib/builtins.py:6343
4151
#: breezy/builtins.py:6343
4152
4152
msgid " brz view --all"
4155
#: brzlib/builtins.py:6345
4155
#: breezy/builtins.py:6345
4156
4156
msgid " To delete all views::"
4159
#: brzlib/builtins.py:6347
4159
#: breezy/builtins.py:6347
4160
4160
msgid " brz view --delete --all"
4163
4163
# help of 'all' option of 'view' command
4164
#: brzlib/builtins.py:6354
4164
#: breezy/builtins.py:6354
4165
4165
msgid "Apply list or delete action to all views."
4168
4168
# help of 'delete' option of 'view' command
4169
#: brzlib/builtins.py:6357
4169
#: breezy/builtins.py:6357
4170
4170
msgid "Delete the view."
4173
4173
# help of 'name' option of 'view' command
4174
#: brzlib/builtins.py:6360
4174
#: breezy/builtins.py:6360
4175
4175
msgid "Name of the view to define, list or delete."
4178
4178
# help of 'switch' option of 'view' command
4179
#: brzlib/builtins.py:6364
4179
#: breezy/builtins.py:6364
4180
4180
msgid "Name of the view to switch to."
4183
#: brzlib/builtins.py:6383
4183
#: breezy/builtins.py:6383
4184
4184
msgid "Both --delete and a file list specified"
4187
#: brzlib/builtins.py:6386
4187
#: breezy/builtins.py:6386
4188
4188
msgid "Both --delete and --switch specified"
4191
#: brzlib/builtins.py:6389
4191
#: breezy/builtins.py:6389
4192
4192
msgid "Deleted all views.\n"
4195
#: brzlib/builtins.py:6391
4195
#: breezy/builtins.py:6391
4196
4196
msgid "No current view to delete"
4199
#: brzlib/builtins.py:6394
4199
#: breezy/builtins.py:6394
4200
4200
#, python-format
4201
4201
msgid "Deleted '%s' view.\n"
4204
#: brzlib/builtins.py:6398
4204
#: breezy/builtins.py:6398
4205
4205
msgid "Both --switch and a file list specified"
4208
#: brzlib/builtins.py:6401
4208
#: breezy/builtins.py:6401
4209
4209
msgid "Both --switch and --all specified"
4212
#: brzlib/builtins.py:6404
4212
#: breezy/builtins.py:6404
4213
4213
msgid "No current view to disable"
4216
#: brzlib/builtins.py:6406
4216
#: breezy/builtins.py:6406
4217
4217
#, python-format
4218
4218
msgid "Disabled '%s' view.\n"
4221
#: brzlib/builtins.py:6410 brzlib/builtins.py:6432
4221
#: breezy/builtins.py:6410 breezy/builtins.py:6432
4222
4222
#, python-brace-format
4223
4223
msgid "Using '{0}' view: {1}\n"
4226
#: brzlib/builtins.py:6413
4226
#: breezy/builtins.py:6413
4227
4227
msgid "Views defined:\n"
4230
#: brzlib/builtins.py:6422
4230
#: breezy/builtins.py:6422
4231
4231
msgid "No views defined.\n"
4234
#: brzlib/builtins.py:6429
4234
#: breezy/builtins.py:6429
4235
4235
msgid "Cannot change the 'off' pseudo view"
4238
#: brzlib/builtins.py:6437
4238
#: breezy/builtins.py:6437
4239
4239
msgid "No current view.\n"
4242
#: brzlib/builtins.py:6440
4242
#: breezy/builtins.py:6440
4243
4243
#, python-brace-format
4244
4244
msgid "'{0}' view is: {1}\n"
4247
#: brzlib/builtins.py:6460
4247
#: breezy/builtins.py:6460
4248
4248
msgid " <no hooks installed>\n"
4251
#: brzlib/builtins.py:6464
4251
#: breezy/builtins.py:6464
4252
4252
msgid "Remove a branch."
4255
#: brzlib/builtins.py:6466
4255
#: breezy/builtins.py:6466
4257
4257
"This will remove the branch from the specified location but \n"
4258
4258
"will keep any working tree or repository in place."
4261
#: brzlib/builtins.py:6471
4261
#: breezy/builtins.py:6471
4262
4262
msgid " Remove the branch at repo/trunk::"
4265
#: brzlib/builtins.py:6473
4265
#: breezy/builtins.py:6473
4266
4266
msgid " bzr remove-branch repo/trunk"
4269
4269
# help of 'force' option of 'remove-branch' command
4270
#: brzlib/builtins.py:6480
4270
#: breezy/builtins.py:6480
4271
4271
msgid "Remove branch even if it is the active branch."
4274
#: brzlib/builtins.py:6494
4274
#: breezy/builtins.py:6494
4275
4275
msgid "Branch is active. Use --force to remove it."
4278
4278
# help of 'writer=plain' option of 'shelve' command
4279
#: brzlib/builtins.py:6498
4279
#: breezy/builtins.py:6498
4280
4280
msgid "Plaintext diff output."
4283
#: brzlib/builtins.py:6499
4283
#: breezy/builtins.py:6499
4284
4284
msgid "Temporarily set aside some changes from the current tree."
4287
#: brzlib/builtins.py:6501
4287
#: breezy/builtins.py:6501
4289
4289
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4290
4290
"ie. out of the way, until a later time when you can bring them back from\n"
4385
4385
# help of 'action' option of 'unshelve' command
4386
#: brzlib/builtins.py:6599
4386
#: breezy/builtins.py:6599
4387
4387
msgid "The action to perform."
4390
4390
# title of 'action' option of 'resolve' command
4391
4391
# title of 'action' option of 'unshelve' command
4392
#: brzlib/builtins.py:6599 brzlib/conflicts.py:694
4392
#: breezy/builtins.py:6599 breezy/conflicts.py:694
4396
4396
# help of 'action=apply' option of 'unshelve' command
4397
#: brzlib/builtins.py:6601
4397
#: breezy/builtins.py:6601
4398
4398
msgid "Apply changes and remove from the shelf."
4401
4401
# help of 'action=dry-run' option of 'unshelve' command
4402
#: brzlib/builtins.py:6602
4402
#: breezy/builtins.py:6602
4403
4403
msgid "Show changes, but do not apply or remove them."
4406
4406
# help of 'action=preview' option of 'unshelve' command
4407
#: brzlib/builtins.py:6603
4407
#: breezy/builtins.py:6603
4409
4409
"Instead of unshelving the changes, show the diff that would result from "
4413
4413
# help of 'action=delete-only' option of 'unshelve' command
4414
#: brzlib/builtins.py:6605
4414
#: breezy/builtins.py:6605
4415
4415
msgid "Delete changes without applying them."
4418
4418
# help of 'action=keep' option of 'unshelve' command
4419
#: brzlib/builtins.py:6606
4419
#: breezy/builtins.py:6606
4420
4420
msgid "Apply changes but don't delete them."
4423
#: brzlib/builtins.py:6621
4423
#: breezy/builtins.py:6621
4424
4424
msgid "Remove unwanted files from working tree."
4427
#: brzlib/builtins.py:6623
4427
#: breezy/builtins.py:6623
4429
4429
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4430
4430
"files are never deleted."
4433
#: brzlib/builtins.py:6626
4433
#: breezy/builtins.py:6626
4435
4435
"Another class is 'detritus', which includes files emitted by brz during\n"
4436
4436
"normal operations and selftests. (The value of these files decreases with\n"
4440
#: brzlib/builtins.py:6630
4440
#: breezy/builtins.py:6630
4442
4442
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4443
4443
"flags are respected, and may be combined."
4446
#: brzlib/builtins.py:6633
4446
#: breezy/builtins.py:6633
4447
4447
msgid "To check what clean-tree will do, use --dry-run."
4450
4450
# help of 'ignored' option of 'clean-tree' command
4451
#: brzlib/builtins.py:6636
4451
#: breezy/builtins.py:6636
4452
4452
msgid "Delete all ignored files."
4455
4455
# help of 'detritus' option of 'clean-tree' command
4456
#: brzlib/builtins.py:6637
4456
#: breezy/builtins.py:6637
4458
4458
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4461
4461
# help of 'unknown' option of 'clean-tree' command
4462
#: brzlib/builtins.py:6640
4462
#: breezy/builtins.py:6640
4463
4463
msgid "Delete files unknown to brz (default)."
4466
4466
# help of 'dry-run' option of 'clean-tree' command
4467
#: brzlib/builtins.py:6641
4467
#: breezy/builtins.py:6641
4468
4468
msgid "Show files to delete instead of deleting them."
4471
4471
# help of 'force' option of 'clean-tree' command
4472
#: brzlib/builtins.py:6643
4472
#: breezy/builtins.py:6643
4473
4473
msgid "Do not prompt before deleting."
4476
#: brzlib/bundle/__init__.py:59
4476
#: breezy/bundle/__init__.py:59
4477
4477
msgid "A directory cannot be a bundle"
4480
#: brzlib/bundle/apply_bundle.py:40
4480
#: breezy/bundle/apply_bundle.py:40
4481
4481
msgid "Install revisions"
4484
#: brzlib/bundle/commands.py:64
4484
#: breezy/bundle/commands.py:64
4485
4485
msgid "--verbose requires a merge directive"
4488
#: brzlib/bundle/commands.py:67
4488
#: breezy/bundle/commands.py:67
4489
4489
msgid "Bundle format not supported"
4492
#: brzlib/bundle/commands.py:77
4492
#: breezy/bundle/commands.py:77
4493
4493
msgid "Records\n"
4496
#: brzlib/bundle/commands.py:81
4496
#: breezy/bundle/commands.py:81
4497
4497
#, python-brace-format
4498
4498
msgid "{0}: {1} ({2} multiparent)\n"
4501
#: brzlib/bundle/commands.py:83
4501
#: breezy/bundle/commands.py:83
4502
4502
#, python-format
4503
4503
msgid "unique files: %d\n"
4506
#: brzlib/bundle/commands.py:92
4506
#: breezy/bundle/commands.py:92
4507
4507
msgid "Revisions\n"
4510
#: brzlib/bundle/commands.py:93
4510
#: breezy/bundle/commands.py:93
4511
4511
#, python-format
4512
4512
msgid "nicks: %s\n"
4515
#: brzlib/bundle/commands.py:95
4515
#: breezy/bundle/commands.py:95
4516
4516
#, python-format
4518
4518
"committers: \n"
4522
#: brzlib/bundle/commands.py:103
4522
#: breezy/bundle/commands.py:103
4523
4523
msgid "Decoded contents\n"
4526
#: brzlib/bundle/serializer/v4.py:327
4526
#: breezy/bundle/serializer/v4.py:327
4527
4527
#, python-format
4528
4528
msgid "Bundling %d revision."
4529
4529
msgid_plural "Bundling %d revisions."
4533
#: brzlib/bzrdir.py:487
4533
#: breezy/bzrdir.py:487
4534
4534
#, python-brace-format
4536
4536
"making backup of {0}\n"
4540
#: brzlib/bzrdir.py:510
4540
#: breezy/bzrdir.py:510
4541
4541
#, python-brace-format
4542
4542
msgid "renamed {0} to {1}"
4545
#: brzlib/bzrdir.py:1639
4545
#: breezy/bzrdir.py:1639
4546
4546
#, python-format
4548
4548
"Source repository format does not support stacking, using format:\n"
4552
#: brzlib/bzrdir.py:1659
4552
#: breezy/bzrdir.py:1659
4553
4553
#, python-format
4555
4555
"Source branch format does not support stacking, using format:\n"
4559
#: brzlib/bzrdir.py:1805
4559
#: breezy/bzrdir.py:1805
4560
4560
msgid "starting repository conversion"
4563
#: brzlib/bzrdir.py:2026
4563
#: breezy/bzrdir.py:2026
4564
4564
#, python-brace-format
4565
4565
msgid "Using default stacking branch {0} at {1}"
4568
#: brzlib/check.py:108
4568
#: breezy/check.py:108
4572
#: brzlib/check.py:110
4572
#: breezy/check.py:110
4573
4573
msgid "checking revisions"
4576
#: brzlib/check.py:112
4576
#: breezy/check.py:112
4577
4577
msgid "checking commit contents"
4580
#: brzlib/check.py:114
4580
#: breezy/check.py:114
4581
4581
msgid "checking file graphs"
4584
#: brzlib/check.py:118
4584
#: breezy/check.py:118
4585
4585
msgid "checking branches and trees"
4588
#: brzlib/check.py:205
4588
#: breezy/check.py:205
4589
4589
#, python-brace-format
4590
4590
msgid "checked repository {0} format {1}"
4593
#: brzlib/check.py:208
4593
#: breezy/check.py:208
4594
4594
#, python-format
4595
4595
msgid "%6d revisions"
4598
#: brzlib/check.py:209
4598
#: breezy/check.py:209
4599
4599
#, python-format
4600
4600
msgid "%6d file-ids"
4603
#: brzlib/check.py:211
4603
#: breezy/check.py:211
4604
4604
#, python-format
4605
4605
msgid "%6d unreferenced text versions"
4608
#: brzlib/check.py:215
4608
#: breezy/check.py:215
4609
4609
#, python-brace-format
4610
4610
msgid "unreferenced version: {{{0}}} in {1}"
4613
#: brzlib/check.py:218
4613
#: breezy/check.py:218
4614
4614
#, python-format
4615
4615
msgid "%6d revisions are missing inventory_sha1"
4618
#: brzlib/check.py:221
4618
#: breezy/check.py:221
4619
4619
#, python-format
4620
4620
msgid "%6d revisions are mentioned but not present"
4623
#: brzlib/check.py:224
4623
#: breezy/check.py:224
4624
4624
#, python-format
4625
4625
msgid "%6d ghost revisions"
4628
#: brzlib/check.py:229
4628
#: breezy/check.py:229
4629
4629
#, python-format
4630
4630
msgid "%6d revisions missing parents in ancestry"
4633
#: brzlib/check.py:233
4633
#: breezy/check.py:233
4634
4634
#, python-format
4635
4635
msgid " %s should be in the ancestry for:"
4638
#: brzlib/check.py:237
4638
#: breezy/check.py:237
4639
4639
#, python-format
4640
4640
msgid "%6d inconsistent parents"
4643
#: brzlib/check.py:241
4643
#: breezy/check.py:241
4644
4644
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4647
#: brzlib/check.py:247
4647
#: breezy/check.py:247
4648
4648
#, python-format
4649
4649
msgid "%6d revisions have incorrect parents in the revision index"
4652
#: brzlib/check.py:253
4652
#: breezy/check.py:253
4653
4653
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4656
#: brzlib/check.py:267
4656
#: breezy/check.py:267
4657
4657
#, python-brace-format
4658
4658
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4661
#: brzlib/check.py:296
4661
#: breezy/check.py:296
4662
4662
#, python-brace-format
4664
4664
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4668
#: brzlib/check.py:354
4668
#: breezy/check.py:354
4669
4669
#, python-format
4670
4670
msgid "Checking branch at '%s'."
4673
#: brzlib/check.py:374
4673
#: breezy/check.py:374
4674
4674
#, python-format
4675
4675
msgid "Checking working tree at '%s'."
4678
#: brzlib/check.py:427 brzlib/check.py:441
4678
#: breezy/check.py:427 breezy/check.py:441
4679
4679
msgid "No branch found at specified location."
4682
#: brzlib/check.py:429 brzlib/check.py:439
4682
#: breezy/check.py:429 breezy/check.py:439
4683
4683
msgid "No working tree found at specified location."
4686
#: brzlib/check.py:432
4686
#: breezy/check.py:432
4687
4687
#, python-format
4688
4688
msgid "Checking repository at '%s'."
4691
#: brzlib/check.py:443
4691
#: breezy/check.py:443
4692
4692
msgid "No repository found at specified location."
4695
#: brzlib/clean_tree.py:63
4695
#: breezy/clean_tree.py:63
4696
4696
msgid "Nothing to delete."
4699
#: brzlib/clean_tree.py:68
4699
#: breezy/clean_tree.py:68
4700
4700
msgid "Are you sure you wish to delete these"
4703
#: brzlib/clean_tree.py:70
4703
#: breezy/clean_tree.py:70
4704
4704
msgid "Canceled"
4707
#: brzlib/clean_tree.py:107
4707
#: breezy/clean_tree.py:107
4708
4708
#, python-format
4709
4709
msgid "unable to remove %s"
4712
#: brzlib/clean_tree.py:111
4712
#: breezy/clean_tree.py:111
4713
4713
msgid "deleting paths:"
4716
#: brzlib/clean_tree.py:125
4716
#: breezy/clean_tree.py:125
4717
4717
#, python-brace-format
4718
4718
msgid "unable to remove \"{0}\": {1}."
4721
#: brzlib/clean_tree.py:130
4721
#: breezy/clean_tree.py:130
4722
4722
msgid "No files deleted."
4725
#: brzlib/cmd_version_info.py:47
4725
#: breezy/cmd_version_info.py:47
4726
4726
#, python-brace-format
4727
4727
msgid "No known version info format {0}. Supported types are: {1}"
4730
4730
# help of 'format=custom' option of 'version-info' command
4731
#: brzlib/cmd_version_info.py:52
4731
#: breezy/cmd_version_info.py:52
4732
4732
msgid "Version info in Custom template-based format."
4735
4735
# help of 'format=python' option of 'version-info' command
4736
#: brzlib/cmd_version_info.py:52
4736
#: breezy/cmd_version_info.py:52
4737
4737
msgid "Version info in Python format."
4740
4740
# help of 'format=rio' option of 'version-info' command
4741
#: brzlib/cmd_version_info.py:52
4741
#: breezy/cmd_version_info.py:52
4742
4742
msgid "Version info in RIO (simple text) format (default)."
4745
#: brzlib/cmd_version_info.py:53
4745
#: breezy/cmd_version_info.py:53
4746
4746
msgid "Show version information about this tree."
4749
#: brzlib/cmd_version_info.py:55
4749
#: breezy/cmd_version_info.py:55
4751
4751
"You can use this command to add information about version into\n"
4752
4752
"source code of an application. The output can be in one of the\n"
4753
4753
"supported formats or in a custom format based on a template."
4756
#: brzlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4756
#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4757
4757
#: en/help_topics/configuration.txt:738
4758
4758
msgid "For example::"
4761
#: brzlib/cmd_version_info.py:61
4761
#: breezy/cmd_version_info.py:61
4763
4763
" bzr version-info --custom \\\n"
4764
4764
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4767
#: brzlib/cmd_version_info.py:64
4767
#: breezy/cmd_version_info.py:64
4769
4769
"will produce a C header file with formatted string containing the\n"
4770
4770
"current revision number. Other supported variables in templates are:"
4773
#: brzlib/cmd_version_info.py:67
4773
#: breezy/cmd_version_info.py:67
4775
4775
" * {date} - date of the last revision\n"
4776
4776
" * {build_date} - current date\n"
4857
#: brzlib/commands.py:533
4857
#: breezy/commands.py:533
4858
4858
#, python-format
4860
4860
"See bzr help %s for more details and examples.\n"
4864
#: brzlib/commands.py:538
4864
#: breezy/commands.py:538
4865
4865
msgid ":Aliases: "
4868
#: brzlib/commands.py:542
4868
#: breezy/commands.py:542
4869
4869
#, python-format
4870
4870
msgid ":From: plugin \"%s\"\n"
4873
#: brzlib/commands.py:554
4873
#: breezy/commands.py:554
4874
4874
#, python-brace-format
4875
4875
msgid ":doc:`{0} <{1}-help>`"
4878
#: brzlib/commands.py:558
4878
#: breezy/commands.py:558
4879
4879
#, python-format
4880
4880
msgid ":See also: %s"
4883
#: brzlib/commands.py:826
4883
#: breezy/commands.py:826
4884
4884
msgid "Only ASCII permitted in option names"
4887
#: brzlib/commands.py:851 brzlib/commands.py:859
4887
#: breezy/commands.py:851 breezy/commands.py:859
4888
4888
msgid "command {0!r} needs one or more {1}"
4891
#: brzlib/commands.py:868
4891
#: breezy/commands.py:868
4892
4892
msgid "command {0!r} requires argument {1}"
4895
#: brzlib/commands.py:875
4895
#: breezy/commands.py:875
4896
4896
#, python-brace-format
4897
4897
msgid "extra argument to command {0}: {1}"
4900
#: brzlib/commands.py:952
4900
#: breezy/commands.py:952
4901
4901
#, python-format
4902
4902
msgid "Profile data written to \"%s\"."
4905
#: brzlib/commit.py:117 brzlib/commit.py:740
4905
#: breezy/commit.py:117 breezy/commit.py:740
4909
#: brzlib/commit.py:117 brzlib/commit.py:748
4909
#: breezy/commit.py:117 breezy/commit.py:748
4910
4910
msgid "modified"
4913
#: brzlib/commit.py:131
4913
#: breezy/commit.py:131
4914
4914
#, python-format
4915
4915
msgid "Committing%s"
4918
#: brzlib/commit.py:134
4918
#: breezy/commit.py:134
4919
4919
#, python-format
4920
4920
msgid "Committed revision %d."
4923
#: brzlib/commit.py:143
4923
#: breezy/commit.py:143
4924
4924
#, python-format
4925
4925
msgid "deleted %s"
4928
#: brzlib/commit.py:146
4928
#: breezy/commit.py:146
4929
4929
#, python-format
4930
4930
msgid "missing %s"
4933
#: brzlib/commit.py:511
4933
#: breezy/commit.py:511
4934
4934
#, python-brace-format
4936
4936
"Conflicting tags in bound branch:\n"
4940
#: brzlib/commit.py:742
4940
#: breezy/commit.py:742
4941
4941
msgid "renamed"
4944
#: brzlib/commit.py:976
4944
#: breezy/commit.py:976
4945
4945
msgid "unchanged"
4948
#: brzlib/commit.py:998
4948
#: breezy/commit.py:998
4949
4949
#, python-brace-format
4950
4950
msgid "{0} [{1}] - Stage"
4953
#: brzlib/commit.py:1001
4953
#: breezy/commit.py:1001
4954
4954
#, python-format
4955
4955
msgid "%s - Stage"
4958
#: brzlib/commit_signature_commands.py:34
4958
#: breezy/commit_signature_commands.py:34
4959
4959
msgid "Sign all commits by a given committer."
4962
#: brzlib/commit_signature_commands.py:36
4962
#: breezy/commit_signature_commands.py:36
4964
4964
"If location is not specified the local tree is used.\n"
4965
4965
"If committer is not specified the default committer is used."
4968
#: brzlib/commit_signature_commands.py:39
4968
#: breezy/commit_signature_commands.py:39
4969
4969
msgid "This does not sign commits that already have signatures."
4972
4972
# help of 'dry-run' option of 'sign-my-commits' command
4973
#: brzlib/commit_signature_commands.py:47
4973
#: breezy/commit_signature_commands.py:47
4975
4975
"Don't actually sign anything, just print the revisions that would be signed."
4978
#: brzlib/commit_signature_commands.py:98
4978
#: breezy/commit_signature_commands.py:98
4979
4979
#, python-format
4980
4980
msgid "Signed %d revision.\n"
4981
4981
msgid_plural "Signed %d revisions.\n"
4985
#: brzlib/commit_signature_commands.py:103
4985
#: breezy/commit_signature_commands.py:103
4986
4986
msgid "Verify all commit signatures."
4989
#: brzlib/commit_signature_commands.py:105
4989
#: breezy/commit_signature_commands.py:105
4990
4990
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4993
4993
# help of 'acceptable-keys' option of 'verify-signatures' command
4994
#: brzlib/commit_signature_commands.py:110
4994
#: breezy/commit_signature_commands.py:110
4996
4996
"Comma separated list of GPG key patterns which are acceptable for "
4997
4997
"verification."
5000
#: brzlib/commit_signature_commands.py:148
5000
#: breezy/commit_signature_commands.py:148
5001
5001
msgid "Cannot verify a range of non-revision-history revisions"
5004
#: brzlib/commit_signature_commands.py:166
5004
#: breezy/commit_signature_commands.py:166
5005
5005
msgid "All commits signed with verifiable keys"
5008
#: brzlib/config.py:438
5008
#: breezy/config.py:438
5009
5009
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5012
#: brzlib/config.py:2465
5012
#: breezy/config.py:2465
5013
5013
#, python-brace-format
5014
5014
msgid "{0} is not an SI unit."
5017
#: brzlib/config.py:3013
5017
#: breezy/config.py:3013
5018
5018
#, python-brace-format
5020
5020
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5021
5021
"will be saved."
5024
#: brzlib/config.py:3158
5024
#: breezy/config.py:3158
5025
5025
#, python-format
5026
5026
msgid "Invalid '%s', should be of the form 'name=value'"
5029
#: brzlib/config.py:4096
5029
#: breezy/config.py:4096
5030
5030
msgid "Display, set or remove a configuration option."
5033
#: brzlib/config.py:4098
5033
#: breezy/config.py:4098
5034
5034
msgid "Display the active value for option NAME."
5037
#: brzlib/config.py:4100
5037
#: breezy/config.py:4100
5039
5039
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5040
5040
"matching options are displayed mentioning their scope and without resolving\n"
5042
5042
"account is the first one displayed for each option."
5045
#: brzlib/config.py:4105
5045
#: breezy/config.py:4105
5047
5047
"If NAME is not given, --all .* is implied (all options are displayed for "
5049
5049
"current scope)."
5052
#: brzlib/config.py:4108
5052
#: breezy/config.py:4108
5054
5054
"Setting a value is achieved by using NAME=value without spaces. The value\n"
5055
5055
"is set in the most relevant scope and can be checked by displaying the\n"
5056
5056
"option again."
5059
#: brzlib/config.py:4112
5059
#: breezy/config.py:4112
5060
5060
msgid "Removing a value is achieved by using --remove NAME."
5063
5063
# help of 'scope' option of 'config' command
5064
#: brzlib/config.py:4122
5064
#: breezy/config.py:4122
5065
5065
msgid "Reduce the scope to the specified configuration file."
5068
5068
# help of 'all' option of 'config' command
5069
#: brzlib/config.py:4126
5069
#: breezy/config.py:4126
5070
5070
msgid "Display all the defined values for the matching options."
5073
5073
# help of 'remove' option of 'config' command
5074
#: brzlib/config.py:4128
5074
#: breezy/config.py:4128
5075
5075
msgid "Remove the option from the configuration file."
5078
#: brzlib/conflicts.py:50
5078
#: breezy/conflicts.py:50
5079
5079
msgid "List files with conflicts."
5082
#: brzlib/conflicts.py:57
5082
#: breezy/conflicts.py:57
5084
5084
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5085
5085
"is supplied, the pathnames of files with text conflicts are listed,\n"
5086
5086
"instead. (This is useful for editing all files with text conflicts.)"
5089
#: brzlib/conflicts.py:61
5089
#: breezy/conflicts.py:61
5090
5090
msgid "Use bzr resolve when you have fixed a problem."
5093
5093
# help of 'text' option of 'conflicts' command
5094
#: brzlib/conflicts.py:66
5094
#: breezy/conflicts.py:66
5095
5095
msgid "List paths of files with text conflicts."
5098
5098
# help of 'action=done' option of 'resolve' command
5099
#: brzlib/conflicts.py:85
5099
#: breezy/conflicts.py:85
5100
5100
msgid "Marks the conflict as resolved."
5103
5103
# help of 'action=take-this' option of 'resolve' command
5104
#: brzlib/conflicts.py:88
5104
#: breezy/conflicts.py:88
5105
5105
msgid "Resolve the conflict preserving the version in the working tree."
5108
5108
# help of 'action=take-other' option of 'resolve' command
5109
#: brzlib/conflicts.py:91
5109
#: breezy/conflicts.py:91
5110
5110
msgid "Resolve the conflict taking the merged version into account."
5113
5113
# help of 'action' option of 'resolve' command
5114
#: brzlib/conflicts.py:98
5114
#: breezy/conflicts.py:98
5115
5115
msgid "How to resolve the conflict."
5118
#: brzlib/conflicts.py:104
5118
#: breezy/conflicts.py:104
5119
5119
msgid "Mark a conflict as resolved."
5122
#: brzlib/conflicts.py:111
5122
#: breezy/conflicts.py:111
5124
5124
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5125
5125
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5130
5130
# help of 'all' option of 'resolve' command
5131
#: brzlib/conflicts.py:119
5131
#: breezy/conflicts.py:119
5132
5132
msgid "Resolve all conflicts in this tree."
5135
#: brzlib/conflicts.py:126
5135
#: breezy/conflicts.py:126
5136
5136
msgid "If --all is specified, no FILE may be provided"
5139
#: brzlib/conflicts.py:151
5139
#: breezy/conflicts.py:151
5140
5140
#, python-format
5141
5141
msgid "%d conflict auto-resolved."
5142
5142
msgid_plural "%d conflicts auto-resolved."
5146
#: brzlib/conflicts.py:154
5146
#: breezy/conflicts.py:154
5147
5147
msgid "Remaining conflicts:"
5150
#: brzlib/conflicts.py:159
5150
#: breezy/conflicts.py:159
5151
5151
msgid "All conflicts resolved."
5154
#: brzlib/conflicts.py:168
5154
#: breezy/conflicts.py:168
5155
5155
#, python-brace-format
5156
5156
msgid "{0} conflict resolved, {1} remaining"
5157
5157
msgid_plural "{0} conflicts resolved, {1} remaining"
5161
#: brzlib/controldir.py:712
5161
#: breezy/controldir.py:712
5162
5162
#, python-brace-format
5163
5163
msgid "{0} is{1} redirected to {2}"
5166
#: brzlib/diff.py:413
5166
#: breezy/diff.py:413
5167
5167
#, python-format
5168
5168
msgid "*** Ignoring files outside view. View is %s"
5171
#: brzlib/errors.py:157
5171
#: breezy/errors.py:157
5172
5172
msgid "The tree builder is already building a tree."
5175
#: brzlib/errors.py:178
5175
#: breezy/errors.py:178
5176
5176
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5179
#: brzlib/errors.py:197
5179
#: breezy/errors.py:197
5181
5181
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5182
5182
"versions \"%(minimum)s\" to \"%(current)s\"."
5185
#: brzlib/errors.py:209
5185
#: breezy/errors.py:209
5186
5186
msgid "The transport '%(transport)s' is only accessible within this process."
5189
#: brzlib/errors.py:227
5189
#: breezy/errors.py:227
5190
5190
msgid "Invalid revision number %(revno)s"
5193
#: brzlib/errors.py:236
5193
#: breezy/errors.py:236
5194
5194
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5197
#: brzlib/errors.py:247
5197
#: breezy/errors.py:247
5198
5198
msgid "Reserved revision-id {%(revision_id)s}"
5201
#: brzlib/errors.py:261
5201
#: breezy/errors.py:261
5202
5202
msgid "There is no public branch set for \"%(branch_url)s\"."
5205
#: brzlib/errors.py:271
5205
#: breezy/errors.py:271
5207
5207
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5208
5208
"obtain a list of topics."
5211
#: brzlib/errors.py:280
5211
#: breezy/errors.py:280
5212
5212
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5215
#: brzlib/errors.py:290
5215
#: breezy/errors.py:290
5217
5217
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5220
#: brzlib/errors.py:299
5220
#: breezy/errors.py:299
5221
5221
msgid "The branch '%(branch)s' is not stacked."
5224
#: brzlib/errors.py:313
5224
#: breezy/errors.py:313
5225
5225
msgid "No WorkingTree exists for \"%(base)s\"."
5228
#: brzlib/errors.py:322
5228
#: breezy/errors.py:322
5229
5229
msgid "Not currently building a tree."
5232
#: brzlib/errors.py:327
5232
#: breezy/errors.py:327
5233
5233
msgid "%(url)s is not a local path."
5236
#: brzlib/errors.py:355
5236
#: breezy/errors.py:355
5237
5237
msgid "%(not_locked)r is not write locked but needs to be."
5240
#: brzlib/errors.py:363
5240
#: breezy/errors.py:363
5241
5241
msgid "Error in command line options"
5244
#: brzlib/errors.py:368
5244
#: breezy/errors.py:368
5245
5245
msgid "%(value)s is not an index of type %(_type)s."
5248
#: brzlib/errors.py:378
5248
#: breezy/errors.py:378
5249
5249
msgid "Error in data for index %(value)s."
5252
#: brzlib/errors.py:387
5252
#: breezy/errors.py:387
5253
5253
msgid "The key '%(key)s' is already in index '%(index)s'."
5256
#: brzlib/errors.py:397
5256
#: breezy/errors.py:397
5257
5257
msgid "The key '%(key)s' is not a valid key."
5260
#: brzlib/errors.py:406
5260
#: breezy/errors.py:406
5261
5261
msgid "Could not parse options for index %(value)s."
5264
#: brzlib/errors.py:415
5264
#: breezy/errors.py:415
5265
5265
msgid "The value '%(value)s' is not a valid value."
5268
#: brzlib/errors.py:424
5268
#: breezy/errors.py:424
5269
5269
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5272
#: brzlib/errors.py:443
5272
#: breezy/errors.py:443
5273
5273
msgid "Generic path error: %(path)r%(extra)s)"
5276
#: brzlib/errors.py:456
5276
#: breezy/errors.py:456
5277
5277
msgid "No such file: %(path)r%(extra)s"
5280
#: brzlib/errors.py:461
5280
#: breezy/errors.py:461
5281
5281
msgid "File exists: %(path)r%(extra)s"
5284
#: brzlib/errors.py:467
5284
#: breezy/errors.py:467
5286
5286
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5287
5287
"after to tell bzr about a rename that has already happened)%(extra)s"
5290
#: brzlib/errors.py:483
5290
#: breezy/errors.py:483
5291
5291
msgid "\"%(path)s\" is not a directory %(extra)s"
5294
#: brzlib/errors.py:488
5294
#: breezy/errors.py:488
5295
5295
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5298
#: brzlib/errors.py:493
5298
#: breezy/errors.py:493
5299
5299
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5302
#: brzlib/errors.py:498
5302
#: breezy/errors.py:498
5303
5303
msgid "Hard-linking \"%(path)s\" is not supported"
5306
#: brzlib/errors.py:513
5306
#: breezy/errors.py:513
5307
5307
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5310
#: brzlib/errors.py:518
5310
#: breezy/errors.py:518
5311
5311
msgid "Permission denied: \"%(path)s\"%(extra)s"
5314
#: brzlib/errors.py:523
5314
#: breezy/errors.py:523
5315
5315
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5318
#: brzlib/errors.py:528
5318
#: breezy/errors.py:528
5319
5319
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5322
#: brzlib/errors.py:539
5322
#: breezy/errors.py:539
5323
5323
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5326
#: brzlib/errors.py:561
5327
msgid "The %(type)s hook '%(hook)s' is unknown in this version of brzlib."
5326
#: breezy/errors.py:561
5327
msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy."
5330
#: brzlib/errors.py:571
5330
#: breezy/errors.py:571
5331
5331
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5334
#: brzlib/errors.py:579
5334
#: breezy/errors.py:579
5336
5336
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5337
5337
"upgrade the branch to permit branch stacking."
5340
#: brzlib/errors.py:590
5340
#: breezy/errors.py:590
5341
5341
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5344
#: brzlib/errors.py:600
5344
#: breezy/errors.py:600
5346
5346
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5347
5347
"need to upgrade the repository to permit branch stacking."
5350
#: brzlib/errors.py:611
5350
#: breezy/errors.py:611
5351
5351
msgid "Error reading from %(path)r."
5354
#: brzlib/errors.py:630
5354
#: breezy/errors.py:630
5355
5355
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5358
#: brzlib/errors.py:646
5358
#: breezy/errors.py:646
5359
5359
msgid "Path \"%(path)s\" is not unicode normalized"
5362
#: brzlib/errors.py:654
5362
#: breezy/errors.py:654
5363
5363
msgid "Not a branch: \"%(path)s\"%(detail)s."
5366
#: brzlib/errors.py:696
5366
#: breezy/errors.py:696
5367
5367
msgid "No submit branch available for branch \"%(path)s\""
5370
#: brzlib/errors.py:705
5370
#: breezy/errors.py:705
5371
5371
msgid "A control directory already exists: \"%(path)s\"."
5374
#: brzlib/errors.py:710
5374
#: breezy/errors.py:710
5375
5375
msgid "Already a branch: \"%(path)s\"."
5378
#: brzlib/errors.py:715
5378
#: breezy/errors.py:715
5379
5379
msgid "Invalid branch name: %(name)s"
5382
#: brzlib/errors.py:724
5382
#: breezy/errors.py:724
5383
5383
msgid "Parent branch already exists: \"%(path)s\"."
5386
#: brzlib/errors.py:730
5386
#: breezy/errors.py:730
5388
5388
"Directory contains a branch, but no working tree (use bzr checkout if you "
5389
5389
"wish to build a working tree): \"%(path)s\""
5392
#: brzlib/errors.py:735
5392
#: breezy/errors.py:735
5394
5394
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5397
#: brzlib/errors.py:745
5397
#: breezy/errors.py:745
5399
5399
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5402
#: brzlib/errors.py:755
5402
#: breezy/errors.py:755
5403
5403
msgid "No repository present: \"%(path)s\""
5406
#: brzlib/errors.py:762
5406
#: breezy/errors.py:762
5408
5408
"Unsupported branch format: %(format)s\n"
5409
5409
"Please run 'bzr upgrade'"
5412
#: brzlib/errors.py:768
5412
#: breezy/errors.py:768
5413
5413
msgid "Unknown %(kind)s format: %(format)r"
5416
#: brzlib/errors.py:777
5416
#: breezy/errors.py:777
5417
5417
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5420
#: brzlib/errors.py:787
5420
#: breezy/errors.py:787
5421
5421
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5424
#: brzlib/errors.py:802
5424
#: breezy/errors.py:802
5427
5427
"is not compatible with\n"
5432
#: brzlib/errors.py:818
5432
#: breezy/errors.py:818
5433
5433
msgid "Revision is not compatible with %(repo_format)s"
5436
#: brzlib/errors.py:828
5436
#: breezy/errors.py:828
5437
5437
msgid "%(context_info)s%(path)s is already versioned."
5440
#: brzlib/errors.py:849
5440
#: breezy/errors.py:849
5441
5441
msgid "%(context_info)s%(path)s is not versioned."
5444
#: brzlib/errors.py:870
5444
#: breezy/errors.py:870
5445
5445
msgid "Path(s) are not versioned: %(paths_as_string)s"
5448
#: brzlib/errors.py:881
5448
#: breezy/errors.py:881
5449
5449
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5452
#: brzlib/errors.py:900
5452
#: breezy/errors.py:900
5453
5453
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5456
#: brzlib/errors.py:908
5456
#: breezy/errors.py:908
5458
5458
"Filename %(filename)r is not valid in your current filesystem encoding "
5459
5459
"%(fs_encoding)s"
5462
#: brzlib/errors.py:919
5462
#: breezy/errors.py:919
5463
5463
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5466
#: brzlib/errors.py:937
5466
#: breezy/errors.py:937
5467
5467
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5470
#: brzlib/errors.py:976
5470
#: breezy/errors.py:976
5471
5471
msgid "Cannot lock %(lock)s: %(why)s"
5474
#: brzlib/errors.py:986
5474
#: breezy/errors.py:986
5476
5476
"A transaction related operation was attempted after the transaction finished."
5479
#: brzlib/errors.py:1013
5479
#: breezy/errors.py:1013
5480
5480
msgid "Cannot lock: transport is read only: %(transport)s"
5483
#: brzlib/errors.py:1021
5483
#: breezy/errors.py:1021
5484
5484
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5487
#: brzlib/errors.py:1032
5487
#: breezy/errors.py:1032
5488
5488
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5491
#: brzlib/errors.py:1043
5491
#: breezy/errors.py:1043
5493
5493
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5494
5494
"%(holder)r, wanted to break %(target)r"
5497
#: brzlib/errors.py:1055
5497
#: breezy/errors.py:1055
5499
5499
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5500
5500
"Use 'bzr break-lock' to clear it"
5503
#: brzlib/errors.py:1068
5503
#: breezy/errors.py:1068
5504
5504
msgid "Lock not held: %(lock)s"
5507
#: brzlib/errors.py:1097
5507
#: breezy/errors.py:1097
5508
5508
msgid "No changes to commit"
5511
#: brzlib/errors.py:1102
5511
#: breezy/errors.py:1102
5513
5513
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5516
#: brzlib/errors.py:1112
5516
#: breezy/errors.py:1112
5518
5518
"Excluding paths during commit is not supported by repository at "
5519
5519
"%(repository)r."
5522
#: brzlib/errors.py:1121
5522
#: breezy/errors.py:1121
5524
5524
"The specified commit message contains characters unsupported by the current "
5528
#: brzlib/errors.py:1127
5528
#: breezy/errors.py:1127
5529
5529
msgid "Upgrade URL cannot work with readonly URLs."
5532
#: brzlib/errors.py:1132
5532
#: breezy/errors.py:1132
5533
5533
msgid "The branch format %(format)s is already at the most recent format."
5536
#: brzlib/errors.py:1155
5536
#: breezy/errors.py:1155
5537
5537
msgid "Option --change does not accept revision ranges"
5540
#: brzlib/errors.py:1160
5540
#: breezy/errors.py:1160
5541
5541
msgid "No namespace registered for string: %(spec)r"
5544
#: brzlib/errors.py:1179
5544
#: breezy/errors.py:1179
5546
5546
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5550
#: brzlib/errors.py:1193
5550
#: breezy/errors.py:1193
5552
5552
"Operation denied because it would change the main history, which is not "
5553
5553
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5556
#: brzlib/errors.py:1204
5556
#: breezy/errors.py:1204
5558
5558
"These branches have diverged. Use the missing command to see how.\n"
5559
5559
"Use the merge command to reconcile them."
5562
#: brzlib/errors.py:1224
5562
#: breezy/errors.py:1224
5564
5564
"Branches have no common ancestor, and no merge base revision was specified."
5567
#: brzlib/errors.py:1230
5567
#: breezy/errors.py:1230
5569
5569
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5572
#: brzlib/errors.py:1236
5572
#: breezy/errors.py:1236
5573
5573
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5576
#: brzlib/errors.py:1245
5576
#: breezy/errors.py:1245
5578
5578
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5581
#: brzlib/errors.py:1254
5581
#: breezy/errors.py:1254
5582
5582
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5585
#: brzlib/errors.py:1263
5585
#: breezy/errors.py:1263
5586
5586
msgid "Branch %(branch)s has no commits."
5589
#: brzlib/errors.py:1281
5589
#: breezy/errors.py:1281
5591
5591
"Bound branch %(branch)s is out of date with master branch %(master)s."
5592
5592
"%(extra_help)s"
5595
#: brzlib/errors.py:1293
5595
#: breezy/errors.py:1293
5597
5597
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5598
5598
"bound to %(remote)s."
5601
#: brzlib/errors.py:1305
5601
#: breezy/errors.py:1305
5602
5602
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5605
#: brzlib/errors.py:1314
5605
#: breezy/errors.py:1314
5607
5607
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5611
#: brzlib/errors.py:1326
5611
#: breezy/errors.py:1326
5612
5612
msgid "Error in processing weave: %(msg)s"
5615
#: brzlib/errors.py:1335
5615
#: breezy/errors.py:1335
5616
5616
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5619
#: brzlib/errors.py:1346
5619
#: breezy/errors.py:1346
5620
5620
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5623
#: brzlib/errors.py:1356
5623
#: breezy/errors.py:1356
5624
5624
msgid "Weave invariant violated: %(what)s"
5627
#: brzlib/errors.py:1365
5627
#: breezy/errors.py:1365
5628
5628
msgid "Parents are mismatched between two revisions. %(msg)s"
5631
#: brzlib/errors.py:1387
5631
#: breezy/errors.py:1387
5633
5633
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5637
#: brzlib/errors.py:1399
5637
#: breezy/errors.py:1399
5638
5638
msgid "Versioned file error"
5641
#: brzlib/errors.py:1404
5641
#: breezy/errors.py:1404
5642
5642
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5645
#: brzlib/errors.py:1414
5645
#: breezy/errors.py:1414
5646
5646
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5649
#: brzlib/errors.py:1424
5649
#: breezy/errors.py:1424
5650
5650
msgid "Text did not match its checksum: %(msg)s"
5653
#: brzlib/errors.py:1550
5653
#: breezy/errors.py:1550
5654
5654
msgid "Export format %(format)r not supported"
5657
#: brzlib/errors.py:1559
5657
#: breezy/errors.py:1559
5658
5658
msgid "Transport error: %(msg)s %(orig_error)s"
5661
#: brzlib/errors.py:1585
5661
#: breezy/errors.py:1585
5662
5662
msgid "Generic bzr smart protocol error: %(details)s"
5665
#: brzlib/errors.py:1593
5665
#: breezy/errors.py:1593
5666
5666
msgid "Received bad protocol version marker: %(marker)r"
5669
#: brzlib/errors.py:1625
5669
#: breezy/errors.py:1625
5670
5670
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5673
#: brzlib/errors.py:1630
5673
#: breezy/errors.py:1630
5674
5674
msgid "Connection error: %(msg)s %(orig_error)s"
5677
#: brzlib/errors.py:1635
5677
#: breezy/errors.py:1635
5678
5678
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5681
#: brzlib/errors.py:1656
5681
#: breezy/errors.py:1656
5682
5682
msgid "Connection closed: %(msg)s %(orig_error)s"
5685
#: brzlib/errors.py:1661
5685
#: breezy/errors.py:1661
5686
5686
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5689
#: brzlib/errors.py:1666
5689
#: breezy/errors.py:1666
5690
5690
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5693
#: brzlib/errors.py:1676
5693
#: breezy/errors.py:1676
5694
5694
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5697
#: brzlib/errors.py:1691
5697
#: breezy/errors.py:1691
5698
5698
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5701
#: brzlib/errors.py:1705
5701
#: breezy/errors.py:1705
5702
5702
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5705
#: brzlib/errors.py:1713
5705
#: breezy/errors.py:1713
5706
5706
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5709
#: brzlib/errors.py:1722
5709
#: breezy/errors.py:1722
5710
5710
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5713
#: brzlib/errors.py:1736
5713
#: breezy/errors.py:1736
5714
5714
msgid "Too many redirections"
5717
#: brzlib/errors.py:1741
5717
#: breezy/errors.py:1741
5718
5718
msgid "Working tree has conflicts."
5721
#: brzlib/errors.py:1745
5721
#: breezy/errors.py:1745
5722
5722
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5725
#: brzlib/errors.py:1754
5725
#: breezy/errors.py:1754
5727
5727
"Error(s) parsing config file %(filename)s:\n"
5731
#: brzlib/errors.py:1764
5731
#: breezy/errors.py:1764
5733
5733
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5734
5734
"See ``bzr help %(name)s``"
5737
#: brzlib/errors.py:1774
5737
#: breezy/errors.py:1774
5738
5738
msgid "%(username)r does not seem to contain a reasonable email address"
5741
#: brzlib/errors.py:1783
5741
#: breezy/errors.py:1783
5742
5742
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5745
#: brzlib/errors.py:1791
5745
#: breezy/errors.py:1791
5746
5746
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5749
#: brzlib/errors.py:1799
5749
#: breezy/errors.py:1799
5750
5750
msgid "Unable to import library \"%(library)s\": %(error)s"
5753
#: brzlib/errors.py:1807
5753
#: breezy/errors.py:1807
5754
5754
msgid "python-gpgme is not installed, it is needed to verify signatures"
5757
#: brzlib/errors.py:1815
5757
#: breezy/errors.py:1815
5759
5759
"The working tree for %(basedir)s has changed since the last commit, but "
5760
5760
"weave merge requires that it be unchanged"
5763
#: brzlib/errors.py:1825
5763
#: breezy/errors.py:1825
5765
5765
"Can't reprocess and show base, because reprocessing obscures the "
5766
5766
"relationship of conflicting lines to the base"
5769
#: brzlib/errors.py:1831
5769
#: breezy/errors.py:1831
5770
5770
msgid "Cycle in graph %(graph)r"
5773
#: brzlib/errors.py:1859
5773
#: breezy/errors.py:1859
5774
5774
msgid "File %(filename)s is not conflicted."
5777
#: brzlib/errors.py:1881
5777
#: breezy/errors.py:1881
5778
5778
msgid "No bundle was found in \"%(filename)s\"."
5781
#: brzlib/errors.py:1890
5781
#: breezy/errors.py:1890
5782
5782
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5785
#: brzlib/errors.py:1900
5785
#: breezy/errors.py:1900
5786
5786
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5789
#: brzlib/errors.py:1913
5789
#: breezy/errors.py:1913
5790
5790
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5793
#: brzlib/errors.py:1923
5793
#: breezy/errors.py:1923
5794
5794
msgid "Key %(key)s is already present in map"
5797
#: brzlib/errors.py:1928
5797
#: breezy/errors.py:1928
5798
5798
msgid "The prefix %(prefix)s is in the help search path twice."
5801
#: brzlib/errors.py:1938
5801
#: breezy/errors.py:1938
5803
5803
"No final name for trans_id %(trans_id)r\n"
5804
5804
"file-id: %(file_id)r\n"
5805
5805
"root trans-id: %(root_trans_id)r\n"
5808
#: brzlib/errors.py:1970
5808
#: breezy/errors.py:1970
5809
5809
msgid "Attempt to reuse a transform that has already been applied."
5812
#: brzlib/errors.py:1975
5812
#: breezy/errors.py:1975
5813
5813
msgid "Moving the root directory is not supported at this time"
5816
#: brzlib/errors.py:1980
5816
#: breezy/errors.py:1980
5817
5817
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5820
#: brzlib/errors.py:1991
5820
#: breezy/errors.py:1991
5822
5822
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5825
#: brzlib/errors.py:2027
5825
#: breezy/errors.py:2027
5827
5827
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5830
#: brzlib/errors.py:2057
5830
#: breezy/errors.py:2057
5831
5831
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5834
#: brzlib/errors.py:2065
5834
#: breezy/errors.py:2065
5835
5835
msgid "Nothing to merge."
5838
#: brzlib/errors.py:2070
5838
#: breezy/errors.py:2070
5839
5839
msgid "Format %(format)s cannot be initialised by this version of bzr."
5842
#: brzlib/errors.py:2079
5842
#: breezy/errors.py:2079
5844
5844
"Cannot convert from format %(from_format)s to format %(format)s. "
5848
#: brzlib/errors.py:2091
5848
#: breezy/errors.py:2091
5849
5849
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5852
#: brzlib/errors.py:2099
5852
#: breezy/errors.py:2099
5853
5853
msgid "%(exe_name)s could not be found on this machine"
5856
#: brzlib/errors.py:2107
5856
#: breezy/errors.py:2107
5857
5857
msgid "Diff is not installed on this machine: %(msg)s"
5860
#: brzlib/errors.py:2115
5860
#: breezy/errors.py:2115
5861
5861
msgid "Diff3 is not installed on this machine."
5864
#: brzlib/errors.py:2121
5864
#: breezy/errors.py:2121
5865
5865
msgid "The content being inserted is already present."
5868
#: brzlib/errors.py:2126
5868
#: breezy/errors.py:2126
5870
5870
"This tree contains left-over files from a failed operation.\n"
5871
5871
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5888
5888
" keep, and delete it when you are done."
5891
#: brzlib/errors.py:2158
5891
#: breezy/errors.py:2158
5893
5893
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5894
5894
"examine %(pending_deletion)s to see if it contains any files you wish to "
5895
5895
"keep, and delete it when you are done."
5898
#: brzlib/errors.py:2168
5898
#: breezy/errors.py:2168
5899
5899
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5902
#: brzlib/errors.py:2182
5902
#: breezy/errors.py:2182
5903
5903
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5906
#: brzlib/errors.py:2195
5906
#: breezy/errors.py:2195
5907
5907
msgid "Error in merge modified format"
5910
#: brzlib/errors.py:2200
5910
#: breezy/errors.py:2200
5911
5911
msgid "Format error in conflict listings"
5914
#: brzlib/errors.py:2204
5914
#: breezy/errors.py:2204
5916
5916
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5917
5917
"Error: %(description)s"
5920
#: brzlib/errors.py:2215
5920
#: breezy/errors.py:2215
5922
5922
"An error has been detected in the repository %(repo_path)s.\n"
5923
5923
"Please run bzr reconcile on this repository."
5926
#: brzlib/errors.py:2226
5926
#: breezy/errors.py:2226
5928
5928
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5929
5929
"reason: %(reason)s"
5932
#: brzlib/errors.py:2239
5932
#: breezy/errors.py:2239
5934
5934
"An inconsistent delta was supplied: %(delta)r\n"
5935
5935
"reason: %(reason)s"
5938
#: brzlib/errors.py:2251
5938
#: breezy/errors.py:2251
5939
5939
msgid "To use this feature you must upgrade your branch at %(path)s."
5942
#: brzlib/errors.py:2260
5942
#: breezy/errors.py:2260
5943
5943
msgid "To use this feature you must upgrade your repository at %(path)s."
5946
#: brzlib/errors.py:2265
5946
#: breezy/errors.py:2265
5948
5948
"To use this feature you must upgrade your branch at %(path)s to a format "
5949
5949
"which supports rich roots."
5952
#: brzlib/errors.py:2271
5952
#: breezy/errors.py:2271
5953
5953
msgid "Cannot perform local-only commits on unbound branches."
5956
#: brzlib/errors.py:2276
5956
#: breezy/errors.py:2276
5957
5957
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5960
#: brzlib/errors.py:2297
5960
#: breezy/errors.py:2297
5961
5961
msgid "Ghost tags not supported by format %(format)r."
5964
#: brzlib/errors.py:2305
5964
#: breezy/errors.py:2305
5965
5965
msgid "File is binary but should be text."
5968
#: brzlib/errors.py:2310
5968
#: breezy/errors.py:2310
5969
5969
msgid "The path %(path)s is not permitted on this platform"
5972
#: brzlib/errors.py:2319
5972
#: breezy/errors.py:2319
5974
5974
"Testament did not match expected value.\n"
5975
5975
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5976
5976
" {%(measured)s}"
5979
#: brzlib/errors.py:2331
5979
#: breezy/errors.py:2331
5980
5980
msgid "Not a bzr revision-bundle: %(text)r"
5983
#: brzlib/errors.py:2340
5983
#: breezy/errors.py:2340
5984
5984
msgid "Bad bzr revision-bundle: %(text)r"
5987
#: brzlib/errors.py:2349
5987
#: breezy/errors.py:2349
5988
5988
msgid "Malformed bzr revision-bundle header: %(text)r"
5991
#: brzlib/errors.py:2354
5991
#: breezy/errors.py:2354
5992
5992
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5995
#: brzlib/errors.py:2359
5995
#: breezy/errors.py:2359
5996
5996
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5999
#: brzlib/errors.py:2364
5999
#: breezy/errors.py:2364
6000
6000
msgid "End of line marker was not \\n in bzr revision-bundle"
6003
#: brzlib/errors.py:2374
6003
#: breezy/errors.py:2374
6004
6004
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6007
#: brzlib/errors.py:2384
6007
#: breezy/errors.py:2384
6008
6008
msgid "Root class for inventory serialization errors"
6011
#: brzlib/errors.py:2388
6011
#: breezy/errors.py:2388
6013
6013
"The inventory was not in the expected format:\n"
6017
#: brzlib/errors.py:2397
6017
#: breezy/errors.py:2397
6018
6018
msgid "This operation requires rich root data storage"
6021
#: brzlib/errors.py:2410
6021
#: breezy/errors.py:2410
6022
6022
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6025
#: brzlib/errors.py:2419
6025
#: breezy/errors.py:2419
6027
6027
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6031
#: brzlib/errors.py:2426
6031
#: breezy/errors.py:2426
6033
6033
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6034
6034
"ghost at {%(ghost_revision_id)s}"
6037
#: brzlib/errors.py:2436
6037
#: breezy/errors.py:2436
6038
6038
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6041
#: brzlib/errors.py:2487
6041
#: breezy/errors.py:2487
6043
6043
"A merge directive must provide either a bundle or a public branch location."
6046
#: brzlib/errors.py:2494
6046
#: breezy/errors.py:2494
6047
6047
msgid "Bad merge directive payload %(start)r"
6050
#: brzlib/errors.py:2504
6050
#: breezy/errors.py:2504
6051
6051
msgid "Preview patch does not match requested changes."
6054
#: brzlib/errors.py:2510
6054
#: breezy/errors.py:2510
6055
6055
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6058
#: brzlib/errors.py:2520
6058
#: breezy/errors.py:2520
6060
6060
"Your branch does not have all of the revisions required in order to merge "
6061
6061
"this merge directive and the target location specified in the merge "
6062
6062
"directive is not a branch: %(location)s."
6065
#: brzlib/errors.py:2532
6065
#: breezy/errors.py:2532
6066
6066
msgid "Unsupported entry kind %(kind)s"
6069
#: brzlib/errors.py:2540
6069
#: breezy/errors.py:2540
6070
6070
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6073
#: brzlib/errors.py:2550
6073
#: breezy/errors.py:2550
6074
6074
msgid "Subsume target %(other_tree)s needs to be upgraded."
6077
#: brzlib/errors.py:2569
6077
#: breezy/errors.py:2569
6078
6078
msgid "No such tag: %(tag_name)s"
6081
#: brzlib/errors.py:2577
6081
#: breezy/errors.py:2577
6082
6082
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6085
#: brzlib/errors.py:2586
6085
#: breezy/errors.py:2586
6086
6086
msgid "Tag %(tag_name)s already exists."
6089
#: brzlib/errors.py:2594
6089
#: breezy/errors.py:2594
6091
6091
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6092
6092
"\" for more information on this feature."
6095
#: brzlib/errors.py:2604
6095
#: breezy/errors.py:2604
6097
6097
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6100
#: brzlib/errors.py:2614
6100
#: breezy/errors.py:2614
6102
6102
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6105
#: brzlib/errors.py:2624
6105
#: breezy/errors.py:2624
6106
6106
msgid "Invalid line in bugs property: '%(line)s'"
6109
#: brzlib/errors.py:2632
6109
#: breezy/errors.py:2632
6110
6110
msgid "Invalid bug status: '%(status)s'"
6113
#: brzlib/errors.py:2640
6113
#: breezy/errors.py:2640
6114
6114
msgid "Could not understand response from smart server: %(response_tuple)r"
6117
#: brzlib/errors.py:2679
6117
#: breezy/errors.py:2679
6118
6118
msgid "Server sent an unexpected error: %(error_tuple)r"
6121
#: brzlib/errors.py:2698
6121
#: breezy/errors.py:2698
6122
6122
msgid "Unrecognised container format: %(container_format)r"
6125
#: brzlib/errors.py:2706
6125
#: breezy/errors.py:2706
6126
6126
msgid "Unexpected end of container stream"
6129
#: brzlib/errors.py:2711
6129
#: breezy/errors.py:2711
6130
6130
msgid "Unknown record type: %(record_type)r"
6133
#: brzlib/errors.py:2719
6133
#: breezy/errors.py:2719
6134
6134
msgid "Invalid record: %(reason)s"
6137
#: brzlib/errors.py:2727
6137
#: breezy/errors.py:2727
6138
6138
msgid "Container has data after end marker: %(excess)r"
6141
#: brzlib/errors.py:2735
6141
#: breezy/errors.py:2735
6142
6142
msgid "Container has multiple records with the same name: %(name)s"
6145
#: brzlib/errors.py:2748
6145
#: breezy/errors.py:2748
6146
6146
msgid "Corrupt or incompatible data stream: %(reason)s"
6149
#: brzlib/errors.py:2756
6149
#: breezy/errors.py:2756
6150
6150
msgid "SMTP error: %(error)s"
6153
#: brzlib/errors.py:2764
6153
#: breezy/errors.py:2764
6154
6154
msgid "No message supplied."
6157
#: brzlib/errors.py:2769
6157
#: breezy/errors.py:2769
6158
6158
msgid "No mail-to address (--mail-to) or output (-o) specified."
6161
#: brzlib/errors.py:2774
6161
#: breezy/errors.py:2774
6163
6163
"Unable to find mail client with the following names: "
6164
6164
"%(mail_command_list_string)s"
6167
#: brzlib/errors.py:2784
6167
#: breezy/errors.py:2784
6168
6168
msgid "SMTP connection to %(host)s refused"
6171
#: brzlib/errors.py:2793
6171
#: breezy/errors.py:2793
6172
6172
msgid "Please specify smtp_server. No server at default %(host)s."
6175
#: brzlib/errors.py:2807
6175
#: breezy/errors.py:2807
6177
6177
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6181
#: brzlib/errors.py:2819
6181
#: breezy/errors.py:2819
6182
6182
msgid "'%(display_url)s' is already a branch."
6185
#: brzlib/errors.py:2824
6185
#: breezy/errors.py:2824
6186
6186
msgid "'%(display_url)s' is already a tree."
6189
#: brzlib/errors.py:2829
6189
#: breezy/errors.py:2829
6190
6190
msgid "'%(display_url)s' is already a checkout."
6193
#: brzlib/errors.py:2834
6193
#: breezy/errors.py:2834
6194
6194
msgid "'%(display_url)s' is already a lightweight checkout."
6197
#: brzlib/errors.py:2839
6197
#: breezy/errors.py:2839
6198
6198
msgid "'%(display_url)s' is already using a shared repository."
6201
#: brzlib/errors.py:2844
6201
#: breezy/errors.py:2844
6202
6202
msgid "'%(display_url)s' is already standalone."
6205
#: brzlib/errors.py:2849
6205
#: breezy/errors.py:2849
6206
6206
msgid "Shared repository '%(display_url)s' already creates working trees."
6209
#: brzlib/errors.py:2855
6209
#: breezy/errors.py:2855
6211
6211
"Shared repository '%(display_url)s' already doesn't create working trees."
6214
#: brzlib/errors.py:2861
6214
#: breezy/errors.py:2861
6215
6215
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6218
#: brzlib/errors.py:2866
6218
#: breezy/errors.py:2866
6219
6219
msgid "No location could be found to bind to at %(display_url)s."
6222
#: brzlib/errors.py:2871
6222
#: breezy/errors.py:2871
6224
6224
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6228
#: brzlib/errors.py:2890
6228
#: breezy/errors.py:2890
6230
6230
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6233
#: brzlib/errors.py:2905
6233
#: breezy/errors.py:2905
6235
6235
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6239
#: brzlib/errors.py:2911
6239
#: breezy/errors.py:2911
6240
6240
msgid "Variable {%(name)s} is not available."
6243
#: brzlib/errors.py:2919
6243
#: breezy/errors.py:2919
6244
6244
msgid "No template specified."
6247
#: brzlib/errors.py:2924
6247
#: breezy/errors.py:2924
6248
6248
msgid "Unable to create symlink %(path_str)son this platform"
6251
#: brzlib/errors.py:2939
6251
#: breezy/errors.py:2939
6253
6253
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6254
6254
"\", \"local\"."
6257
#: brzlib/errors.py:2973
6257
#: breezy/errors.py:2973
6259
6259
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6262
#: brzlib/errors.py:2985
6262
#: breezy/errors.py:2985
6263
6263
msgid "The \"%(config_id)s\" configuration does not exist."
6266
#: brzlib/errors.py:2993
6266
#: breezy/errors.py:2993
6267
6267
msgid "The \"%(option_name)s\" configuration option does not exist."
6270
#: brzlib/errors.py:3001
6270
#: breezy/errors.py:3001
6271
6271
msgid "The alias \"%(alias_name)s\" does not exist."
6274
#: brzlib/errors.py:3015
6274
#: breezy/errors.py:3015
6275
6275
msgid "\"%(alias_name)s\" is not a valid location alias."
6278
#: brzlib/errors.py:3023
6278
#: breezy/errors.py:3023
6279
6279
msgid "No %(alias_name)s location assigned."
6282
#: brzlib/errors.py:3031
6282
#: breezy/errors.py:3031
6283
6283
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6286
#: brzlib/errors.py:3041
6286
#: breezy/errors.py:3041
6287
6287
msgid "Unknown rules detected: %(unknowns_str)s."
6290
#: brzlib/errors.py:3052
6290
#: breezy/errors.py:3052
6291
6291
msgid "Tip change rejected: %(msg)s"
6294
#: brzlib/errors.py:3060
6294
#: breezy/errors.py:3060
6295
6295
msgid "Shelf corrupt."
6298
#: brzlib/errors.py:3065
6298
#: breezy/errors.py:3065
6299
6299
msgid "Corruption while decompressing repository file%(orig_error)s"
6302
#: brzlib/errors.py:3077
6302
#: breezy/errors.py:3077
6303
6303
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6306
#: brzlib/errors.py:3085
6306
#: breezy/errors.py:3085
6307
6307
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6310
#: brzlib/errors.py:3093
6310
#: breezy/errors.py:3093
6311
6311
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6314
#: brzlib/errors.py:3101
6314
#: breezy/errors.py:3101
6315
6315
msgid "The user aborted the operation."
6318
#: brzlib/errors.py:3106
6318
#: breezy/errors.py:3106
6319
6319
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6322
#: brzlib/errors.py:3116
6322
#: breezy/errors.py:3116
6323
6323
msgid "No such view: %(view_name)s."
6326
#: brzlib/errors.py:3126
6326
#: breezy/errors.py:3126
6328
6328
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6329
6329
"to a later format."
6332
#: brzlib/errors.py:3135
6332
#: breezy/errors.py:3135
6334
6334
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6337
#: brzlib/errors.py:3202
6337
#: breezy/errors.py:3202
6338
6338
msgid "%(bzrdir)r does not support co-located branches."
6341
#: brzlib/errors.py:3208
6341
#: breezy/errors.py:3208
6343
6343
"Unable to determine your name.\n"
6344
6344
"Please, set your name with the 'whoami' command.\n"
6345
6345
"E.g. bzr whoami \"Your Name <name@example.com>\""
6348
#: brzlib/errors.py:3217
6348
#: breezy/errors.py:3217
6349
6349
msgid "Invalid pattern(s) found. %(msg)s"
6352
#: brzlib/errors.py:3225
6352
#: breezy/errors.py:3225
6354
6354
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6355
6355
"unbind` to fix."
6358
#: brzlib/errors.py:3236
6358
#: breezy/errors.py:3236
6359
6359
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6362
#: brzlib/errors.py:3245
6362
#: breezy/errors.py:3245
6363
6363
msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"."
6366
#: brzlib/errors.py:3254
6366
#: breezy/errors.py:3254
6367
6367
msgid "Option \"%(name)s\" is not allowed."
6370
#: brzlib/errors.py:3262
6370
#: breezy/errors.py:3262
6372
6372
"No compatible object available for operations from %(source)r to %(target)r."
6375
#: brzlib/errors.py:3272
6375
#: breezy/errors.py:3272
6377
6377
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6378
6378
"%(arguments)s."
6381
#: brzlib/errors.py:3282
6381
#: breezy/errors.py:3282
6383
6383
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6384
6384
"format %(format)r"
6387
#: brzlib/errors.py:3294
6387
#: breezy/errors.py:3294
6389
6389
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6393
#: brzlib/errors.py:3307
6393
#: breezy/errors.py:3307
6394
6394
msgid "Binary files section encountered."
6397
#: brzlib/errors.py:3315
6397
#: breezy/errors.py:3315
6399
6399
"Malformed patch header. %(desc)s\n"
6403
#: brzlib/errors.py:3324
6403
#: breezy/errors.py:3324
6405
6405
"Malformed hunk header. %(desc)s\n"
6409
#: brzlib/errors.py:3333
6409
#: breezy/errors.py:3333
6411
6411
"Malformed line. %(desc)s\n"
6415
#: brzlib/errors.py:3343
6415
#: breezy/errors.py:3343
6417
6417
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6418
6418
"but patch says it should be \"%(patch_line)s\""
6421
#: brzlib/errors.py:3354
6421
#: breezy/errors.py:3354
6422
6422
msgid "The feature %(feature)s has already been registered."
6425
#: brzlib/errors.py:3362
6425
#: breezy/errors.py:3362
6427
6427
"Cannot store uncommitted changes because this branch already stores "
6428
6428
"uncommitted changes."
6431
#: brzlib/export_pot.py:252
6431
#: breezy/export_pot.py:252
6432
6432
#, python-format
6433
6433
msgid "Exporting messages from builtin command: %s"
6436
#: brzlib/export_pot.py:271
6436
#: breezy/export_pot.py:271
6437
6437
#, python-brace-format
6438
6438
msgid "Exporting messages from plugin command: {0} in {1}"
6441
#: brzlib/export_pot.py:292
6441
#: breezy/export_pot.py:292
6442
6442
#, python-format
6443
6443
msgid "Exporting message from error: %s"
6446
#: brzlib/fetch.py:98
6446
#: breezy/fetch.py:98
6447
6447
msgid "Finding revisions"
6450
#: brzlib/fetch.py:103
6450
#: breezy/fetch.py:103
6451
6451
msgid "Fetching revisions"
6454
#: brzlib/foreign.py:262
6454
#: breezy/foreign.py:262
6455
6455
msgid "Push into a different VCS without any custom bzr metadata."
6458
#: brzlib/foreign.py:264
6458
#: breezy/foreign.py:264
6460
6460
"This will afterwards rebase the local branch on the remote\n"
6461
6461
"branch unless the --no-rebase option is used, in which case \n"
6465
6465
# help of 'no-rebase' option of 'dpush' command
6466
#: brzlib/foreign.py:277
6466
#: breezy/foreign.py:277
6467
6467
msgid "Do not rebase after push."
6470
#: brzlib/foreign.py:311
6470
#: breezy/foreign.py:311
6471
6471
#, python-format
6472
6472
msgid "Using saved location: %s\n"
6475
#: brzlib/foreign.py:321
6475
#: breezy/foreign.py:321
6477
6477
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6478
6478
"regular push."
6481
#: brzlib/gpg.py:358
6481
#: breezy/gpg.py:358
6482
6482
#, python-brace-format
6483
6483
msgid "No GnuPG key results for pattern: {0}"
6486
#: brzlib/gpg.py:431
6486
#: breezy/gpg.py:431
6487
6487
#, python-brace-format
6488
6488
msgid "{0} commits with valid signatures"
6491
#: brzlib/gpg.py:437
6491
#: breezy/gpg.py:437
6492
6492
#, python-brace-format
6493
6493
msgid "{0} commit with unknown key"
6494
6494
msgid_plural "{0} commits with unknown keys"
6498
#: brzlib/gpg.py:445
6498
#: breezy/gpg.py:445
6499
6499
#, python-brace-format
6500
6500
msgid "{0} commit not valid"
6501
6501
msgid_plural "{0} commits not valid"
6505
#: brzlib/gpg.py:453
6505
#: breezy/gpg.py:453
6506
6506
#, python-brace-format
6507
6507
msgid "{0} commit not signed"
6508
6508
msgid_plural "{0} commits not signed"
6512
#: brzlib/gpg.py:461
6512
#: breezy/gpg.py:461
6513
6513
#, python-brace-format
6514
6514
msgid "{0} commit with key now expired"
6515
6515
msgid_plural "{0} commits with key now expired"
6519
#: brzlib/gpg.py:481
6519
#: breezy/gpg.py:481
6520
6520
#, python-brace-format
6521
6521
msgid "{0} commit by author {1} with key {2} now expired"
6522
6522
msgid_plural "{0} commits by author {1} with key {2} now expired"
6526
#: brzlib/gpg.py:497
6526
#: breezy/gpg.py:497
6527
6527
#, python-brace-format
6528
6528
msgid "{0} signed {1} commit"
6529
6529
msgid_plural "{0} signed {1} commits"
6533
#: brzlib/gpg.py:514 brzlib/gpg.py:531
6533
#: breezy/gpg.py:514 breezy/gpg.py:531
6534
6534
#, python-brace-format
6535
6535
msgid "{0} commit by author {1}"
6536
6536
msgid_plural "{0} commits by author {1}"
6540
#: brzlib/gpg.py:546
6540
#: breezy/gpg.py:546
6541
6541
#, python-brace-format
6542
6542
msgid "Unknown key {0} signed {1} commit"
6543
6543
msgid_plural "Unknown key {0} signed {1} commits"
6547
#: brzlib/groupcompress.py:1739
6547
#: breezy/groupcompress.py:1739
6548
6548
#, python-format
6549
6549
msgid "Insert claimed random_id=True, but then inserted %r two times"
6552
#: brzlib/hooks.py:313
6552
#: breezy/hooks.py:313
6553
6553
#, python-format
6554
6554
msgid "Introduced in: %s"
6557
#: brzlib/hooks.py:316
6557
#: breezy/hooks.py:316
6558
6558
#, python-format
6559
6559
msgid "Deprecated in: %s"
6562
#: brzlib/knit.py:1766 brzlib/knit.py:1802
6562
#: breezy/knit.py:1766 breezy/knit.py:1802
6563
6563
msgid "Walking content"
6566
#: brzlib/knit.py:3330
6566
#: breezy/knit.py:3330
6567
6567
msgid "annotating"
6570
#: brzlib/lock.py:549
6570
#: breezy/lock.py:549
6571
6571
msgid "{0!r} was {1} locked again"
6574
#: brzlib/lockdir.py:321
6574
#: breezy/lockdir.py:321
6575
6575
#, python-format
6576
6576
msgid "error removing pending lock: %s"
6579
#: brzlib/lockdir.py:616
6579
#: breezy/lockdir.py:616
6580
6580
msgid "Unable to obtain"
6583
#: brzlib/lockdir.py:618
6583
#: breezy/lockdir.py:618
6584
6584
msgid "Lock owner changed for"
6587
#: brzlib/lockdir.py:620
6587
#: breezy/lockdir.py:620
6588
6588
#, python-brace-format
6589
6589
msgid "{0} lock {1} {2}."
6592
#: brzlib/lockdir.py:627
6592
#: breezy/lockdir.py:627
6593
6593
#, python-format
6594
6594
msgid "Will continue to try until %s, unless you press Ctrl-C."
6597
#: brzlib/lockdir.py:629
6597
#: breezy/lockdir.py:629
6598
6598
msgid "See \"bzr help break-lock\" for more."
6601
#: brzlib/lockdir.py:739
6601
#: breezy/lockdir.py:739
6602
6602
#, python-format
6604
6604
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6607
#: brzlib/log.py:563
6607
#: breezy/log.py:563
6608
6608
msgid "--exclude-common-ancestry requires two different revisions"
6611
#: brzlib/log.py:565
6611
#: breezy/log.py:565
6612
6612
#, python-format
6613
6613
msgid "invalid direction %r"
6616
#: brzlib/log.py:653
6616
#: breezy/log.py:653
6617
6617
msgid "Start revision not found in history of end revision."
6620
#: brzlib/log.py:1071 brzlib/log.py:1129
6620
#: breezy/log.py:1071 breezy/log.py:1129
6621
6621
msgid "Logging revision 0 is invalid."
6624
#: brzlib/log.py:1073 brzlib/log.py:1131
6624
#: breezy/log.py:1073 breezy/log.py:1131
6625
6625
msgid "Start revision must be older than the end revision."
6628
#: brzlib/log.py:1818
6628
#: breezy/log.py:1818
6629
6629
#, python-format
6630
6630
msgid "unknown log formatter: %r"
6633
#: brzlib/log.py:2114
6633
#: breezy/log.py:2114
6634
6634
msgid "fixes bug"
6635
6635
msgid_plural "fixes bugs"
6639
#: brzlib/merge.py:689
6639
#: breezy/merge.py:689
6640
6640
msgid "All changes applied successfully."
6643
#: brzlib/merge.py:691
6643
#: breezy/merge.py:691
6644
6644
#, python-format
6645
6645
msgid "%d conflicts encountered."
6648
#: brzlib/merge.py:845 brzlib/merge.py:1868
6648
#: breezy/merge.py:845 breezy/merge.py:1868
6649
6649
msgid "Preparing file merge"
6652
#: brzlib/multiparent.py:426
6652
#: breezy/multiparent.py:426
6653
6653
msgid "Importing revisions"
6656
6656
# help of 'help' option
6657
#: brzlib/option.py:526
6657
#: breezy/option.py:526
6658
6658
msgid "Show help message."
6661
6661
# help of 'quiet' option
6662
#: brzlib/option.py:528
6662
#: breezy/option.py:528
6663
6663
msgid "Only display errors and warnings."
6666
6666
# help of 'usage' option
6667
#: brzlib/option.py:531
6667
#: breezy/option.py:531
6668
6668
msgid "Show usage message and options."
6671
6671
# help of 'verbose' option
6672
#: brzlib/option.py:533
6672
#: breezy/option.py:533
6673
6673
msgid "Display more information."
6676
6676
# help of 'change' option
6677
#: brzlib/option.py:541
6677
#: breezy/option.py:541
6679
6679
"Select changes introduced by the specified revision. See also \"help "
6680
6680
"revisionspec\"."
6683
6683
# help of 'directory' option
6684
#: brzlib/option.py:543
6684
#: breezy/option.py:543
6685
6685
msgid "Branch to operate on, instead of working directory."
6688
6688
# help of 'log-format=long' option
6689
#: brzlib/option.py:545
6689
#: breezy/option.py:545
6690
6690
msgid "Detailed log format."
6693
6693
# help of 'log-format=gnu-changelog' option
6694
#: brzlib/option.py:545
6694
#: breezy/option.py:545
6695
6695
msgid "Format used by GNU ChangeLog files."
6698
6698
# help of 'log-format=line' option
6699
#: brzlib/option.py:545
6699
#: breezy/option.py:545
6700
6700
msgid "Log format with one line per revision."
6703
6703
# help of 'log-format=short' option
6704
#: brzlib/option.py:545
6704
#: breezy/option.py:545
6705
6705
msgid "Moderately short log format."
6708
6708
# help of 'log-format' option
6709
#: brzlib/option.py:545
6709
#: breezy/option.py:545
6710
6710
msgid "Use specified log format."
6713
6713
# title of 'log-format' option
6714
#: brzlib/option.py:547
6714
#: breezy/option.py:547
6715
6715
msgid "Log format"
6718
6718
# help of 'merge-type=lca' option
6719
#: brzlib/option.py:549
6719
#: breezy/option.py:549
6720
6720
msgid "LCA-newness merge."
6723
6723
# help of 'merge-type=diff3' option
6724
#: brzlib/option.py:549
6724
#: breezy/option.py:549
6725
6725
msgid "Merge using external diff3."
6728
6728
# help of 'merge-type=merge3' option
6729
#: brzlib/option.py:549
6729
#: breezy/option.py:549
6730
6730
msgid "Native diff3-style merge."
6733
6733
# help of 'merge-type' option
6734
#: brzlib/option.py:549
6734
#: breezy/option.py:549
6735
6735
msgid "Select a particular merge algorithm."
6738
6738
# help of 'merge-type=weave' option
6739
#: brzlib/option.py:549
6739
#: breezy/option.py:549
6740
6740
msgid "Weave-based merge."
6743
6743
# title of 'merge-type' option
6744
#: brzlib/option.py:551
6744
#: breezy/option.py:551
6745
6745
msgid "Merge algorithm"
6748
6748
# help of 'message' option
6749
#: brzlib/option.py:554
6749
#: breezy/option.py:554
6750
6750
msgid "Message string."
6753
6753
# help of 'null' option
6754
#: brzlib/option.py:556
6754
#: breezy/option.py:556
6755
6755
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6758
6758
# help of 'overwrite' option
6759
#: brzlib/option.py:558
6759
#: breezy/option.py:558
6760
6760
msgid "Ignore differences between branches and overwrite unconditionally."
6763
6763
# help of 'remember' option
6764
#: brzlib/option.py:560
6764
#: breezy/option.py:560
6765
6765
msgid "Remember the specified location as a default."
6768
6768
# help of 'reprocess' option
6769
#: brzlib/option.py:562
6769
#: breezy/option.py:562
6770
6770
msgid "Reprocess to reduce spurious conflicts."
6773
6773
# help of 'revision' option
6774
#: brzlib/option.py:566
6774
#: breezy/option.py:566
6775
6775
msgid "See \"help revisionspec\" for details."
6778
6778
# help of 'show-ids' option
6779
#: brzlib/option.py:568
6779
#: breezy/option.py:568
6780
6780
msgid "Show internal object ids."
6783
6783
# help of 'timezone' option
6784
#: brzlib/option.py:571
6784
#: breezy/option.py:571
6785
6785
msgid "Display timezone as local, original, or utc."
6788
#: brzlib/osutils.py:101
6788
#: breezy/osutils.py:101
6789
6789
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6792
#: brzlib/osutils.py:221
6792
#: breezy/osutils.py:221
6793
6793
msgid "lstat/stat of ({0!r}): {1!r}"
6796
#: brzlib/osutils.py:1041 brzlib/osutils.py:1052
6796
#: breezy/osutils.py:1041 breezy/osutils.py:1052
6797
6797
#, python-format
6798
6798
msgid "sorry, %r not allowed in path"
6801
#: brzlib/osutils.py:1270
6801
#: breezy/osutils.py:1270
6802
6802
#, python-format
6803
6803
msgid "%r is too short to calculate a relative path"
6806
#: brzlib/plugin.py:143
6806
#: breezy/plugin.py:143
6807
6807
#, python-format
6808
6808
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6811
6811
# help of 'plugin' option of 'bash-completion' command
6812
#: brzlib/plugins/bash_completion/bashcomp.py:411
6812
#: breezy/plugins/bash_completion/bashcomp.py:411
6813
6813
msgid "Enable completions for the selected plugin (default: all plugins)"
6816
#: brzlib/plugins/bash_completion/bashcomp.py:412
6816
#: breezy/plugins/bash_completion/bashcomp.py:412
6817
6817
msgid "Generate a shell function for bash command line completion."
6820
#: brzlib/plugins/bash_completion/bashcomp.py:414
6820
#: breezy/plugins/bash_completion/bashcomp.py:414
6822
6822
"This command generates a shell function which can be used by bash to\n"
6823
6823
"automatically complete the currently typed command when the user presses\n"
6824
6824
"the completion key (usually tab)."
6827
#: brzlib/plugins/bash_completion/bashcomp.py:418
6827
#: breezy/plugins/bash_completion/bashcomp.py:418
6829
6829
"Commonly used like this:\n"
6830
6830
" eval \"`bzr bash-completion`\""
6833
6833
# help of 'function-name' option of 'bash-completion' command
6834
#: brzlib/plugins/bash_completion/bashcomp.py:424
6834
#: breezy/plugins/bash_completion/bashcomp.py:424
6835
6835
msgid "Name of the generated function (default: _bzr)"
6838
6838
# help of 'function-only' option of 'bash-completion' command
6839
#: brzlib/plugins/bash_completion/bashcomp.py:426
6839
#: breezy/plugins/bash_completion/bashcomp.py:426
6840
6840
msgid "Generate only the shell function, don't enable it"
6843
#: brzlib/plugins/grep/cmds.py:77
6843
#: breezy/plugins/grep/cmds.py:77
6844
6844
msgid "Print lines matching PATTERN for specified files and revisions."
6847
#: brzlib/plugins/grep/cmds.py:79
6847
#: breezy/plugins/grep/cmds.py:79
6849
6849
"This command searches the specified files and revisions for a given\n"
6850
6850
"pattern. The pattern is specified as a Python regular expressions[1]."
6853
#: brzlib/plugins/grep/cmds.py:82
6853
#: breezy/plugins/grep/cmds.py:82
6855
6855
"If the file name is not specified, the revisions starting with the\n"
6856
6856
"current directory are searched recursively. If the revision number is\n"
6880
6880
"pattern is not a regular expression."
6883
#: brzlib/plugins/grep/cmds.py:100
6883
#: breezy/plugins/grep/cmds.py:100
6884
6884
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6887
6887
# help of 'color' option of 'grep' command
6888
#: brzlib/plugins/grep/cmds.py:109
6888
#: breezy/plugins/grep/cmds.py:109
6889
6889
msgid "Show match in color. WHEN is never, always or auto."
6892
6892
# help of 'diff' option of 'grep' command
6893
#: brzlib/plugins/grep/cmds.py:111
6893
#: breezy/plugins/grep/cmds.py:111
6894
6894
msgid "Grep for pattern in changeset for each revision."
6897
6897
# help of 'exclude' option of 'grep' command
6898
#: brzlib/plugins/grep/cmds.py:113
6898
#: breezy/plugins/grep/cmds.py:113
6899
6899
msgid "Skip files whose base name matches GLOB."
6902
6902
# help of 'include' option of 'grep' command
6903
#: brzlib/plugins/grep/cmds.py:115
6903
#: breezy/plugins/grep/cmds.py:115
6904
6904
msgid "Search only files whose base name matches GLOB."
6907
6907
# help of 'files-with-matches' option of 'grep' command
6908
#: brzlib/plugins/grep/cmds.py:117
6908
#: breezy/plugins/grep/cmds.py:117
6909
6909
msgid "Print only the name of each input file in which PATTERN is found."
6912
6912
# help of 'files-without-match' option of 'grep' command
6913
#: brzlib/plugins/grep/cmds.py:120
6913
#: breezy/plugins/grep/cmds.py:120
6914
6914
msgid "Print only the name of each input file in which PATTERN is not found."
6917
6917
# help of 'fixed-string' option of 'grep' command
6918
#: brzlib/plugins/grep/cmds.py:123
6918
#: breezy/plugins/grep/cmds.py:123
6919
6919
msgid "Interpret PATTERN is a single fixed string (not regex)."
6922
6922
# help of 'from-root' option of 'grep' command
6923
#: brzlib/plugins/grep/cmds.py:125
6923
#: breezy/plugins/grep/cmds.py:125
6925
6925
"Search for pattern starting from the root of the branch. (implies --"
6929
6929
# help of 'ignore-case' option of 'grep' command
6930
#: brzlib/plugins/grep/cmds.py:128
6930
#: breezy/plugins/grep/cmds.py:128
6931
6931
msgid "ignore case distinctions while matching."
6934
6934
# help of 'levels' option of 'grep' command
6935
#: brzlib/plugins/grep/cmds.py:130
6935
#: breezy/plugins/grep/cmds.py:130
6937
6937
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6940
6940
# help of 'line-number' option of 'grep' command
6941
#: brzlib/plugins/grep/cmds.py:135
6941
#: breezy/plugins/grep/cmds.py:135
6942
6942
msgid "show 1-based line number."
6945
6945
# help of 'no-recursive' option of 'grep' command
6946
#: brzlib/plugins/grep/cmds.py:137
6946
#: breezy/plugins/grep/cmds.py:137
6947
6947
msgid "Don't recurse into subdirectories. (default is --recursive)"
6950
6950
# help of 'null' option of 'grep' command
6951
#: brzlib/plugins/grep/cmds.py:139
6951
#: breezy/plugins/grep/cmds.py:139
6953
6953
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6957
#: brzlib/plugins/launchpad/account.py:66
6957
#: breezy/plugins/launchpad/account.py:66
6958
6958
msgid "Setting ssh/sftp usernames for launchpad.net."
6961
#: brzlib/plugins/launchpad/cmds.py:43
6961
#: breezy/plugins/launchpad/cmds.py:43
6962
6962
msgid "Register a branch with launchpad.net."
6965
#: brzlib/plugins/launchpad/cmds.py:45
6965
#: breezy/plugins/launchpad/cmds.py:45
6967
6967
"This command lists a bzr branch in the directory of branches on\n"
6968
6968
"launchpad.net. Registration allows the branch to be associated with\n"
6969
6969
"bugs or specifications."
6972
#: brzlib/plugins/launchpad/cmds.py:49
6972
#: breezy/plugins/launchpad/cmds.py:49
6974
6974
"Before using this command you must register the project to which the\n"
6975
6975
"branch belongs, and create an account for yourself on launchpad.net."
6978
#: brzlib/plugins/launchpad/cmds.py:52
6978
#: breezy/plugins/launchpad/cmds.py:52
6981
6981
" public_url: The publicly visible url for the branch to register.\n"
6997
6997
# help of 'project' option of 'register-branch' command
6998
#: brzlib/plugins/launchpad/cmds.py:68
6998
#: breezy/plugins/launchpad/cmds.py:68
6999
6999
msgid "Launchpad project short name to associate with the branch."
7002
7002
# help of 'branch-name' option of 'register-branch' command
7003
#: brzlib/plugins/launchpad/cmds.py:75
7003
#: breezy/plugins/launchpad/cmds.py:75
7005
7005
"Short name for the branch; by default taken from the last component of the "
7009
7009
# help of 'branch-title' option of 'register-branch' command
7010
#: brzlib/plugins/launchpad/cmds.py:79
7010
#: breezy/plugins/launchpad/cmds.py:79
7011
7011
msgid "One-sentence description of the branch."
7014
7014
# help of 'branch-description' option of 'register-branch' command
7015
#: brzlib/plugins/launchpad/cmds.py:82
7015
#: breezy/plugins/launchpad/cmds.py:82
7016
7016
msgid "Longer description of the purpose or contents of the branch."
7019
7019
# help of 'author' option of 'register-branch' command
7020
#: brzlib/plugins/launchpad/cmds.py:85
7020
#: breezy/plugins/launchpad/cmds.py:85
7021
7021
msgid "Branch author's email address, if not yourself."
7024
7024
# help of 'link-bug' option of 'register-branch' command
7025
#: brzlib/plugins/launchpad/cmds.py:88
7025
#: breezy/plugins/launchpad/cmds.py:88
7026
7026
msgid "The bug this branch fixes."
7029
7029
# help of 'dry-run' option of 'register-branch' command
7030
#: brzlib/plugins/launchpad/cmds.py:91
7030
#: breezy/plugins/launchpad/cmds.py:91
7031
7031
msgid "Prepare the request but don't actually send it."
7034
#: brzlib/plugins/launchpad/cmds.py:113
7034
#: breezy/plugins/launchpad/cmds.py:113
7036
7036
"register-branch requires a public branch url - see bzr help register-branch."
7039
#: brzlib/plugins/launchpad/cmds.py:121
7039
#: breezy/plugins/launchpad/cmds.py:121
7040
7040
msgid "--product is deprecated; please use --project."
7043
#: brzlib/plugins/launchpad/cmds.py:151
7043
#: breezy/plugins/launchpad/cmds.py:151
7044
7044
msgid "Open a Launchpad branch page in your web browser."
7047
7047
# help of 'dry-run' option of 'launchpad-open' command
7048
#: brzlib/plugins/launchpad/cmds.py:156
7048
#: breezy/plugins/launchpad/cmds.py:156
7049
7049
msgid "Do not actually open the browser. Just say the URL we would use."
7052
#: brzlib/plugins/launchpad/cmds.py:191
7052
#: breezy/plugins/launchpad/cmds.py:191
7053
7053
#, python-format
7054
7054
msgid "Opening %s in web browser"
7057
#: brzlib/plugins/launchpad/cmds.py:199
7057
#: breezy/plugins/launchpad/cmds.py:199
7058
7058
msgid "Show or set the Launchpad user ID."
7061
#: brzlib/plugins/launchpad/cmds.py:201
7061
#: breezy/plugins/launchpad/cmds.py:201
7063
7063
"When communicating with Launchpad, some commands need to know your\n"
7064
7064
"Launchpad user ID. This command can be used to set or show the\n"
7065
7065
"user ID that Bazaar will use for such communication."
7068
#: brzlib/plugins/launchpad/cmds.py:205
7068
#: breezy/plugins/launchpad/cmds.py:205
7071
7071
" Show the Launchpad ID of the current user::"
7074
#: brzlib/plugins/launchpad/cmds.py:208
7074
#: breezy/plugins/launchpad/cmds.py:208
7075
7075
msgid " bzr launchpad-login"
7078
#: brzlib/plugins/launchpad/cmds.py:210
7078
#: breezy/plugins/launchpad/cmds.py:210
7079
7079
msgid " Set the Launchpad ID of the current user to 'bob'::"
7082
#: brzlib/plugins/launchpad/cmds.py:212
7082
#: breezy/plugins/launchpad/cmds.py:212
7083
7083
msgid " bzr launchpad-login bob"
7086
7086
# help of 'no-check' option of 'launchpad-login' command
7087
#: brzlib/plugins/launchpad/cmds.py:219
7087
#: breezy/plugins/launchpad/cmds.py:219
7088
7088
msgid "Don't check that the user name is valid."
7091
#: brzlib/plugins/launchpad/cmds.py:234 brzlib/plugins/launchpad/cmds.py:245
7091
#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245
7092
7092
msgid "Launchpad user ID exists and has SSH keys.\n"
7095
#: brzlib/plugins/launchpad/cmds.py:237
7095
#: breezy/plugins/launchpad/cmds.py:237
7096
7096
msgid "No Launchpad user ID configured.\n"
7099
#: brzlib/plugins/launchpad/cmds.py:248
7099
#: breezy/plugins/launchpad/cmds.py:248
7100
7100
#, python-format
7101
7101
msgid "Launchpad user ID set to '%s'.\n"
7104
#: brzlib/plugins/launchpad/cmds.py:254
7104
#: breezy/plugins/launchpad/cmds.py:254
7105
7105
msgid "Ask Launchpad to mirror a branch now."
7108
#: brzlib/plugins/launchpad/cmds.py:271
7108
#: breezy/plugins/launchpad/cmds.py:271
7109
7109
msgid "Propose merging a branch on Launchpad."
7112
#: brzlib/plugins/launchpad/cmds.py:273
7112
#: breezy/plugins/launchpad/cmds.py:273
7114
7114
"This will open your usual editor to provide the initial comment. When it\n"
7115
7115
"has created the proposal, it will open it in your default web browser."
7118
#: brzlib/plugins/launchpad/cmds.py:276
7118
#: breezy/plugins/launchpad/cmds.py:276
7120
7120
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7121
7121
"is not supplied, the remembered submit branch will be used. If no submit\n"
7122
7122
"branch is remembered, the development focus will be used."
7125
#: brzlib/plugins/launchpad/cmds.py:280
7125
#: breezy/plugins/launchpad/cmds.py:280
7127
7127
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7128
7128
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7130
7130
"may optionally be followed by '=' and the review type. For example:"
7133
#: brzlib/plugins/launchpad/cmds.py:285
7133
#: breezy/plugins/launchpad/cmds.py:285
7134
7134
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7137
#: brzlib/plugins/launchpad/cmds.py:287
7137
#: breezy/plugins/launchpad/cmds.py:287
7139
7139
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7140
7140
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7143
7143
# help of 'staging' option of 'lp-propose-merge' command
7144
#: brzlib/plugins/launchpad/cmds.py:292
7144
#: breezy/plugins/launchpad/cmds.py:292
7145
7145
msgid "Propose the merge on staging."
7148
7148
# help of 'message' option of 'lp-propose-merge' command
7149
#: brzlib/plugins/launchpad/cmds.py:294
7149
#: breezy/plugins/launchpad/cmds.py:294
7150
7150
msgid "Commit message."
7153
7153
# help of 'approve' option of 'lp-propose-merge' command
7154
#: brzlib/plugins/launchpad/cmds.py:296
7154
#: breezy/plugins/launchpad/cmds.py:296
7156
7156
"Mark the proposal as approved immediately, setting the approved revision to "
7160
7160
# help of 'fixes' option of 'lp-propose-merge' command
7161
#: brzlib/plugins/launchpad/cmds.py:298
7161
#: breezy/plugins/launchpad/cmds.py:298
7162
7162
msgid "The bug this proposal fixes."
7165
7165
# help of 'review' option of 'lp-propose-merge' command
7166
#: brzlib/plugins/launchpad/cmds.py:300
7166
#: breezy/plugins/launchpad/cmds.py:300
7167
7167
msgid "Requested reviewer and optional type."
7170
#: brzlib/plugins/launchpad/cmds.py:335
7170
#: breezy/plugins/launchpad/cmds.py:335
7171
7171
msgid "Find the proposal to merge this revision."
7174
#: brzlib/plugins/launchpad/cmds.py:337
7174
#: breezy/plugins/launchpad/cmds.py:337
7176
7176
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7177
7177
"This works only if the if the merged_revno was recorded for the merge\n"
7178
7178
"proposal. The proposal(s) are opened in a web browser."
7181
#: brzlib/plugins/launchpad/cmds.py:341
7181
#: breezy/plugins/launchpad/cmds.py:341
7183
7183
"Only the revision specified is searched for. To find the mainline\n"
7184
7184
"revision that merged it into mainline, use the \"mainline\" revision spec."
7187
#: brzlib/plugins/launchpad/cmds.py:344
7187
#: breezy/plugins/launchpad/cmds.py:344
7188
7188
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7191
#: brzlib/plugins/launchpad/cmds.py:346
7191
#: breezy/plugins/launchpad/cmds.py:346
7192
7192
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
7195
#: brzlib/plugins/launchpad/cmds.py:365
7195
#: breezy/plugins/launchpad/cmds.py:365
7196
7196
msgid "No review found."
7199
#: brzlib/plugins/launchpad/cmds.py:366
7199
#: breezy/plugins/launchpad/cmds.py:366
7200
7200
#, python-format
7201
7201
msgid "%d proposals(s) found."
7204
#: brzlib/plugins/launchpad/cmds.py:378
7204
#: breezy/plugins/launchpad/cmds.py:378
7205
7205
msgid "Finding proposals"
7208
#: brzlib/plugins/launchpad/lp_api.py:231
7209
#: brzlib/plugins/launchpad/lp_api.py:236
7208
#: breezy/plugins/launchpad/lp_api.py:231
7209
#: breezy/plugins/launchpad/lp_api.py:236
7210
7210
#, python-format
7211
7211
msgid "%s is not registered on Launchpad"
7214
#: brzlib/plugins/launchpad/lp_api.py:246
7214
#: breezy/plugins/launchpad/lp_api.py:246
7215
7215
#, python-format
7216
7216
msgid "%s has no development focus."
7219
#: brzlib/plugins/launchpad/lp_api.py:251
7219
#: breezy/plugins/launchpad/lp_api.py:251
7220
7220
#, python-format
7221
7221
msgid "development focus %s has no branch."
7224
#: brzlib/plugins/launchpad/lp_api.py:256
7224
#: breezy/plugins/launchpad/lp_api.py:256
7225
7225
#, python-format
7226
7226
msgid "source package %s has no branch."
7229
#: brzlib/plugins/launchpad/lp_api.py:260
7229
#: breezy/plugins/launchpad/lp_api.py:260
7230
7230
#, python-format
7231
7231
msgid "%s has no associated product or source package."
7234
#: brzlib/plugins/launchpad/lp_api.py:272
7234
#: breezy/plugins/launchpad/lp_api.py:272
7235
7235
#, python-format
7236
7236
msgid "%s is already up-to-date."
7239
#: brzlib/plugins/launchpad/lp_api.py:279
7239
#: breezy/plugins/launchpad/lp_api.py:279
7240
7240
#, python-format
7241
7241
msgid "Pushing to %s"
7244
#: brzlib/plugins/launchpad/lp_directory.py:170
7244
#: breezy/plugins/launchpad/lp_directory.py:170
7245
7245
#, python-brace-format
7247
7247
"resolution for {0}\n"
7252
#: brzlib/plugins/launchpad/lp_propose.py:161
7252
#: breezy/plugins/launchpad/lp_propose.py:161
7253
7253
#, python-format
7254
7254
msgid "There is already a branch merge proposal: %s"
7257
#: brzlib/plugins/weave_fmt/bzrdir.py:237
7257
#: breezy/plugins/weave_fmt/bzrdir.py:237
7258
7258
msgid "pb parameter to convert() is deprecated"
7261
#: brzlib/plugins/weave_fmt/bzrdir.py:240
7261
#: breezy/plugins/weave_fmt/bzrdir.py:240
7262
7262
msgid "starting upgrade from format 4 to 5"
7265
#: brzlib/plugins/weave_fmt/bzrdir.py:250
7265
#: breezy/plugins/weave_fmt/bzrdir.py:250
7266
7266
msgid "note: upgrade may be faster if all store files are ungzipped first"
7269
#: brzlib/plugins/weave_fmt/bzrdir.py:279
7269
#: breezy/plugins/weave_fmt/bzrdir.py:279
7270
7270
msgid "converting revision"
7273
#: brzlib/plugins/weave_fmt/bzrdir.py:284
7273
#: breezy/plugins/weave_fmt/bzrdir.py:284
7274
7274
msgid "upgraded to weaves:"
7277
#: brzlib/plugins/weave_fmt/bzrdir.py:285
7277
#: breezy/plugins/weave_fmt/bzrdir.py:285
7278
7278
#, python-format
7279
7279
msgid "%6d revisions and inventories"
7282
#: brzlib/plugins/weave_fmt/bzrdir.py:287
7282
#: breezy/plugins/weave_fmt/bzrdir.py:287
7283
7283
#, python-format
7284
7284
msgid "%6d revisions not present"
7287
#: brzlib/plugins/weave_fmt/bzrdir.py:289
7287
#: breezy/plugins/weave_fmt/bzrdir.py:289
7288
7288
#, python-format
7289
7289
msgid "%6d texts"
7292
#: brzlib/plugins/weave_fmt/bzrdir.py:325
7292
#: breezy/plugins/weave_fmt/bzrdir.py:325
7293
7293
msgid "writing weave"
7296
#: brzlib/plugins/weave_fmt/bzrdir.py:329
7297
#: brzlib/plugins/weave_fmt/bzrdir.py:331
7296
#: breezy/plugins/weave_fmt/bzrdir.py:329
7297
#: breezy/plugins/weave_fmt/bzrdir.py:331
7298
7298
msgid "inventory"
7301
#: brzlib/plugins/weave_fmt/bzrdir.py:348
7301
#: breezy/plugins/weave_fmt/bzrdir.py:348
7302
7302
msgid "write revision"
7305
#: brzlib/plugins/weave_fmt/bzrdir.py:362
7305
#: breezy/plugins/weave_fmt/bzrdir.py:362
7306
7306
msgid "loading revision"
7309
#: brzlib/plugins/weave_fmt/bzrdir.py:367
7309
#: breezy/plugins/weave_fmt/bzrdir.py:367
7310
7310
#, python-format
7311
7311
msgid "revision {%s} not present in branch; will be converted as a ghost"
7314
#: brzlib/plugins/weave_fmt/bzrdir.py:507
7314
#: breezy/plugins/weave_fmt/bzrdir.py:507
7315
7315
msgid "starting upgrade from format 5 to 6"
7318
#: brzlib/plugins/weave_fmt/bzrdir.py:517
7318
#: breezy/plugins/weave_fmt/bzrdir.py:517
7319
7319
#, python-format
7320
7320
msgid "adding prefixes to %s"
7323
#: brzlib/plugins/weave_fmt/bzrdir.py:557
7323
#: breezy/plugins/weave_fmt/bzrdir.py:557
7324
7324
msgid "starting upgrade from format 6 to metadir"
7327
#: brzlib/plugins/weave_fmt/bzrdir.py:565
7327
#: breezy/plugins/weave_fmt/bzrdir.py:565
7328
7328
msgid "Removing ancestry.weave"
7331
#: brzlib/plugins/weave_fmt/bzrdir.py:570
7331
#: breezy/plugins/weave_fmt/bzrdir.py:570
7332
7332
msgid "Finding branch files"
7335
#: brzlib/plugins/weave_fmt/bzrdir.py:580
7335
#: breezy/plugins/weave_fmt/bzrdir.py:580
7336
7336
msgid "Upgrading repository"
7339
#: brzlib/plugins/weave_fmt/bzrdir.py:590
7339
#: breezy/plugins/weave_fmt/bzrdir.py:590
7340
7340
msgid "Upgrading branch"
7343
#: brzlib/plugins/weave_fmt/bzrdir.py:613
7343
#: breezy/plugins/weave_fmt/bzrdir.py:613
7344
7344
msgid "No working tree."
7347
#: brzlib/plugins/weave_fmt/bzrdir.py:620
7347
#: breezy/plugins/weave_fmt/bzrdir.py:620
7348
7348
msgid "Upgrading working tree"
7351
#: brzlib/plugins/weave_fmt/bzrdir.py:641
7351
#: breezy/plugins/weave_fmt/bzrdir.py:641
7352
7352
#, python-format
7353
7353
msgid "Make %s lock"
7356
#: brzlib/plugins/weave_fmt/bzrdir.py:652
7356
#: breezy/plugins/weave_fmt/bzrdir.py:652
7357
7357
#, python-format
7358
7358
msgid "Moving %s"
7361
#: brzlib/push.py:56
7361
#: breezy/push.py:56
7362
7362
msgid "Created new branch."
7365
#: brzlib/push.py:97
7365
#: breezy/push.py:97
7366
7366
#, python-format
7368
7368
"Target directory %s already contains a .bzr directory, but it is not valid."
7371
#: brzlib/push.py:101
7371
#: breezy/push.py:101
7372
7372
#, python-format
7374
7374
"Target directory %s already exists, but does not have a .bzr directory. "
7375
7375
"Supply --use-existing-dir to push there anyway."
7378
#: brzlib/push.py:122
7378
#: breezy/push.py:122
7379
7379
#, python-format
7380
7380
msgid "Too many redirections trying to make %s."
7383
#: brzlib/push.py:148
7383
#: breezy/push.py:148
7385
7385
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7389
#: brzlib/push.py:152
7389
#: breezy/push.py:152
7390
7390
#, python-format
7392
7392
"It is not possible to losslessly push to %s. You may want to use dpush "
7396
#: brzlib/push.py:158
7396
#: breezy/push.py:158
7397
7397
#, python-format
7399
7399
"At %s you have a valid .bzr control directory, but not a branch or "
7401
7401
"directory out of the way and try again."
7404
#: brzlib/reconcile.py:97
7404
#: breezy/reconcile.py:97
7405
7405
#, python-format
7406
7406
msgid "Reconciling branch %s"
7409
#: brzlib/reconcile.py:103
7409
#: breezy/reconcile.py:103
7410
7410
#, python-format
7411
7411
msgid "Reconciling repository %s"
7414
#: brzlib/reconcile.py:105
7414
#: breezy/reconcile.py:105
7415
7415
msgid "Reconciling repository"
7418
#: brzlib/reconcile.py:111
7418
#: breezy/reconcile.py:111
7419
7419
#, python-format
7420
7420
msgid "%s cannot canonicalize CHKs."
7423
#: brzlib/reconcile.py:119
7423
#: breezy/reconcile.py:119
7424
7424
msgid "Reconcile aborted: revision index has inconsistent parents."
7427
#: brzlib/reconcile.py:121
7427
#: breezy/reconcile.py:121
7428
7428
msgid "Run \"bzr check\" for more details."
7431
#: brzlib/reconcile.py:123
7431
#: breezy/reconcile.py:123
7432
7432
msgid "Reconciliation complete."
7435
#: brzlib/reconcile.py:166
7435
#: breezy/reconcile.py:166
7436
7436
#, python-brace-format
7437
7437
msgid "Fixing last revision info {0} => {1}"
7440
#: brzlib/reconcile.py:173
7440
#: breezy/reconcile.py:173
7441
7441
msgid "revision_history ok."
7444
#: brzlib/reconcile.py:234
7444
#: breezy/reconcile.py:234
7445
7445
msgid "Reading inventory data"
7448
#: brzlib/reconcile.py:254 brzlib/reconcile.py:384
7448
#: breezy/reconcile.py:254 breezy/reconcile.py:384
7449
7449
msgid "Inventory ok."
7452
#: brzlib/reconcile.py:256 brzlib/reconcile.py:386
7452
#: breezy/reconcile.py:256 breezy/reconcile.py:386
7453
7453
msgid "Backing up inventory"
7456
#: brzlib/reconcile.py:258
7456
#: breezy/reconcile.py:258
7457
7457
msgid "Backup inventory created."
7460
#: brzlib/reconcile.py:274 brzlib/reconcile.py:405
7460
#: breezy/reconcile.py:274 breezy/reconcile.py:405
7461
7461
msgid "Writing weave"
7464
#: brzlib/reconcile.py:277 brzlib/reconcile.py:408
7464
#: breezy/reconcile.py:277 breezy/reconcile.py:408
7465
7465
msgid "Inventory regenerated."
7468
#: brzlib/reconcile.py:371 brzlib/reconcile.py:373 brzlib/reconcile.py:376
7468
#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376
7469
7469
msgid "Reading indexes"
7472
#: brzlib/reconcile.py:380 brzlib/reconcile.py:382
7472
#: breezy/reconcile.py:380 breezy/reconcile.py:382
7473
7473
msgid "Checking unused inventories"
7476
#: brzlib/reconcile.py:388
7476
#: breezy/reconcile.py:388
7477
7477
msgid "Backup Inventory created"
7480
#: brzlib/reconcile.py:446
7480
#: breezy/reconcile.py:446
7481
7481
msgid "Fixing text parents"
7484
#: brzlib/reconfigure.py:54
7484
#: breezy/reconfigure.py:54
7485
7485
#, python-brace-format
7486
7486
msgid "{0} is now stacked on {1}\n"
7489
#: brzlib/reconfigure.py:69
7489
#: breezy/reconfigure.py:69
7490
7490
#, python-format
7491
7491
msgid "%s is now not stacked\n"
7494
#: brzlib/remote.py:1228 brzlib/repository.py:289
7494
#: breezy/remote.py:1228 breezy/repository.py:289
7495
7495
#, python-format
7496
7496
msgid "bzr: ERROR (ignored): %s"
7499
#: brzlib/remote.py:2534
7499
#: breezy/remote.py:2534
7500
7500
msgid "Copying repository content as tarball..."
7503
#: brzlib/rename_map.py:69
7503
#: breezy/rename_map.py:69
7504
7504
msgid "Calculating hashes"
7507
#: brzlib/rename_map.py:107
7507
#: breezy/rename_map.py:107
7508
7508
msgid "Determining hash hits"
7511
#: brzlib/rename_map.py:242
7511
#: breezy/rename_map.py:242
7512
7512
#, python-brace-format
7513
7513
msgid "{0} => {1}"
7516
#: brzlib/repository.py:1738
7516
#: breezy/repository.py:1738
7517
7517
msgid "Moving repository to repository.backup"
7520
#: brzlib/repository.py:1745
7520
#: breezy/repository.py:1745
7521
7521
msgid "Creating new repository"
7524
#: brzlib/repository.py:1750
7524
#: breezy/repository.py:1750
7525
7525
msgid "Copying content"
7528
#: brzlib/repository.py:1754
7528
#: breezy/repository.py:1754
7529
7529
msgid "Deleting old repository content"
7532
#: brzlib/repository.py:1756
7532
#: breezy/repository.py:1756
7533
7533
msgid "repository converted"
7536
#: brzlib/revisionspec.py:903
7536
#: breezy/revisionspec.py:903
7537
7537
#, python-brace-format
7538
7538
msgid "Using {0} {1}"
7541
#: brzlib/send.py:59
7541
#: breezy/send.py:59
7542
7542
#, python-format
7543
7543
msgid "Mail client \"%s\" does not support specifying body"
7546
#: brzlib/send.py:63
7546
#: breezy/send.py:63
7547
7547
msgid "--remember requires a branch to be specified."
7550
#: brzlib/send.py:78
7550
#: breezy/send.py:78
7551
7551
msgid "No submit branch known or specified"
7554
#: brzlib/send.py:81
7554
#: breezy/send.py:81
7555
7555
#, python-brace-format
7556
7556
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7559
#: brzlib/send.py:99
7559
#: breezy/send.py:99
7560
7560
#, python-format
7561
7561
msgid "No such send format '%s'."
7564
#: brzlib/send.py:115
7564
#: breezy/send.py:115
7565
7565
msgid "bzr send takes at most two one revision identifiers"
7568
#: brzlib/send.py:128
7568
#: breezy/send.py:128
7569
7569
msgid "No revisions to submit."
7572
#: brzlib/send.py:140
7572
#: breezy/send.py:140
7574
7574
"- not supported for merge directives that use more than one output file."
7577
#: brzlib/send.py:186
7577
#: breezy/send.py:186
7578
7578
msgid "Format 0.9 does not permit bundle with no patch"
7581
#: brzlib/shelf_ui.py:46
7581
#: breezy/shelf_ui.py:46
7582
7582
#, python-format
7583
7583
msgid "Shelve adding file \"%(path)s\"?"
7586
#: brzlib/shelf_ui.py:47
7586
#: breezy/shelf_ui.py:47
7587
7587
msgid "Shelve binary changes?"
7590
#: brzlib/shelf_ui.py:48
7590
#: breezy/shelf_ui.py:48
7591
7591
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7594
#: brzlib/shelf_ui.py:50
7594
#: breezy/shelf_ui.py:50
7595
7595
#, python-format
7596
7596
msgid "Shelve removing file \"%(path)s\"?"
7599
#: brzlib/shelf_ui.py:51
7599
#: breezy/shelf_ui.py:51
7600
7600
#, python-format
7601
7601
msgid "Shelve %d change(s)?"
7604
#: brzlib/shelf_ui.py:52
7604
#: breezy/shelf_ui.py:52
7605
7605
msgid "Shelve?"
7608
#: brzlib/shelf_ui.py:53
7608
#: breezy/shelf_ui.py:53
7609
7609
#, python-format
7611
7611
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7614
#: brzlib/shelf_ui.py:55
7614
#: breezy/shelf_ui.py:55
7615
7615
#, python-format
7616
7616
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7619
#: brzlib/shelf_ui.py:70
7619
#: breezy/shelf_ui.py:70
7620
7620
#, python-format
7621
7621
msgid "Changes shelved with id \"%d\"."
7624
#: brzlib/shelf_ui.py:74
7624
#: breezy/shelf_ui.py:74
7625
7625
msgid "Selected changes destroyed."
7628
#: brzlib/shelf_ui.py:78
7628
#: breezy/shelf_ui.py:78
7629
7629
msgid "Selected changes:"
7632
#: brzlib/shelf_ui.py:98
7632
#: breezy/shelf_ui.py:98
7633
7633
#, python-format
7634
7634
msgid "Delete file \"%(path)s\"?"
7637
#: brzlib/shelf_ui.py:99
7637
#: breezy/shelf_ui.py:99
7638
7638
msgid "Apply binary changes?"
7641
#: brzlib/shelf_ui.py:100
7641
#: breezy/shelf_ui.py:100
7642
7642
#, python-format
7643
7643
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7646
#: brzlib/shelf_ui.py:102
7646
#: breezy/shelf_ui.py:102
7647
7647
#, python-format
7648
7648
msgid "Add file \"%(path)s\"?"
7651
#: brzlib/shelf_ui.py:103
7651
#: breezy/shelf_ui.py:103
7652
7652
#, python-format
7653
7653
msgid "Apply %d change(s)?"
7656
#: brzlib/shelf_ui.py:104
7656
#: breezy/shelf_ui.py:104
7657
7657
msgid "Apply change?"
7660
#: brzlib/shelf_ui.py:105
7660
#: breezy/shelf_ui.py:105
7661
7661
#, python-format
7662
7662
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7665
#: brzlib/shelf_ui.py:107
7665
#: breezy/shelf_ui.py:107
7666
7666
#, python-format
7667
7667
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7670
#: brzlib/shelf_ui.py:402
7670
#: breezy/shelf_ui.py:402
7671
7671
msgid "No changes are shelved."
7674
#: brzlib/shelf_ui.py:460
7674
#: breezy/shelf_ui.py:460
7675
7675
#, python-format
7676
7676
msgid "Using changes with id \"%d\"."
7679
#: brzlib/shelf_ui.py:464
7679
#: breezy/shelf_ui.py:464
7680
7680
#, python-format
7681
7681
msgid "Message: %s"
7684
#: brzlib/shelf_ui.py:476
7684
#: breezy/shelf_ui.py:476
7685
7685
#, python-format
7686
7686
msgid "Deleted changes with id \"%d\"."
7689
#: brzlib/smart/medium.py:714
7689
#: breezy/smart/medium.py:714
7690
7690
#, python-brace-format
7691
7691
msgid "HPSS calls: {0} ({1} vfs) {2}"
7694
#: brzlib/smart/ping.py:32
7694
#: breezy/smart/ping.py:32
7695
7695
msgid "Pings a Bazaar smart server."
7698
#: brzlib/smart/ping.py:34
7698
#: breezy/smart/ping.py:34
7700
7700
"This command sends a 'hello' request to the given location using the bzr\n"
7701
7701
"smart protocol, and reports the response."
7704
#: brzlib/smart/server.py:169
7704
#: breezy/smart/server.py:169
7705
7705
msgid "Requested to stop gracefully"
7708
#: brzlib/smart/server.py:179
7708
#: breezy/smart/server.py:179
7709
7709
#, python-format
7710
7710
msgid "Waiting for %d client(s) to finish"
7713
#: brzlib/smart/server.py:185
7713
#: breezy/smart/server.py:185
7714
7714
#, python-format
7715
7715
msgid "Still waiting for %d client(s) to finish"
7718
#: brzlib/smart/server.py:219
7718
#: breezy/smart/server.py:219
7719
7719
#, python-format
7720
7720
msgid "listening socket error: %s"
7723
#: brzlib/smart/server.py:452
7723
#: breezy/smart/server.py:452
7724
7724
#, python-format
7725
7725
msgid "listening on port: %s"
7728
#: brzlib/switch.py:84
7728
#: breezy/switch.py:84
7729
7729
msgid "Pending merges must be committed or reverted before using switch."
7732
#: brzlib/switch.py:111
7732
#: breezy/switch.py:111
7734
7734
"Cannot switch as local commits found in the checkout. Commit these to the "
7735
7735
"bound branch or use --force to throw them away."
7738
#: brzlib/switch.py:116
7738
#: breezy/switch.py:116
7739
7739
#, python-format
7741
7741
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7742
7742
"anyway, use --force."
7745
#: brzlib/switch.py:140
7745
#: breezy/switch.py:140
7746
7746
msgid "Cannot switch a branch, only a checkout."
7749
#: brzlib/switch.py:183
7749
#: breezy/switch.py:183
7750
7750
#, python-format
7751
7751
msgid "Tree is up to date at revision %d."
7754
#: brzlib/switch.py:190
7754
#: breezy/switch.py:190
7755
7755
#, python-format
7756
7756
msgid "Updated to revision %d."
7759
#: brzlib/transform.py:1723 brzlib/transform.py:1734 brzlib/transform.py:1736
7759
#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736
7760
7760
msgid "Apply phase"
7763
#: brzlib/transform.py:1762 brzlib/transform.py:1830
7763
#: breezy/transform.py:1762 breezy/transform.py:1830
7764
7764
msgid "removing file"
7767
#: brzlib/transform.py:1780 brzlib/transform.py:1865
7767
#: breezy/transform.py:1780 breezy/transform.py:1865
7768
7768
msgid "adding file"
7771
#: brzlib/transform.py:2598
7771
#: breezy/transform.py:2598
7772
7772
msgid "Building tree"
7775
#: brzlib/transform.py:2688 brzlib/transform.py:2715
7775
#: breezy/transform.py:2688 breezy/transform.py:2715
7776
7776
msgid "Adding file contents"
7779
#: brzlib/transform.py:3017
7779
#: breezy/transform.py:3017
7780
7780
msgid "Resolution pass"
7783
#: brzlib/transport/ftp/_gssapi.py:88
7783
#: breezy/transport/ftp/_gssapi.py:88
7784
7784
#, python-format
7785
7785
msgid "Authenticated as %s"
7788
#: brzlib/tree.py:647
7788
#: breezy/tree.py:647
7789
7789
msgid "*** {0} content-filter: {1} => {2!r}"
7792
#: brzlib/upgrade.py:77
7792
#: breezy/upgrade.py:77
7793
7793
#, python-format
7794
7794
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7797
#: brzlib/upgrade.py:100
7797
#: breezy/upgrade.py:100
7798
7798
#, python-format
7799
7799
msgid "cannot upgrade from bzrdir format %s"
7802
#: brzlib/upgrade.py:103
7802
#: breezy/upgrade.py:103
7803
7803
#, python-format
7804
7804
msgid "starting upgrade of %s"
7807
#: brzlib/upgrade.py:110
7807
#: breezy/upgrade.py:110
7808
7808
msgid "finished"
7811
#: brzlib/upgrade.py:120
7811
#: breezy/upgrade.py:120
7812
7812
msgid "Deleting backup.bzr"
7815
#: brzlib/upgrade.py:151
7815
#: breezy/upgrade.py:151
7816
7816
#, python-brace-format
7819
7819
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7822
#: brzlib/upgrade.py:208
7822
#: breezy/upgrade.py:208
7823
7823
#, python-format
7824
7824
msgid "Found %d dependent branches - upgrading ..."
7827
#: brzlib/upgrade.py:276
7827
#: breezy/upgrade.py:276
7828
7828
msgid "Upgrading bzrdirs"
7831
#: brzlib/upgrade.py:282
7831
#: breezy/upgrade.py:282
7832
7832
#, python-format
7833
7833
msgid "Upgrading %s"
7836
#: brzlib/upgrade.py:283
7836
#: breezy/upgrade.py:283
7837
7837
#, python-brace-format
7838
7838
msgid "Upgrading {0} {1} ..."
7841
#: brzlib/upgrade.py:301
7841
#: breezy/upgrade.py:301
7842
7842
msgid "Removing backup ..."
7845
#: brzlib/upgrade.py:305
7845
#: breezy/upgrade.py:305
7846
7846
#, python-brace-format
7847
7847
msgid "failed to clean-up {0}: {1}"
7850
#: brzlib/vf_repository.py:1091
7850
#: breezy/vf_repository.py:1091
7851
7851
msgid "inventories"
7854
#: brzlib/vf_repository.py:1117
7854
#: breezy/vf_repository.py:1117
7858
#: brzlib/vf_repository.py:1622 brzlib/vf_repository.py:1631
7858
#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631
7859
7859
msgid "Calculating text parents"
7862
#: brzlib/vf_repository.py:1707
7862
#: breezy/vf_repository.py:1707
7863
7863
msgid "Fetch texts"
7866
#: brzlib/vf_repository.py:2536
7866
#: breezy/vf_repository.py:2536
7867
7867
msgid "loading text store"
7870
#: brzlib/vf_repository.py:2542
7870
#: breezy/vf_repository.py:2542
7871
7871
msgid "checking text graph"
7874
#: brzlib/vf_repository.py:2998 brzlib/vf_repository.py:3012
7875
#: brzlib/vf_repository.py:3127
7874
#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012
7875
#: breezy/vf_repository.py:3127
7876
7876
msgid "Transferring revisions"
7879
#: brzlib/win32utils.py:146
7879
#: breezy/win32utils.py:146
7880
7880
msgid "Failed to GetProcessMemoryInfo()"
7883
#: brzlib/win32utils.py:167
7883
#: breezy/win32utils.py:167
7884
7884
msgid "Cannot debug memory on win32 without ctypes or win32process"
7887
#: brzlib/win32utils.py:172
7887
#: breezy/win32utils.py:172
7888
7888
#, python-brace-format
7889
7889
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7892
#: brzlib/win32utils.py:180
7892
#: breezy/win32utils.py:180
7893
7893
#, python-format
7894
7894
msgid "WorkingSize %8d KiB"
7897
#: brzlib/win32utils.py:181
7897
#: breezy/win32utils.py:181
7898
7898
#, python-format
7899
7899
msgid "PeakWorking %8d KiB"
7902
#: brzlib/win32utils.py:182
7902
#: breezy/win32utils.py:182
7903
7903
#, python-format
7904
7904
msgid "PagefileUsage %8d KiB"
7907
#: brzlib/win32utils.py:183
7907
#: breezy/win32utils.py:183
7908
7908
#, python-format
7909
7909
msgid "PeakPagefileUsage %8d KiB"
7912
#: brzlib/win32utils.py:185
7912
#: breezy/win32utils.py:185
7913
7913
#, python-format
7914
7914
msgid "PrivateUsage %8d KiB"
7917
#: brzlib/win32utils.py:186
7917
#: breezy/win32utils.py:186
7918
7918
#, python-format
7919
7919
msgid "PageFaultCount %8d"
7922
#: brzlib/workingtree.py:1516
7922
#: breezy/workingtree.py:1516
7923
7923
msgid "Rerun update after fixing the conflicts."