169
169
# help of 'short' option of 'status' command
170
#: brzlib/builtins.py:375
170
#: breezy/builtins.py:375
171
171
msgid "Use short status indicators."
174
174
# help of 'versioned' option of 'status' command
175
#: brzlib/builtins.py:377
175
#: breezy/builtins.py:377
176
176
msgid "Only show versioned files."
179
179
# help of 'no-pending' option of 'status' command
180
#: brzlib/builtins.py:379
180
#: breezy/builtins.py:379
181
181
msgid "Don't show pending merges."
184
184
# help of 'no-classify' option of 'status' command
185
#: brzlib/builtins.py:382
185
#: breezy/builtins.py:382
186
186
msgid "Do not mark object type using indicator."
189
#: brzlib/builtins.py:397
189
#: breezy/builtins.py:397
190
190
msgid "brz status --revision takes exactly one or two revision specifiers"
193
#: brzlib/builtins.py:441 brzlib/builtins.py:5229
193
#: breezy/builtins.py:441 breezy/builtins.py:5229
194
194
msgid "You can only supply one of revision_id or --revision"
197
#: brzlib/builtins.py:444 brzlib/builtins.py:5231
197
#: breezy/builtins.py:444 breezy/builtins.py:5231
198
198
msgid "You must supply either --revision or a revision_id"
201
#: brzlib/builtins.py:451
201
#: breezy/builtins.py:451
203
203
msgid "Repository %r does not support access to raw revision texts"
206
#: brzlib/builtins.py:462
206
#: breezy/builtins.py:462
207
207
#, python-brace-format
208
208
msgid "The repository {0} contains no revision {1}."
211
#: brzlib/builtins.py:469
211
#: breezy/builtins.py:469
212
212
msgid "You cannot specify a NULL revision."
215
#: brzlib/builtins.py:561
215
#: breezy/builtins.py:561
216
216
msgid "Remove the working tree from a given branch/checkout."
219
#: brzlib/builtins.py:563
219
#: breezy/builtins.py:563
221
221
"Since a lightweight checkout is little more than a working tree\n"
222
222
"this will refuse to run against one."
225
#: brzlib/builtins.py:566
225
#: breezy/builtins.py:566
226
226
msgid "To re-create the working tree, use \"brz checkout\"."
229
229
# help of 'force' option of 'remove-tree' command
230
#: brzlib/builtins.py:572
230
#: breezy/builtins.py:572
231
231
msgid "Remove the working tree even if it has uncommitted or shelved changes."
234
#: brzlib/builtins.py:586
234
#: breezy/builtins.py:586
235
235
msgid "No working tree to remove"
238
#: brzlib/builtins.py:588
238
#: breezy/builtins.py:588
239
239
msgid "You cannot remove the working tree of a remote path"
242
#: brzlib/builtins.py:597
242
#: breezy/builtins.py:597
243
243
msgid "You cannot remove the working tree from a lightweight checkout"
246
#: brzlib/builtins.py:637
246
#: breezy/builtins.py:637
248
248
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
249
249
"instead. Use \"--force\" if you are sure you want to reset the working tree."
252
#: brzlib/builtins.py:648
252
#: breezy/builtins.py:648
254
254
", the header appears corrupt, try passing -r -1 to set the state to the last "
258
#: brzlib/builtins.py:652
258
#: breezy/builtins.py:652
259
259
#, python-brace-format
260
260
msgid "failed to reset the tree state{0}"
263
#: brzlib/builtins.py:656
263
#: breezy/builtins.py:656
264
264
msgid "Show current revision number."
267
#: brzlib/builtins.py:658
267
#: breezy/builtins.py:658
268
268
msgid "This is equal to the number of revisions on this branch."
271
#: brzlib/builtins.py:671
271
#: breezy/builtins.py:671
272
272
msgid "--tree and --revision can not be used together"
275
#: brzlib/builtins.py:688
275
#: breezy/builtins.py:688
276
276
msgid "Revision numbers only make sense for single revisions, not ranges"
279
279
# help of 'tree' option of 'revno' command
280
#: brzlib/builtins.py:712
280
#: breezy/builtins.py:712
281
281
msgid "Show revno of working tree."
284
#: brzlib/builtins.py:760
284
#: breezy/builtins.py:760
285
285
msgid "Add specified files or directories."
288
#: brzlib/builtins.py:762
288
#: breezy/builtins.py:762
290
290
"In non-recursive mode, all the named items are added, regardless\n"
291
291
"of whether they were previously ignored. A warning is given if\n"
292
292
"any of the named files are already versioned."
295
#: brzlib/builtins.py:766
295
#: breezy/builtins.py:766
297
297
"In recursive mode (the default), files are treated the same way\n"
298
298
"but the behaviour for directories is different. Directories that\n"
511
511
# help of 'verbose' option of 'pull' command
512
#: brzlib/builtins.py:1146
512
#: breezy/builtins.py:1146
513
513
msgid "Show logs of pulled revisions."
516
516
# help of 'directory' option of 'pull' command
517
#: brzlib/builtins.py:1148
517
#: breezy/builtins.py:1148
519
519
"Branch to pull into, rather than the one containing the working directory."
522
522
# help of 'local' option of 'pull' command
523
#: brzlib/builtins.py:1151
523
#: breezy/builtins.py:1151
525
525
"Perform a local pull in a bound branch. Local pulls are not applied to the "
529
#: brzlib/builtins.py:1188
529
#: breezy/builtins.py:1188
530
530
msgid "No working tree, ignoring --show-base"
533
#: brzlib/builtins.py:1204
533
#: breezy/builtins.py:1204
534
534
msgid "No pull location known or specified."
537
#: brzlib/builtins.py:1210
537
#: breezy/builtins.py:1210
539
539
msgid "Using saved parent location: %s\n"
542
#: brzlib/builtins.py:1217 brzlib/builtins.py:4423
542
#: breezy/builtins.py:1217 breezy/builtins.py:4423
543
543
msgid "Cannot use -r with merge directives or bundles"
546
#: brzlib/builtins.py:1260
546
#: breezy/builtins.py:1260
547
547
msgid "Update a mirror of this branch."
550
#: brzlib/builtins.py:1262
550
#: breezy/builtins.py:1262
552
552
"The target branch will not have its working tree populated because this\n"
553
553
"is both expensive, and is not supported on remote file systems."
556
#: brzlib/builtins.py:1265
556
#: breezy/builtins.py:1265
558
558
"Some smart servers or protocols *may* put the working tree in place in\n"
562
#: brzlib/builtins.py:1268
562
#: breezy/builtins.py:1268
564
564
"This command only works on branches that have not diverged. Branches are\n"
565
565
"considered diverged if the destination branch's most recent commit is one\n"
566
566
"that has not been merged (directly or indirectly) by the source branch."
569
#: brzlib/builtins.py:1272
569
#: breezy/builtins.py:1272
571
571
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
572
572
"the other branch completely, discarding its unmerged changes."
575
#: brzlib/builtins.py:1275
575
#: breezy/builtins.py:1275
577
577
"If you want to ensure you have the different changes in the other branch,\n"
578
578
"do a merge (see brz help merge) from the other branch, and commit that.\n"
579
579
"After that you will be able to do a push without '--overwrite'."
582
#: brzlib/builtins.py:1279
582
#: breezy/builtins.py:1279
584
584
"If there is no default push location set, the first push will set it (use\n"
585
585
"--no-remember to avoid setting it). After that, you can omit the\n"
677
677
"create ./foo-bar."
680
#: brzlib/builtins.py:1406
680
#: breezy/builtins.py:1406
682
682
"To retrieve the branch as of a particular revision, supply the --revision\n"
683
683
"parameter, as in \"branch foo/bar -r 5\"."
686
#: brzlib/builtins.py:1409
686
#: breezy/builtins.py:1409
687
687
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
690
690
# help of 'no-tree' option of 'branch' command
691
#: brzlib/builtins.py:1419
691
#: breezy/builtins.py:1419
692
692
msgid "Create a branch without a working-tree."
695
695
# help of 'switch' option of 'branch' command
696
#: brzlib/builtins.py:1421
696
#: breezy/builtins.py:1421
697
697
msgid "Switch the checkout in the current directory to the new branch."
700
700
# help of 'stacked' option of 'branch' command
701
#: brzlib/builtins.py:1424
701
#: breezy/builtins.py:1424
703
703
"Create a stacked branch referring to the source branch. The new branch will "
704
704
"depend on the availability of the source branch for all operations."
707
707
# help of 'standalone' option of 'branch' command
708
#: brzlib/builtins.py:1428
708
#: breezy/builtins.py:1428
709
709
msgid "Do not use a shared repository, even if available."
712
712
# help of 'use-existing-dir' option of 'branch' command
713
#: brzlib/builtins.py:1430
713
#: breezy/builtins.py:1430
715
715
"By default branch will fail if the target directory exists, but does not "
716
716
"already have a control directory. This flag will allow branch to proceed."
719
719
# help of 'bind' option of 'branch' command
720
#: brzlib/builtins.py:1435
720
#: breezy/builtins.py:1435
721
721
msgid "Bind new branch to from location."
724
#: brzlib/builtins.py:1482
724
#: breezy/builtins.py:1482
726
726
msgid "Target directory \"%s\" already exists."
729
#: brzlib/builtins.py:1494
729
#: breezy/builtins.py:1494
731
731
msgid "Parent of \"%s\" does not exist."
734
#: brzlib/builtins.py:1513
734
#: breezy/builtins.py:1513
735
735
#, python-brace-format
736
736
msgid "The branch {0} has no revision {1}."
739
#: brzlib/builtins.py:1528 brzlib/push.py:53
739
#: breezy/builtins.py:1528 breezy/push.py:53
741
741
msgid "Created new stacked branch referring to %s."
744
#: brzlib/builtins.py:1532
744
#: breezy/builtins.py:1532
746
746
msgid "Branched %d revision."
747
747
msgid_plural "Branched %d revisions."
751
#: brzlib/builtins.py:1537
751
#: breezy/builtins.py:1537
753
753
msgid "New branch bound to %s"
756
#: brzlib/builtins.py:1542 brzlib/builtins.py:6283
756
#: breezy/builtins.py:1542 breezy/builtins.py:6283
758
758
msgid "Switched to branch: %s"
761
#: brzlib/builtins.py:1547
761
#: breezy/builtins.py:1547
762
762
msgid "List the branches available at the current location."
765
#: brzlib/builtins.py:1549
765
#: breezy/builtins.py:1549
767
767
"This command will print the names of all the branches at the current\n"
771
771
# help of 'recursive' option of 'branches' command
772
#: brzlib/builtins.py:1556
772
#: breezy/builtins.py:1556
774
774
"Recursively scan for branches rather than just looking in the specified "
778
#: brzlib/builtins.py:1585
778
#: breezy/builtins.py:1585
779
779
msgid "(default)"
782
#: brzlib/builtins.py:1597
782
#: breezy/builtins.py:1597
783
783
msgid "Create a new checkout of an existing branch."
786
#: brzlib/builtins.py:1599
786
#: breezy/builtins.py:1599
788
788
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
883
883
"out the old content of that file to a new location."
886
#: brzlib/builtins.py:1723
886
#: breezy/builtins.py:1723
888
888
"The 'dir' argument, if given, must be the location of the root of a\n"
889
889
"working tree to update. By default, the working tree that contains the \n"
890
890
"current working directory is used."
893
#: brzlib/builtins.py:1739
893
#: breezy/builtins.py:1739
894
894
msgid "brz update --revision takes exactly one revision"
897
#: brzlib/builtins.py:1747
897
#: breezy/builtins.py:1747
898
898
msgid "brz update can only update a whole tree, not a file or subdirectory"
901
#: brzlib/builtins.py:1778
901
#: breezy/builtins.py:1778
902
902
#, python-brace-format
903
903
msgid "Tree is up to date at revision {0} of branch {1}"
906
#: brzlib/builtins.py:1794
906
#: breezy/builtins.py:1794
909
909
"branch has no revision %s\n"
910
910
"brz update --revision only works for a revision in the branch history"
913
#: brzlib/builtins.py:1800
913
#: breezy/builtins.py:1800
914
914
#, python-brace-format
915
915
msgid "Updated to revision {0} of branch {1}"
918
#: brzlib/builtins.py:1804
918
#: breezy/builtins.py:1804
920
920
"Your local commits will now show as pending merges with 'brz status', and "
921
921
"can be committed with 'brz commit'."
924
#: brzlib/builtins.py:1813
924
#: breezy/builtins.py:1813
925
925
msgid "Show information about a working tree, branch or repository."
928
#: brzlib/builtins.py:1815
928
#: breezy/builtins.py:1815
930
930
"This command will show all known locations and formats associated to the\n"
931
931
"tree, branch or repository."
934
#: brzlib/builtins.py:1818
934
#: breezy/builtins.py:1818
936
936
"In verbose mode, statistical information is included with each report.\n"
937
937
"To see extended statistic information, use a verbosity level of 2 or\n"
938
938
"higher by specifying the verbose option multiple times, e.g. -vv."
941
#: brzlib/builtins.py:1822
941
#: breezy/builtins.py:1822
942
942
msgid "Branches and working trees will also report any missing revisions."
945
#: brzlib/builtins.py:1824 brzlib/builtins.py:3742 brzlib/builtins.py:4883
946
#: brzlib/builtins.py:6469
945
#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
946
#: breezy/builtins.py:6469
947
947
msgid ":Examples:"
950
#: brzlib/builtins.py:1826
950
#: breezy/builtins.py:1826
951
951
msgid " Display information on the format and related locations:"
954
#: brzlib/builtins.py:1828
954
#: breezy/builtins.py:1828
955
955
msgid " brz info"
958
#: brzlib/builtins.py:1830
958
#: breezy/builtins.py:1830
960
960
" Display the above together with extended format information and\n"
961
961
" basic statistics (like the number of files in the working tree and\n"
962
962
" number of revisions in the branch and repository):"
965
#: brzlib/builtins.py:1834
965
#: breezy/builtins.py:1834
966
966
msgid " brz info -v"
969
#: brzlib/builtins.py:1836
969
#: breezy/builtins.py:1836
970
970
msgid " Display the above together with number of committers to the branch:"
973
#: brzlib/builtins.py:1838
973
#: breezy/builtins.py:1838
974
974
msgid " brz info -vv"
977
#: brzlib/builtins.py:1857
977
#: breezy/builtins.py:1857
978
978
msgid "Remove files or directories."
981
#: brzlib/builtins.py:1859
981
#: breezy/builtins.py:1859
983
983
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
984
984
"delete them if they can easily be recovered using revert otherwise they\n"
1260
1260
" 0 - no change"
1263
#: brzlib/builtins.py:2243
1263
#: breezy/builtins.py:2243
1266
1266
" Shows the difference in the working tree versus the last commit::"
1269
#: brzlib/builtins.py:2246
1269
#: breezy/builtins.py:2246
1270
1270
msgid " brz diff"
1273
#: brzlib/builtins.py:2248
1273
#: breezy/builtins.py:2248
1274
1274
msgid " Difference between the working tree and revision 1::"
1277
#: brzlib/builtins.py:2250
1277
#: breezy/builtins.py:2250
1278
1278
msgid " brz diff -r1"
1281
#: brzlib/builtins.py:2252
1281
#: breezy/builtins.py:2252
1282
1282
msgid " Difference between revision 3 and revision 1::"
1285
#: brzlib/builtins.py:2254
1285
#: breezy/builtins.py:2254
1286
1286
msgid " brz diff -r1..3"
1289
#: brzlib/builtins.py:2256
1289
#: breezy/builtins.py:2256
1290
1290
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1293
#: brzlib/builtins.py:2258
1293
#: breezy/builtins.py:2258
1294
1294
msgid " brz diff -r1..3 xxx"
1297
#: brzlib/builtins.py:2260
1297
#: breezy/builtins.py:2260
1298
1298
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1301
#: brzlib/builtins.py:2262
1301
#: breezy/builtins.py:2262
1302
1302
msgid " brz diff -c2"
1305
#: brzlib/builtins.py:2264
1305
#: breezy/builtins.py:2264
1307
1307
" To see the changes introduced by revision X::\n"
1309
1309
" brz diff -cX"
1312
#: brzlib/builtins.py:2268
1312
#: breezy/builtins.py:2268
1314
1314
" Note that in the case of a merge, the -c option shows the changes\n"
1315
1315
" compared to the left hand parent. To see the changes against\n"
1316
1316
" another parent, use::"
1319
#: brzlib/builtins.py:2272
1319
#: breezy/builtins.py:2272
1320
1320
msgid " brz diff -r<chosen_parent>..X"
1323
#: brzlib/builtins.py:2274
1323
#: breezy/builtins.py:2274
1325
1325
" The changes between the current revision and the previous revision\n"
1326
1326
" (equivalent to -c-1 and -r-2..-1)"
1329
#: brzlib/builtins.py:2277
1329
#: breezy/builtins.py:2277
1330
1330
msgid " brz diff -r-2.."
1333
#: brzlib/builtins.py:2279
1333
#: breezy/builtins.py:2279
1334
1334
msgid " Show just the differences for file NEWS::"
1337
#: brzlib/builtins.py:2281
1337
#: breezy/builtins.py:2281
1338
1338
msgid " brz diff NEWS"
1341
#: brzlib/builtins.py:2283
1341
#: breezy/builtins.py:2283
1342
1342
msgid " Show the differences in working tree xxx for file NEWS::"
1345
#: brzlib/builtins.py:2285
1345
#: breezy/builtins.py:2285
1346
1346
msgid " brz diff xxx/NEWS"
1349
#: brzlib/builtins.py:2287
1349
#: breezy/builtins.py:2287
1350
1350
msgid " Show the differences from branch xxx to this working tree:"
1353
#: brzlib/builtins.py:2289
1353
#: breezy/builtins.py:2289
1354
1354
msgid " brz diff --old xxx"
1357
#: brzlib/builtins.py:2291
1357
#: breezy/builtins.py:2291
1358
1358
msgid " Show the differences between two branches for file NEWS::"
1361
#: brzlib/builtins.py:2293
1361
#: breezy/builtins.py:2293
1362
1362
msgid " brz diff --old xxx --new yyy NEWS"
1365
#: brzlib/builtins.py:2295
1365
#: breezy/builtins.py:2295
1366
1366
msgid " Same as 'brz diff' but prefix paths with old/ and new/::"
1369
#: brzlib/builtins.py:2297
1369
#: breezy/builtins.py:2297
1371
1371
" brz diff --prefix old/:new/\n"
1378
1378
# help of 'diff-options' option of 'diff' command
1379
#: brzlib/builtins.py:2307
1379
#: breezy/builtins.py:2307
1380
1380
msgid "Pass these options to the external diff program."
1383
1383
# help of 'prefix' option of 'diff' command
1384
#: brzlib/builtins.py:2310
1384
#: breezy/builtins.py:2310
1386
1386
"Set prefixes added to old and new filenames, as two values separated by a "
1387
1387
"colon. (eg \"old/:new/\")."
1390
1390
# help of 'old' option of 'diff' command
1391
#: brzlib/builtins.py:2313
1391
#: breezy/builtins.py:2313
1392
1392
msgid "Branch/tree to compare from."
1395
1395
# help of 'new' option of 'diff' command
1396
#: brzlib/builtins.py:2317
1396
#: breezy/builtins.py:2317
1397
1397
msgid "Branch/tree to compare to."
1400
1400
# help of 'using' option of 'diff' command
1401
#: brzlib/builtins.py:2323
1401
#: breezy/builtins.py:2323
1402
1402
msgid "Use this command to compare files."
1405
1405
# help of 'format' option of 'diff' command
1406
#: brzlib/builtins.py:2328
1406
#: breezy/builtins.py:2328
1407
1407
msgid "Diff format to use."
1410
1410
# title of 'format' option of 'diff' command
1411
#: brzlib/builtins.py:2330
1411
#: breezy/builtins.py:2330
1412
1412
msgid "Diff format"
1415
1415
# help of 'context' option of 'diff' command
1416
#: brzlib/builtins.py:2332
1416
#: breezy/builtins.py:2332
1417
1417
msgid "How many lines of context to show."
1420
#: brzlib/builtins.py:2357
1420
#: breezy/builtins.py:2357
1421
1421
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1424
#: brzlib/builtins.py:2361
1424
#: breezy/builtins.py:2361
1425
1425
msgid "brz diff --revision takes exactly one or two revision specifiers"
1428
#: brzlib/builtins.py:2366 brzlib/builtins.py:2763 brzlib/builtins.py:2776
1429
#: brzlib/builtins.py:2784 brzlib/builtins.py:4957
1428
#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1429
#: breezy/builtins.py:2784 breezy/builtins.py:4957
1430
1430
#, python-brace-format
1431
1431
msgid "{0} and {1} are mutually exclusive"
1434
#: brzlib/builtins.py:2386
1434
#: breezy/builtins.py:2386
1436
1436
"List files deleted in the working tree.\n"
1440
#: brzlib/builtins.py:2463
1440
#: breezy/builtins.py:2463
1441
1441
msgid "Show the tree root directory."
1444
#: brzlib/builtins.py:2465
1444
#: breezy/builtins.py:2465
1446
1446
"The root is the nearest enclosing directory with a .bzr control\n"
1450
#: brzlib/builtins.py:2480
1450
#: breezy/builtins.py:2480
1451
1451
msgid "The limit argument must be an integer."
1454
#: brzlib/builtins.py:2488
1454
#: breezy/builtins.py:2488
1455
1455
msgid "The levels argument must be an integer."
1458
#: brzlib/builtins.py:2493
1458
#: breezy/builtins.py:2493
1459
1459
msgid "Show historical log for a branch or subset of a branch."
1462
#: brzlib/builtins.py:2495
1462
#: breezy/builtins.py:2495
1464
1464
"log is brz's default tool for exploring the history of a branch.\n"
1465
1465
"The branch to use is taken from the first parameter. If no parameters\n"
1581
1581
" a nested merge revision and the log will be truncated accordingly."
1584
#: brzlib/builtins.py:2569
1584
#: breezy/builtins.py:2569
1585
1585
msgid ":Path filtering:"
1588
#: brzlib/builtins.py:2571
1588
#: breezy/builtins.py:2571
1590
1590
" If parameters are given and the first one is not a branch, the log\n"
1591
1591
" will be filtered to show only those revisions that changed the\n"
1592
1592
" nominated files or directories."
1595
#: brzlib/builtins.py:2575
1595
#: breezy/builtins.py:2575
1597
1597
" Filenames are interpreted within their historical context. To log a\n"
1598
1598
" deleted file, specify a revision range so that the file existed at\n"
1599
1599
" the end or start of the range."
1602
#: brzlib/builtins.py:2579
1602
#: breezy/builtins.py:2579
1604
1604
" Historical context is also important when interpreting pathnames of\n"
1605
1605
" renamed files/directories. Consider the following example:"
1608
#: brzlib/builtins.py:2582
1608
#: breezy/builtins.py:2582
1610
1610
" * revision 1: add tutorial.txt\n"
1611
1611
" * revision 2: modify tutorial.txt\n"
1612
1612
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1615
#: brzlib/builtins.py:2586
1615
#: breezy/builtins.py:2586
1616
1616
msgid " In this case:"
1619
#: brzlib/builtins.py:2588
1619
#: breezy/builtins.py:2588
1620
1620
msgid " * ``brz log guide.txt`` will log the file added in revision 1"
1623
#: brzlib/builtins.py:2590
1623
#: breezy/builtins.py:2590
1624
1624
msgid " * ``brz log tutorial.txt`` will log the new file added in revision 3"
1627
#: brzlib/builtins.py:2592
1627
#: breezy/builtins.py:2592
1629
1629
" * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
1630
1630
" the original file in revision 2."
1633
#: brzlib/builtins.py:2595
1633
#: breezy/builtins.py:2595
1635
1635
" * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
1636
1636
" was no file called guide.txt in revision 2."
1639
#: brzlib/builtins.py:2598
1639
#: breezy/builtins.py:2598
1641
1641
" Renames are always followed by log. By design, there is no need to\n"
1642
1642
" explicitly ask for this (and no way to stop logging a file back\n"
1643
1643
" until it was last renamed)."
1646
#: brzlib/builtins.py:2602
1646
#: breezy/builtins.py:2602
1647
1647
msgid ":Other filtering:"
1650
#: brzlib/builtins.py:2604
1650
#: breezy/builtins.py:2604
1652
1652
" The --match option can be used for finding revisions that match a\n"
1653
1653
" regular expression in a commit message, committer, author or bug.\n"
1721
1721
# help of 'forward' option of 'log' command
1722
#: brzlib/builtins.py:2651
1722
#: breezy/builtins.py:2651
1723
1723
msgid "Show from oldest to newest."
1726
1726
# help of 'verbose' option of 'log' command
1727
#: brzlib/builtins.py:2654
1727
#: breezy/builtins.py:2654
1728
1728
msgid "Show files changed in each revision."
1731
1731
# help of 'change' option of 'log' command
1732
#: brzlib/builtins.py:2660
1732
#: breezy/builtins.py:2660
1733
1733
msgid "Show just the specified revision. See also \"help revisionspec\"."
1736
1736
# help of 'authors' option of 'log' command
1737
#: brzlib/builtins.py:2664
1737
#: breezy/builtins.py:2664
1738
1738
msgid "What names to list as authors - first, all or committer."
1741
1741
# title of 'authors' option of 'log' command
1742
#: brzlib/builtins.py:2665
1742
#: breezy/builtins.py:2665
1743
1743
msgid "Authors"
1746
1746
# help of 'levels' option of 'log' command
1747
#: brzlib/builtins.py:2670
1747
#: breezy/builtins.py:2670
1748
1748
msgid "Number of levels to display - 0 for all, 1 for flat."
1751
1751
# help of 'limit' option of 'log' command
1752
#: brzlib/builtins.py:2680
1752
#: breezy/builtins.py:2680
1753
1753
msgid "Limit the output to the first N revisions."
1756
1756
# help of 'show-diff' option of 'log' command
1757
#: brzlib/builtins.py:2685
1757
#: breezy/builtins.py:2685
1758
1758
msgid "Show changes made in each revision as a patch."
1761
1761
# help of 'include-merged' option of 'log' command
1762
#: brzlib/builtins.py:2687
1762
#: breezy/builtins.py:2687
1763
1763
msgid "Show merged revisions like --levels 0 does."
1766
1766
# help of 'omit-merges' option of 'log' command
1767
#: brzlib/builtins.py:2691
1767
#: breezy/builtins.py:2691
1768
1768
msgid "Do not report commits with more than one parent."
1771
1771
# help of 'exclude-common-ancestry' option of 'log' command
1772
#: brzlib/builtins.py:2693
1772
#: breezy/builtins.py:2693
1774
1774
"Display only the revisions that are not part of both ancestries (require -"
1778
1778
# help of 'signatures' option of 'log' command
1779
#: brzlib/builtins.py:2697
1779
#: breezy/builtins.py:2697
1780
1780
msgid "Show digital signature validity."
1783
1783
# help of 'match' option of 'log' command
1784
#: brzlib/builtins.py:2700
1784
#: breezy/builtins.py:2700
1785
1785
msgid "Show revisions whose properties match this expression."
1788
1788
# help of 'match-message' option of 'log' command
1789
#: brzlib/builtins.py:2704
1789
#: breezy/builtins.py:2704
1790
1790
msgid "Show revisions whose message matches this expression."
1793
1793
# help of 'match-committer' option of 'log' command
1794
#: brzlib/builtins.py:2708
1794
#: breezy/builtins.py:2708
1795
1795
msgid "Show revisions whose committer matches this expression."
1798
1798
# help of 'match-author' option of 'log' command
1799
#: brzlib/builtins.py:2712
1799
#: breezy/builtins.py:2712
1800
1800
msgid "Show revisions whose authors match this expression."
1803
1803
# help of 'match-bugs' option of 'log' command
1804
#: brzlib/builtins.py:2716
1804
#: breezy/builtins.py:2716
1805
1805
msgid "Show revisions whose bugs match this expression."
1808
#: brzlib/builtins.py:2770
1808
#: breezy/builtins.py:2770
1809
1809
msgid "--exclude-common-ancestry requires -r with two revisions"
1812
#: brzlib/builtins.py:2798
1812
#: breezy/builtins.py:2798
1813
1813
#, python-format
1814
1814
msgid "Path unknown at end or start of revision range: %s"
1817
#: brzlib/builtins.py:2915
1817
#: breezy/builtins.py:2915
1818
1818
#, python-format
1819
1819
msgid "brz %s doesn't accept two revisions in different branches."
1822
#: brzlib/builtins.py:2931
1822
#: breezy/builtins.py:2931
1823
1823
#, python-format
1824
1824
msgid "brz %s --revision takes one or two values."
1827
#: brzlib/builtins.py:2976
1827
#: breezy/builtins.py:2976
1829
1829
"List files in a tree.\n"
1833
1833
# help of 'recursive' option of 'ls' command
1834
#: brzlib/builtins.py:2985
1834
#: breezy/builtins.py:2985
1835
1835
msgid "Recurse into subdirectories."
1838
1838
# help of 'from-root' option of 'ls' command
1839
#: brzlib/builtins.py:2987
1839
#: breezy/builtins.py:2987
1840
1840
msgid "Print paths relative to the root of the branch."
1843
1843
# help of 'unknown' option of 'ls' command
1844
#: brzlib/builtins.py:2989
1844
#: breezy/builtins.py:2989
1845
1845
msgid "Print unknown files."
1848
1848
# help of 'versioned' option of 'ls' command
1849
#: brzlib/builtins.py:2990
1849
#: breezy/builtins.py:2990
1850
1850
msgid "Print versioned files."
1853
1853
# help of 'ignored' option of 'ls' command
1854
#: brzlib/builtins.py:2993
1854
#: breezy/builtins.py:2993
1855
1855
msgid "Print ignored files."
1858
1858
# help of 'kind' option of 'ls' command
1859
#: brzlib/builtins.py:2995
1859
#: breezy/builtins.py:2995
1860
1860
msgid "List entries of a particular kind: file, directory, symlink."
1863
#: brzlib/builtins.py:3008
1863
#: breezy/builtins.py:3008
1864
1864
msgid "invalid kind specified"
1867
#: brzlib/builtins.py:3011
1867
#: breezy/builtins.py:3011
1868
1868
msgid "Cannot set both --verbose and --null"
1871
#: brzlib/builtins.py:3020
1871
#: breezy/builtins.py:3020
1872
1872
msgid "cannot specify both --from-root and PATH"
1875
#: brzlib/builtins.py:3107
1875
#: breezy/builtins.py:3107
1876
1876
msgid "Ignore specified files or patterns."
1879
#: brzlib/builtins.py:3109
1879
#: breezy/builtins.py:3109
1880
1880
msgid "See ``brz help patterns`` for details on the syntax of patterns."
1883
#: brzlib/builtins.py:3111
1883
#: breezy/builtins.py:3111
1885
1885
"If a .bzrignore file does not exist, the ignore command\n"
1886
1886
"will create one and add the specified files or patterns to the newly\n"
2028
#: brzlib/builtins.py:3236
2028
#: breezy/builtins.py:3236
2029
2029
msgid "List ignored files and the patterns that matched them."
2032
#: brzlib/builtins.py:3238
2032
#: breezy/builtins.py:3238
2034
2034
"List all the ignored files and the ignore pattern that caused the file to\n"
2038
#: brzlib/builtins.py:3241
2038
#: breezy/builtins.py:3241
2039
2039
msgid "Alternatively, to list just the files::"
2042
#: brzlib/builtins.py:3243
2042
#: breezy/builtins.py:3243
2043
2043
msgid " brz ls --ignored"
2046
#: brzlib/builtins.py:3277
2046
#: breezy/builtins.py:3277
2047
2047
#, python-format
2048
2048
msgid "not a valid revision-number: %r"
2051
#: brzlib/builtins.py:3284
2051
#: breezy/builtins.py:3284
2052
2052
msgid "Export current or past revision to a destination directory or archive."
2055
#: brzlib/builtins.py:3286
2055
#: breezy/builtins.py:3286
2056
2056
msgid "If no revision is specified this exports the last committed revision."
2059
#: brzlib/builtins.py:3288
2059
#: breezy/builtins.py:3288
2061
2061
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2062
2062
"given, try to find the format with the extension. If no extension\n"
2063
2063
"is found exports to a directory (equivalent to --format=dir)."
2066
#: brzlib/builtins.py:3292
2066
#: breezy/builtins.py:3292
2068
2068
"If root is supplied, it will be used as the root directory inside\n"
2069
2069
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2070
2070
"to the exported filename. The root option has no effect for 'dir' format."
2073
#: brzlib/builtins.py:3296
2073
#: breezy/builtins.py:3296
2075
2075
"If branch is omitted then the branch containing the current working\n"
2076
2076
"directory will be used."
2079
#: brzlib/builtins.py:3299
2079
#: breezy/builtins.py:3299
2080
2080
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2083
#: brzlib/builtins.py:3301
2083
#: breezy/builtins.py:3301
2085
2085
" ================= =========================\n"
2086
2086
" Supported formats Autodetected by extension\n"
2096
2096
# help of 'format' option of 'export' command
2097
#: brzlib/builtins.py:3315
2097
#: breezy/builtins.py:3315
2098
2098
msgid "Type of file to export to."
2101
2101
# help of 'filters' option of 'export' command
2102
#: brzlib/builtins.py:3318
2102
#: breezy/builtins.py:3318
2103
2103
msgid "Apply content filters to export the convenient form."
2106
2106
# help of 'root' option of 'export' command
2107
#: brzlib/builtins.py:3322
2107
#: breezy/builtins.py:3322
2108
2108
msgid "Name of the root directory inside the exported file."
2111
2111
# help of 'per-file-timestamps' option of 'export' command
2112
#: brzlib/builtins.py:3324
2112
#: breezy/builtins.py:3324
2114
2114
"Set modification time of files to that of the last revision in which it was "
2118
2118
# help of 'uncommitted' option of 'export' command
2119
#: brzlib/builtins.py:3327
2119
#: breezy/builtins.py:3327
2120
2120
msgid "Export the working tree contents rather than that of the last revision."
2123
#: brzlib/builtins.py:3346
2123
#: breezy/builtins.py:3346
2124
2124
msgid "--uncommitted requires a working tree"
2127
#: brzlib/builtins.py:3355
2127
#: breezy/builtins.py:3355
2128
2128
#, python-format
2129
2129
msgid "Unsupported export format: %s"
2132
#: brzlib/builtins.py:3359
2132
#: breezy/builtins.py:3359
2133
2133
msgid "Write the contents of a file as of a given revision to standard output."
2136
#: brzlib/builtins.py:3361
2136
#: breezy/builtins.py:3361
2137
2137
msgid "If no revision is nominated, the last revision is used."
2140
#: brzlib/builtins.py:3363
2140
#: breezy/builtins.py:3363
2142
2142
"Note: Take care to redirect standard output when using this command on a\n"
2146
2146
# help of 'name-from-revision' option of 'cat' command
2147
#: brzlib/builtins.py:3369
2147
#: breezy/builtins.py:3369
2148
2148
msgid "The path name in the old tree."
2151
2151
# help of 'filters' option of 'cat' command
2152
#: brzlib/builtins.py:3370
2152
#: breezy/builtins.py:3370
2153
2153
msgid "Apply content filters to display the convenience form."
2156
#: brzlib/builtins.py:3381
2156
#: breezy/builtins.py:3381
2157
2157
msgid "brz cat --revision takes exactly one revision specifier"
2160
#: brzlib/builtins.py:3406 brzlib/builtins.py:3418
2160
#: breezy/builtins.py:3406 breezy/builtins.py:3418
2161
2161
msgid "{0!r} is not present in revision {1}"
2164
#: brzlib/builtins.py:3441
2164
#: breezy/builtins.py:3441
2165
2165
msgid "Commit changes into a new revision."
2168
#: brzlib/builtins.py:3443
2168
#: breezy/builtins.py:3443
2170
2170
"An explanatory message needs to be given for each commit. This is\n"
2171
2171
"often done by using the --message option (getting the message from the\n"
2257
2257
# help of 'exclude' option of 'commit' command
2258
#: brzlib/builtins.py:3501
2258
#: breezy/builtins.py:3501
2259
2259
msgid "Do not consider changes made to a given path."
2262
2262
# help of 'message' option of 'commit' command
2263
#: brzlib/builtins.py:3504
2263
#: breezy/builtins.py:3504
2264
2264
msgid "Description of the new revision."
2267
2267
# help of 'unchanged' option of 'commit' command
2268
#: brzlib/builtins.py:3507
2268
#: breezy/builtins.py:3507
2269
2269
msgid "Commit even if nothing has changed."
2272
2272
# help of 'file' option of 'commit' command
2273
#: brzlib/builtins.py:3511
2273
#: breezy/builtins.py:3511
2274
2274
msgid "Take commit message from this file."
2277
2277
# help of 'strict' option of 'commit' command
2278
#: brzlib/builtins.py:3513
2278
#: breezy/builtins.py:3513
2279
2279
msgid "Refuse to commit if there are unknown files in the working tree."
2282
2282
# help of 'commit-time' option of 'commit' command
2283
#: brzlib/builtins.py:3516
2283
#: breezy/builtins.py:3516
2285
2285
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2286
2286
"08:00:00 +0100'."
2289
2289
# help of 'fixes' option of 'commit' command
2290
#: brzlib/builtins.py:3519
2290
#: breezy/builtins.py:3519
2291
2291
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
2294
2294
# help of 'author' option of 'commit' command
2295
#: brzlib/builtins.py:3522
2295
#: breezy/builtins.py:3522
2296
2296
msgid "Set the author's name, if it's different from the committer."
2299
2299
# help of 'local' option of 'commit' command
2300
#: brzlib/builtins.py:3525
2300
#: breezy/builtins.py:3525
2302
2302
"Perform a local commit in a bound branch. Local commits are not pushed to "
2303
2303
"the master branch until a normal commit is performed."
2306
2306
# help of 'show-diff' option of 'commit' command
2307
#: brzlib/builtins.py:3531
2307
#: breezy/builtins.py:3531
2309
2309
"When no message is supplied, show the diff along with the status summary in "
2310
2310
"the message editor."
2313
2313
# help of 'lossy' option of 'commit' command
2314
#: brzlib/builtins.py:3534
2314
#: breezy/builtins.py:3534
2316
2316
"When committing to a foreign version control system do not push data that "
2317
2317
"can not be natively represented."
2320
#: brzlib/builtins.py:3552
2320
#: breezy/builtins.py:3552
2321
2321
#, python-format
2323
2323
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2333
2333
"Commit refused."
2336
#: brzlib/builtins.py:3570
2336
#: breezy/builtins.py:3570
2337
2337
#, python-format
2338
2338
msgid "Unrecognized bug %s. Commit refused."
2341
#: brzlib/builtins.py:3573
2341
#: breezy/builtins.py:3573
2342
2342
#, python-format
2345
2345
"Commit refused."
2348
#: brzlib/builtins.py:3597
2348
#: breezy/builtins.py:3597
2349
2349
msgid "Could not parse --commit-time: "
2352
#: brzlib/builtins.py:3637
2352
#: breezy/builtins.py:3637
2353
2353
msgid "please specify either --message or --file"
2356
#: brzlib/builtins.py:3666
2356
#: breezy/builtins.py:3666
2357
2357
msgid "please specify a commit message with either --message or --file"
2360
#: brzlib/builtins.py:3669
2360
#: breezy/builtins.py:3669
2362
2362
"Empty commit message specified. Please specify a commit message with either "
2363
2363
"--message or --file or leave a blank message with --message \"\"."
2366
#: brzlib/builtins.py:3689
2366
#: breezy/builtins.py:3689
2368
2368
"No changes to commit. Please 'brz add' the files you want to commit, or use "
2369
2369
"--unchanged to force an empty commit."
2372
#: brzlib/builtins.py:3693
2372
#: breezy/builtins.py:3693
2374
2374
"Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz "
2375
2375
"resolve FILE\" to resolve."
2378
#: brzlib/builtins.py:3697
2378
#: breezy/builtins.py:3697
2379
2379
msgid "Commit refused because there are unknown files in the working tree."
2382
#: brzlib/builtins.py:3700
2382
#: breezy/builtins.py:3700
2385
2385
"To commit to master branch, run update and then commit.\n"
2386
2386
"You can also pass --local to commit to continue working disconnected."
2389
#: brzlib/builtins.py:3708
2389
#: breezy/builtins.py:3708
2391
2391
"Validate working tree structure, branch consistency and repository history."
2394
#: brzlib/builtins.py:3710
2394
#: breezy/builtins.py:3710
2396
2396
"This command checks various invariants about branch and repository storage\n"
2397
2397
"to detect data corruption or brz bugs."
2400
#: brzlib/builtins.py:3713
2400
#: breezy/builtins.py:3713
2402
2402
"The working tree and branch checks will only give output if a problem is\n"
2403
2403
"detected. The output fields of the repository check are:"
2406
#: brzlib/builtins.py:3716
2406
#: breezy/builtins.py:3716
2409
2409
" This is just the number of revisions checked. It doesn't\n"
2410
2410
" indicate a problem."
2413
#: brzlib/builtins.py:3720
2413
#: breezy/builtins.py:3720
2415
2415
"versionedfiles\n"
2416
2416
" This is just the number of versionedfiles checked. It\n"
2417
2417
" doesn't indicate a problem."
2420
#: brzlib/builtins.py:3724
2420
#: breezy/builtins.py:3724
2422
2422
"unreferenced ancestors\n"
2423
2423
" Texts that are ancestors of other texts, but\n"
2532
#: brzlib/builtins.py:3806
2532
#: breezy/builtins.py:3806
2534
2534
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2535
2535
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2538
2538
# help of 'format' option of 'upgrade' command
2539
#: brzlib/builtins.py:3814
2539
#: breezy/builtins.py:3814
2540
2540
msgid "Upgrade to a specific format. See \"brz help formats\" for details."
2543
2543
# title of 'format' option of 'init' command
2544
2544
# title of 'format' option of 'upgrade' command
2545
#: brzlib/builtins.py:3818
2545
#: breezy/builtins.py:3818
2546
2546
msgid "Branch format"
2549
2549
# help of 'clean' option of 'upgrade' command
2550
#: brzlib/builtins.py:3820
2550
#: breezy/builtins.py:3820
2551
2551
msgid "Remove the backup.bzr directory if successful."
2554
2554
# help of 'dry-run' option of 'add' command
2555
2555
# help of 'dry-run' option of 'upgrade' command
2556
#: brzlib/builtins.py:3822
2556
#: breezy/builtins.py:3822
2557
2557
msgid "Show what would be done, but don't actually do anything."
2560
#: brzlib/builtins.py:3837
2560
#: breezy/builtins.py:3837
2561
2561
msgid "Show or set brz user id."
2564
#: brzlib/builtins.py:3839
2564
#: breezy/builtins.py:3839
2567
2567
" Show the email of the current user::"
2570
#: brzlib/builtins.py:3842
2570
#: breezy/builtins.py:3842
2571
2571
msgid " brz whoami --email"
2574
#: brzlib/builtins.py:3844
2574
#: breezy/builtins.py:3844
2575
2575
msgid " Set the current user::"
2578
#: brzlib/builtins.py:3846
2578
#: breezy/builtins.py:3846
2579
2579
msgid " brz whoami \"Frank Chu <fchu@example.com>\""
2582
2582
# help of 'email' option of 'whoami' command
2583
#: brzlib/builtins.py:3850
2583
#: breezy/builtins.py:3850
2584
2584
msgid "Display email address only."
2587
2587
# help of 'branch' option of 'whoami' command
2588
#: brzlib/builtins.py:3852
2588
#: breezy/builtins.py:3852
2589
2589
msgid "Set identity for the current branch instead of globally."
2592
#: brzlib/builtins.py:3878
2592
#: breezy/builtins.py:3878
2593
2593
msgid "--email can only be used to display existing identity"
2596
#: brzlib/builtins.py:3902
2596
#: breezy/builtins.py:3902
2597
2597
msgid "Print or set the branch nickname."
2600
#: brzlib/builtins.py:3904
2600
#: breezy/builtins.py:3904
2602
2602
"If unset, the colocated branch name is used for colocated branches, and\n"
2603
2603
"the branch directory name is used for other branches. To print the\n"
2604
2604
"current nickname, execute with no argument."
2607
#: brzlib/builtins.py:3908
2607
#: breezy/builtins.py:3908
2609
2609
"Bound branches use the nickname of its master branch unless it is set\n"
2613
#: brzlib/builtins.py:3928
2613
#: breezy/builtins.py:3928
2614
2614
msgid "Set/unset and display aliases."
2617
#: brzlib/builtins.py:3930
2617
#: breezy/builtins.py:3930
2620
2620
" Show the current aliases::"
2623
#: brzlib/builtins.py:3933
2623
#: breezy/builtins.py:3933
2624
2624
msgid " brz alias"
2627
#: brzlib/builtins.py:3935
2627
#: breezy/builtins.py:3935
2628
2628
msgid " Show the alias specified for 'll'::"
2631
#: brzlib/builtins.py:3937
2631
#: breezy/builtins.py:3937
2632
2632
msgid " brz alias ll"
2635
#: brzlib/builtins.py:3939
2635
#: breezy/builtins.py:3939
2636
2636
msgid " Set an alias for 'll'::"
2639
#: brzlib/builtins.py:3941
2639
#: breezy/builtins.py:3941
2640
2640
msgid " brz alias ll=\"log --line -r-10..-1\""
2643
#: brzlib/builtins.py:3943
2643
#: breezy/builtins.py:3943
2644
2644
msgid " To remove an alias for 'll'::"
2647
#: brzlib/builtins.py:3945
2647
#: breezy/builtins.py:3945
2648
2648
msgid " brz alias --remove ll"
2651
2651
# help of 'remove' option of 'alias' command
2652
#: brzlib/builtins.py:3950
2652
#: breezy/builtins.py:3950
2653
2653
msgid "Remove the alias."
2656
#: brzlib/builtins.py:3968
2656
#: breezy/builtins.py:3968
2657
2657
msgid "brz alias --remove expects an alias to remove."
2660
#: brzlib/builtins.py:4149
2660
#: breezy/builtins.py:4149
2661
2661
msgid "subunit not available. subunit needs to be installed to use --subunit."
2664
#: brzlib/builtins.py:4166
2664
#: breezy/builtins.py:4166
2666
2666
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
2669
#: brzlib/builtins.py:4213
2669
#: breezy/builtins.py:4213
2670
2670
msgid "Show version of brz."
2673
2673
# help of 'short' option of 'version' command
2674
#: brzlib/builtins.py:4217
2674
#: breezy/builtins.py:4217
2675
2675
msgid "Print just the version number."
2678
#: brzlib/builtins.py:4236
2678
#: breezy/builtins.py:4236
2679
2679
msgid "It sure does!\n"
2682
#: brzlib/builtins.py:4260
2682
#: breezy/builtins.py:4260
2683
2683
#, python-format
2684
2684
msgid "merge base is revision %s\n"
2687
#: brzlib/builtins.py:4264
2687
#: breezy/builtins.py:4264
2688
2688
msgid "Perform a three-way merge."
2691
#: brzlib/builtins.py:4266
2691
#: breezy/builtins.py:4266
2693
2693
"The source of the merge can be specified either in the form of a branch,\n"
2694
2694
"or in the form of a path to a file containing a merge directive generated\n"
2845
2845
# help of 'directory' option of 'merge' command
2846
#: brzlib/builtins.py:4365
2846
#: breezy/builtins.py:4365
2848
2848
"Branch to merge into, rather than the one containing the working directory."
2851
2851
# help of 'preview' option of 'merge' command
2852
#: brzlib/builtins.py:4367
2852
#: breezy/builtins.py:4367
2853
2853
msgid "Instead of merging, show a diff of the merge."
2856
2856
# help of 'interactive' option of 'merge' command
2857
#: brzlib/builtins.py:4369
2857
#: breezy/builtins.py:4369
2858
2858
msgid "Select changes interactively."
2861
#: brzlib/builtins.py:4391
2861
#: breezy/builtins.py:4391
2863
2863
"Merging into empty branches not currently supported, https://bugs.launchpad."
2864
2864
"net/brz/+bug/308562"
2867
#: brzlib/builtins.py:4418
2867
#: breezy/builtins.py:4418
2868
2868
msgid "Cannot use --uncommitted with bundles or merge directives."
2871
#: brzlib/builtins.py:4429
2871
#: breezy/builtins.py:4429
2872
2872
msgid "Cannot use --uncommitted and --revision at the same time."
2875
#: brzlib/builtins.py:4449
2875
#: breezy/builtins.py:4449
2876
2876
msgid "merger: "
2879
#: brzlib/builtins.py:4451 brzlib/bundle/apply_bundle.py:71
2879
#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
2880
2880
msgid "Nothing to do."
2883
#: brzlib/builtins.py:4455
2883
#: breezy/builtins.py:4455
2884
2884
msgid "Cannot pull individual files"
2887
#: brzlib/builtins.py:4463
2887
#: breezy/builtins.py:4463
2888
2888
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
2891
#: brzlib/builtins.py:4521
2891
#: breezy/builtins.py:4521
2892
2892
#, python-format
2893
2893
msgid "Show-base is not supported for this merge type. %s"
2896
#: brzlib/builtins.py:4530
2896
#: breezy/builtins.py:4530
2897
2897
#, python-format
2898
2898
msgid "Conflict reduction is not supported for merge type %s."
2901
#: brzlib/builtins.py:4534
2901
#: breezy/builtins.py:4534
2902
2902
msgid "Cannot do conflict reduction and show base."
2905
#: brzlib/builtins.py:4645
2905
#: breezy/builtins.py:4645
2906
2906
msgid "No location specified or remembered"
2909
#: brzlib/builtins.py:4647
2909
#: breezy/builtins.py:4647
2910
2910
#, python-brace-format
2911
2911
msgid "{0} remembered {1} location {2}"
2914
#: brzlib/builtins.py:4653
2914
#: breezy/builtins.py:4653
2915
2915
msgid "Redo a merge."
2918
#: brzlib/builtins.py:4655
2918
#: breezy/builtins.py:4655
2920
2920
"Use this if you want to try a different merge technique while resolving\n"
2921
2921
"conflicts. Some merge techniques are better than others, and remerge\n"
2922
2922
"lets you try different ones on different files."
2925
#: brzlib/builtins.py:4659
2925
#: breezy/builtins.py:4659
2927
2927
"The options for remerge have the same meaning and defaults as the ones for\n"
2928
2928
"merge. The difference is that remerge can (only) be run when there is a\n"
2929
2929
"pending merge, and it lets you specify particular files."
2932
#: brzlib/builtins.py:4663
2932
#: breezy/builtins.py:4663
2935
2935
" Re-do the merge of all conflicted files, and show the base text in\n"
2936
2936
" conflict regions, in addition to the usual THIS and OTHER texts::"
2939
#: brzlib/builtins.py:4667
2939
#: breezy/builtins.py:4667
2940
2940
msgid " brz remerge --show-base"
2943
#: brzlib/builtins.py:4669
2943
#: breezy/builtins.py:4669
2945
2945
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2946
2946
" additional processing to reduce the size of conflict regions::"
2949
#: brzlib/builtins.py:4672
2949
#: breezy/builtins.py:4672
2950
2950
msgid " brz remerge --merge-type weave --reprocess foobar"
3080
3080
" 0 - no missing revisions"
3083
#: brzlib/builtins.py:4885
3083
#: breezy/builtins.py:4885
3085
3085
" Determine the missing revisions between this and the branch at the\n"
3086
3086
" remembered pull location::"
3089
#: brzlib/builtins.py:4888
3089
#: breezy/builtins.py:4888
3090
3090
msgid " brz missing"
3093
#: brzlib/builtins.py:4890
3093
#: breezy/builtins.py:4890
3094
3094
msgid " Determine the missing revisions between this and another branch::"
3097
#: brzlib/builtins.py:4892
3097
#: breezy/builtins.py:4892
3098
3098
msgid " brz missing http://server/branch"
3101
#: brzlib/builtins.py:4894
3101
#: breezy/builtins.py:4894
3103
3103
" Determine the missing revisions up to a specific revision on the other\n"
3107
#: brzlib/builtins.py:4897
3107
#: breezy/builtins.py:4897
3108
3108
msgid " brz missing -r ..-10"
3111
#: brzlib/builtins.py:4899
3111
#: breezy/builtins.py:4899
3113
3113
" Determine the missing revisions up to a specific revision on this\n"
3117
#: brzlib/builtins.py:4902
3117
#: breezy/builtins.py:4902
3118
3118
msgid " brz missing --my-revision ..-10"
3121
3121
# help of 'reverse' option of 'missing' command
3122
#: brzlib/builtins.py:4909
3122
#: breezy/builtins.py:4909
3123
3123
msgid "Reverse the order of revisions."
3126
3126
# help of 'mine-only' option of 'missing' command
3127
#: brzlib/builtins.py:4911
3127
#: breezy/builtins.py:4911
3128
3128
msgid "Display changes in the local branch only."
3131
3131
# help of 'this' option of 'missing' command
3132
#: brzlib/builtins.py:4912
3132
#: breezy/builtins.py:4912
3133
3133
msgid "Same as --mine-only."
3136
3136
# help of 'theirs-only' option of 'missing' command
3137
#: brzlib/builtins.py:4914
3137
#: breezy/builtins.py:4914
3138
3138
msgid "Display changes in the remote branch only."
3141
3141
# help of 'other' option of 'missing' command
3142
#: brzlib/builtins.py:4915
3142
#: breezy/builtins.py:4915
3143
3143
msgid "Same as --theirs-only."
3146
3146
# help of 'revision' option of 'missing' command
3147
#: brzlib/builtins.py:4920
3147
#: breezy/builtins.py:4920
3149
3149
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3153
3153
# help of 'my-revision' option of 'missing' command
3154
#: brzlib/builtins.py:4924
3154
#: breezy/builtins.py:4924
3156
3156
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3160
3160
# help of 'include-merged' option of 'missing' command
3161
#: brzlib/builtins.py:4927
3161
#: breezy/builtins.py:4927
3162
3162
msgid "Show all revisions in addition to the mainline ones."
3165
#: brzlib/builtins.py:4981
3165
#: breezy/builtins.py:4981
3166
3166
msgid "No peer location known or specified."
3169
#: brzlib/builtins.py:4985
3169
#: breezy/builtins.py:4985
3170
3170
#, python-brace-format
3171
3171
msgid "Using saved parent location: {0}\n"
3174
#: brzlib/builtins.py:5018
3174
#: breezy/builtins.py:5018
3175
3175
#, python-format
3176
3176
msgid "You have %d extra revision:\n"
3177
3177
msgid_plural "You have %d extra revisions:\n"
3181
#: brzlib/builtins.py:5038
3181
#: breezy/builtins.py:5038
3182
3182
#, python-format
3183
3183
msgid "You are missing %d revision:\n"
3184
3184
msgid_plural "You are missing %d revisions:\n"
3188
#: brzlib/builtins.py:5053
3188
#: breezy/builtins.py:5053
3189
3189
msgid "This branch has no new revisions.\n"
3192
#: brzlib/builtins.py:5056
3192
#: breezy/builtins.py:5056
3193
3193
msgid "Other branch has no new revisions.\n"
3196
#: brzlib/builtins.py:5061
3196
#: breezy/builtins.py:5061
3197
3197
msgid "Branches are up to date.\n"
3200
#: brzlib/builtins.py:5072
3200
#: breezy/builtins.py:5072
3201
3201
msgid "Compress the data within a repository."
3204
#: brzlib/builtins.py:5074
3204
#: breezy/builtins.py:5074
3206
3206
"This operation compresses the data within a bazaar repository. As\n"
3207
3207
"bazaar supports automatic packing of repository, this operation is\n"
3208
3208
"normally not required to be done manually."
3211
#: brzlib/builtins.py:5078
3211
#: breezy/builtins.py:5078
3213
3213
"During the pack operation, bazaar takes a backup of existing repository\n"
3214
3214
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3261
3261
"plugins using the Python programming language."
3264
#: brzlib/builtins.py:5136
3264
#: breezy/builtins.py:5136
3265
3265
msgid "Show testament (signing-form) of a revision."
3268
3268
# help of 'long' option of 'testament' command
3269
#: brzlib/builtins.py:5139
3269
#: breezy/builtins.py:5139
3270
3270
msgid "Produce long-format testament."
3273
3273
# help of 'strict' option of 'testament' command
3274
#: brzlib/builtins.py:5141
3274
#: breezy/builtins.py:5141
3275
3275
msgid "Produce a strict-format testament."
3278
#: brzlib/builtins.py:5168
3278
#: breezy/builtins.py:5168
3279
3279
msgid "Show the origin of each line in a file."
3282
#: brzlib/builtins.py:5170
3282
#: breezy/builtins.py:5170
3284
3284
"This prints out the given file with an annotation on the left side\n"
3285
3285
"indicating which revision, author and date introduced the change."
3288
#: brzlib/builtins.py:5173
3288
#: breezy/builtins.py:5173
3290
3290
"If the origin is the same for a run of consecutive lines, it is\n"
3291
3291
"shown only at the top, unless the --all option is given."
3294
3294
# help of 'all' option of 'annotate' command
3295
#: brzlib/builtins.py:5181
3295
#: breezy/builtins.py:5181
3296
3296
msgid "Show annotations on all lines."
3299
3299
# help of 'long' option of 'annotate' command
3300
#: brzlib/builtins.py:5182
3300
#: breezy/builtins.py:5182
3301
3301
msgid "Show commit date in annotations."
3304
#: brzlib/builtins.py:5269
3304
#: breezy/builtins.py:5269
3305
3305
msgid "Cannot sign a range of non-revision-history revisions"
3308
#: brzlib/builtins.py:5281
3308
#: breezy/builtins.py:5281
3309
3309
msgid "Please supply either one revision, or a range."
3312
#: brzlib/builtins.py:5285
3312
#: breezy/builtins.py:5285
3314
3314
"Convert the current branch into a checkout of the supplied branch.\n"
3315
3315
"If no branch is supplied, rebind to the last bound location."
3318
#: brzlib/builtins.py:5288
3318
#: breezy/builtins.py:5288
3320
3320
"Once converted into a checkout, commits must succeed on the master branch\n"
3321
3321
"before they will be applied to the local branch."
3324
#: brzlib/builtins.py:5291
3324
#: breezy/builtins.py:5291
3326
3326
"Bound branches use the nickname of its master branch unless it is set\n"
3327
3327
"locally, in which case binding will update the local nickname to be\n"
3328
3328
"that of the master."
3331
#: brzlib/builtins.py:5306
3331
#: breezy/builtins.py:5306
3332
3332
msgid "No location supplied. This format does not remember old locations."
3335
#: brzlib/builtins.py:5312
3335
#: breezy/builtins.py:5312
3336
3336
msgid "Branch is already bound"
3339
#: brzlib/builtins.py:5315
3339
#: breezy/builtins.py:5315
3340
3340
msgid "No location supplied and no previous location known"
3343
#: brzlib/builtins.py:5321
3343
#: breezy/builtins.py:5321
3344
3344
msgid "These branches have diverged. Try merging, and then bind again."
3347
#: brzlib/builtins.py:5328
3347
#: breezy/builtins.py:5328
3348
3348
msgid "Convert the current checkout into a regular branch."
3351
#: brzlib/builtins.py:5330
3351
#: breezy/builtins.py:5330
3353
3353
"After unbinding, the local branch is considered independent and subsequent\n"
3354
3354
"commits will be local only."
3357
#: brzlib/builtins.py:5341
3357
#: breezy/builtins.py:5341
3358
3358
msgid "Local branch is not bound"
3361
#: brzlib/builtins.py:5345
3361
#: breezy/builtins.py:5345
3362
3362
msgid "Remove the last committed revision."
3365
#: brzlib/builtins.py:5347
3365
#: breezy/builtins.py:5347
3367
3367
"--verbose will print out what is being removed.\n"
3368
3368
"--dry-run will go through all the motions, but not actually\n"
3369
3369
"remove anything."
3372
#: brzlib/builtins.py:5351
3372
#: breezy/builtins.py:5351
3374
3374
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3375
3375
"specified revision. For example, \"brz uncommit -r 15\" will leave the\n"
3376
3376
"branch at revision 15."
3379
#: brzlib/builtins.py:5355
3379
#: breezy/builtins.py:5355
3381
3381
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3382
3382
"it may make is to restore any pending merges that were present before\n"
3386
3386
# help of 'dry-run' option of 'uncommit' command
3387
#: brzlib/builtins.py:5366
3387
#: breezy/builtins.py:5366
3388
3388
msgid "Don't actually make changes."
3391
3391
# help of 'force' option of 'uncommit' command
3392
#: brzlib/builtins.py:5367
3392
#: breezy/builtins.py:5367
3393
3393
msgid "Say yes to all questions."
3396
3396
# help of 'keep-tags' option of 'uncommit' command
3397
#: brzlib/builtins.py:5369
3397
#: breezy/builtins.py:5369
3398
3398
msgid "Keep tags that point to removed revisions."
3401
3401
# help of 'local' option of 'uncommit' command
3402
#: brzlib/builtins.py:5371
3402
#: breezy/builtins.py:5371
3403
3403
msgid "Only remove the commits from the local branch when in a checkout."
3406
#: brzlib/builtins.py:5420
3406
#: breezy/builtins.py:5420
3407
3407
msgid "No revisions to uncommit.\n"
3410
#: brzlib/builtins.py:5435
3410
#: breezy/builtins.py:5435
3411
3411
msgid "Dry-run, pretending to remove the above revisions.\n"
3414
#: brzlib/builtins.py:5438
3414
#: breezy/builtins.py:5438
3415
3415
msgid "The above revision(s) will be removed.\n"
3418
#: brzlib/builtins.py:5442
3418
#: breezy/builtins.py:5442
3419
3419
msgid "Uncommit these revisions"
3422
#: brzlib/builtins.py:5445
3422
#: breezy/builtins.py:5445
3423
3423
msgid "Canceled\n"
3426
#: brzlib/builtins.py:5452
3426
#: breezy/builtins.py:5452
3427
3427
#, python-format
3429
3429
"You can restore the old tip by running:\n"
3430
3430
" brz pull . -r revid:%s\n"
3433
#: brzlib/builtins.py:5457
3433
#: breezy/builtins.py:5457
3434
3434
msgid "Break a dead lock."
3437
#: brzlib/builtins.py:5459
3437
#: breezy/builtins.py:5459
3439
3439
"This command breaks a lock on a repository, branch, working directory or\n"
3443
#: brzlib/builtins.py:5462
3443
#: breezy/builtins.py:5462
3445
3445
"CAUTION: Locks should only be broken when you are sure that the process\n"
3446
3446
"holding the lock has been stopped."
3449
#: brzlib/builtins.py:5465
3449
#: breezy/builtins.py:5465
3451
3451
"You can get information on what locks are open via the 'brz info\n"
3452
3452
"[location]' command."
3455
#: brzlib/builtins.py:5468
3455
#: breezy/builtins.py:5468
3458
3458
" brz break-lock\n"
3525
3525
# help of 'client-timeout' option of 'serve' command
3526
#: brzlib/builtins.py:5545
3526
#: breezy/builtins.py:5545
3527
3527
msgid "Override the default idle client timeout (5min)."
3530
#: brzlib/builtins.py:5563
3530
#: breezy/builtins.py:5563
3531
3531
msgid "Combine a tree into its containing tree."
3534
#: brzlib/builtins.py:5565
3534
#: breezy/builtins.py:5565
3535
3535
msgid "This command requires the target tree to be in a rich-root format."
3538
#: brzlib/builtins.py:5567
3538
#: breezy/builtins.py:5567
3540
3540
"The TREE argument should be an independent tree, inside another tree, but\n"
3541
3541
"not part of it. (Such trees can be produced by \"brz split\", but also by\n"
3542
3542
"running \"brz branch\" with the target inside a tree.)"
3545
#: brzlib/builtins.py:5571
3545
#: breezy/builtins.py:5571
3547
3547
"The result is a combined tree, with the subtree no longer an independent\n"
3548
3548
"part. This is marked as a merge of the subtree into the containing tree,\n"
3549
3549
"and all history is preserved."
3552
#: brzlib/builtins.py:5589
3552
#: breezy/builtins.py:5589
3553
3553
#, python-format
3555
3555
"Can't join trees because %s doesn't support rich root data.\n"
3556
3556
"You can use brz upgrade on the repository."
3559
#: brzlib/builtins.py:5599 brzlib/builtins.py:5605
3559
#: breezy/builtins.py:5599 breezy/builtins.py:5605
3560
3560
#, python-brace-format
3561
3561
msgid "Cannot join {0}. {1}"
3564
#: brzlib/builtins.py:5609
3564
#: breezy/builtins.py:5609
3565
3565
msgid "Split a subdirectory of a tree into a separate tree."
3568
#: brzlib/builtins.py:5611
3568
#: breezy/builtins.py:5611
3570
3570
"This command will produce a target tree in a format that supports\n"
3571
3571
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3572
3572
"converted into earlier formats like 'dirstate-tags'."
3575
#: brzlib/builtins.py:5615
3575
#: breezy/builtins.py:5615
3577
3577
"The TREE argument should be a subdirectory of a working tree. That\n"
3578
3578
"subdirectory will be converted into an independent tree, with its own\n"
3579
3579
"branch. Commits in the top-level tree will not apply to the new subtree."
3582
#: brzlib/builtins.py:5695
3582
#: breezy/builtins.py:5695
3583
3583
msgid "No submit branch specified or known"
3586
#: brzlib/builtins.py:5704 brzlib/send.py:109
3586
#: breezy/builtins.py:5704 breezy/send.py:109
3587
3587
msgid "No public branch specified or known"
3590
#: brzlib/builtins.py:5709
3590
#: breezy/builtins.py:5709
3591
3591
msgid "brz merge-directive takes at most two one revision identifiers"
3594
#: brzlib/builtins.py:5718
3594
#: breezy/builtins.py:5718
3595
3595
msgid "No revisions to bundle."
3598
#: brzlib/builtins.py:5737
3598
#: breezy/builtins.py:5737
3599
3599
msgid "Mail or create a merge-directive for submitting changes."
3602
#: brzlib/builtins.py:5739
3602
#: breezy/builtins.py:5739
3603
3603
msgid "A merge directive provides many things needed for requesting merges:"
3606
#: brzlib/builtins.py:5741
3606
#: breezy/builtins.py:5741
3607
3607
msgid "* A machine-readable description of the merge to perform"
3610
#: brzlib/builtins.py:5743
3610
#: breezy/builtins.py:5743
3611
3611
msgid "* An optional patch that is a preview of the changes requested"
3614
#: brzlib/builtins.py:5745
3614
#: breezy/builtins.py:5745
3616
3616
"* An optional bundle of revision data, so that the changes can be applied\n"
3617
3617
" directly from the merge directive, without retrieving data from a\n"
3621
#: brzlib/builtins.py:5749
3621
#: breezy/builtins.py:5749
3623
3623
"`brz send` creates a compact data set that, when applied using brz\n"
3624
3624
"merge, has the same effect as merging from the source branch. "
3627
#: brzlib/builtins.py:5752
3627
#: breezy/builtins.py:5752
3629
3629
"By default the merge directive is self-contained and can be applied to any\n"
3630
3630
"branch containing submit_branch in its ancestory without needing access to\n"
3631
3631
"the source branch."
3634
#: brzlib/builtins.py:5756
3634
#: breezy/builtins.py:5756
3636
3636
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3637
3637
"revisions, but only a structured request to merge from the\n"
3819
3819
# help of 'delete' option of 'tag' command
3820
#: brzlib/builtins.py:5958
3820
#: breezy/builtins.py:5958
3821
3821
msgid "Delete this tag rather than placing it."
3824
3824
# help of 'directory' option of 'tag' command
3825
#: brzlib/builtins.py:5961
3825
#: breezy/builtins.py:5961
3826
3826
msgid "Branch in which to place the tag."
3829
3829
# help of 'force' option of 'tag' command
3830
#: brzlib/builtins.py:5963
3830
#: breezy/builtins.py:5963
3831
3831
msgid "Replace existing tags."
3834
#: brzlib/builtins.py:5978
3834
#: breezy/builtins.py:5978
3835
3835
msgid "No tag specified to delete."
3838
#: brzlib/builtins.py:5980
3838
#: breezy/builtins.py:5980
3839
3839
#, python-format
3840
3840
msgid "Deleted tag %s."
3843
#: brzlib/builtins.py:5985
3843
#: breezy/builtins.py:5985
3844
3844
msgid "Tags can only be placed on a single revision, not on a range"
3847
#: brzlib/builtins.py:5994
3847
#: breezy/builtins.py:5994
3848
3848
msgid "Please specify a tag name."
3851
#: brzlib/builtins.py:6002
3851
#: breezy/builtins.py:6002
3852
3852
#, python-format
3853
3853
msgid "Tag %s already exists for that revision."
3856
#: brzlib/builtins.py:6006
3856
#: breezy/builtins.py:6006
3857
3857
#, python-format
3858
3858
msgid "Created tag %s."
3861
#: brzlib/builtins.py:6008
3861
#: breezy/builtins.py:6008
3862
3862
#, python-format
3863
3863
msgid "Updated tag %s."
3866
#: brzlib/builtins.py:6012
3866
#: breezy/builtins.py:6012
3867
3867
msgid "List tags."
3870
#: brzlib/builtins.py:6014
3870
#: breezy/builtins.py:6014
3872
3872
"This command shows a table of tag names and the revisions they reference."
3875
3875
# help of 'directory' option of 'tags' command
3876
#: brzlib/builtins.py:6020
3876
#: breezy/builtins.py:6020
3877
3877
msgid "Branch whose tags should be displayed."
3880
3880
# help of 'sort' option of 'tags' command
3881
#: brzlib/builtins.py:6022
3881
#: breezy/builtins.py:6022
3882
3882
msgid "Sort tags by different criteria."
3885
3885
# title of 'sort' option of 'tags' command
3886
#: brzlib/builtins.py:6022
3886
#: breezy/builtins.py:6022
3887
3887
msgid "Sorting"
3890
#: brzlib/builtins.py:6091
3890
#: breezy/builtins.py:6091
3891
3891
msgid "Reconfigure the type of a brz directory."
3894
#: brzlib/builtins.py:6093
3894
#: breezy/builtins.py:6093
3895
3895
msgid "A target configuration must be specified."
3898
#: brzlib/builtins.py:6095
3898
#: breezy/builtins.py:6095
3900
3900
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3901
3901
"The order of preference is\n"
3909
3909
# title of 'tree_type' option of 'reconfigure' command
3910
#: brzlib/builtins.py:6109
3910
#: breezy/builtins.py:6109
3911
3911
msgid "Tree type"
3914
3914
# help of 'tree_type' option of 'reconfigure' command
3915
#: brzlib/builtins.py:6110
3915
#: breezy/builtins.py:6110
3916
3916
msgid "The relation between branch and tree."
3919
3919
# help of 'tree_type=branch' option of 'reconfigure' command
3920
#: brzlib/builtins.py:6112
3920
#: breezy/builtins.py:6112
3921
3921
msgid "Reconfigure to be an unbound branch with no working tree."
3924
3924
# help of 'tree_type=tree' option of 'reconfigure' command
3925
#: brzlib/builtins.py:6113
3925
#: breezy/builtins.py:6113
3926
3926
msgid "Reconfigure to be an unbound branch with a working tree."
3929
3929
# help of 'tree_type=checkout' option of 'reconfigure' command
3930
#: brzlib/builtins.py:6114
3930
#: breezy/builtins.py:6114
3931
3931
msgid "Reconfigure to be a bound branch with a working tree."
3934
3934
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3935
#: brzlib/builtins.py:6115
3935
#: breezy/builtins.py:6115
3936
3936
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3939
3939
# title of 'repository_type' option of 'reconfigure' command
3940
#: brzlib/builtins.py:6120
3940
#: breezy/builtins.py:6120
3941
3941
msgid "Repository type"
3944
3944
# help of 'repository_type' option of 'reconfigure' command
3945
#: brzlib/builtins.py:6121
3945
#: breezy/builtins.py:6121
3946
3946
msgid "Location fo the repository."
3949
3949
# help of 'repository_type=standalone' option of 'reconfigure' command
3950
#: brzlib/builtins.py:6123
3950
#: breezy/builtins.py:6123
3952
3952
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3955
3955
# help of 'repository_type=use-shared' option of 'reconfigure' command
3956
#: brzlib/builtins.py:6125
3956
#: breezy/builtins.py:6125
3957
3957
msgid "Reconfigure to use a shared repository."
3960
3960
# title of 'repository_trees' option of 'reconfigure' command
3961
#: brzlib/builtins.py:6129
3961
#: breezy/builtins.py:6129
3962
3962
msgid "Trees in Repository"
3965
3965
# help of 'repository_trees' option of 'reconfigure' command
3966
#: brzlib/builtins.py:6130
3966
#: breezy/builtins.py:6130
3967
3967
msgid "Whether new branches in the repository have trees."
3970
3970
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3971
#: brzlib/builtins.py:6132
3971
#: breezy/builtins.py:6132
3972
3972
msgid "Reconfigure repository to create working trees on branches by default."
3975
3975
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3976
#: brzlib/builtins.py:6134
3976
#: breezy/builtins.py:6134
3978
3978
"Reconfigure repository to not create working trees on branches by default."
3981
3981
# help of 'bind-to' option of 'reconfigure' command
3982
#: brzlib/builtins.py:6137
3982
#: breezy/builtins.py:6137
3983
3983
msgid "Branch to bind checkout to."
3986
3986
# help of 'force' option of 'reconfigure' command
3987
#: brzlib/builtins.py:6139
3987
#: breezy/builtins.py:6139
3988
3988
msgid "Perform reconfiguration even if local changes will be lost."
3991
3991
# help of 'stacked-on' option of 'reconfigure' command
3992
#: brzlib/builtins.py:6142
3992
#: breezy/builtins.py:6142
3993
3993
msgid "Reconfigure a branch to be stacked on another branch."
3996
3996
# help of 'unstacked' option of 'reconfigure' command
3997
#: brzlib/builtins.py:6146
3997
#: breezy/builtins.py:6146
3999
3999
"Reconfigure a branch to be unstacked. This may require copying substantial "
4000
4000
"data into it."
4003
#: brzlib/builtins.py:6156
4003
#: breezy/builtins.py:6156
4004
4004
msgid "Can't use both --stacked-on and --unstacked"
4007
#: brzlib/builtins.py:6170
4007
#: breezy/builtins.py:6170
4008
4008
msgid "No target configuration specified"
4011
#: brzlib/builtins.py:6205
4011
#: breezy/builtins.py:6205
4012
4012
msgid "Set the branch of a checkout and update."
4015
#: brzlib/builtins.py:6207
4015
#: breezy/builtins.py:6207
4017
4017
"For lightweight checkouts, this changes the branch being referenced.\n"
4018
4018
"For heavyweight checkouts, this checks that there are no local commits\n"
4098
4098
"want to switch back to your view after that."
4101
#: brzlib/builtins.py:6308
4101
#: breezy/builtins.py:6308
4104
4104
" To define the current view::"
4107
#: brzlib/builtins.py:6311
4107
#: breezy/builtins.py:6311
4108
4108
msgid " brz view file1 dir1 ..."
4111
#: brzlib/builtins.py:6313
4111
#: breezy/builtins.py:6313
4112
4112
msgid " To list the current view::"
4115
#: brzlib/builtins.py:6315
4115
#: breezy/builtins.py:6315
4116
4116
msgid " brz view"
4119
#: brzlib/builtins.py:6317
4119
#: breezy/builtins.py:6317
4120
4120
msgid " To delete the current view::"
4123
#: brzlib/builtins.py:6319
4123
#: breezy/builtins.py:6319
4124
4124
msgid " brz view --delete"
4127
#: brzlib/builtins.py:6321
4127
#: breezy/builtins.py:6321
4128
4128
msgid " To disable the current view without deleting it::"
4131
#: brzlib/builtins.py:6323
4131
#: breezy/builtins.py:6323
4132
4132
msgid " brz view --switch off"
4135
#: brzlib/builtins.py:6325
4135
#: breezy/builtins.py:6325
4136
4136
msgid " To define a named view and switch to it::"
4139
#: brzlib/builtins.py:6327
4139
#: breezy/builtins.py:6327
4140
4140
msgid " brz view --name view-name file1 dir1 ..."
4143
#: brzlib/builtins.py:6329
4143
#: breezy/builtins.py:6329
4144
4144
msgid " To list a named view::"
4147
#: brzlib/builtins.py:6331
4147
#: breezy/builtins.py:6331
4148
4148
msgid " brz view --name view-name"
4151
#: brzlib/builtins.py:6333
4151
#: breezy/builtins.py:6333
4152
4152
msgid " To delete a named view::"
4155
#: brzlib/builtins.py:6335
4155
#: breezy/builtins.py:6335
4156
4156
msgid " brz view --name view-name --delete"
4159
#: brzlib/builtins.py:6337
4159
#: breezy/builtins.py:6337
4160
4160
msgid " To switch to a named view::"
4163
#: brzlib/builtins.py:6339
4163
#: breezy/builtins.py:6339
4164
4164
msgid " brz view --switch view-name"
4167
#: brzlib/builtins.py:6341
4167
#: breezy/builtins.py:6341
4168
4168
msgid " To list all views defined::"
4171
#: brzlib/builtins.py:6343
4171
#: breezy/builtins.py:6343
4172
4172
msgid " brz view --all"
4175
#: brzlib/builtins.py:6345
4175
#: breezy/builtins.py:6345
4176
4176
msgid " To delete all views::"
4179
#: brzlib/builtins.py:6347
4179
#: breezy/builtins.py:6347
4180
4180
msgid " brz view --delete --all"
4183
4183
# help of 'all' option of 'view' command
4184
#: brzlib/builtins.py:6354
4184
#: breezy/builtins.py:6354
4185
4185
msgid "Apply list or delete action to all views."
4188
4188
# help of 'delete' option of 'view' command
4189
#: brzlib/builtins.py:6357
4189
#: breezy/builtins.py:6357
4190
4190
msgid "Delete the view."
4193
4193
# help of 'name' option of 'view' command
4194
#: brzlib/builtins.py:6360
4194
#: breezy/builtins.py:6360
4195
4195
msgid "Name of the view to define, list or delete."
4198
4198
# help of 'switch' option of 'view' command
4199
#: brzlib/builtins.py:6364
4199
#: breezy/builtins.py:6364
4200
4200
msgid "Name of the view to switch to."
4203
#: brzlib/builtins.py:6383
4203
#: breezy/builtins.py:6383
4204
4204
msgid "Both --delete and a file list specified"
4207
#: brzlib/builtins.py:6386
4207
#: breezy/builtins.py:6386
4208
4208
msgid "Both --delete and --switch specified"
4211
#: brzlib/builtins.py:6389
4211
#: breezy/builtins.py:6389
4212
4212
msgid "Deleted all views.\n"
4215
#: brzlib/builtins.py:6391
4215
#: breezy/builtins.py:6391
4216
4216
msgid "No current view to delete"
4219
#: brzlib/builtins.py:6394
4219
#: breezy/builtins.py:6394
4220
4220
#, python-format
4221
4221
msgid "Deleted '%s' view.\n"
4224
#: brzlib/builtins.py:6398
4224
#: breezy/builtins.py:6398
4225
4225
msgid "Both --switch and a file list specified"
4228
#: brzlib/builtins.py:6401
4228
#: breezy/builtins.py:6401
4229
4229
msgid "Both --switch and --all specified"
4232
#: brzlib/builtins.py:6404
4232
#: breezy/builtins.py:6404
4233
4233
msgid "No current view to disable"
4236
#: brzlib/builtins.py:6406
4236
#: breezy/builtins.py:6406
4237
4237
#, python-format
4238
4238
msgid "Disabled '%s' view.\n"
4241
#: brzlib/builtins.py:6410 brzlib/builtins.py:6432
4241
#: breezy/builtins.py:6410 breezy/builtins.py:6432
4242
4242
#, python-brace-format
4243
4243
msgid "Using '{0}' view: {1}\n"
4246
#: brzlib/builtins.py:6413
4246
#: breezy/builtins.py:6413
4247
4247
msgid "Views defined:\n"
4250
#: brzlib/builtins.py:6422
4250
#: breezy/builtins.py:6422
4251
4251
msgid "No views defined.\n"
4254
#: brzlib/builtins.py:6429
4254
#: breezy/builtins.py:6429
4255
4255
msgid "Cannot change the 'off' pseudo view"
4258
#: brzlib/builtins.py:6437
4258
#: breezy/builtins.py:6437
4259
4259
msgid "No current view.\n"
4262
#: brzlib/builtins.py:6440
4262
#: breezy/builtins.py:6440
4263
4263
#, python-brace-format
4264
4264
msgid "'{0}' view is: {1}\n"
4267
#: brzlib/builtins.py:6460
4267
#: breezy/builtins.py:6460
4268
4268
msgid " <no hooks installed>\n"
4271
#: brzlib/builtins.py:6464
4271
#: breezy/builtins.py:6464
4272
4272
msgid "Remove a branch."
4275
#: brzlib/builtins.py:6466
4275
#: breezy/builtins.py:6466
4277
4277
"This will remove the branch from the specified location but \n"
4278
4278
"will keep any working tree or repository in place."
4281
#: brzlib/builtins.py:6471
4281
#: breezy/builtins.py:6471
4282
4282
msgid " Remove the branch at repo/trunk::"
4285
#: brzlib/builtins.py:6473
4285
#: breezy/builtins.py:6473
4286
4286
msgid " brz remove-branch repo/trunk"
4289
4289
# help of 'force' option of 'remove-branch' command
4290
#: brzlib/builtins.py:6480
4290
#: breezy/builtins.py:6480
4291
4291
msgid "Remove branch even if it is the active branch."
4294
#: brzlib/builtins.py:6494
4294
#: breezy/builtins.py:6494
4295
4295
msgid "Branch is active. Use --force to remove it."
4298
4298
# help of 'writer=plain' option of 'shelve' command
4299
#: brzlib/builtins.py:6498
4299
#: breezy/builtins.py:6498
4300
4300
msgid "Plaintext diff output."
4303
#: brzlib/builtins.py:6499
4303
#: breezy/builtins.py:6499
4304
4304
msgid "Temporarily set aside some changes from the current tree."
4307
#: brzlib/builtins.py:6501
4307
#: breezy/builtins.py:6501
4309
4309
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4310
4310
"ie. out of the way, until a later time when you can bring them back from\n"
4405
4405
# help of 'action' option of 'unshelve' command
4406
#: brzlib/builtins.py:6599
4406
#: breezy/builtins.py:6599
4407
4407
msgid "The action to perform."
4410
4410
# title of 'action' option of 'resolve' command
4411
4411
# title of 'action' option of 'unshelve' command
4412
#: brzlib/builtins.py:6599 brzlib/conflicts.py:694
4412
#: breezy/builtins.py:6599 breezy/conflicts.py:694
4416
4416
# help of 'action=apply' option of 'unshelve' command
4417
#: brzlib/builtins.py:6601
4417
#: breezy/builtins.py:6601
4418
4418
msgid "Apply changes and remove from the shelf."
4421
4421
# help of 'action=dry-run' option of 'unshelve' command
4422
#: brzlib/builtins.py:6602
4422
#: breezy/builtins.py:6602
4423
4423
msgid "Show changes, but do not apply or remove them."
4426
4426
# help of 'action=preview' option of 'unshelve' command
4427
#: brzlib/builtins.py:6603
4427
#: breezy/builtins.py:6603
4429
4429
"Instead of unshelving the changes, show the diff that would result from "
4433
4433
# help of 'action=delete-only' option of 'unshelve' command
4434
#: brzlib/builtins.py:6605
4434
#: breezy/builtins.py:6605
4435
4435
msgid "Delete changes without applying them."
4438
4438
# help of 'action=keep' option of 'unshelve' command
4439
#: brzlib/builtins.py:6606
4439
#: breezy/builtins.py:6606
4440
4440
msgid "Apply changes but don't delete them."
4443
#: brzlib/builtins.py:6621
4443
#: breezy/builtins.py:6621
4444
4444
msgid "Remove unwanted files from working tree."
4447
#: brzlib/builtins.py:6623
4447
#: breezy/builtins.py:6623
4449
4449
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4450
4450
"files are never deleted."
4453
#: brzlib/builtins.py:6626
4453
#: breezy/builtins.py:6626
4455
4455
"Another class is 'detritus', which includes files emitted by brz during\n"
4456
4456
"normal operations and selftests. (The value of these files decreases with\n"
4460
#: brzlib/builtins.py:6630
4460
#: breezy/builtins.py:6630
4462
4462
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4463
4463
"flags are respected, and may be combined."
4466
#: brzlib/builtins.py:6633
4466
#: breezy/builtins.py:6633
4467
4467
msgid "To check what clean-tree will do, use --dry-run."
4470
4470
# help of 'ignored' option of 'clean-tree' command
4471
#: brzlib/builtins.py:6636
4471
#: breezy/builtins.py:6636
4472
4472
msgid "Delete all ignored files."
4475
4475
# help of 'detritus' option of 'clean-tree' command
4476
#: brzlib/builtins.py:6637
4476
#: breezy/builtins.py:6637
4478
4478
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4481
4481
# help of 'unknown' option of 'clean-tree' command
4482
#: brzlib/builtins.py:6640
4482
#: breezy/builtins.py:6640
4483
4483
msgid "Delete files unknown to brz (default)."
4486
4486
# help of 'dry-run' option of 'clean-tree' command
4487
#: brzlib/builtins.py:6641
4487
#: breezy/builtins.py:6641
4488
4488
msgid "Show files to delete instead of deleting them."
4491
4491
# help of 'force' option of 'clean-tree' command
4492
#: brzlib/builtins.py:6643
4492
#: breezy/builtins.py:6643
4493
4493
msgid "Do not prompt before deleting."
4496
#: brzlib/bundle/__init__.py:59
4496
#: breezy/bundle/__init__.py:59
4497
4497
msgid "A directory cannot be a bundle"
4500
#: brzlib/bundle/apply_bundle.py:40
4500
#: breezy/bundle/apply_bundle.py:40
4501
4501
msgid "Install revisions"
4504
#: brzlib/bundle/commands.py:64
4504
#: breezy/bundle/commands.py:64
4505
4505
msgid "--verbose requires a merge directive"
4508
#: brzlib/bundle/commands.py:67
4508
#: breezy/bundle/commands.py:67
4509
4509
msgid "Bundle format not supported"
4512
#: brzlib/bundle/commands.py:77
4512
#: breezy/bundle/commands.py:77
4513
4513
msgid "Records\n"
4516
#: brzlib/bundle/commands.py:81
4516
#: breezy/bundle/commands.py:81
4517
4517
#, python-brace-format
4518
4518
msgid "{0}: {1} ({2} multiparent)\n"
4521
#: brzlib/bundle/commands.py:83
4521
#: breezy/bundle/commands.py:83
4522
4522
#, python-format
4523
4523
msgid "unique files: %d\n"
4526
#: brzlib/bundle/commands.py:92
4526
#: breezy/bundle/commands.py:92
4527
4527
msgid "Revisions\n"
4530
#: brzlib/bundle/commands.py:93
4530
#: breezy/bundle/commands.py:93
4531
4531
#, python-format
4532
4532
msgid "nicks: %s\n"
4535
#: brzlib/bundle/commands.py:95
4535
#: breezy/bundle/commands.py:95
4536
4536
#, python-format
4538
4538
"committers: \n"
4542
#: brzlib/bundle/commands.py:103
4542
#: breezy/bundle/commands.py:103
4543
4543
msgid "Decoded contents\n"
4546
#: brzlib/bundle/serializer/v4.py:327
4546
#: breezy/bundle/serializer/v4.py:327
4547
4547
#, python-format
4548
4548
msgid "Bundling %d revision."
4549
4549
msgid_plural "Bundling %d revisions."
4553
#: brzlib/bzrdir.py:487
4553
#: breezy/bzrdir.py:487
4554
4554
#, python-brace-format
4556
4556
"making backup of {0}\n"
4560
#: brzlib/bzrdir.py:510
4560
#: breezy/bzrdir.py:510
4561
4561
#, python-brace-format
4562
4562
msgid "renamed {0} to {1}"
4565
#: brzlib/bzrdir.py:1639
4565
#: breezy/bzrdir.py:1639
4566
4566
#, python-format
4568
4568
"Source repository format does not support stacking, using format:\n"
4572
#: brzlib/bzrdir.py:1659
4572
#: breezy/bzrdir.py:1659
4573
4573
#, python-format
4575
4575
"Source branch format does not support stacking, using format:\n"
4579
#: brzlib/bzrdir.py:1805
4579
#: breezy/bzrdir.py:1805
4580
4580
msgid "starting repository conversion"
4583
#: brzlib/bzrdir.py:2026
4583
#: breezy/bzrdir.py:2026
4584
4584
#, python-brace-format
4585
4585
msgid "Using default stacking branch {0} at {1}"
4588
#: brzlib/check.py:108
4588
#: breezy/check.py:108
4592
#: brzlib/check.py:110
4592
#: breezy/check.py:110
4593
4593
msgid "checking revisions"
4596
#: brzlib/check.py:112
4596
#: breezy/check.py:112
4597
4597
msgid "checking commit contents"
4600
#: brzlib/check.py:114
4600
#: breezy/check.py:114
4601
4601
msgid "checking file graphs"
4604
#: brzlib/check.py:118
4604
#: breezy/check.py:118
4605
4605
msgid "checking branches and trees"
4608
#: brzlib/check.py:205
4608
#: breezy/check.py:205
4609
4609
#, python-brace-format
4610
4610
msgid "checked repository {0} format {1}"
4613
#: brzlib/check.py:208
4613
#: breezy/check.py:208
4614
4614
#, python-format
4615
4615
msgid "%6d revisions"
4618
#: brzlib/check.py:209
4618
#: breezy/check.py:209
4619
4619
#, python-format
4620
4620
msgid "%6d file-ids"
4623
#: brzlib/check.py:211
4623
#: breezy/check.py:211
4624
4624
#, python-format
4625
4625
msgid "%6d unreferenced text versions"
4628
#: brzlib/check.py:215
4628
#: breezy/check.py:215
4629
4629
#, python-brace-format
4630
4630
msgid "unreferenced version: {{{0}}} in {1}"
4633
#: brzlib/check.py:218
4633
#: breezy/check.py:218
4634
4634
#, python-format
4635
4635
msgid "%6d revisions are missing inventory_sha1"
4638
#: brzlib/check.py:221
4638
#: breezy/check.py:221
4639
4639
#, python-format
4640
4640
msgid "%6d revisions are mentioned but not present"
4643
#: brzlib/check.py:224
4643
#: breezy/check.py:224
4644
4644
#, python-format
4645
4645
msgid "%6d ghost revisions"
4648
#: brzlib/check.py:229
4648
#: breezy/check.py:229
4649
4649
#, python-format
4650
4650
msgid "%6d revisions missing parents in ancestry"
4653
#: brzlib/check.py:233
4653
#: breezy/check.py:233
4654
4654
#, python-format
4655
4655
msgid " %s should be in the ancestry for:"
4658
#: brzlib/check.py:237
4658
#: breezy/check.py:237
4659
4659
#, python-format
4660
4660
msgid "%6d inconsistent parents"
4663
#: brzlib/check.py:241
4663
#: breezy/check.py:241
4664
4664
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4667
#: brzlib/check.py:247
4667
#: breezy/check.py:247
4668
4668
#, python-format
4669
4669
msgid "%6d revisions have incorrect parents in the revision index"
4672
#: brzlib/check.py:253
4672
#: breezy/check.py:253
4673
4673
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4676
#: brzlib/check.py:267
4676
#: breezy/check.py:267
4677
4677
#, python-brace-format
4678
4678
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4681
#: brzlib/check.py:296
4681
#: breezy/check.py:296
4682
4682
#, python-brace-format
4684
4684
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4688
#: brzlib/check.py:354
4688
#: breezy/check.py:354
4689
4689
#, python-format
4690
4690
msgid "Checking branch at '%s'."
4693
#: brzlib/check.py:374
4693
#: breezy/check.py:374
4694
4694
#, python-format
4695
4695
msgid "Checking working tree at '%s'."
4698
#: brzlib/check.py:427 brzlib/check.py:441
4698
#: breezy/check.py:427 breezy/check.py:441
4699
4699
msgid "No branch found at specified location."
4702
#: brzlib/check.py:429 brzlib/check.py:439
4702
#: breezy/check.py:429 breezy/check.py:439
4703
4703
msgid "No working tree found at specified location."
4706
#: brzlib/check.py:432
4706
#: breezy/check.py:432
4707
4707
#, python-format
4708
4708
msgid "Checking repository at '%s'."
4711
#: brzlib/check.py:443
4711
#: breezy/check.py:443
4712
4712
msgid "No repository found at specified location."
4715
#: brzlib/clean_tree.py:63
4715
#: breezy/clean_tree.py:63
4716
4716
msgid "Nothing to delete."
4719
#: brzlib/clean_tree.py:68
4719
#: breezy/clean_tree.py:68
4720
4720
msgid "Are you sure you wish to delete these"
4723
#: brzlib/clean_tree.py:70
4723
#: breezy/clean_tree.py:70
4724
4724
msgid "Canceled"
4727
#: brzlib/clean_tree.py:107
4727
#: breezy/clean_tree.py:107
4728
4728
#, python-format
4729
4729
msgid "unable to remove %s"
4732
#: brzlib/clean_tree.py:111
4732
#: breezy/clean_tree.py:111
4733
4733
msgid "deleting paths:"
4736
#: brzlib/clean_tree.py:125
4736
#: breezy/clean_tree.py:125
4737
4737
#, python-brace-format
4738
4738
msgid "unable to remove \"{0}\": {1}."
4741
#: brzlib/clean_tree.py:130
4741
#: breezy/clean_tree.py:130
4742
4742
msgid "No files deleted."
4745
#: brzlib/cmd_version_info.py:47
4745
#: breezy/cmd_version_info.py:47
4746
4746
#, python-brace-format
4747
4747
msgid "No known version info format {0}. Supported types are: {1}"
4750
4750
# help of 'format=custom' option of 'version-info' command
4751
#: brzlib/cmd_version_info.py:52
4751
#: breezy/cmd_version_info.py:52
4752
4752
msgid "Version info in Custom template-based format."
4755
4755
# help of 'format=python' option of 'version-info' command
4756
#: brzlib/cmd_version_info.py:52
4756
#: breezy/cmd_version_info.py:52
4757
4757
msgid "Version info in Python format."
4760
4760
# help of 'format=rio' option of 'version-info' command
4761
#: brzlib/cmd_version_info.py:52
4761
#: breezy/cmd_version_info.py:52
4762
4762
msgid "Version info in RIO (simple text) format (default)."
4765
#: brzlib/cmd_version_info.py:53
4765
#: breezy/cmd_version_info.py:53
4766
4766
msgid "Show version information about this tree."
4769
#: brzlib/cmd_version_info.py:55
4769
#: breezy/cmd_version_info.py:55
4771
4771
"You can use this command to add information about version into\n"
4772
4772
"source code of an application. The output can be in one of the\n"
4773
4773
"supported formats or in a custom format based on a template."
4776
#: brzlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4776
#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4777
4777
#: en/help_topics/configuration.txt:738
4778
4778
msgid "For example::"
4781
#: brzlib/cmd_version_info.py:61
4781
#: breezy/cmd_version_info.py:61
4783
4783
" brz version-info --custom \\\n"
4784
4784
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4787
#: brzlib/cmd_version_info.py:64
4787
#: breezy/cmd_version_info.py:64
4789
4789
"will produce a C header file with formatted string containing the\n"
4790
4790
"current revision number. Other supported variables in templates are:"
4793
#: brzlib/cmd_version_info.py:67
4793
#: breezy/cmd_version_info.py:67
4795
4795
" * {date} - date of the last revision\n"
4796
4796
" * {build_date} - current date\n"
4877
#: brzlib/commands.py:533
4877
#: breezy/commands.py:533
4878
4878
#, python-format
4880
4880
"See brz help %s for more details and examples.\n"
4884
#: brzlib/commands.py:538
4884
#: breezy/commands.py:538
4885
4885
msgid ":Aliases: "
4888
#: brzlib/commands.py:542
4888
#: breezy/commands.py:542
4889
4889
#, python-format
4890
4890
msgid ":From: plugin \"%s\"\n"
4893
#: brzlib/commands.py:554
4893
#: breezy/commands.py:554
4894
4894
#, python-brace-format
4895
4895
msgid ":doc:`{0} <{1}-help>`"
4898
#: brzlib/commands.py:558
4898
#: breezy/commands.py:558
4899
4899
#, python-format
4900
4900
msgid ":See also: %s"
4903
#: brzlib/commands.py:826
4903
#: breezy/commands.py:826
4904
4904
msgid "Only ASCII permitted in option names"
4907
#: brzlib/commands.py:851 brzlib/commands.py:859
4907
#: breezy/commands.py:851 breezy/commands.py:859
4908
4908
msgid "command {0!r} needs one or more {1}"
4911
#: brzlib/commands.py:868
4911
#: breezy/commands.py:868
4912
4912
msgid "command {0!r} requires argument {1}"
4915
#: brzlib/commands.py:875
4915
#: breezy/commands.py:875
4916
4916
#, python-brace-format
4917
4917
msgid "extra argument to command {0}: {1}"
4920
#: brzlib/commands.py:952
4920
#: breezy/commands.py:952
4921
4921
#, python-format
4922
4922
msgid "Profile data written to \"%s\"."
4925
#: brzlib/commit.py:117 brzlib/commit.py:740
4925
#: breezy/commit.py:117 breezy/commit.py:740
4929
#: brzlib/commit.py:117 brzlib/commit.py:748
4929
#: breezy/commit.py:117 breezy/commit.py:748
4930
4930
msgid "modified"
4933
#: brzlib/commit.py:131
4933
#: breezy/commit.py:131
4934
4934
#, python-format
4935
4935
msgid "Committing%s"
4938
#: brzlib/commit.py:134
4938
#: breezy/commit.py:134
4939
4939
#, python-format
4940
4940
msgid "Committed revision %d."
4943
#: brzlib/commit.py:143
4943
#: breezy/commit.py:143
4944
4944
#, python-format
4945
4945
msgid "deleted %s"
4948
#: brzlib/commit.py:146
4948
#: breezy/commit.py:146
4949
4949
#, python-format
4950
4950
msgid "missing %s"
4953
#: brzlib/commit.py:511
4953
#: breezy/commit.py:511
4954
4954
#, python-brace-format
4956
4956
"Conflicting tags in bound branch:\n"
4960
#: brzlib/commit.py:742
4960
#: breezy/commit.py:742
4961
4961
msgid "renamed"
4964
#: brzlib/commit.py:976
4964
#: breezy/commit.py:976
4965
4965
msgid "unchanged"
4968
#: brzlib/commit.py:998
4968
#: breezy/commit.py:998
4969
4969
#, python-brace-format
4970
4970
msgid "{0} [{1}] - Stage"
4973
#: brzlib/commit.py:1001
4973
#: breezy/commit.py:1001
4974
4974
#, python-format
4975
4975
msgid "%s - Stage"
4978
#: brzlib/commit_signature_commands.py:34
4978
#: breezy/commit_signature_commands.py:34
4979
4979
msgid "Sign all commits by a given committer."
4982
#: brzlib/commit_signature_commands.py:36
4982
#: breezy/commit_signature_commands.py:36
4984
4984
"If location is not specified the local tree is used.\n"
4985
4985
"If committer is not specified the default committer is used."
4988
#: brzlib/commit_signature_commands.py:39
4988
#: breezy/commit_signature_commands.py:39
4989
4989
msgid "This does not sign commits that already have signatures."
4992
4992
# help of 'dry-run' option of 'sign-my-commits' command
4993
#: brzlib/commit_signature_commands.py:47
4993
#: breezy/commit_signature_commands.py:47
4995
4995
"Don't actually sign anything, just print the revisions that would be signed."
4998
#: brzlib/commit_signature_commands.py:98
4998
#: breezy/commit_signature_commands.py:98
4999
4999
#, python-format
5000
5000
msgid "Signed %d revision.\n"
5001
5001
msgid_plural "Signed %d revisions.\n"
5005
#: brzlib/commit_signature_commands.py:103
5005
#: breezy/commit_signature_commands.py:103
5006
5006
msgid "Verify all commit signatures."
5009
#: brzlib/commit_signature_commands.py:105
5009
#: breezy/commit_signature_commands.py:105
5010
5010
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
5013
5013
# help of 'acceptable-keys' option of 'verify-signatures' command
5014
#: brzlib/commit_signature_commands.py:110
5014
#: breezy/commit_signature_commands.py:110
5016
5016
"Comma separated list of GPG key patterns which are acceptable for "
5017
5017
"verification."
5020
#: brzlib/commit_signature_commands.py:148
5020
#: breezy/commit_signature_commands.py:148
5021
5021
msgid "Cannot verify a range of non-revision-history revisions"
5024
#: brzlib/commit_signature_commands.py:166
5024
#: breezy/commit_signature_commands.py:166
5025
5025
msgid "All commits signed with verifiable keys"
5028
#: brzlib/config.py:438
5028
#: breezy/config.py:438
5029
5029
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5032
#: brzlib/config.py:2465
5032
#: breezy/config.py:2465
5033
5033
#, python-brace-format
5034
5034
msgid "{0} is not an SI unit."
5037
#: brzlib/config.py:3013
5037
#: breezy/config.py:3013
5038
5038
#, python-brace-format
5040
5040
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5041
5041
"will be saved."
5044
#: brzlib/config.py:3158
5044
#: breezy/config.py:3158
5045
5045
#, python-format
5046
5046
msgid "Invalid '%s', should be of the form 'name=value'"
5049
#: brzlib/config.py:4096
5049
#: breezy/config.py:4096
5050
5050
msgid "Display, set or remove a configuration option."
5053
#: brzlib/config.py:4098
5053
#: breezy/config.py:4098
5054
5054
msgid "Display the active value for option NAME."
5057
#: brzlib/config.py:4100
5057
#: breezy/config.py:4100
5059
5059
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5060
5060
"matching options are displayed mentioning their scope and without resolving\n"
5062
5062
"account is the first one displayed for each option."
5065
#: brzlib/config.py:4105
5065
#: breezy/config.py:4105
5067
5067
"If NAME is not given, --all .* is implied (all options are displayed for "
5069
5069
"current scope)."
5072
#: brzlib/config.py:4108
5072
#: breezy/config.py:4108
5074
5074
"Setting a value is achieved by using NAME=value without spaces. The value\n"
5075
5075
"is set in the most relevant scope and can be checked by displaying the\n"
5076
5076
"option again."
5079
#: brzlib/config.py:4112
5079
#: breezy/config.py:4112
5080
5080
msgid "Removing a value is achieved by using --remove NAME."
5083
5083
# help of 'scope' option of 'config' command
5084
#: brzlib/config.py:4122
5084
#: breezy/config.py:4122
5085
5085
msgid "Reduce the scope to the specified configuration file."
5088
5088
# help of 'all' option of 'config' command
5089
#: brzlib/config.py:4126
5089
#: breezy/config.py:4126
5090
5090
msgid "Display all the defined values for the matching options."
5093
5093
# help of 'remove' option of 'config' command
5094
#: brzlib/config.py:4128
5094
#: breezy/config.py:4128
5095
5095
msgid "Remove the option from the configuration file."
5098
#: brzlib/conflicts.py:50
5098
#: breezy/conflicts.py:50
5099
5099
msgid "List files with conflicts."
5102
#: brzlib/conflicts.py:57
5102
#: breezy/conflicts.py:57
5104
5104
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5105
5105
"is supplied, the pathnames of files with text conflicts are listed,\n"
5106
5106
"instead. (This is useful for editing all files with text conflicts.)"
5109
#: brzlib/conflicts.py:61
5109
#: breezy/conflicts.py:61
5110
5110
msgid "Use brz resolve when you have fixed a problem."
5113
5113
# help of 'text' option of 'conflicts' command
5114
#: brzlib/conflicts.py:66
5114
#: breezy/conflicts.py:66
5115
5115
msgid "List paths of files with text conflicts."
5118
5118
# help of 'action=done' option of 'resolve' command
5119
#: brzlib/conflicts.py:85
5119
#: breezy/conflicts.py:85
5120
5120
msgid "Marks the conflict as resolved."
5123
5123
# help of 'action=take-this' option of 'resolve' command
5124
#: brzlib/conflicts.py:88
5124
#: breezy/conflicts.py:88
5125
5125
msgid "Resolve the conflict preserving the version in the working tree."
5128
5128
# help of 'action=take-other' option of 'resolve' command
5129
#: brzlib/conflicts.py:91
5129
#: breezy/conflicts.py:91
5130
5130
msgid "Resolve the conflict taking the merged version into account."
5133
5133
# help of 'action' option of 'resolve' command
5134
#: brzlib/conflicts.py:98
5134
#: breezy/conflicts.py:98
5135
5135
msgid "How to resolve the conflict."
5138
#: brzlib/conflicts.py:104
5138
#: breezy/conflicts.py:104
5139
5139
msgid "Mark a conflict as resolved."
5142
#: brzlib/conflicts.py:111
5142
#: breezy/conflicts.py:111
5144
5144
"Once you have fixed a problem, use \"brz resolve\" to automatically mark\n"
5145
5145
"text conflicts as fixed, \"brz resolve FILE\" to mark a specific conflict "
5150
5150
# help of 'all' option of 'resolve' command
5151
#: brzlib/conflicts.py:119
5151
#: breezy/conflicts.py:119
5152
5152
msgid "Resolve all conflicts in this tree."
5155
#: brzlib/conflicts.py:126
5155
#: breezy/conflicts.py:126
5156
5156
msgid "If --all is specified, no FILE may be provided"
5159
#: brzlib/conflicts.py:151
5159
#: breezy/conflicts.py:151
5160
5160
#, python-format
5161
5161
msgid "%d conflict auto-resolved."
5162
5162
msgid_plural "%d conflicts auto-resolved."
5166
#: brzlib/conflicts.py:154
5166
#: breezy/conflicts.py:154
5167
5167
msgid "Remaining conflicts:"
5170
#: brzlib/conflicts.py:159
5170
#: breezy/conflicts.py:159
5171
5171
msgid "All conflicts resolved."
5174
#: brzlib/conflicts.py:168
5174
#: breezy/conflicts.py:168
5175
5175
#, python-brace-format
5176
5176
msgid "{0} conflict resolved, {1} remaining"
5177
5177
msgid_plural "{0} conflicts resolved, {1} remaining"
5181
#: brzlib/controldir.py:712
5181
#: breezy/controldir.py:712
5182
5182
#, python-brace-format
5183
5183
msgid "{0} is{1} redirected to {2}"
5186
#: brzlib/diff.py:413
5186
#: breezy/diff.py:413
5187
5187
#, python-format
5188
5188
msgid "*** Ignoring files outside view. View is %s"
5191
#: brzlib/errors.py:157
5191
#: breezy/errors.py:157
5192
5192
msgid "The tree builder is already building a tree."
5195
#: brzlib/errors.py:178
5195
#: breezy/errors.py:178
5196
5196
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5199
#: brzlib/errors.py:197
5199
#: breezy/errors.py:197
5201
5201
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5202
5202
"versions \"%(minimum)s\" to \"%(current)s\"."
5205
#: brzlib/errors.py:209
5205
#: breezy/errors.py:209
5206
5206
msgid "The transport '%(transport)s' is only accessible within this process."
5209
#: brzlib/errors.py:227
5209
#: breezy/errors.py:227
5210
5210
msgid "Invalid revision number %(revno)s"
5213
#: brzlib/errors.py:236
5213
#: breezy/errors.py:236
5214
5214
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5217
#: brzlib/errors.py:247
5217
#: breezy/errors.py:247
5218
5218
msgid "Reserved revision-id {%(revision_id)s}"
5221
#: brzlib/errors.py:261
5221
#: breezy/errors.py:261
5222
5222
msgid "There is no public branch set for \"%(branch_url)s\"."
5225
#: brzlib/errors.py:271
5225
#: breezy/errors.py:271
5227
5227
"No help could be found for '%(topic)s'. Please use 'brz help topics' to "
5228
5228
"obtain a list of topics."
5231
#: brzlib/errors.py:280
5231
#: breezy/errors.py:280
5232
5232
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5235
#: brzlib/errors.py:290
5235
#: breezy/errors.py:290
5237
5237
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5240
#: brzlib/errors.py:299
5240
#: breezy/errors.py:299
5241
5241
msgid "The branch '%(branch)s' is not stacked."
5244
#: brzlib/errors.py:313
5244
#: breezy/errors.py:313
5245
5245
msgid "No WorkingTree exists for \"%(base)s\"."
5248
#: brzlib/errors.py:322
5248
#: breezy/errors.py:322
5249
5249
msgid "Not currently building a tree."
5252
#: brzlib/errors.py:327
5252
#: breezy/errors.py:327
5253
5253
msgid "%(url)s is not a local path."
5256
#: brzlib/errors.py:355
5256
#: breezy/errors.py:355
5257
5257
msgid "%(not_locked)r is not write locked but needs to be."
5260
#: brzlib/errors.py:363
5260
#: breezy/errors.py:363
5261
5261
msgid "Error in command line options"
5264
#: brzlib/errors.py:368
5264
#: breezy/errors.py:368
5265
5265
msgid "%(value)s is not an index of type %(_type)s."
5268
#: brzlib/errors.py:378
5268
#: breezy/errors.py:378
5269
5269
msgid "Error in data for index %(value)s."
5272
#: brzlib/errors.py:387
5272
#: breezy/errors.py:387
5273
5273
msgid "The key '%(key)s' is already in index '%(index)s'."
5276
#: brzlib/errors.py:397
5276
#: breezy/errors.py:397
5277
5277
msgid "The key '%(key)s' is not a valid key."
5280
#: brzlib/errors.py:406
5280
#: breezy/errors.py:406
5281
5281
msgid "Could not parse options for index %(value)s."
5284
#: brzlib/errors.py:415
5284
#: breezy/errors.py:415
5285
5285
msgid "The value '%(value)s' is not a valid value."
5288
#: brzlib/errors.py:424
5288
#: breezy/errors.py:424
5289
5289
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5292
#: brzlib/errors.py:443
5292
#: breezy/errors.py:443
5293
5293
msgid "Generic path error: %(path)r%(extra)s)"
5296
#: brzlib/errors.py:456
5296
#: breezy/errors.py:456
5297
5297
msgid "No such file: %(path)r%(extra)s"
5300
#: brzlib/errors.py:461
5300
#: breezy/errors.py:461
5301
5301
msgid "File exists: %(path)r%(extra)s"
5304
#: brzlib/errors.py:467
5304
#: breezy/errors.py:467
5306
5306
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5307
5307
"after to tell brz about a rename that has already happened)%(extra)s"
5310
#: brzlib/errors.py:483
5310
#: breezy/errors.py:483
5311
5311
msgid "\"%(path)s\" is not a directory %(extra)s"
5314
#: brzlib/errors.py:488
5314
#: breezy/errors.py:488
5315
5315
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5318
#: brzlib/errors.py:493
5318
#: breezy/errors.py:493
5319
5319
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5322
#: brzlib/errors.py:498
5322
#: breezy/errors.py:498
5323
5323
msgid "Hard-linking \"%(path)s\" is not supported"
5326
#: brzlib/errors.py:513
5326
#: breezy/errors.py:513
5327
5327
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5330
#: brzlib/errors.py:518
5330
#: breezy/errors.py:518
5331
5331
msgid "Permission denied: \"%(path)s\"%(extra)s"
5334
#: brzlib/errors.py:523
5334
#: breezy/errors.py:523
5335
5335
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5338
#: brzlib/errors.py:528
5338
#: breezy/errors.py:528
5339
5339
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5342
#: brzlib/errors.py:539
5342
#: breezy/errors.py:539
5343
5343
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5346
#: brzlib/errors.py:561
5347
msgid "The %(type)s hook '%(hook)s' is unknown in this version of brzlib."
5346
#: breezy/errors.py:561
5347
msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy."
5350
#: brzlib/errors.py:571
5350
#: breezy/errors.py:571
5351
5351
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5354
#: brzlib/errors.py:579
5354
#: breezy/errors.py:579
5356
5356
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5357
5357
"upgrade the branch to permit branch stacking."
5360
#: brzlib/errors.py:590
5360
#: breezy/errors.py:590
5361
5361
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5364
#: brzlib/errors.py:600
5364
#: breezy/errors.py:600
5366
5366
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5367
5367
"need to upgrade the repository to permit branch stacking."
5370
#: brzlib/errors.py:611
5370
#: breezy/errors.py:611
5371
5371
msgid "Error reading from %(path)r."
5374
#: brzlib/errors.py:630
5374
#: breezy/errors.py:630
5375
5375
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5378
#: brzlib/errors.py:646
5378
#: breezy/errors.py:646
5379
5379
msgid "Path \"%(path)s\" is not unicode normalized"
5382
#: brzlib/errors.py:654
5382
#: breezy/errors.py:654
5383
5383
msgid "Not a branch: \"%(path)s\"%(detail)s."
5386
#: brzlib/errors.py:696
5386
#: breezy/errors.py:696
5387
5387
msgid "No submit branch available for branch \"%(path)s\""
5390
#: brzlib/errors.py:705
5390
#: breezy/errors.py:705
5391
5391
msgid "A control directory already exists: \"%(path)s\"."
5394
#: brzlib/errors.py:710
5394
#: breezy/errors.py:710
5395
5395
msgid "Already a branch: \"%(path)s\"."
5398
#: brzlib/errors.py:715
5398
#: breezy/errors.py:715
5399
5399
msgid "Invalid branch name: %(name)s"
5402
#: brzlib/errors.py:724
5402
#: breezy/errors.py:724
5403
5403
msgid "Parent branch already exists: \"%(path)s\"."
5406
#: brzlib/errors.py:730
5406
#: breezy/errors.py:730
5408
5408
"Directory contains a branch, but no working tree (use brz checkout if you "
5409
5409
"wish to build a working tree): \"%(path)s\""
5412
#: brzlib/errors.py:735
5412
#: breezy/errors.py:735
5414
5414
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5417
#: brzlib/errors.py:745
5417
#: breezy/errors.py:745
5419
5419
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5422
#: brzlib/errors.py:755
5422
#: breezy/errors.py:755
5423
5423
msgid "No repository present: \"%(path)s\""
5426
#: brzlib/errors.py:762
5426
#: breezy/errors.py:762
5428
5428
"Unsupported branch format: %(format)s\n"
5429
5429
"Please run 'brz upgrade'"
5432
#: brzlib/errors.py:768
5432
#: breezy/errors.py:768
5433
5433
msgid "Unknown %(kind)s format: %(format)r"
5436
#: brzlib/errors.py:777
5436
#: breezy/errors.py:777
5437
5437
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5440
#: brzlib/errors.py:787
5440
#: breezy/errors.py:787
5441
5441
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5444
#: brzlib/errors.py:802
5444
#: breezy/errors.py:802
5447
5447
"is not compatible with\n"
5452
#: brzlib/errors.py:818
5452
#: breezy/errors.py:818
5453
5453
msgid "Revision is not compatible with %(repo_format)s"
5456
#: brzlib/errors.py:828
5456
#: breezy/errors.py:828
5457
5457
msgid "%(context_info)s%(path)s is already versioned."
5460
#: brzlib/errors.py:849
5460
#: breezy/errors.py:849
5461
5461
msgid "%(context_info)s%(path)s is not versioned."
5464
#: brzlib/errors.py:870
5464
#: breezy/errors.py:870
5465
5465
msgid "Path(s) are not versioned: %(paths_as_string)s"
5468
#: brzlib/errors.py:881
5468
#: breezy/errors.py:881
5469
5469
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5472
#: brzlib/errors.py:900
5472
#: breezy/errors.py:900
5473
5473
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5476
#: brzlib/errors.py:908
5476
#: breezy/errors.py:908
5478
5478
"Filename %(filename)r is not valid in your current filesystem encoding "
5479
5479
"%(fs_encoding)s"
5482
#: brzlib/errors.py:919
5482
#: breezy/errors.py:919
5483
5483
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5486
#: brzlib/errors.py:937
5486
#: breezy/errors.py:937
5487
5487
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5490
#: brzlib/errors.py:976
5490
#: breezy/errors.py:976
5491
5491
msgid "Cannot lock %(lock)s: %(why)s"
5494
#: brzlib/errors.py:986
5494
#: breezy/errors.py:986
5496
5496
"A transaction related operation was attempted after the transaction finished."
5499
#: brzlib/errors.py:1013
5499
#: breezy/errors.py:1013
5500
5500
msgid "Cannot lock: transport is read only: %(transport)s"
5503
#: brzlib/errors.py:1021
5503
#: breezy/errors.py:1021
5504
5504
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5507
#: brzlib/errors.py:1032
5507
#: breezy/errors.py:1032
5508
5508
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5511
#: brzlib/errors.py:1043
5511
#: breezy/errors.py:1043
5513
5513
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5514
5514
"%(holder)r, wanted to break %(target)r"
5517
#: brzlib/errors.py:1055
5517
#: breezy/errors.py:1055
5519
5519
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5520
5520
"Use 'brz break-lock' to clear it"
5523
#: brzlib/errors.py:1068
5523
#: breezy/errors.py:1068
5524
5524
msgid "Lock not held: %(lock)s"
5527
#: brzlib/errors.py:1097
5527
#: breezy/errors.py:1097
5528
5528
msgid "No changes to commit"
5531
#: brzlib/errors.py:1102
5531
#: breezy/errors.py:1102
5533
5533
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5536
#: brzlib/errors.py:1112
5536
#: breezy/errors.py:1112
5538
5538
"Excluding paths during commit is not supported by repository at "
5539
5539
"%(repository)r."
5542
#: brzlib/errors.py:1121
5542
#: breezy/errors.py:1121
5544
5544
"The specified commit message contains characters unsupported by the current "
5548
#: brzlib/errors.py:1127
5548
#: breezy/errors.py:1127
5549
5549
msgid "Upgrade URL cannot work with readonly URLs."
5552
#: brzlib/errors.py:1132
5552
#: breezy/errors.py:1132
5553
5553
msgid "The branch format %(format)s is already at the most recent format."
5556
#: brzlib/errors.py:1155
5556
#: breezy/errors.py:1155
5557
5557
msgid "Option --change does not accept revision ranges"
5560
#: brzlib/errors.py:1160
5560
#: breezy/errors.py:1160
5561
5561
msgid "No namespace registered for string: %(spec)r"
5564
#: brzlib/errors.py:1179
5564
#: breezy/errors.py:1179
5566
5566
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5570
#: brzlib/errors.py:1193
5570
#: breezy/errors.py:1193
5572
5572
"Operation denied because it would change the main history, which is not "
5573
5573
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5576
#: brzlib/errors.py:1204
5576
#: breezy/errors.py:1204
5578
5578
"These branches have diverged. Use the missing command to see how.\n"
5579
5579
"Use the merge command to reconcile them."
5582
#: brzlib/errors.py:1224
5582
#: breezy/errors.py:1224
5584
5584
"Branches have no common ancestor, and no merge base revision was specified."
5587
#: brzlib/errors.py:1230
5587
#: breezy/errors.py:1230
5589
5589
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5592
#: brzlib/errors.py:1236
5592
#: breezy/errors.py:1236
5593
5593
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5596
#: brzlib/errors.py:1245
5596
#: breezy/errors.py:1245
5598
5598
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5601
#: brzlib/errors.py:1254
5601
#: breezy/errors.py:1254
5602
5602
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5605
#: brzlib/errors.py:1263
5605
#: breezy/errors.py:1263
5606
5606
msgid "Branch %(branch)s has no commits."
5609
#: brzlib/errors.py:1281
5609
#: breezy/errors.py:1281
5611
5611
"Bound branch %(branch)s is out of date with master branch %(master)s."
5612
5612
"%(extra_help)s"
5615
#: brzlib/errors.py:1293
5615
#: breezy/errors.py:1293
5617
5617
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5618
5618
"bound to %(remote)s."
5621
#: brzlib/errors.py:1305
5621
#: breezy/errors.py:1305
5622
5622
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5625
#: brzlib/errors.py:1314
5625
#: breezy/errors.py:1314
5627
5627
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5631
#: brzlib/errors.py:1326
5631
#: breezy/errors.py:1326
5632
5632
msgid "Error in processing weave: %(msg)s"
5635
#: brzlib/errors.py:1335
5635
#: breezy/errors.py:1335
5636
5636
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5639
#: brzlib/errors.py:1346
5639
#: breezy/errors.py:1346
5640
5640
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5643
#: brzlib/errors.py:1356
5643
#: breezy/errors.py:1356
5644
5644
msgid "Weave invariant violated: %(what)s"
5647
#: brzlib/errors.py:1365
5647
#: breezy/errors.py:1365
5648
5648
msgid "Parents are mismatched between two revisions. %(msg)s"
5651
#: brzlib/errors.py:1387
5651
#: breezy/errors.py:1387
5653
5653
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5657
#: brzlib/errors.py:1399
5657
#: breezy/errors.py:1399
5658
5658
msgid "Versioned file error"
5661
#: brzlib/errors.py:1404
5661
#: breezy/errors.py:1404
5662
5662
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5665
#: brzlib/errors.py:1414
5665
#: breezy/errors.py:1414
5666
5666
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5669
#: brzlib/errors.py:1424
5669
#: breezy/errors.py:1424
5670
5670
msgid "Text did not match its checksum: %(msg)s"
5673
#: brzlib/errors.py:1550
5673
#: breezy/errors.py:1550
5674
5674
msgid "Export format %(format)r not supported"
5677
#: brzlib/errors.py:1559
5677
#: breezy/errors.py:1559
5678
5678
msgid "Transport error: %(msg)s %(orig_error)s"
5681
#: brzlib/errors.py:1585
5681
#: breezy/errors.py:1585
5682
5682
msgid "Generic bzr smart protocol error: %(details)s"
5685
#: brzlib/errors.py:1593
5685
#: breezy/errors.py:1593
5686
5686
msgid "Received bad protocol version marker: %(marker)r"
5689
#: brzlib/errors.py:1625
5689
#: breezy/errors.py:1625
5690
5690
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5693
#: brzlib/errors.py:1630
5693
#: breezy/errors.py:1630
5694
5694
msgid "Connection error: %(msg)s %(orig_error)s"
5697
#: brzlib/errors.py:1635
5697
#: breezy/errors.py:1635
5698
5698
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5701
#: brzlib/errors.py:1656
5701
#: breezy/errors.py:1656
5702
5702
msgid "Connection closed: %(msg)s %(orig_error)s"
5705
#: brzlib/errors.py:1661
5705
#: breezy/errors.py:1661
5706
5706
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5709
#: brzlib/errors.py:1666
5709
#: breezy/errors.py:1666
5710
5710
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5713
#: brzlib/errors.py:1676
5713
#: breezy/errors.py:1676
5714
5714
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5717
#: brzlib/errors.py:1691
5717
#: breezy/errors.py:1691
5718
5718
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5721
#: brzlib/errors.py:1705
5721
#: breezy/errors.py:1705
5722
5722
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5725
#: brzlib/errors.py:1713
5725
#: breezy/errors.py:1713
5726
5726
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5729
#: brzlib/errors.py:1722
5729
#: breezy/errors.py:1722
5730
5730
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5733
#: brzlib/errors.py:1736
5733
#: breezy/errors.py:1736
5734
5734
msgid "Too many redirections"
5737
#: brzlib/errors.py:1741
5737
#: breezy/errors.py:1741
5738
5738
msgid "Working tree has conflicts."
5741
#: brzlib/errors.py:1745
5741
#: breezy/errors.py:1745
5742
5742
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5745
#: brzlib/errors.py:1754
5745
#: breezy/errors.py:1754
5747
5747
"Error(s) parsing config file %(filename)s:\n"
5751
#: brzlib/errors.py:1764
5751
#: breezy/errors.py:1764
5753
5753
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5754
5754
"See ``brz help %(name)s``"
5757
#: brzlib/errors.py:1774
5757
#: breezy/errors.py:1774
5758
5758
msgid "%(username)r does not seem to contain a reasonable email address"
5761
#: brzlib/errors.py:1783
5761
#: breezy/errors.py:1783
5762
5762
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5765
#: brzlib/errors.py:1791
5765
#: breezy/errors.py:1791
5766
5766
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5769
#: brzlib/errors.py:1799
5769
#: breezy/errors.py:1799
5770
5770
msgid "Unable to import library \"%(library)s\": %(error)s"
5773
#: brzlib/errors.py:1807
5773
#: breezy/errors.py:1807
5774
5774
msgid "python-gpgme is not installed, it is needed to verify signatures"
5777
#: brzlib/errors.py:1815
5777
#: breezy/errors.py:1815
5779
5779
"The working tree for %(basedir)s has changed since the last commit, but "
5780
5780
"weave merge requires that it be unchanged"
5783
#: brzlib/errors.py:1825
5783
#: breezy/errors.py:1825
5785
5785
"Can't reprocess and show base, because reprocessing obscures the "
5786
5786
"relationship of conflicting lines to the base"
5789
#: brzlib/errors.py:1831
5789
#: breezy/errors.py:1831
5790
5790
msgid "Cycle in graph %(graph)r"
5793
#: brzlib/errors.py:1859
5793
#: breezy/errors.py:1859
5794
5794
msgid "File %(filename)s is not conflicted."
5797
#: brzlib/errors.py:1881
5797
#: breezy/errors.py:1881
5798
5798
msgid "No bundle was found in \"%(filename)s\"."
5801
#: brzlib/errors.py:1890
5801
#: breezy/errors.py:1890
5802
5802
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5805
#: brzlib/errors.py:1900
5805
#: breezy/errors.py:1900
5806
5806
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5809
#: brzlib/errors.py:1913
5809
#: breezy/errors.py:1913
5810
5810
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5813
#: brzlib/errors.py:1923
5813
#: breezy/errors.py:1923
5814
5814
msgid "Key %(key)s is already present in map"
5817
#: brzlib/errors.py:1928
5817
#: breezy/errors.py:1928
5818
5818
msgid "The prefix %(prefix)s is in the help search path twice."
5821
#: brzlib/errors.py:1938
5821
#: breezy/errors.py:1938
5823
5823
"No final name for trans_id %(trans_id)r\n"
5824
5824
"file-id: %(file_id)r\n"
5825
5825
"root trans-id: %(root_trans_id)r\n"
5828
#: brzlib/errors.py:1970
5828
#: breezy/errors.py:1970
5829
5829
msgid "Attempt to reuse a transform that has already been applied."
5832
#: brzlib/errors.py:1975
5832
#: breezy/errors.py:1975
5833
5833
msgid "Moving the root directory is not supported at this time"
5836
#: brzlib/errors.py:1980
5836
#: breezy/errors.py:1980
5837
5837
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5840
#: brzlib/errors.py:1991
5840
#: breezy/errors.py:1991
5842
5842
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5845
#: brzlib/errors.py:2027
5845
#: breezy/errors.py:2027
5847
5847
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5850
#: brzlib/errors.py:2057
5850
#: breezy/errors.py:2057
5851
5851
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5854
#: brzlib/errors.py:2065
5854
#: breezy/errors.py:2065
5855
5855
msgid "Nothing to merge."
5858
#: brzlib/errors.py:2070
5858
#: breezy/errors.py:2070
5859
5859
msgid "Format %(format)s cannot be initialised by this version of brz."
5862
#: brzlib/errors.py:2079
5862
#: breezy/errors.py:2079
5864
5864
"Cannot convert from format %(from_format)s to format %(format)s. "
5868
#: brzlib/errors.py:2091
5868
#: breezy/errors.py:2091
5869
5869
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5872
#: brzlib/errors.py:2099
5872
#: breezy/errors.py:2099
5873
5873
msgid "%(exe_name)s could not be found on this machine"
5876
#: brzlib/errors.py:2107
5876
#: breezy/errors.py:2107
5877
5877
msgid "Diff is not installed on this machine: %(msg)s"
5880
#: brzlib/errors.py:2115
5880
#: breezy/errors.py:2115
5881
5881
msgid "Diff3 is not installed on this machine."
5884
#: brzlib/errors.py:2121
5884
#: breezy/errors.py:2121
5885
5885
msgid "The content being inserted is already present."
5888
#: brzlib/errors.py:2126
5888
#: breezy/errors.py:2126
5890
5890
"This tree contains left-over files from a failed operation.\n"
5891
5891
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5908
5908
" keep, and delete it when you are done."
5911
#: brzlib/errors.py:2158
5911
#: breezy/errors.py:2158
5913
5913
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5914
5914
"examine %(pending_deletion)s to see if it contains any files you wish to "
5915
5915
"keep, and delete it when you are done."
5918
#: brzlib/errors.py:2168
5918
#: breezy/errors.py:2168
5919
5919
msgid "Working tree is out of date, please run 'brz update'.%(more)s"
5922
#: brzlib/errors.py:2182
5922
#: breezy/errors.py:2182
5923
5923
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5926
#: brzlib/errors.py:2195
5926
#: breezy/errors.py:2195
5927
5927
msgid "Error in merge modified format"
5930
#: brzlib/errors.py:2200
5930
#: breezy/errors.py:2200
5931
5931
msgid "Format error in conflict listings"
5934
#: brzlib/errors.py:2204
5934
#: breezy/errors.py:2204
5936
5936
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5937
5937
"Error: %(description)s"
5940
#: brzlib/errors.py:2215
5940
#: breezy/errors.py:2215
5942
5942
"An error has been detected in the repository %(repo_path)s.\n"
5943
5943
"Please run brz reconcile on this repository."
5946
#: brzlib/errors.py:2226
5946
#: breezy/errors.py:2226
5948
5948
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5949
5949
"reason: %(reason)s"
5952
#: brzlib/errors.py:2239
5952
#: breezy/errors.py:2239
5954
5954
"An inconsistent delta was supplied: %(delta)r\n"
5955
5955
"reason: %(reason)s"
5958
#: brzlib/errors.py:2251
5958
#: breezy/errors.py:2251
5959
5959
msgid "To use this feature you must upgrade your branch at %(path)s."
5962
#: brzlib/errors.py:2260
5962
#: breezy/errors.py:2260
5963
5963
msgid "To use this feature you must upgrade your repository at %(path)s."
5966
#: brzlib/errors.py:2265
5966
#: breezy/errors.py:2265
5968
5968
"To use this feature you must upgrade your branch at %(path)s to a format "
5969
5969
"which supports rich roots."
5972
#: brzlib/errors.py:2271
5972
#: breezy/errors.py:2271
5973
5973
msgid "Cannot perform local-only commits on unbound branches."
5976
#: brzlib/errors.py:2276
5976
#: breezy/errors.py:2276
5977
5977
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5980
#: brzlib/errors.py:2297
5980
#: breezy/errors.py:2297
5981
5981
msgid "Ghost tags not supported by format %(format)r."
5984
#: brzlib/errors.py:2305
5984
#: breezy/errors.py:2305
5985
5985
msgid "File is binary but should be text."
5988
#: brzlib/errors.py:2310
5988
#: breezy/errors.py:2310
5989
5989
msgid "The path %(path)s is not permitted on this platform"
5992
#: brzlib/errors.py:2319
5992
#: breezy/errors.py:2319
5994
5994
"Testament did not match expected value.\n"
5995
5995
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5996
5996
" {%(measured)s}"
5999
#: brzlib/errors.py:2331
5999
#: breezy/errors.py:2331
6000
6000
msgid "Not a bzr revision-bundle: %(text)r"
6003
#: brzlib/errors.py:2340
6003
#: breezy/errors.py:2340
6004
6004
msgid "Bad bzr revision-bundle: %(text)r"
6007
#: brzlib/errors.py:2349
6007
#: breezy/errors.py:2349
6008
6008
msgid "Malformed bzr revision-bundle header: %(text)r"
6011
#: brzlib/errors.py:2354
6011
#: breezy/errors.py:2354
6012
6012
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6015
#: brzlib/errors.py:2359
6015
#: breezy/errors.py:2359
6016
6016
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6019
#: brzlib/errors.py:2364
6019
#: breezy/errors.py:2364
6020
6020
msgid "End of line marker was not \\n in bzr revision-bundle"
6023
#: brzlib/errors.py:2374
6023
#: breezy/errors.py:2374
6024
6024
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6027
#: brzlib/errors.py:2384
6027
#: breezy/errors.py:2384
6028
6028
msgid "Root class for inventory serialization errors"
6031
#: brzlib/errors.py:2388
6031
#: breezy/errors.py:2388
6033
6033
"The inventory was not in the expected format:\n"
6037
#: brzlib/errors.py:2397
6037
#: breezy/errors.py:2397
6038
6038
msgid "This operation requires rich root data storage"
6041
#: brzlib/errors.py:2410
6041
#: breezy/errors.py:2410
6042
6042
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6045
#: brzlib/errors.py:2419
6045
#: breezy/errors.py:2419
6047
6047
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6051
#: brzlib/errors.py:2426
6051
#: breezy/errors.py:2426
6053
6053
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6054
6054
"ghost at {%(ghost_revision_id)s}"
6057
#: brzlib/errors.py:2436
6057
#: breezy/errors.py:2436
6058
6058
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6061
#: brzlib/errors.py:2487
6061
#: breezy/errors.py:2487
6063
6063
"A merge directive must provide either a bundle or a public branch location."
6066
#: brzlib/errors.py:2494
6066
#: breezy/errors.py:2494
6067
6067
msgid "Bad merge directive payload %(start)r"
6070
#: brzlib/errors.py:2504
6070
#: breezy/errors.py:2504
6071
6071
msgid "Preview patch does not match requested changes."
6074
#: brzlib/errors.py:2510
6074
#: breezy/errors.py:2510
6075
6075
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6078
#: brzlib/errors.py:2520
6078
#: breezy/errors.py:2520
6080
6080
"Your branch does not have all of the revisions required in order to merge "
6081
6081
"this merge directive and the target location specified in the merge "
6082
6082
"directive is not a branch: %(location)s."
6085
#: brzlib/errors.py:2532
6085
#: breezy/errors.py:2532
6086
6086
msgid "Unsupported entry kind %(kind)s"
6089
#: brzlib/errors.py:2540
6089
#: breezy/errors.py:2540
6090
6090
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6093
#: brzlib/errors.py:2550
6093
#: breezy/errors.py:2550
6094
6094
msgid "Subsume target %(other_tree)s needs to be upgraded."
6097
#: brzlib/errors.py:2569
6097
#: breezy/errors.py:2569
6098
6098
msgid "No such tag: %(tag_name)s"
6101
#: brzlib/errors.py:2577
6101
#: breezy/errors.py:2577
6102
6102
msgid "Tags not supported by %(branch)s; you may be able to use brz upgrade."
6105
#: brzlib/errors.py:2586
6105
#: breezy/errors.py:2586
6106
6106
msgid "Tag %(tag_name)s already exists."
6109
#: brzlib/errors.py:2594
6109
#: breezy/errors.py:2594
6111
6111
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"brz help bugs"
6112
6112
"\" for more information on this feature."
6115
#: brzlib/errors.py:2604
6115
#: breezy/errors.py:2604
6117
6117
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6120
#: brzlib/errors.py:2614
6120
#: breezy/errors.py:2614
6122
6122
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6125
#: brzlib/errors.py:2624
6125
#: breezy/errors.py:2624
6126
6126
msgid "Invalid line in bugs property: '%(line)s'"
6129
#: brzlib/errors.py:2632
6129
#: breezy/errors.py:2632
6130
6130
msgid "Invalid bug status: '%(status)s'"
6133
#: brzlib/errors.py:2640
6133
#: breezy/errors.py:2640
6134
6134
msgid "Could not understand response from smart server: %(response_tuple)r"
6137
#: brzlib/errors.py:2679
6137
#: breezy/errors.py:2679
6138
6138
msgid "Server sent an unexpected error: %(error_tuple)r"
6141
#: brzlib/errors.py:2698
6141
#: breezy/errors.py:2698
6142
6142
msgid "Unrecognised container format: %(container_format)r"
6145
#: brzlib/errors.py:2706
6145
#: breezy/errors.py:2706
6146
6146
msgid "Unexpected end of container stream"
6149
#: brzlib/errors.py:2711
6149
#: breezy/errors.py:2711
6150
6150
msgid "Unknown record type: %(record_type)r"
6153
#: brzlib/errors.py:2719
6153
#: breezy/errors.py:2719
6154
6154
msgid "Invalid record: %(reason)s"
6157
#: brzlib/errors.py:2727
6157
#: breezy/errors.py:2727
6158
6158
msgid "Container has data after end marker: %(excess)r"
6161
#: brzlib/errors.py:2735
6161
#: breezy/errors.py:2735
6162
6162
msgid "Container has multiple records with the same name: %(name)s"
6165
#: brzlib/errors.py:2748
6165
#: breezy/errors.py:2748
6166
6166
msgid "Corrupt or incompatible data stream: %(reason)s"
6169
#: brzlib/errors.py:2756
6169
#: breezy/errors.py:2756
6170
6170
msgid "SMTP error: %(error)s"
6173
#: brzlib/errors.py:2764
6173
#: breezy/errors.py:2764
6174
6174
msgid "No message supplied."
6177
#: brzlib/errors.py:2769
6177
#: breezy/errors.py:2769
6178
6178
msgid "No mail-to address (--mail-to) or output (-o) specified."
6181
#: brzlib/errors.py:2774
6181
#: breezy/errors.py:2774
6183
6183
"Unable to find mail client with the following names: "
6184
6184
"%(mail_command_list_string)s"
6187
#: brzlib/errors.py:2784
6187
#: breezy/errors.py:2784
6188
6188
msgid "SMTP connection to %(host)s refused"
6191
#: brzlib/errors.py:2793
6191
#: breezy/errors.py:2793
6192
6192
msgid "Please specify smtp_server. No server at default %(host)s."
6195
#: brzlib/errors.py:2807
6195
#: breezy/errors.py:2807
6197
6197
"'%(display_url)s' is not in sync with %(target_url)s. See brz help sync-for-"
6201
#: brzlib/errors.py:2819
6201
#: breezy/errors.py:2819
6202
6202
msgid "'%(display_url)s' is already a branch."
6205
#: brzlib/errors.py:2824
6205
#: breezy/errors.py:2824
6206
6206
msgid "'%(display_url)s' is already a tree."
6209
#: brzlib/errors.py:2829
6209
#: breezy/errors.py:2829
6210
6210
msgid "'%(display_url)s' is already a checkout."
6213
#: brzlib/errors.py:2834
6213
#: breezy/errors.py:2834
6214
6214
msgid "'%(display_url)s' is already a lightweight checkout."
6217
#: brzlib/errors.py:2839
6217
#: breezy/errors.py:2839
6218
6218
msgid "'%(display_url)s' is already using a shared repository."
6221
#: brzlib/errors.py:2844
6221
#: breezy/errors.py:2844
6222
6222
msgid "'%(display_url)s' is already standalone."
6225
#: brzlib/errors.py:2849
6225
#: breezy/errors.py:2849
6226
6226
msgid "Shared repository '%(display_url)s' already creates working trees."
6229
#: brzlib/errors.py:2855
6229
#: breezy/errors.py:2855
6231
6231
"Shared repository '%(display_url)s' already doesn't create working trees."
6234
#: brzlib/errors.py:2861
6234
#: breezy/errors.py:2861
6235
6235
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6238
#: brzlib/errors.py:2866
6238
#: breezy/errors.py:2866
6239
6239
msgid "No location could be found to bind to at %(display_url)s."
6242
#: brzlib/errors.py:2871
6242
#: breezy/errors.py:2871
6244
6244
"Working tree \"%(display_url)s\" has uncommitted changes (See brz status)."
6248
#: brzlib/errors.py:2890
6248
#: breezy/errors.py:2890
6250
6250
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6253
#: brzlib/errors.py:2905
6253
#: breezy/errors.py:2905
6255
6255
"Working tree \"%(display_url)s\" has shelved changes (See brz shelve --list)."
6259
#: brzlib/errors.py:2911
6259
#: breezy/errors.py:2911
6260
6260
msgid "Variable {%(name)s} is not available."
6263
#: brzlib/errors.py:2919
6263
#: breezy/errors.py:2919
6264
6264
msgid "No template specified."
6267
#: brzlib/errors.py:2924
6267
#: breezy/errors.py:2924
6268
6268
msgid "Unable to create symlink %(path_str)son this platform"
6271
#: brzlib/errors.py:2939
6271
#: breezy/errors.py:2939
6273
6273
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6274
6274
"\", \"local\"."
6277
#: brzlib/errors.py:2973
6277
#: breezy/errors.py:2973
6279
6279
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6282
#: brzlib/errors.py:2985
6282
#: breezy/errors.py:2985
6283
6283
msgid "The \"%(config_id)s\" configuration does not exist."
6286
#: brzlib/errors.py:2993
6286
#: breezy/errors.py:2993
6287
6287
msgid "The \"%(option_name)s\" configuration option does not exist."
6290
#: brzlib/errors.py:3001
6290
#: breezy/errors.py:3001
6291
6291
msgid "The alias \"%(alias_name)s\" does not exist."
6294
#: brzlib/errors.py:3015
6294
#: breezy/errors.py:3015
6295
6295
msgid "\"%(alias_name)s\" is not a valid location alias."
6298
#: brzlib/errors.py:3023
6298
#: breezy/errors.py:3023
6299
6299
msgid "No %(alias_name)s location assigned."
6302
#: brzlib/errors.py:3031
6302
#: breezy/errors.py:3031
6303
6303
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6306
#: brzlib/errors.py:3041
6306
#: breezy/errors.py:3041
6307
6307
msgid "Unknown rules detected: %(unknowns_str)s."
6310
#: brzlib/errors.py:3052
6310
#: breezy/errors.py:3052
6311
6311
msgid "Tip change rejected: %(msg)s"
6314
#: brzlib/errors.py:3060
6314
#: breezy/errors.py:3060
6315
6315
msgid "Shelf corrupt."
6318
#: brzlib/errors.py:3065
6318
#: breezy/errors.py:3065
6319
6319
msgid "Corruption while decompressing repository file%(orig_error)s"
6322
#: brzlib/errors.py:3077
6322
#: breezy/errors.py:3077
6323
6323
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6326
#: brzlib/errors.py:3085
6326
#: breezy/errors.py:3085
6327
6327
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6330
#: brzlib/errors.py:3093
6330
#: breezy/errors.py:3093
6331
6331
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6334
#: brzlib/errors.py:3101
6334
#: breezy/errors.py:3101
6335
6335
msgid "The user aborted the operation."
6338
#: brzlib/errors.py:3106
6338
#: breezy/errors.py:3106
6339
6339
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6342
#: brzlib/errors.py:3116
6342
#: breezy/errors.py:3116
6343
6343
msgid "No such view: %(view_name)s."
6346
#: brzlib/errors.py:3126
6346
#: breezy/errors.py:3126
6348
6348
"Views are not supported by %(tree)s; use 'brz upgrade' to change your tree "
6349
6349
"to a later format."
6352
#: brzlib/errors.py:3135
6352
#: breezy/errors.py:3135
6354
6354
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6357
#: brzlib/errors.py:3202
6357
#: breezy/errors.py:3202
6358
6358
msgid "%(bzrdir)r does not support co-located branches."
6361
#: brzlib/errors.py:3208
6361
#: breezy/errors.py:3208
6363
6363
"Unable to determine your name.\n"
6364
6364
"Please, set your name with the 'whoami' command.\n"
6365
6365
"E.g. brz whoami \"Your Name <name@example.com>\""
6368
#: brzlib/errors.py:3217
6368
#: breezy/errors.py:3217
6369
6369
msgid "Invalid pattern(s) found. %(msg)s"
6372
#: brzlib/errors.py:3225
6372
#: breezy/errors.py:3225
6374
6374
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `brz "
6375
6375
"unbind` to fix."
6378
#: brzlib/errors.py:3236
6378
#: breezy/errors.py:3236
6379
6379
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6382
#: brzlib/errors.py:3245
6382
#: breezy/errors.py:3245
6383
6383
msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"."
6386
#: brzlib/errors.py:3254
6386
#: breezy/errors.py:3254
6387
6387
msgid "Option \"%(name)s\" is not allowed."
6390
#: brzlib/errors.py:3262
6390
#: breezy/errors.py:3262
6392
6392
"No compatible object available for operations from %(source)r to %(target)r."
6395
#: brzlib/errors.py:3272
6395
#: breezy/errors.py:3272
6397
6397
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6398
6398
"%(arguments)s."
6401
#: brzlib/errors.py:3282
6401
#: breezy/errors.py:3282
6403
6403
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6404
6404
"format %(format)r"
6407
#: brzlib/errors.py:3294
6407
#: breezy/errors.py:3294
6409
6409
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6413
#: brzlib/errors.py:3307
6413
#: breezy/errors.py:3307
6414
6414
msgid "Binary files section encountered."
6417
#: brzlib/errors.py:3315
6417
#: breezy/errors.py:3315
6419
6419
"Malformed patch header. %(desc)s\n"
6423
#: brzlib/errors.py:3324
6423
#: breezy/errors.py:3324
6425
6425
"Malformed hunk header. %(desc)s\n"
6429
#: brzlib/errors.py:3333
6429
#: breezy/errors.py:3333
6431
6431
"Malformed line. %(desc)s\n"
6435
#: brzlib/errors.py:3343
6435
#: breezy/errors.py:3343
6437
6437
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6438
6438
"but patch says it should be \"%(patch_line)s\""
6441
#: brzlib/errors.py:3354
6441
#: breezy/errors.py:3354
6442
6442
msgid "The feature %(feature)s has already been registered."
6445
#: brzlib/errors.py:3362
6445
#: breezy/errors.py:3362
6447
6447
"Cannot store uncommitted changes because this branch already stores "
6448
6448
"uncommitted changes."
6451
#: brzlib/export_pot.py:252
6451
#: breezy/export_pot.py:252
6452
6452
#, python-format
6453
6453
msgid "Exporting messages from builtin command: %s"
6456
#: brzlib/export_pot.py:271
6456
#: breezy/export_pot.py:271
6457
6457
#, python-brace-format
6458
6458
msgid "Exporting messages from plugin command: {0} in {1}"
6461
#: brzlib/export_pot.py:292
6461
#: breezy/export_pot.py:292
6462
6462
#, python-format
6463
6463
msgid "Exporting message from error: %s"
6466
#: brzlib/fetch.py:98
6466
#: breezy/fetch.py:98
6467
6467
msgid "Finding revisions"
6470
#: brzlib/fetch.py:103
6470
#: breezy/fetch.py:103
6471
6471
msgid "Fetching revisions"
6474
#: brzlib/foreign.py:262
6474
#: breezy/foreign.py:262
6475
6475
msgid "Push into a different VCS without any custom bzr metadata."
6478
#: brzlib/foreign.py:264
6478
#: breezy/foreign.py:264
6480
6480
"This will afterwards rebase the local branch on the remote\n"
6481
6481
"branch unless the --no-rebase option is used, in which case \n"
6485
6485
# help of 'no-rebase' option of 'dpush' command
6486
#: brzlib/foreign.py:277
6486
#: breezy/foreign.py:277
6487
6487
msgid "Do not rebase after push."
6490
#: brzlib/foreign.py:311
6490
#: breezy/foreign.py:311
6491
6491
#, python-format
6492
6492
msgid "Using saved location: %s\n"
6495
#: brzlib/foreign.py:321
6495
#: breezy/foreign.py:321
6497
6497
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6498
6498
"regular push."
6501
#: brzlib/gpg.py:358
6501
#: breezy/gpg.py:358
6502
6502
#, python-brace-format
6503
6503
msgid "No GnuPG key results for pattern: {0}"
6506
#: brzlib/gpg.py:431
6506
#: breezy/gpg.py:431
6507
6507
#, python-brace-format
6508
6508
msgid "{0} commits with valid signatures"
6511
#: brzlib/gpg.py:437
6511
#: breezy/gpg.py:437
6512
6512
#, python-brace-format
6513
6513
msgid "{0} commit with unknown key"
6514
6514
msgid_plural "{0} commits with unknown keys"
6518
#: brzlib/gpg.py:445
6518
#: breezy/gpg.py:445
6519
6519
#, python-brace-format
6520
6520
msgid "{0} commit not valid"
6521
6521
msgid_plural "{0} commits not valid"
6525
#: brzlib/gpg.py:453
6525
#: breezy/gpg.py:453
6526
6526
#, python-brace-format
6527
6527
msgid "{0} commit not signed"
6528
6528
msgid_plural "{0} commits not signed"
6532
#: brzlib/gpg.py:461
6532
#: breezy/gpg.py:461
6533
6533
#, python-brace-format
6534
6534
msgid "{0} commit with key now expired"
6535
6535
msgid_plural "{0} commits with key now expired"
6539
#: brzlib/gpg.py:481
6539
#: breezy/gpg.py:481
6540
6540
#, python-brace-format
6541
6541
msgid "{0} commit by author {1} with key {2} now expired"
6542
6542
msgid_plural "{0} commits by author {1} with key {2} now expired"
6546
#: brzlib/gpg.py:497
6546
#: breezy/gpg.py:497
6547
6547
#, python-brace-format
6548
6548
msgid "{0} signed {1} commit"
6549
6549
msgid_plural "{0} signed {1} commits"
6553
#: brzlib/gpg.py:514 brzlib/gpg.py:531
6553
#: breezy/gpg.py:514 breezy/gpg.py:531
6554
6554
#, python-brace-format
6555
6555
msgid "{0} commit by author {1}"
6556
6556
msgid_plural "{0} commits by author {1}"
6560
#: brzlib/gpg.py:546
6560
#: breezy/gpg.py:546
6561
6561
#, python-brace-format
6562
6562
msgid "Unknown key {0} signed {1} commit"
6563
6563
msgid_plural "Unknown key {0} signed {1} commits"
6567
#: brzlib/groupcompress.py:1739
6567
#: breezy/groupcompress.py:1739
6568
6568
#, python-format
6569
6569
msgid "Insert claimed random_id=True, but then inserted %r two times"
6572
#: brzlib/hooks.py:313
6572
#: breezy/hooks.py:313
6573
6573
#, python-format
6574
6574
msgid "Introduced in: %s"
6577
#: brzlib/hooks.py:316
6577
#: breezy/hooks.py:316
6578
6578
#, python-format
6579
6579
msgid "Deprecated in: %s"
6582
#: brzlib/knit.py:1766 brzlib/knit.py:1802
6582
#: breezy/knit.py:1766 breezy/knit.py:1802
6583
6583
msgid "Walking content"
6586
#: brzlib/knit.py:3330
6586
#: breezy/knit.py:3330
6587
6587
msgid "annotating"
6590
#: brzlib/lock.py:549
6590
#: breezy/lock.py:549
6591
6591
msgid "{0!r} was {1} locked again"
6594
#: brzlib/lockdir.py:321
6594
#: breezy/lockdir.py:321
6595
6595
#, python-format
6596
6596
msgid "error removing pending lock: %s"
6599
#: brzlib/lockdir.py:616
6599
#: breezy/lockdir.py:616
6600
6600
msgid "Unable to obtain"
6603
#: brzlib/lockdir.py:618
6603
#: breezy/lockdir.py:618
6604
6604
msgid "Lock owner changed for"
6607
#: brzlib/lockdir.py:620
6607
#: breezy/lockdir.py:620
6608
6608
#, python-brace-format
6609
6609
msgid "{0} lock {1} {2}."
6612
#: brzlib/lockdir.py:627
6612
#: breezy/lockdir.py:627
6613
6613
#, python-format
6614
6614
msgid "Will continue to try until %s, unless you press Ctrl-C."
6617
#: brzlib/lockdir.py:629
6617
#: breezy/lockdir.py:629
6618
6618
msgid "See \"bzr help break-lock\" for more."
6621
#: brzlib/lockdir.py:739
6621
#: breezy/lockdir.py:739
6622
6622
#, python-format
6624
6624
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6627
#: brzlib/log.py:563
6627
#: breezy/log.py:563
6628
6628
msgid "--exclude-common-ancestry requires two different revisions"
6631
#: brzlib/log.py:565
6631
#: breezy/log.py:565
6632
6632
#, python-format
6633
6633
msgid "invalid direction %r"
6636
#: brzlib/log.py:653
6636
#: breezy/log.py:653
6637
6637
msgid "Start revision not found in history of end revision."
6640
#: brzlib/log.py:1071 brzlib/log.py:1129
6640
#: breezy/log.py:1071 breezy/log.py:1129
6641
6641
msgid "Logging revision 0 is invalid."
6644
#: brzlib/log.py:1073 brzlib/log.py:1131
6644
#: breezy/log.py:1073 breezy/log.py:1131
6645
6645
msgid "Start revision must be older than the end revision."
6648
#: brzlib/log.py:1818
6648
#: breezy/log.py:1818
6649
6649
#, python-format
6650
6650
msgid "unknown log formatter: %r"
6653
#: brzlib/log.py:2114
6653
#: breezy/log.py:2114
6654
6654
msgid "fixes bug"
6655
6655
msgid_plural "fixes bugs"
6659
#: brzlib/merge.py:689
6659
#: breezy/merge.py:689
6660
6660
msgid "All changes applied successfully."
6663
#: brzlib/merge.py:691
6663
#: breezy/merge.py:691
6664
6664
#, python-format
6665
6665
msgid "%d conflicts encountered."
6668
#: brzlib/merge.py:845 brzlib/merge.py:1868
6668
#: breezy/merge.py:845 breezy/merge.py:1868
6669
6669
msgid "Preparing file merge"
6672
#: brzlib/multiparent.py:426
6672
#: breezy/multiparent.py:426
6673
6673
msgid "Importing revisions"
6676
6676
# help of 'help' option
6677
#: brzlib/option.py:526
6677
#: breezy/option.py:526
6678
6678
msgid "Show help message."
6681
6681
# help of 'quiet' option
6682
#: brzlib/option.py:528
6682
#: breezy/option.py:528
6683
6683
msgid "Only display errors and warnings."
6686
6686
# help of 'usage' option
6687
#: brzlib/option.py:531
6687
#: breezy/option.py:531
6688
6688
msgid "Show usage message and options."
6691
6691
# help of 'verbose' option
6692
#: brzlib/option.py:533
6692
#: breezy/option.py:533
6693
6693
msgid "Display more information."
6696
6696
# help of 'change' option
6697
#: brzlib/option.py:541
6697
#: breezy/option.py:541
6699
6699
"Select changes introduced by the specified revision. See also \"help "
6700
6700
"revisionspec\"."
6703
6703
# help of 'directory' option
6704
#: brzlib/option.py:543
6704
#: breezy/option.py:543
6705
6705
msgid "Branch to operate on, instead of working directory."
6708
6708
# help of 'log-format=long' option
6709
#: brzlib/option.py:545
6709
#: breezy/option.py:545
6710
6710
msgid "Detailed log format."
6713
6713
# help of 'log-format=gnu-changelog' option
6714
#: brzlib/option.py:545
6714
#: breezy/option.py:545
6715
6715
msgid "Format used by GNU ChangeLog files."
6718
6718
# help of 'log-format=line' option
6719
#: brzlib/option.py:545
6719
#: breezy/option.py:545
6720
6720
msgid "Log format with one line per revision."
6723
6723
# help of 'log-format=short' option
6724
#: brzlib/option.py:545
6724
#: breezy/option.py:545
6725
6725
msgid "Moderately short log format."
6728
6728
# help of 'log-format' option
6729
#: brzlib/option.py:545
6729
#: breezy/option.py:545
6730
6730
msgid "Use specified log format."
6733
6733
# title of 'log-format' option
6734
#: brzlib/option.py:547
6734
#: breezy/option.py:547
6735
6735
msgid "Log format"
6738
6738
# help of 'merge-type=lca' option
6739
#: brzlib/option.py:549
6739
#: breezy/option.py:549
6740
6740
msgid "LCA-newness merge."
6743
6743
# help of 'merge-type=diff3' option
6744
#: brzlib/option.py:549
6744
#: breezy/option.py:549
6745
6745
msgid "Merge using external diff3."
6748
6748
# help of 'merge-type=merge3' option
6749
#: brzlib/option.py:549
6749
#: breezy/option.py:549
6750
6750
msgid "Native diff3-style merge."
6753
6753
# help of 'merge-type' option
6754
#: brzlib/option.py:549
6754
#: breezy/option.py:549
6755
6755
msgid "Select a particular merge algorithm."
6758
6758
# help of 'merge-type=weave' option
6759
#: brzlib/option.py:549
6759
#: breezy/option.py:549
6760
6760
msgid "Weave-based merge."
6763
6763
# title of 'merge-type' option
6764
#: brzlib/option.py:551
6764
#: breezy/option.py:551
6765
6765
msgid "Merge algorithm"
6768
6768
# help of 'message' option
6769
#: brzlib/option.py:554
6769
#: breezy/option.py:554
6770
6770
msgid "Message string."
6773
6773
# help of 'null' option
6774
#: brzlib/option.py:556
6774
#: breezy/option.py:556
6775
6775
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6778
6778
# help of 'overwrite' option
6779
#: brzlib/option.py:558
6779
#: breezy/option.py:558
6780
6780
msgid "Ignore differences between branches and overwrite unconditionally."
6783
6783
# help of 'remember' option
6784
#: brzlib/option.py:560
6784
#: breezy/option.py:560
6785
6785
msgid "Remember the specified location as a default."
6788
6788
# help of 'reprocess' option
6789
#: brzlib/option.py:562
6789
#: breezy/option.py:562
6790
6790
msgid "Reprocess to reduce spurious conflicts."
6793
6793
# help of 'revision' option
6794
#: brzlib/option.py:566
6794
#: breezy/option.py:566
6795
6795
msgid "See \"help revisionspec\" for details."
6798
6798
# help of 'show-ids' option
6799
#: brzlib/option.py:568
6799
#: breezy/option.py:568
6800
6800
msgid "Show internal object ids."
6803
6803
# help of 'timezone' option
6804
#: brzlib/option.py:571
6804
#: breezy/option.py:571
6805
6805
msgid "Display timezone as local, original, or utc."
6808
#: brzlib/osutils.py:101
6808
#: breezy/osutils.py:101
6809
6809
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6812
#: brzlib/osutils.py:221
6812
#: breezy/osutils.py:221
6813
6813
msgid "lstat/stat of ({0!r}): {1!r}"
6816
#: brzlib/osutils.py:1041 brzlib/osutils.py:1052
6816
#: breezy/osutils.py:1041 breezy/osutils.py:1052
6817
6817
#, python-format
6818
6818
msgid "sorry, %r not allowed in path"
6821
#: brzlib/osutils.py:1270
6821
#: breezy/osutils.py:1270
6822
6822
#, python-format
6823
6823
msgid "%r is too short to calculate a relative path"
6826
#: brzlib/plugin.py:143
6826
#: breezy/plugin.py:143
6827
6827
#, python-format
6828
6828
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6831
6831
# help of 'plugin' option of 'bash-completion' command
6832
#: brzlib/plugins/bash_completion/bashcomp.py:411
6832
#: breezy/plugins/bash_completion/bashcomp.py:411
6833
6833
msgid "Enable completions for the selected plugin (default: all plugins)"
6836
#: brzlib/plugins/bash_completion/bashcomp.py:412
6836
#: breezy/plugins/bash_completion/bashcomp.py:412
6837
6837
msgid "Generate a shell function for bash command line completion."
6840
#: brzlib/plugins/bash_completion/bashcomp.py:414
6840
#: breezy/plugins/bash_completion/bashcomp.py:414
6842
6842
"This command generates a shell function which can be used by bash to\n"
6843
6843
"automatically complete the currently typed command when the user presses\n"
6844
6844
"the completion key (usually tab)."
6847
#: brzlib/plugins/bash_completion/bashcomp.py:418
6847
#: breezy/plugins/bash_completion/bashcomp.py:418
6849
6849
"Commonly used like this:\n"
6850
6850
" eval \"`brz bash-completion`\""
6853
6853
# help of 'function-name' option of 'bash-completion' command
6854
#: brzlib/plugins/bash_completion/bashcomp.py:424
6854
#: breezy/plugins/bash_completion/bashcomp.py:424
6855
6855
msgid "Name of the generated function (default: _brz)"
6858
6858
# help of 'function-only' option of 'bash-completion' command
6859
#: brzlib/plugins/bash_completion/bashcomp.py:426
6859
#: breezy/plugins/bash_completion/bashcomp.py:426
6860
6860
msgid "Generate only the shell function, don't enable it"
6863
#: brzlib/plugins/grep/cmds.py:77
6863
#: breezy/plugins/grep/cmds.py:77
6864
6864
msgid "Print lines matching PATTERN for specified files and revisions."
6867
#: brzlib/plugins/grep/cmds.py:79
6867
#: breezy/plugins/grep/cmds.py:79
6869
6869
"This command searches the specified files and revisions for a given\n"
6870
6870
"pattern. The pattern is specified as a Python regular expressions[1]."
6873
#: brzlib/plugins/grep/cmds.py:82
6873
#: breezy/plugins/grep/cmds.py:82
6875
6875
"If the file name is not specified, the revisions starting with the\n"
6876
6876
"current directory are searched recursively. If the revision number is\n"
6900
6900
"pattern is not a regular expression."
6903
#: brzlib/plugins/grep/cmds.py:100
6903
#: breezy/plugins/grep/cmds.py:100
6904
6904
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6907
6907
# help of 'color' option of 'grep' command
6908
#: brzlib/plugins/grep/cmds.py:109
6908
#: breezy/plugins/grep/cmds.py:109
6909
6909
msgid "Show match in color. WHEN is never, always or auto."
6912
6912
# help of 'diff' option of 'grep' command
6913
#: brzlib/plugins/grep/cmds.py:111
6913
#: breezy/plugins/grep/cmds.py:111
6914
6914
msgid "Grep for pattern in changeset for each revision."
6917
6917
# help of 'exclude' option of 'grep' command
6918
#: brzlib/plugins/grep/cmds.py:113
6918
#: breezy/plugins/grep/cmds.py:113
6919
6919
msgid "Skip files whose base name matches GLOB."
6922
6922
# help of 'include' option of 'grep' command
6923
#: brzlib/plugins/grep/cmds.py:115
6923
#: breezy/plugins/grep/cmds.py:115
6924
6924
msgid "Search only files whose base name matches GLOB."
6927
6927
# help of 'files-with-matches' option of 'grep' command
6928
#: brzlib/plugins/grep/cmds.py:117
6928
#: breezy/plugins/grep/cmds.py:117
6929
6929
msgid "Print only the name of each input file in which PATTERN is found."
6932
6932
# help of 'files-without-match' option of 'grep' command
6933
#: brzlib/plugins/grep/cmds.py:120
6933
#: breezy/plugins/grep/cmds.py:120
6934
6934
msgid "Print only the name of each input file in which PATTERN is not found."
6937
6937
# help of 'fixed-string' option of 'grep' command
6938
#: brzlib/plugins/grep/cmds.py:123
6938
#: breezy/plugins/grep/cmds.py:123
6939
6939
msgid "Interpret PATTERN is a single fixed string (not regex)."
6942
6942
# help of 'from-root' option of 'grep' command
6943
#: brzlib/plugins/grep/cmds.py:125
6943
#: breezy/plugins/grep/cmds.py:125
6945
6945
"Search for pattern starting from the root of the branch. (implies --"
6949
6949
# help of 'ignore-case' option of 'grep' command
6950
#: brzlib/plugins/grep/cmds.py:128
6950
#: breezy/plugins/grep/cmds.py:128
6951
6951
msgid "ignore case distinctions while matching."
6954
6954
# help of 'levels' option of 'grep' command
6955
#: brzlib/plugins/grep/cmds.py:130
6955
#: breezy/plugins/grep/cmds.py:130
6957
6957
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6960
6960
# help of 'line-number' option of 'grep' command
6961
#: brzlib/plugins/grep/cmds.py:135
6961
#: breezy/plugins/grep/cmds.py:135
6962
6962
msgid "show 1-based line number."
6965
6965
# help of 'no-recursive' option of 'grep' command
6966
#: brzlib/plugins/grep/cmds.py:137
6966
#: breezy/plugins/grep/cmds.py:137
6967
6967
msgid "Don't recurse into subdirectories. (default is --recursive)"
6970
6970
# help of 'null' option of 'grep' command
6971
#: brzlib/plugins/grep/cmds.py:139
6971
#: breezy/plugins/grep/cmds.py:139
6973
6973
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6977
#: brzlib/plugins/launchpad/account.py:66
6977
#: breezy/plugins/launchpad/account.py:66
6978
6978
msgid "Setting ssh/sftp usernames for launchpad.net."
6981
#: brzlib/plugins/launchpad/cmds.py:43
6981
#: breezy/plugins/launchpad/cmds.py:43
6982
6982
msgid "Register a branch with launchpad.net."
6985
#: brzlib/plugins/launchpad/cmds.py:45
6985
#: breezy/plugins/launchpad/cmds.py:45
6987
6987
"This command lists a brz branch in the directory of branches on\n"
6988
6988
"launchpad.net. Registration allows the branch to be associated with\n"
6989
6989
"bugs or specifications."
6992
#: brzlib/plugins/launchpad/cmds.py:49
6992
#: breezy/plugins/launchpad/cmds.py:49
6994
6994
"Before using this command you must register the project to which the\n"
6995
6995
"branch belongs, and create an account for yourself on launchpad.net."
6998
#: brzlib/plugins/launchpad/cmds.py:52
6998
#: breezy/plugins/launchpad/cmds.py:52
7001
7001
" public_url: The publicly visible url for the branch to register.\n"
7017
7017
# help of 'project' option of 'register-branch' command
7018
#: brzlib/plugins/launchpad/cmds.py:68
7018
#: breezy/plugins/launchpad/cmds.py:68
7019
7019
msgid "Launchpad project short name to associate with the branch."
7022
7022
# help of 'branch-name' option of 'register-branch' command
7023
#: brzlib/plugins/launchpad/cmds.py:75
7023
#: breezy/plugins/launchpad/cmds.py:75
7025
7025
"Short name for the branch; by default taken from the last component of the "
7029
7029
# help of 'branch-title' option of 'register-branch' command
7030
#: brzlib/plugins/launchpad/cmds.py:79
7030
#: breezy/plugins/launchpad/cmds.py:79
7031
7031
msgid "One-sentence description of the branch."
7034
7034
# help of 'branch-description' option of 'register-branch' command
7035
#: brzlib/plugins/launchpad/cmds.py:82
7035
#: breezy/plugins/launchpad/cmds.py:82
7036
7036
msgid "Longer description of the purpose or contents of the branch."
7039
7039
# help of 'author' option of 'register-branch' command
7040
#: brzlib/plugins/launchpad/cmds.py:85
7040
#: breezy/plugins/launchpad/cmds.py:85
7041
7041
msgid "Branch author's email address, if not yourself."
7044
7044
# help of 'link-bug' option of 'register-branch' command
7045
#: brzlib/plugins/launchpad/cmds.py:88
7045
#: breezy/plugins/launchpad/cmds.py:88
7046
7046
msgid "The bug this branch fixes."
7049
7049
# help of 'dry-run' option of 'register-branch' command
7050
#: brzlib/plugins/launchpad/cmds.py:91
7050
#: breezy/plugins/launchpad/cmds.py:91
7051
7051
msgid "Prepare the request but don't actually send it."
7054
#: brzlib/plugins/launchpad/cmds.py:113
7054
#: breezy/plugins/launchpad/cmds.py:113
7056
7056
"register-branch requires a public branch url - see brz help register-branch."
7059
#: brzlib/plugins/launchpad/cmds.py:121
7059
#: breezy/plugins/launchpad/cmds.py:121
7060
7060
msgid "--product is deprecated; please use --project."
7063
#: brzlib/plugins/launchpad/cmds.py:151
7063
#: breezy/plugins/launchpad/cmds.py:151
7064
7064
msgid "Open a Launchpad branch page in your web browser."
7067
7067
# help of 'dry-run' option of 'launchpad-open' command
7068
#: brzlib/plugins/launchpad/cmds.py:156
7068
#: breezy/plugins/launchpad/cmds.py:156
7069
7069
msgid "Do not actually open the browser. Just say the URL we would use."
7072
#: brzlib/plugins/launchpad/cmds.py:191
7072
#: breezy/plugins/launchpad/cmds.py:191
7073
7073
#, python-format
7074
7074
msgid "Opening %s in web browser"
7077
#: brzlib/plugins/launchpad/cmds.py:199
7077
#: breezy/plugins/launchpad/cmds.py:199
7078
7078
msgid "Show or set the Launchpad user ID."
7081
#: brzlib/plugins/launchpad/cmds.py:201
7081
#: breezy/plugins/launchpad/cmds.py:201
7083
7083
"When communicating with Launchpad, some commands need to know your\n"
7084
7084
"Launchpad user ID. This command can be used to set or show the\n"
7085
7085
"user ID that Bazaar will use for such communication."
7088
#: brzlib/plugins/launchpad/cmds.py:205
7088
#: breezy/plugins/launchpad/cmds.py:205
7091
7091
" Show the Launchpad ID of the current user::"
7094
#: brzlib/plugins/launchpad/cmds.py:208
7094
#: breezy/plugins/launchpad/cmds.py:208
7095
7095
msgid " brz launchpad-login"
7098
#: brzlib/plugins/launchpad/cmds.py:210
7098
#: breezy/plugins/launchpad/cmds.py:210
7099
7099
msgid " Set the Launchpad ID of the current user to 'bob'::"
7102
#: brzlib/plugins/launchpad/cmds.py:212
7102
#: breezy/plugins/launchpad/cmds.py:212
7103
7103
msgid " brz launchpad-login bob"
7106
7106
# help of 'no-check' option of 'launchpad-login' command
7107
#: brzlib/plugins/launchpad/cmds.py:219
7107
#: breezy/plugins/launchpad/cmds.py:219
7108
7108
msgid "Don't check that the user name is valid."
7111
#: brzlib/plugins/launchpad/cmds.py:234 brzlib/plugins/launchpad/cmds.py:245
7111
#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245
7112
7112
msgid "Launchpad user ID exists and has SSH keys.\n"
7115
#: brzlib/plugins/launchpad/cmds.py:237
7115
#: breezy/plugins/launchpad/cmds.py:237
7116
7116
msgid "No Launchpad user ID configured.\n"
7119
#: brzlib/plugins/launchpad/cmds.py:248
7119
#: breezy/plugins/launchpad/cmds.py:248
7120
7120
#, python-format
7121
7121
msgid "Launchpad user ID set to '%s'.\n"
7124
#: brzlib/plugins/launchpad/cmds.py:254
7124
#: breezy/plugins/launchpad/cmds.py:254
7125
7125
msgid "Ask Launchpad to mirror a branch now."
7128
#: brzlib/plugins/launchpad/cmds.py:271
7128
#: breezy/plugins/launchpad/cmds.py:271
7129
7129
msgid "Propose merging a branch on Launchpad."
7132
#: brzlib/plugins/launchpad/cmds.py:273
7132
#: breezy/plugins/launchpad/cmds.py:273
7134
7134
"This will open your usual editor to provide the initial comment. When it\n"
7135
7135
"has created the proposal, it will open it in your default web browser."
7138
#: brzlib/plugins/launchpad/cmds.py:276
7138
#: breezy/plugins/launchpad/cmds.py:276
7140
7140
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7141
7141
"is not supplied, the remembered submit branch will be used. If no submit\n"
7142
7142
"branch is remembered, the development focus will be used."
7145
#: brzlib/plugins/launchpad/cmds.py:280
7145
#: breezy/plugins/launchpad/cmds.py:280
7147
7147
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7148
7148
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7150
7150
"may optionally be followed by '=' and the review type. For example:"
7153
#: brzlib/plugins/launchpad/cmds.py:285
7153
#: breezy/plugins/launchpad/cmds.py:285
7154
7154
msgid " brz lp-propose-merge --review jrandom --review review-team=qa"
7157
#: brzlib/plugins/launchpad/cmds.py:287
7157
#: breezy/plugins/launchpad/cmds.py:287
7159
7159
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7160
7160
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7163
7163
# help of 'staging' option of 'lp-propose-merge' command
7164
#: brzlib/plugins/launchpad/cmds.py:292
7164
#: breezy/plugins/launchpad/cmds.py:292
7165
7165
msgid "Propose the merge on staging."
7168
7168
# help of 'message' option of 'lp-propose-merge' command
7169
#: brzlib/plugins/launchpad/cmds.py:294
7169
#: breezy/plugins/launchpad/cmds.py:294
7170
7170
msgid "Commit message."
7173
7173
# help of 'approve' option of 'lp-propose-merge' command
7174
#: brzlib/plugins/launchpad/cmds.py:296
7174
#: breezy/plugins/launchpad/cmds.py:296
7176
7176
"Mark the proposal as approved immediately, setting the approved revision to "
7180
7180
# help of 'fixes' option of 'lp-propose-merge' command
7181
#: brzlib/plugins/launchpad/cmds.py:298
7181
#: breezy/plugins/launchpad/cmds.py:298
7182
7182
msgid "The bug this proposal fixes."
7185
7185
# help of 'review' option of 'lp-propose-merge' command
7186
#: brzlib/plugins/launchpad/cmds.py:300
7186
#: breezy/plugins/launchpad/cmds.py:300
7187
7187
msgid "Requested reviewer and optional type."
7190
#: brzlib/plugins/launchpad/cmds.py:335
7190
#: breezy/plugins/launchpad/cmds.py:335
7191
7191
msgid "Find the proposal to merge this revision."
7194
#: brzlib/plugins/launchpad/cmds.py:337
7194
#: breezy/plugins/launchpad/cmds.py:337
7196
7196
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7197
7197
"This works only if the if the merged_revno was recorded for the merge\n"
7198
7198
"proposal. The proposal(s) are opened in a web browser."
7201
#: brzlib/plugins/launchpad/cmds.py:341
7201
#: breezy/plugins/launchpad/cmds.py:341
7203
7203
"Only the revision specified is searched for. To find the mainline\n"
7204
7204
"revision that merged it into mainline, use the \"mainline\" revision spec."
7207
#: brzlib/plugins/launchpad/cmds.py:344
7207
#: breezy/plugins/launchpad/cmds.py:344
7208
7208
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7211
#: brzlib/plugins/launchpad/cmds.py:346
7211
#: breezy/plugins/launchpad/cmds.py:346
7212
7212
msgid " brz lp-find-proposal -r mainline:annotate:README:1"
7215
#: brzlib/plugins/launchpad/cmds.py:365
7215
#: breezy/plugins/launchpad/cmds.py:365
7216
7216
msgid "No review found."
7219
#: brzlib/plugins/launchpad/cmds.py:366
7219
#: breezy/plugins/launchpad/cmds.py:366
7220
7220
#, python-format
7221
7221
msgid "%d proposals(s) found."
7224
#: brzlib/plugins/launchpad/cmds.py:378
7224
#: breezy/plugins/launchpad/cmds.py:378
7225
7225
msgid "Finding proposals"
7228
#: brzlib/plugins/launchpad/lp_api.py:231
7229
#: brzlib/plugins/launchpad/lp_api.py:236
7228
#: breezy/plugins/launchpad/lp_api.py:231
7229
#: breezy/plugins/launchpad/lp_api.py:236
7230
7230
#, python-format
7231
7231
msgid "%s is not registered on Launchpad"
7234
#: brzlib/plugins/launchpad/lp_api.py:246
7234
#: breezy/plugins/launchpad/lp_api.py:246
7235
7235
#, python-format
7236
7236
msgid "%s has no development focus."
7239
#: brzlib/plugins/launchpad/lp_api.py:251
7239
#: breezy/plugins/launchpad/lp_api.py:251
7240
7240
#, python-format
7241
7241
msgid "development focus %s has no branch."
7244
#: brzlib/plugins/launchpad/lp_api.py:256
7244
#: breezy/plugins/launchpad/lp_api.py:256
7245
7245
#, python-format
7246
7246
msgid "source package %s has no branch."
7249
#: brzlib/plugins/launchpad/lp_api.py:260
7249
#: breezy/plugins/launchpad/lp_api.py:260
7250
7250
#, python-format
7251
7251
msgid "%s has no associated product or source package."
7254
#: brzlib/plugins/launchpad/lp_api.py:272
7254
#: breezy/plugins/launchpad/lp_api.py:272
7255
7255
#, python-format
7256
7256
msgid "%s is already up-to-date."
7259
#: brzlib/plugins/launchpad/lp_api.py:279
7259
#: breezy/plugins/launchpad/lp_api.py:279
7260
7260
#, python-format
7261
7261
msgid "Pushing to %s"
7264
#: brzlib/plugins/launchpad/lp_directory.py:170
7264
#: breezy/plugins/launchpad/lp_directory.py:170
7265
7265
#, python-brace-format
7267
7267
"resolution for {0}\n"
7272
#: brzlib/plugins/launchpad/lp_propose.py:161
7272
#: breezy/plugins/launchpad/lp_propose.py:161
7273
7273
#, python-format
7274
7274
msgid "There is already a branch merge proposal: %s"
7277
#: brzlib/plugins/weave_fmt/bzrdir.py:237
7277
#: breezy/plugins/weave_fmt/bzrdir.py:237
7278
7278
msgid "pb parameter to convert() is deprecated"
7281
#: brzlib/plugins/weave_fmt/bzrdir.py:240
7281
#: breezy/plugins/weave_fmt/bzrdir.py:240
7282
7282
msgid "starting upgrade from format 4 to 5"
7285
#: brzlib/plugins/weave_fmt/bzrdir.py:250
7285
#: breezy/plugins/weave_fmt/bzrdir.py:250
7286
7286
msgid "note: upgrade may be faster if all store files are ungzipped first"
7289
#: brzlib/plugins/weave_fmt/bzrdir.py:279
7289
#: breezy/plugins/weave_fmt/bzrdir.py:279
7290
7290
msgid "converting revision"
7293
#: brzlib/plugins/weave_fmt/bzrdir.py:284
7293
#: breezy/plugins/weave_fmt/bzrdir.py:284
7294
7294
msgid "upgraded to weaves:"
7297
#: brzlib/plugins/weave_fmt/bzrdir.py:285
7297
#: breezy/plugins/weave_fmt/bzrdir.py:285
7298
7298
#, python-format
7299
7299
msgid "%6d revisions and inventories"
7302
#: brzlib/plugins/weave_fmt/bzrdir.py:287
7302
#: breezy/plugins/weave_fmt/bzrdir.py:287
7303
7303
#, python-format
7304
7304
msgid "%6d revisions not present"
7307
#: brzlib/plugins/weave_fmt/bzrdir.py:289
7307
#: breezy/plugins/weave_fmt/bzrdir.py:289
7308
7308
#, python-format
7309
7309
msgid "%6d texts"
7312
#: brzlib/plugins/weave_fmt/bzrdir.py:325
7312
#: breezy/plugins/weave_fmt/bzrdir.py:325
7313
7313
msgid "writing weave"
7316
#: brzlib/plugins/weave_fmt/bzrdir.py:329
7317
#: brzlib/plugins/weave_fmt/bzrdir.py:331
7316
#: breezy/plugins/weave_fmt/bzrdir.py:329
7317
#: breezy/plugins/weave_fmt/bzrdir.py:331
7318
7318
msgid "inventory"
7321
#: brzlib/plugins/weave_fmt/bzrdir.py:348
7321
#: breezy/plugins/weave_fmt/bzrdir.py:348
7322
7322
msgid "write revision"
7325
#: brzlib/plugins/weave_fmt/bzrdir.py:362
7325
#: breezy/plugins/weave_fmt/bzrdir.py:362
7326
7326
msgid "loading revision"
7329
#: brzlib/plugins/weave_fmt/bzrdir.py:367
7329
#: breezy/plugins/weave_fmt/bzrdir.py:367
7330
7330
#, python-format
7331
7331
msgid "revision {%s} not present in branch; will be converted as a ghost"
7334
#: brzlib/plugins/weave_fmt/bzrdir.py:507
7334
#: breezy/plugins/weave_fmt/bzrdir.py:507
7335
7335
msgid "starting upgrade from format 5 to 6"
7338
#: brzlib/plugins/weave_fmt/bzrdir.py:517
7338
#: breezy/plugins/weave_fmt/bzrdir.py:517
7339
7339
#, python-format
7340
7340
msgid "adding prefixes to %s"
7343
#: brzlib/plugins/weave_fmt/bzrdir.py:557
7343
#: breezy/plugins/weave_fmt/bzrdir.py:557
7344
7344
msgid "starting upgrade from format 6 to metadir"
7347
#: brzlib/plugins/weave_fmt/bzrdir.py:565
7347
#: breezy/plugins/weave_fmt/bzrdir.py:565
7348
7348
msgid "Removing ancestry.weave"
7351
#: brzlib/plugins/weave_fmt/bzrdir.py:570
7351
#: breezy/plugins/weave_fmt/bzrdir.py:570
7352
7352
msgid "Finding branch files"
7355
#: brzlib/plugins/weave_fmt/bzrdir.py:580
7355
#: breezy/plugins/weave_fmt/bzrdir.py:580
7356
7356
msgid "Upgrading repository"
7359
#: brzlib/plugins/weave_fmt/bzrdir.py:590
7359
#: breezy/plugins/weave_fmt/bzrdir.py:590
7360
7360
msgid "Upgrading branch"
7363
#: brzlib/plugins/weave_fmt/bzrdir.py:613
7363
#: breezy/plugins/weave_fmt/bzrdir.py:613
7364
7364
msgid "No working tree."
7367
#: brzlib/plugins/weave_fmt/bzrdir.py:620
7367
#: breezy/plugins/weave_fmt/bzrdir.py:620
7368
7368
msgid "Upgrading working tree"
7371
#: brzlib/plugins/weave_fmt/bzrdir.py:641
7371
#: breezy/plugins/weave_fmt/bzrdir.py:641
7372
7372
#, python-format
7373
7373
msgid "Make %s lock"
7376
#: brzlib/plugins/weave_fmt/bzrdir.py:652
7376
#: breezy/plugins/weave_fmt/bzrdir.py:652
7377
7377
#, python-format
7378
7378
msgid "Moving %s"
7381
#: brzlib/push.py:56
7381
#: breezy/push.py:56
7382
7382
msgid "Created new branch."
7385
#: brzlib/push.py:97
7385
#: breezy/push.py:97
7386
7386
#, python-format
7388
7388
"Target directory %s already contains a .bzr directory, but it is not valid."
7391
#: brzlib/push.py:101
7391
#: breezy/push.py:101
7392
7392
#, python-format
7394
7394
"Target directory %s already exists, but does not have a .bzr directory. "
7395
7395
"Supply --use-existing-dir to push there anyway."
7398
#: brzlib/push.py:122
7398
#: breezy/push.py:122
7399
7399
#, python-format
7400
7400
msgid "Too many redirections trying to make %s."
7403
#: brzlib/push.py:148
7403
#: breezy/push.py:148
7405
7405
"These branches have diverged. See \"brz help diverged-branches\" for more "
7409
#: brzlib/push.py:152
7409
#: breezy/push.py:152
7410
7410
#, python-format
7412
7412
"It is not possible to losslessly push to %s. You may want to use dpush "
7416
#: brzlib/push.py:158
7416
#: breezy/push.py:158
7417
7417
#, python-format
7419
7419
"At %s you have a valid .bzr control directory, but not a branch or "
7421
7421
"directory out of the way and try again."
7424
#: brzlib/reconcile.py:97
7424
#: breezy/reconcile.py:97
7425
7425
#, python-format
7426
7426
msgid "Reconciling branch %s"
7429
#: brzlib/reconcile.py:103
7429
#: breezy/reconcile.py:103
7430
7430
#, python-format
7431
7431
msgid "Reconciling repository %s"
7434
#: brzlib/reconcile.py:105
7434
#: breezy/reconcile.py:105
7435
7435
msgid "Reconciling repository"
7438
#: brzlib/reconcile.py:111
7438
#: breezy/reconcile.py:111
7439
7439
#, python-format
7440
7440
msgid "%s cannot canonicalize CHKs."
7443
#: brzlib/reconcile.py:119
7443
#: breezy/reconcile.py:119
7444
7444
msgid "Reconcile aborted: revision index has inconsistent parents."
7447
#: brzlib/reconcile.py:121
7447
#: breezy/reconcile.py:121
7448
7448
msgid "Run \"brz check\" for more details."
7451
#: brzlib/reconcile.py:123
7451
#: breezy/reconcile.py:123
7452
7452
msgid "Reconciliation complete."
7455
#: brzlib/reconcile.py:166
7455
#: breezy/reconcile.py:166
7456
7456
#, python-brace-format
7457
7457
msgid "Fixing last revision info {0} => {1}"
7460
#: brzlib/reconcile.py:173
7460
#: breezy/reconcile.py:173
7461
7461
msgid "revision_history ok."
7464
#: brzlib/reconcile.py:234
7464
#: breezy/reconcile.py:234
7465
7465
msgid "Reading inventory data"
7468
#: brzlib/reconcile.py:254 brzlib/reconcile.py:384
7468
#: breezy/reconcile.py:254 breezy/reconcile.py:384
7469
7469
msgid "Inventory ok."
7472
#: brzlib/reconcile.py:256 brzlib/reconcile.py:386
7472
#: breezy/reconcile.py:256 breezy/reconcile.py:386
7473
7473
msgid "Backing up inventory"
7476
#: brzlib/reconcile.py:258
7476
#: breezy/reconcile.py:258
7477
7477
msgid "Backup inventory created."
7480
#: brzlib/reconcile.py:274 brzlib/reconcile.py:405
7480
#: breezy/reconcile.py:274 breezy/reconcile.py:405
7481
7481
msgid "Writing weave"
7484
#: brzlib/reconcile.py:277 brzlib/reconcile.py:408
7484
#: breezy/reconcile.py:277 breezy/reconcile.py:408
7485
7485
msgid "Inventory regenerated."
7488
#: brzlib/reconcile.py:371 brzlib/reconcile.py:373 brzlib/reconcile.py:376
7488
#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376
7489
7489
msgid "Reading indexes"
7492
#: brzlib/reconcile.py:380 brzlib/reconcile.py:382
7492
#: breezy/reconcile.py:380 breezy/reconcile.py:382
7493
7493
msgid "Checking unused inventories"
7496
#: brzlib/reconcile.py:388
7496
#: breezy/reconcile.py:388
7497
7497
msgid "Backup Inventory created"
7500
#: brzlib/reconcile.py:446
7500
#: breezy/reconcile.py:446
7501
7501
msgid "Fixing text parents"
7504
#: brzlib/reconfigure.py:54
7504
#: breezy/reconfigure.py:54
7505
7505
#, python-brace-format
7506
7506
msgid "{0} is now stacked on {1}\n"
7509
#: brzlib/reconfigure.py:69
7509
#: breezy/reconfigure.py:69
7510
7510
#, python-format
7511
7511
msgid "%s is now not stacked\n"
7514
#: brzlib/remote.py:1228 brzlib/repository.py:289
7514
#: breezy/remote.py:1228 breezy/repository.py:289
7515
7515
#, python-format
7516
7516
msgid "bzr: ERROR (ignored): %s"
7519
#: brzlib/remote.py:2534
7519
#: breezy/remote.py:2534
7520
7520
msgid "Copying repository content as tarball..."
7523
#: brzlib/rename_map.py:69
7523
#: breezy/rename_map.py:69
7524
7524
msgid "Calculating hashes"
7527
#: brzlib/rename_map.py:107
7527
#: breezy/rename_map.py:107
7528
7528
msgid "Determining hash hits"
7531
#: brzlib/rename_map.py:242
7531
#: breezy/rename_map.py:242
7532
7532
#, python-brace-format
7533
7533
msgid "{0} => {1}"
7536
#: brzlib/repository.py:1738
7536
#: breezy/repository.py:1738
7537
7537
msgid "Moving repository to repository.backup"
7540
#: brzlib/repository.py:1745
7540
#: breezy/repository.py:1745
7541
7541
msgid "Creating new repository"
7544
#: brzlib/repository.py:1750
7544
#: breezy/repository.py:1750
7545
7545
msgid "Copying content"
7548
#: brzlib/repository.py:1754
7548
#: breezy/repository.py:1754
7549
7549
msgid "Deleting old repository content"
7552
#: brzlib/repository.py:1756
7552
#: breezy/repository.py:1756
7553
7553
msgid "repository converted"
7556
#: brzlib/revisionspec.py:903
7556
#: breezy/revisionspec.py:903
7557
7557
#, python-brace-format
7558
7558
msgid "Using {0} {1}"
7561
#: brzlib/send.py:59
7561
#: breezy/send.py:59
7562
7562
#, python-format
7563
7563
msgid "Mail client \"%s\" does not support specifying body"
7566
#: brzlib/send.py:63
7566
#: breezy/send.py:63
7567
7567
msgid "--remember requires a branch to be specified."
7570
#: brzlib/send.py:78
7570
#: breezy/send.py:78
7571
7571
msgid "No submit branch known or specified"
7574
#: brzlib/send.py:81
7574
#: breezy/send.py:81
7575
7575
#, python-brace-format
7576
7576
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7579
#: brzlib/send.py:99
7579
#: breezy/send.py:99
7580
7580
#, python-format
7581
7581
msgid "No such send format '%s'."
7584
#: brzlib/send.py:115
7584
#: breezy/send.py:115
7585
7585
msgid "bzr send takes at most two one revision identifiers"
7588
#: brzlib/send.py:128
7588
#: breezy/send.py:128
7589
7589
msgid "No revisions to submit."
7592
#: brzlib/send.py:140
7592
#: breezy/send.py:140
7594
7594
"- not supported for merge directives that use more than one output file."
7597
#: brzlib/send.py:186
7597
#: breezy/send.py:186
7598
7598
msgid "Format 0.9 does not permit bundle with no patch"
7601
#: brzlib/shelf_ui.py:46
7601
#: breezy/shelf_ui.py:46
7602
7602
#, python-format
7603
7603
msgid "Shelve adding file \"%(path)s\"?"
7606
#: brzlib/shelf_ui.py:47
7606
#: breezy/shelf_ui.py:47
7607
7607
msgid "Shelve binary changes?"
7610
#: brzlib/shelf_ui.py:48
7610
#: breezy/shelf_ui.py:48
7611
7611
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7614
#: brzlib/shelf_ui.py:50
7614
#: breezy/shelf_ui.py:50
7615
7615
#, python-format
7616
7616
msgid "Shelve removing file \"%(path)s\"?"
7619
#: brzlib/shelf_ui.py:51
7619
#: breezy/shelf_ui.py:51
7620
7620
#, python-format
7621
7621
msgid "Shelve %d change(s)?"
7624
#: brzlib/shelf_ui.py:52
7624
#: breezy/shelf_ui.py:52
7625
7625
msgid "Shelve?"
7628
#: brzlib/shelf_ui.py:53
7628
#: breezy/shelf_ui.py:53
7629
7629
#, python-format
7631
7631
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7634
#: brzlib/shelf_ui.py:55
7634
#: breezy/shelf_ui.py:55
7635
7635
#, python-format
7636
7636
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7639
#: brzlib/shelf_ui.py:70
7639
#: breezy/shelf_ui.py:70
7640
7640
#, python-format
7641
7641
msgid "Changes shelved with id \"%d\"."
7644
#: brzlib/shelf_ui.py:74
7644
#: breezy/shelf_ui.py:74
7645
7645
msgid "Selected changes destroyed."
7648
#: brzlib/shelf_ui.py:78
7648
#: breezy/shelf_ui.py:78
7649
7649
msgid "Selected changes:"
7652
#: brzlib/shelf_ui.py:98
7652
#: breezy/shelf_ui.py:98
7653
7653
#, python-format
7654
7654
msgid "Delete file \"%(path)s\"?"
7657
#: brzlib/shelf_ui.py:99
7657
#: breezy/shelf_ui.py:99
7658
7658
msgid "Apply binary changes?"
7661
#: brzlib/shelf_ui.py:100
7661
#: breezy/shelf_ui.py:100
7662
7662
#, python-format
7663
7663
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7666
#: brzlib/shelf_ui.py:102
7666
#: breezy/shelf_ui.py:102
7667
7667
#, python-format
7668
7668
msgid "Add file \"%(path)s\"?"
7671
#: brzlib/shelf_ui.py:103
7671
#: breezy/shelf_ui.py:103
7672
7672
#, python-format
7673
7673
msgid "Apply %d change(s)?"
7676
#: brzlib/shelf_ui.py:104
7676
#: breezy/shelf_ui.py:104
7677
7677
msgid "Apply change?"
7680
#: brzlib/shelf_ui.py:105
7680
#: breezy/shelf_ui.py:105
7681
7681
#, python-format
7682
7682
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7685
#: brzlib/shelf_ui.py:107
7685
#: breezy/shelf_ui.py:107
7686
7686
#, python-format
7687
7687
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7690
#: brzlib/shelf_ui.py:402
7690
#: breezy/shelf_ui.py:402
7691
7691
msgid "No changes are shelved."
7694
#: brzlib/shelf_ui.py:460
7694
#: breezy/shelf_ui.py:460
7695
7695
#, python-format
7696
7696
msgid "Using changes with id \"%d\"."
7699
#: brzlib/shelf_ui.py:464
7699
#: breezy/shelf_ui.py:464
7700
7700
#, python-format
7701
7701
msgid "Message: %s"
7704
#: brzlib/shelf_ui.py:476
7704
#: breezy/shelf_ui.py:476
7705
7705
#, python-format
7706
7706
msgid "Deleted changes with id \"%d\"."
7709
#: brzlib/smart/medium.py:714
7709
#: breezy/smart/medium.py:714
7710
7710
#, python-brace-format
7711
7711
msgid "HPSS calls: {0} ({1} vfs) {2}"
7714
#: brzlib/smart/ping.py:32
7714
#: breezy/smart/ping.py:32
7715
7715
msgid "Pings a Bazaar smart server."
7718
#: brzlib/smart/ping.py:34
7718
#: breezy/smart/ping.py:34
7720
7720
"This command sends a 'hello' request to the given location using the brz\n"
7721
7721
"smart protocol, and reports the response."
7724
#: brzlib/smart/server.py:169
7724
#: breezy/smart/server.py:169
7725
7725
msgid "Requested to stop gracefully"
7728
#: brzlib/smart/server.py:179
7728
#: breezy/smart/server.py:179
7729
7729
#, python-format
7730
7730
msgid "Waiting for %d client(s) to finish"
7733
#: brzlib/smart/server.py:185
7733
#: breezy/smart/server.py:185
7734
7734
#, python-format
7735
7735
msgid "Still waiting for %d client(s) to finish"
7738
#: brzlib/smart/server.py:219
7738
#: breezy/smart/server.py:219
7739
7739
#, python-format
7740
7740
msgid "listening socket error: %s"
7743
#: brzlib/smart/server.py:452
7743
#: breezy/smart/server.py:452
7744
7744
#, python-format
7745
7745
msgid "listening on port: %s"
7748
#: brzlib/switch.py:84
7748
#: breezy/switch.py:84
7749
7749
msgid "Pending merges must be committed or reverted before using switch."
7752
#: brzlib/switch.py:111
7752
#: breezy/switch.py:111
7754
7754
"Cannot switch as local commits found in the checkout. Commit these to the "
7755
7755
"bound branch or use --force to throw them away."
7758
#: brzlib/switch.py:116
7758
#: breezy/switch.py:116
7759
7759
#, python-format
7761
7761
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7762
7762
"anyway, use --force."
7765
#: brzlib/switch.py:140
7765
#: breezy/switch.py:140
7766
7766
msgid "Cannot switch a branch, only a checkout."
7769
#: brzlib/switch.py:183
7769
#: breezy/switch.py:183
7770
7770
#, python-format
7771
7771
msgid "Tree is up to date at revision %d."
7774
#: brzlib/switch.py:190
7774
#: breezy/switch.py:190
7775
7775
#, python-format
7776
7776
msgid "Updated to revision %d."
7779
#: brzlib/transform.py:1723 brzlib/transform.py:1734 brzlib/transform.py:1736
7779
#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736
7780
7780
msgid "Apply phase"
7783
#: brzlib/transform.py:1762 brzlib/transform.py:1830
7783
#: breezy/transform.py:1762 breezy/transform.py:1830
7784
7784
msgid "removing file"
7787
#: brzlib/transform.py:1780 brzlib/transform.py:1865
7787
#: breezy/transform.py:1780 breezy/transform.py:1865
7788
7788
msgid "adding file"
7791
#: brzlib/transform.py:2598
7791
#: breezy/transform.py:2598
7792
7792
msgid "Building tree"
7795
#: brzlib/transform.py:2688 brzlib/transform.py:2715
7795
#: breezy/transform.py:2688 breezy/transform.py:2715
7796
7796
msgid "Adding file contents"
7799
#: brzlib/transform.py:3017
7799
#: breezy/transform.py:3017
7800
7800
msgid "Resolution pass"
7803
#: brzlib/transport/ftp/_gssapi.py:88
7803
#: breezy/transport/ftp/_gssapi.py:88
7804
7804
#, python-format
7805
7805
msgid "Authenticated as %s"
7808
#: brzlib/tree.py:647
7808
#: breezy/tree.py:647
7809
7809
msgid "*** {0} content-filter: {1} => {2!r}"
7812
#: brzlib/upgrade.py:77
7812
#: breezy/upgrade.py:77
7813
7813
#, python-format
7814
7814
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7817
#: brzlib/upgrade.py:100
7817
#: breezy/upgrade.py:100
7818
7818
#, python-format
7819
7819
msgid "cannot upgrade from bzrdir format %s"
7822
#: brzlib/upgrade.py:103
7822
#: breezy/upgrade.py:103
7823
7823
#, python-format
7824
7824
msgid "starting upgrade of %s"
7827
#: brzlib/upgrade.py:110
7827
#: breezy/upgrade.py:110
7828
7828
msgid "finished"
7831
#: brzlib/upgrade.py:120
7831
#: breezy/upgrade.py:120
7832
7832
msgid "Deleting backup.bzr"
7835
#: brzlib/upgrade.py:151
7835
#: breezy/upgrade.py:151
7836
7836
#, python-brace-format
7839
7839
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7842
#: brzlib/upgrade.py:208
7842
#: breezy/upgrade.py:208
7843
7843
#, python-format
7844
7844
msgid "Found %d dependent branches - upgrading ..."
7847
#: brzlib/upgrade.py:276
7847
#: breezy/upgrade.py:276
7848
7848
msgid "Upgrading bzrdirs"
7851
#: brzlib/upgrade.py:282
7851
#: breezy/upgrade.py:282
7852
7852
#, python-format
7853
7853
msgid "Upgrading %s"
7856
#: brzlib/upgrade.py:283
7856
#: breezy/upgrade.py:283
7857
7857
#, python-brace-format
7858
7858
msgid "Upgrading {0} {1} ..."
7861
#: brzlib/upgrade.py:301
7861
#: breezy/upgrade.py:301
7862
7862
msgid "Removing backup ..."
7865
#: brzlib/upgrade.py:305
7865
#: breezy/upgrade.py:305
7866
7866
#, python-brace-format
7867
7867
msgid "failed to clean-up {0}: {1}"
7870
#: brzlib/vf_repository.py:1091
7870
#: breezy/vf_repository.py:1091
7871
7871
msgid "inventories"
7874
#: brzlib/vf_repository.py:1117
7874
#: breezy/vf_repository.py:1117
7878
#: brzlib/vf_repository.py:1622 brzlib/vf_repository.py:1631
7878
#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631
7879
7879
msgid "Calculating text parents"
7882
#: brzlib/vf_repository.py:1707
7882
#: breezy/vf_repository.py:1707
7883
7883
msgid "Fetch texts"
7886
#: brzlib/vf_repository.py:2536
7886
#: breezy/vf_repository.py:2536
7887
7887
msgid "loading text store"
7890
#: brzlib/vf_repository.py:2542
7890
#: breezy/vf_repository.py:2542
7891
7891
msgid "checking text graph"
7894
#: brzlib/vf_repository.py:2998 brzlib/vf_repository.py:3012
7895
#: brzlib/vf_repository.py:3127
7894
#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012
7895
#: breezy/vf_repository.py:3127
7896
7896
msgid "Transferring revisions"
7899
#: brzlib/win32utils.py:146
7899
#: breezy/win32utils.py:146
7900
7900
msgid "Failed to GetProcessMemoryInfo()"
7903
#: brzlib/win32utils.py:167
7903
#: breezy/win32utils.py:167
7904
7904
msgid "Cannot debug memory on win32 without ctypes or win32process"
7907
#: brzlib/win32utils.py:172
7907
#: breezy/win32utils.py:172
7908
7908
#, python-brace-format
7909
7909
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7912
#: brzlib/win32utils.py:180
7912
#: breezy/win32utils.py:180
7913
7913
#, python-format
7914
7914
msgid "WorkingSize %8d KiB"
7917
#: brzlib/win32utils.py:181
7917
#: breezy/win32utils.py:181
7918
7918
#, python-format
7919
7919
msgid "PeakWorking %8d KiB"
7922
#: brzlib/win32utils.py:182
7922
#: breezy/win32utils.py:182
7923
7923
#, python-format
7924
7924
msgid "PagefileUsage %8d KiB"
7927
#: brzlib/win32utils.py:183
7927
#: breezy/win32utils.py:183
7928
7928
#, python-format
7929
7929
msgid "PeakPagefileUsage %8d KiB"
7932
#: brzlib/win32utils.py:185
7932
#: breezy/win32utils.py:185
7933
7933
#, python-format
7934
7934
msgid "PrivateUsage %8d KiB"
7937
#: brzlib/win32utils.py:186
7937
#: breezy/win32utils.py:186
7938
7938
#, python-format
7939
7939
msgid "PageFaultCount %8d"
7942
#: brzlib/workingtree.py:1516
7942
#: breezy/workingtree.py:1516
7943
7943
msgid "Rerun update after fixing the conflicts."