1#: breezy/add.py:93 2#, python-brace-format 3msgid "skipping {0} (larger than {1} of {2} bytes)" 4msgstr "" 5 6#: breezy/branch.py:872 7msgid "Unstacking" 8msgstr "" 9 10#: breezy/branch.py:3012 11#, python-format 12msgid "Pushed up to revision %d." 13msgstr "" 14 15#: breezy/branch.py:3014 16#, python-format 17msgid "%d tag updated." 18msgid_plural "%d tags updated." 19msgstr[0] "" 20msgstr[1] "" 21 22#: breezy/branch.py:3017 23msgid "No new revisions or tags to push." 24msgstr "" 25 26#: breezy/branch.py:3019 27msgid "No new revisions to push." 28msgstr "" 29 30#: breezy/branch.py:3039 31#, python-brace-format 32msgid "checked branch {0} format {1}" 33msgstr "" 34 35#: breezy/branch.py:3042 36#, python-format 37msgid "found error:%s" 38msgstr "" 39 40#: breezy/builtins.py:251 breezy/builtins.py:3043 breezy/workingtree.py:324 41#, python-format 42msgid "Ignoring files outside view. View is %s" 43msgstr "" 44 45#: breezy/builtins.py:260 46#, python-format 47msgid "brz %s --revision takes exactly one revision identifier" 48msgstr "" 49 50#: breezy/builtins.py:315 51msgid "Display status summary." 52msgstr "" 53 54#: breezy/builtins.py:317 55msgid "" 56"This reports on versioned and unknown files, reporting them\n" 57"grouped by state. Possible states are:" 58msgstr "" 59 60#: breezy/builtins.py:320 61msgid "" 62"added\n" 63" Versioned in the working copy but not in the previous revision." 64msgstr "" 65 66#: breezy/builtins.py:323 67msgid "" 68"removed\n" 69" Versioned in the previous revision but removed or deleted\n" 70" in the working copy." 71msgstr "" 72 73#: breezy/builtins.py:327 74msgid "" 75"renamed\n" 76" Path of this file changed from the previous revision;\n" 77" the text may also have changed. This includes files whose\n" 78" parent directory was renamed." 79msgstr "" 80 81#: breezy/builtins.py:332 82msgid "" 83"modified\n" 84" Text has changed since the previous revision." 85msgstr "" 86 87#: breezy/builtins.py:335 88msgid "" 89"kind changed\n" 90" File kind has been changed (e.g. from file to directory)." 91msgstr "" 92 93#: breezy/builtins.py:338 94msgid "" 95"unknown\n" 96" Not versioned and not matching an ignore pattern." 97msgstr "" 98 99#: breezy/builtins.py:341 100msgid "" 101"Additionally for directories, symlinks and files with a changed\n" 102"executable bit, Bazaar indicates their type using a trailing\n" 103"character: '/', '@' or '*' respectively. These decorations can be\n" 104"disabled using the '--no-classify' option." 105msgstr "" 106 107#: breezy/builtins.py:346 108msgid "" 109"To see ignored files use 'brz ignored'. For details on the\n" 110"changes to file texts, use 'brz diff'." 111msgstr "" 112 113#: breezy/builtins.py:349 114msgid "" 115"Note that --short or -S gives status flags for each item, similar\n" 116"to Subversion's status command. To get output similar to svn -q,\n" 117"use brz status -SV." 118msgstr "" 119 120#: breezy/builtins.py:353 121msgid "" 122"If no arguments are specified, the status of the entire working\n" 123"directory is shown. Otherwise, only the status of the specified\n" 124"files or directories is reported. If a directory is given, status\n" 125"is reported for everything inside that directory." 126msgstr "" 127 128#: breezy/builtins.py:358 129msgid "" 130"Before merges are committed, the pending merge tip revisions are\n" 131"shown. To see all pending merge revisions, use the -v option.\n" 132"To skip the display of pending merge information altogether, use\n" 133"the no-pending option or specify a file/directory." 134msgstr "" 135 136#: breezy/builtins.py:363 137msgid "" 138"To compare the working directory to a specific revision, pass a\n" 139"single revision to the revision argument." 140msgstr "" 141 142#: breezy/builtins.py:366 143msgid "" 144"To see which files have changed in a specific revision, or between\n" 145"two revisions, pass a revision range to the revision argument.\n" 146"This will produce the same results as calling 'brz diff --summarize'." 147msgstr "" 148 149# help of 'short' option of 'status' command 150#: breezy/builtins.py:375 151msgid "Use short status indicators." 152msgstr "" 153 154# help of 'versioned' option of 'status' command 155#: breezy/builtins.py:377 156msgid "Only show versioned files." 157msgstr "" 158 159# help of 'no-pending' option of 'status' command 160#: breezy/builtins.py:379 161msgid "Don't show pending merges." 162msgstr "" 163 164# help of 'no-classify' option of 'status' command 165#: breezy/builtins.py:382 166msgid "Do not mark object type using indicator." 167msgstr "" 168 169#: breezy/builtins.py:397 170msgid "brz status --revision takes exactly one or two revision specifiers" 171msgstr "" 172 173#: breezy/builtins.py:441 breezy/builtins.py:5229 174msgid "You can only supply one of revision_id or --revision" 175msgstr "" 176 177#: breezy/builtins.py:444 breezy/builtins.py:5231 178msgid "You must supply either --revision or a revision_id" 179msgstr "" 180 181#: breezy/builtins.py:451 182#, python-format 183msgid "Repository %r does not support access to raw revision texts" 184msgstr "" 185 186#: breezy/builtins.py:462 187#, python-brace-format 188msgid "The repository {0} contains no revision {1}." 189msgstr "" 190 191#: breezy/builtins.py:469 192msgid "You cannot specify a NULL revision." 193msgstr "" 194 195#: breezy/builtins.py:561 196msgid "Remove the working tree from a given branch/checkout." 197msgstr "" 198 199#: breezy/builtins.py:563 200msgid "" 201"Since a lightweight checkout is little more than a working tree\n" 202"this will refuse to run against one." 203msgstr "" 204 205#: breezy/builtins.py:566 206msgid "To re-create the working tree, use \"brz checkout\"." 207msgstr "" 208 209# help of 'force' option of 'remove-tree' command 210#: breezy/builtins.py:572 211msgid "Remove the working tree even if it has uncommitted or shelved changes." 212msgstr "" 213 214#: breezy/builtins.py:586 215msgid "No working tree to remove" 216msgstr "" 217 218#: breezy/builtins.py:588 219msgid "You cannot remove the working tree of a remote path" 220msgstr "" 221 222#: breezy/builtins.py:597 223msgid "You cannot remove the working tree from a lightweight checkout" 224msgstr "" 225 226#: breezy/builtins.py:637 227msgid "" 228"The tree does not appear to be corrupt. You probably want \"brz revert\" " 229"instead. Use \"--force\" if you are sure you want to reset the working tree." 230msgstr "" 231 232#: breezy/builtins.py:648 233msgid "" 234", the header appears corrupt, try passing -r -1 to set the state to the last " 235"commit" 236msgstr "" 237 238#: breezy/builtins.py:652 239#, python-brace-format 240msgid "failed to reset the tree state{0}" 241msgstr "" 242 243#: breezy/builtins.py:656 244msgid "Show current revision number." 245msgstr "" 246 247#: breezy/builtins.py:658 248msgid "This is equal to the number of revisions on this branch." 249msgstr "" 250 251#: breezy/builtins.py:671 252msgid "--tree and --revision can not be used together" 253msgstr "" 254 255#: breezy/builtins.py:688 256msgid "Revision numbers only make sense for single revisions, not ranges" 257msgstr "" 258 259# help of 'tree' option of 'revno' command 260#: breezy/builtins.py:712 261msgid "Show revno of working tree." 262msgstr "" 263 264#: breezy/builtins.py:760 265msgid "Add specified files or directories." 266msgstr "" 267 268#: breezy/builtins.py:762 269msgid "" 270"In non-recursive mode, all the named items are added, regardless\n" 271"of whether they were previously ignored. A warning is given if\n" 272"any of the named files are already versioned." 273msgstr "" 274 275#: breezy/builtins.py:766 276msgid "" 277"In recursive mode (the default), files are treated the same way\n" 278"but the behaviour for directories is different. Directories that\n" 279"are already versioned do not give a warning. All directories,\n" 280"whether already versioned or not, are searched for files or\n" 281"subdirectories that are neither versioned or ignored, and these\n" 282"are added. This search proceeds recursively into versioned\n" 283"directories. If no names are given '.' is assumed." 284msgstr "" 285 286#: breezy/builtins.py:774 287msgid "" 288"A warning will be printed when nested trees are encountered,\n" 289"unless they are explicitly ignored." 290msgstr "" 291 292#: breezy/builtins.py:777 293msgid "" 294"Therefore simply saying 'brz add' will version all files that\n" 295"are currently unknown." 296msgstr "" 297 298#: breezy/builtins.py:780 299msgid "" 300"Adding a file whose parent directory is not versioned will\n" 301"implicitly add the parent, and so on up to the root. This means\n" 302"you should never need to explicitly add a directory, they'll just\n" 303"get added when you add a file in the directory." 304msgstr "" 305 306#: breezy/builtins.py:785 307msgid "" 308"--dry-run will show which files would be added, but not actually\n" 309"add them." 310msgstr "" 311 312#: breezy/builtins.py:788 313msgid "" 314"--file-ids-from will try to use the file ids from the supplied path.\n" 315"It looks up ids trying to find a matching parent directory with the\n" 316"same filename, and then by pure path. This option is rarely needed\n" 317"but can be useful when adding the same logical file into two\n" 318"branches that will be merged later (without showing the two different\n" 319"adds as a conflict). It is also useful when merging another project\n" 320"into a subdirectory of this one." 321msgstr "" 322 323#: breezy/builtins.py:796 324msgid "" 325"Any files matching patterns in the ignore list will not be added\n" 326"unless they are explicitly mentioned." 327msgstr "" 328 329#: breezy/builtins.py:799 330msgid "" 331"In recursive mode, files larger than the configuration option \n" 332"add.maximum_file_size will be skipped. Named items are never skipped due\n" 333"to file size." 334msgstr "" 335 336# help of 'no-recurse' option of 'add' command 337#: breezy/builtins.py:806 338msgid "Don't recursively add the contents of directories." 339msgstr "" 340 341# help of 'file-ids-from' option of 'add' command 342#: breezy/builtins.py:813 343msgid "Lookup file ids from this tree." 344msgstr "" 345 346#: breezy/builtins.py:849 347#, python-brace-format 348msgid "ignored {0} matching \"{1}\"\n" 349msgstr "" 350 351#: breezy/builtins.py:854 352msgid "Create a new versioned directory." 353msgstr "" 354 355#: breezy/builtins.py:856 356msgid "This is equivalent to creating the directory and then adding it." 357msgstr "" 358 359# help of 'parents' option of 'mkdir' command 360#: breezy/builtins.py:863 361msgid "No error if existing, make parent directories as needed." 362msgstr "" 363 364#: breezy/builtins.py:897 365#, python-format 366msgid "added %s\n" 367msgstr "" 368 369#: breezy/builtins.py:939 370#, python-format 371msgid "invalid kind %r specified" 372msgstr "" 373 374#: breezy/builtins.py:976 375msgid "Move or rename a file." 376msgstr "" 377 378#: breezy/builtins.py:978 379msgid " brz mv SOURCE... DESTINATION" 380msgstr "" 381 382#: breezy/builtins.py:980 383msgid "" 384"If the last argument is a versioned directory, all the other names\n" 385"are moved into it. Otherwise, there must be exactly two arguments\n" 386"and the file is changed to a new name." 387msgstr "" 388 389#: breezy/builtins.py:984 390msgid "" 391"If OLDNAME does not exist on the filesystem but is versioned and\n" 392"NEWNAME does exist on the filesystem but is not versioned, mv\n" 393"assumes that the file has been manually moved and only updates\n" 394"its internal inventory to reflect that change.\n" 395"The same is valid when moving many SOURCE files to a DESTINATION." 396msgstr "" 397 398#: breezy/builtins.py:990 399msgid "Files cannot be moved between branches." 400msgstr "" 401 402# help of 'after' option of 'mv' command 403#: breezy/builtins.py:997 404msgid "" 405"Move only the brz identifier of the file, because the file has already been " 406"moved." 407msgstr "" 408 409# help of 'auto' option of 'mv' command 410#: breezy/builtins.py:999 411msgid "Automatically guess renames." 412msgstr "" 413 414# help of 'dry-run' option of 'mv' command 415#: breezy/builtins.py:1000 416msgid "Avoid making changes when guessing renames." 417msgstr "" 418 419#: breezy/builtins.py:1009 420msgid "--dry-run requires --auto." 421msgstr "" 422 423#: breezy/builtins.py:1013 424msgid "missing file argument" 425msgstr "" 426 427#: breezy/builtins.py:1017 428msgid "can not move root of branch" 429msgstr "" 430 431#: breezy/builtins.py:1023 432msgid "Only one path may be specified to --auto." 433msgstr "" 434 435#: breezy/builtins.py:1026 436msgid "--after cannot be specified with --auto." 437msgstr "" 438 439#: breezy/builtins.py:1062 440msgid "to mv multiple files the destination must be a versioned directory" 441msgstr "" 442 443#: breezy/builtins.py:1114 444msgid "Turn this branch into a mirror of another branch." 445msgstr "" 446 447#: breezy/builtins.py:1116 448msgid "" 449"By default, this command only works on branches that have not diverged.\n" 450"Branches are considered diverged if the destination branch's most recent \n" 451"commit is one that has not been merged (directly or indirectly) into the \n" 452"parent." 453msgstr "" 454 455#: breezy/builtins.py:1121 456msgid "" 457"If branches have diverged, you can use 'brz merge' to integrate the changes\n" 458"from one into the other. Once one branch has merged, the other should\n" 459"be able to pull it again." 460msgstr "" 461 462#: breezy/builtins.py:1125 463msgid "" 464"If you want to replace your local changes and just want your branch to\n" 465"match the remote one, use pull --overwrite. This will work even if the two\n" 466"branches have diverged." 467msgstr "" 468 469#: breezy/builtins.py:1129 470msgid "" 471"If there is no default location set, the first pull will set it (use\n" 472"--no-remember to avoid setting it). After that, you can omit the\n" 473"location to use the default. To change the default, use --remember. The\n" 474"value will only be saved if the remote location can be accessed." 475msgstr "" 476 477#: breezy/builtins.py:1134 478msgid "" 479"The --verbose option will display the revisions pulled using the log_format\n" 480"configuration option. You can use a different format by overriding it with\n" 481"-Olog_format=<other_format>." 482msgstr "" 483 484#: breezy/builtins.py:1138 485msgid "" 486"Note: The location can be specified either in the form of a branch,\n" 487"or in the form of a path to a file containing a merge directive generated\n" 488"with brz send." 489msgstr "" 490 491# help of 'verbose' option of 'pull' command 492#: breezy/builtins.py:1146 493msgid "Show logs of pulled revisions." 494msgstr "" 495 496# help of 'directory' option of 'pull' command 497#: breezy/builtins.py:1148 498msgid "" 499"Branch to pull into, rather than the one containing the working directory." 500msgstr "" 501 502# help of 'local' option of 'pull' command 503#: breezy/builtins.py:1151 504msgid "" 505"Perform a local pull in a bound branch. Local pulls are not applied to the " 506"master branch." 507msgstr "" 508 509#: breezy/builtins.py:1188 510msgid "No working tree, ignoring --show-base" 511msgstr "" 512 513#: breezy/builtins.py:1204 514msgid "No pull location known or specified." 515msgstr "" 516 517#: breezy/builtins.py:1210 518#, python-format 519msgid "Using saved parent location: %s\n" 520msgstr "" 521 522#: breezy/builtins.py:1217 breezy/builtins.py:4423 523msgid "Cannot use -r with merge directives or bundles" 524msgstr "" 525 526#: breezy/builtins.py:1260 527msgid "Update a mirror of this branch." 528msgstr "" 529 530#: breezy/builtins.py:1262 531msgid "" 532"The target branch will not have its working tree populated because this\n" 533"is both expensive, and is not supported on remote file systems." 534msgstr "" 535 536#: breezy/builtins.py:1265 537msgid "" 538"Some smart servers or protocols *may* put the working tree in place in\n" 539"the future." 540msgstr "" 541 542#: breezy/builtins.py:1268 543msgid "" 544"This command only works on branches that have not diverged. Branches are\n" 545"considered diverged if the destination branch's most recent commit is one\n" 546"that has not been merged (directly or indirectly) by the source branch." 547msgstr "" 548 549#: breezy/builtins.py:1272 550msgid "" 551"If branches have diverged, you can use 'brz push --overwrite' to replace\n" 552"the other branch completely, discarding its unmerged changes." 553msgstr "" 554 555#: breezy/builtins.py:1275 556msgid "" 557"If you want to ensure you have the different changes in the other branch,\n" 558"do a merge (see brz help merge) from the other branch, and commit that.\n" 559"After that you will be able to do a push without '--overwrite'." 560msgstr "" 561 562#: breezy/builtins.py:1279 563msgid "" 564"If there is no default push location set, the first push will set it (use\n" 565"--no-remember to avoid setting it). After that, you can omit the\n" 566"location to use the default. To change the default, use --remember. The\n" 567"value will only be saved if the remote location can be accessed." 568msgstr "" 569 570#: breezy/builtins.py:1284 571msgid "" 572"The --verbose option will display the revisions pushed using the log_format\n" 573"configuration option. You can use a different format by overriding it with\n" 574"-Olog_format=<other_format>." 575msgstr "" 576 577# help of 'directory' option of 'dpush' command 578# help of 'directory' option of 'push' command 579#: breezy/builtins.py:1295 breezy/foreign.py:272 580msgid "" 581"Branch to push from, rather than the one containing the working directory." 582msgstr "" 583 584# help of 'use-existing-dir' option of 'push' command 585#: breezy/builtins.py:1298 586msgid "" 587"By default push will fail if the target directory exists, but does not " 588"already have a control directory. This flag will allow push to proceed." 589msgstr "" 590 591# help of 'stacked' option of 'push' command 592#: breezy/builtins.py:1303 593msgid "" 594"Create a stacked branch that references the public location of the parent " 595"branch." 596msgstr "" 597 598# help of 'stacked-on' option of 'push' command 599#: breezy/builtins.py:1306 600msgid "" 601"Create a stacked branch that refers to another branch for the commit " 602"history. Only the work not present in the referenced branch is included in " 603"the branch created." 604msgstr "" 605 606# help of 'strict' option of 'dpush' command 607# help of 'strict' option of 'push' command 608#: breezy/builtins.py:1311 breezy/foreign.py:279 609msgid "" 610"Refuse to push if there are uncommitted changes in the working tree, --no-" 611"strict disables the check." 612msgstr "" 613 614# help of 'no-tree' option of 'push' command 615#: breezy/builtins.py:1314 616msgid "Don't populate the working tree, even for protocols that support it." 617msgstr "" 618 619# help of 'overwrite-tags' option of 'pull' command 620# help of 'overwrite-tags' option of 'push' command 621#: breezy/builtins.py:1317 622msgid "Overwrite tags only." 623msgstr "" 624 625#: breezy/builtins.py:1368 626msgid "Could not determine branch to refer to." 627msgstr "" 628 629#: breezy/builtins.py:1377 630#, python-format 631msgid "" 632"No push location known or specified. To push to the parent branch (at %s), " 633"use 'brz push :parent'." 634msgstr "" 635 636#: breezy/builtins.py:1383 breezy/foreign.py:306 637msgid "No push location known or specified." 638msgstr "" 639 640#: breezy/builtins.py:1387 641#, python-format 642msgid "Using saved push location: %s" 643msgstr "" 644 645#: breezy/builtins.py:1397 646msgid "Create a new branch that is a copy of an existing branch." 647msgstr "" 648 649#: breezy/builtins.py:1399 650msgid "" 651"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n" 652"be used. In other words, \"branch ../foo/bar\" will attempt to create ./" 653"bar.\n" 654"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n" 655"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n" 656"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n" 657"create ./foo-bar." 658msgstr "" 659 660#: breezy/builtins.py:1406 661msgid "" 662"To retrieve the branch as of a particular revision, supply the --revision\n" 663"parameter, as in \"branch foo/bar -r 5\"." 664msgstr "" 665 666#: breezy/builtins.py:1409 667msgid "The synonyms 'clone' and 'get' for this command are deprecated." 668msgstr "" 669 670# help of 'no-tree' option of 'branch' command 671#: breezy/builtins.py:1419 672msgid "Create a branch without a working-tree." 673msgstr "" 674 675# help of 'switch' option of 'branch' command 676#: breezy/builtins.py:1421 677msgid "Switch the checkout in the current directory to the new branch." 678msgstr "" 679 680# help of 'stacked' option of 'branch' command 681#: breezy/builtins.py:1424 682msgid "" 683"Create a stacked branch referring to the source branch. The new branch will " 684"depend on the availability of the source branch for all operations." 685msgstr "" 686 687# help of 'standalone' option of 'branch' command 688#: breezy/builtins.py:1428 689msgid "Do not use a shared repository, even if available." 690msgstr "" 691 692# help of 'use-existing-dir' option of 'branch' command 693#: breezy/builtins.py:1430 694msgid "" 695"By default branch will fail if the target directory exists, but does not " 696"already have a control directory. This flag will allow branch to proceed." 697msgstr "" 698 699# help of 'bind' option of 'branch' command 700#: breezy/builtins.py:1435 701msgid "Bind new branch to from location." 702msgstr "" 703 704#: breezy/builtins.py:1482 705#, python-format 706msgid "Target directory \"%s\" already exists." 707msgstr "" 708 709#: breezy/builtins.py:1494 710#, python-format 711msgid "Parent of \"%s\" does not exist." 712msgstr "" 713 714#: breezy/builtins.py:1513 715#, python-brace-format 716msgid "The branch {0} has no revision {1}." 717msgstr "" 718 719#: breezy/builtins.py:1528 breezy/push.py:53 720#, python-format 721msgid "Created new stacked branch referring to %s." 722msgstr "" 723 724#: breezy/builtins.py:1532 725#, python-format 726msgid "Branched %d revision." 727msgid_plural "Branched %d revisions." 728msgstr[0] "" 729msgstr[1] "" 730 731#: breezy/builtins.py:1537 732#, python-format 733msgid "New branch bound to %s" 734msgstr "" 735 736#: breezy/builtins.py:1542 breezy/builtins.py:6283 737#, python-format 738msgid "Switched to branch: %s" 739msgstr "" 740 741#: breezy/builtins.py:1547 742msgid "List the branches available at the current location." 743msgstr "" 744 745#: breezy/builtins.py:1549 746msgid "" 747"This command will print the names of all the branches at the current\n" 748"location." 749msgstr "" 750 751# help of 'recursive' option of 'branches' command 752#: breezy/builtins.py:1556 753msgid "" 754"Recursively scan for branches rather than just looking in the specified " 755"location." 756msgstr "" 757 758#: breezy/builtins.py:1585 759msgid "(default)" 760msgstr "" 761 762#: breezy/builtins.py:1597 763msgid "Create a new checkout of an existing branch." 764msgstr "" 765 766#: breezy/builtins.py:1599 767msgid "" 768"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree " 769"for\n" 770"the branch found in '.'. This is useful if you have removed the working " 771"tree\n" 772"or if it was never created - i.e. if you pushed the branch to its current\n" 773"location using SFTP." 774msgstr "" 775 776#: breezy/builtins.py:1604 777msgid "" 778"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION " 779"will\n" 780"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./" 781"bar.\n" 782"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n" 783"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n" 784"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n" 785"create ./foo-bar." 786msgstr "" 787 788#: breezy/builtins.py:1611 789msgid "" 790"To retrieve the branch as of a particular revision, supply the --revision\n" 791"parameter, as in \"checkout foo/bar -r 5\". Note that this will be " 792"immediately\n" 793"out of date [so you cannot commit] but it may be useful (i.e. to examine " 794"old\n" 795"code.)" 796msgstr "" 797 798# help of 'lightweight' option of 'checkout' command 799#: breezy/builtins.py:1621 800msgid "" 801"Perform a lightweight checkout. Lightweight checkouts depend on access to " 802"the branch for every operation. Normal checkouts can perform common " 803"operations like diff and status without such access, and also support local " 804"commits." 805msgstr "" 806 807# help of 'files-from' option of 'branch' command 808# help of 'files-from' option of 'checkout' command 809#: breezy/builtins.py:1628 810msgid "Get file contents from this tree." 811msgstr "" 812 813# help of 'hardlink' option of 'branch' command 814# help of 'hardlink' option of 'checkout' command 815#: breezy/builtins.py:1630 816msgid "Hard-link working tree files where possible." 817msgstr "" 818 819#: breezy/builtins.py:1671 820msgid "" 821"Show list of renamed files.\n" 822" " 823msgstr "" 824 825#: breezy/builtins.py:1699 826msgid "Update a working tree to a new revision." 827msgstr "" 828 829#: breezy/builtins.py:1701 830msgid "" 831"This will perform a merge of the destination revision (the tip of the\n" 832"branch, or the specified revision) into the working tree, and then make\n" 833"that revision the basis revision for the working tree. " 834msgstr "" 835 836#: breezy/builtins.py:1705 837msgid "" 838"You can use this to visit an older revision, or to update a working tree\n" 839"that is out of date from its branch." 840msgstr "" 841 842#: breezy/builtins.py:1708 843msgid "" 844"If there are any uncommitted changes in the tree, they will be carried\n" 845"across and remain as uncommitted changes after the update. To discard\n" 846"these changes, use 'brz revert'. The uncommitted changes may conflict\n" 847"with the changes brought in by the change in basis revision." 848msgstr "" 849 850#: breezy/builtins.py:1713 851msgid "" 852"If the tree's branch is bound to a master branch, brz will also update\n" 853"the branch from the master." 854msgstr "" 855 856#: breezy/builtins.py:1716 857msgid "" 858"You cannot update just a single file or directory, because each Bazaar\n" 859"working tree has just a single basis revision. If you want to restore a\n" 860"file that has been removed locally, use 'brz revert' instead of 'brz\n" 861"update'. If you want to restore a file to its state in a previous\n" 862"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n" 863"out the old content of that file to a new location." 864msgstr "" 865 866#: breezy/builtins.py:1723 867msgid "" 868"The 'dir' argument, if given, must be the location of the root of a\n" 869"working tree to update. By default, the working tree that contains the \n" 870"current working directory is used." 871msgstr "" 872 873#: breezy/builtins.py:1739 874msgid "brz update --revision takes exactly one revision" 875msgstr "" 876 877#: breezy/builtins.py:1747 878msgid "brz update can only update a whole tree, not a file or subdirectory" 879msgstr "" 880 881#: breezy/builtins.py:1778 882#, python-brace-format 883msgid "Tree is up to date at revision {0} of branch {1}" 884msgstr "" 885 886#: breezy/builtins.py:1794 887#, python-format 888msgid "" 889"branch has no revision %s\n" 890"brz update --revision only works for a revision in the branch history" 891msgstr "" 892 893#: breezy/builtins.py:1800 894#, python-brace-format 895msgid "Updated to revision {0} of branch {1}" 896msgstr "" 897 898#: breezy/builtins.py:1804 899msgid "" 900"Your local commits will now show as pending merges with 'brz status', and " 901"can be committed with 'brz commit'." 902msgstr "" 903 904#: breezy/builtins.py:1813 905msgid "Show information about a working tree, branch or repository." 906msgstr "" 907 908#: breezy/builtins.py:1815 909msgid "" 910"This command will show all known locations and formats associated to the\n" 911"tree, branch or repository." 912msgstr "" 913 914#: breezy/builtins.py:1818 915msgid "" 916"In verbose mode, statistical information is included with each report.\n" 917"To see extended statistic information, use a verbosity level of 2 or\n" 918"higher by specifying the verbose option multiple times, e.g. -vv." 919msgstr "" 920 921#: breezy/builtins.py:1822 922msgid "Branches and working trees will also report any missing revisions." 923msgstr "" 924 925#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883 926#: breezy/builtins.py:6469 927msgid ":Examples:" 928msgstr "" 929 930#: breezy/builtins.py:1826 931msgid " Display information on the format and related locations:" 932msgstr "" 933 934#: breezy/builtins.py:1828 935msgid " brz info" 936msgstr "" 937 938#: breezy/builtins.py:1830 939msgid "" 940" Display the above together with extended format information and\n" 941" basic statistics (like the number of files in the working tree and\n" 942" number of revisions in the branch and repository):" 943msgstr "" 944 945#: breezy/builtins.py:1834 946msgid " brz info -v" 947msgstr "" 948 949#: breezy/builtins.py:1836 950msgid " Display the above together with number of committers to the branch:" 951msgstr "" 952 953#: breezy/builtins.py:1838 954msgid " brz info -vv" 955msgstr "" 956 957#: breezy/builtins.py:1857 958msgid "Remove files or directories." 959msgstr "" 960 961#: breezy/builtins.py:1859 962msgid "" 963"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n" 964"delete them if they can easily be recovered using revert otherwise they\n" 965"will be backed up (adding an extension of the form .~#~). If no options or\n" 966"parameters are given Bazaar will scan for files that are being tracked by\n" 967"Bazaar but missing in your tree and stop tracking them for you." 968msgstr "" 969 970# help of 'new' option of 'remove' command 971#: breezy/builtins.py:1867 972msgid "Only remove files that have never been committed." 973msgstr "" 974 975# help of 'file-deletion-strategy' option of 'remove' command 976#: breezy/builtins.py:1869 977msgid "The file deletion mode to be used." 978msgstr "" 979 980# title of 'file-deletion-strategy' option of 'remove' command 981#: breezy/builtins.py:1870 982msgid "Deletion Strategy" 983msgstr "" 984 985# help of 'file-deletion-strategy=safe' option of 'remove' command 986#: breezy/builtins.py:1871 987msgid "Backup changed files (default)." 988msgstr "" 989 990# help of 'file-deletion-strategy=keep' option of 'remove' command 991#: breezy/builtins.py:1872 992msgid "Delete from brz but leave the working copy." 993msgstr "" 994 995# help of 'file-deletion-strategy=no-backup' option of 'remove' command 996#: breezy/builtins.py:1873 997msgid "Don't backup changed files." 998msgstr "" 999 1000#: breezy/builtins.py:1894 1001msgid "No matching files." 1002msgstr "" 1003 1004#: breezy/builtins.py:1955 1005msgid "Reconcile brz metadata in a branch." 1006msgstr "" 1007 1008#: breezy/builtins.py:1957 1009msgid "" 1010"This can correct data mismatches that may have been caused by\n" 1011"previous ghost operations or brz upgrades. You should only\n" 1012"need to run this command if 'brz check' or a brz developer\n" 1013"advises you to run it." 1014msgstr "" 1015 1016#: breezy/builtins.py:1962 1017msgid "" 1018"If a second branch is provided, cross-branch reconciliation is\n" 1019"also attempted, which will check that data like the tree root\n" 1020"id which was not present in very early brz versions is represented\n" 1021"correctly in both branches." 1022msgstr "" 1023 1024#: breezy/builtins.py:1967 1025msgid "" 1026"At the same time it is run it may recompress data resulting in\n" 1027"a potential saving in disk space or performance gain." 1028msgstr "" 1029 1030#: breezy/builtins.py:1970 1031msgid "The branch *MUST* be on a listable system such as local disk or sftp." 1032msgstr "" 1033 1034# help of 'format=2a' option of 'init' command 1035# help of 'format=default' option of 'init' command 1036# help of 'format=2a' option of 'init-repository' command 1037# help of 'format=default' option of 'init-repository' command 1038# help of 'format=2a' option of 'upgrade' command 1039# help of 'format=default' option of 'upgrade' command 1040#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777 1041msgid "" 1042"Format for the bzr 2.0 series.\n" 1043"Uses group-compress storage.\n" 1044"Provides rich roots which are a one-way transition.\n" 1045msgstr "" 1046 1047# help of 'format=pack-0.92' option of 'init' command 1048# help of 'format=pack-0.92' option of 'init-repository' command 1049# help of 'format=pack-0.92' option of 'upgrade' command 1050#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777 1051msgid "" 1052"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with " 1053"bzr repositories before 0.92 but cannot be read by bzr < 0.92. " 1054msgstr "" 1055 1056# help of 'format=development-colo' option of 'init' command 1057# help of 'format=development-colo' option of 'init-repository' command 1058# help of 'format=development-colo' option of 'upgrade' command 1059#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777 1060msgid "The 2a format with experimental support for colocated branches.\n" 1061msgstr "" 1062 1063#: breezy/builtins.py:2038 1064msgid "Make a directory into a versioned branch." 1065msgstr "" 1066 1067#: breezy/builtins.py:2040 1068msgid "" 1069"Use this to create an empty branch, or before importing an\n" 1070"existing project." 1071msgstr "" 1072 1073#: breezy/builtins.py:2043 1074msgid "" 1075"If there is a repository in a parent directory of the location, then\n" 1076"the history of the branch will be stored in the repository. Otherwise\n" 1077"init creates a standalone branch which carries its own history\n" 1078"in the .bzr directory." 1079msgstr "" 1080 1081#: breezy/builtins.py:2048 1082msgid "" 1083"If there is already a branch at the location but it has no working tree,\n" 1084"the tree can be populated with 'brz checkout'." 1085msgstr "" 1086 1087#: breezy/builtins.py:2051 1088msgid "Recipe for importing a tree of files::" 1089msgstr "" 1090 1091#: breezy/builtins.py:2053 1092msgid "" 1093" cd ~/project\n" 1094" brz init\n" 1095" brz add .\n" 1096" brz status\n" 1097" brz commit -m \"imported project\"" 1098msgstr "" 1099 1100# help of 'create-prefix' option of 'init' command 1101# help of 'create-prefix' option of 'push' command 1102#: breezy/builtins.py:2064 1103msgid "Create the path leading up to the branch if it does not already exist." 1104msgstr "" 1105 1106# help of 'format' option of 'init' command 1107#: breezy/builtins.py:2067 1108msgid "Specify a format for this branch. See \"help formats\"." 1109msgstr "" 1110 1111# help of 'append-revisions-only' option of 'init' command 1112#: breezy/builtins.py:2075 1113msgid "Never change revnos or the existing log. Append revisions to it only." 1114msgstr "" 1115 1116# help of 'no-tree' option of 'init' command 1117#: breezy/builtins.py:2078 1118msgid "Create a branch without a working tree." 1119msgstr "" 1120 1121#: breezy/builtins.py:2098 breezy/push.py:110 1122#, python-format 1123msgid "" 1124"Parent directory of %s does not exist.\n" 1125"You may supply --create-prefix to create all leading parent directories." 1126msgstr "" 1127 1128#: breezy/builtins.py:2132 1129msgid "" 1130"This branch format cannot be set to append-revisions-only. Try --default." 1131msgstr "" 1132 1133#: breezy/builtins.py:2143 1134#, python-brace-format 1135msgid "Created a {0} (format: {1})\n" 1136msgstr "" 1137 1138#: breezy/builtins.py:2152 1139#, python-format 1140msgid "Using shared repository: %s\n" 1141msgstr "" 1142 1143#: breezy/builtins.py:2156 1144msgid "Create a shared repository for branches to share storage space." 1145msgstr "" 1146 1147#: breezy/builtins.py:2158 1148msgid "" 1149"New branches created under the repository directory will store their\n" 1150"revisions in the repository, not in the branch directory. For branches\n" 1151"with shared history, this reduces the amount of storage needed and \n" 1152"speeds up the creation of new branches." 1153msgstr "" 1154 1155#: breezy/builtins.py:2163 1156msgid "" 1157"If the --no-trees option is given then the branches in the repository\n" 1158"will not have working trees by default. They will still exist as \n" 1159"directories on disk, but they will not have separate copies of the \n" 1160"files at a certain revision. This can be useful for repositories that\n" 1161"store branches which are interacted with through checkouts or remote\n" 1162"branches, such as on a server." 1163msgstr "" 1164 1165#: breezy/builtins.py:2170 1166msgid "" 1167":Examples:\n" 1168" Create a shared repository holding just branches::" 1169msgstr "" 1170 1171#: breezy/builtins.py:2173 1172msgid "" 1173" brz init-repo --no-trees repo\n" 1174" brz init repo/trunk" 1175msgstr "" 1176 1177#: breezy/builtins.py:2176 1178msgid " Make a lightweight checkout elsewhere::" 1179msgstr "" 1180 1181#: breezy/builtins.py:2178 1182msgid "" 1183" brz checkout --lightweight repo/trunk trunk-checkout\n" 1184" cd trunk-checkout\n" 1185" (add files here)" 1186msgstr "" 1187 1188# help of 'format' option of 'init-repository' command 1189#: breezy/builtins.py:2186 1190msgid "" 1191"Specify a format for this repository. See \"brz help formats\" for details." 1192msgstr "" 1193 1194# title of 'format' option of 'init-repository' command 1195#: breezy/builtins.py:2190 1196msgid "Repository format" 1197msgstr "" 1198 1199# help of 'no-trees' option of 'init-repository' command 1200#: breezy/builtins.py:2192 1201msgid "Branches in the repository will default to not having a working tree." 1202msgstr "" 1203 1204#: breezy/builtins.py:2218 1205msgid "Show differences in the working tree, between revisions or branches." 1206msgstr "" 1207 1208#: breezy/builtins.py:2220 1209msgid "" 1210"If no arguments are given, all changes for the current tree are listed.\n" 1211"If files are given, only the changes in those files are listed.\n" 1212"Remote and multiple branches can be compared by using the --old and\n" 1213"--new options. If not provided, the default for both is derived from\n" 1214"the first argument, if any, or the current tree if no arguments are\n" 1215"given." 1216msgstr "" 1217 1218#: breezy/builtins.py:2227 1219msgid "" 1220"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n" 1221"produces patches suitable for \"patch -p1\"." 1222msgstr "" 1223 1224#: breezy/builtins.py:2230 1225msgid "" 1226"Note that when using the -r argument with a range of revisions, the\n" 1227"differences are computed between the two specified revisions. That\n" 1228"is, the command does not show the changes introduced by the first \n" 1229"revision in the range. This differs from the interpretation of \n" 1230"revision ranges used by \"brz log\" which includes the first revision\n" 1231"in the range." 1232msgstr "" 1233 1234#: breezy/builtins.py:2237 1235msgid "" 1236":Exit values:\n" 1237" 1 - changed\n" 1238" 2 - unrepresentable changes\n" 1239" 3 - error\n" 1240" 0 - no change" 1241msgstr "" 1242 1243#: breezy/builtins.py:2243 1244msgid "" 1245":Examples:\n" 1246" Shows the difference in the working tree versus the last commit::" 1247msgstr "" 1248 1249#: breezy/builtins.py:2246 1250msgid " brz diff" 1251msgstr "" 1252 1253#: breezy/builtins.py:2248 1254msgid " Difference between the working tree and revision 1::" 1255msgstr "" 1256 1257#: breezy/builtins.py:2250 1258msgid " brz diff -r1" 1259msgstr "" 1260 1261#: breezy/builtins.py:2252 1262msgid " Difference between revision 3 and revision 1::" 1263msgstr "" 1264 1265#: breezy/builtins.py:2254 1266msgid " brz diff -r1..3" 1267msgstr "" 1268 1269#: breezy/builtins.py:2256 1270msgid " Difference between revision 3 and revision 1 for branch xxx::" 1271msgstr "" 1272 1273#: breezy/builtins.py:2258 1274msgid " brz diff -r1..3 xxx" 1275msgstr "" 1276 1277#: breezy/builtins.py:2260 1278msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" 1279msgstr "" 1280 1281#: breezy/builtins.py:2262 1282msgid " brz diff -c2" 1283msgstr "" 1284 1285#: breezy/builtins.py:2264 1286msgid "" 1287" To see the changes introduced by revision X::\n" 1288" \n" 1289" brz diff -cX" 1290msgstr "" 1291 1292#: breezy/builtins.py:2268 1293msgid "" 1294" Note that in the case of a merge, the -c option shows the changes\n" 1295" compared to the left hand parent. To see the changes against\n" 1296" another parent, use::" 1297msgstr "" 1298 1299#: breezy/builtins.py:2272 1300msgid " brz diff -r<chosen_parent>..X" 1301msgstr "" 1302 1303#: breezy/builtins.py:2274 1304msgid "" 1305" The changes between the current revision and the previous revision\n" 1306" (equivalent to -c-1 and -r-2..-1)" 1307msgstr "" 1308 1309#: breezy/builtins.py:2277 1310msgid " brz diff -r-2.." 1311msgstr "" 1312 1313#: breezy/builtins.py:2279 1314msgid " Show just the differences for file NEWS::" 1315msgstr "" 1316 1317#: breezy/builtins.py:2281 1318msgid " brz diff NEWS" 1319msgstr "" 1320 1321#: breezy/builtins.py:2283 1322msgid " Show the differences in working tree xxx for file NEWS::" 1323msgstr "" 1324 1325#: breezy/builtins.py:2285 1326msgid " brz diff xxx/NEWS" 1327msgstr "" 1328 1329#: breezy/builtins.py:2287 1330msgid " Show the differences from branch xxx to this working tree:" 1331msgstr "" 1332 1333#: breezy/builtins.py:2289 1334msgid " brz diff --old xxx" 1335msgstr "" 1336 1337#: breezy/builtins.py:2291 1338msgid " Show the differences between two branches for file NEWS::" 1339msgstr "" 1340 1341#: breezy/builtins.py:2293 1342msgid " brz diff --old xxx --new yyy NEWS" 1343msgstr "" 1344 1345#: breezy/builtins.py:2295 1346msgid " Same as 'brz diff' but prefix paths with old/ and new/::" 1347msgstr "" 1348 1349#: breezy/builtins.py:2297 1350msgid "" 1351" brz diff --prefix old/:new/\n" 1352" \n" 1353" Show the differences using a custom diff program with options::\n" 1354" \n" 1355" brz diff --using /usr/bin/diff --diff-options -wu" 1356msgstr "" 1357 1358# help of 'diff-options' option of 'diff' command 1359#: breezy/builtins.py:2307 1360msgid "Pass these options to the external diff program." 1361msgstr "" 1362 1363# help of 'prefix' option of 'diff' command 1364#: breezy/builtins.py:2310 1365msgid "" 1366"Set prefixes added to old and new filenames, as two values separated by a " 1367"colon. (eg \"old/:new/\")." 1368msgstr "" 1369 1370# help of 'old' option of 'diff' command 1371#: breezy/builtins.py:2313 1372msgid "Branch/tree to compare from." 1373msgstr "" 1374 1375# help of 'new' option of 'diff' command 1376#: breezy/builtins.py:2317 1377msgid "Branch/tree to compare to." 1378msgstr "" 1379 1380# help of 'using' option of 'diff' command 1381#: breezy/builtins.py:2323 1382msgid "Use this command to compare files." 1383msgstr "" 1384 1385# help of 'format' option of 'diff' command 1386#: breezy/builtins.py:2328 1387msgid "Diff format to use." 1388msgstr "" 1389 1390# title of 'format' option of 'diff' command 1391#: breezy/builtins.py:2330 1392msgid "Diff format" 1393msgstr "" 1394 1395# help of 'context' option of 'diff' command 1396#: breezy/builtins.py:2332 1397msgid "How many lines of context to show." 1398msgstr "" 1399 1400#: breezy/builtins.py:2357 1401msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")" 1402msgstr "" 1403 1404#: breezy/builtins.py:2361 1405msgid "brz diff --revision takes exactly one or two revision specifiers" 1406msgstr "" 1407 1408#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776 1409#: breezy/builtins.py:2784 breezy/builtins.py:4957 1410#, python-brace-format 1411msgid "{0} and {1} are mutually exclusive" 1412msgstr "" 1413 1414#: breezy/builtins.py:2386 1415msgid "" 1416"List files deleted in the working tree.\n" 1417" " 1418msgstr "" 1419 1420#: breezy/builtins.py:2463 1421msgid "Show the tree root directory." 1422msgstr "" 1423 1424#: breezy/builtins.py:2465 1425msgid "" 1426"The root is the nearest enclosing directory with a .bzr control\n" 1427"directory." 1428msgstr "" 1429 1430#: breezy/builtins.py:2480 1431msgid "The limit argument must be an integer." 1432msgstr "" 1433 1434#: breezy/builtins.py:2488 1435msgid "The levels argument must be an integer." 1436msgstr "" 1437 1438#: breezy/builtins.py:2493 1439msgid "Show historical log for a branch or subset of a branch." 1440msgstr "" 1441 1442#: breezy/builtins.py:2495 1443msgid "" 1444"log is brz's default tool for exploring the history of a branch.\n" 1445"The branch to use is taken from the first parameter. If no parameters\n" 1446"are given, the branch containing the working directory is logged.\n" 1447"Here are some simple examples::" 1448msgstr "" 1449 1450#: breezy/builtins.py:2500 1451msgid "" 1452" brz log log the current branch\n" 1453" brz log foo.py log a file in its branch\n" 1454" brz log http://server/branch log a branch on a server" 1455msgstr "" 1456 1457#: breezy/builtins.py:2504 1458msgid "" 1459"The filtering, ordering and information shown for each revision can\n" 1460"be controlled as explained below. By default, all revisions are\n" 1461"shown sorted (topologically) so that newer revisions appear before\n" 1462"older ones and descendants always appear before ancestors. If displayed,\n" 1463"merged revisions are shown indented under the revision in which they\n" 1464"were merged." 1465msgstr "" 1466 1467#: breezy/builtins.py:2511 1468msgid ":Output control:" 1469msgstr "" 1470 1471#: breezy/builtins.py:2513 1472msgid "" 1473" The log format controls how information about each revision is\n" 1474" displayed. The standard log formats are called ``long``, ``short``\n" 1475" and ``line``. The default is long. See ``brz help log-formats``\n" 1476" for more details on log formats." 1477msgstr "" 1478 1479#: breezy/builtins.py:2518 1480msgid "" 1481" The following options can be used to control what information is\n" 1482" displayed::" 1483msgstr "" 1484 1485#: breezy/builtins.py:2521 1486msgid "" 1487" -l N display a maximum of N revisions\n" 1488" -n N display N levels of revisions (0 for all, 1 for collapsed)\n" 1489" -v display a status summary (delta) for each revision\n" 1490" -p display a diff (patch) for each revision\n" 1491" --show-ids display revision-ids (and file-ids), not just revnos" 1492msgstr "" 1493 1494#: breezy/builtins.py:2527 1495msgid "" 1496" Note that the default number of levels to display is a function of the\n" 1497" log format. If the -n option is not used, the standard log formats show\n" 1498" just the top level (mainline)." 1499msgstr "" 1500 1501#: breezy/builtins.py:2531 1502msgid "" 1503" Status summaries are shown using status flags like A, M, etc. To see\n" 1504" the changes explained using words like ``added`` and ``modified``\n" 1505" instead, use the -vv option." 1506msgstr "" 1507 1508#: breezy/builtins.py:2535 1509msgid ":Ordering control:" 1510msgstr "" 1511 1512#: breezy/builtins.py:2537 1513msgid "" 1514" To display revisions from oldest to newest, use the --forward option.\n" 1515" In most cases, using this option will have little impact on the total\n" 1516" time taken to produce a log, though --forward does not incrementally\n" 1517" display revisions like --reverse does when it can." 1518msgstr "" 1519 1520#: breezy/builtins.py:2542 1521msgid ":Revision filtering:" 1522msgstr "" 1523 1524#: breezy/builtins.py:2544 1525msgid "" 1526" The -r option can be used to specify what revision or range of revisions\n" 1527" to filter against. The various forms are shown below::" 1528msgstr "" 1529 1530#: breezy/builtins.py:2547 1531msgid "" 1532" -rX display revision X\n" 1533" -rX.. display revision X and later\n" 1534" -r..Y display up to and including revision Y\n" 1535" -rX..Y display from X to Y inclusive" 1536msgstr "" 1537 1538#: breezy/builtins.py:2552 1539msgid "" 1540" See ``brz help revisionspec`` for details on how to specify X and Y.\n" 1541" Some common examples are given below::" 1542msgstr "" 1543 1544#: breezy/builtins.py:2555 1545msgid "" 1546" -r-1 show just the tip\n" 1547" -r-10.. show the last 10 mainline revisions\n" 1548" -rsubmit:.. show what's new on this branch\n" 1549" -rancestor:path.. show changes since the common ancestor of this\n" 1550" branch and the one at location path\n" 1551" -rdate:yesterday.. show changes since yesterday" 1552msgstr "" 1553 1554#: breezy/builtins.py:2562 1555msgid "" 1556" When logging a range of revisions using -rX..Y, log starts at\n" 1557" revision Y and searches back in history through the primary\n" 1558" (\"left-hand\") parents until it finds X. When logging just the\n" 1559" top level (using -n1), an error is reported if X is not found\n" 1560" along the way. If multi-level logging is used (-n0), X may be\n" 1561" a nested merge revision and the log will be truncated accordingly." 1562msgstr "" 1563 1564#: breezy/builtins.py:2569 1565msgid ":Path filtering:" 1566msgstr "" 1567 1568#: breezy/builtins.py:2571 1569msgid "" 1570" If parameters are given and the first one is not a branch, the log\n" 1571" will be filtered to show only those revisions that changed the\n" 1572" nominated files or directories." 1573msgstr "" 1574 1575#: breezy/builtins.py:2575 1576msgid "" 1577" Filenames are interpreted within their historical context. To log a\n" 1578" deleted file, specify a revision range so that the file existed at\n" 1579" the end or start of the range." 1580msgstr "" 1581 1582#: breezy/builtins.py:2579 1583msgid "" 1584" Historical context is also important when interpreting pathnames of\n" 1585" renamed files/directories. Consider the following example:" 1586msgstr "" 1587 1588#: breezy/builtins.py:2582 1589msgid "" 1590" * revision 1: add tutorial.txt\n" 1591" * revision 2: modify tutorial.txt\n" 1592" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt" 1593msgstr "" 1594 1595#: breezy/builtins.py:2586 1596msgid " In this case:" 1597msgstr "" 1598 1599#: breezy/builtins.py:2588 1600msgid " * ``brz log guide.txt`` will log the file added in revision 1" 1601msgstr "" 1602 1603#: breezy/builtins.py:2590 1604msgid " * ``brz log tutorial.txt`` will log the new file added in revision 3" 1605msgstr "" 1606 1607#: breezy/builtins.py:2592 1608msgid "" 1609" * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n" 1610" the original file in revision 2." 1611msgstr "" 1612 1613#: breezy/builtins.py:2595 1614msgid "" 1615" * ``brz log -r2 -p guide.txt`` will display an error message as there\n" 1616" was no file called guide.txt in revision 2." 1617msgstr "" 1618 1619#: breezy/builtins.py:2598 1620msgid "" 1621" Renames are always followed by log. By design, there is no need to\n" 1622" explicitly ask for this (and no way to stop logging a file back\n" 1623" until it was last renamed)." 1624msgstr "" 1625 1626#: breezy/builtins.py:2602 1627msgid ":Other filtering:" 1628msgstr "" 1629 1630#: breezy/builtins.py:2604 1631msgid "" 1632" The --match option can be used for finding revisions that match a\n" 1633" regular expression in a commit message, committer, author or bug.\n" 1634" Specifying the option several times will match any of the supplied\n" 1635" expressions. --match-author, --match-bugs, --match-committer and\n" 1636" --match-message can be used to only match a specific field." 1637msgstr "" 1638 1639#: breezy/builtins.py:2610 1640msgid ":Tips & tricks:" 1641msgstr "" 1642 1643#: breezy/builtins.py:2612 1644msgid "" 1645" GUI tools and IDEs are often better at exploring history than command\n" 1646" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n" 1647" bzr-explorer shell, or the Loggerhead web interface. See the Bazaar\n" 1648" Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n" 1649" <http://wiki.bazaar.canonical.com/IDEIntegration>. " 1650msgstr "" 1651 1652#: breezy/builtins.py:2618 1653msgid " You may find it useful to add the aliases below to ``bazaar.conf``::" 1654msgstr "" 1655 1656#: breezy/builtins.py:2620 1657msgid "" 1658" [ALIASES]\n" 1659" tip = log -r-1\n" 1660" top = log -l10 --line\n" 1661" show = log -v -p" 1662msgstr "" 1663 1664#: breezy/builtins.py:2625 1665msgid "" 1666" ``brz tip`` will then show the latest revision while ``brz top``\n" 1667" will show the last 10 mainline revisions. To see the details of a\n" 1668" particular revision X, ``brz show -rX``." 1669msgstr "" 1670 1671#: breezy/builtins.py:2629 1672msgid "" 1673" If you are interested in looking deeper into a particular merge X,\n" 1674" use ``brz log -n0 -rX``." 1675msgstr "" 1676 1677#: breezy/builtins.py:2632 1678msgid "" 1679" ``brz log -v`` on a branch with lots of history is currently\n" 1680" very slow. A fix for this issue is currently under development.\n" 1681" With or without that fix, it is recommended that a revision range\n" 1682" be given when using the -v option." 1683msgstr "" 1684 1685#: breezy/builtins.py:2637 1686msgid "" 1687" brz has a generic full-text matching plugin, brz-search, that can be\n" 1688" used to find revisions matching user names, commit messages, etc.\n" 1689" Among other features, this plugin can find all revisions containing\n" 1690" a list of words but not others." 1691msgstr "" 1692 1693#: breezy/builtins.py:2642 1694msgid "" 1695" When exploring non-mainline history on large projects with deep\n" 1696" history, the performance of log can be greatly improved by installing\n" 1697" the historycache plugin. This plugin buffers historical information\n" 1698" trading disk space for faster speed." 1699msgstr "" 1700 1701# help of 'forward' option of 'log' command 1702#: breezy/builtins.py:2651 1703msgid "Show from oldest to newest." 1704msgstr "" 1705 1706# help of 'verbose' option of 'log' command 1707#: breezy/builtins.py:2654 1708msgid "Show files changed in each revision." 1709msgstr "" 1710 1711# help of 'change' option of 'log' command 1712#: breezy/builtins.py:2660 1713msgid "Show just the specified revision. See also \"help revisionspec\"." 1714msgstr "" 1715 1716# help of 'authors' option of 'log' command 1717#: breezy/builtins.py:2664 1718msgid "What names to list as authors - first, all or committer." 1719msgstr "" 1720 1721# title of 'authors' option of 'log' command 1722#: breezy/builtins.py:2665 1723msgid "Authors" 1724msgstr "" 1725 1726# help of 'levels' option of 'log' command 1727#: breezy/builtins.py:2670 1728msgid "Number of levels to display - 0 for all, 1 for flat." 1729msgstr "" 1730 1731# help of 'limit' option of 'log' command 1732#: breezy/builtins.py:2680 1733msgid "Limit the output to the first N revisions." 1734msgstr "" 1735 1736# help of 'show-diff' option of 'log' command 1737#: breezy/builtins.py:2685 1738msgid "Show changes made in each revision as a patch." 1739msgstr "" 1740 1741# help of 'include-merged' option of 'log' command 1742#: breezy/builtins.py:2687 1743msgid "Show merged revisions like --levels 0 does." 1744msgstr "" 1745 1746# help of 'omit-merges' option of 'log' command 1747#: breezy/builtins.py:2691 1748msgid "Do not report commits with more than one parent." 1749msgstr "" 1750 1751# help of 'exclude-common-ancestry' option of 'log' command 1752#: breezy/builtins.py:2693 1753msgid "" 1754"Display only the revisions that are not part of both ancestries (require -" 1755"rX..Y)." 1756msgstr "" 1757 1758# help of 'signatures' option of 'log' command 1759#: breezy/builtins.py:2697 1760msgid "Show digital signature validity." 1761msgstr "" 1762 1763# help of 'match' option of 'log' command 1764#: breezy/builtins.py:2700 1765msgid "Show revisions whose properties match this expression." 1766msgstr "" 1767 1768# help of 'match-message' option of 'log' command 1769#: breezy/builtins.py:2704 1770msgid "Show revisions whose message matches this expression." 1771msgstr "" 1772 1773# help of 'match-committer' option of 'log' command 1774#: breezy/builtins.py:2708 1775msgid "Show revisions whose committer matches this expression." 1776msgstr "" 1777 1778# help of 'match-author' option of 'log' command 1779#: breezy/builtins.py:2712 1780msgid "Show revisions whose authors match this expression." 1781msgstr "" 1782 1783# help of 'match-bugs' option of 'log' command 1784#: breezy/builtins.py:2716 1785msgid "Show revisions whose bugs match this expression." 1786msgstr "" 1787 1788#: breezy/builtins.py:2770 1789msgid "--exclude-common-ancestry requires -r with two revisions" 1790msgstr "" 1791 1792#: breezy/builtins.py:2798 1793#, python-format 1794msgid "Path unknown at end or start of revision range: %s" 1795msgstr "" 1796 1797#: breezy/builtins.py:2915 1798#, python-format 1799msgid "brz %s doesn't accept two revisions in different branches." 1800msgstr "" 1801 1802#: breezy/builtins.py:2931 1803#, python-format 1804msgid "brz %s --revision takes one or two values." 1805msgstr "" 1806 1807#: breezy/builtins.py:2976 1808msgid "" 1809"List files in a tree.\n" 1810" " 1811msgstr "" 1812 1813# help of 'recursive' option of 'ls' command 1814#: breezy/builtins.py:2985 1815msgid "Recurse into subdirectories." 1816msgstr "" 1817 1818# help of 'from-root' option of 'ls' command 1819#: breezy/builtins.py:2987 1820msgid "Print paths relative to the root of the branch." 1821msgstr "" 1822 1823# help of 'unknown' option of 'ls' command 1824#: breezy/builtins.py:2989 1825msgid "Print unknown files." 1826msgstr "" 1827 1828# help of 'versioned' option of 'ls' command 1829#: breezy/builtins.py:2990 1830msgid "Print versioned files." 1831msgstr "" 1832 1833# help of 'ignored' option of 'ls' command 1834#: breezy/builtins.py:2993 1835msgid "Print ignored files." 1836msgstr "" 1837 1838# help of 'kind' option of 'ls' command 1839#: breezy/builtins.py:2995 1840msgid "List entries of a particular kind: file, directory, symlink." 1841msgstr "" 1842 1843#: breezy/builtins.py:3008 1844msgid "invalid kind specified" 1845msgstr "" 1846 1847#: breezy/builtins.py:3011 1848msgid "Cannot set both --verbose and --null" 1849msgstr "" 1850 1851#: breezy/builtins.py:3020 1852msgid "cannot specify both --from-root and PATH" 1853msgstr "" 1854 1855#: breezy/builtins.py:3107 1856msgid "Ignore specified files or patterns." 1857msgstr "" 1858 1859#: breezy/builtins.py:3109 1860msgid "See ``brz help patterns`` for details on the syntax of patterns." 1861msgstr "" 1862 1863#: breezy/builtins.py:3111 1864msgid "" 1865"If a .bzrignore file does not exist, the ignore command\n" 1866"will create one and add the specified files or patterns to the newly\n" 1867"created file. The ignore command will also automatically add the \n" 1868".bzrignore file to be versioned. Creating a .bzrignore file without\n" 1869"the use of the ignore command will require an explicit add command." 1870msgstr "" 1871 1872#: breezy/builtins.py:3117 1873msgid "" 1874"To remove patterns from the ignore list, edit the .bzrignore file.\n" 1875"After adding, editing or deleting that file either indirectly by\n" 1876"using this command or directly by using an editor, be sure to commit\n" 1877"it." 1878msgstr "" 1879 1880#: breezy/builtins.py:3122 1881msgid "" 1882"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n" 1883"the global ignore file can be found in the application data directory as\n" 1884"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n" 1885"Global ignores are not touched by this command. The global ignore file\n" 1886"can be edited directly using an editor." 1887msgstr "" 1888 1889#: breezy/builtins.py:3128 1890msgid "" 1891"Patterns prefixed with '!' are exceptions to ignore patterns and take\n" 1892"precedence over regular ignores. Such exceptions are used to specify\n" 1893"files that should be versioned which would otherwise be ignored." 1894msgstr "" 1895 1896#: breezy/builtins.py:3132 1897msgid "" 1898"Patterns prefixed with '!!' act as regular ignore patterns, but have\n" 1899"precedence over the '!' exception patterns." 1900msgstr "" 1901 1902#: breezy/builtins.py:3135 1903msgid "" 1904":Notes: \n" 1905" \n" 1906"* Ignore patterns containing shell wildcards must be quoted from\n" 1907" the shell on Unix." 1908msgstr "" 1909 1910#: breezy/builtins.py:3140 1911msgid "" 1912"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n" 1913" To ignore patterns that begin with that character, use the \"RE:\" prefix." 1914msgstr "" 1915 1916#: breezy/builtins.py:3143 1917msgid "" 1918":Examples:\n" 1919" Ignore the top level Makefile::" 1920msgstr "" 1921 1922#: breezy/builtins.py:3146 1923msgid " brz ignore ./Makefile" 1924msgstr "" 1925 1926#: breezy/builtins.py:3148 1927msgid " Ignore .class files in all directories...::" 1928msgstr "" 1929 1930#: breezy/builtins.py:3150 1931msgid " brz ignore \"*.class\"" 1932msgstr "" 1933 1934#: breezy/builtins.py:3152 1935msgid " ...but do not ignore \"special.class\"::" 1936msgstr "" 1937 1938#: breezy/builtins.py:3154 1939msgid " brz ignore \"!special.class\"" 1940msgstr "" 1941 1942#: breezy/builtins.py:3156 1943msgid " Ignore files whose name begins with the \"#\" character::" 1944msgstr "" 1945 1946#: breezy/builtins.py:3158 1947msgid " brz ignore \"RE:^#\"" 1948msgstr "" 1949 1950#: breezy/builtins.py:3160 breezy/builtins.py:3164 1951msgid " Ignore .o files under the lib directory::" 1952msgstr "" 1953 1954#: breezy/builtins.py:3162 1955msgid " brz ignore \"lib/**/*.o\"" 1956msgstr "" 1957 1958#: breezy/builtins.py:3166 1959msgid " brz ignore \"RE:lib/.*\\.o\"" 1960msgstr "" 1961 1962#: breezy/builtins.py:3168 1963msgid " Ignore everything but the \"debian\" toplevel directory::" 1964msgstr "" 1965 1966#: breezy/builtins.py:3170 1967msgid "" 1968" brz ignore \"RE:(?!debian/).*\"\n" 1969" \n" 1970" Ignore everything except the \"local\" toplevel directory,\n" 1971" but always ignore autosave files ending in ~, even under local/::\n" 1972" \n" 1973" brz ignore \"*\"\n" 1974" brz ignore \"!./local\"\n" 1975" brz ignore \"!!*~\"" 1976msgstr "" 1977 1978# help of 'default-rules' option of 'ignore' command 1979#: breezy/builtins.py:3184 1980msgid "Display the default ignore rules that brz uses." 1981msgstr "" 1982 1983#: breezy/builtins.py:3196 1984msgid "ignore requires at least one NAME_PATTERN or --default-rules." 1985msgstr "" 1986 1987#: breezy/builtins.py:3207 1988#, python-format 1989msgid "Invalid ignore pattern found. %s" 1990msgid_plural "Invalid ignore patterns found. %s" 1991msgstr[0] "" 1992msgstr[1] "" 1993 1994#: breezy/builtins.py:3216 1995msgid "NAME_PATTERN should not be an absolute path" 1996msgstr "" 1997 1998#: breezy/builtins.py:3229 1999#, python-format 2000msgid "" 2001"Warning: the following files are version controlled and match your ignore " 2002"pattern:\n" 2003"%s\n" 2004"These files will continue to be version controlled unless you 'brz remove' " 2005"them.\n" 2006msgstr "" 2007 2008#: breezy/builtins.py:3236 2009msgid "List ignored files and the patterns that matched them." 2010msgstr "" 2011 2012#: breezy/builtins.py:3238 2013msgid "" 2014"List all the ignored files and the ignore pattern that caused the file to\n" 2015"be ignored." 2016msgstr "" 2017 2018#: breezy/builtins.py:3241 2019msgid "Alternatively, to list just the files::" 2020msgstr "" 2021 2022#: breezy/builtins.py:3243 2023msgid " brz ls --ignored" 2024msgstr "" 2025 2026#: breezy/builtins.py:3277 2027#, python-format 2028msgid "not a valid revision-number: %r" 2029msgstr "" 2030 2031#: breezy/builtins.py:3284 2032msgid "Export current or past revision to a destination directory or archive." 2033msgstr "" 2034 2035#: breezy/builtins.py:3286 2036msgid "If no revision is specified this exports the last committed revision." 2037msgstr "" 2038 2039#: breezy/builtins.py:3288 2040msgid "" 2041"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n" 2042"given, try to find the format with the extension. If no extension\n" 2043"is found exports to a directory (equivalent to --format=dir)." 2044msgstr "" 2045 2046#: breezy/builtins.py:3292 2047msgid "" 2048"If root is supplied, it will be used as the root directory inside\n" 2049"container formats (tar, zip, etc). If it is not supplied it will default\n" 2050"to the exported filename. The root option has no effect for 'dir' format." 2051msgstr "" 2052 2053#: breezy/builtins.py:3296 2054msgid "" 2055"If branch is omitted then the branch containing the current working\n" 2056"directory will be used." 2057msgstr "" 2058 2059#: breezy/builtins.py:3299 2060msgid "Note: Export of tree with non-ASCII filenames to zip is not supported." 2061msgstr "" 2062 2063#: breezy/builtins.py:3301 2064msgid "" 2065" ================= =========================\n" 2066" Supported formats Autodetected by extension\n" 2067" ================= =========================\n" 2068" dir (none)\n" 2069" tar .tar\n" 2070" tbz2 .tar.bz2, .tbz2\n" 2071" tgz .tar.gz, .tgz\n" 2072" zip .zip\n" 2073" ================= =========================" 2074msgstr "" 2075 2076# help of 'format' option of 'export' command 2077#: breezy/builtins.py:3315 2078msgid "Type of file to export to." 2079msgstr "" 2080 2081# help of 'filters' option of 'export' command 2082#: breezy/builtins.py:3318 2083msgid "Apply content filters to export the convenient form." 2084msgstr "" 2085 2086# help of 'root' option of 'export' command 2087#: breezy/builtins.py:3322 2088msgid "Name of the root directory inside the exported file." 2089msgstr "" 2090 2091# help of 'per-file-timestamps' option of 'export' command 2092#: breezy/builtins.py:3324 2093msgid "" 2094"Set modification time of files to that of the last revision in which it was " 2095"changed." 2096msgstr "" 2097 2098# help of 'uncommitted' option of 'export' command 2099#: breezy/builtins.py:3327 2100msgid "Export the working tree contents rather than that of the last revision." 2101msgstr "" 2102 2103#: breezy/builtins.py:3346 2104msgid "--uncommitted requires a working tree" 2105msgstr "" 2106 2107#: breezy/builtins.py:3355 2108#, python-format 2109msgid "Unsupported export format: %s" 2110msgstr "" 2111 2112#: breezy/builtins.py:3359 2113msgid "Write the contents of a file as of a given revision to standard output." 2114msgstr "" 2115 2116#: breezy/builtins.py:3361 2117msgid "If no revision is nominated, the last revision is used." 2118msgstr "" 2119 2120#: breezy/builtins.py:3363 2121msgid "" 2122"Note: Take care to redirect standard output when using this command on a\n" 2123"binary file." 2124msgstr "" 2125 2126# help of 'name-from-revision' option of 'cat' command 2127#: breezy/builtins.py:3369 2128msgid "The path name in the old tree." 2129msgstr "" 2130 2131# help of 'filters' option of 'cat' command 2132#: breezy/builtins.py:3370 2133msgid "Apply content filters to display the convenience form." 2134msgstr "" 2135 2136#: breezy/builtins.py:3381 2137msgid "brz cat --revision takes exactly one revision specifier" 2138msgstr "" 2139 2140#: breezy/builtins.py:3406 breezy/builtins.py:3418 2141msgid "{0!r} is not present in revision {1}" 2142msgstr "" 2143 2144#: breezy/builtins.py:3441 2145msgid "Commit changes into a new revision." 2146msgstr "" 2147 2148#: breezy/builtins.py:3443 2149msgid "" 2150"An explanatory message needs to be given for each commit. This is\n" 2151"often done by using the --message option (getting the message from the\n" 2152"command line) or by using the --file option (getting the message from\n" 2153"a file). If neither of these options is given, an editor is opened for\n" 2154"the user to enter the message. To see the changed files in the\n" 2155"boilerplate text loaded into the editor, use the --show-diff option." 2156msgstr "" 2157 2158#: breezy/builtins.py:3450 2159msgid "" 2160"By default, the entire tree is committed and the person doing the\n" 2161"commit is assumed to be the author. These defaults can be overridden\n" 2162"as explained below." 2163msgstr "" 2164 2165#: breezy/builtins.py:3454 2166msgid ":Selective commits:" 2167msgstr "" 2168 2169#: breezy/builtins.py:3456 2170msgid "" 2171" If selected files are specified, only changes to those files are\n" 2172" committed. If a directory is specified then the directory and\n" 2173" everything within it is committed." 2174msgstr "" 2175 2176#: breezy/builtins.py:3460 2177msgid "" 2178" When excludes are given, they take precedence over selected files.\n" 2179" For example, to commit only changes within foo, but not changes\n" 2180" within foo/bar::" 2181msgstr "" 2182 2183#: breezy/builtins.py:3464 2184msgid " brz commit foo -x foo/bar" 2185msgstr "" 2186 2187#: breezy/builtins.py:3466 2188msgid " A selective commit after a merge is not yet supported." 2189msgstr "" 2190 2191#: breezy/builtins.py:3468 2192msgid ":Custom authors:" 2193msgstr "" 2194 2195#: breezy/builtins.py:3470 2196msgid "" 2197" If the author of the change is not the same person as the committer,\n" 2198" you can specify the author's name using the --author option. The\n" 2199" name should be in the same format as a committer-id, e.g.\n" 2200" \"John Doe <jdoe@example.com>\". If there is more than one author of\n" 2201" the change you can specify the option multiple times, once for each\n" 2202" author." 2203msgstr "" 2204 2205#: breezy/builtins.py:3477 2206msgid ":Checks:" 2207msgstr "" 2208 2209#: breezy/builtins.py:3479 2210msgid "" 2211" A common mistake is to forget to add a new file or directory before\n" 2212" running the commit command. The --strict option checks for unknown\n" 2213" files and aborts the commit if any are found. More advanced pre-commit\n" 2214" checks can be implemented by defining hooks. See ``brz help hooks``\n" 2215" for details." 2216msgstr "" 2217 2218#: breezy/builtins.py:3485 2219msgid ":Things to note:" 2220msgstr "" 2221 2222#: breezy/builtins.py:3487 2223msgid "" 2224" If you accidentially commit the wrong changes or make a spelling\n" 2225" mistake in the commit message say, you can use the uncommit command\n" 2226" to undo it. See ``brz help uncommit`` for details." 2227msgstr "" 2228 2229#: breezy/builtins.py:3491 2230msgid "" 2231" Hooks can also be configured to run after a commit. This allows you\n" 2232" to trigger updates to external systems like bug trackers. The --fixes\n" 2233" option can be used to record the association between a revision and\n" 2234" one or more bugs. See ``brz help bugs`` for details." 2235msgstr "" 2236 2237# help of 'exclude' option of 'commit' command 2238#: breezy/builtins.py:3501 2239msgid "Do not consider changes made to a given path." 2240msgstr "" 2241 2242# help of 'message' option of 'commit' command 2243#: breezy/builtins.py:3504 2244msgid "Description of the new revision." 2245msgstr "" 2246 2247# help of 'unchanged' option of 'commit' command 2248#: breezy/builtins.py:3507 2249msgid "Commit even if nothing has changed." 2250msgstr "" 2251 2252# help of 'file' option of 'commit' command 2253#: breezy/builtins.py:3511 2254msgid "Take commit message from this file." 2255msgstr "" 2256 2257# help of 'strict' option of 'commit' command 2258#: breezy/builtins.py:3513 2259msgid "Refuse to commit if there are unknown files in the working tree." 2260msgstr "" 2261 2262# help of 'commit-time' option of 'commit' command 2263#: breezy/builtins.py:3516 2264msgid "" 2265"Manually set a commit time using commit date format, e.g. '2009-10-10 " 2266"08:00:00 +0100'." 2267msgstr "" 2268 2269# help of 'fixes' option of 'commit' command 2270#: breezy/builtins.py:3519 2271msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")." 2272msgstr "" 2273 2274# help of 'author' option of 'commit' command 2275#: breezy/builtins.py:3522 2276msgid "Set the author's name, if it's different from the committer." 2277msgstr "" 2278 2279# help of 'local' option of 'commit' command 2280#: breezy/builtins.py:3525 2281msgid "" 2282"Perform a local commit in a bound branch. Local commits are not pushed to " 2283"the master branch until a normal commit is performed." 2284msgstr "" 2285 2286# help of 'show-diff' option of 'commit' command 2287#: breezy/builtins.py:3531 2288msgid "" 2289"When no message is supplied, show the diff along with the status summary in " 2290"the message editor." 2291msgstr "" 2292 2293# help of 'lossy' option of 'commit' command 2294#: breezy/builtins.py:3534 2295msgid "" 2296"When committing to a foreign version control system do not push data that " 2297"can not be natively represented." 2298msgstr "" 2299 2300#: breezy/builtins.py:3552 2301#, python-format 2302msgid "" 2303"No tracker specified for bug %s. Use the form 'tracker:id' or specify a " 2304"default bug tracker using the `bugtracker` option.\n" 2305"See \"brz help bugs\" for more information on this feature. Commit refused." 2306msgstr "" 2307 2308#: breezy/builtins.py:3561 2309#, python-format 2310msgid "" 2311"Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" " 2312"for more information on this feature.\n" 2313"Commit refused." 2314msgstr "" 2315 2316#: breezy/builtins.py:3570 2317#, python-format 2318msgid "Unrecognized bug %s. Commit refused." 2319msgstr "" 2320 2321#: breezy/builtins.py:3573 2322#, python-format 2323msgid "" 2324"%s\n" 2325"Commit refused." 2326msgstr "" 2327 2328#: breezy/builtins.py:3597 2329msgid "Could not parse --commit-time: " 2330msgstr "" 2331 2332#: breezy/builtins.py:3637 2333msgid "please specify either --message or --file" 2334msgstr "" 2335 2336#: breezy/builtins.py:3666 2337msgid "please specify a commit message with either --message or --file" 2338msgstr "" 2339 2340#: breezy/builtins.py:3669 2341msgid "" 2342"Empty commit message specified. Please specify a commit message with either " 2343"--message or --file or leave a blank message with --message \"\"." 2344msgstr "" 2345 2346#: breezy/builtins.py:3689 2347msgid "" 2348"No changes to commit. Please 'brz add' the files you want to commit, or use " 2349"--unchanged to force an empty commit." 2350msgstr "" 2351 2352#: breezy/builtins.py:3693 2353msgid "" 2354"Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz " 2355"resolve FILE\" to resolve." 2356msgstr "" 2357 2358#: breezy/builtins.py:3697 2359msgid "Commit refused because there are unknown files in the working tree." 2360msgstr "" 2361 2362#: breezy/builtins.py:3700 2363msgid "" 2364"\n" 2365"To commit to master branch, run update and then commit.\n" 2366"You can also pass --local to commit to continue working disconnected." 2367msgstr "" 2368 2369#: breezy/builtins.py:3708 2370msgid "" 2371"Validate working tree structure, branch consistency and repository history." 2372msgstr "" 2373 2374#: breezy/builtins.py:3710 2375msgid "" 2376"This command checks various invariants about branch and repository storage\n" 2377"to detect data corruption or brz bugs." 2378msgstr "" 2379 2380#: breezy/builtins.py:3713 2381msgid "" 2382"The working tree and branch checks will only give output if a problem is\n" 2383"detected. The output fields of the repository check are:" 2384msgstr "" 2385 2386#: breezy/builtins.py:3716 2387msgid "" 2388"revisions\n" 2389" This is just the number of revisions checked. It doesn't\n" 2390" indicate a problem." 2391msgstr "" 2392 2393#: breezy/builtins.py:3720 2394msgid "" 2395"versionedfiles\n" 2396" This is just the number of versionedfiles checked. It\n" 2397" doesn't indicate a problem." 2398msgstr "" 2399 2400#: breezy/builtins.py:3724 2401msgid "" 2402"unreferenced ancestors\n" 2403" Texts that are ancestors of other texts, but\n" 2404" are not properly referenced by the revision ancestry. This is a\n" 2405" subtle problem that Bazaar can work around." 2406msgstr "" 2407 2408#: breezy/builtins.py:3729 2409msgid "" 2410"unique file texts\n" 2411" This is the total number of unique file contents\n" 2412" seen in the checked revisions. It does not indicate a problem." 2413msgstr "" 2414 2415#: breezy/builtins.py:3733 2416msgid "" 2417"repeated file texts\n" 2418" This is the total number of repeated texts seen\n" 2419" in the checked revisions. Texts can be repeated when their file\n" 2420" entries are modified, but the file contents are not. It does not\n" 2421" indicate a problem." 2422msgstr "" 2423 2424#: breezy/builtins.py:3739 2425msgid "" 2426"If no restrictions are specified, all Bazaar data that is found at the " 2427"given\n" 2428"location will be checked." 2429msgstr "" 2430 2431#: breezy/builtins.py:3744 2432msgid " Check the tree and branch at 'foo'::" 2433msgstr "" 2434 2435#: breezy/builtins.py:3746 2436msgid " brz check --tree --branch foo" 2437msgstr "" 2438 2439#: breezy/builtins.py:3748 2440msgid " Check only the repository at 'bar'::" 2441msgstr "" 2442 2443#: breezy/builtins.py:3750 2444msgid " brz check --repo bar" 2445msgstr "" 2446 2447#: breezy/builtins.py:3752 2448msgid " Check everything at 'baz'::" 2449msgstr "" 2450 2451#: breezy/builtins.py:3754 2452msgid " brz check baz" 2453msgstr "" 2454 2455# help of 'branch' option of 'check' command 2456#: breezy/builtins.py:3760 2457msgid "Check the branch related to the current directory." 2458msgstr "" 2459 2460# help of 'repo' option of 'check' command 2461#: breezy/builtins.py:3762 2462msgid "Check the repository related to the current directory." 2463msgstr "" 2464 2465# help of 'tree' option of 'check' command 2466#: breezy/builtins.py:3764 2467msgid "Check the working tree related to the current directory." 2468msgstr "" 2469 2470#: breezy/builtins.py:3778 2471msgid "Upgrade a repository, branch or working tree to a newer format." 2472msgstr "" 2473 2474#: breezy/builtins.py:3780 2475msgid "" 2476"When the default format has changed after a major new release of\n" 2477"Bazaar, you may be informed during certain operations that you\n" 2478"should upgrade. Upgrading to a newer format may improve performance\n" 2479"or make new features available. It may however limit interoperability\n" 2480"with older repositories or with older versions of Bazaar." 2481msgstr "" 2482 2483#: breezy/builtins.py:3786 2484msgid "" 2485"If you wish to upgrade to a particular format rather than the\n" 2486"current default, that can be specified using the --format option.\n" 2487"As a consequence, you can use the upgrade command this way to\n" 2488"\"downgrade\" to an earlier format, though some conversions are\n" 2489"a one way process (e.g. changing from the 1.x default to the\n" 2490"2.x default) so downgrading is not always possible." 2491msgstr "" 2492 2493#: breezy/builtins.py:3793 2494msgid "" 2495"A backup.bzr.~#~ directory is created at the start of the conversion\n" 2496"process (where # is a number). By default, this is left there on\n" 2497"completion. If the conversion fails, delete the new .bzr directory\n" 2498"and rename this one back in its place. Use the --clean option to ask\n" 2499"for the backup.bzr directory to be removed on successful conversion.\n" 2500"Alternatively, you can delete it by hand if everything looks good\n" 2501"afterwards." 2502msgstr "" 2503 2504#: breezy/builtins.py:3801 2505msgid "" 2506"If the location given is a shared repository, dependent branches\n" 2507"are also converted provided the repository converts successfully.\n" 2508"If the conversion of a branch fails, remaining branches are still\n" 2509"tried." 2510msgstr "" 2511 2512#: breezy/builtins.py:3806 2513msgid "" 2514"For more information on upgrades, see the Bazaar Upgrade Guide,\n" 2515"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." 2516msgstr "" 2517 2518# help of 'format' option of 'upgrade' command 2519#: breezy/builtins.py:3814 2520msgid "Upgrade to a specific format. See \"brz help formats\" for details." 2521msgstr "" 2522 2523# title of 'format' option of 'init' command 2524# title of 'format' option of 'upgrade' command 2525#: breezy/builtins.py:3818 2526msgid "Branch format" 2527msgstr "" 2528 2529# help of 'clean' option of 'upgrade' command 2530#: breezy/builtins.py:3820 2531msgid "Remove the backup.bzr directory if successful." 2532msgstr "" 2533 2534# help of 'dry-run' option of 'add' command 2535# help of 'dry-run' option of 'upgrade' command 2536#: breezy/builtins.py:3822 2537msgid "Show what would be done, but don't actually do anything." 2538msgstr "" 2539 2540#: breezy/builtins.py:3837 2541msgid "Show or set brz user id." 2542msgstr "" 2543 2544#: breezy/builtins.py:3839 2545msgid "" 2546":Examples:\n" 2547" Show the email of the current user::" 2548msgstr "" 2549 2550#: breezy/builtins.py:3842 2551msgid " brz whoami --email" 2552msgstr "" 2553 2554#: breezy/builtins.py:3844 2555msgid " Set the current user::" 2556msgstr "" 2557 2558#: breezy/builtins.py:3846 2559msgid " brz whoami \"Frank Chu <fchu@example.com>\"" 2560msgstr "" 2561 2562# help of 'email' option of 'whoami' command 2563#: breezy/builtins.py:3850 2564msgid "Display email address only." 2565msgstr "" 2566 2567# help of 'branch' option of 'whoami' command 2568#: breezy/builtins.py:3852 2569msgid "Set identity for the current branch instead of globally." 2570msgstr "" 2571 2572#: breezy/builtins.py:3878 2573msgid "--email can only be used to display existing identity" 2574msgstr "" 2575 2576#: breezy/builtins.py:3902 2577msgid "Print or set the branch nickname." 2578msgstr "" 2579 2580#: breezy/builtins.py:3904 2581msgid "" 2582"If unset, the colocated branch name is used for colocated branches, and\n" 2583"the branch directory name is used for other branches. To print the\n" 2584"current nickname, execute with no argument." 2585msgstr "" 2586 2587#: breezy/builtins.py:3908 2588msgid "" 2589"Bound branches use the nickname of its master branch unless it is set\n" 2590"locally." 2591msgstr "" 2592 2593#: breezy/builtins.py:3928 2594msgid "Set/unset and display aliases." 2595msgstr "" 2596 2597#: breezy/builtins.py:3930 2598msgid "" 2599":Examples:\n" 2600" Show the current aliases::" 2601msgstr "" 2602 2603#: breezy/builtins.py:3933 2604msgid " brz alias" 2605msgstr "" 2606 2607#: breezy/builtins.py:3935 2608msgid " Show the alias specified for 'll'::" 2609msgstr "" 2610 2611#: breezy/builtins.py:3937 2612msgid " brz alias ll" 2613msgstr "" 2614 2615#: breezy/builtins.py:3939 2616msgid " Set an alias for 'll'::" 2617msgstr "" 2618 2619#: breezy/builtins.py:3941 2620msgid " brz alias ll=\"log --line -r-10..-1\"" 2621msgstr "" 2622 2623#: breezy/builtins.py:3943 2624msgid " To remove an alias for 'll'::" 2625msgstr "" 2626 2627#: breezy/builtins.py:3945 2628msgid " brz alias --remove ll" 2629msgstr "" 2630 2631# help of 'remove' option of 'alias' command 2632#: breezy/builtins.py:3950 2633msgid "Remove the alias." 2634msgstr "" 2635 2636#: breezy/builtins.py:3968 2637msgid "brz alias --remove expects an alias to remove." 2638msgstr "" 2639 2640#: breezy/builtins.py:4149 2641msgid "subunit not available. subunit needs to be installed to use --subunit." 2642msgstr "" 2643 2644#: breezy/builtins.py:4166 2645msgid "" 2646"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead" 2647msgstr "" 2648 2649#: breezy/builtins.py:4213 2650msgid "Show version of brz." 2651msgstr "" 2652 2653# help of 'short' option of 'version' command 2654#: breezy/builtins.py:4217 2655msgid "Print just the version number." 2656msgstr "" 2657 2658#: breezy/builtins.py:4236 2659msgid "It sure does!\n" 2660msgstr "" 2661 2662#: breezy/builtins.py:4260 2663#, python-format 2664msgid "merge base is revision %s\n" 2665msgstr "" 2666 2667#: breezy/builtins.py:4264 2668msgid "Perform a three-way merge." 2669msgstr "" 2670 2671#: breezy/builtins.py:4266 2672msgid "" 2673"The source of the merge can be specified either in the form of a branch,\n" 2674"or in the form of a path to a file containing a merge directive generated\n" 2675"with brz send. If neither is specified, the default is the upstream branch\n" 2676"or the branch most recently merged using --remember. The source of the\n" 2677"merge may also be specified in the form of a path to a file in another\n" 2678"branch: in this case, only the modifications to that file are merged into\n" 2679"the current working tree." 2680msgstr "" 2681 2682#: breezy/builtins.py:4274 2683msgid "" 2684"When merging from a branch, by default brz will try to merge in all new\n" 2685"work from the other branch, automatically determining an appropriate base\n" 2686"revision. If this fails, you may need to give an explicit base." 2687msgstr "" 2688 2689#: breezy/builtins.py:4278 2690msgid "" 2691"To pick a different ending revision, pass \"--revision OTHER\". brz will\n" 2692"try to merge in all new work up to and including revision OTHER." 2693msgstr "" 2694 2695#: breezy/builtins.py:4281 2696msgid "" 2697"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n" 2698"through OTHER, excluding BASE but including OTHER, will be merged. If this\n" 2699"causes some revisions to be skipped, i.e. if the destination branch does\n" 2700"not already contain revision BASE, such a merge is commonly referred to as\n" 2701"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n" 2702"cherrypicks. The changes look like a normal commit, and the history of the\n" 2703"changes from the other branch is not stored in the commit." 2704msgstr "" 2705 2706#: breezy/builtins.py:4289 2707msgid "Revision numbers are always relative to the source branch." 2708msgstr "" 2709 2710#: breezy/builtins.py:4291 breezy/conflicts.py:52 breezy/conflicts.py:106 2711msgid "" 2712"Merge will do its best to combine the changes in two branches, but there\n" 2713"are some kinds of problems only a human can fix. When it encounters those,\n" 2714"it will mark a conflict. A conflict means that you need to fix something,\n" 2715"before you can commit." 2716msgstr "" 2717 2718#: breezy/builtins.py:4296 2719msgid "Use brz resolve when you have fixed a problem. See also brz conflicts." 2720msgstr "" 2721 2722#: breezy/builtins.py:4298 2723msgid "" 2724"If there is no default branch set, the first merge will set it (use\n" 2725"--no-remember to avoid setting it). After that, you can omit the branch\n" 2726"to use the default. To change the default, use --remember. The value will\n" 2727"only be saved if the remote location can be accessed." 2728msgstr "" 2729 2730#: breezy/builtins.py:4303 2731msgid "" 2732"The results of the merge are placed into the destination working\n" 2733"directory, where they can be reviewed (with brz diff), tested, and then\n" 2734"committed to record the result of the merge." 2735msgstr "" 2736 2737#: breezy/builtins.py:4307 2738msgid "" 2739"merge refuses to run if there are any uncommitted changes, unless\n" 2740"--force is given. If --force is given, then the changes from the source \n" 2741"will be merged with the current working tree, including any uncommitted\n" 2742"changes in the tree. The --force option can also be used to create a\n" 2743"merge revision which has more than two parents." 2744msgstr "" 2745 2746#: breezy/builtins.py:4313 2747msgid "" 2748"If one would like to merge changes from the working tree of the other\n" 2749"branch without merging any committed revisions, the --uncommitted option\n" 2750"can be given." 2751msgstr "" 2752 2753#: breezy/builtins.py:4317 2754msgid "" 2755"To select only some changes to merge, use \"merge -i\", which will prompt\n" 2756"you to apply each diff hunk and file change, similar to \"shelve\"." 2757msgstr "" 2758 2759#: breezy/builtins.py:4320 2760msgid "" 2761":Examples:\n" 2762" To merge all new revisions from brz.dev::" 2763msgstr "" 2764 2765#: breezy/builtins.py:4323 2766msgid " brz merge ../brz.dev" 2767msgstr "" 2768 2769#: breezy/builtins.py:4325 2770msgid " To merge changes up to and including revision 82 from brz.dev::" 2771msgstr "" 2772 2773#: breezy/builtins.py:4327 2774msgid " brz merge -r 82 ../brz.dev" 2775msgstr "" 2776 2777#: breezy/builtins.py:4329 2778msgid " To merge the changes introduced by 82, without previous changes::" 2779msgstr "" 2780 2781#: breezy/builtins.py:4331 2782msgid " brz merge -r 81..82 ../brz.dev" 2783msgstr "" 2784 2785#: breezy/builtins.py:4333 2786msgid " To apply a merge directive contained in /tmp/merge::" 2787msgstr "" 2788 2789#: breezy/builtins.py:4335 2790msgid " brz merge /tmp/merge" 2791msgstr "" 2792 2793#: breezy/builtins.py:4337 2794msgid "" 2795" To create a merge revision with three parents from two branches\n" 2796" feature1a and feature1b:" 2797msgstr "" 2798 2799#: breezy/builtins.py:4340 2800msgid "" 2801" brz merge ../feature1a\n" 2802" brz merge ../feature1b --force\n" 2803" brz commit -m 'revision with three parents'" 2804msgstr "" 2805 2806# help of 'force' option of 'merge' command 2807#: breezy/builtins.py:4352 2808msgid "Merge even if the destination tree has uncommitted changes." 2809msgstr "" 2810 2811# help of 'uncommitted' option of 'merge' command 2812#: breezy/builtins.py:4358 2813msgid "" 2814"Apply uncommitted changes from a working copy, instead of branch changes." 2815msgstr "" 2816 2817# help of 'pull' option of 'merge' command 2818#: breezy/builtins.py:4360 2819msgid "" 2820"If the destination is already completely merged into the source, pull from " 2821"the source rather than merging. When this happens, you do not need to " 2822"commit the result." 2823msgstr "" 2824 2825# help of 'directory' option of 'merge' command 2826#: breezy/builtins.py:4365 2827msgid "" 2828"Branch to merge into, rather than the one containing the working directory." 2829msgstr "" 2830 2831# help of 'preview' option of 'merge' command 2832#: breezy/builtins.py:4367 2833msgid "Instead of merging, show a diff of the merge." 2834msgstr "" 2835 2836# help of 'interactive' option of 'merge' command 2837#: breezy/builtins.py:4369 2838msgid "Select changes interactively." 2839msgstr "" 2840 2841#: breezy/builtins.py:4391 2842msgid "" 2843"Merging into empty branches not currently supported, https://bugs.launchpad." 2844"net/brz/+bug/308562" 2845msgstr "" 2846 2847#: breezy/builtins.py:4418 2848msgid "Cannot use --uncommitted with bundles or merge directives." 2849msgstr "" 2850 2851#: breezy/builtins.py:4429 2852msgid "Cannot use --uncommitted and --revision at the same time." 2853msgstr "" 2854 2855#: breezy/builtins.py:4449 2856msgid "merger: " 2857msgstr "" 2858 2859#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71 2860msgid "Nothing to do." 2861msgstr "" 2862 2863#: breezy/builtins.py:4455 2864msgid "Cannot pull individual files" 2865msgstr "" 2866 2867#: breezy/builtins.py:4463 2868msgid "This branch has no commits. (perhaps you would prefer 'brz pull')" 2869msgstr "" 2870 2871#: breezy/builtins.py:4521 2872#, python-format 2873msgid "Show-base is not supported for this merge type. %s" 2874msgstr "" 2875 2876#: breezy/builtins.py:4530 2877#, python-format 2878msgid "Conflict reduction is not supported for merge type %s." 2879msgstr "" 2880 2881#: breezy/builtins.py:4534 2882msgid "Cannot do conflict reduction and show base." 2883msgstr "" 2884 2885#: breezy/builtins.py:4645 2886msgid "No location specified or remembered" 2887msgstr "" 2888 2889#: breezy/builtins.py:4647 2890#, python-brace-format 2891msgid "{0} remembered {1} location {2}" 2892msgstr "" 2893 2894#: breezy/builtins.py:4653 2895msgid "Redo a merge." 2896msgstr "" 2897 2898#: breezy/builtins.py:4655 2899msgid "" 2900"Use this if you want to try a different merge technique while resolving\n" 2901"conflicts. Some merge techniques are better than others, and remerge\n" 2902"lets you try different ones on different files." 2903msgstr "" 2904 2905#: breezy/builtins.py:4659 2906msgid "" 2907"The options for remerge have the same meaning and defaults as the ones for\n" 2908"merge. The difference is that remerge can (only) be run when there is a\n" 2909"pending merge, and it lets you specify particular files." 2910msgstr "" 2911 2912#: breezy/builtins.py:4663 2913msgid "" 2914":Examples:\n" 2915" Re-do the merge of all conflicted files, and show the base text in\n" 2916" conflict regions, in addition to the usual THIS and OTHER texts::" 2917msgstr "" 2918 2919#: breezy/builtins.py:4667 2920msgid " brz remerge --show-base" 2921msgstr "" 2922 2923#: breezy/builtins.py:4669 2924msgid "" 2925" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n" 2926" additional processing to reduce the size of conflict regions::" 2927msgstr "" 2928 2929#: breezy/builtins.py:4672 2930msgid " brz remerge --merge-type weave --reprocess foobar" 2931msgstr "" 2932 2933# help of 'show-base' option of 'merge' command 2934# help of 'show-base' option of 'pull' command 2935# help of 'show-base' option of 'remerge' command 2936# help of 'show-base' option of 'update' command 2937#: breezy/builtins.py:4679 2938msgid "Show base revision text in conflicts." 2939msgstr "" 2940 2941#: breezy/builtins.py:4691 2942msgid "" 2943"Sorry, remerge only works after normal merges. Not cherrypicking or multi-" 2944"merges." 2945msgstr "" 2946 2947#: breezy/builtins.py:4749 2948msgid "" 2949"Set files in the working tree back to the contents of a previous revision." 2950msgstr "" 2951 2952#: breezy/builtins.py:4751 2953msgid "" 2954"Giving a list of files will revert only those files. Otherwise, all files\n" 2955"will be reverted. If the revision is not specified with '--revision', the\n" 2956"working tree basis revision is used. A revert operation affects only the\n" 2957"working tree, not any revision history like the branch and repository or\n" 2958"the working tree basis revision." 2959msgstr "" 2960 2961#: breezy/builtins.py:4757 2962msgid "" 2963"To remove only some changes, without reverting to a prior version, use\n" 2964"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n" 2965"will remove the changes introduced by the second last commit (-2), without\n" 2966"affecting the changes introduced by the last commit (-1). To remove\n" 2967"certain changes on a hunk-by-hunk basis, see the shelve command.\n" 2968"To update the branch to a specific revision or the latest revision and\n" 2969"update the working tree accordingly while preserving local changes, see the\n" 2970"update command." 2971msgstr "" 2972 2973#: breezy/builtins.py:4766 2974msgid "" 2975"Uncommitted changes to files that are reverted will be discarded.\n" 2976"Howver, by default, any files that have been manually changed will be\n" 2977"backed up first. (Files changed only by merge are not backed up.) Backup\n" 2978"files have '.~#~' appended to their name, where # is a number." 2979msgstr "" 2980 2981#: breezy/builtins.py:4771 2982msgid "" 2983"When you provide files, you can use their current pathname or the pathname\n" 2984"from the target revision. So you can use revert to \"undelete\" a file by\n" 2985"name. If you name a directory, all the contents of that directory will be\n" 2986"reverted." 2987msgstr "" 2988 2989#: breezy/builtins.py:4776 2990msgid "" 2991"If you have newly added files since the target revision, they will be\n" 2992"removed. If the files to be removed have been changed, backups will be\n" 2993"created as above. Directories containing unknown files will not be\n" 2994"deleted." 2995msgstr "" 2996 2997#: breezy/builtins.py:4781 2998msgid "" 2999"The working tree contains a list of revisions that have been merged but\n" 3000"not yet committed. These revisions will be included as additional parents\n" 3001"of the next commit. Normally, using revert clears that list as well as\n" 3002"reverting the files. If any files are specified, revert leaves the list\n" 3003"of uncommitted merges alone and reverts only the files. Use ``brz revert\n" 3004".`` in the tree root to revert all files but keep the recorded merges,\n" 3005"and ``brz revert --forget-merges`` to clear the pending merge list without\n" 3006"reverting any files." 3007msgstr "" 3008 3009#: breezy/builtins.py:4790 3010msgid "" 3011"Using \"brz revert --forget-merges\", it is possible to apply all of the\n" 3012"changes from a branch in a single revision. To do this, perform the merge\n" 3013"as desired. Then doing revert with the \"--forget-merges\" option will " 3014"keep\n" 3015"the content of the tree as it was, but it will clear the list of pending\n" 3016"merges. The next commit will then contain all of the changes that are\n" 3017"present in the other branch, but without any other parent revisions.\n" 3018"Because this technique forgets where these changes originated, it may\n" 3019"cause additional conflicts on later merges involving the same source and\n" 3020"target branches." 3021msgstr "" 3022 3023# help of 'no-backup' option of 'revert' command 3024#: breezy/builtins.py:4804 3025msgid "Do not save backups of reverted files." 3026msgstr "" 3027 3028# help of 'forget-merges' option of 'revert' command 3029#: breezy/builtins.py:4806 3030msgid "Remove pending merge marker, without changing any files." 3031msgstr "" 3032 3033#: breezy/builtins.py:4837 3034msgid "" 3035"Show help on a command or other topic.\n" 3036" " 3037msgstr "" 3038 3039# help of 'long' option of 'help' command 3040#: breezy/builtins.py:4842 3041msgid "Show help on all commands." 3042msgstr "" 3043 3044#: breezy/builtins.py:4871 3045msgid "Show unmerged/unpulled revisions between two branches." 3046msgstr "" 3047 3048#: breezy/builtins.py:4873 3049msgid "OTHER_BRANCH may be local or remote." 3050msgstr "" 3051 3052#: breezy/builtins.py:4875 3053msgid "" 3054"To filter on a range of revisions, you can use the command -r begin..end\n" 3055"-r revision requests a specific revision, -r ..end or -r begin.. are\n" 3056"also valid.\n" 3057" \n" 3058":Exit values:\n" 3059" 1 - some missing revisions\n" 3060" 0 - no missing revisions" 3061msgstr "" 3062 3063#: breezy/builtins.py:4885 3064msgid "" 3065" Determine the missing revisions between this and the branch at the\n" 3066" remembered pull location::" 3067msgstr "" 3068 3069#: breezy/builtins.py:4888 3070msgid " brz missing" 3071msgstr "" 3072 3073#: breezy/builtins.py:4890 3074msgid " Determine the missing revisions between this and another branch::" 3075msgstr "" 3076 3077#: breezy/builtins.py:4892 3078msgid " brz missing http://server/branch" 3079msgstr "" 3080 3081#: breezy/builtins.py:4894 3082msgid "" 3083" Determine the missing revisions up to a specific revision on the other\n" 3084" branch::" 3085msgstr "" 3086 3087#: breezy/builtins.py:4897 3088msgid " brz missing -r ..-10" 3089msgstr "" 3090 3091#: breezy/builtins.py:4899 3092msgid "" 3093" Determine the missing revisions up to a specific revision on this\n" 3094" branch::" 3095msgstr "" 3096 3097#: breezy/builtins.py:4902 3098msgid " brz missing --my-revision ..-10" 3099msgstr "" 3100 3101# help of 'reverse' option of 'missing' command 3102#: breezy/builtins.py:4909 3103msgid "Reverse the order of revisions." 3104msgstr "" 3105 3106# help of 'mine-only' option of 'missing' command 3107#: breezy/builtins.py:4911 3108msgid "Display changes in the local branch only." 3109msgstr "" 3110 3111# help of 'this' option of 'missing' command 3112#: breezy/builtins.py:4912 3113msgid "Same as --mine-only." 3114msgstr "" 3115 3116# help of 'theirs-only' option of 'missing' command 3117#: breezy/builtins.py:4914 3118msgid "Display changes in the remote branch only." 3119msgstr "" 3120 3121# help of 'other' option of 'missing' command 3122#: breezy/builtins.py:4915 3123msgid "Same as --theirs-only." 3124msgstr "" 3125 3126# help of 'revision' option of 'missing' command 3127#: breezy/builtins.py:4920 3128msgid "" 3129"Filter on other branch revisions (inclusive). See \"help revisionspec\" for " 3130"details." 3131msgstr "" 3132 3133# help of 'my-revision' option of 'missing' command 3134#: breezy/builtins.py:4924 3135msgid "" 3136"Filter on local branch revisions (inclusive). See \"help revisionspec\" for " 3137"details." 3138msgstr "" 3139 3140# help of 'include-merged' option of 'missing' command 3141#: breezy/builtins.py:4927 3142msgid "Show all revisions in addition to the mainline ones." 3143msgstr "" 3144 3145#: breezy/builtins.py:4981 3146msgid "No peer location known or specified." 3147msgstr "" 3148 3149#: breezy/builtins.py:4985 3150#, python-brace-format 3151msgid "Using saved parent location: {0}\n" 3152msgstr "" 3153 3154#: breezy/builtins.py:5018 3155#, python-format 3156msgid "You have %d extra revision:\n" 3157msgid_plural "You have %d extra revisions:\n" 3158msgstr[0] "" 3159msgstr[1] "" 3160 3161#: breezy/builtins.py:5038 3162#, python-format 3163msgid "You are missing %d revision:\n" 3164msgid_plural "You are missing %d revisions:\n" 3165msgstr[0] "" 3166msgstr[1] "" 3167 3168#: breezy/builtins.py:5053 3169msgid "This branch has no new revisions.\n" 3170msgstr "" 3171 3172#: breezy/builtins.py:5056 3173msgid "Other branch has no new revisions.\n" 3174msgstr "" 3175 3176#: breezy/builtins.py:5061 3177msgid "Branches are up to date.\n" 3178msgstr "" 3179 3180#: breezy/builtins.py:5072 3181msgid "Compress the data within a repository." 3182msgstr "" 3183 3184#: breezy/builtins.py:5074 3185msgid "" 3186"This operation compresses the data within a bazaar repository. As\n" 3187"bazaar supports automatic packing of repository, this operation is\n" 3188"normally not required to be done manually." 3189msgstr "" 3190 3191#: breezy/builtins.py:5078 3192msgid "" 3193"During the pack operation, bazaar takes a backup of existing repository\n" 3194"data, i.e. pack files. This backup is eventually removed by bazaar\n" 3195"automatically when it is safe to do so. To save disk space by removing\n" 3196"the backed up pack files, the --clean-obsolete-packs option may be\n" 3197"used." 3198msgstr "" 3199 3200#: breezy/builtins.py:5084 3201msgid "" 3202"Warning: If you use --clean-obsolete-packs and your machine crashes\n" 3203"during or immediately after repacking, you may be left with a state\n" 3204"where the deletion has been written to disk but the new packs have not\n" 3205"been. In this case the repository may be unusable." 3206msgstr "" 3207 3208# help of 'clean-obsolete-packs' option of 'pack' command 3209#: breezy/builtins.py:5093 3210msgid "Delete obsolete packs to save disk space." 3211msgstr "" 3212 3213#: breezy/builtins.py:5107 3214msgid "List the installed plugins." 3215msgstr "" 3216 3217#: breezy/builtins.py:5109 3218msgid "" 3219"This command displays the list of installed plugins including\n" 3220"version of plugin and a short description of each." 3221msgstr "" 3222 3223#: breezy/builtins.py:5112 3224msgid "--verbose shows the path where each plugin is located." 3225msgstr "" 3226 3227#: breezy/builtins.py:5114 3228msgid "" 3229"A plugin is an external component for Bazaar that extends the\n" 3230"revision control system, by adding or replacing code in Bazaar.\n" 3231"Plugins can do a variety of things, including overriding commands,\n" 3232"adding new commands, providing additional network transports and\n" 3233"customizing log output." 3234msgstr "" 3235 3236#: breezy/builtins.py:5120 3237msgid "" 3238"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n" 3239"for further information on plugins including where to find them and how to\n" 3240"install them. Instructions are also provided there on how to write new\n" 3241"plugins using the Python programming language." 3242msgstr "" 3243 3244#: breezy/builtins.py:5136 3245msgid "Show testament (signing-form) of a revision." 3246msgstr "" 3247 3248# help of 'long' option of 'testament' command 3249#: breezy/builtins.py:5139 3250msgid "Produce long-format testament." 3251msgstr "" 3252 3253# help of 'strict' option of 'testament' command 3254#: breezy/builtins.py:5141 3255msgid "Produce a strict-format testament." 3256msgstr "" 3257 3258#: breezy/builtins.py:5168 3259msgid "Show the origin of each line in a file." 3260msgstr "" 3261 3262#: breezy/builtins.py:5170 3263msgid "" 3264"This prints out the given file with an annotation on the left side\n" 3265"indicating which revision, author and date introduced the change." 3266msgstr "" 3267 3268#: breezy/builtins.py:5173 3269msgid "" 3270"If the origin is the same for a run of consecutive lines, it is\n" 3271"shown only at the top, unless the --all option is given." 3272msgstr "" 3273 3274# help of 'all' option of 'annotate' command 3275#: breezy/builtins.py:5181 3276msgid "Show annotations on all lines." 3277msgstr "" 3278 3279# help of 'long' option of 'annotate' command 3280#: breezy/builtins.py:5182 3281msgid "Show commit date in annotations." 3282msgstr "" 3283 3284#: breezy/builtins.py:5269 3285msgid "Cannot sign a range of non-revision-history revisions" 3286msgstr "" 3287 3288#: breezy/builtins.py:5281 3289msgid "Please supply either one revision, or a range." 3290msgstr "" 3291 3292#: breezy/builtins.py:5285 3293msgid "" 3294"Convert the current branch into a checkout of the supplied branch.\n" 3295"If no branch is supplied, rebind to the last bound location." 3296msgstr "" 3297 3298#: breezy/builtins.py:5288 3299msgid "" 3300"Once converted into a checkout, commits must succeed on the master branch\n" 3301"before they will be applied to the local branch." 3302msgstr "" 3303 3304#: breezy/builtins.py:5291 3305msgid "" 3306"Bound branches use the nickname of its master branch unless it is set\n" 3307"locally, in which case binding will update the local nickname to be\n" 3308"that of the master." 3309msgstr "" 3310 3311#: breezy/builtins.py:5306 3312msgid "No location supplied. This format does not remember old locations." 3313msgstr "" 3314 3315#: breezy/builtins.py:5312 3316msgid "Branch is already bound" 3317msgstr "" 3318 3319#: breezy/builtins.py:5315 3320msgid "No location supplied and no previous location known" 3321msgstr "" 3322 3323#: breezy/builtins.py:5321 3324msgid "These branches have diverged. Try merging, and then bind again." 3325msgstr "" 3326 3327#: breezy/builtins.py:5328 3328msgid "Convert the current checkout into a regular branch." 3329msgstr "" 3330 3331#: breezy/builtins.py:5330 3332msgid "" 3333"After unbinding, the local branch is considered independent and subsequent\n" 3334"commits will be local only." 3335msgstr "" 3336 3337#: breezy/builtins.py:5341 3338msgid "Local branch is not bound" 3339msgstr "" 3340 3341#: breezy/builtins.py:5345 3342msgid "Remove the last committed revision." 3343msgstr "" 3344 3345#: breezy/builtins.py:5347 3346msgid "" 3347"--verbose will print out what is being removed.\n" 3348"--dry-run will go through all the motions, but not actually\n" 3349"remove anything." 3350msgstr "" 3351 3352#: breezy/builtins.py:5351 3353msgid "" 3354"If --revision is specified, uncommit revisions to leave the branch at the\n" 3355"specified revision. For example, \"brz uncommit -r 15\" will leave the\n" 3356"branch at revision 15." 3357msgstr "" 3358 3359#: breezy/builtins.py:5355 3360msgid "" 3361"Uncommit leaves the working tree ready for a new commit. The only change\n" 3362"it may make is to restore any pending merges that were present before\n" 3363"the commit." 3364msgstr "" 3365 3366# help of 'dry-run' option of 'uncommit' command 3367#: breezy/builtins.py:5366 3368msgid "Don't actually make changes." 3369msgstr "" 3370 3371# help of 'force' option of 'uncommit' command 3372#: breezy/builtins.py:5367 3373msgid "Say yes to all questions." 3374msgstr "" 3375 3376# help of 'keep-tags' option of 'uncommit' command 3377#: breezy/builtins.py:5369 3378msgid "Keep tags that point to removed revisions." 3379msgstr "" 3380 3381# help of 'local' option of 'uncommit' command 3382#: breezy/builtins.py:5371 3383msgid "Only remove the commits from the local branch when in a checkout." 3384msgstr "" 3385 3386#: breezy/builtins.py:5420 3387msgid "No revisions to uncommit.\n" 3388msgstr "" 3389 3390#: breezy/builtins.py:5435 3391msgid "Dry-run, pretending to remove the above revisions.\n" 3392msgstr "" 3393 3394#: breezy/builtins.py:5438 3395msgid "The above revision(s) will be removed.\n" 3396msgstr "" 3397 3398#: breezy/builtins.py:5442 3399msgid "Uncommit these revisions" 3400msgstr "" 3401 3402#: breezy/builtins.py:5445 3403msgid "Canceled\n" 3404msgstr "" 3405 3406#: breezy/builtins.py:5452 3407#, python-format 3408msgid "" 3409"You can restore the old tip by running:\n" 3410" brz pull . -r revid:%s\n" 3411msgstr "" 3412 3413#: breezy/builtins.py:5457 3414msgid "Break a dead lock." 3415msgstr "" 3416 3417#: breezy/builtins.py:5459 3418msgid "" 3419"This command breaks a lock on a repository, branch, working directory or\n" 3420"config file." 3421msgstr "" 3422 3423#: breezy/builtins.py:5462 3424msgid "" 3425"CAUTION: Locks should only be broken when you are sure that the process\n" 3426"holding the lock has been stopped." 3427msgstr "" 3428 3429#: breezy/builtins.py:5465 3430msgid "" 3431"You can get information on what locks are open via the 'brz info\n" 3432"[location]' command." 3433msgstr "" 3434 3435#: breezy/builtins.py:5468 3436msgid "" 3437":Examples:\n" 3438" brz break-lock\n" 3439" brz break-lock brz+ssh://example.com/brz/foo\n" 3440" brz break-lock --conf ~/.bazaar" 3441msgstr "" 3442 3443# help of 'config' option of 'break-lock' command 3444#: breezy/builtins.py:5477 3445msgid "LOCATION is the directory where the config lock is." 3446msgstr "" 3447 3448# help of 'force' option of 'break-lock' command 3449#: breezy/builtins.py:5479 3450msgid "Do not ask for confirmation before breaking the lock." 3451msgstr "" 3452 3453# help of 'protocol=bzr' option of 'serve' command 3454#: breezy/builtins.py:5514 3455msgid "The Bazaar smart server protocol over TCP. (default port: 4155)" 3456msgstr "" 3457 3458#: breezy/builtins.py:5515 3459msgid "Run the brz server." 3460msgstr "" 3461 3462# help of 'inet' option of 'serve' command 3463#: breezy/builtins.py:5521 3464msgid "Serve on stdin/out for use from inetd or sshd." 3465msgstr "" 3466 3467# title of 'protocol' option of 'serve' command 3468#: breezy/builtins.py:5522 3469msgid "protocol" 3470msgstr "" 3471 3472# help of 'protocol' option of 'serve' command 3473#: breezy/builtins.py:5523 3474msgid "Protocol to serve." 3475msgstr "" 3476 3477# help of 'listen' option of 'serve' command 3478#: breezy/builtins.py:5527 3479msgid "Listen for connections on nominated address." 3480msgstr "" 3481 3482# help of 'port' option of 'serve' command 3483#: breezy/builtins.py:5529 3484msgid "" 3485"Listen for connections on nominated port. Passing 0 as the port number will " 3486"result in a dynamically allocated port. The default port depends on the " 3487"protocol." 3488msgstr "" 3489 3490# help of 'directory' option of 'serve' command 3491#: breezy/builtins.py:5534 3492msgid "Serve contents of this directory." 3493msgstr "" 3494 3495# help of 'allow-writes' option of 'serve' command 3496#: breezy/builtins.py:5536 3497msgid "" 3498"By default the server is a readonly server. Supplying --allow-writes " 3499"enables write access to the contents of the served directory and below. " 3500"Note that ``brz serve`` does not perform authentication, so unless some form " 3501"of external authentication is arranged supplying this option leads to global " 3502"uncontrolled write access to your file system." 3503msgstr "" 3504 3505# help of 'client-timeout' option of 'serve' command 3506#: breezy/builtins.py:5545 3507msgid "Override the default idle client timeout (5min)." 3508msgstr "" 3509 3510#: breezy/builtins.py:5563 3511msgid "Combine a tree into its containing tree." 3512msgstr "" 3513 3514#: breezy/builtins.py:5565 3515msgid "This command requires the target tree to be in a rich-root format." 3516msgstr "" 3517 3518#: breezy/builtins.py:5567 3519msgid "" 3520"The TREE argument should be an independent tree, inside another tree, but\n" 3521"not part of it. (Such trees can be produced by \"brz split\", but also by\n" 3522"running \"brz branch\" with the target inside a tree.)" 3523msgstr "" 3524 3525#: breezy/builtins.py:5571 3526msgid "" 3527"The result is a combined tree, with the subtree no longer an independent\n" 3528"part. This is marked as a merge of the subtree into the containing tree,\n" 3529"and all history is preserved." 3530msgstr "" 3531 3532#: breezy/builtins.py:5589 3533#, python-format 3534msgid "" 3535"Can't join trees because %s doesn't support rich root data.\n" 3536"You can use brz upgrade on the repository." 3537msgstr "" 3538 3539#: breezy/builtins.py:5599 breezy/builtins.py:5605 3540#, python-brace-format 3541msgid "Cannot join {0}. {1}" 3542msgstr "" 3543 3544#: breezy/builtins.py:5609 3545msgid "Split a subdirectory of a tree into a separate tree." 3546msgstr "" 3547 3548#: breezy/builtins.py:5611 3549msgid "" 3550"This command will produce a target tree in a format that supports\n" 3551"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n" 3552"converted into earlier formats like 'dirstate-tags'." 3553msgstr "" 3554 3555#: breezy/builtins.py:5615 3556msgid "" 3557"The TREE argument should be a subdirectory of a working tree. That\n" 3558"subdirectory will be converted into an independent tree, with its own\n" 3559"branch. Commits in the top-level tree will not apply to the new subtree." 3560msgstr "" 3561 3562#: breezy/builtins.py:5695 3563msgid "No submit branch specified or known" 3564msgstr "" 3565 3566#: breezy/builtins.py:5704 breezy/send.py:109 3567msgid "No public branch specified or known" 3568msgstr "" 3569 3570#: breezy/builtins.py:5709 3571msgid "brz merge-directive takes at most two one revision identifiers" 3572msgstr "" 3573 3574#: breezy/builtins.py:5718 3575msgid "No revisions to bundle." 3576msgstr "" 3577 3578#: breezy/builtins.py:5737 3579msgid "Mail or create a merge-directive for submitting changes." 3580msgstr "" 3581 3582#: breezy/builtins.py:5739 3583msgid "A merge directive provides many things needed for requesting merges:" 3584msgstr "" 3585 3586#: breezy/builtins.py:5741 3587msgid "* A machine-readable description of the merge to perform" 3588msgstr "" 3589 3590#: breezy/builtins.py:5743 3591msgid "* An optional patch that is a preview of the changes requested" 3592msgstr "" 3593 3594#: breezy/builtins.py:5745 3595msgid "" 3596"* An optional bundle of revision data, so that the changes can be applied\n" 3597" directly from the merge directive, without retrieving data from a\n" 3598" branch." 3599msgstr "" 3600 3601#: breezy/builtins.py:5749 3602msgid "" 3603"`brz send` creates a compact data set that, when applied using brz\n" 3604"merge, has the same effect as merging from the source branch. " 3605msgstr "" 3606 3607#: breezy/builtins.py:5752 3608msgid "" 3609"By default the merge directive is self-contained and can be applied to any\n" 3610"branch containing submit_branch in its ancestory without needing access to\n" 3611"the source branch." 3612msgstr "" 3613 3614#: breezy/builtins.py:5756 3615msgid "" 3616"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n" 3617"revisions, but only a structured request to merge from the\n" 3618"public_location. In that case the public_branch is needed and it must be\n" 3619"up-to-date and accessible to the recipient. The public_branch is always\n" 3620"included if known, so that people can check it later." 3621msgstr "" 3622 3623#: breezy/builtins.py:5762 3624msgid "" 3625"The submit branch defaults to the parent of the source branch, but can be\n" 3626"overridden. Both submit branch and public branch will be remembered in\n" 3627"branch.conf the first time they are used for a particular branch. The\n" 3628"source branch defaults to that containing the working directory, but can\n" 3629"be changed using --from." 3630msgstr "" 3631 3632#: breezy/builtins.py:5768 3633msgid "" 3634"Both the submit branch and the public branch follow the usual behavior with\n" 3635"respect to --remember: If there is no default location set, the first send\n" 3636"will set it (use --no-remember to avoid setting it). After that, you can\n" 3637"omit the location to use the default. To change the default, use\n" 3638"--remember. The value will only be saved if the location can be accessed." 3639msgstr "" 3640 3641#: breezy/builtins.py:5774 3642msgid "" 3643"In order to calculate those changes, brz must analyse the submit branch.\n" 3644"Therefore it is most efficient for the submit branch to be a local mirror.\n" 3645"If a public location is known for the submit_branch, that location is used\n" 3646"in the merge directive." 3647msgstr "" 3648 3649#: breezy/builtins.py:5779 3650msgid "" 3651"The default behaviour is to send the merge directive by mail, unless -o is\n" 3652"given, in which case it is sent to a file." 3653msgstr "" 3654 3655#: breezy/builtins.py:5782 3656msgid "" 3657"Mail is sent using your preferred mail program. This should be transparent\n" 3658"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n" 3659"If the preferred client can't be found (or used), your editor will be used." 3660msgstr "" 3661 3662#: breezy/builtins.py:5786 3663msgid "" 3664"To use a specific mail program, set the mail_client configuration option.\n" 3665"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n" 3666"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app" 3667"\" (MacOS X's\n" 3668"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n" 3669"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also " 3670"add\n" 3671"supported clients." 3672msgstr "" 3673 3674#: breezy/builtins.py:5793 3675msgid "" 3676"If mail is being sent, a to address is required. This can be supplied\n" 3677"either on the commandline, by setting the submit_to configuration\n" 3678"option in the branch itself or the child_submit_to configuration option\n" 3679"in the submit branch." 3680msgstr "" 3681 3682#: breezy/builtins.py:5798 3683msgid "" 3684"Two formats are currently supported: \"4\" uses revision bundle format 4 " 3685"and\n" 3686"merge directive format 2. It is significantly faster and smaller than\n" 3687"older formats. It is compatible with Bazaar 0.19 and later. It is the\n" 3688"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n" 3689"format 1. It is compatible with Bazaar 0.12 - 0.18." 3690msgstr "" 3691 3692#: breezy/builtins.py:5804 3693msgid "" 3694"The merge directives created by brz send may be applied using brz merge or\n" 3695"brz pull by specifying a file containing a merge directive as the location." 3696msgstr "" 3697 3698#: breezy/builtins.py:5807 3699msgid "" 3700"brz send makes extensive use of public locations to map local locations " 3701"into\n" 3702"URLs that can be used by other people. See `brz help configuration` to\n" 3703"set them, and use `brz info` to display them." 3704msgstr "" 3705 3706# help of 'output' option of 'send' command 3707#: breezy/builtins.py:5831 3708msgid "Write merge directive to this file or directory; use - for stdout." 3709msgstr "" 3710 3711# help of 'strict' option of 'send' command 3712#: breezy/builtins.py:5835 3713msgid "" 3714"Refuse to send if there are uncommitted changes in the working tree, --no-" 3715"strict disables the check." 3716msgstr "" 3717 3718# help of 'mail-to' option of 'send' command 3719#: breezy/builtins.py:5837 3720msgid "Mail the request to this address." 3721msgstr "" 3722 3723# help of 'body' option of 'send' command 3724#: breezy/builtins.py:5841 3725msgid "Body for the email." 3726msgstr "" 3727 3728# help of 'no-bundle' option of 'send' command 3729#: breezy/builtins.py:5894 3730msgid "Do not include a bundle in the merge directive." 3731msgstr "" 3732 3733# help of 'no-patch' option of 'send' command 3734#: breezy/builtins.py:5895 3735msgid "Do not include a preview patch in the merge directive." 3736msgstr "" 3737 3738# help of 'remember' option of 'send' command 3739#: breezy/builtins.py:5898 3740msgid "Remember submit and public branch." 3741msgstr "" 3742 3743# help of 'from' option of 'send' command 3744#: breezy/builtins.py:5900 3745msgid "" 3746"Branch to generate the submission from, rather than the one containing the " 3747"working directory." 3748msgstr "" 3749 3750# title of 'format' option of 'send' command 3751# title of 'format' option of 'version-info' command 3752#: breezy/builtins.py:5910 breezy/cmd_version_info.py:76 3753msgid "format" 3754msgstr "" 3755 3756# help of 'format' option of 'send' command 3757#: breezy/builtins.py:5911 3758msgid "Use the specified output format." 3759msgstr "" 3760 3761#: breezy/builtins.py:5933 3762msgid "Create, remove or modify a tag naming a revision." 3763msgstr "" 3764 3765#: breezy/builtins.py:5935 3766msgid "" 3767"Tags give human-meaningful names to revisions. Commands that take a -r\n" 3768"(--revision) option can be given -rtag:X, where X is any previously\n" 3769"created tag." 3770msgstr "" 3771 3772#: breezy/builtins.py:5939 3773msgid "" 3774"Tags are stored in the branch. Tags are copied from one branch to another\n" 3775"along when you branch, push, pull or merge." 3776msgstr "" 3777 3778#: breezy/builtins.py:5942 3779msgid "" 3780"It is an error to give a tag name that already exists unless you pass\n" 3781"--force, in which case the tag is moved to point to the new revision." 3782msgstr "" 3783 3784#: breezy/builtins.py:5945 3785msgid "" 3786"To rename a tag (change the name but keep it on the same revsion), run " 3787"``bzr\n" 3788"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``." 3789msgstr "" 3790 3791#: breezy/builtins.py:5948 3792msgid "" 3793"If no tag name is specified it will be determined through the \n" 3794"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n" 3795"upstream releases by reading configure.ac. See ``brz help hooks`` for\n" 3796"details." 3797msgstr "" 3798 3799# help of 'delete' option of 'tag' command 3800#: breezy/builtins.py:5958 3801msgid "Delete this tag rather than placing it." 3802msgstr "" 3803 3804# help of 'directory' option of 'tag' command 3805#: breezy/builtins.py:5961 3806msgid "Branch in which to place the tag." 3807msgstr "" 3808 3809# help of 'force' option of 'tag' command 3810#: breezy/builtins.py:5963 3811msgid "Replace existing tags." 3812msgstr "" 3813 3814#: breezy/builtins.py:5978 3815msgid "No tag specified to delete." 3816msgstr "" 3817 3818#: breezy/builtins.py:5980 3819#, python-format 3820msgid "Deleted tag %s." 3821msgstr "" 3822 3823#: breezy/builtins.py:5985 3824msgid "Tags can only be placed on a single revision, not on a range" 3825msgstr "" 3826 3827#: breezy/builtins.py:5994 3828msgid "Please specify a tag name." 3829msgstr "" 3830 3831#: breezy/builtins.py:6002 3832#, python-format 3833msgid "Tag %s already exists for that revision." 3834msgstr "" 3835 3836#: breezy/builtins.py:6006 3837#, python-format 3838msgid "Created tag %s." 3839msgstr "" 3840 3841#: breezy/builtins.py:6008 3842#, python-format 3843msgid "Updated tag %s." 3844msgstr "" 3845 3846#: breezy/builtins.py:6012 3847msgid "List tags." 3848msgstr "" 3849 3850#: breezy/builtins.py:6014 3851msgid "" 3852"This command shows a table of tag names and the revisions they reference." 3853msgstr "" 3854 3855# help of 'directory' option of 'tags' command 3856#: breezy/builtins.py:6020 3857msgid "Branch whose tags should be displayed." 3858msgstr "" 3859 3860# help of 'sort' option of 'tags' command 3861#: breezy/builtins.py:6022 3862msgid "Sort tags by different criteria." 3863msgstr "" 3864 3865# title of 'sort' option of 'tags' command 3866#: breezy/builtins.py:6022 3867msgid "Sorting" 3868msgstr "" 3869 3870#: breezy/builtins.py:6091 3871msgid "Reconfigure the type of a brz directory." 3872msgstr "" 3873 3874#: breezy/builtins.py:6093 3875msgid "A target configuration must be specified." 3876msgstr "" 3877 3878#: breezy/builtins.py:6095 3879msgid "" 3880"For checkouts, the bind-to location will be auto-detected if not specified.\n" 3881"The order of preference is\n" 3882"1. For a lightweight checkout, the current bound location.\n" 3883"2. For branches that used to be checkouts, the previously-bound location.\n" 3884"3. The push location.\n" 3885"4. The parent location.\n" 3886"If none of these is available, --bind-to must be specified." 3887msgstr "" 3888 3889# title of 'tree_type' option of 'reconfigure' command 3890#: breezy/builtins.py:6109 3891msgid "Tree type" 3892msgstr "" 3893 3894# help of 'tree_type' option of 'reconfigure' command 3895#: breezy/builtins.py:6110 3896msgid "The relation between branch and tree." 3897msgstr "" 3898 3899# help of 'tree_type=branch' option of 'reconfigure' command 3900#: breezy/builtins.py:6112 3901msgid "Reconfigure to be an unbound branch with no working tree." 3902msgstr "" 3903 3904# help of 'tree_type=tree' option of 'reconfigure' command 3905#: breezy/builtins.py:6113 3906msgid "Reconfigure to be an unbound branch with a working tree." 3907msgstr "" 3908 3909# help of 'tree_type=checkout' option of 'reconfigure' command 3910#: breezy/builtins.py:6114 3911msgid "Reconfigure to be a bound branch with a working tree." 3912msgstr "" 3913 3914# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command 3915#: breezy/builtins.py:6115 3916msgid "Reconfigure to be a lightweight checkout (with no local history)." 3917msgstr "" 3918 3919# title of 'repository_type' option of 'reconfigure' command 3920#: breezy/builtins.py:6120 3921msgid "Repository type" 3922msgstr "" 3923 3924# help of 'repository_type' option of 'reconfigure' command 3925#: breezy/builtins.py:6121 3926msgid "Location fo the repository." 3927msgstr "" 3928 3929# help of 'repository_type=standalone' option of 'reconfigure' command 3930#: breezy/builtins.py:6123 3931msgid "" 3932"Reconfigure to be a standalone branch (i.e. stop using shared repository)." 3933msgstr "" 3934 3935# help of 'repository_type=use-shared' option of 'reconfigure' command 3936#: breezy/builtins.py:6125 3937msgid "Reconfigure to use a shared repository." 3938msgstr "" 3939 3940# title of 'repository_trees' option of 'reconfigure' command 3941#: breezy/builtins.py:6129 3942msgid "Trees in Repository" 3943msgstr "" 3944 3945# help of 'repository_trees' option of 'reconfigure' command 3946#: breezy/builtins.py:6130 3947msgid "Whether new branches in the repository have trees." 3948msgstr "" 3949 3950# help of 'repository_trees=with-trees' option of 'reconfigure' command 3951#: breezy/builtins.py:6132 3952msgid "Reconfigure repository to create working trees on branches by default." 3953msgstr "" 3954 3955# help of 'repository_trees=with-no-trees' option of 'reconfigure' command 3956#: breezy/builtins.py:6134 3957msgid "" 3958"Reconfigure repository to not create working trees on branches by default." 3959msgstr "" 3960 3961# help of 'bind-to' option of 'reconfigure' command 3962#: breezy/builtins.py:6137 3963msgid "Branch to bind checkout to." 3964msgstr "" 3965 3966# help of 'force' option of 'reconfigure' command 3967#: breezy/builtins.py:6139 3968msgid "Perform reconfiguration even if local changes will be lost." 3969msgstr "" 3970 3971# help of 'stacked-on' option of 'reconfigure' command 3972#: breezy/builtins.py:6142 3973msgid "Reconfigure a branch to be stacked on another branch." 3974msgstr "" 3975 3976# help of 'unstacked' option of 'reconfigure' command 3977#: breezy/builtins.py:6146 3978msgid "" 3979"Reconfigure a branch to be unstacked. This may require copying substantial " 3980"data into it." 3981msgstr "" 3982 3983#: breezy/builtins.py:6156 3984msgid "Can't use both --stacked-on and --unstacked" 3985msgstr "" 3986 3987#: breezy/builtins.py:6170 3988msgid "No target configuration specified" 3989msgstr "" 3990 3991#: breezy/builtins.py:6205 3992msgid "Set the branch of a checkout and update." 3993msgstr "" 3994 3995#: breezy/builtins.py:6207 3996msgid "" 3997"For lightweight checkouts, this changes the branch being referenced.\n" 3998"For heavyweight checkouts, this checks that there are no local commits\n" 3999"versus the current bound branch, then it makes the local branch a mirror\n" 4000"of the new location and binds to it." 4001msgstr "" 4002 4003#: breezy/builtins.py:6212 4004msgid "" 4005"In both cases, the working tree is updated and uncommitted changes\n" 4006"are merged. The user can commit or revert these as they desire." 4007msgstr "" 4008 4009#: breezy/builtins.py:6215 4010msgid "Pending merges need to be committed or reverted before using switch." 4011msgstr "" 4012 4013#: breezy/builtins.py:6217 4014msgid "" 4015"The path to the branch to switch to can be specified relative to the parent\n" 4016"directory of the current branch. For example, if you are currently in a\n" 4017"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n" 4018"/path/to/newbranch." 4019msgstr "" 4020 4021#: breezy/builtins.py:6222 4022msgid "" 4023"Bound branches use the nickname of its master branch unless it is set\n" 4024"locally, in which case switching will update the local nickname to be\n" 4025"that of the master." 4026msgstr "" 4027 4028# help of 'force' option of 'switch' command 4029#: breezy/builtins.py:6230 4030msgid "Switch even if local commits will be lost." 4031msgstr "" 4032 4033# help of 'create-branch' option of 'switch' command 4034#: breezy/builtins.py:6233 4035msgid "Create the target branch from this one before switching to it." 4036msgstr "" 4037 4038# help of 'store' option of 'switch' command 4039#: breezy/builtins.py:6236 4040msgid "Store and restore uncommitted changes in the branch." 4041msgstr "" 4042 4043#: breezy/builtins.py:6250 4044msgid "You must supply either a revision or a location" 4045msgstr "" 4046 4047#: breezy/builtins.py:6263 4048msgid "cannot create branch without source branch" 4049msgstr "" 4050 4051#: breezy/builtins.py:6289 4052msgid "Manage filtered views." 4053msgstr "" 4054 4055#: breezy/builtins.py:6291 4056msgid "" 4057"Views provide a mask over the tree so that users can focus on\n" 4058"a subset of a tree when doing their work. After creating a view,\n" 4059"commands that support a list of files - status, diff, commit, etc -\n" 4060"effectively have that list of files implicitly given each time.\n" 4061"An explicit list of files can still be given but those files\n" 4062"must be within the current view." 4063msgstr "" 4064 4065#: breezy/builtins.py:6298 4066msgid "" 4067"In most cases, a view has a short life-span: it is created to make\n" 4068"a selected change and is deleted once that change is committed.\n" 4069"At other times, you may wish to create one or more named views\n" 4070"and switch between them." 4071msgstr "" 4072 4073#: breezy/builtins.py:6303 4074msgid "" 4075"To disable the current view without deleting it, you can switch to\n" 4076"the pseudo view called ``off``. This can be useful when you need\n" 4077"to see the whole tree for an operation or two (e.g. merge) but\n" 4078"want to switch back to your view after that." 4079msgstr "" 4080 4081#: breezy/builtins.py:6308 4082msgid "" 4083":Examples:\n" 4084" To define the current view::" 4085msgstr "" 4086 4087#: breezy/builtins.py:6311 4088msgid " brz view file1 dir1 ..." 4089msgstr "" 4090 4091#: breezy/builtins.py:6313 4092msgid " To list the current view::" 4093msgstr "" 4094 4095#: breezy/builtins.py:6315 4096msgid " brz view" 4097msgstr "" 4098 4099#: breezy/builtins.py:6317 4100msgid " To delete the current view::" 4101msgstr "" 4102 4103#: breezy/builtins.py:6319 4104msgid " brz view --delete" 4105msgstr "" 4106 4107#: breezy/builtins.py:6321 4108msgid " To disable the current view without deleting it::" 4109msgstr "" 4110 4111#: breezy/builtins.py:6323 4112msgid " brz view --switch off" 4113msgstr "" 4114 4115#: breezy/builtins.py:6325 4116msgid " To define a named view and switch to it::" 4117msgstr "" 4118 4119#: breezy/builtins.py:6327 4120msgid " brz view --name view-name file1 dir1 ..." 4121msgstr "" 4122 4123#: breezy/builtins.py:6329 4124msgid " To list a named view::" 4125msgstr "" 4126 4127#: breezy/builtins.py:6331 4128msgid " brz view --name view-name" 4129msgstr "" 4130 4131#: breezy/builtins.py:6333 4132msgid " To delete a named view::" 4133msgstr "" 4134 4135#: breezy/builtins.py:6335 4136msgid " brz view --name view-name --delete" 4137msgstr "" 4138 4139#: breezy/builtins.py:6337 4140msgid " To switch to a named view::" 4141msgstr "" 4142 4143#: breezy/builtins.py:6339 4144msgid " brz view --switch view-name" 4145msgstr "" 4146 4147#: breezy/builtins.py:6341 4148msgid " To list all views defined::" 4149msgstr "" 4150 4151#: breezy/builtins.py:6343 4152msgid " brz view --all" 4153msgstr "" 4154 4155#: breezy/builtins.py:6345 4156msgid " To delete all views::" 4157msgstr "" 4158 4159#: breezy/builtins.py:6347 4160msgid " brz view --delete --all" 4161msgstr "" 4162 4163# help of 'all' option of 'view' command 4164#: breezy/builtins.py:6354 4165msgid "Apply list or delete action to all views." 4166msgstr "" 4167 4168# help of 'delete' option of 'view' command 4169#: breezy/builtins.py:6357 4170msgid "Delete the view." 4171msgstr "" 4172 4173# help of 'name' option of 'view' command 4174#: breezy/builtins.py:6360 4175msgid "Name of the view to define, list or delete." 4176msgstr "" 4177 4178# help of 'switch' option of 'view' command 4179#: breezy/builtins.py:6364 4180msgid "Name of the view to switch to." 4181msgstr "" 4182 4183#: breezy/builtins.py:6383 4184msgid "Both --delete and a file list specified" 4185msgstr "" 4186 4187#: breezy/builtins.py:6386 4188msgid "Both --delete and --switch specified" 4189msgstr "" 4190 4191#: breezy/builtins.py:6389 4192msgid "Deleted all views.\n" 4193msgstr "" 4194 4195#: breezy/builtins.py:6391 4196msgid "No current view to delete" 4197msgstr "" 4198 4199#: breezy/builtins.py:6394 4200#, python-format 4201msgid "Deleted '%s' view.\n" 4202msgstr "" 4203 4204#: breezy/builtins.py:6398 4205msgid "Both --switch and a file list specified" 4206msgstr "" 4207 4208#: breezy/builtins.py:6401 4209msgid "Both --switch and --all specified" 4210msgstr "" 4211 4212#: breezy/builtins.py:6404 4213msgid "No current view to disable" 4214msgstr "" 4215 4216#: breezy/builtins.py:6406 4217#, python-format 4218msgid "Disabled '%s' view.\n" 4219msgstr "" 4220 4221#: breezy/builtins.py:6410 breezy/builtins.py:6432 4222#, python-brace-format 4223msgid "Using '{0}' view: {1}\n" 4224msgstr "" 4225 4226#: breezy/builtins.py:6413 4227msgid "Views defined:\n" 4228msgstr "" 4229 4230#: breezy/builtins.py:6422 4231msgid "No views defined.\n" 4232msgstr "" 4233 4234#: breezy/builtins.py:6429 4235msgid "Cannot change the 'off' pseudo view" 4236msgstr "" 4237 4238#: breezy/builtins.py:6437 4239msgid "No current view.\n" 4240msgstr "" 4241 4242#: breezy/builtins.py:6440 4243#, python-brace-format 4244msgid "'{0}' view is: {1}\n" 4245msgstr "" 4246 4247#: breezy/builtins.py:6460 4248msgid " <no hooks installed>\n" 4249msgstr "" 4250 4251#: breezy/builtins.py:6464 4252msgid "Remove a branch." 4253msgstr "" 4254 4255#: breezy/builtins.py:6466 4256msgid "" 4257"This will remove the branch from the specified location but \n" 4258"will keep any working tree or repository in place." 4259msgstr "" 4260 4261#: breezy/builtins.py:6471 4262msgid " Remove the branch at repo/trunk::" 4263msgstr "" 4264 4265#: breezy/builtins.py:6473 4266msgid " bzr remove-branch repo/trunk" 4267msgstr "" 4268 4269# help of 'force' option of 'remove-branch' command 4270#: breezy/builtins.py:6480 4271msgid "Remove branch even if it is the active branch." 4272msgstr "" 4273 4274#: breezy/builtins.py:6494 4275msgid "Branch is active. Use --force to remove it." 4276msgstr "" 4277 4278# help of 'writer=plain' option of 'shelve' command 4279#: breezy/builtins.py:6498 4280msgid "Plaintext diff output." 4281msgstr "" 4282 4283#: breezy/builtins.py:6499 4284msgid "Temporarily set aside some changes from the current tree." 4285msgstr "" 4286 4287#: breezy/builtins.py:6501 4288msgid "" 4289"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n" 4290"ie. out of the way, until a later time when you can bring them back from\n" 4291"the shelf with the 'unshelve' command. The changes are stored alongside\n" 4292"your working tree, and so they aren't propagated along with your branch nor\n" 4293"will they survive its deletion." 4294msgstr "" 4295 4296#: breezy/builtins.py:6507 4297msgid "If shelve --list is specified, previously-shelved changes are listed." 4298msgstr "" 4299 4300#: breezy/builtins.py:6509 4301msgid "" 4302"Shelve is intended to help separate several sets of changes that have\n" 4303"been inappropriately mingled. If you just want to get rid of all changes\n" 4304"and you don't need to restore them later, use revert. If you want to\n" 4305"shelve all text changes at once, use shelve --all." 4306msgstr "" 4307 4308#: breezy/builtins.py:6514 4309msgid "" 4310"If filenames are specified, only the changes to those files will be\n" 4311"shelved. Other files will be left untouched." 4312msgstr "" 4313 4314#: breezy/builtins.py:6517 4315msgid "" 4316"If a revision is specified, changes since that revision will be shelved." 4317msgstr "" 4318 4319#: breezy/builtins.py:6519 4320msgid "" 4321"You can put multiple items on the shelf, and by default, 'unshelve' will\n" 4322"restore the most recently shelved changes." 4323msgstr "" 4324 4325#: breezy/builtins.py:6522 4326msgid "" 4327"For complicated changes, it is possible to edit the changes in a separate\n" 4328"editor program to decide what the file remaining in the working copy\n" 4329"should look like. To do this, add the configuration option" 4330msgstr "" 4331 4332#: breezy/builtins.py:6526 4333msgid " change_editor = PROGRAM @new_path @old_path" 4334msgstr "" 4335 4336#: breezy/builtins.py:6528 4337msgid "" 4338"where @new_path is replaced with the path of the new version of the \n" 4339"file and @old_path is replaced with the path of the old version of \n" 4340"the file. The PROGRAM should save the new file with the desired \n" 4341"contents of the file in the working tree.\n" 4342" " 4343msgstr "" 4344 4345# help of 'all' option of 'shelve' command 4346#: breezy/builtins.py:6540 4347msgid "Shelve all changes." 4348msgstr "" 4349 4350# help of 'writer' option of 'shelve' command 4351#: breezy/builtins.py:6542 4352msgid "Method to use for writing diffs." 4353msgstr "" 4354 4355# title of 'writer' option of 'shelve' command 4356#: breezy/builtins.py:6542 4357msgid "writer" 4358msgstr "" 4359 4360# help of 'list' option of 'shelve' command 4361#: breezy/builtins.py:6546 4362msgid "List shelved changes." 4363msgstr "" 4364 4365# help of 'destroy' option of 'shelve' command 4366#: breezy/builtins.py:6548 4367msgid "Destroy removed changes instead of shelving them." 4368msgstr "" 4369 4370#: breezy/builtins.py:6577 4371msgid "No shelved changes." 4372msgstr "" 4373 4374#: breezy/builtins.py:6588 4375msgid "Restore shelved changes." 4376msgstr "" 4377 4378#: breezy/builtins.py:6590 4379msgid "" 4380"By default, the most recently shelved changes are restored. However if you\n" 4381"specify a shelf by id those changes will be restored instead. This works\n" 4382"best when the changes don't depend on each other." 4383msgstr "" 4384 4385# help of 'action' option of 'unshelve' command 4386#: breezy/builtins.py:6599 4387msgid "The action to perform." 4388msgstr "" 4389 4390# title of 'action' option of 'resolve' command 4391# title of 'action' option of 'unshelve' command 4392#: breezy/builtins.py:6599 breezy/conflicts.py:694 4393msgid "action" 4394msgstr "" 4395 4396# help of 'action=apply' option of 'unshelve' command 4397#: breezy/builtins.py:6601 4398msgid "Apply changes and remove from the shelf." 4399msgstr "" 4400 4401# help of 'action=dry-run' option of 'unshelve' command 4402#: breezy/builtins.py:6602 4403msgid "Show changes, but do not apply or remove them." 4404msgstr "" 4405 4406# help of 'action=preview' option of 'unshelve' command 4407#: breezy/builtins.py:6603 4408msgid "" 4409"Instead of unshelving the changes, show the diff that would result from " 4410"unshelving." 4411msgstr "" 4412 4413# help of 'action=delete-only' option of 'unshelve' command 4414#: breezy/builtins.py:6605 4415msgid "Delete changes without applying them." 4416msgstr "" 4417 4418# help of 'action=keep' option of 'unshelve' command 4419#: breezy/builtins.py:6606 4420msgid "Apply changes but don't delete them." 4421msgstr "" 4422 4423#: breezy/builtins.py:6621 4424msgid "Remove unwanted files from working tree." 4425msgstr "" 4426 4427#: breezy/builtins.py:6623 4428msgid "" 4429"By default, only unknown files, not ignored files, are deleted. Versioned\n" 4430"files are never deleted." 4431msgstr "" 4432 4433#: breezy/builtins.py:6626 4434msgid "" 4435"Another class is 'detritus', which includes files emitted by brz during\n" 4436"normal operations and selftests. (The value of these files decreases with\n" 4437"time.)" 4438msgstr "" 4439 4440#: breezy/builtins.py:6630 4441msgid "" 4442"If no options are specified, unknown files are deleted. Otherwise, option\n" 4443"flags are respected, and may be combined." 4444msgstr "" 4445 4446#: breezy/builtins.py:6633 4447msgid "To check what clean-tree will do, use --dry-run." 4448msgstr "" 4449 4450# help of 'ignored' option of 'clean-tree' command 4451#: breezy/builtins.py:6636 4452msgid "Delete all ignored files." 4453msgstr "" 4454 4455# help of 'detritus' option of 'clean-tree' command 4456#: breezy/builtins.py:6637 4457msgid "" 4458"Delete conflict files, merge and revert backups, and failed selftest dirs." 4459msgstr "" 4460 4461# help of 'unknown' option of 'clean-tree' command 4462#: breezy/builtins.py:6640 4463msgid "Delete files unknown to brz (default)." 4464msgstr "" 4465 4466# help of 'dry-run' option of 'clean-tree' command 4467#: breezy/builtins.py:6641 4468msgid "Show files to delete instead of deleting them." 4469msgstr "" 4470 4471# help of 'force' option of 'clean-tree' command 4472#: breezy/builtins.py:6643 4473msgid "Do not prompt before deleting." 4474msgstr "" 4475 4476#: breezy/bundle/__init__.py:59 4477msgid "A directory cannot be a bundle" 4478msgstr "" 4479 4480#: breezy/bundle/apply_bundle.py:40 4481msgid "Install revisions" 4482msgstr "" 4483 4484#: breezy/bundle/commands.py:64 4485msgid "--verbose requires a merge directive" 4486msgstr "" 4487 4488#: breezy/bundle/commands.py:67 4489msgid "Bundle format not supported" 4490msgstr "" 4491 4492#: breezy/bundle/commands.py:77 4493msgid "Records\n" 4494msgstr "" 4495 4496#: breezy/bundle/commands.py:81 4497#, python-brace-format 4498msgid "{0}: {1} ({2} multiparent)\n" 4499msgstr "" 4500 4501#: breezy/bundle/commands.py:83 4502#, python-format 4503msgid "unique files: %d\n" 4504msgstr "" 4505 4506#: breezy/bundle/commands.py:92 4507msgid "Revisions\n" 4508msgstr "" 4509 4510#: breezy/bundle/commands.py:93 4511#, python-format 4512msgid "nicks: %s\n" 4513msgstr "" 4514 4515#: breezy/bundle/commands.py:95 4516#, python-format 4517msgid "" 4518"committers: \n" 4519"%s\n" 4520msgstr "" 4521 4522#: breezy/bundle/commands.py:103 4523msgid "Decoded contents\n" 4524msgstr "" 4525 4526#: breezy/bundle/serializer/v4.py:327 4527#, python-format 4528msgid "Bundling %d revision." 4529msgid_plural "Bundling %d revisions." 4530msgstr[0] "" 4531msgstr[1] "" 4532 4533#: breezy/bzrdir.py:487 4534#, python-brace-format 4535msgid "" 4536"making backup of {0}\n" 4537" to {1}" 4538msgstr "" 4539 4540#: breezy/bzrdir.py:510 4541#, python-brace-format 4542msgid "renamed {0} to {1}" 4543msgstr "" 4544 4545#: breezy/bzrdir.py:1639 4546#, python-format 4547msgid "" 4548"Source repository format does not support stacking, using format:\n" 4549" %s" 4550msgstr "" 4551 4552#: breezy/bzrdir.py:1659 4553#, python-format 4554msgid "" 4555"Source branch format does not support stacking, using format:\n" 4556" %s" 4557msgstr "" 4558 4559#: breezy/bzrdir.py:1805 4560msgid "starting repository conversion" 4561msgstr "" 4562 4563#: breezy/bzrdir.py:2026 4564#, python-brace-format 4565msgid "Using default stacking branch {0} at {1}" 4566msgstr "" 4567 4568#: breezy/check.py:108 4569msgid "check" 4570msgstr "" 4571 4572#: breezy/check.py:110 4573msgid "checking revisions" 4574msgstr "" 4575 4576#: breezy/check.py:112 4577msgid "checking commit contents" 4578msgstr "" 4579 4580#: breezy/check.py:114 4581msgid "checking file graphs" 4582msgstr "" 4583 4584#: breezy/check.py:118 4585msgid "checking branches and trees" 4586msgstr "" 4587 4588#: breezy/check.py:205 4589#, python-brace-format 4590msgid "checked repository {0} format {1}" 4591msgstr "" 4592 4593#: breezy/check.py:208 4594#, python-format 4595msgid "%6d revisions" 4596msgstr "" 4597 4598#: breezy/check.py:209 4599#, python-format 4600msgid "%6d file-ids" 4601msgstr "" 4602 4603#: breezy/check.py:211 4604#, python-format 4605msgid "%6d unreferenced text versions" 4606msgstr "" 4607 4608#: breezy/check.py:215 4609#, python-brace-format 4610msgid "unreferenced version: {{{0}}} in {1}" 4611msgstr "" 4612 4613#: breezy/check.py:218 4614#, python-format 4615msgid "%6d revisions are missing inventory_sha1" 4616msgstr "" 4617 4618#: breezy/check.py:221 4619#, python-format 4620msgid "%6d revisions are mentioned but not present" 4621msgstr "" 4622 4623#: breezy/check.py:224 4624#, python-format 4625msgid "%6d ghost revisions" 4626msgstr "" 4627 4628#: breezy/check.py:229 4629#, python-format 4630msgid "%6d revisions missing parents in ancestry" 4631msgstr "" 4632 4633#: breezy/check.py:233 4634#, python-format 4635msgid " %s should be in the ancestry for:" 4636msgstr "" 4637 4638#: breezy/check.py:237 4639#, python-format 4640msgid "%6d inconsistent parents" 4641msgstr "" 4642 4643#: breezy/check.py:241 4644msgid " * {0} version {1} has parents {2!r} but should have {3!r}" 4645msgstr "" 4646 4647#: breezy/check.py:247 4648#, python-format 4649msgid "%6d revisions have incorrect parents in the revision index" 4650msgstr "" 4651 4652#: breezy/check.py:253 4653msgid " {0} has wrong parents in index: {1!r} should be {2!r}" 4654msgstr "" 4655 4656#: breezy/check.py:267 4657#, python-brace-format 4658msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}" 4659msgstr "" 4660 4661#: breezy/check.py:296 4662#, python-brace-format 4663msgid "" 4664"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects " 4665"{{{4}}}" 4666msgstr "" 4667 4668#: breezy/check.py:354 4669#, python-format 4670msgid "Checking branch at '%s'." 4671msgstr "" 4672 4673#: breezy/check.py:374 4674#, python-format 4675msgid "Checking working tree at '%s'." 4676msgstr "" 4677 4678#: breezy/check.py:427 breezy/check.py:441 4679msgid "No branch found at specified location." 4680msgstr "" 4681 4682#: breezy/check.py:429 breezy/check.py:439 4683msgid "No working tree found at specified location." 4684msgstr "" 4685 4686#: breezy/check.py:432 4687#, python-format 4688msgid "Checking repository at '%s'." 4689msgstr "" 4690 4691#: breezy/check.py:443 4692msgid "No repository found at specified location." 4693msgstr "" 4694 4695#: breezy/clean_tree.py:63 4696msgid "Nothing to delete." 4697msgstr "" 4698 4699#: breezy/clean_tree.py:68 4700msgid "Are you sure you wish to delete these" 4701msgstr "" 4702 4703#: breezy/clean_tree.py:70 4704msgid "Canceled" 4705msgstr "" 4706 4707#: breezy/clean_tree.py:107 4708#, python-format 4709msgid "unable to remove %s" 4710msgstr "" 4711 4712#: breezy/clean_tree.py:111 4713msgid "deleting paths:" 4714msgstr "" 4715 4716#: breezy/clean_tree.py:125 4717#, python-brace-format 4718msgid "unable to remove \"{0}\": {1}." 4719msgstr "" 4720 4721#: breezy/clean_tree.py:130 4722msgid "No files deleted." 4723msgstr "" 4724 4725#: breezy/cmd_version_info.py:47 4726#, python-brace-format 4727msgid "No known version info format {0}. Supported types are: {1}" 4728msgstr "" 4729 4730# help of 'format=custom' option of 'version-info' command 4731#: breezy/cmd_version_info.py:52 4732msgid "Version info in Custom template-based format." 4733msgstr "" 4734 4735# help of 'format=python' option of 'version-info' command 4736#: breezy/cmd_version_info.py:52 4737msgid "Version info in Python format." 4738msgstr "" 4739 4740# help of 'format=rio' option of 'version-info' command 4741#: breezy/cmd_version_info.py:52 4742msgid "Version info in RIO (simple text) format (default)." 4743msgstr "" 4744 4745#: breezy/cmd_version_info.py:53 4746msgid "Show version information about this tree." 4747msgstr "" 4748 4749#: breezy/cmd_version_info.py:55 4750msgid "" 4751"You can use this command to add information about version into\n" 4752"source code of an application. The output can be in one of the\n" 4753"supported formats or in a custom format based on a template." 4754msgstr "" 4755 4756#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712 4757#: en/help_topics/configuration.txt:738 4758msgid "For example::" 4759msgstr "" 4760 4761#: breezy/cmd_version_info.py:61 4762msgid "" 4763" bzr version-info --custom \\\n" 4764" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\"" 4765msgstr "" 4766 4767#: breezy/cmd_version_info.py:64 4768msgid "" 4769"will produce a C header file with formatted string containing the\n" 4770"current revision number. Other supported variables in templates are:" 4771msgstr "" 4772 4773#: breezy/cmd_version_info.py:67 4774msgid "" 4775" * {date} - date of the last revision\n" 4776" * {build_date} - current date\n" 4777" * {revno} - revision number\n" 4778" * {revision_id} - revision id\n" 4779" * {branch_nick} - branch nickname\n" 4780" * {clean} - 0 if the source tree contains uncommitted changes,\n" 4781" otherwise 1" 4782msgstr "" 4783 4784# help of 'format' option of 'version-info' command 4785#: breezy/cmd_version_info.py:77 4786msgid "Select the output format." 4787msgstr "" 4788 4789# help of 'all' option of 'version-info' command 4790#: breezy/cmd_version_info.py:81 4791msgid "Include all possible information." 4792msgstr "" 4793 4794# help of 'check-clean' option of 'version-info' command 4795#: breezy/cmd_version_info.py:82 4796msgid "Check if tree is clean." 4797msgstr "" 4798 4799# help of 'include-history' option of 'version-info' command 4800#: breezy/cmd_version_info.py:84 4801msgid "Include the revision-history." 4802msgstr "" 4803 4804# help of 'include-file-revisions' option of 'version-info' command 4805#: breezy/cmd_version_info.py:86 4806msgid "Include the last revision for each file." 4807msgstr "" 4808 4809# help of 'template' option of 'version-info' command 4810#: breezy/cmd_version_info.py:87 4811msgid "Template for the output." 4812msgstr "" 4813 4814#: breezy/cmd_version_info.py:101 4815msgid "bzr version-info --revision takes exactly one revision specifier" 4816msgstr "" 4817 4818#: breezy/commands.py:229 4819#, python-format 4820msgid "unknown command \"%s\"" 4821msgstr "" 4822 4823#: breezy/commands.py:476 4824msgid "No help for this command." 4825msgstr "" 4826 4827#: breezy/commands.py:489 4828#, python-format 4829msgid ":Purpose: %s\n" 4830msgstr "" 4831 4832#: breezy/commands.py:491 4833#, python-format 4834msgid "" 4835":Usage:\n" 4836"%s\n" 4837msgstr "" 4838 4839#: breezy/commands.py:493 4840#, python-format 4841msgid ":Usage: %s\n" 4842msgstr "" 4843 4844#: breezy/commands.py:512 4845#, python-format 4846msgid ":Options:%s" 4847msgstr "" 4848 4849#: breezy/commands.py:523 4850#, python-format 4851msgid "" 4852":Description:\n" 4853" %s\n" 4854"\n" 4855msgstr "" 4856 4857#: breezy/commands.py:533 4858#, python-format 4859msgid "" 4860"See bzr help %s for more details and examples.\n" 4861"\n" 4862msgstr "" 4863 4864#: breezy/commands.py:538 4865msgid ":Aliases: " 4866msgstr "" 4867 4868#: breezy/commands.py:542 4869#, python-format 4870msgid ":From: plugin \"%s\"\n" 4871msgstr "" 4872 4873#: breezy/commands.py:554 4874#, python-brace-format 4875msgid ":doc:`{0} <{1}-help>`" 4876msgstr "" 4877 4878#: breezy/commands.py:558 4879#, python-format 4880msgid ":See also: %s" 4881msgstr "" 4882 4883#: breezy/commands.py:826 4884msgid "Only ASCII permitted in option names" 4885msgstr "" 4886 4887#: breezy/commands.py:851 breezy/commands.py:859 4888msgid "command {0!r} needs one or more {1}" 4889msgstr "" 4890 4891#: breezy/commands.py:868 4892msgid "command {0!r} requires argument {1}" 4893msgstr "" 4894 4895#: breezy/commands.py:875 4896#, python-brace-format 4897msgid "extra argument to command {0}: {1}" 4898msgstr "" 4899 4900#: breezy/commands.py:952 4901#, python-format 4902msgid "Profile data written to \"%s\"." 4903msgstr "" 4904 4905#: breezy/commit.py:117 breezy/commit.py:740 4906msgid "added" 4907msgstr "" 4908 4909#: breezy/commit.py:117 breezy/commit.py:748 4910msgid "modified" 4911msgstr "" 4912 4913#: breezy/commit.py:131 4914#, python-format 4915msgid "Committing%s" 4916msgstr "" 4917 4918#: breezy/commit.py:134 4919#, python-format 4920msgid "Committed revision %d." 4921msgstr "" 4922 4923#: breezy/commit.py:143 4924#, python-format 4925msgid "deleted %s" 4926msgstr "" 4927 4928#: breezy/commit.py:146 4929#, python-format 4930msgid "missing %s" 4931msgstr "" 4932 4933#: breezy/commit.py:511 4934#, python-brace-format 4935msgid "" 4936"Conflicting tags in bound branch:\n" 4937"{0}" 4938msgstr "" 4939 4940#: breezy/commit.py:742 4941msgid "renamed" 4942msgstr "" 4943 4944#: breezy/commit.py:976 4945msgid "unchanged" 4946msgstr "" 4947 4948#: breezy/commit.py:998 4949#, python-brace-format 4950msgid "{0} [{1}] - Stage" 4951msgstr "" 4952 4953#: breezy/commit.py:1001 4954#, python-format 4955msgid "%s - Stage" 4956msgstr "" 4957 4958#: breezy/commit_signature_commands.py:34 4959msgid "Sign all commits by a given committer." 4960msgstr "" 4961 4962#: breezy/commit_signature_commands.py:36 4963msgid "" 4964"If location is not specified the local tree is used.\n" 4965"If committer is not specified the default committer is used." 4966msgstr "" 4967 4968#: breezy/commit_signature_commands.py:39 4969msgid "This does not sign commits that already have signatures." 4970msgstr "" 4971 4972# help of 'dry-run' option of 'sign-my-commits' command 4973#: breezy/commit_signature_commands.py:47 4974msgid "" 4975"Don't actually sign anything, just print the revisions that would be signed." 4976msgstr "" 4977 4978#: breezy/commit_signature_commands.py:98 4979#, python-format 4980msgid "Signed %d revision.\n" 4981msgid_plural "Signed %d revisions.\n" 4982msgstr[0] "" 4983msgstr[1] "" 4984 4985#: breezy/commit_signature_commands.py:103 4986msgid "Verify all commit signatures." 4987msgstr "" 4988 4989#: breezy/commit_signature_commands.py:105 4990msgid "Verifies that all commits in the branch are signed by known GnuPG keys." 4991msgstr "" 4992 4993# help of 'acceptable-keys' option of 'verify-signatures' command 4994#: breezy/commit_signature_commands.py:110 4995msgid "" 4996"Comma separated list of GPG key patterns which are acceptable for " 4997"verification." 4998msgstr "" 4999 5000#: breezy/commit_signature_commands.py:148 5001msgid "Cannot verify a range of non-revision-history revisions" 5002msgstr "" 5003 5004#: breezy/commit_signature_commands.py:166 5005msgid "All commits signed with verifiable keys" 5006msgstr "" 5007 5008#: breezy/config.py:438 5009msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit." 5010msgstr "" 5011 5012#: breezy/config.py:2465 5013#, python-brace-format 5014msgid "{0} is not an SI unit." 5015msgstr "" 5016 5017#: breezy/config.py:3013 5018#, python-brace-format 5019msgid "" 5020"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value " 5021"will be saved." 5022msgstr "" 5023 5024#: breezy/config.py:3158 5025#, python-format 5026msgid "Invalid '%s', should be of the form 'name=value'" 5027msgstr "" 5028 5029#: breezy/config.py:4096 5030msgid "Display, set or remove a configuration option." 5031msgstr "" 5032 5033#: breezy/config.py:4098 5034msgid "Display the active value for option NAME." 5035msgstr "" 5036 5037#: breezy/config.py:4100 5038msgid "" 5039"If --all is specified, NAME is interpreted as a regular expression and all\n" 5040"matching options are displayed mentioning their scope and without resolving\n" 5041"option references in the value). The active value that bzr will take into\n" 5042"account is the first one displayed for each option." 5043msgstr "" 5044 5045#: breezy/config.py:4105 5046msgid "" 5047"If NAME is not given, --all .* is implied (all options are displayed for " 5048"the\n" 5049"current scope)." 5050msgstr "" 5051 5052#: breezy/config.py:4108 5053msgid "" 5054"Setting a value is achieved by using NAME=value without spaces. The value\n" 5055"is set in the most relevant scope and can be checked by displaying the\n" 5056"option again." 5057msgstr "" 5058 5059#: breezy/config.py:4112 5060msgid "Removing a value is achieved by using --remove NAME." 5061msgstr "" 5062 5063# help of 'scope' option of 'config' command 5064#: breezy/config.py:4122 5065msgid "Reduce the scope to the specified configuration file." 5066msgstr "" 5067 5068# help of 'all' option of 'config' command 5069#: breezy/config.py:4126 5070msgid "Display all the defined values for the matching options." 5071msgstr "" 5072 5073# help of 'remove' option of 'config' command 5074#: breezy/config.py:4128 5075msgid "Remove the option from the configuration file." 5076msgstr "" 5077 5078#: breezy/conflicts.py:50 5079msgid "List files with conflicts." 5080msgstr "" 5081 5082#: breezy/conflicts.py:57 5083msgid "" 5084"Conflicts normally are listed as short, human-readable messages. If --text\n" 5085"is supplied, the pathnames of files with text conflicts are listed,\n" 5086"instead. (This is useful for editing all files with text conflicts.)" 5087msgstr "" 5088 5089#: breezy/conflicts.py:61 5090msgid "Use bzr resolve when you have fixed a problem." 5091msgstr "" 5092 5093# help of 'text' option of 'conflicts' command 5094#: breezy/conflicts.py:66 5095msgid "List paths of files with text conflicts." 5096msgstr "" 5097 5098# help of 'action=done' option of 'resolve' command 5099#: breezy/conflicts.py:85 5100msgid "Marks the conflict as resolved." 5101msgstr "" 5102 5103# help of 'action=take-this' option of 'resolve' command 5104#: breezy/conflicts.py:88 5105msgid "Resolve the conflict preserving the version in the working tree." 5106msgstr "" 5107 5108# help of 'action=take-other' option of 'resolve' command 5109#: breezy/conflicts.py:91 5110msgid "Resolve the conflict taking the merged version into account." 5111msgstr "" 5112 5113# help of 'action' option of 'resolve' command 5114#: breezy/conflicts.py:98 5115msgid "How to resolve the conflict." 5116msgstr "" 5117 5118#: breezy/conflicts.py:104 5119msgid "Mark a conflict as resolved." 5120msgstr "" 5121 5122#: breezy/conflicts.py:111 5123msgid "" 5124"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n" 5125"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict " 5126"as\n" 5127"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved." 5128msgstr "" 5129 5130# help of 'all' option of 'resolve' command 5131#: breezy/conflicts.py:119 5132msgid "Resolve all conflicts in this tree." 5133msgstr "" 5134 5135#: breezy/conflicts.py:126 5136msgid "If --all is specified, no FILE may be provided" 5137msgstr "" 5138 5139#: breezy/conflicts.py:151 5140#, python-format 5141msgid "%d conflict auto-resolved." 5142msgid_plural "%d conflicts auto-resolved." 5143msgstr[0] "" 5144msgstr[1] "" 5145 5146#: breezy/conflicts.py:154 5147msgid "Remaining conflicts:" 5148msgstr "" 5149 5150#: breezy/conflicts.py:159 5151msgid "All conflicts resolved." 5152msgstr "" 5153 5154#: breezy/conflicts.py:168 5155#, python-brace-format 5156msgid "{0} conflict resolved, {1} remaining" 5157msgid_plural "{0} conflicts resolved, {1} remaining" 5158msgstr[0] "" 5159msgstr[1] "" 5160 5161#: breezy/controldir.py:712 5162#, python-brace-format 5163msgid "{0} is{1} redirected to {2}" 5164msgstr "" 5165 5166#: breezy/diff.py:413 5167#, python-format 5168msgid "*** Ignoring files outside view. View is %s" 5169msgstr "" 5170 5171#: breezy/errors.py:157 5172msgid "The tree builder is already building a tree." 5173msgstr "" 5174 5175#: breezy/errors.py:178 5176msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s" 5177msgstr "" 5178 5179#: breezy/errors.py:197 5180msgid "" 5181"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports " 5182"versions \"%(minimum)s\" to \"%(current)s\"." 5183msgstr "" 5184 5185#: breezy/errors.py:209 5186msgid "The transport '%(transport)s' is only accessible within this process." 5187msgstr "" 5188 5189#: breezy/errors.py:227 5190msgid "Invalid revision number %(revno)s" 5191msgstr "" 5192 5193#: breezy/errors.py:236 5194msgid "Invalid revision-id {%(revision_id)s} in %(branch)s" 5195msgstr "" 5196 5197#: breezy/errors.py:247 5198msgid "Reserved revision-id {%(revision_id)s}" 5199msgstr "" 5200 5201#: breezy/errors.py:261 5202msgid "There is no public branch set for \"%(branch_url)s\"." 5203msgstr "" 5204 5205#: breezy/errors.py:271 5206msgid "" 5207"No help could be found for '%(topic)s'. Please use 'bzr help topics' to " 5208"obtain a list of topics." 5209msgstr "" 5210 5211#: breezy/errors.py:280 5212msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s." 5213msgstr "" 5214 5215#: breezy/errors.py:290 5216msgid "" 5217"The file id \"%(file_id)s\" is not present in the repository %(repository)r" 5218msgstr "" 5219 5220#: breezy/errors.py:299 5221msgid "The branch '%(branch)s' is not stacked." 5222msgstr "" 5223 5224#: breezy/errors.py:313 5225msgid "No WorkingTree exists for \"%(base)s\"." 5226msgstr "" 5227 5228#: breezy/errors.py:322 5229msgid "Not currently building a tree." 5230msgstr "" 5231 5232#: breezy/errors.py:327 5233msgid "%(url)s is not a local path." 5234msgstr "" 5235 5236#: breezy/errors.py:355 5237msgid "%(not_locked)r is not write locked but needs to be." 5238msgstr "" 5239 5240#: breezy/errors.py:363 5241msgid "Error in command line options" 5242msgstr "" 5243 5244#: breezy/errors.py:368 5245msgid "%(value)s is not an index of type %(_type)s." 5246msgstr "" 5247 5248#: breezy/errors.py:378 5249msgid "Error in data for index %(value)s." 5250msgstr "" 5251 5252#: breezy/errors.py:387 5253msgid "The key '%(key)s' is already in index '%(index)s'." 5254msgstr "" 5255 5256#: breezy/errors.py:397 5257msgid "The key '%(key)s' is not a valid key." 5258msgstr "" 5259 5260#: breezy/errors.py:406 5261msgid "Could not parse options for index %(value)s." 5262msgstr "" 5263 5264#: breezy/errors.py:415 5265msgid "The value '%(value)s' is not a valid value." 5266msgstr "" 5267 5268#: breezy/errors.py:424 5269msgid "Bad value \"%(value)s\" for option \"%(name)s\"." 5270msgstr "" 5271 5272#: breezy/errors.py:443 5273msgid "Generic path error: %(path)r%(extra)s)" 5274msgstr "" 5275 5276#: breezy/errors.py:456 5277msgid "No such file: %(path)r%(extra)s" 5278msgstr "" 5279 5280#: breezy/errors.py:461 5281msgid "File exists: %(path)r%(extra)s" 5282msgstr "" 5283 5284#: breezy/errors.py:467 5285msgid "" 5286"Could not rename %(source)s => %(dest)s because both files exist. (Use --" 5287"after to tell bzr about a rename that has already happened)%(extra)s" 5288msgstr "" 5289 5290#: breezy/errors.py:483 5291msgid "\"%(path)s\" is not a directory %(extra)s" 5292msgstr "" 5293 5294#: breezy/errors.py:488 5295msgid "\"%(path)s\" is not in the working directory %(extra)s" 5296msgstr "" 5297 5298#: breezy/errors.py:493 5299msgid "Directory not empty: \"%(path)s\"%(extra)s" 5300msgstr "" 5301 5302#: breezy/errors.py:498 5303msgid "Hard-linking \"%(path)s\" is not supported" 5304msgstr "" 5305 5306#: breezy/errors.py:513 5307msgid "Device or resource busy: \"%(path)s\"%(extra)s" 5308msgstr "" 5309 5310#: breezy/errors.py:518 5311msgid "Permission denied: \"%(path)s\"%(extra)s" 5312msgstr "" 5313 5314#: breezy/errors.py:523 5315msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s" 5316msgstr "" 5317 5318#: breezy/errors.py:528 5319msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r" 5320msgstr "" 5321 5322#: breezy/errors.py:539 5323msgid "URLs differ by more than path: %(from_)r and %(to)r" 5324msgstr "" 5325 5326#: breezy/errors.py:561 5327msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy." 5328msgstr "" 5329 5330#: breezy/errors.py:571 5331msgid "Unsupported protocol for url \"%(path)s\"%(extra)s" 5332msgstr "" 5333 5334#: breezy/errors.py:579 5335msgid "" 5336"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to " 5337"upgrade the branch to permit branch stacking." 5338msgstr "" 5339 5340#: breezy/errors.py:590 5341msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." 5342msgstr "" 5343 5344#: breezy/errors.py:600 5345msgid "" 5346"The repository '%(url)s'(%(format)s) is not a stackable format. You will " 5347"need to upgrade the repository to permit branch stacking." 5348msgstr "" 5349 5350#: breezy/errors.py:611 5351msgid "Error reading from %(path)r." 5352msgstr "" 5353 5354#: breezy/errors.py:630 5355msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s" 5356msgstr "" 5357 5358#: breezy/errors.py:646 5359msgid "Path \"%(path)s\" is not unicode normalized" 5360msgstr "" 5361 5362#: breezy/errors.py:654 5363msgid "Not a branch: \"%(path)s\"%(detail)s." 5364msgstr "" 5365 5366#: breezy/errors.py:696 5367msgid "No submit branch available for branch \"%(path)s\"" 5368msgstr "" 5369 5370#: breezy/errors.py:705 5371msgid "A control directory already exists: \"%(path)s\"." 5372msgstr "" 5373 5374#: breezy/errors.py:710 5375msgid "Already a branch: \"%(path)s\"." 5376msgstr "" 5377 5378#: breezy/errors.py:715 5379msgid "Invalid branch name: %(name)s" 5380msgstr "" 5381 5382#: breezy/errors.py:724 5383msgid "Parent branch already exists: \"%(path)s\"." 5384msgstr "" 5385 5386#: breezy/errors.py:730 5387msgid "" 5388"Directory contains a branch, but no working tree (use bzr checkout if you " 5389"wish to build a working tree): \"%(path)s\"" 5390msgstr "" 5391 5392#: breezy/errors.py:735 5393msgid "" 5394"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\"" 5395msgstr "" 5396 5397#: breezy/errors.py:745 5398msgid "" 5399"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\"" 5400msgstr "" 5401 5402#: breezy/errors.py:755 5403msgid "No repository present: \"%(path)s\"" 5404msgstr "" 5405 5406#: breezy/errors.py:762 5407msgid "" 5408"Unsupported branch format: %(format)s\n" 5409"Please run 'bzr upgrade'" 5410msgstr "" 5411 5412#: breezy/errors.py:768 5413msgid "Unknown %(kind)s format: %(format)r" 5414msgstr "" 5415 5416#: breezy/errors.py:777 5417msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s." 5418msgstr "" 5419 5420#: breezy/errors.py:787 5421msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s" 5422msgstr "" 5423 5424#: breezy/errors.py:802 5425msgid "" 5426"%(target)s\n" 5427"is not compatible with\n" 5428"%(source)s\n" 5429"%(details)s" 5430msgstr "" 5431 5432#: breezy/errors.py:818 5433msgid "Revision is not compatible with %(repo_format)s" 5434msgstr "" 5435 5436#: breezy/errors.py:828 5437msgid "%(context_info)s%(path)s is already versioned." 5438msgstr "" 5439 5440#: breezy/errors.py:849 5441msgid "%(context_info)s%(path)s is not versioned." 5442msgstr "" 5443 5444#: breezy/errors.py:870 5445msgid "Path(s) are not versioned: %(paths_as_string)s" 5446msgstr "" 5447 5448#: breezy/errors.py:881 5449msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s" 5450msgstr "" 5451 5452#: breezy/errors.py:900 5453msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\"" 5454msgstr "" 5455 5456#: breezy/errors.py:908 5457msgid "" 5458"Filename %(filename)r is not valid in your current filesystem encoding " 5459"%(fs_encoding)s" 5460msgstr "" 5461 5462#: breezy/errors.py:919 5463msgid "Cannot operate on \"%(filename)s\" because it is a control file" 5464msgstr "" 5465 5466#: breezy/errors.py:937 5467msgid "The lock for '%(lock_description)s' is in use and cannot be broken." 5468msgstr "" 5469 5470#: breezy/errors.py:976 5471msgid "Cannot lock %(lock)s: %(why)s" 5472msgstr "" 5473 5474#: breezy/errors.py:986 5475msgid "" 5476"A transaction related operation was attempted after the transaction finished." 5477msgstr "" 5478 5479#: breezy/errors.py:1013 5480msgid "Cannot lock: transport is read only: %(transport)s" 5481msgstr "" 5482 5483#: breezy/errors.py:1021 5484msgid "Could not acquire lock \"%(lock)s\": %(msg)s" 5485msgstr "" 5486 5487#: breezy/errors.py:1032 5488msgid "Lock was broken while still open: %(lock)s - check storage consistency!" 5489msgstr "" 5490 5491#: breezy/errors.py:1043 5492msgid "" 5493"Lock was released and re-acquired before being broken: %(lock)s: held by " 5494"%(holder)r, wanted to break %(target)r" 5495msgstr "" 5496 5497#: breezy/errors.py:1055 5498msgid "" 5499"Lock is apparently held, but corrupted: %(corruption_info)s\n" 5500"Use 'bzr break-lock' to clear it" 5501msgstr "" 5502 5503#: breezy/errors.py:1068 5504msgid "Lock not held: %(lock)s" 5505msgstr "" 5506 5507#: breezy/errors.py:1097 5508msgid "No changes to commit" 5509msgstr "" 5510 5511#: breezy/errors.py:1102 5512msgid "" 5513"Selected-file commit of merges is not supported yet: files %(files_str)s" 5514msgstr "" 5515 5516#: breezy/errors.py:1112 5517msgid "" 5518"Excluding paths during commit is not supported by repository at " 5519"%(repository)r." 5520msgstr "" 5521 5522#: breezy/errors.py:1121 5523msgid "" 5524"The specified commit message contains characters unsupported by the current " 5525"encoding." 5526msgstr "" 5527 5528#: breezy/errors.py:1127 5529msgid "Upgrade URL cannot work with readonly URLs." 5530msgstr "" 5531 5532#: breezy/errors.py:1132 5533msgid "The branch format %(format)s is already at the most recent format." 5534msgstr "" 5535 5536#: breezy/errors.py:1155 5537msgid "Option --change does not accept revision ranges" 5538msgstr "" 5539 5540#: breezy/errors.py:1160 5541msgid "No namespace registered for string: %(spec)r" 5542msgstr "" 5543 5544#: breezy/errors.py:1179 5545msgid "" 5546"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s" 5547"%(extra)s" 5548msgstr "" 5549 5550#: breezy/errors.py:1193 5551msgid "" 5552"Operation denied because it would change the main history, which is not " 5553"permitted by the append_revisions_only setting on branch \"%(location)s\"." 5554msgstr "" 5555 5556#: breezy/errors.py:1204 5557msgid "" 5558"These branches have diverged. Use the missing command to see how.\n" 5559"Use the merge command to reconcile them." 5560msgstr "" 5561 5562#: breezy/errors.py:1224 5563msgid "" 5564"Branches have no common ancestor, and no merge base revision was specified." 5565msgstr "" 5566 5567#: breezy/errors.py:1230 5568msgid "" 5569"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3." 5570msgstr "" 5571 5572#: breezy/errors.py:1236 5573msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" 5574msgstr "" 5575 5576#: breezy/errors.py:1245 5577msgid "" 5578"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s." 5579msgstr "" 5580 5581#: breezy/errors.py:1254 5582msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" 5583msgstr "" 5584 5585#: breezy/errors.py:1263 5586msgid "Branch %(branch)s has no commits." 5587msgstr "" 5588 5589#: breezy/errors.py:1281 5590msgid "" 5591"Bound branch %(branch)s is out of date with master branch %(master)s." 5592"%(extra_help)s" 5593msgstr "" 5594 5595#: breezy/errors.py:1293 5596msgid "" 5597"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is " 5598"bound to %(remote)s." 5599msgstr "" 5600 5601#: breezy/errors.py:1305 5602msgid "Cannot pull --overwrite to a branch which is bound %(branch)s" 5603msgstr "" 5604 5605#: breezy/errors.py:1314 5606msgid "" 5607"Unable to connect to target of bound branch %(branch)s => %(target)s: " 5608"%(error)s" 5609msgstr "" 5610 5611#: breezy/errors.py:1326 5612msgid "Error in processing weave: %(msg)s" 5613msgstr "" 5614 5615#: breezy/errors.py:1335 5616msgid "Revision {%(revision_id)s} already present in %(weave)s" 5617msgstr "" 5618 5619#: breezy/errors.py:1346 5620msgid "Revision {%(revision_id)s} not present in %(weave)s" 5621msgstr "" 5622 5623#: breezy/errors.py:1356 5624msgid "Weave invariant violated: %(what)s" 5625msgstr "" 5626 5627#: breezy/errors.py:1365 5628msgid "Parents are mismatched between two revisions. %(msg)s" 5629msgstr "" 5630 5631#: breezy/errors.py:1387 5632msgid "" 5633"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, " 5634"%(weave_b)s" 5635msgstr "" 5636 5637#: breezy/errors.py:1399 5638msgid "Versioned file error" 5639msgstr "" 5640 5641#: breezy/errors.py:1404 5642msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"." 5643msgstr "" 5644 5645#: breezy/errors.py:1414 5646msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"." 5647msgstr "" 5648 5649#: breezy/errors.py:1424 5650msgid "Text did not match its checksum: %(msg)s" 5651msgstr "" 5652 5653#: breezy/errors.py:1550 5654msgid "Export format %(format)r not supported" 5655msgstr "" 5656 5657#: breezy/errors.py:1559 5658msgid "Transport error: %(msg)s %(orig_error)s" 5659msgstr "" 5660 5661#: breezy/errors.py:1585 5662msgid "Generic bzr smart protocol error: %(details)s" 5663msgstr "" 5664 5665#: breezy/errors.py:1593 5666msgid "Received bad protocol version marker: %(marker)r" 5667msgstr "" 5668 5669#: breezy/errors.py:1625 5670msgid "Transport operation not possible: %(msg)s %(orig_error)s" 5671msgstr "" 5672 5673#: breezy/errors.py:1630 5674msgid "Connection error: %(msg)s %(orig_error)s" 5675msgstr "" 5676 5677#: breezy/errors.py:1635 5678msgid "%(msg)s %(host)s%(port)s%(orig_error)s" 5679msgstr "" 5680 5681#: breezy/errors.py:1656 5682msgid "Connection closed: %(msg)s %(orig_error)s" 5683msgstr "" 5684 5685#: breezy/errors.py:1661 5686msgid "Connection Timeout: %(msg)s%(orig_error)s" 5687msgstr "" 5688 5689#: breezy/errors.py:1666 5690msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s" 5691msgstr "" 5692 5693#: breezy/errors.py:1676 5694msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s" 5695msgstr "" 5696 5697#: breezy/errors.py:1691 5698msgid "Invalid http range %(range)r for %(path)s: %(msg)s" 5699msgstr "" 5700 5701#: breezy/errors.py:1705 5702msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s" 5703msgstr "" 5704 5705#: breezy/errors.py:1713 5706msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s" 5707msgstr "" 5708 5709#: breezy/errors.py:1722 5710msgid "%(source)s is%(permanently)s redirected to %(target)s" 5711msgstr "" 5712 5713#: breezy/errors.py:1736 5714msgid "Too many redirections" 5715msgstr "" 5716 5717#: breezy/errors.py:1741 5718msgid "Working tree has conflicts." 5719msgstr "" 5720 5721#: breezy/errors.py:1745 5722msgid "Config file %(filename)s is not UTF-8 encoded\n" 5723msgstr "" 5724 5725#: breezy/errors.py:1754 5726msgid "" 5727"Error(s) parsing config file %(filename)s:\n" 5728"%(errors)s" 5729msgstr "" 5730 5731#: breezy/errors.py:1764 5732msgid "" 5733"Bad value \"%(value)s\" for option \"%(name)s\".\n" 5734"See ``bzr help %(name)s``" 5735msgstr "" 5736 5737#: breezy/errors.py:1774 5738msgid "%(username)r does not seem to contain a reasonable email address" 5739msgstr "" 5740 5741#: breezy/errors.py:1783 5742msgid "Failed to GPG sign data with command \"%(command_line)s\"" 5743msgstr "" 5744 5745#: breezy/errors.py:1791 5746msgid "Failed to verify GPG signature data with error \"%(error)s\"" 5747msgstr "" 5748 5749#: breezy/errors.py:1799 5750msgid "Unable to import library \"%(library)s\": %(error)s" 5751msgstr "" 5752 5753#: breezy/errors.py:1807 5754msgid "python-gpgme is not installed, it is needed to verify signatures" 5755msgstr "" 5756 5757#: breezy/errors.py:1815 5758msgid "" 5759"The working tree for %(basedir)s has changed since the last commit, but " 5760"weave merge requires that it be unchanged" 5761msgstr "" 5762 5763#: breezy/errors.py:1825 5764msgid "" 5765"Can't reprocess and show base, because reprocessing obscures the " 5766"relationship of conflicting lines to the base" 5767msgstr "" 5768 5769#: breezy/errors.py:1831 5770msgid "Cycle in graph %(graph)r" 5771msgstr "" 5772 5773#: breezy/errors.py:1859 5774msgid "File %(filename)s is not conflicted." 5775msgstr "" 5776 5777#: breezy/errors.py:1881 5778msgid "No bundle was found in \"%(filename)s\"." 5779msgstr "" 5780 5781#: breezy/errors.py:1890 5782msgid "Unable to handle bundle version %(version)s: %(msg)s" 5783msgstr "" 5784 5785#: breezy/errors.py:1900 5786msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s" 5787msgstr "" 5788 5789#: breezy/errors.py:1913 5790msgid "File id {%(file_id)s} already exists in inventory as %(entry)s" 5791msgstr "" 5792 5793#: breezy/errors.py:1923 5794msgid "Key %(key)s is already present in map" 5795msgstr "" 5796 5797#: breezy/errors.py:1928 5798msgid "The prefix %(prefix)s is in the help search path twice." 5799msgstr "" 5800 5801#: breezy/errors.py:1938 5802msgid "" 5803"No final name for trans_id %(trans_id)r\n" 5804"file-id: %(file_id)r\n" 5805"root trans-id: %(root_trans_id)r\n" 5806msgstr "" 5807 5808#: breezy/errors.py:1970 5809msgid "Attempt to reuse a transform that has already been applied." 5810msgstr "" 5811 5812#: breezy/errors.py:1975 5813msgid "Moving the root directory is not supported at this time" 5814msgstr "" 5815 5816#: breezy/errors.py:1980 5817msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s" 5818msgstr "" 5819 5820#: breezy/errors.py:1991 5821msgid "" 5822"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" 5823msgstr "" 5824 5825#: breezy/errors.py:2027 5826msgid "" 5827"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" 5828msgstr "" 5829 5830#: breezy/errors.py:2057 5831msgid "Unable to import paramiko (required for sftp support): %(error)s" 5832msgstr "" 5833 5834#: breezy/errors.py:2065 5835msgid "Nothing to merge." 5836msgstr "" 5837 5838#: breezy/errors.py:2070 5839msgid "Format %(format)s cannot be initialised by this version of bzr." 5840msgstr "" 5841 5842#: breezy/errors.py:2079 5843msgid "" 5844"Cannot convert from format %(from_format)s to format %(format)s. " 5845"%(problem)s" 5846msgstr "" 5847 5848#: breezy/errors.py:2091 5849msgid "Could not find an appropriate Differ for file \"%(path)s\"" 5850msgstr "" 5851 5852#: breezy/errors.py:2099 5853msgid "%(exe_name)s could not be found on this machine" 5854msgstr "" 5855 5856#: breezy/errors.py:2107 5857msgid "Diff is not installed on this machine: %(msg)s" 5858msgstr "" 5859 5860#: breezy/errors.py:2115 5861msgid "Diff3 is not installed on this machine." 5862msgstr "" 5863 5864#: breezy/errors.py:2121 5865msgid "The content being inserted is already present." 5866msgstr "" 5867 5868#: breezy/errors.py:2126 5869msgid "" 5870"This tree contains left-over files from a failed operation.\n" 5871" Please examine %(limbo_dir)s to see if it contains any files you wish " 5872"to\n" 5873" keep, and delete it when you are done." 5874msgstr "" 5875 5876#: breezy/errors.py:2137 5877msgid "" 5878"This tree contains left-over files from a failed operation.\n" 5879" Please examine %(pending_deletion)s to see if it contains any files you\n" 5880" wish to keep, and delete it when you are done." 5881msgstr "" 5882 5883#: breezy/errors.py:2147 5884msgid "" 5885"Unable to delete transform temporary directory %(limbo_dir)s.\n" 5886" Please examine %(limbo_dir)s to see if it contains any files you wish " 5887"to\n" 5888" keep, and delete it when you are done." 5889msgstr "" 5890 5891#: breezy/errors.py:2158 5892msgid "" 5893"Unable to delete transform temporary directory %(pending_deletion)s. Please " 5894"examine %(pending_deletion)s to see if it contains any files you wish to " 5895"keep, and delete it when you are done." 5896msgstr "" 5897 5898#: breezy/errors.py:2168 5899msgid "Working tree is out of date, please run 'bzr update'.%(more)s" 5900msgstr "" 5901 5902#: breezy/errors.py:2182 5903msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"." 5904msgstr "" 5905 5906#: breezy/errors.py:2195 5907msgid "Error in merge modified format" 5908msgstr "" 5909 5910#: breezy/errors.py:2200 5911msgid "Format error in conflict listings" 5912msgstr "" 5913 5914#: breezy/errors.py:2204 5915msgid "" 5916"Inconsistency in dirstate file %(dirstate_path)s.\n" 5917"Error: %(description)s" 5918msgstr "" 5919 5920#: breezy/errors.py:2215 5921msgid "" 5922"An error has been detected in the repository %(repo_path)s.\n" 5923"Please run bzr reconcile on this repository." 5924msgstr "" 5925 5926#: breezy/errors.py:2226 5927msgid "" 5928"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n" 5929"reason: %(reason)s" 5930msgstr "" 5931 5932#: breezy/errors.py:2239 5933msgid "" 5934"An inconsistent delta was supplied: %(delta)r\n" 5935"reason: %(reason)s" 5936msgstr "" 5937 5938#: breezy/errors.py:2251 5939msgid "To use this feature you must upgrade your branch at %(path)s." 5940msgstr "" 5941 5942#: breezy/errors.py:2260 5943msgid "To use this feature you must upgrade your repository at %(path)s." 5944msgstr "" 5945 5946#: breezy/errors.py:2265 5947msgid "" 5948"To use this feature you must upgrade your branch at %(path)s to a format " 5949"which supports rich roots." 5950msgstr "" 5951 5952#: breezy/errors.py:2271 5953msgid "Cannot perform local-only commits on unbound branches." 5954msgstr "" 5955 5956#: breezy/errors.py:2276 5957msgid "The method %(mname)s is not supported on objects of type %(tname)s." 5958msgstr "" 5959 5960#: breezy/errors.py:2297 5961msgid "Ghost tags not supported by format %(format)r." 5962msgstr "" 5963 5964#: breezy/errors.py:2305 5965msgid "File is binary but should be text." 5966msgstr "" 5967 5968#: breezy/errors.py:2310 5969msgid "The path %(path)s is not permitted on this platform" 5970msgstr "" 5971 5972#: breezy/errors.py:2319 5973msgid "" 5974"Testament did not match expected value.\n" 5975" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n" 5976" {%(measured)s}" 5977msgstr "" 5978 5979#: breezy/errors.py:2331 5980msgid "Not a bzr revision-bundle: %(text)r" 5981msgstr "" 5982 5983#: breezy/errors.py:2340 5984msgid "Bad bzr revision-bundle: %(text)r" 5985msgstr "" 5986 5987#: breezy/errors.py:2349 5988msgid "Malformed bzr revision-bundle header: %(text)r" 5989msgstr "" 5990 5991#: breezy/errors.py:2354 5992msgid "Malformed patches in bzr revision-bundle: %(text)r" 5993msgstr "" 5994 5995#: breezy/errors.py:2359 5996msgid "Malformed footer in bzr revision-bundle: %(text)r" 5997msgstr "" 5998 5999#: breezy/errors.py:2364 6000msgid "End of line marker was not \\n in bzr revision-bundle" 6001msgstr "" 6002 6003#: breezy/errors.py:2374 6004msgid "Bundle format %(bundle_format)s is incompatible with %(other)s" 6005msgstr "" 6006 6007#: breezy/errors.py:2384 6008msgid "Root class for inventory serialization errors" 6009msgstr "" 6010 6011#: breezy/errors.py:2388 6012msgid "" 6013"The inventory was not in the expected format:\n" 6014" %(msg)s" 6015msgstr "" 6016 6017#: breezy/errors.py:2397 6018msgid "This operation requires rich root data storage" 6019msgstr "" 6020 6021#: breezy/errors.py:2410 6022msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s" 6023msgstr "" 6024 6025#: breezy/errors.py:2419 6026msgid "" 6027"Don't know how to handle SSH connections. Please set BRZ_SSH environment " 6028"variable." 6029msgstr "" 6030 6031#: breezy/errors.py:2426 6032msgid "" 6033"Could not determine revno for {%(revision_id)s} because its ancestry shows a " 6034"ghost at {%(ghost_revision_id)s}" 6035msgstr "" 6036 6037#: breezy/errors.py:2436 6038msgid "Ghost revision {%(revision_id)s} cannot be used here." 6039msgstr "" 6040 6041#: breezy/errors.py:2487 6042msgid "" 6043"A merge directive must provide either a bundle or a public branch location." 6044msgstr "" 6045 6046#: breezy/errors.py:2494 6047msgid "Bad merge directive payload %(start)r" 6048msgstr "" 6049 6050#: breezy/errors.py:2504 6051msgid "Preview patch does not match requested changes." 6052msgstr "" 6053 6054#: breezy/errors.py:2510 6055msgid "Patch_type was %(patch_type)s, but no patch was supplied." 6056msgstr "" 6057 6058#: breezy/errors.py:2520 6059msgid "" 6060"Your branch does not have all of the revisions required in order to merge " 6061"this merge directive and the target location specified in the merge " 6062"directive is not a branch: %(location)s." 6063msgstr "" 6064 6065#: breezy/errors.py:2532 6066msgid "Unsupported entry kind %(kind)s" 6067msgstr "" 6068 6069#: breezy/errors.py:2540 6070msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s" 6071msgstr "" 6072 6073#: breezy/errors.py:2550 6074msgid "Subsume target %(other_tree)s needs to be upgraded." 6075msgstr "" 6076 6077#: breezy/errors.py:2569 6078msgid "No such tag: %(tag_name)s" 6079msgstr "" 6080 6081#: breezy/errors.py:2577 6082msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade." 6083msgstr "" 6084 6085#: breezy/errors.py:2586 6086msgid "Tag %(tag_name)s already exists." 6087msgstr "" 6088 6089#: breezy/errors.py:2594 6090msgid "" 6091"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs" 6092"\" for more information on this feature." 6093msgstr "" 6094 6095#: breezy/errors.py:2604 6096msgid "" 6097"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s" 6098msgstr "" 6099 6100#: breezy/errors.py:2614 6101msgid "" 6102"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s" 6103msgstr "" 6104 6105#: breezy/errors.py:2624 6106msgid "Invalid line in bugs property: '%(line)s'" 6107msgstr "" 6108 6109#: breezy/errors.py:2632 6110msgid "Invalid bug status: '%(status)s'" 6111msgstr "" 6112 6113#: breezy/errors.py:2640 6114msgid "Could not understand response from smart server: %(response_tuple)r" 6115msgstr "" 6116 6117#: breezy/errors.py:2679 6118msgid "Server sent an unexpected error: %(error_tuple)r" 6119msgstr "" 6120 6121#: breezy/errors.py:2698 6122msgid "Unrecognised container format: %(container_format)r" 6123msgstr "" 6124 6125#: breezy/errors.py:2706 6126msgid "Unexpected end of container stream" 6127msgstr "" 6128 6129#: breezy/errors.py:2711 6130msgid "Unknown record type: %(record_type)r" 6131msgstr "" 6132 6133#: breezy/errors.py:2719 6134msgid "Invalid record: %(reason)s" 6135msgstr "" 6136 6137#: breezy/errors.py:2727 6138msgid "Container has data after end marker: %(excess)r" 6139msgstr "" 6140 6141#: breezy/errors.py:2735 6142msgid "Container has multiple records with the same name: %(name)s" 6143msgstr "" 6144 6145#: breezy/errors.py:2748 6146msgid "Corrupt or incompatible data stream: %(reason)s" 6147msgstr "" 6148 6149#: breezy/errors.py:2756 6150msgid "SMTP error: %(error)s" 6151msgstr "" 6152 6153#: breezy/errors.py:2764 6154msgid "No message supplied." 6155msgstr "" 6156 6157#: breezy/errors.py:2769 6158msgid "No mail-to address (--mail-to) or output (-o) specified." 6159msgstr "" 6160 6161#: breezy/errors.py:2774 6162msgid "" 6163"Unable to find mail client with the following names: " 6164"%(mail_command_list_string)s" 6165msgstr "" 6166 6167#: breezy/errors.py:2784 6168msgid "SMTP connection to %(host)s refused" 6169msgstr "" 6170 6171#: breezy/errors.py:2793 6172msgid "Please specify smtp_server. No server at default %(host)s." 6173msgstr "" 6174 6175#: breezy/errors.py:2807 6176msgid "" 6177"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-" 6178"reconfigure." 6179msgstr "" 6180 6181#: breezy/errors.py:2819 6182msgid "'%(display_url)s' is already a branch." 6183msgstr "" 6184 6185#: breezy/errors.py:2824 6186msgid "'%(display_url)s' is already a tree." 6187msgstr "" 6188 6189#: breezy/errors.py:2829 6190msgid "'%(display_url)s' is already a checkout." 6191msgstr "" 6192 6193#: breezy/errors.py:2834 6194msgid "'%(display_url)s' is already a lightweight checkout." 6195msgstr "" 6196 6197#: breezy/errors.py:2839 6198msgid "'%(display_url)s' is already using a shared repository." 6199msgstr "" 6200 6201#: breezy/errors.py:2844 6202msgid "'%(display_url)s' is already standalone." 6203msgstr "" 6204 6205#: breezy/errors.py:2849 6206msgid "Shared repository '%(display_url)s' already creates working trees." 6207msgstr "" 6208 6209#: breezy/errors.py:2855 6210msgid "" 6211"Shared repository '%(display_url)s' already doesn't create working trees." 6212msgstr "" 6213 6214#: breezy/errors.py:2861 6215msgid "Requested reconfiguration of '%(display_url)s' is not supported." 6216msgstr "" 6217 6218#: breezy/errors.py:2866 6219msgid "No location could be found to bind to at %(display_url)s." 6220msgstr "" 6221 6222#: breezy/errors.py:2871 6223msgid "" 6224"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)." 6225"%(more)s" 6226msgstr "" 6227 6228#: breezy/errors.py:2890 6229msgid "" 6230"Branch \"%(display_url)s\" does not support storing uncommitted changes." 6231msgstr "" 6232 6233#: breezy/errors.py:2905 6234msgid "" 6235"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)." 6236"%(more)s" 6237msgstr "" 6238 6239#: breezy/errors.py:2911 6240msgid "Variable {%(name)s} is not available." 6241msgstr "" 6242 6243#: breezy/errors.py:2919 6244msgid "No template specified." 6245msgstr "" 6246 6247#: breezy/errors.py:2924 6248msgid "Unable to create symlink %(path_str)son this platform" 6249msgstr "" 6250 6251#: breezy/errors.py:2939 6252msgid "" 6253"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original" 6254"\", \"local\"." 6255msgstr "" 6256 6257#: breezy/errors.py:2973 6258msgid "" 6259"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s" 6260msgstr "" 6261 6262#: breezy/errors.py:2985 6263msgid "The \"%(config_id)s\" configuration does not exist." 6264msgstr "" 6265 6266#: breezy/errors.py:2993 6267msgid "The \"%(option_name)s\" configuration option does not exist." 6268msgstr "" 6269 6270#: breezy/errors.py:3001 6271msgid "The alias \"%(alias_name)s\" does not exist." 6272msgstr "" 6273 6274#: breezy/errors.py:3015 6275msgid "\"%(alias_name)s\" is not a valid location alias." 6276msgstr "" 6277 6278#: breezy/errors.py:3023 6279msgid "No %(alias_name)s location assigned." 6280msgstr "" 6281 6282#: breezy/errors.py:3031 6283msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s." 6284msgstr "" 6285 6286#: breezy/errors.py:3041 6287msgid "Unknown rules detected: %(unknowns_str)s." 6288msgstr "" 6289 6290#: breezy/errors.py:3052 6291msgid "Tip change rejected: %(msg)s" 6292msgstr "" 6293 6294#: breezy/errors.py:3060 6295msgid "Shelf corrupt." 6296msgstr "" 6297 6298#: breezy/errors.py:3065 6299msgid "Corruption while decompressing repository file%(orig_error)s" 6300msgstr "" 6301 6302#: breezy/errors.py:3077 6303msgid "No changes are shelved with id \"%(shelf_id)d\"." 6304msgstr "" 6305 6306#: breezy/errors.py:3085 6307msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead." 6308msgstr "" 6309 6310#: breezy/errors.py:3093 6311msgid "An attempt to access a url outside the server jail was made: '%(url)s'." 6312msgstr "" 6313 6314#: breezy/errors.py:3101 6315msgid "The user aborted the operation." 6316msgstr "" 6317 6318#: breezy/errors.py:3106 6319msgid "Branching '%(url)s'(%(format)s) must create a working tree." 6320msgstr "" 6321 6322#: breezy/errors.py:3116 6323msgid "No such view: %(view_name)s." 6324msgstr "" 6325 6326#: breezy/errors.py:3126 6327msgid "" 6328"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree " 6329"to a later format." 6330msgstr "" 6331 6332#: breezy/errors.py:3135 6333msgid "" 6334"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s" 6335msgstr "" 6336 6337#: breezy/errors.py:3202 6338msgid "%(bzrdir)r does not support co-located branches." 6339msgstr "" 6340 6341#: breezy/errors.py:3208 6342msgid "" 6343"Unable to determine your name.\n" 6344"Please, set your name with the 'whoami' command.\n" 6345"E.g. bzr whoami \"Your Name <name@example.com>\"" 6346msgstr "" 6347 6348#: breezy/errors.py:3217 6349msgid "Invalid pattern(s) found. %(msg)s" 6350msgstr "" 6351 6352#: breezy/errors.py:3225 6353msgid "" 6354"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr " 6355"unbind` to fix." 6356msgstr "" 6357 6358#: breezy/errors.py:3236 6359msgid "Loop involving %(refs)r while expanding \"%(string)s\"." 6360msgstr "" 6361 6362#: breezy/errors.py:3245 6363msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"." 6364msgstr "" 6365 6366#: breezy/errors.py:3254 6367msgid "Option \"%(name)s\" is not allowed." 6368msgstr "" 6369 6370#: breezy/errors.py:3262 6371msgid "" 6372"No compatible object available for operations from %(source)r to %(target)r." 6373msgstr "" 6374 6375#: breezy/errors.py:3272 6376msgid "" 6377"VFS requests over the smart server are not allowed. Encountered: %(method)s, " 6378"%(arguments)s." 6379msgstr "" 6380 6381#: breezy/errors.py:3282 6382msgid "" 6383"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by " 6384"format %(format)r" 6385msgstr "" 6386 6387#: breezy/errors.py:3294 6388msgid "" 6389"Missing feature %(feature)s not provided by this version of Bazaar or any " 6390"plugin." 6391msgstr "" 6392 6393#: breezy/errors.py:3307 6394msgid "Binary files section encountered." 6395msgstr "" 6396 6397#: breezy/errors.py:3315 6398msgid "" 6399"Malformed patch header. %(desc)s\n" 6400"%(line)r" 6401msgstr "" 6402 6403#: breezy/errors.py:3324 6404msgid "" 6405"Malformed hunk header. %(desc)s\n" 6406"%(line)r" 6407msgstr "" 6408 6409#: breezy/errors.py:3333 6410msgid "" 6411"Malformed line. %(desc)s\n" 6412"%(line)r" 6413msgstr "" 6414 6415#: breezy/errors.py:3343 6416msgid "" 6417"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", " 6418"but patch says it should be \"%(patch_line)s\"" 6419msgstr "" 6420 6421#: breezy/errors.py:3354 6422msgid "The feature %(feature)s has already been registered." 6423msgstr "" 6424 6425#: breezy/errors.py:3362 6426msgid "" 6427"Cannot store uncommitted changes because this branch already stores " 6428"uncommitted changes." 6429msgstr "" 6430 6431#: breezy/export_pot.py:252 6432#, python-format 6433msgid "Exporting messages from builtin command: %s" 6434msgstr "" 6435 6436#: breezy/export_pot.py:271 6437#, python-brace-format 6438msgid "Exporting messages from plugin command: {0} in {1}" 6439msgstr "" 6440 6441#: breezy/export_pot.py:292 6442#, python-format 6443msgid "Exporting message from error: %s" 6444msgstr "" 6445 6446#: breezy/fetch.py:98 6447msgid "Finding revisions" 6448msgstr "" 6449 6450#: breezy/fetch.py:103 6451msgid "Fetching revisions" 6452msgstr "" 6453 6454#: breezy/foreign.py:262 6455msgid "Push into a different VCS without any custom bzr metadata." 6456msgstr "" 6457 6458#: breezy/foreign.py:264 6459msgid "" 6460"This will afterwards rebase the local branch on the remote\n" 6461"branch unless the --no-rebase option is used, in which case \n" 6462"the two branches will be out of sync after the push. " 6463msgstr "" 6464 6465# help of 'no-rebase' option of 'dpush' command 6466#: breezy/foreign.py:277 6467msgid "Do not rebase after push." 6468msgstr "" 6469 6470#: breezy/foreign.py:311 6471#, python-format 6472msgid "Using saved location: %s\n" 6473msgstr "" 6474 6475#: breezy/foreign.py:321 6476msgid "" 6477"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use " 6478"regular push." 6479msgstr "" 6480 6481#: breezy/gpg.py:358 6482#, python-brace-format 6483msgid "No GnuPG key results for pattern: {0}" 6484msgstr "" 6485 6486#: breezy/gpg.py:431 6487#, python-brace-format 6488msgid "{0} commits with valid signatures" 6489msgstr "" 6490 6491#: breezy/gpg.py:437 6492#, python-brace-format 6493msgid "{0} commit with unknown key" 6494msgid_plural "{0} commits with unknown keys" 6495msgstr[0] "" 6496msgstr[1] "" 6497 6498#: breezy/gpg.py:445 6499#, python-brace-format 6500msgid "{0} commit not valid" 6501msgid_plural "{0} commits not valid" 6502msgstr[0] "" 6503msgstr[1] "" 6504 6505#: breezy/gpg.py:453 6506#, python-brace-format 6507msgid "{0} commit not signed" 6508msgid_plural "{0} commits not signed" 6509msgstr[0] "" 6510msgstr[1] "" 6511 6512#: breezy/gpg.py:461 6513#, python-brace-format 6514msgid "{0} commit with key now expired" 6515msgid_plural "{0} commits with key now expired" 6516msgstr[0] "" 6517msgstr[1] "" 6518 6519#: breezy/gpg.py:481 6520#, python-brace-format 6521msgid "{0} commit by author {1} with key {2} now expired" 6522msgid_plural "{0} commits by author {1} with key {2} now expired" 6523msgstr[0] "" 6524msgstr[1] "" 6525 6526#: breezy/gpg.py:497 6527#, python-brace-format 6528msgid "{0} signed {1} commit" 6529msgid_plural "{0} signed {1} commits" 6530msgstr[0] "" 6531msgstr[1] "" 6532 6533#: breezy/gpg.py:514 breezy/gpg.py:531 6534#, python-brace-format 6535msgid "{0} commit by author {1}" 6536msgid_plural "{0} commits by author {1}" 6537msgstr[0] "" 6538msgstr[1] "" 6539 6540#: breezy/gpg.py:546 6541#, python-brace-format 6542msgid "Unknown key {0} signed {1} commit" 6543msgid_plural "Unknown key {0} signed {1} commits" 6544msgstr[0] "" 6545msgstr[1] "" 6546 6547#: breezy/groupcompress.py:1739 6548#, python-format 6549msgid "Insert claimed random_id=True, but then inserted %r two times" 6550msgstr "" 6551 6552#: breezy/hooks.py:313 6553#, python-format 6554msgid "Introduced in: %s" 6555msgstr "" 6556 6557#: breezy/hooks.py:316 6558#, python-format 6559msgid "Deprecated in: %s" 6560msgstr "" 6561 6562#: breezy/knit.py:1766 breezy/knit.py:1802 6563msgid "Walking content" 6564msgstr "" 6565 6566#: breezy/knit.py:3330 6567msgid "annotating" 6568msgstr "" 6569 6570#: breezy/lock.py:549 6571msgid "{0!r} was {1} locked again" 6572msgstr "" 6573 6574#: breezy/lockdir.py:321 6575#, python-format 6576msgid "error removing pending lock: %s" 6577msgstr "" 6578 6579#: breezy/lockdir.py:616 6580msgid "Unable to obtain" 6581msgstr "" 6582 6583#: breezy/lockdir.py:618 6584msgid "Lock owner changed for" 6585msgstr "" 6586 6587#: breezy/lockdir.py:620 6588#, python-brace-format 6589msgid "{0} lock {1} {2}." 6590msgstr "" 6591 6592#: breezy/lockdir.py:627 6593#, python-format 6594msgid "Will continue to try until %s, unless you press Ctrl-C." 6595msgstr "" 6596 6597#: breezy/lockdir.py:629 6598msgid "See \"bzr help break-lock\" for more." 6599msgstr "" 6600 6601#: breezy/lockdir.py:739 6602#, python-format 6603msgid "" 6604"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s" 6605msgstr "" 6606 6607#: breezy/log.py:563 6608msgid "--exclude-common-ancestry requires two different revisions" 6609msgstr "" 6610 6611#: breezy/log.py:565 6612#, python-format 6613msgid "invalid direction %r" 6614msgstr "" 6615 6616#: breezy/log.py:653 6617msgid "Start revision not found in history of end revision." 6618msgstr "" 6619 6620#: breezy/log.py:1071 breezy/log.py:1129 6621msgid "Logging revision 0 is invalid." 6622msgstr "" 6623 6624#: breezy/log.py:1073 breezy/log.py:1131 6625msgid "Start revision must be older than the end revision." 6626msgstr "" 6627 6628#: breezy/log.py:1818 6629#, python-format 6630msgid "unknown log formatter: %r" 6631msgstr "" 6632 6633#: breezy/log.py:2114 6634msgid "fixes bug" 6635msgid_plural "fixes bugs" 6636msgstr[0] "" 6637msgstr[1] "" 6638 6639#: breezy/merge.py:689 6640msgid "All changes applied successfully." 6641msgstr "" 6642 6643#: breezy/merge.py:691 6644#, python-format 6645msgid "%d conflicts encountered." 6646msgstr "" 6647 6648#: breezy/merge.py:845 breezy/merge.py:1868 6649msgid "Preparing file merge" 6650msgstr "" 6651 6652#: breezy/multiparent.py:426 6653msgid "Importing revisions" 6654msgstr "" 6655 6656# help of 'help' option 6657#: breezy/option.py:526 6658msgid "Show help message." 6659msgstr "" 6660 6661# help of 'quiet' option 6662#: breezy/option.py:528 6663msgid "Only display errors and warnings." 6664msgstr "" 6665 6666# help of 'usage' option 6667#: breezy/option.py:531 6668msgid "Show usage message and options." 6669msgstr "" 6670 6671# help of 'verbose' option 6672#: breezy/option.py:533 6673msgid "Display more information." 6674msgstr "" 6675 6676# help of 'change' option 6677#: breezy/option.py:541 6678msgid "" 6679"Select changes introduced by the specified revision. See also \"help " 6680"revisionspec\"." 6681msgstr "" 6682 6683# help of 'directory' option 6684#: breezy/option.py:543 6685msgid "Branch to operate on, instead of working directory." 6686msgstr "" 6687 6688# help of 'log-format=long' option 6689#: breezy/option.py:545 6690msgid "Detailed log format." 6691msgstr "" 6692 6693# help of 'log-format=gnu-changelog' option 6694#: breezy/option.py:545 6695msgid "Format used by GNU ChangeLog files." 6696msgstr "" 6697 6698# help of 'log-format=line' option 6699#: breezy/option.py:545 6700msgid "Log format with one line per revision." 6701msgstr "" 6702 6703# help of 'log-format=short' option 6704#: breezy/option.py:545 6705msgid "Moderately short log format." 6706msgstr "" 6707 6708# help of 'log-format' option 6709#: breezy/option.py:545 6710msgid "Use specified log format." 6711msgstr "" 6712 6713# title of 'log-format' option 6714#: breezy/option.py:547 6715msgid "Log format" 6716msgstr "" 6717 6718# help of 'merge-type=lca' option 6719#: breezy/option.py:549 6720msgid "LCA-newness merge." 6721msgstr "" 6722 6723# help of 'merge-type=diff3' option 6724#: breezy/option.py:549 6725msgid "Merge using external diff3." 6726msgstr "" 6727 6728# help of 'merge-type=merge3' option 6729#: breezy/option.py:549 6730msgid "Native diff3-style merge." 6731msgstr "" 6732 6733# help of 'merge-type' option 6734#: breezy/option.py:549 6735msgid "Select a particular merge algorithm." 6736msgstr "" 6737 6738# help of 'merge-type=weave' option 6739#: breezy/option.py:549 6740msgid "Weave-based merge." 6741msgstr "" 6742 6743# title of 'merge-type' option 6744#: breezy/option.py:551 6745msgid "Merge algorithm" 6746msgstr "" 6747 6748# help of 'message' option 6749#: breezy/option.py:554 6750msgid "Message string." 6751msgstr "" 6752 6753# help of 'null' option 6754#: breezy/option.py:556 6755msgid "Use an ASCII NUL (\\0) separator rather than a newline." 6756msgstr "" 6757 6758# help of 'overwrite' option 6759#: breezy/option.py:558 6760msgid "Ignore differences between branches and overwrite unconditionally." 6761msgstr "" 6762 6763# help of 'remember' option 6764#: breezy/option.py:560 6765msgid "Remember the specified location as a default." 6766msgstr "" 6767 6768# help of 'reprocess' option 6769#: breezy/option.py:562 6770msgid "Reprocess to reduce spurious conflicts." 6771msgstr "" 6772 6773# help of 'revision' option 6774#: breezy/option.py:566 6775msgid "See \"help revisionspec\" for details." 6776msgstr "" 6777 6778# help of 'show-ids' option 6779#: breezy/option.py:568 6780msgid "Show internal object ids." 6781msgstr "" 6782 6783# help of 'timezone' option 6784#: breezy/option.py:571 6785msgid "Display timezone as local, original, or utc." 6786msgstr "" 6787 6788#: breezy/osutils.py:101 6789msgid "Parameter {0!r} encoding is unsupported by {1} application locale." 6790msgstr "" 6791 6792#: breezy/osutils.py:221 6793msgid "lstat/stat of ({0!r}): {1!r}" 6794msgstr "" 6795 6796#: breezy/osutils.py:1041 breezy/osutils.py:1052 6797#, python-format 6798msgid "sorry, %r not allowed in path" 6799msgstr "" 6800 6801#: breezy/osutils.py:1270 6802#, python-format 6803msgid "%r is too short to calculate a relative path" 6804msgstr "" 6805 6806#: breezy/plugin.py:143 6807#, python-format 6808msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description " 6809msgstr "" 6810 6811# help of 'plugin' option of 'bash-completion' command 6812#: breezy/plugins/bash_completion/bashcomp.py:411 6813msgid "Enable completions for the selected plugin (default: all plugins)" 6814msgstr "" 6815 6816#: breezy/plugins/bash_completion/bashcomp.py:412 6817msgid "Generate a shell function for bash command line completion." 6818msgstr "" 6819 6820#: breezy/plugins/bash_completion/bashcomp.py:414 6821msgid "" 6822"This command generates a shell function which can be used by bash to\n" 6823"automatically complete the currently typed command when the user presses\n" 6824"the completion key (usually tab)." 6825msgstr "" 6826 6827#: breezy/plugins/bash_completion/bashcomp.py:418 6828msgid "" 6829"Commonly used like this:\n" 6830" eval \"`bzr bash-completion`\"" 6831msgstr "" 6832 6833# help of 'function-name' option of 'bash-completion' command 6834#: breezy/plugins/bash_completion/bashcomp.py:424 6835msgid "Name of the generated function (default: _bzr)" 6836msgstr "" 6837 6838# help of 'function-only' option of 'bash-completion' command 6839#: breezy/plugins/bash_completion/bashcomp.py:426 6840msgid "Generate only the shell function, don't enable it" 6841msgstr "" 6842 6843#: breezy/plugins/grep/cmds.py:77 6844msgid "Print lines matching PATTERN for specified files and revisions." 6845msgstr "" 6846 6847#: breezy/plugins/grep/cmds.py:79 6848msgid "" 6849"This command searches the specified files and revisions for a given\n" 6850"pattern. The pattern is specified as a Python regular expressions[1]." 6851msgstr "" 6852 6853#: breezy/plugins/grep/cmds.py:82 6854msgid "" 6855"If the file name is not specified, the revisions starting with the\n" 6856"current directory are searched recursively. If the revision number is\n" 6857"not specified, the working copy is searched. To search the last committed\n" 6858"revision, use the '-r -1' or '-r last:1' option." 6859msgstr "" 6860 6861#: breezy/plugins/grep/cmds.py:87 6862msgid "" 6863"Unversioned files are not searched unless explicitly specified on the\n" 6864"command line. Unversioned directores are not searched." 6865msgstr "" 6866 6867#: breezy/plugins/grep/cmds.py:90 6868msgid "" 6869"When searching a pattern, the output is shown in the 'filepath:string'\n" 6870"format. If a revision is explicitly searched, the output is shown as\n" 6871"'filepath~N:string', where N is the revision number." 6872msgstr "" 6873 6874#: breezy/plugins/grep/cmds.py:94 6875msgid "" 6876"--include and --exclude options can be used to search only (or exclude\n" 6877"from search) files with base name matches the specified Unix style GLOB\n" 6878"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n" 6879"to quote wildcard or backslash character literally. Note that the glob\n" 6880"pattern is not a regular expression." 6881msgstr "" 6882 6883#: breezy/plugins/grep/cmds.py:100 6884msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax" 6885msgstr "" 6886 6887# help of 'color' option of 'grep' command 6888#: breezy/plugins/grep/cmds.py:109 6889msgid "Show match in color. WHEN is never, always or auto." 6890msgstr "" 6891 6892# help of 'diff' option of 'grep' command 6893#: breezy/plugins/grep/cmds.py:111 6894msgid "Grep for pattern in changeset for each revision." 6895msgstr "" 6896 6897# help of 'exclude' option of 'grep' command 6898#: breezy/plugins/grep/cmds.py:113 6899msgid "Skip files whose base name matches GLOB." 6900msgstr "" 6901 6902# help of 'include' option of 'grep' command 6903#: breezy/plugins/grep/cmds.py:115 6904msgid "Search only files whose base name matches GLOB." 6905msgstr "" 6906 6907# help of 'files-with-matches' option of 'grep' command 6908#: breezy/plugins/grep/cmds.py:117 6909msgid "Print only the name of each input file in which PATTERN is found." 6910msgstr "" 6911 6912# help of 'files-without-match' option of 'grep' command 6913#: breezy/plugins/grep/cmds.py:120 6914msgid "Print only the name of each input file in which PATTERN is not found." 6915msgstr "" 6916 6917# help of 'fixed-string' option of 'grep' command 6918#: breezy/plugins/grep/cmds.py:123 6919msgid "Interpret PATTERN is a single fixed string (not regex)." 6920msgstr "" 6921 6922# help of 'from-root' option of 'grep' command 6923#: breezy/plugins/grep/cmds.py:125 6924msgid "" 6925"Search for pattern starting from the root of the branch. (implies --" 6926"recursive)" 6927msgstr "" 6928 6929# help of 'ignore-case' option of 'grep' command 6930#: breezy/plugins/grep/cmds.py:128 6931msgid "ignore case distinctions while matching." 6932msgstr "" 6933 6934# help of 'levels' option of 'grep' command 6935#: breezy/plugins/grep/cmds.py:130 6936msgid "" 6937"Number of levels to display - 0 for all, 1 for collapsed (1 is default)." 6938msgstr "" 6939 6940# help of 'line-number' option of 'grep' command 6941#: breezy/plugins/grep/cmds.py:135 6942msgid "show 1-based line number." 6943msgstr "" 6944 6945# help of 'no-recursive' option of 'grep' command 6946#: breezy/plugins/grep/cmds.py:137 6947msgid "Don't recurse into subdirectories. (default is --recursive)" 6948msgstr "" 6949 6950# help of 'null' option of 'grep' command 6951#: breezy/plugins/grep/cmds.py:139 6952msgid "" 6953"Write an ASCII NUL (\\0) separator between output lines rather than a " 6954"newline." 6955msgstr "" 6956 6957#: breezy/plugins/launchpad/account.py:66 6958msgid "Setting ssh/sftp usernames for launchpad.net." 6959msgstr "" 6960 6961#: breezy/plugins/launchpad/cmds.py:43 6962msgid "Register a branch with launchpad.net." 6963msgstr "" 6964 6965#: breezy/plugins/launchpad/cmds.py:45 6966msgid "" 6967"This command lists a bzr branch in the directory of branches on\n" 6968"launchpad.net. Registration allows the branch to be associated with\n" 6969"bugs or specifications." 6970msgstr "" 6971 6972#: breezy/plugins/launchpad/cmds.py:49 6973msgid "" 6974"Before using this command you must register the project to which the\n" 6975"branch belongs, and create an account for yourself on launchpad.net." 6976msgstr "" 6977 6978#: breezy/plugins/launchpad/cmds.py:52 6979msgid "" 6980"arguments:\n" 6981" public_url: The publicly visible url for the branch to register.\n" 6982" This must be an http or https url (which Launchpad can read\n" 6983" from to access the branch). Local file urls, SFTP urls, and\n" 6984" bzr+ssh urls will not work.\n" 6985" If no public_url is provided, bzr will use the configured\n" 6986" public_url if there is one for the current branch, and\n" 6987" otherwise error." 6988msgstr "" 6989 6990#: breezy/plugins/launchpad/cmds.py:61 6991msgid "" 6992"example:\n" 6993" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n" 6994" --project fooproject" 6995msgstr "" 6996 6997# help of 'project' option of 'register-branch' command 6998#: breezy/plugins/launchpad/cmds.py:68 6999msgid "Launchpad project short name to associate with the branch." 7000msgstr "" 7001 7002# help of 'branch-name' option of 'register-branch' command 7003#: breezy/plugins/launchpad/cmds.py:75 7004msgid "" 7005"Short name for the branch; by default taken from the last component of the " 7006"url." 7007msgstr "" 7008 7009# help of 'branch-title' option of 'register-branch' command 7010#: breezy/plugins/launchpad/cmds.py:79 7011msgid "One-sentence description of the branch." 7012msgstr "" 7013 7014# help of 'branch-description' option of 'register-branch' command 7015#: breezy/plugins/launchpad/cmds.py:82 7016msgid "Longer description of the purpose or contents of the branch." 7017msgstr "" 7018 7019# help of 'author' option of 'register-branch' command 7020#: breezy/plugins/launchpad/cmds.py:85 7021msgid "Branch author's email address, if not yourself." 7022msgstr "" 7023 7024# help of 'link-bug' option of 'register-branch' command 7025#: breezy/plugins/launchpad/cmds.py:88 7026msgid "The bug this branch fixes." 7027msgstr "" 7028 7029# help of 'dry-run' option of 'register-branch' command 7030#: breezy/plugins/launchpad/cmds.py:91 7031msgid "Prepare the request but don't actually send it." 7032msgstr "" 7033 7034#: breezy/plugins/launchpad/cmds.py:113 7035msgid "" 7036"register-branch requires a public branch url - see bzr help register-branch." 7037msgstr "" 7038 7039#: breezy/plugins/launchpad/cmds.py:121 7040msgid "--product is deprecated; please use --project." 7041msgstr "" 7042 7043#: breezy/plugins/launchpad/cmds.py:151 7044msgid "Open a Launchpad branch page in your web browser." 7045msgstr "" 7046 7047# help of 'dry-run' option of 'launchpad-open' command 7048#: breezy/plugins/launchpad/cmds.py:156 7049msgid "Do not actually open the browser. Just say the URL we would use." 7050msgstr "" 7051 7052#: breezy/plugins/launchpad/cmds.py:191 7053#, python-format 7054msgid "Opening %s in web browser" 7055msgstr "" 7056 7057#: breezy/plugins/launchpad/cmds.py:199 7058msgid "Show or set the Launchpad user ID." 7059msgstr "" 7060 7061#: breezy/plugins/launchpad/cmds.py:201 7062msgid "" 7063"When communicating with Launchpad, some commands need to know your\n" 7064"Launchpad user ID. This command can be used to set or show the\n" 7065"user ID that Bazaar will use for such communication." 7066msgstr "" 7067 7068#: breezy/plugins/launchpad/cmds.py:205 7069msgid "" 7070":Examples:\n" 7071" Show the Launchpad ID of the current user::" 7072msgstr "" 7073 7074#: breezy/plugins/launchpad/cmds.py:208 7075msgid " bzr launchpad-login" 7076msgstr "" 7077 7078#: breezy/plugins/launchpad/cmds.py:210 7079msgid " Set the Launchpad ID of the current user to 'bob'::" 7080msgstr "" 7081 7082#: breezy/plugins/launchpad/cmds.py:212 7083msgid " bzr launchpad-login bob" 7084msgstr "" 7085 7086# help of 'no-check' option of 'launchpad-login' command 7087#: breezy/plugins/launchpad/cmds.py:219 7088msgid "Don't check that the user name is valid." 7089msgstr "" 7090 7091#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245 7092msgid "Launchpad user ID exists and has SSH keys.\n" 7093msgstr "" 7094 7095#: breezy/plugins/launchpad/cmds.py:237 7096msgid "No Launchpad user ID configured.\n" 7097msgstr "" 7098 7099#: breezy/plugins/launchpad/cmds.py:248 7100#, python-format 7101msgid "Launchpad user ID set to '%s'.\n" 7102msgstr "" 7103 7104#: breezy/plugins/launchpad/cmds.py:254 7105msgid "Ask Launchpad to mirror a branch now." 7106msgstr "" 7107 7108#: breezy/plugins/launchpad/cmds.py:271 7109msgid "Propose merging a branch on Launchpad." 7110msgstr "" 7111 7112#: breezy/plugins/launchpad/cmds.py:273 7113msgid "" 7114"This will open your usual editor to provide the initial comment. When it\n" 7115"has created the proposal, it will open it in your default web browser." 7116msgstr "" 7117 7118#: breezy/plugins/launchpad/cmds.py:276 7119msgid "" 7120"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n" 7121"is not supplied, the remembered submit branch will be used. If no submit\n" 7122"branch is remembered, the development focus will be used." 7123msgstr "" 7124 7125#: breezy/plugins/launchpad/cmds.py:280 7126msgid "" 7127"By default, the SUBMIT_BRANCH's review team will be requested to review\n" 7128"the merge proposal. This can be overriden by specifying --review (-R).\n" 7129"The parameter the launchpad account name of the desired reviewer. This\n" 7130"may optionally be followed by '=' and the review type. For example:" 7131msgstr "" 7132 7133#: breezy/plugins/launchpad/cmds.py:285 7134msgid " bzr lp-propose-merge --review jrandom --review review-team=qa" 7135msgstr "" 7136 7137#: breezy/plugins/launchpad/cmds.py:287 7138msgid "" 7139"This will propose a merge, request \"jrandom\" to perform a review of\n" 7140"unspecified type, and request \"review-team\" to perform a \"qa\" review." 7141msgstr "" 7142 7143# help of 'staging' option of 'lp-propose-merge' command 7144#: breezy/plugins/launchpad/cmds.py:292 7145msgid "Propose the merge on staging." 7146msgstr "" 7147 7148# help of 'message' option of 'lp-propose-merge' command 7149#: breezy/plugins/launchpad/cmds.py:294 7150msgid "Commit message." 7151msgstr "" 7152 7153# help of 'approve' option of 'lp-propose-merge' command 7154#: breezy/plugins/launchpad/cmds.py:296 7155msgid "" 7156"Mark the proposal as approved immediately, setting the approved revision to " 7157"tip." 7158msgstr "" 7159 7160# help of 'fixes' option of 'lp-propose-merge' command 7161#: breezy/plugins/launchpad/cmds.py:298 7162msgid "The bug this proposal fixes." 7163msgstr "" 7164 7165# help of 'review' option of 'lp-propose-merge' command 7166#: breezy/plugins/launchpad/cmds.py:300 7167msgid "Requested reviewer and optional type." 7168msgstr "" 7169 7170#: breezy/plugins/launchpad/cmds.py:335 7171msgid "Find the proposal to merge this revision." 7172msgstr "" 7173 7174#: breezy/plugins/launchpad/cmds.py:337 7175msgid "" 7176"Finds the merge proposal(s) that discussed landing the specified revision.\n" 7177"This works only if the if the merged_revno was recorded for the merge\n" 7178"proposal. The proposal(s) are opened in a web browser." 7179msgstr "" 7180 7181#: breezy/plugins/launchpad/cmds.py:341 7182msgid "" 7183"Only the revision specified is searched for. To find the mainline\n" 7184"revision that merged it into mainline, use the \"mainline\" revision spec." 7185msgstr "" 7186 7187#: breezy/plugins/launchpad/cmds.py:344 7188msgid "So, to find the merge proposal that reviewed line 1 of README::" 7189msgstr "" 7190 7191#: breezy/plugins/launchpad/cmds.py:346 7192msgid " bzr lp-find-proposal -r mainline:annotate:README:1" 7193msgstr "" 7194 7195#: breezy/plugins/launchpad/cmds.py:365 7196msgid "No review found." 7197msgstr "" 7198 7199#: breezy/plugins/launchpad/cmds.py:366 7200#, python-format 7201msgid "%d proposals(s) found." 7202msgstr "" 7203 7204#: breezy/plugins/launchpad/cmds.py:378 7205msgid "Finding proposals" 7206msgstr "" 7207 7208#: breezy/plugins/launchpad/lp_api.py:231 7209#: breezy/plugins/launchpad/lp_api.py:236 7210#, python-format 7211msgid "%s is not registered on Launchpad" 7212msgstr "" 7213 7214#: breezy/plugins/launchpad/lp_api.py:246 7215#, python-format 7216msgid "%s has no development focus." 7217msgstr "" 7218 7219#: breezy/plugins/launchpad/lp_api.py:251 7220#, python-format 7221msgid "development focus %s has no branch." 7222msgstr "" 7223 7224#: breezy/plugins/launchpad/lp_api.py:256 7225#, python-format 7226msgid "source package %s has no branch." 7227msgstr "" 7228 7229#: breezy/plugins/launchpad/lp_api.py:260 7230#, python-format 7231msgid "%s has no associated product or source package." 7232msgstr "" 7233 7234#: breezy/plugins/launchpad/lp_api.py:272 7235#, python-format 7236msgid "%s is already up-to-date." 7237msgstr "" 7238 7239#: breezy/plugins/launchpad/lp_api.py:279 7240#, python-format 7241msgid "Pushing to %s" 7242msgstr "" 7243 7244#: breezy/plugins/launchpad/lp_directory.py:170 7245#, python-brace-format 7246msgid "" 7247"resolution for {0}\n" 7248" local: {1}\n" 7249" remote: {2}" 7250msgstr "" 7251 7252#: breezy/plugins/launchpad/lp_propose.py:161 7253#, python-format 7254msgid "There is already a branch merge proposal: %s" 7255msgstr "" 7256 7257#: breezy/plugins/weave_fmt/bzrdir.py:237 7258msgid "pb parameter to convert() is deprecated" 7259msgstr "" 7260 7261#: breezy/plugins/weave_fmt/bzrdir.py:240 7262msgid "starting upgrade from format 4 to 5" 7263msgstr "" 7264 7265#: breezy/plugins/weave_fmt/bzrdir.py:250 7266msgid "note: upgrade may be faster if all store files are ungzipped first" 7267msgstr "" 7268 7269#: breezy/plugins/weave_fmt/bzrdir.py:279 7270msgid "converting revision" 7271msgstr "" 7272 7273#: breezy/plugins/weave_fmt/bzrdir.py:284 7274msgid "upgraded to weaves:" 7275msgstr "" 7276 7277#: breezy/plugins/weave_fmt/bzrdir.py:285 7278#, python-format 7279msgid "%6d revisions and inventories" 7280msgstr "" 7281 7282#: breezy/plugins/weave_fmt/bzrdir.py:287 7283#, python-format 7284msgid "%6d revisions not present" 7285msgstr "" 7286 7287#: breezy/plugins/weave_fmt/bzrdir.py:289 7288#, python-format 7289msgid "%6d texts" 7290msgstr "" 7291 7292#: breezy/plugins/weave_fmt/bzrdir.py:325 7293msgid "writing weave" 7294msgstr "" 7295 7296#: breezy/plugins/weave_fmt/bzrdir.py:329 7297#: breezy/plugins/weave_fmt/bzrdir.py:331 7298msgid "inventory" 7299msgstr "" 7300 7301#: breezy/plugins/weave_fmt/bzrdir.py:348 7302msgid "write revision" 7303msgstr "" 7304 7305#: breezy/plugins/weave_fmt/bzrdir.py:362 7306msgid "loading revision" 7307msgstr "" 7308 7309#: breezy/plugins/weave_fmt/bzrdir.py:367 7310#, python-format 7311msgid "revision {%s} not present in branch; will be converted as a ghost" 7312msgstr "" 7313 7314#: breezy/plugins/weave_fmt/bzrdir.py:507 7315msgid "starting upgrade from format 5 to 6" 7316msgstr "" 7317 7318#: breezy/plugins/weave_fmt/bzrdir.py:517 7319#, python-format 7320msgid "adding prefixes to %s" 7321msgstr "" 7322 7323#: breezy/plugins/weave_fmt/bzrdir.py:557 7324msgid "starting upgrade from format 6 to metadir" 7325msgstr "" 7326 7327#: breezy/plugins/weave_fmt/bzrdir.py:565 7328msgid "Removing ancestry.weave" 7329msgstr "" 7330 7331#: breezy/plugins/weave_fmt/bzrdir.py:570 7332msgid "Finding branch files" 7333msgstr "" 7334 7335#: breezy/plugins/weave_fmt/bzrdir.py:580 7336msgid "Upgrading repository" 7337msgstr "" 7338 7339#: breezy/plugins/weave_fmt/bzrdir.py:590 7340msgid "Upgrading branch" 7341msgstr "" 7342 7343#: breezy/plugins/weave_fmt/bzrdir.py:613 7344msgid "No working tree." 7345msgstr "" 7346 7347#: breezy/plugins/weave_fmt/bzrdir.py:620 7348msgid "Upgrading working tree" 7349msgstr "" 7350 7351#: breezy/plugins/weave_fmt/bzrdir.py:641 7352#, python-format 7353msgid "Make %s lock" 7354msgstr "" 7355 7356#: breezy/plugins/weave_fmt/bzrdir.py:652 7357#, python-format 7358msgid "Moving %s" 7359msgstr "" 7360 7361#: breezy/push.py:56 7362msgid "Created new branch." 7363msgstr "" 7364 7365#: breezy/push.py:97 7366#, python-format 7367msgid "" 7368"Target directory %s already contains a .bzr directory, but it is not valid." 7369msgstr "" 7370 7371#: breezy/push.py:101 7372#, python-format 7373msgid "" 7374"Target directory %s already exists, but does not have a .bzr directory. " 7375"Supply --use-existing-dir to push there anyway." 7376msgstr "" 7377 7378#: breezy/push.py:122 7379#, python-format 7380msgid "Too many redirections trying to make %s." 7381msgstr "" 7382 7383#: breezy/push.py:148 7384msgid "" 7385"These branches have diverged. See \"bzr help diverged-branches\" for more " 7386"information." 7387msgstr "" 7388 7389#: breezy/push.py:152 7390#, python-format 7391msgid "" 7392"It is not possible to losslessly push to %s. You may want to use dpush " 7393"instead." 7394msgstr "" 7395 7396#: breezy/push.py:158 7397#, python-format 7398msgid "" 7399"At %s you have a valid .bzr control directory, but not a branch or " 7400"repository. This is an unsupported configuration. Please move the target " 7401"directory out of the way and try again." 7402msgstr "" 7403 7404#: breezy/reconcile.py:97 7405#, python-format 7406msgid "Reconciling branch %s" 7407msgstr "" 7408 7409#: breezy/reconcile.py:103 7410#, python-format 7411msgid "Reconciling repository %s" 7412msgstr "" 7413 7414#: breezy/reconcile.py:105 7415msgid "Reconciling repository" 7416msgstr "" 7417 7418#: breezy/reconcile.py:111 7419#, python-format 7420msgid "%s cannot canonicalize CHKs." 7421msgstr "" 7422 7423#: breezy/reconcile.py:119 7424msgid "Reconcile aborted: revision index has inconsistent parents." 7425msgstr "" 7426 7427#: breezy/reconcile.py:121 7428msgid "Run \"bzr check\" for more details." 7429msgstr "" 7430 7431#: breezy/reconcile.py:123 7432msgid "Reconciliation complete." 7433msgstr "" 7434 7435#: breezy/reconcile.py:166 7436#, python-brace-format 7437msgid "Fixing last revision info {0} => {1}" 7438msgstr "" 7439 7440#: breezy/reconcile.py:173 7441msgid "revision_history ok." 7442msgstr "" 7443 7444#: breezy/reconcile.py:234 7445msgid "Reading inventory data" 7446msgstr "" 7447 7448#: breezy/reconcile.py:254 breezy/reconcile.py:384 7449msgid "Inventory ok." 7450msgstr "" 7451 7452#: breezy/reconcile.py:256 breezy/reconcile.py:386 7453msgid "Backing up inventory" 7454msgstr "" 7455 7456#: breezy/reconcile.py:258 7457msgid "Backup inventory created." 7458msgstr "" 7459 7460#: breezy/reconcile.py:274 breezy/reconcile.py:405 7461msgid "Writing weave" 7462msgstr "" 7463 7464#: breezy/reconcile.py:277 breezy/reconcile.py:408 7465msgid "Inventory regenerated." 7466msgstr "" 7467 7468#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376 7469msgid "Reading indexes" 7470msgstr "" 7471 7472#: breezy/reconcile.py:380 breezy/reconcile.py:382 7473msgid "Checking unused inventories" 7474msgstr "" 7475 7476#: breezy/reconcile.py:388 7477msgid "Backup Inventory created" 7478msgstr "" 7479 7480#: breezy/reconcile.py:446 7481msgid "Fixing text parents" 7482msgstr "" 7483 7484#: breezy/reconfigure.py:54 7485#, python-brace-format 7486msgid "{0} is now stacked on {1}\n" 7487msgstr "" 7488 7489#: breezy/reconfigure.py:69 7490#, python-format 7491msgid "%s is now not stacked\n" 7492msgstr "" 7493 7494#: breezy/remote.py:1228 breezy/repository.py:289 7495#, python-format 7496msgid "bzr: ERROR (ignored): %s" 7497msgstr "" 7498 7499#: breezy/remote.py:2534 7500msgid "Copying repository content as tarball..." 7501msgstr "" 7502 7503#: breezy/rename_map.py:69 7504msgid "Calculating hashes" 7505msgstr "" 7506 7507#: breezy/rename_map.py:107 7508msgid "Determining hash hits" 7509msgstr "" 7510 7511#: breezy/rename_map.py:242 7512#, python-brace-format 7513msgid "{0} => {1}" 7514msgstr "" 7515 7516#: breezy/repository.py:1738 7517msgid "Moving repository to repository.backup" 7518msgstr "" 7519 7520#: breezy/repository.py:1745 7521msgid "Creating new repository" 7522msgstr "" 7523 7524#: breezy/repository.py:1750 7525msgid "Copying content" 7526msgstr "" 7527 7528#: breezy/repository.py:1754 7529msgid "Deleting old repository content" 7530msgstr "" 7531 7532#: breezy/repository.py:1756 7533msgid "repository converted" 7534msgstr "" 7535 7536#: breezy/revisionspec.py:903 7537#, python-brace-format 7538msgid "Using {0} {1}" 7539msgstr "" 7540 7541#: breezy/send.py:59 7542#, python-format 7543msgid "Mail client \"%s\" does not support specifying body" 7544msgstr "" 7545 7546#: breezy/send.py:63 7547msgid "--remember requires a branch to be specified." 7548msgstr "" 7549 7550#: breezy/send.py:78 7551msgid "No submit branch known or specified" 7552msgstr "" 7553 7554#: breezy/send.py:81 7555#, python-brace-format 7556msgid "Using saved {0} location \"{1}\" to determine what changes to submit." 7557msgstr "" 7558 7559#: breezy/send.py:99 7560#, python-format 7561msgid "No such send format '%s'." 7562msgstr "" 7563 7564#: breezy/send.py:115 7565msgid "bzr send takes at most two one revision identifiers" 7566msgstr "" 7567 7568#: breezy/send.py:128 7569msgid "No revisions to submit." 7570msgstr "" 7571 7572#: breezy/send.py:140 7573msgid "" 7574"- not supported for merge directives that use more than one output file." 7575msgstr "" 7576 7577#: breezy/send.py:186 7578msgid "Format 0.9 does not permit bundle with no patch" 7579msgstr "" 7580 7581#: breezy/shelf_ui.py:46 7582#, python-format 7583msgid "Shelve adding file \"%(path)s\"?" 7584msgstr "" 7585 7586#: breezy/shelf_ui.py:47 7587msgid "Shelve binary changes?" 7588msgstr "" 7589 7590#: breezy/shelf_ui.py:48 7591msgid "Shelve changing \"%s\" from %(other)s to %(this)s?" 7592msgstr "" 7593 7594#: breezy/shelf_ui.py:50 7595#, python-format 7596msgid "Shelve removing file \"%(path)s\"?" 7597msgstr "" 7598 7599#: breezy/shelf_ui.py:51 7600#, python-format 7601msgid "Shelve %d change(s)?" 7602msgstr "" 7603 7604#: breezy/shelf_ui.py:52 7605msgid "Shelve?" 7606msgstr "" 7607 7608#: breezy/shelf_ui.py:53 7609#, python-format 7610msgid "" 7611"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?" 7612msgstr "" 7613 7614#: breezy/shelf_ui.py:55 7615#, python-format 7616msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?" 7617msgstr "" 7618 7619#: breezy/shelf_ui.py:70 7620#, python-format 7621msgid "Changes shelved with id \"%d\"." 7622msgstr "" 7623 7624#: breezy/shelf_ui.py:74 7625msgid "Selected changes destroyed." 7626msgstr "" 7627 7628#: breezy/shelf_ui.py:78 7629msgid "Selected changes:" 7630msgstr "" 7631 7632#: breezy/shelf_ui.py:98 7633#, python-format 7634msgid "Delete file \"%(path)s\"?" 7635msgstr "" 7636 7637#: breezy/shelf_ui.py:99 7638msgid "Apply binary changes?" 7639msgstr "" 7640 7641#: breezy/shelf_ui.py:100 7642#, python-format 7643msgid "Change \"%(path)s\" from %(this)s to %(other)s?" 7644msgstr "" 7645 7646#: breezy/shelf_ui.py:102 7647#, python-format 7648msgid "Add file \"%(path)s\"?" 7649msgstr "" 7650 7651#: breezy/shelf_ui.py:103 7652#, python-format 7653msgid "Apply %d change(s)?" 7654msgstr "" 7655 7656#: breezy/shelf_ui.py:104 7657msgid "Apply change?" 7658msgstr "" 7659 7660#: breezy/shelf_ui.py:105 7661#, python-format 7662msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?" 7663msgstr "" 7664 7665#: breezy/shelf_ui.py:107 7666#, python-format 7667msgid "Rename \"%(this)s\" => \"%(other)s\"?" 7668msgstr "" 7669 7670#: breezy/shelf_ui.py:402 7671msgid "No changes are shelved." 7672msgstr "" 7673 7674#: breezy/shelf_ui.py:460 7675#, python-format 7676msgid "Using changes with id \"%d\"." 7677msgstr "" 7678 7679#: breezy/shelf_ui.py:464 7680#, python-format 7681msgid "Message: %s" 7682msgstr "" 7683 7684#: breezy/shelf_ui.py:476 7685#, python-format 7686msgid "Deleted changes with id \"%d\"." 7687msgstr "" 7688 7689#: breezy/smart/medium.py:714 7690#, python-brace-format 7691msgid "HPSS calls: {0} ({1} vfs) {2}" 7692msgstr "" 7693 7694#: breezy/smart/ping.py:32 7695msgid "Pings a Bazaar smart server." 7696msgstr "" 7697 7698#: breezy/smart/ping.py:34 7699msgid "" 7700"This command sends a 'hello' request to the given location using the bzr\n" 7701"smart protocol, and reports the response." 7702msgstr "" 7703 7704#: breezy/smart/server.py:169 7705msgid "Requested to stop gracefully" 7706msgstr "" 7707 7708#: breezy/smart/server.py:179 7709#, python-format 7710msgid "Waiting for %d client(s) to finish" 7711msgstr "" 7712 7713#: breezy/smart/server.py:185 7714#, python-format 7715msgid "Still waiting for %d client(s) to finish" 7716msgstr "" 7717 7718#: breezy/smart/server.py:219 7719#, python-format 7720msgid "listening socket error: %s" 7721msgstr "" 7722 7723#: breezy/smart/server.py:452 7724#, python-format 7725msgid "listening on port: %s" 7726msgstr "" 7727 7728#: breezy/switch.py:84 7729msgid "Pending merges must be committed or reverted before using switch." 7730msgstr "" 7731 7732#: breezy/switch.py:111 7733msgid "" 7734"Cannot switch as local commits found in the checkout. Commit these to the " 7735"bound branch or use --force to throw them away." 7736msgstr "" 7737 7738#: breezy/switch.py:116 7739#, python-format 7740msgid "" 7741"Unable to connect to current master branch %(target)s: %(error)s To switch " 7742"anyway, use --force." 7743msgstr "" 7744 7745#: breezy/switch.py:140 7746msgid "Cannot switch a branch, only a checkout." 7747msgstr "" 7748 7749#: breezy/switch.py:183 7750#, python-format 7751msgid "Tree is up to date at revision %d." 7752msgstr "" 7753 7754#: breezy/switch.py:190 7755#, python-format 7756msgid "Updated to revision %d." 7757msgstr "" 7758 7759#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736 7760msgid "Apply phase" 7761msgstr "" 7762 7763#: breezy/transform.py:1762 breezy/transform.py:1830 7764msgid "removing file" 7765msgstr "" 7766 7767#: breezy/transform.py:1780 breezy/transform.py:1865 7768msgid "adding file" 7769msgstr "" 7770 7771#: breezy/transform.py:2598 7772msgid "Building tree" 7773msgstr "" 7774 7775#: breezy/transform.py:2688 breezy/transform.py:2715 7776msgid "Adding file contents" 7777msgstr "" 7778 7779#: breezy/transform.py:3017 7780msgid "Resolution pass" 7781msgstr "" 7782 7783#: breezy/transport/ftp/_gssapi.py:88 7784#, python-format 7785msgid "Authenticated as %s" 7786msgstr "" 7787 7788#: breezy/tree.py:647 7789msgid "*** {0} content-filter: {1} => {2!r}" 7790msgstr "" 7791 7792#: breezy/upgrade.py:77 7793#, python-format 7794msgid "This is a checkout. The branch (%s) needs to be upgraded separately." 7795msgstr "" 7796 7797#: breezy/upgrade.py:100 7798#, python-format 7799msgid "cannot upgrade from bzrdir format %s" 7800msgstr "" 7801 7802#: breezy/upgrade.py:103 7803#, python-format 7804msgid "starting upgrade of %s" 7805msgstr "" 7806 7807#: breezy/upgrade.py:110 7808msgid "finished" 7809msgstr "" 7810 7811#: breezy/upgrade.py:120 7812msgid "Deleting backup.bzr" 7813msgstr "" 7814 7815#: breezy/upgrade.py:151 7816#, python-brace-format 7817msgid "" 7818"\n" 7819"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed" 7820msgstr "" 7821 7822#: breezy/upgrade.py:208 7823#, python-format 7824msgid "Found %d dependent branches - upgrading ..." 7825msgstr "" 7826 7827#: breezy/upgrade.py:276 7828msgid "Upgrading bzrdirs" 7829msgstr "" 7830 7831#: breezy/upgrade.py:282 7832#, python-format 7833msgid "Upgrading %s" 7834msgstr "" 7835 7836#: breezy/upgrade.py:283 7837#, python-brace-format 7838msgid "Upgrading {0} {1} ..." 7839msgstr "" 7840 7841#: breezy/upgrade.py:301 7842msgid "Removing backup ..." 7843msgstr "" 7844 7845#: breezy/upgrade.py:305 7846#, python-brace-format 7847msgid "failed to clean-up {0}: {1}" 7848msgstr "" 7849 7850#: breezy/vf_repository.py:1091 7851msgid "inventories" 7852msgstr "" 7853 7854#: breezy/vf_repository.py:1117 7855msgid "texts" 7856msgstr "" 7857 7858#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631 7859msgid "Calculating text parents" 7860msgstr "" 7861 7862#: breezy/vf_repository.py:1707 7863msgid "Fetch texts" 7864msgstr "" 7865 7866#: breezy/vf_repository.py:2536 7867msgid "loading text store" 7868msgstr "" 7869 7870#: breezy/vf_repository.py:2542 7871msgid "checking text graph" 7872msgstr "" 7873 7874#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012 7875#: breezy/vf_repository.py:3127 7876msgid "Transferring revisions" 7877msgstr "" 7878 7879#: breezy/win32utils.py:146 7880msgid "Failed to GetProcessMemoryInfo()" 7881msgstr "" 7882 7883#: breezy/win32utils.py:167 7884msgid "Cannot debug memory on win32 without ctypes or win32process" 7885msgstr "" 7886 7887#: breezy/win32utils.py:172 7888#, python-brace-format 7889msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}" 7890msgstr "" 7891 7892#: breezy/win32utils.py:180 7893#, python-format 7894msgid "WorkingSize %8d KiB" 7895msgstr "" 7896 7897#: breezy/win32utils.py:181 7898#, python-format 7899msgid "PeakWorking %8d KiB" 7900msgstr "" 7901 7902#: breezy/win32utils.py:182 7903#, python-format 7904msgid "PagefileUsage %8d KiB" 7905msgstr "" 7906 7907#: breezy/win32utils.py:183 7908#, python-format 7909msgid "PeakPagefileUsage %8d KiB" 7910msgstr "" 7911 7912#: breezy/win32utils.py:185 7913#, python-format 7914msgid "PrivateUsage %8d KiB" 7915msgstr "" 7916 7917#: breezy/win32utils.py:186 7918#, python-format 7919msgid "PageFaultCount %8d" 7920msgstr "" 7921 7922#: breezy/workingtree.py:1516 7923msgid "Rerun update after fixing the conflicts." 7924msgstr "" 7925 7926#: dummy/help_topics/authentication/summary.txt:1 7927msgid "Information on configuring authentication" 7928msgstr "" 7929 7930#: dummy/help_topics/basic/detail.txt:1 7931msgid "" 7932"Bazaar 2.8.0dev1 -- a free distributed version-control tool\n" 7933"http://bazaar.canonical.com/" 7934msgstr "" 7935 7936#: dummy/help_topics/basic/detail.txt:4 7937msgid "" 7938"Basic commands:\n" 7939" bzr init makes this directory a versioned branch\n" 7940" bzr branch make a copy of another branch" 7941msgstr "" 7942 7943#: dummy/help_topics/basic/detail.txt:8 7944msgid "" 7945" bzr add make files or directories versioned\n" 7946" bzr ignore ignore a file or pattern\n" 7947" bzr mv move or rename a versioned file" 7948msgstr "" 7949 7950#: dummy/help_topics/basic/detail.txt:12 7951msgid "" 7952" bzr status summarize changes in working copy\n" 7953" bzr diff show detailed diffs" 7954msgstr "" 7955 7956#: dummy/help_topics/basic/detail.txt:15 7957msgid "" 7958" bzr merge pull in changes from another branch\n" 7959" bzr commit save some or all changes\n" 7960" bzr send send changes via email" 7961msgstr "" 7962 7963#: dummy/help_topics/basic/detail.txt:19 7964msgid "" 7965" bzr log show history of changes\n" 7966" bzr check validate storage" 7967msgstr "" 7968 7969#: dummy/help_topics/basic/detail.txt:22 7970msgid "" 7971" bzr help init more help on e.g. init command\n" 7972" bzr help commands list all commands\n" 7973" bzr help topics list all help topics\n" 7974msgstr "" 7975 7976#: dummy/help_topics/basic/summary.txt:1 7977msgid "Basic commands" 7978msgstr "" 7979 7980#: dummy/help_topics/branches/detail.txt:1 7981msgid "Branches" 7982msgstr "" 7983 7984#: dummy/help_topics/branches/detail.txt:3 7985msgid "" 7986"A branch consists of the state of a project, including all of its\n" 7987"history. All branches have a repository associated (which is where the\n" 7988"branch history is stored), but multiple branches may share the same\n" 7989"repository (a shared repository). Branches can be copied and merged." 7990msgstr "" 7991 7992#: dummy/help_topics/branches/detail.txt:8 7993msgid "" 7994"In addition, one branch may be bound to another one. Binding to another\n" 7995"branch indicates that commits which happen in this branch must also \n" 7996"happen in the other branch. Bazaar ensures consistency by not allowing \n" 7997"commits when the two branches are out of date. In order for a commit \n" 7998"to succeed, it may be necessary to update the current branch using \n" 7999"``bzr update``." 8000msgstr "" 8001 8002#: dummy/help_topics/branches/detail.txt:15 8003#: dummy/help_topics/checkouts/detail.txt:66 8004#: dummy/help_topics/repositories/detail.txt:36 8005msgid "Related commands::" 8006msgstr "" 8007 8008#: dummy/help_topics/branches/detail.txt:17 8009msgid "" 8010" init Change a directory into a versioned branch.\n" 8011" branch Create a new branch that is a copy of an existing branch.\n" 8012" merge Perform a three-way merge.\n" 8013" bind Bind a branch to another one.\n" 8014msgstr "" 8015 8016#: dummy/help_topics/branches/summary.txt:1 8017msgid "Information on what a branch is" 8018msgstr "" 8019 8020#: dummy/help_topics/bugs/summary.txt:1 8021msgid "Bug tracker settings" 8022msgstr "" 8023 8024#: dummy/help_topics/checkouts/detail.txt:1 8025msgid "Checkouts" 8026msgstr "" 8027 8028#: dummy/help_topics/checkouts/detail.txt:3 8029msgid "" 8030"Checkouts are source trees that are connected to a branch, so that when\n" 8031"you commit in the source tree, the commit goes into that branch. They\n" 8032"allow you to use a simpler, more centralized workflow, ignoring some of\n" 8033"Bazaar's decentralized features until you want them. Using checkouts\n" 8034"with shared repositories is very similar to working with SVN or CVS, but\n" 8035"doesn't have the same restrictions. And using checkouts still allows\n" 8036"others working on the project to use whatever workflow they like." 8037msgstr "" 8038 8039#: dummy/help_topics/checkouts/detail.txt:11 8040msgid "" 8041"A checkout is created with the bzr checkout command (see \"help checkout" 8042"\").\n" 8043"You pass it a reference to another branch, and it will create a local copy\n" 8044"for you that still contains a reference to the branch you created the\n" 8045"checkout from (the master branch). Then if you make any commits they will " 8046"be\n" 8047"made on the other branch first. This creates an instant mirror of your work, " 8048"or\n" 8049"facilitates lockstep development, where each developer is working together,\n" 8050"continuously integrating the changes of others." 8051msgstr "" 8052 8053#: dummy/help_topics/checkouts/detail.txt:19 8054msgid "" 8055"However the checkout is still a first class branch in Bazaar terms, so that\n" 8056"you have the full history locally. As you have a first class branch you " 8057"can\n" 8058"also commit locally if you want, for instance due to the temporary loss af " 8059"a\n" 8060"network connection. Use the --local option to commit to do this. All the " 8061"local\n" 8062"commits will then be made on the master branch the next time you do a non-" 8063"local\n" 8064"commit." 8065msgstr "" 8066 8067#: dummy/help_topics/checkouts/detail.txt:26 8068msgid "" 8069"If you are using a checkout from a shared branch you will periodically want " 8070"to\n" 8071"pull in all the changes made by others. This is done using the \"update\"\n" 8072"command. The changes need to be applied before any non-local commit, but\n" 8073"Bazaar will tell you if there are any changes and suggest that you use this\n" 8074"command when needed." 8075msgstr "" 8076 8077#: dummy/help_topics/checkouts/detail.txt:32 8078msgid "" 8079"It is also possible to create a \"lightweight\" checkout by passing the\n" 8080"--lightweight flag to checkout. A lightweight checkout is even closer to an\n" 8081"SVN checkout in that it is not a first class branch, it mainly consists of " 8082"the\n" 8083"working tree. This means that any history operations must query the master\n" 8084"branch, which could be slow if a network connection is involved. Also, as " 8085"you\n" 8086"don't have a local branch, then you cannot commit locally." 8087msgstr "" 8088 8089#: dummy/help_topics/checkouts/detail.txt:39 8090msgid "" 8091"Lightweight checkouts work best when you have fast reliable access to the\n" 8092"master branch. This means that if the master branch is on the same disk or " 8093"LAN\n" 8094"a lightweight checkout will be faster than a heavyweight one for any " 8095"commands\n" 8096"that modify the revision history (as only one copy of the branch needs to\n" 8097"be updated). Heavyweight checkouts will generally be faster for any command\n" 8098"that uses the history but does not change it, but if the master branch is " 8099"on\n" 8100"the same disk then there won't be a noticeable difference." 8101msgstr "" 8102 8103#: dummy/help_topics/checkouts/detail.txt:47 8104msgid "" 8105"Another possible use for a checkout is to use it with a treeless repository\n" 8106"containing your branches, where you maintain only one working tree by\n" 8107"switching the master branch that the checkout points to when you want to\n" 8108"work on a different branch." 8109msgstr "" 8110 8111#: dummy/help_topics/checkouts/detail.txt:52 8112msgid "" 8113"Obviously to commit on a checkout you need to be able to write to the " 8114"master\n" 8115"branch. This means that the master branch must be accessible over a " 8116"writeable\n" 8117"protocol , such as sftp://, and that you have write permissions at the " 8118"other\n" 8119"end. Checkouts also work on the local file system, so that all that matters " 8120"is\n" 8121"file permissions." 8122msgstr "" 8123 8124#: dummy/help_topics/checkouts/detail.txt:58 8125msgid "" 8126"You can change the master of a checkout by using the \"switch\" command " 8127"(see\n" 8128"\"help switch\"). This will change the location that the commits are sent " 8129"to.\n" 8130"The \"bind\" command can also be used to turn a normal branch into a heavy\n" 8131"checkout. If you would like to convert your heavy checkout into a normal\n" 8132"branch so that every commit is local, you can use the \"unbind\" command. To " 8133"see\n" 8134"whether or not a branch is bound or not you can use the \"info\" command. If " 8135"the\n" 8136"branch is bound it will tell you the location of the bound branch." 8137msgstr "" 8138 8139#: dummy/help_topics/checkouts/detail.txt:68 8140msgid "" 8141" checkout Create a checkout. Pass --lightweight to get a lightweight\n" 8142" checkout\n" 8143" update Pull any changes in the master branch in to your checkout\n" 8144" commit Make a commit that is sent to the master branch. If you have\n" 8145" a heavy checkout then the --local option will commit to the\n" 8146" checkout without sending the commit to the master\n" 8147" switch Change the master branch that the commits in the checkout " 8148"will\n" 8149" be sent to\n" 8150" bind Turn a standalone branch into a heavy checkout so that any\n" 8151" commits will be sent to the master branch\n" 8152" unbind Turn a heavy checkout into a standalone branch so that any\n" 8153" commits are only made locally\n" 8154" info Displays whether a branch is bound or unbound. If the branch " 8155"is\n" 8156" bound, then it will also display the location of the bound " 8157"branch\n" 8158msgstr "" 8159 8160#: dummy/help_topics/checkouts/summary.txt:1 8161msgid "Information on what a checkout is" 8162msgstr "" 8163 8164#: dummy/help_topics/commands/summary.txt:1 8165msgid "Basic help for all commands" 8166msgstr "" 8167 8168#: dummy/help_topics/configuration/summary.txt:1 8169msgid "Details on the configuration settings available" 8170msgstr "" 8171 8172#: dummy/help_topics/conflict-types/summary.txt:1 8173msgid "Types of conflicts and what to do about them" 8174msgstr "" 8175 8176#: dummy/help_topics/content-filters/summary.txt:1 8177msgid "Conversion of content into/from working trees" 8178msgstr "" 8179 8180#: dummy/help_topics/criss-cross/detail.txt:1 8181msgid "Criss-Cross" 8182msgstr "" 8183 8184#: dummy/help_topics/criss-cross/detail.txt:3 8185msgid "" 8186"A criss-cross in the branch history can cause the default merge technique\n" 8187"to emit more conflicts than would normally be expected." 8188msgstr "" 8189 8190#: dummy/help_topics/criss-cross/detail.txt:6 8191msgid "" 8192"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may " 8193"give\n" 8194"better results. You may wish to ``bzr revert`` the working tree and merge\n" 8195"again. Alternatively, use ``bzr remerge`` on particular conflicted files." 8196msgstr "" 8197 8198#: dummy/help_topics/criss-cross/detail.txt:10 8199msgid "" 8200"Criss-crosses occur in a branch's history if two branches merge the same " 8201"thing\n" 8202"and then merge one another, or if two branches merge one another at the " 8203"same\n" 8204"time. They can be avoided by having each branch only merge from or into a\n" 8205"designated central branch (a \"star topology\")." 8206msgstr "" 8207 8208#: dummy/help_topics/criss-cross/detail.txt:15 8209msgid "" 8210"Criss-crosses cause problems because of the way merge works. Bazaar's " 8211"default\n" 8212"merge is a three-way merger; in order to merge OTHER into THIS, it must\n" 8213"find a basis for comparison, BASE. Using BASE, it can determine whether\n" 8214"differences between THIS and OTHER are due to one side adding lines, or\n" 8215"from another side removing lines." 8216msgstr "" 8217 8218#: dummy/help_topics/criss-cross/detail.txt:21 8219msgid "" 8220"Criss-crosses mean there is no good choice for a base. Selecting the " 8221"recent\n" 8222"merge points could cause one side's changes to be silently discarded.\n" 8223"Selecting older merge points (which Bazaar does) mean that extra conflicts\n" 8224"are emitted." 8225msgstr "" 8226 8227#: dummy/help_topics/criss-cross/detail.txt:26 8228msgid "" 8229"The ``weave`` merge type is not affected by this problem because it uses\n" 8230"line-origin detection instead of a basis revision to determine the cause of\n" 8231"differences.\n" 8232msgstr "" 8233 8234#: dummy/help_topics/criss-cross/summary.txt:1 8235msgid "Information on criss-cross merging" 8236msgstr "" 8237 8238#: dummy/help_topics/current-formats/summary.txt:1 8239msgid "Current storage formats" 8240msgstr "" 8241 8242#: dummy/help_topics/debug-flags/summary.txt:1 8243msgid "Options to show or record debug information" 8244msgstr "" 8245 8246#: dummy/help_topics/diverged-branches/summary.txt:1 8247msgid "How to fix diverged branches" 8248msgstr "" 8249 8250#: dummy/help_topics/env-variables/summary.txt:1 8251msgid "Environment variable names and values" 8252msgstr "" 8253 8254#: dummy/help_topics/eol/summary.txt:1 8255msgid "Information on end-of-line handling" 8256msgstr "" 8257 8258#: dummy/help_topics/files/detail.txt:1 8259msgid "Files" 8260msgstr "" 8261 8262#: dummy/help_topics/files/detail.txt:3 8263msgid "" 8264":On Unix: ~/.bazaar/bazaar.conf\n" 8265":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\" 8266"\\bazaar\\\\2.0\\\\bazaar.conf" 8267msgstr "" 8268 8269#: dummy/help_topics/files/detail.txt:6 8270msgid "" 8271"Contains the user's default configuration. The section ``[DEFAULT]`` is\n" 8272"used to define general configuration that will be applied everywhere.\n" 8273"The section ``[ALIASES]`` can be used to create command aliases for\n" 8274"commonly used options." 8275msgstr "" 8276 8277#: dummy/help_topics/files/detail.txt:11 8278msgid "A typical config file might look something like::" 8279msgstr "" 8280 8281#: dummy/help_topics/files/detail.txt:13 8282msgid "" 8283" [DEFAULT]\n" 8284" email=John Doe <jdoe@isp.com>" 8285msgstr "" 8286 8287#: dummy/help_topics/files/detail.txt:16 8288msgid "" 8289" [ALIASES]\n" 8290" commit = commit --strict\n" 8291" log10 = log --short -r -10..-1\n" 8292msgstr "" 8293 8294#: dummy/help_topics/files/summary.txt:1 8295msgid "Information on configuration and log files" 8296msgstr "" 8297 8298#: dummy/help_topics/formats/detail.txt:1 8299msgid "Storage Formats" 8300msgstr "" 8301 8302#: dummy/help_topics/formats/detail.txt:3 8303msgid "" 8304"To ensure that older clients do not access data incorrectly,\n" 8305"Bazaar's policy is to introduce a new storage format whenever\n" 8306"new features requiring new metadata are added. New storage\n" 8307"formats may also be introduced to improve performance and\n" 8308"scalability." 8309msgstr "" 8310 8311#: dummy/help_topics/formats/detail.txt:9 8312msgid "" 8313"The newest format, 2a, is highly recommended. If your\n" 8314"project is not using 2a, then you should suggest to the\n" 8315"project owner to upgrade." 8316msgstr "" 8317 8318#: dummy/help_topics/formats/detail.txt:13 8319msgid "" 8320"\n" 8321".. note::" 8322msgstr "" 8323 8324#: dummy/help_topics/formats/detail.txt:16 8325msgid "" 8326" Some of the older formats have two variants:\n" 8327" a plain one and a rich-root one. The latter include an additional\n" 8328" field about the root of the tree. There is no performance cost\n" 8329" for using a rich-root format but you cannot easily merge changes\n" 8330" from a rich-root format into a plain format. As a consequence,\n" 8331" moving a project to a rich-root format takes some co-ordination\n" 8332" in that all contributors need to upgrade their repositories\n" 8333" around the same time. 2a and all future formats will be\n" 8334" implicitly rich-root." 8335msgstr "" 8336 8337#: dummy/help_topics/formats/detail.txt:26 8338msgid "" 8339"See :doc:`current-formats-help` for the complete list of\n" 8340"currently supported formats. See :doc:`other-formats-help` for\n" 8341"descriptions of any available experimental and deprecated formats.\n" 8342msgstr "" 8343 8344#: dummy/help_topics/formats/summary.txt:1 8345msgid "Information on choosing a storage format" 8346msgstr "" 8347 8348#: dummy/help_topics/global-options/detail.txt:1 8349msgid "Global Options" 8350msgstr "" 8351 8352#: dummy/help_topics/global-options/detail.txt:3 8353msgid "" 8354"These options may be used with any command, and may appear in front of any\n" 8355"command. (e.g. ``bzr --profile help``)." 8356msgstr "" 8357 8358#: dummy/help_topics/global-options/detail.txt:6 8359msgid "" 8360"--version Print the version number. Must be supplied before the " 8361"command.\n" 8362"--no-aliases Do not process command aliases when running this command.\n" 8363"--builtin Use the built-in version of a command, not the plugin " 8364"version.\n" 8365" This does not suppress other plugin effects.\n" 8366"--no-plugins Do not process any plugins.\n" 8367"--no-l10n Do not translate messages.\n" 8368"--concurrency Number of processes that can be run concurrently (selftest)." 8369msgstr "" 8370 8371#: dummy/help_topics/global-options/detail.txt:14 8372msgid "" 8373"--profile Profile execution using the hotshot profiler.\n" 8374"--lsprof Profile execution using the lsprof profiler.\n" 8375"--lsprof-file Profile execution using the lsprof profiler, and write the\n" 8376" results to a specified file. If the filename ends with \".txt" 8377"\",\n" 8378" text format will be used. If the filename either starts " 8379"with\n" 8380" \"callgrind.out\" or end with \".callgrind\", the output will " 8381"be\n" 8382" formatted for use with KCacheGrind. Otherwise, the output\n" 8383" will be a pickle.\n" 8384"--coverage Generate line coverage report in the specified directory." 8385msgstr "" 8386 8387#: dummy/help_topics/global-options/detail.txt:24 8388msgid "" 8389"-Oname=value Override the ``name`` config option setting it to ``value`` " 8390"for\n" 8391" the duration of the command. This can be used multiple times " 8392"if\n" 8393" several options need to be overridden." 8394msgstr "" 8395 8396#: dummy/help_topics/global-options/detail.txt:28 8397msgid "" 8398"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n" 8399"information on profiling." 8400msgstr "" 8401 8402#: dummy/help_topics/global-options/detail.txt:31 8403msgid "" 8404"A number of debug flags are also available to assist troubleshooting and\n" 8405"development. See :doc:`debug-flags-help`.\n" 8406msgstr "" 8407 8408#: dummy/help_topics/global-options/summary.txt:1 8409msgid "Options that control how Bazaar runs" 8410msgstr "" 8411 8412#: dummy/help_topics/hidden-commands/summary.txt:1 8413msgid "All hidden commands" 8414msgstr "" 8415 8416#: dummy/help_topics/hooks/summary.txt:1 8417msgid "Points at which custom processing can be added" 8418msgstr "" 8419 8420#: dummy/help_topics/launchpad/detail.txt:1 8421msgid "Integration with Launchpad.net" 8422msgstr "" 8423 8424#: dummy/help_topics/launchpad/detail.txt:3 8425msgid "" 8426"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n" 8427"specification tracking." 8428msgstr "" 8429 8430#: dummy/help_topics/launchpad/detail.txt:6 8431msgid "" 8432"The bzr client (through the plugin called 'launchpad') has special\n" 8433"features to communicate with Launchpad:" 8434msgstr "" 8435 8436#: dummy/help_topics/launchpad/detail.txt:9 8437msgid "" 8438" * The launchpad-login command tells Bazaar your Launchpad user name. " 8439"This\n" 8440" is then used by the 'lp:' transport to download your branches using\n" 8441" bzr+ssh://." 8442msgstr "" 8443 8444#: dummy/help_topics/launchpad/detail.txt:13 8445msgid "" 8446" * The 'lp:' transport uses Launchpad as a directory service: for " 8447"example\n" 8448" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n" 8449" projects and may be branched, logged, etc. You can also use the 'lp:'\n" 8450" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk." 8451msgstr "" 8452 8453#: dummy/help_topics/launchpad/detail.txt:18 8454msgid "" 8455" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n" 8456" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes " 8457"lp:12345'\n" 8458" will record a revision property that marks that revision as fixing\n" 8459" Launchpad bug 12345. When you push that branch to Launchpad it will\n" 8460" automatically be linked to the bug report." 8461msgstr "" 8462 8463#: dummy/help_topics/launchpad/detail.txt:24 8464msgid "" 8465" * The register-branch command tells Launchpad about the url of a\n" 8466" public branch. Launchpad will then mirror the branch, display\n" 8467" its contents and allow it to be attached to bugs and other\n" 8468" objects." 8469msgstr "" 8470 8471#: dummy/help_topics/launchpad/detail.txt:29 8472msgid "For more information see http://help.launchpad.net/\n" 8473msgstr "" 8474 8475#: dummy/help_topics/launchpad/summary.txt:1 8476msgid "Using Bazaar with Launchpad.net" 8477msgstr "" 8478 8479#: dummy/help_topics/location-alias/summary.txt:1 8480msgid "Aliases for remembered locations" 8481msgstr "" 8482 8483#: dummy/help_topics/log-formats/summary.txt:1 8484msgid "Details on the logging formats available" 8485msgstr "" 8486 8487#: dummy/help_topics/other-formats/summary.txt:1 8488msgid "Experimental and deprecated storage formats" 8489msgstr "" 8490 8491#: dummy/help_topics/patterns/summary.txt:1 8492msgid "Information on the pattern syntax" 8493msgstr "" 8494 8495#: dummy/help_topics/repositories/detail.txt:1 8496msgid "Repositories" 8497msgstr "" 8498 8499#: dummy/help_topics/repositories/detail.txt:3 8500msgid "" 8501"Repositories in Bazaar are where committed information is stored. There is\n" 8502"a repository associated with every branch." 8503msgstr "" 8504 8505#: dummy/help_topics/repositories/detail.txt:6 8506msgid "" 8507"Repositories are a form of database. Bzr will usually maintain this for\n" 8508"good performance automatically, but in some situations (e.g. when doing\n" 8509"very many commits in a short time period) you may want to ask bzr to\n" 8510"optimise the database indices. This can be done by the 'bzr pack' command." 8511msgstr "" 8512 8513#: dummy/help_topics/repositories/detail.txt:11 8514msgid "" 8515"By default just running 'bzr init' will create a repository within the new\n" 8516"branch but it is possible to create a shared repository which allows " 8517"multiple\n" 8518"branches to share their information in the same location. When a new branch " 8519"is\n" 8520"created it will first look to see if there is a containing shared repository " 8521"it\n" 8522"can use." 8523msgstr "" 8524 8525#: dummy/help_topics/repositories/detail.txt:17 8526msgid "" 8527"When two branches of the same project share a repository, there is\n" 8528"generally a large space saving. For some operations (e.g. branching\n" 8529"within the repository) this translates in to a large time saving." 8530msgstr "" 8531 8532#: dummy/help_topics/repositories/detail.txt:21 8533msgid "" 8534"To create a shared repository use the init-repository command (or the alias\n" 8535"init-repo). This command takes the location of the repository to create. " 8536"This\n" 8537"means that 'bzr init-repository repo' will create a directory named 'repo',\n" 8538"which contains a shared repository. Any new branches that are created in " 8539"this\n" 8540"directory will then use it for storage." 8541msgstr "" 8542 8543#: dummy/help_topics/repositories/detail.txt:27 8544msgid "" 8545"It is a good idea to create a repository whenever you might create more\n" 8546"than one branch of a project. This is true for both working areas where you\n" 8547"are doing the development, and any server areas that you use for hosting\n" 8548"projects. In the latter case, it is common to want branches without working\n" 8549"trees. Since the files in the branch will not be edited directly there is " 8550"no\n" 8551"need to use up disk space for a working tree. To create a repository in " 8552"which\n" 8553"the branches will not have working trees pass the '--no-trees' option to\n" 8554"'init-repository'." 8555msgstr "" 8556 8557#: dummy/help_topics/repositories/detail.txt:38 8558msgid "" 8559" init-repository Create a shared repository. Use --no-trees to create " 8560"one\n" 8561" in which new branches won't get a working tree.\n" 8562msgstr "" 8563 8564#: dummy/help_topics/repositories/summary.txt:1 8565msgid "Basic information on shared repositories." 8566msgstr "" 8567 8568#: dummy/help_topics/revisionspec/summary.txt:1 8569msgid "Explain how to use --revision" 8570msgstr "" 8571 8572#: dummy/help_topics/rules/summary.txt:1 8573msgid "Information on defining rule-based preferences" 8574msgstr "" 8575 8576#: dummy/help_topics/standalone-trees/detail.txt:1 8577msgid "Standalone Trees" 8578msgstr "" 8579 8580#: dummy/help_topics/standalone-trees/detail.txt:3 8581msgid "" 8582"A standalone tree is a working tree with an associated repository. It\n" 8583"is an independently usable branch, with no dependencies on any other.\n" 8584"Creating a standalone tree (via bzr init) is the quickest way to put\n" 8585"an existing project under version control." 8586msgstr "" 8587 8588#: dummy/help_topics/standalone-trees/detail.txt:8 8589msgid "Related Commands::" 8590msgstr "" 8591 8592#: dummy/help_topics/standalone-trees/detail.txt:10 8593msgid " init Make a directory into a versioned branch.\n" 8594msgstr "" 8595 8596#: dummy/help_topics/standalone-trees/summary.txt:1 8597msgid "Information on what a standalone tree is" 8598msgstr "" 8599 8600#: dummy/help_topics/standard-options/detail.txt:1 8601msgid "Standard Options" 8602msgstr "" 8603 8604#: dummy/help_topics/standard-options/detail.txt:3 8605msgid "Standard options are legal for all commands." 8606msgstr "" 8607 8608#: dummy/help_topics/standard-options/detail.txt:5 8609msgid "" 8610"--help, -h Show help message.\n" 8611"--verbose, -v Display more information.\n" 8612"--quiet, -q Only display errors and warnings." 8613msgstr "" 8614 8615#: dummy/help_topics/standard-options/detail.txt:9 8616msgid "Unlike global options, standard options can be used in aliases.\n" 8617msgstr "" 8618 8619#: dummy/help_topics/standard-options/summary.txt:1 8620msgid "Options that can be used with any command" 8621msgstr "" 8622 8623#: dummy/help_topics/status-flags/detail.txt:1 8624msgid "Status Flags" 8625msgstr "" 8626 8627#: dummy/help_topics/status-flags/detail.txt:3 8628msgid "" 8629"Status flags are used to summarise changes to the working tree in a concise\n" 8630"manner. They are in the form::" 8631msgstr "" 8632 8633#: dummy/help_topics/status-flags/detail.txt:6 8634msgid " xxx <filename>" 8635msgstr "" 8636 8637#: dummy/help_topics/status-flags/detail.txt:8 8638msgid "where the columns' meanings are as follows." 8639msgstr "" 8640 8641#: dummy/help_topics/status-flags/detail.txt:10 8642msgid "Column 1 - versioning/renames::" 8643msgstr "" 8644 8645#: dummy/help_topics/status-flags/detail.txt:12 8646msgid "" 8647" + File versioned\n" 8648" - File unversioned\n" 8649" R File renamed\n" 8650" ? File unknown\n" 8651" X File nonexistent (and unknown to bzr)\n" 8652" C File has conflicts\n" 8653" P Entry for a pending merge (not a file)" 8654msgstr "" 8655 8656#: dummy/help_topics/status-flags/detail.txt:20 8657msgid "Column 2 - contents::" 8658msgstr "" 8659 8660#: dummy/help_topics/status-flags/detail.txt:22 8661msgid "" 8662" N File created\n" 8663" D File deleted\n" 8664" K File kind changed\n" 8665" M File modified" 8666msgstr "" 8667 8668#: dummy/help_topics/status-flags/detail.txt:27 8669msgid "Column 3 - execute::" 8670msgstr "" 8671 8672#: dummy/help_topics/status-flags/detail.txt:29 8673msgid " * The execute bit was changed\n" 8674msgstr "" 8675 8676#: dummy/help_topics/status-flags/summary.txt:1 8677msgid "Help on status flags" 8678msgstr "" 8679 8680#: dummy/help_topics/sync-for-reconfigure/detail.txt:1 8681msgid "Branches Out of Sync" 8682msgstr "" 8683 8684#: dummy/help_topics/sync-for-reconfigure/detail.txt:3 8685msgid "" 8686"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n" 8687"a local branch must be destroyed. (For checkouts, this is the local branch\n" 8688"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n" 8689"have the same last revision as the new reference branch for the lightweight\n" 8690"checkout, data could be lost, so Bazaar refuses." 8691msgstr "" 8692 8693#: dummy/help_topics/sync-for-reconfigure/detail.txt:9 8694msgid "How you deal with this depends on *why* the branches are out of sync." 8695msgstr "" 8696 8697#: dummy/help_topics/sync-for-reconfigure/detail.txt:11 8698msgid "" 8699"If you have a checkout and have done local commits, you can get back in " 8700"sync\n" 8701"by running \"bzr update\" (and possibly \"bzr commit\")." 8702msgstr "" 8703 8704#: dummy/help_topics/sync-for-reconfigure/detail.txt:14 8705msgid "" 8706"If you have a branch and the remote branch is out-of-date, you can push\n" 8707"the local changes using \"bzr push\". If the local branch is out of date, " 8708"you\n" 8709"can do \"bzr pull\". If both branches have had changes, you can merge, " 8710"commit\n" 8711"and then push your changes. If you decide that some of the changes aren't\n" 8712"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n" 8713msgstr "" 8714 8715#: dummy/help_topics/sync-for-reconfigure/summary.txt:1 8716msgid "Steps to resolve \"out-of-sync\" when reconfiguring" 8717msgstr "" 8718 8719#: dummy/help_topics/topics/summary.txt:1 8720msgid "Topics list" 8721msgstr "" 8722 8723#: dummy/help_topics/url-special-chars/summary.txt:1 8724msgid "Special character handling in URLs" 8725msgstr "" 8726 8727#: dummy/help_topics/urlspec/summary.txt:1 8728msgid "Supported transport protocols" 8729msgstr "" 8730 8731#: dummy/help_topics/working-trees/detail.txt:1 8732msgid "Working Trees" 8733msgstr "" 8734 8735#: dummy/help_topics/working-trees/detail.txt:3 8736msgid "" 8737"A working tree is the contents of a branch placed on disk so that you can\n" 8738"see the files and edit them. The working tree is where you make changes to " 8739"a\n" 8740"branch, and when you commit the current state of the working tree is the\n" 8741"snapshot that is recorded in the commit." 8742msgstr "" 8743 8744#: dummy/help_topics/working-trees/detail.txt:8 8745msgid "" 8746"When you push a branch to a remote system, a working tree will not be\n" 8747"created. If one is already present the files will not be updated. The\n" 8748"branch information will be updated and the working tree will be marked\n" 8749"as out-of-date. Updating a working tree remotely is difficult, as there\n" 8750"may be uncommitted changes or the update may cause content conflicts that " 8751"are\n" 8752"difficult to deal with remotely." 8753msgstr "" 8754 8755#: dummy/help_topics/working-trees/detail.txt:15 8756msgid "" 8757"If you have a branch with no working tree you can use the 'checkout' " 8758"command\n" 8759"to create a working tree. If you run 'bzr checkout .' from the branch it " 8760"will\n" 8761"create the working tree. If the branch is updated remotely, you can update " 8762"the\n" 8763"working tree by running 'bzr update' in that directory." 8764msgstr "" 8765 8766#: dummy/help_topics/working-trees/detail.txt:20 8767msgid "" 8768"If you have a branch with a working tree that you do not want the 'remove-" 8769"tree'\n" 8770"command will remove the tree if it is safe. This can be done to avoid the\n" 8771"warning about the remote working tree not being updated when pushing to the\n" 8772"branch. It can also be useful when working with a '--no-trees' repository\n" 8773"(see 'bzr help repositories')." 8774msgstr "" 8775 8776#: dummy/help_topics/working-trees/detail.txt:26 8777msgid "" 8778"If you want to have a working tree on a remote machine that you push to you\n" 8779"can either run 'bzr update' in the remote branch after each push, or use " 8780"some\n" 8781"other method to update the tree during the push. There is an 'rspush' " 8782"plugin\n" 8783"that will update the working tree using rsync as well as doing a push. " 8784"There\n" 8785"is also a 'push-and-update' plugin that automates running 'bzr update' via " 8786"SSH\n" 8787"after each push." 8788msgstr "" 8789 8790#: dummy/help_topics/working-trees/detail.txt:33 8791msgid "Useful commands::" 8792msgstr "" 8793 8794#: dummy/help_topics/working-trees/detail.txt:35 8795msgid "" 8796" checkout Create a working tree when a branch does not have one.\n" 8797" remove-tree Removes the working tree from a branch when it is safe to do " 8798"so.\n" 8799" update When a working tree is out of sync with its associated " 8800"branch\n" 8801" this will update the tree to match the branch.\n" 8802msgstr "" 8803 8804#: dummy/help_topics/working-trees/summary.txt:1 8805msgid "Information on working trees" 8806msgstr "" 8807 8808#: en/help_topics/authentication.txt:1 8809msgid "" 8810"Authentication Settings\n" 8811"=======================" 8812msgstr "" 8813 8814#: en/help_topics/authentication.txt:4 8815msgid "" 8816"\n" 8817"Intent\n" 8818"------" 8819msgstr "" 8820 8821#: en/help_topics/authentication.txt:8 8822msgid "" 8823"Many different authentication policies can be described in the\n" 8824"``authentication.conf`` file but a particular user should need only a few\n" 8825"definitions to cover his needs without having to specify a user and a " 8826"password\n" 8827"for every branch he uses." 8828msgstr "" 8829 8830#: en/help_topics/authentication.txt:13 8831msgid "" 8832"The definitions found in this file are used to find the credentials to use " 8833"for\n" 8834"a given url. The same credentials can generally be used for as many branches " 8835"as\n" 8836"possible by grouping their declaration around the remote servers that need\n" 8837"them. It's even possible to declare credentials that will be used by " 8838"different\n" 8839"servers." 8840msgstr "" 8841 8842#: en/help_topics/authentication.txt:19 8843msgid "" 8844"The intent is to make this file as small as possible to minimize maintenance." 8845msgstr "" 8846 8847#: en/help_topics/authentication.txt:21 8848msgid "" 8849"Once the relevant credentials are declared in this file you may use branch " 8850"urls\n" 8851"without embedding passwords (security hazard) or even users (enabling " 8852"sharing\n" 8853"of your urls with others)." 8854msgstr "" 8855 8856#: en/help_topics/authentication.txt:25 8857msgid "Instead of using::" 8858msgstr "" 8859 8860#: en/help_topics/authentication.txt:27 8861msgid " brz branch ftp://joe:secret@host.com/path/to/my/branch" 8862msgstr "" 8863 8864#: en/help_topics/authentication.txt:29 8865msgid "you simply use::" 8866msgstr "" 8867 8868#: en/help_topics/authentication.txt:31 8869msgid " brz branch ftp://host.com/path/to/my/branch" 8870msgstr "" 8871 8872#: en/help_topics/authentication.txt:33 8873msgid "provided you have created the following ``authentication.conf`` file::" 8874msgstr "" 8875 8876#: en/help_topics/authentication.txt:35 8877msgid "" 8878" [myprojects]\n" 8879" scheme=ftp\n" 8880" host=host.com\n" 8881" user=joe\n" 8882" password=secret\n" 8883" " 8884msgstr "" 8885 8886#: en/help_topics/authentication.txt:42 8887msgid "" 8888"Authentication definitions\n" 8889"--------------------------" 8890msgstr "" 8891 8892#: en/help_topics/authentication.txt:45 8893msgid "" 8894"There are two kinds of authentication used by the various schemes supported " 8895"by\n" 8896"brz:" 8897msgstr "" 8898 8899#: en/help_topics/authentication.txt:48 8900msgid "1. user and password" 8901msgstr "" 8902 8903#: en/help_topics/authentication.txt:50 8904msgid "" 8905"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n" 8906"``SFTP`` can use either a password or a host key to authenticate. However,\n" 8907"ssh agents are a better, more secure solution. So we have chosen to not " 8908"provide\n" 8909"our own less secure method." 8910msgstr "" 8911 8912#: en/help_topics/authentication.txt:55 8913msgid "2. user, realm and password" 8914msgstr "" 8915 8916#: en/help_topics/authentication.txt:57 8917msgid "" 8918"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n" 8919"against a host. But, by using ``.htaccess`` files, for example, it is " 8920"possible\n" 8921"to define several (``user, realm, password``) for a given ``host``. So what " 8922"is\n" 8923"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` " 8924"is\n" 8925"not taken into account in the definitions, but will displayed if brz " 8926"prompts\n" 8927"you for a password." 8928msgstr "" 8929 8930#: en/help_topics/authentication.txt:64 8931msgid "" 8932"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n" 8933"specifying the appropriate port." 8934msgstr "" 8935 8936#: en/help_topics/authentication.txt:67 8937msgid "" 8938"To take all schemes into account, the password will be deduced from a set " 8939"of\n" 8940"authentication definitions (``scheme``, ``host``, ``port``, ``path``, " 8941"``user``,\n" 8942"``password``)." 8943msgstr "" 8944 8945#: en/help_topics/authentication.txt:71 8946msgid "" 8947" * ``scheme``: can be empty (meaning the rest of the definition can be " 8948"used\n" 8949" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, " 8950"``ssh``\n" 8951" should be used instead since this is the real scheme regarding\n" 8952" authentication," 8953msgstr "" 8954 8955#: en/help_topics/authentication.txt:76 8956msgid " * ``host``: can be empty (to act as a default for any host)," 8957msgstr "" 8958 8959#: en/help_topics/authentication.txt:78 8960msgid "" 8961" * ``port`` can be empty (useful when an host provides several servers for " 8962"the\n" 8963" same scheme), only numerical values are allowed, this should be used " 8964"only\n" 8965" when the server uses a port different than the scheme standard port," 8966msgstr "" 8967 8968#: en/help_topics/authentication.txt:82 8969msgid " * ``path``: can be empty (FTP or SFTP will never user it)," 8970msgstr "" 8971 8972#: en/help_topics/authentication.txt:84 8973msgid "" 8974" * ``user``: can be empty (``bzr`` will default to python's\n" 8975" ``getpass.get_user()``)," 8976msgstr "" 8977 8978#: en/help_topics/authentication.txt:87 8979msgid "" 8980" * ``password``: can be empty if you prefer to always be prompted for your\n" 8981" password." 8982msgstr "" 8983 8984#: en/help_topics/authentication.txt:90 8985msgid "" 8986"Multiple definitions can be provided and, for a given URL, brz will select " 8987"a\n" 8988"(``user`` [, ``password``]) based on the following rules :" 8989msgstr "" 8990 8991#: en/help_topics/authentication.txt:93 8992msgid " 1. the first match wins," 8993msgstr "" 8994 8995#: en/help_topics/authentication.txt:95 8996msgid " 2. empty fields match everything," 8997msgstr "" 8998 8999#: en/help_topics/authentication.txt:97 9000msgid "" 9001" 3. ``scheme`` matches even if decorators are used in the requested URL," 9002msgstr "" 9003 9004#: en/help_topics/authentication.txt:99 9005msgid "" 9006" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n" 9007" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf." 9008"net``\n" 9009" will not match ``bzr.sf.net``)." 9010msgstr "" 9011 9012#: en/help_topics/authentication.txt:103 9013msgid "" 9014" 5. ``port`` matches if included in the requested URL (exact matches only)" 9015msgstr "" 9016 9017#: en/help_topics/authentication.txt:105 9018msgid "" 9019" 6. ``path`` matches if included in the requested URL (and by rule #2 " 9020"above,\n" 9021" empty paths will match any provided path)." 9022msgstr "" 9023 9024#: en/help_topics/authentication.txt:110 9025msgid "" 9026"File format\n" 9027"-----------" 9028msgstr "" 9029 9030#: en/help_topics/authentication.txt:113 9031msgid "" 9032"The general rules for :doc:`configuration files <configuration-help>`\n" 9033"apply except for the variable policies." 9034msgstr "" 9035 9036#: en/help_topics/authentication.txt:116 9037msgid "Each section describes an authentication definition." 9038msgstr "" 9039 9040#: en/help_topics/authentication.txt:118 9041msgid "" 9042"The section name is an arbitrary string, only the ``DEFAULT`` value is " 9043"reserved\n" 9044"and should appear as the *last* section." 9045msgstr "" 9046 9047#: en/help_topics/authentication.txt:121 9048msgid "Each section should define:" 9049msgstr "" 9050 9051#: en/help_topics/authentication.txt:123 9052msgid "* ``user``: the login to be used," 9053msgstr "" 9054 9055#: en/help_topics/authentication.txt:125 9056msgid "Each section could define:" 9057msgstr "" 9058 9059#: en/help_topics/authentication.txt:127 9060msgid "* ``host``: the remote server," 9061msgstr "" 9062 9063#: en/help_topics/authentication.txt:129 9064msgid "* ``port``: the port the server is listening," 9065msgstr "" 9066 9067#: en/help_topics/authentication.txt:131 9068msgid "* ``path``: the branch location," 9069msgstr "" 9070 9071#: en/help_topics/authentication.txt:133 9072msgid "* ``password``: the password." 9073msgstr "" 9074 9075#: en/help_topics/authentication.txt:135 9076msgid "" 9077"\n" 9078"Examples\n" 9079"--------" 9080msgstr "" 9081 9082#: en/help_topics/authentication.txt:139 9083msgid "" 9084"\n" 9085"Personal projects hosted outside\n" 9086"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 9087msgstr "" 9088 9089#: en/help_topics/authentication.txt:143 9090msgid "" 9091"All connections are done with the same ``user`` (the remote one for which " 9092"the\n" 9093"default brz one is not appropriate) and the password is always prompted " 9094"with\n" 9095"some exceptions::" 9096msgstr "" 9097 9098#: en/help_topics/authentication.txt:147 9099msgid "" 9100" # Pet projects on hobby.net\n" 9101" [hobby]\n" 9102" host=r.hobby.net\n" 9103" user=jim\n" 9104" password=obvious1234\n" 9105" \n" 9106" # Home server\n" 9107" [home]\n" 9108" scheme=https\n" 9109" host=home.net\n" 9110" user=joe\n" 9111" password=1essobV10us\n" 9112" \n" 9113" [DEFAULT]\n" 9114" # Our local user is barbaz, on all remote sites we're known as " 9115"foobar\n" 9116" user=foobar" 9117msgstr "" 9118 9119#: en/help_topics/authentication.txt:164 9120msgid "" 9121"\n" 9122"Source hosting provider\n" 9123"~~~~~~~~~~~~~~~~~~~~~~~" 9124msgstr "" 9125 9126#: en/help_topics/authentication.txt:168 9127msgid "In the shp.net (fictitious) domain, each project has its own site::" 9128msgstr "" 9129 9130#: en/help_topics/authentication.txt:170 9131msgid "" 9132" [shpnet domain]\n" 9133" # we use sftp, but ssh is the scheme used for authentication\n" 9134" scheme=ssh\n" 9135" # The leading '.' ensures that 'shp.net' alone doesn't match\n" 9136" host=.shp.net\n" 9137" user=joe\n" 9138" # brz doesn't support supplying a password for sftp,\n" 9139" # consider using an ssh agent if you don't want to supply\n" 9140" # a password interactively. (pageant, ssh-agent, etc)" 9141msgstr "" 9142 9143#: en/help_topics/authentication.txt:180 9144msgid "" 9145"HTTPS, SFTP servers and their proxy\n" 9146"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 9147msgstr "" 9148 9149#: en/help_topics/authentication.txt:183 9150msgid "" 9151"At company.com, the server hosting release and integration branches is " 9152"behind a\n" 9153"proxy, and the two branches use different authentication policies::" 9154msgstr "" 9155 9156#: en/help_topics/authentication.txt:186 9157msgid "" 9158" [reference code]\n" 9159" scheme=https\n" 9160" host=dev.company.com\n" 9161" path=/dev\n" 9162" user=user1\n" 9163" password=pass1" 9164msgstr "" 9165 9166#: en/help_topics/authentication.txt:193 9167msgid "" 9168" # development branches on dev server\n" 9169" [dev]\n" 9170" scheme=ssh # bzr+ssh and sftp are available here\n" 9171" host=dev.company.com\n" 9172" path=/dev/integration\n" 9173" user=user2\n" 9174" \n" 9175" # proxy\n" 9176" [proxy]\n" 9177" scheme=http\n" 9178" host=proxy.company.com\n" 9179" port=3128\n" 9180" user=proxyuser1\n" 9181" password=proxypass1" 9182msgstr "" 9183 9184#: en/help_topics/authentication.txt:208 9185msgid "" 9186"\n" 9187"Planned enhancements\n" 9188"--------------------" 9189msgstr "" 9190 9191#: en/help_topics/authentication.txt:212 9192msgid "" 9193"The following are not yet implemented but planned as parts of a work in\n" 9194"progress:" 9195msgstr "" 9196 9197#: en/help_topics/authentication.txt:215 9198msgid "* add a ``password_encoding`` field allowing:" 9199msgstr "" 9200 9201#: en/help_topics/authentication.txt:217 9202msgid "" 9203" - storing the passwords in various obfuscating encodings (base64 for one)," 9204msgstr "" 9205 9206#: en/help_topics/authentication.txt:219 9207msgid " - delegate password storage to plugins (.netrc for example)." 9208msgstr "" 9209 9210#: en/help_topics/authentication.txt:221 9211msgid "" 9212"* update the credentials when the user is prompted for user or password," 9213msgstr "" 9214 9215#: en/help_topics/authentication.txt:223 9216msgid "* add a ``verify_certificates`` field for ``HTTPS``." 9217msgstr "" 9218 9219#: en/help_topics/authentication.txt:225 9220msgid "" 9221"The ``password_encoding`` and ``verify_certificates`` fields are recognized " 9222"but\n" 9223"ignored in the actual implementation.\n" 9224msgstr "" 9225 9226#: en/help_topics/bugs.txt:1 9227msgid "Bug Tracker Settings" 9228msgstr "" 9229 9230#: en/help_topics/bugs.txt:3 9231msgid "" 9232"When making a commit, metadata about bugs fixed by that change can be\n" 9233"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n" 9234"entry is included in the 'bugs' revision property stating '<url> <status>'.\n" 9235"(The only ``status`` value currently supported is ``fixed.``)" 9236msgstr "" 9237 9238#: en/help_topics/bugs.txt:8 9239msgid "" 9240"The ``--fixes`` option allows you to specify a bug tracker and a bug " 9241"identifier\n" 9242"rather than a full URL. This looks like::" 9243msgstr "" 9244 9245#: en/help_topics/bugs.txt:11 9246msgid " bzr commit --fixes <tracker>:<id>" 9247msgstr "" 9248 9249#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410 9250msgid "or::" 9251msgstr "" 9252 9253#: en/help_topics/bugs.txt:15 9254msgid " bzr commit --fixes <id>" 9255msgstr "" 9256 9257#: en/help_topics/bugs.txt:17 9258msgid "" 9259"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is " 9260"the\n" 9261"identifier for that bug within the bugtracker, usually the bug number.\n" 9262"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n" 9263"or global configuration is used." 9264msgstr "" 9265 9266#: en/help_topics/bugs.txt:22 9267msgid "" 9268"Bazaar knows about a few bug trackers that have many users. If\n" 9269"you use one of these bug trackers then there is no setup required to\n" 9270"use this feature, you just need to know the tracker identifier to use.\n" 9271"These are the bugtrackers that are built in:" 9272msgstr "" 9273 9274#: en/help_topics/bugs.txt:27 9275msgid "" 9276" ============================ ============ ============\n" 9277" URL Abbreviation Example\n" 9278" ============================ ============ ============\n" 9279" https://bugs.launchpad.net/ lp lp:12345\n" 9280" http://bugs.debian.org/ deb deb:12345\n" 9281" http://bugzilla.gnome.org/ gnome gnome:12345\n" 9282" ============================ ============ ============" 9283msgstr "" 9284 9285#: en/help_topics/bugs.txt:35 9286msgid "" 9287"For the bug trackers not listed above configuration is required.\n" 9288"Support for generating the URLs for any project using Bugzilla or Trac\n" 9289"is built in, along with a template mechanism for other bugtrackers with\n" 9290"simple URL schemes. If your bug tracker can't be described by one\n" 9291"of the schemes described below then you can write a plugin to support\n" 9292"it." 9293msgstr "" 9294 9295#: en/help_topics/bugs.txt:42 9296msgid "" 9297"If you use Bugzilla or Trac, then you only need to set a configuration\n" 9298"variable which contains the base URL of the bug tracker. These options\n" 9299"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n" 9300"configuration section in ``locations.conf``. You can set up these values\n" 9301"for each of the projects you work on." 9302msgstr "" 9303 9304#: en/help_topics/bugs.txt:48 9305msgid "" 9306"Note: As you provide a short name for each tracker, you can specify one or\n" 9307"more bugs in one or more trackers at commit time if you wish." 9308msgstr "" 9309 9310#: en/help_topics/bugs.txt:51 9311msgid "" 9312"Launchpad\n" 9313"---------" 9314msgstr "" 9315 9316#: en/help_topics/bugs.txt:54 9317msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2." 9318msgstr "" 9319 9320#: en/help_topics/bugs.txt:56 9321msgid "" 9322"bugzilla_<tracker>_url\n" 9323"----------------------" 9324msgstr "" 9325 9326#: en/help_topics/bugs.txt:59 9327msgid "" 9328"If present, the location of the Bugzilla bug tracker referred to by\n" 9329"<tracker>. This option can then be used together with ``bzr commit\n" 9330"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n" 9331"example::" 9332msgstr "" 9333 9334#: en/help_topics/bugs.txt:64 9335msgid " bugzilla_squid_url = http://bugs.squid-cache.org" 9336msgstr "" 9337 9338#: en/help_topics/bugs.txt:66 9339msgid "" 9340"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n" 9341"fixed." 9342msgstr "" 9343 9344#: en/help_topics/bugs.txt:69 9345msgid "" 9346"trac_<tracker>_url\n" 9347"------------------" 9348msgstr "" 9349 9350#: en/help_topics/bugs.txt:72 9351msgid "" 9352"If present, the location of the Trac instance referred to by\n" 9353"<tracker>. This option can then be used together with ``bzr commit\n" 9354"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n" 9355"example::" 9356msgstr "" 9357 9358#: en/help_topics/bugs.txt:77 9359msgid " trac_twisted_url = http://www.twistedmatrix.com/trac" 9360msgstr "" 9361 9362#: en/help_topics/bugs.txt:79 9363msgid "" 9364"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 " 9365"as\n" 9366"fixed." 9367msgstr "" 9368 9369#: en/help_topics/bugs.txt:82 9370msgid "" 9371"bugtracker_<tracker>_url\n" 9372"------------------------" 9373msgstr "" 9374 9375#: en/help_topics/bugs.txt:85 9376msgid "" 9377"If present, the location of a generic bug tracker instance referred to by\n" 9378"<tracker>. The location must contain an ``{id}`` placeholder,\n" 9379"which will be replaced by a specific bug ID. This option can then be used\n" 9380"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n" 9381"fixed by that commit. For example::" 9382msgstr "" 9383 9384#: en/help_topics/bugs.txt:91 9385msgid " bugtracker_python_url = http://bugs.python.org/issue{id}" 9386msgstr "" 9387 9388#: en/help_topics/bugs.txt:93 9389msgid "" 9390"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n" 9391"Roundup bug tracker as fixed, or::" 9392msgstr "" 9393 9394#: en/help_topics/bugs.txt:96 9395msgid "" 9396" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}" 9397msgstr "" 9398 9399#: en/help_topics/bugs.txt:98 9400msgid "" 9401"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n" 9402"RT bug tracker as fixed, or::" 9403msgstr "" 9404 9405#: en/help_topics/bugs.txt:101 9406msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}" 9407msgstr "" 9408 9409#: en/help_topics/bugs.txt:103 9410msgid "" 9411"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug " 9412"HUDSON-1234\n" 9413"in Hudson's JIRA bug tracker as fixed.\n" 9414msgstr "" 9415 9416#: en/help_topics/commands.txt:1 9417msgid "" 9418"add Add specified files or directories.\n" 9419"alias Set/unset and display aliases.\n" 9420"annotate Show the origin of each line in a file.\n" 9421"bash-completion Generate a shell function for bash command line " 9422"completion.\n" 9423" [bash_completion]\n" 9424"bind Convert the current branch into a checkout of the " 9425"supplied\n" 9426" branch.\n" 9427"branch Create a new branch that is a copy of an existing branch.\n" 9428"branches List the branches available at the current location.\n" 9429"break-lock Break a dead lock.\n" 9430"cat Write the contents of a file as of a given revision to\n" 9431" standard output.\n" 9432"check Validate working tree structure, branch consistency and\n" 9433" repository history.\n" 9434"checkout Create a new checkout of an existing branch.\n" 9435"clean-tree Remove unwanted files from working tree.\n" 9436"commit Commit changes into a new revision.\n" 9437"config Display, set or remove a configuration option.\n" 9438"conflicts List files with conflicts.\n" 9439"deleted List files deleted in the working tree.\n" 9440"diff Show differences in the working tree, between revisions " 9441"or\n" 9442" branches.\n" 9443"dpush Push into a different VCS without any custom bzr " 9444"metadata.\n" 9445"export Export current or past revision to a destination directory " 9446"or\n" 9447" archive.\n" 9448"grep Print lines matching PATTERN for specified files and\n" 9449" revisions. [grep]\n" 9450"help Show help on a command or other topic.\n" 9451"ignore Ignore specified files or patterns.\n" 9452"ignored List ignored files and the patterns that matched them.\n" 9453"info Show information about a working tree, branch or " 9454"repository.\n" 9455"init Make a directory into a versioned branch.\n" 9456"init-repository Create a shared repository for branches to share storage\n" 9457" space.\n" 9458"join Combine a tree into its containing tree.\n" 9459"launchpad-login Show or set the Launchpad user ID. [launchpad]\n" 9460"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n" 9461"launchpad-open Open a Launchpad branch page in your web browser. " 9462"[launchpad]\n" 9463"log Show historical log for a branch or subset of a branch.\n" 9464"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n" 9465"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n" 9466"ls List files in a tree.\n" 9467"merge Perform a three-way merge.\n" 9468"missing Show unmerged/unpulled revisions between two branches.\n" 9469"mkdir Create a new versioned directory.\n" 9470"mv Move or rename a file.\n" 9471"nick Print or set the branch nickname.\n" 9472"pack Compress the data within a repository.\n" 9473"ping Pings a Bazaar smart server.\n" 9474"plugins List the installed plugins.\n" 9475"pull Turn this branch into a mirror of another branch.\n" 9476"push Update a mirror of this branch.\n" 9477"reconcile Reconcile brz metadata in a branch.\n" 9478"reconfigure Reconfigure the type of a brz directory.\n" 9479"register-branch Register a branch with launchpad.net. [launchpad]\n" 9480"remerge Redo a merge.\n" 9481"remove Remove files or directories.\n" 9482"remove-branch Remove a branch.\n" 9483"remove-tree Remove the working tree from a given branch/checkout.\n" 9484"renames Show list of renamed files.\n" 9485"resolve Mark a conflict as resolved.\n" 9486"revert Set files in the working tree back to the contents of a\n" 9487" previous revision.\n" 9488"revno Show current revision number.\n" 9489"root Show the tree root directory.\n" 9490"send Mail or create a merge-directive for submitting changes.\n" 9491"serve Run the brz server.\n" 9492"shelve Temporarily set aside some changes from the current tree.\n" 9493"sign-my-commits Sign all commits by a given committer.\n" 9494"split Split a subdirectory of a tree into a separate tree.\n" 9495"status Display status summary.\n" 9496"switch Set the branch of a checkout and update.\n" 9497"tag Create, remove or modify a tag naming a revision.\n" 9498"tags List tags.\n" 9499"testament Show testament (signing-form) of a revision.\n" 9500"unbind Convert the current checkout into a regular branch.\n" 9501"uncommit Remove the last committed revision.\n" 9502"unshelve Restore shelved changes.\n" 9503"update Update a working tree to a new revision.\n" 9504"upgrade Upgrade a repository, branch or working tree to a newer\n" 9505" format.\n" 9506"verify-signatures Verify all commit signatures.\n" 9507"version Show version of brz.\n" 9508"version-info Show version information about this tree.\n" 9509"view Manage filtered views.\n" 9510"whoami Show or set brz user id.\n" 9511msgstr "" 9512 9513#: en/help_topics/configuration.txt:1 9514msgid "" 9515"Configuration Settings\n" 9516"=======================" 9517msgstr "" 9518 9519#: en/help_topics/configuration.txt:4 9520msgid "" 9521"Environment settings\n" 9522"---------------------" 9523msgstr "" 9524 9525#: en/help_topics/configuration.txt:7 9526msgid "" 9527"While most configuration is handled by configuration files, some options\n" 9528"which may be semi-permanent can also be controlled through the environment." 9529msgstr "" 9530 9531#: en/help_topics/configuration.txt:10 9532msgid "" 9533"BRZ_EMAIL\n" 9534"~~~~~~~~~" 9535msgstr "" 9536 9537#: en/help_topics/configuration.txt:13 9538msgid "Override the email id used by Bazaar. Typical format::" 9539msgstr "" 9540 9541#: en/help_topics/configuration.txt:15 9542msgid " \"John Doe <jdoe@example.com>\"" 9543msgstr "" 9544 9545#: en/help_topics/configuration.txt:17 9546msgid "See also the ``email`` configuration option." 9547msgstr "" 9548 9549#: en/help_topics/configuration.txt:19 9550msgid "" 9551"BRZ_PROGRESS_BAR\n" 9552"~~~~~~~~~~~~~~~~" 9553msgstr "" 9554 9555#: en/help_topics/configuration.txt:22 9556msgid "" 9557"Override the progress display. Possible values are \"none\" or \"text\". " 9558"If\n" 9559"the value is \"none\" then no progress bar is displayed. The value \"text\" " 9560"draws\n" 9561"the ordinary command line progress bar." 9562msgstr "" 9563 9564#: en/help_topics/configuration.txt:26 9565msgid "" 9566"BRZ_SIGQUIT_PDB\n" 9567"~~~~~~~~~~~~~~~" 9568msgstr "" 9569 9570#: en/help_topics/configuration.txt:29 9571msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger." 9572msgstr "" 9573 9574#: en/help_topics/configuration.txt:31 9575msgid "" 9576"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n" 9577"* 1 = Invoke breakin debugger (default)" 9578msgstr "" 9579 9580#: en/help_topics/configuration.txt:34 9581msgid "" 9582"BRZ_HOME\n" 9583"~~~~~~~~" 9584msgstr "" 9585 9586#: en/help_topics/configuration.txt:37 9587msgid "Override the home directory used by Bazaar." 9588msgstr "" 9589 9590#: en/help_topics/configuration.txt:39 9591msgid "" 9592"BRZ_SSH\n" 9593"~~~~~~~" 9594msgstr "" 9595 9596#: en/help_topics/configuration.txt:42 9597msgid "Select a different SSH implementation." 9598msgstr "" 9599 9600#: en/help_topics/configuration.txt:44 9601msgid "" 9602"BRZ_PDB\n" 9603"~~~~~~~" 9604msgstr "" 9605 9606#: en/help_topics/configuration.txt:47 9607msgid "Control whether to launch a debugger on error." 9608msgstr "" 9609 9610#: en/help_topics/configuration.txt:49 9611msgid "" 9612"* 0 = Standard behavior\n" 9613"* 1 = Launch debugger" 9614msgstr "" 9615 9616#: en/help_topics/configuration.txt:52 9617msgid "" 9618"BZR_REMOTE_PATH\n" 9619"~~~~~~~~~~~~~~~" 9620msgstr "" 9621 9622#: en/help_topics/configuration.txt:55 9623msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol." 9624msgstr "" 9625 9626#: en/help_topics/configuration.txt:57 9627msgid "See also the ``bzr_remote_path`` configuration option." 9628msgstr "" 9629 9630#: en/help_topics/configuration.txt:59 9631msgid "" 9632"BRZ_EDITOR\n" 9633"~~~~~~~~~~" 9634msgstr "" 9635 9636#: en/help_topics/configuration.txt:62 9637msgid "Path to the editor Bazaar should use for commit messages, etc." 9638msgstr "" 9639 9640#: en/help_topics/configuration.txt:64 9641msgid "" 9642"BRZ_LOG\n" 9643"~~~~~~~" 9644msgstr "" 9645 9646#: en/help_topics/configuration.txt:67 9647msgid "" 9648"Location of the Bazaar log file. You can check the current location by\n" 9649"running ``bzr version``." 9650msgstr "" 9651 9652#: en/help_topics/configuration.txt:70 9653msgid "" 9654"The log file contains debug information that is useful for diagnosing or\n" 9655"reporting problems with Bazaar." 9656msgstr "" 9657 9658#: en/help_topics/configuration.txt:73 9659msgid "" 9660"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n" 9661"will disable logging." 9662msgstr "" 9663 9664#: en/help_topics/configuration.txt:76 9665msgid "" 9666"\n" 9667"BRZ_PLUGIN_PATH\n" 9668"~~~~~~~~~~~~~~~" 9669msgstr "" 9670 9671#: en/help_topics/configuration.txt:80 9672msgid "" 9673"The path to the plugins directory that Bazaar should use.\n" 9674"If not set, Bazaar will search for plugins in:" 9675msgstr "" 9676 9677#: en/help_topics/configuration.txt:83 9678msgid "* the user specific plugin directory (containing the ``user`` plugins)," 9679msgstr "" 9680 9681#: en/help_topics/configuration.txt:85 9682msgid "* the bzrlib directory (containing the ``core`` plugins)," 9683msgstr "" 9684 9685#: en/help_topics/configuration.txt:87 9686msgid "" 9687"* the site specific plugin directory if applicable (containing\n" 9688" the ``site`` plugins)." 9689msgstr "" 9690 9691#: en/help_topics/configuration.txt:90 9692msgid "" 9693"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n" 9694"the way the plugin are searched. " 9695msgstr "" 9696 9697#: en/help_topics/configuration.txt:93 9698msgid "" 9699"As for the ``PATH`` variables, if multiple directories are\n" 9700"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n" 9701"platform specific appropriate character (':' on Unix,\n" 9702"';' on windows)" 9703msgstr "" 9704 9705#: en/help_topics/configuration.txt:98 9706msgid "" 9707"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n" 9708"in ``user``. However it will continue to search in ``core`` and\n" 9709"``site`` unless they are explicitly removed." 9710msgstr "" 9711 9712#: en/help_topics/configuration.txt:102 9713msgid "" 9714"If you need to change the order or remove one of these\n" 9715"directories, you should use special values:" 9716msgstr "" 9717 9718#: en/help_topics/configuration.txt:105 9719msgid "" 9720"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n" 9721" path from the default values," 9722msgstr "" 9723 9724#: en/help_topics/configuration.txt:108 9725msgid "" 9726"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n" 9727" before the remaining default values (and also remove it from\n" 9728" the default values)." 9729msgstr "" 9730 9731#: en/help_topics/configuration.txt:112 9732msgid "" 9733"Note that the special values 'user', 'core' and 'site' should be\n" 9734"used literally, they will be substituted by the corresponding,\n" 9735"platform specific, values." 9736msgstr "" 9737 9738#: en/help_topics/configuration.txt:116 9739msgid "" 9740"The examples below use ':' as the separator, windows users\n" 9741"should use ';'." 9742msgstr "" 9743 9744#: en/help_topics/configuration.txt:119 9745msgid "Overriding the default user plugin directory::" 9746msgstr "" 9747 9748#: en/help_topics/configuration.txt:121 9749msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'" 9750msgstr "" 9751 9752#: en/help_topics/configuration.txt:123 9753msgid "Disabling the site directory while retaining the user directory::" 9754msgstr "" 9755 9756#: en/help_topics/configuration.txt:125 9757msgid " BZR_PLUGIN_PATH='-site:+user'" 9758msgstr "" 9759 9760#: en/help_topics/configuration.txt:127 9761msgid "Disabling all plugins (better achieved with --no-plugins)::" 9762msgstr "" 9763 9764#: en/help_topics/configuration.txt:129 9765msgid " BZR_PLUGIN_PATH='-user:-core:-site'" 9766msgstr "" 9767 9768#: en/help_topics/configuration.txt:131 9769msgid "Overriding the default site plugin directory::" 9770msgstr "" 9771 9772#: en/help_topics/configuration.txt:133 9773msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user" 9774msgstr "" 9775 9776#: en/help_topics/configuration.txt:135 9777msgid "" 9778"BRZ_DISABLE_PLUGINS\n" 9779"~~~~~~~~~~~~~~~~~~~" 9780msgstr "" 9781 9782#: en/help_topics/configuration.txt:138 9783msgid "" 9784"Under special circumstances (mostly when trying to diagnose a\n" 9785"bug), it's better to disable a plugin (or several) rather than\n" 9786"uninstalling them completely. Such plugins can be specified in\n" 9787"the ``BZR_DISABLE_PLUGINS`` environment variable." 9788msgstr "" 9789 9790#: en/help_topics/configuration.txt:143 9791msgid "" 9792"In that case, ``bzr`` will stop loading the specified plugins and\n" 9793"will raise an import error if they are explicitly imported (by\n" 9794"another plugin that depends on them for example)." 9795msgstr "" 9796 9797#: en/help_topics/configuration.txt:147 9798msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::" 9799msgstr "" 9800 9801#: en/help_topics/configuration.txt:149 9802msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'" 9803msgstr "" 9804 9805#: en/help_topics/configuration.txt:151 9806msgid "" 9807"BRZ_PLUGINS_AT\n" 9808"~~~~~~~~~~~~~~" 9809msgstr "" 9810 9811#: en/help_topics/configuration.txt:154 9812msgid "" 9813"When adding a new feature or working on a bug in a plugin,\n" 9814"developers often need to use a specific version of a given\n" 9815"plugin. Since python requires that the directory containing the\n" 9816"code is named like the plugin itself this make it impossible to\n" 9817"use arbitrary directory names (using a two-level directory scheme\n" 9818"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n" 9819"if they don't appear in ``BZR_PLUGIN_PATH`` ." 9820msgstr "" 9821 9822#: en/help_topics/configuration.txt:162 9823msgid "" 9824"Plugins specified in this environment variable takes precedence\n" 9825"over the ones in ``BZR_PLUGIN_PATH``." 9826msgstr "" 9827 9828#: en/help_topics/configuration.txt:165 9829msgid "" 9830"The variable specified a list of ``plugin_name@plugin path``,\n" 9831"``plugin_name`` being the name of the plugin as it appears in\n" 9832"python module paths, ``plugin_path`` being the path to the\n" 9833"directory containing the plugin code itself\n" 9834"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n" 9835"separator, use ';' on windows." 9836msgstr "" 9837 9838#: en/help_topics/configuration.txt:172 9839msgid "" 9840"Example:\n" 9841"~~~~~~~~" 9842msgstr "" 9843 9844#: en/help_topics/configuration.txt:175 9845msgid "" 9846"Using a specific version of ``myplugin``:\n" 9847"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``" 9848msgstr "" 9849 9850#: en/help_topics/configuration.txt:178 9851msgid "" 9852"BRZPATH\n" 9853"~~~~~~~" 9854msgstr "" 9855 9856#: en/help_topics/configuration.txt:181 9857msgid "The path where Bazaar should look for shell plugin external commands." 9858msgstr "" 9859 9860#: en/help_topics/configuration.txt:183 9861msgid "" 9862"\n" 9863"http_proxy, https_proxy\n" 9864"~~~~~~~~~~~~~~~~~~~~~~~" 9865msgstr "" 9866 9867#: en/help_topics/configuration.txt:187 9868msgid "Specifies the network proxy for outgoing connections, for example::" 9869msgstr "" 9870 9871#: en/help_topics/configuration.txt:189 9872msgid "" 9873" http_proxy=http://proxy.example.com:3128/ \n" 9874" https_proxy=http://proxy.example.com:3128/" 9875msgstr "" 9876 9877#: en/help_topics/configuration.txt:192 9878msgid "" 9879"\n" 9880"Configuration files\n" 9881"-------------------" 9882msgstr "" 9883 9884#: en/help_topics/configuration.txt:196 9885msgid "" 9886"Location\n" 9887"~~~~~~~~" 9888msgstr "" 9889 9890#: en/help_topics/configuration.txt:199 9891msgid "" 9892"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n" 9893"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` " 9894"on\n" 9895"Windows. (You can check the location for your system by using\n" 9896"``bzr version``.)" 9897msgstr "" 9898 9899#: en/help_topics/configuration.txt:204 9900msgid "There are three primary configuration files in this location:" 9901msgstr "" 9902 9903#: en/help_topics/configuration.txt:206 9904msgid "* ``bazaar.conf`` describes default configuration options," 9905msgstr "" 9906 9907#: en/help_topics/configuration.txt:208 9908msgid "" 9909"* ``locations.conf`` describes configuration information for\n" 9910" specific branch locations," 9911msgstr "" 9912 9913#: en/help_topics/configuration.txt:211 9914msgid "" 9915"* ``authentication.conf`` describes credential information for\n" 9916" remote servers." 9917msgstr "" 9918 9919#: en/help_topics/configuration.txt:214 9920msgid "" 9921"Each branch can also contain a configuration file that sets values specific\n" 9922"to that branch. This file is found at ``.bzr/branch/branch.conf`` within " 9923"the\n" 9924"branch. This file is visible to all users of a branch, if you wish to " 9925"override\n" 9926"one of the values for a branch with a setting that is specific to you then " 9927"you\n" 9928"can do so in ``locations.conf``." 9929msgstr "" 9930 9931#: en/help_topics/configuration.txt:220 9932msgid "" 9933"General format\n" 9934"~~~~~~~~~~~~~~" 9935msgstr "" 9936 9937#: en/help_topics/configuration.txt:223 9938msgid "" 9939"An ini file has three types of contructs: section headers, section\n" 9940"options and comments." 9941msgstr "" 9942 9943#: en/help_topics/configuration.txt:226 9944msgid "" 9945"Comments\n" 9946"^^^^^^^^" 9947msgstr "" 9948 9949#: en/help_topics/configuration.txt:229 9950msgid "" 9951"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n" 9952"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n" 9953"Bazaar when parsing ini files." 9954msgstr "" 9955 9956#: en/help_topics/configuration.txt:233 9957msgid "" 9958"Section headers\n" 9959"^^^^^^^^^^^^^^^" 9960msgstr "" 9961 9962#: en/help_topics/configuration.txt:236 9963msgid "" 9964"A section header is a word enclosed in brackets that starts at the begining\n" 9965"of a line. A typical section header looks like this::" 9966msgstr "" 9967 9968#: en/help_topics/configuration.txt:239 9969msgid " [DEFAULT]" 9970msgstr "" 9971 9972#: en/help_topics/configuration.txt:241 9973msgid "" 9974"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n" 9975"[ALIASES]. Section headers are case sensitive. The default section provides " 9976"for\n" 9977"setting options which can be overridden with the branch config file." 9978msgstr "" 9979 9980#: en/help_topics/configuration.txt:245 9981msgid "" 9982"For ``locations.conf``, the options from the section with the\n" 9983"longest matching section header are used to the exclusion of other\n" 9984"potentially valid section headers. A section header uses the path for\n" 9985"the branch as the section header. Some examples include::" 9986msgstr "" 9987 9988#: en/help_topics/configuration.txt:250 9989msgid "" 9990" [http://mybranches.isp.com/~jdoe/branchdir]\n" 9991" [/home/jdoe/branches/]" 9992msgstr "" 9993 9994#: en/help_topics/configuration.txt:253 9995msgid "" 9996"\n" 9997"Section options\n" 9998"^^^^^^^^^^^^^^^" 9999msgstr "" 10000 10001#: en/help_topics/configuration.txt:257 10002msgid "" 10003"A section option resides within a section. A section option contains an\n" 10004"option name, an equals sign and a value. For example::" 10005msgstr "" 10006 10007#: en/help_topics/configuration.txt:260 10008msgid "" 10009" email = John Doe <jdoe@isp.com>\n" 10010" gpg_signing_key = Amy Pond <amy@example.com>" 10011msgstr "" 10012 10013#: en/help_topics/configuration.txt:263 10014msgid "" 10015"A option can reference other options by enclosing them in curly brackets::" 10016msgstr "" 10017 10018#: en/help_topics/configuration.txt:265 10019msgid "" 10020" my_branch_name = feature_x\n" 10021" my_server = bzr+ssh://example.com\n" 10022" push_location = {my_server}/project/{my_branch_name}" 10023msgstr "" 10024 10025#: en/help_topics/configuration.txt:269 10026msgid "" 10027"Option policies\n" 10028"^^^^^^^^^^^^^^^" 10029msgstr "" 10030 10031#: en/help_topics/configuration.txt:272 10032msgid "" 10033"Options defined in a section affect the named directory or URL plus\n" 10034"any locations they contain. Policies can be used to change how an\n" 10035"option value is interpreted for contained locations. Currently\n" 10036"there are three policies available:" 10037msgstr "" 10038 10039#: en/help_topics/configuration.txt:277 10040msgid "" 10041" none:\n" 10042" the value is interpreted the same for contained locations. This is\n" 10043" the default behaviour.\n" 10044" norecurse:\n" 10045" the value is only used for the exact location specified by the\n" 10046" section name.\n" 10047" appendpath:\n" 10048" for contained locations, any additional path components are\n" 10049" appended to the value." 10050msgstr "" 10051 10052#: en/help_topics/configuration.txt:287 10053msgid "" 10054"Policies are specified by keys with names of the form \"<option_name>:policy" 10055"\".\n" 10056"For example, to define the push location for a tree of branches, the\n" 10057"following could be used::" 10058msgstr "" 10059 10060#: en/help_topics/configuration.txt:291 10061msgid "" 10062" [/top/location]\n" 10063" push_location = sftp://example.com/location\n" 10064" push_location:policy = appendpath" 10065msgstr "" 10066 10067#: en/help_topics/configuration.txt:295 10068msgid "" 10069"With this configuration, the push location for ``/top/location/branch1``\n" 10070"would be ``sftp://example.com/location/branch1``." 10071msgstr "" 10072 10073#: en/help_topics/configuration.txt:298 10074msgid "" 10075"Section local options\n" 10076"^^^^^^^^^^^^^^^^^^^^^" 10077msgstr "" 10078 10079#: en/help_topics/configuration.txt:301 10080msgid "" 10081"Some options are defined automatically inside a given section and can be\n" 10082"refered to in this section only. " 10083msgstr "" 10084 10085#: en/help_topics/configuration.txt:304 10086msgid "For example, the ``appendpath`` policy can be used like this::" 10087msgstr "" 10088 10089#: en/help_topics/configuration.txt:306 10090msgid "" 10091" [/home/vila/src/bzr/bugs]\n" 10092" mypush = lp:~vila/bzr\n" 10093" mypush:policy=appendpath" 10094msgstr "" 10095 10096#: en/help_topics/configuration.txt:310 10097msgid "Using ``relpath`` to achieve the same result is done like this::" 10098msgstr "" 10099 10100#: en/help_topics/configuration.txt:312 10101msgid "" 10102" [/home/vila/src/bzr/bugs]\n" 10103" mypush = lp:~vila/bzr/{relpath}" 10104msgstr "" 10105 10106#: en/help_topics/configuration.txt:315 10107msgid "" 10108"In both cases, when used in a directory like\n" 10109"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::" 10110msgstr "" 10111 10112#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329 10113msgid "" 10114" $ bzr config mypush\n" 10115" lp:~vila/bzr/832013-expand-in-stack" 10116msgstr "" 10117 10118#: en/help_topics/configuration.txt:321 10119msgid "Another such option is ``basename`` which can be used like this::" 10120msgstr "" 10121 10122#: en/help_topics/configuration.txt:323 10123msgid "" 10124" [/home/vila/src/bzr]\n" 10125" mypush = lp:~vila/bzr/{basename}" 10126msgstr "" 10127 10128#: en/help_topics/configuration.txt:326 10129msgid "" 10130"When used in a directory like\n" 10131"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::" 10132msgstr "" 10133 10134#: en/help_topics/configuration.txt:332 10135msgid "" 10136"Note that ``basename`` here refers to the base name of ``relpath`` which\n" 10137"itself is defined as the relative path between the section name and the\n" 10138"location it matches." 10139msgstr "" 10140 10141#: en/help_topics/configuration.txt:336 10142msgid "" 10143"Another such option is ``branchname``, which refers to the name of a " 10144"colocated\n" 10145"branch. For non-colocated branches, it behaves like basename. It can be " 10146"used\n" 10147"like this::" 10148msgstr "" 10149 10150#: en/help_topics/configuration.txt:340 10151msgid "" 10152" [/home/vila/src/bzr/bugs]\n" 10153" mypush = lp:~vila/bzr/{branchname}" 10154msgstr "" 10155 10156#: en/help_topics/configuration.txt:343 10157msgid "" 10158"When used with a colocated branch named ``832013-expand-in-stack``, we'll " 10159"get::" 10160msgstr "" 10161 10162#: en/help_topics/configuration.txt:345 10163msgid "" 10164" bzr config mypush\n" 10165" lp:~vila/bzr/832013-expand-in-stack" 10166msgstr "" 10167 10168#: en/help_topics/configuration.txt:348 10169msgid "" 10170"When an option is local to a Section, it cannot be referred to from option\n" 10171"values in any other section from the same ``Store`` nor from any other\n" 10172"``Store``." 10173msgstr "" 10174 10175#: en/help_topics/configuration.txt:352 10176msgid "" 10177"\n" 10178"The main configuration file, bazaar.conf\n" 10179"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 10180msgstr "" 10181 10182#: en/help_topics/configuration.txt:356 10183msgid "" 10184"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n" 10185"The default section contains the default\n" 10186"configuration options for all branches. The default section can be\n" 10187"overriden by providing a branch-specific section in ``locations.conf``." 10188msgstr "" 10189 10190#: en/help_topics/configuration.txt:361 10191msgid "A typical ``bazaar.conf`` section often looks like the following::" 10192msgstr "" 10193 10194#: en/help_topics/configuration.txt:363 10195msgid "" 10196" [DEFAULT]\n" 10197" email = John Doe <jdoe@isp.com>\n" 10198" editor = /usr/bin/vim\n" 10199" create_signatures = when-required" 10200msgstr "" 10201 10202#: en/help_topics/configuration.txt:368 10203msgid "" 10204"\n" 10205"The branch location configuration file, locations.conf\n" 10206"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 10207msgstr "" 10208 10209#: en/help_topics/configuration.txt:372 10210msgid "" 10211"``locations.conf`` allows one to specify overriding settings for\n" 10212"a specific branch. The format is almost identical to the default section in\n" 10213"bazaar.conf with one significant change: The section header, instead of " 10214"saying\n" 10215"default, will be the path to a branch that you wish to override a value\n" 10216"for. The '?' and '*' wildcards are supported::" 10217msgstr "" 10218 10219#: en/help_topics/configuration.txt:378 10220msgid "" 10221" [/home/jdoe/branches/nethack]\n" 10222" email = Nethack Admin <nethack@nethack.com>" 10223msgstr "" 10224 10225#: en/help_topics/configuration.txt:381 10226msgid "" 10227" [http://hypothetical.site.com/branches/devel-branch]\n" 10228" create_signatures = always" 10229msgstr "" 10230 10231#: en/help_topics/configuration.txt:384 10232msgid "" 10233"The authentication configuration file, authentication.conf\n" 10234"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 10235msgstr "" 10236 10237#: en/help_topics/configuration.txt:387 10238msgid "" 10239"``authentication.conf`` allows one to specify credentials for\n" 10240"remote servers. This can be used for all the supported transports and any " 10241"part\n" 10242"of bzr that requires authentication (smtp for example)." 10243msgstr "" 10244 10245#: en/help_topics/configuration.txt:391 10246msgid "" 10247"The syntax of the file obeys the same rules as the others except for the\n" 10248"option policies which don't apply." 10249msgstr "" 10250 10251#: en/help_topics/configuration.txt:394 10252msgid "" 10253"For more information on the possible uses of the authentication " 10254"configuration\n" 10255"file see :doc:`authentication-help`." 10256msgstr "" 10257 10258#: en/help_topics/configuration.txt:397 10259msgid "" 10260"\n" 10261"Common options\n" 10262"--------------" 10263msgstr "" 10264 10265#: en/help_topics/configuration.txt:401 10266msgid "" 10267"debug_flags\n" 10268"~~~~~~~~~~~" 10269msgstr "" 10270 10271#: en/help_topics/configuration.txt:404 10272msgid "" 10273"A comma-separated list of debugging options to turn on. The same values\n" 10274"can be used as with the -D command-line option (see `help global-options`).\n" 10275"For example::" 10276msgstr "" 10277 10278#: en/help_topics/configuration.txt:408 10279msgid " debug_flags = hpss" 10280msgstr "" 10281 10282#: en/help_topics/configuration.txt:412 10283msgid " debug_flags = hpss,evil" 10284msgstr "" 10285 10286#: en/help_topics/configuration.txt:414 10287msgid "" 10288"email\n" 10289"~~~~~" 10290msgstr "" 10291 10292#: en/help_topics/configuration.txt:417 10293msgid "" 10294"The email address to use when committing a branch. Typically takes the form\n" 10295"of::" 10296msgstr "" 10297 10298#: en/help_topics/configuration.txt:420 10299msgid " email = Full Name <account@hostname.tld>" 10300msgstr "" 10301 10302#: en/help_topics/configuration.txt:422 10303msgid "" 10304"editor\n" 10305"~~~~~~" 10306msgstr "" 10307 10308#: en/help_topics/configuration.txt:425 10309msgid "" 10310"The path of the editor that you wish to use if *bzr commit* is run without\n" 10311"a commit message. This setting is trumped by the environment variable\n" 10312"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n" 10313"variables." 10314msgstr "" 10315 10316#: en/help_topics/configuration.txt:430 10317msgid "" 10318"log_format\n" 10319"~~~~~~~~~~" 10320msgstr "" 10321 10322#: en/help_topics/configuration.txt:433 10323msgid "" 10324"The default log format to use. Standard log formats are ``long``, ``short``\n" 10325"and ``line``. Additional formats may be provided by plugins. The default\n" 10326"value is ``long``." 10327msgstr "" 10328 10329#: en/help_topics/configuration.txt:437 10330msgid "" 10331"check_signatures\n" 10332"~~~~~~~~~~~~~~~~" 10333msgstr "" 10334 10335#: en/help_topics/configuration.txt:440 10336msgid "" 10337"Reserved for future use. These options will allow a policy for branches to\n" 10338"require signatures." 10339msgstr "" 10340 10341#: en/help_topics/configuration.txt:443 10342msgid "" 10343"require\n" 10344" The gnupg signature for revisions must be present and must be valid." 10345msgstr "" 10346 10347#: en/help_topics/configuration.txt:446 10348msgid "" 10349"ignore\n" 10350" Do not check gnupg signatures of revisions." 10351msgstr "" 10352 10353#: en/help_topics/configuration.txt:449 10354msgid "" 10355"check-available\n" 10356" (default) If gnupg signatures for revisions are present, check them.\n" 10357" Bazaar will fail if it finds a bad signature, but will not fail if\n" 10358" no signature is present." 10359msgstr "" 10360 10361#: en/help_topics/configuration.txt:454 10362msgid "" 10363"create_signatures\n" 10364"~~~~~~~~~~~~~~~~~" 10365msgstr "" 10366 10367#: en/help_topics/configuration.txt:457 10368msgid "" 10369"Defines the behaviour of signing revisions on commits. By default bzr will " 10370"not\n" 10371"sign new commits." 10372msgstr "" 10373 10374#: en/help_topics/configuration.txt:460 10375msgid "" 10376"always\n" 10377" Sign every new revision that is committed. If the signing fails then " 10378"the\n" 10379" commit will not be made." 10380msgstr "" 10381 10382#: en/help_topics/configuration.txt:464 10383msgid "" 10384"when-required\n" 10385" Reserved for future use." 10386msgstr "" 10387 10388#: en/help_topics/configuration.txt:467 10389msgid "" 10390"never\n" 10391" Reserved for future use." 10392msgstr "" 10393 10394#: en/help_topics/configuration.txt:470 10395msgid "" 10396"In future it is planned that ``when-required`` will sign newly\n" 10397"committed revisions only when the branch requires them. ``never`` will " 10398"refuse\n" 10399"to sign newly committed revisions, even if the branch requires signatures." 10400msgstr "" 10401 10402#: en/help_topics/configuration.txt:474 10403msgid "" 10404"dirstate.fdatasync\n" 10405"~~~~~~~~~~~~~~~~~~" 10406msgstr "" 10407 10408#: en/help_topics/configuration.txt:477 10409msgid "" 10410"If true (default), working tree metadata changes are flushed through the\n" 10411"OS buffers to physical disk. This is somewhat slower, but means data\n" 10412"should not be lost if the machine crashes. See also repository.fdatasync." 10413msgstr "" 10414 10415#: en/help_topics/configuration.txt:481 10416msgid "" 10417"gpg_signing_key\n" 10418"~~~~~~~~~~~~~~~" 10419msgstr "" 10420 10421#: en/help_topics/configuration.txt:484 10422msgid "" 10423"The GnuPG user identity to use when signing commits. Can be an e-mail\n" 10424"address, key fingerprint or full key ID. When unset or when set to\n" 10425"\"default\" Bazaar will use the user e-mail set with ``whoami``." 10426msgstr "" 10427 10428#: en/help_topics/configuration.txt:488 10429msgid "" 10430"recurse\n" 10431"~~~~~~~" 10432msgstr "" 10433 10434#: en/help_topics/configuration.txt:491 10435msgid "" 10436"Only useful in ``locations.conf``. Defines whether or not the\n" 10437"configuration for this section applies to subdirectories:" 10438msgstr "" 10439 10440#: en/help_topics/configuration.txt:494 10441msgid "" 10442"true\n" 10443" (default) This section applies to subdirectories as well." 10444msgstr "" 10445 10446#: en/help_topics/configuration.txt:497 10447msgid "" 10448"false\n" 10449" This section only applies to the branch at this directory and not\n" 10450" branches below it." 10451msgstr "" 10452 10453#: en/help_topics/configuration.txt:501 10454msgid "" 10455"gpg_signing_command\n" 10456"~~~~~~~~~~~~~~~~~~~" 10457msgstr "" 10458 10459#: en/help_topics/configuration.txt:504 10460msgid "" 10461"(Default: \"gpg\"). Which program should be used to sign and check " 10462"revisions.\n" 10463"For example::" 10464msgstr "" 10465 10466#: en/help_topics/configuration.txt:507 10467msgid " gpg_signing_command = /usr/bin/gnpg" 10468msgstr "" 10469 10470#: en/help_topics/configuration.txt:509 10471msgid "" 10472"The specified command must accept the options \"--clearsign\" and \"-u " 10473"<email>\"." 10474msgstr "" 10475 10476#: en/help_topics/configuration.txt:511 10477msgid "" 10478"bzr_remote_path\n" 10479"~~~~~~~~~~~~~~~" 10480msgstr "" 10481 10482#: en/help_topics/configuration.txt:514 10483msgid "" 10484"(Default: \"bzr\"). The path to the command that should be used to run the " 10485"smart\n" 10486"server for bzr. This value may only be specified in locations.conf, because:" 10487msgstr "" 10488 10489#: en/help_topics/configuration.txt:517 10490msgid "" 10491"- it's needed before branch.conf is accessible\n" 10492"- allowing remote branch.conf files to specify commands would be a security\n" 10493" risk" 10494msgstr "" 10495 10496#: en/help_topics/configuration.txt:521 10497msgid "It is overridden by the BZR_REMOTE_PATH environment variable." 10498msgstr "" 10499 10500#: en/help_topics/configuration.txt:523 10501msgid "" 10502"smtp_server\n" 10503"~~~~~~~~~~~" 10504msgstr "" 10505 10506#: en/help_topics/configuration.txt:526 10507msgid "" 10508"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n" 10509"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin." 10510msgstr "" 10511 10512#: en/help_topics/configuration.txt:529 10513msgid "" 10514"smtp_username, smtp_password\n" 10515"~~~~~~~~~~~~~~~~~~~~~~~~~~~~" 10516msgstr "" 10517 10518#: en/help_topics/configuration.txt:532 10519msgid "" 10520"User and password to authenticate to the SMTP server. If smtp_username\n" 10521"is set, and smtp_password is not, Bazaar will prompt for a password.\n" 10522"These settings are only needed if the SMTP server requires authentication\n" 10523"to send mail." 10524msgstr "" 10525 10526#: en/help_topics/configuration.txt:537 10527msgid "" 10528"locks.steal_dead\n" 10529"~~~~~~~~~~~~~~~~" 10530msgstr "" 10531 10532#: en/help_topics/configuration.txt:540 10533msgid "" 10534"If set to true, bzr will automatically break locks held by processes from\n" 10535"the same machine and user that are no longer alive. Otherwise, it will\n" 10536"print a message and you can break the lock manually, if you are satisfied\n" 10537"the object is no longer in use." 10538msgstr "" 10539 10540#: en/help_topics/configuration.txt:545 10541msgid "" 10542"mail_client\n" 10543"~~~~~~~~~~~" 10544msgstr "" 10545 10546#: en/help_topics/configuration.txt:548 10547msgid "" 10548"A mail client to use for sending merge requests.\n" 10549"By default, bzr will try to use ``mapi`` on Windows. On other platforms, " 10550"it\n" 10551"will try ``xdg-email``. If either of these fails, it will fall back to\n" 10552"``editor``." 10553msgstr "" 10554 10555#: en/help_topics/configuration.txt:553 10556msgid "Supported values for specific clients:" 10557msgstr "" 10558 10559#: en/help_topics/configuration.txt:555 10560msgid "" 10561":claws: Use Claws. This skips a dialog for attaching files.\n" 10562":evolution: Use Evolution.\n" 10563":kmail: Use KMail.\n" 10564":mutt: Use Mutt.\n" 10565":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove " 10566"1.5,\n" 10567" this works around some bugs that xdg-email doesn't handle." 10568msgstr "" 10569 10570#: en/help_topics/configuration.txt:562 10571msgid "Supported generic values are:" 10572msgstr "" 10573 10574#: en/help_topics/configuration.txt:564 10575msgid "" 10576":default: See above.\n" 10577":editor: Use your editor to compose the merge request. This also uses\n" 10578" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n" 10579" smtp_username and smtp_password.\n" 10580":mapi: Use your preferred e-mail client on Windows.\n" 10581":xdg-email: Use xdg-email to run your preferred mail program" 10582msgstr "" 10583 10584#: en/help_topics/configuration.txt:571 10585msgid "" 10586"repository.fdatasync\n" 10587"~~~~~~~~~~~~~~~~~~~~" 10588msgstr "" 10589 10590#: en/help_topics/configuration.txt:574 10591msgid "" 10592"If true (default), repository changes are flushed through the OS buffers\n" 10593"to physical disk. This is somewhat slower, but means data should not be\n" 10594"lost if the machine crashes. See also dirstate.fdatasync." 10595msgstr "" 10596 10597#: en/help_topics/configuration.txt:578 10598msgid "" 10599"submit_branch\n" 10600"~~~~~~~~~~~~~" 10601msgstr "" 10602 10603#: en/help_topics/configuration.txt:581 10604msgid "" 10605"The branch you intend to submit your current work to. This is " 10606"automatically\n" 10607"set by ``bzr send``, and is also used by the ``submit:`` revision spec. " 10608"This\n" 10609"should usually be set on a per-branch or per-location basis." 10610msgstr "" 10611 10612#: en/help_topics/configuration.txt:585 10613msgid "" 10614"public_branch\n" 10615"~~~~~~~~~~~~~" 10616msgstr "" 10617 10618#: en/help_topics/configuration.txt:588 10619msgid "" 10620"A publically-accessible version of this branch (implying that this version " 10621"is\n" 10622"not publically-accessible). Used (and set) by ``bzr send``." 10623msgstr "" 10624 10625#: en/help_topics/configuration.txt:591 10626msgid "" 10627"suppress_warnings\n" 10628"~~~~~~~~~~~~~~~~~" 10629msgstr "" 10630 10631#: en/help_topics/configuration.txt:594 10632msgid "" 10633"A list of strings, each string represent a warning that can be emitted by\n" 10634"bzr. Mentioning a warning in this list tells bzr to not emit it." 10635msgstr "" 10636 10637#: en/help_topics/configuration.txt:597 10638msgid "Valid values:" 10639msgstr "" 10640 10641#: en/help_topics/configuration.txt:599 10642msgid "" 10643"* ``format_deprecation``:\n" 10644" whether the format deprecation warning is shown on repositories that " 10645"are\n" 10646" using deprecated formats." 10647msgstr "" 10648 10649#: en/help_topics/configuration.txt:603 10650msgid "" 10651"default_format\n" 10652"~~~~~~~~~~~~~~" 10653msgstr "" 10654 10655#: en/help_topics/configuration.txt:606 10656msgid "" 10657"A format name for the default format used when creating branches. See " 10658"``bzr\n" 10659"help formats`` for possible values." 10660msgstr "" 10661 10662#: en/help_topics/configuration.txt:609 10663msgid "" 10664"\n" 10665"Unicode options\n" 10666"---------------" 10667msgstr "" 10668 10669#: en/help_topics/configuration.txt:613 10670msgid "" 10671"output_encoding\n" 10672"~~~~~~~~~~~~~~~" 10673msgstr "" 10674 10675#: en/help_topics/configuration.txt:616 10676msgid "" 10677"A Python unicode encoding name for text output from bzr, such as log\n" 10678"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n" 10679"is the terminal encoding prefered by the operating system." 10680msgstr "" 10681 10682#: en/help_topics/configuration.txt:620 10683msgid "" 10684"\n" 10685"Branch type specific options\n" 10686"----------------------------" 10687msgstr "" 10688 10689#: en/help_topics/configuration.txt:624 10690msgid "" 10691"These options apply only to branches that use the ``dirstate-tags`` or\n" 10692"later format. They\n" 10693"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n" 10694"manually set in ``locations.conf`` or ``bazaar.conf``." 10695msgstr "" 10696 10697#: en/help_topics/configuration.txt:629 10698msgid "" 10699"append_revisions_only\n" 10700"~~~~~~~~~~~~~~~~~~~~~" 10701msgstr "" 10702 10703#: en/help_topics/configuration.txt:632 10704msgid "" 10705"If set to \"True\" then revisions can only be appended to the log, not\n" 10706"removed. A branch with this setting enabled can only pull from another\n" 10707"branch if the other branch's log is a longer version of its own. This is\n" 10708"normally set by ``bzr init --append-revisions-only``. If you set it\n" 10709"manually, use either 'True' or 'False' (case-sensitive) to maintain\n" 10710"compatibility with previous bzr versions (older than 2.2)." 10711msgstr "" 10712 10713#: en/help_topics/configuration.txt:639 10714msgid "" 10715"parent_location\n" 10716"~~~~~~~~~~~~~~~" 10717msgstr "" 10718 10719#: en/help_topics/configuration.txt:642 10720msgid "" 10721"If present, the location of the default branch for pull or merge. This " 10722"option\n" 10723"is normally set when creating a branch, the first ``pull`` or by ``pull\n" 10724"--remember``." 10725msgstr "" 10726 10727#: en/help_topics/configuration.txt:646 10728msgid "" 10729"push_location\n" 10730"~~~~~~~~~~~~~" 10731msgstr "" 10732 10733#: en/help_topics/configuration.txt:649 10734msgid "" 10735"If present, the location of the default branch for push. This option\n" 10736"is normally set by the first ``push`` or ``push --remember``." 10737msgstr "" 10738 10739#: en/help_topics/configuration.txt:652 10740msgid "" 10741"push_strict\n" 10742"~~~~~~~~~~~" 10743msgstr "" 10744 10745#: en/help_topics/configuration.txt:655 10746msgid "" 10747"If present, defines the ``--strict`` option default value for checking\n" 10748"uncommitted changes before pushing." 10749msgstr "" 10750 10751#: en/help_topics/configuration.txt:658 10752msgid "" 10753"dpush_strict\n" 10754"~~~~~~~~~~~~" 10755msgstr "" 10756 10757#: en/help_topics/configuration.txt:661 10758msgid "" 10759"If present, defines the ``--strict`` option default value for checking\n" 10760"uncommitted changes before pushing into a different VCS without any\n" 10761"custom bzr metadata." 10762msgstr "" 10763 10764#: en/help_topics/configuration.txt:665 10765msgid "" 10766"bound_location\n" 10767"~~~~~~~~~~~~~~" 10768msgstr "" 10769 10770#: en/help_topics/configuration.txt:668 10771msgid "" 10772"The location that commits should go to when acting as a checkout.\n" 10773"This option is normally set by ``bind``." 10774msgstr "" 10775 10776#: en/help_topics/configuration.txt:671 10777msgid "" 10778"bound\n" 10779"~~~~~" 10780msgstr "" 10781 10782#: en/help_topics/configuration.txt:674 10783msgid "" 10784"If set to \"True\", the branch should act as a checkout, and push each " 10785"commit to\n" 10786"the bound_location. This option is normally set by ``bind``/``unbind``." 10787msgstr "" 10788 10789#: en/help_topics/configuration.txt:677 10790msgid "" 10791"send_strict\n" 10792"~~~~~~~~~~~" 10793msgstr "" 10794 10795#: en/help_topics/configuration.txt:680 10796msgid "" 10797"If present, defines the ``--strict`` option default value for checking\n" 10798"uncommitted changes before sending a merge directive." 10799msgstr "" 10800 10801#: en/help_topics/configuration.txt:683 10802msgid "" 10803"add.maximum_file_size\n" 10804"~~~~~~~~~~~~~~~~~~~~~" 10805msgstr "" 10806 10807#: en/help_topics/configuration.txt:686 10808msgid "" 10809"Defines the maximum file size the command line \"add\" operation will allow\n" 10810"in recursive mode, with files larger than this value being skipped. You " 10811"may \n" 10812"specify this value as an integer (in which case it is interpreted as " 10813"bytes), \n" 10814"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of " 10815"0 \n" 10816"will disable skipping." 10817msgstr "" 10818 10819#: en/help_topics/configuration.txt:692 10820msgid "" 10821"External Merge Tools\n" 10822"--------------------" 10823msgstr "" 10824 10825#: en/help_topics/configuration.txt:695 10826msgid "" 10827"bzr.mergetool.<name>\n" 10828"~~~~~~~~~~~~~~~~~~~~" 10829msgstr "" 10830 10831#: en/help_topics/configuration.txt:698 10832msgid "" 10833"Defines an external merge tool called <name> with the given command-line.\n" 10834"Arguments containing spaces should be quoted using single or double quotes. " 10835"The\n" 10836"executable may omit its path if it can be found on the PATH." 10837msgstr "" 10838 10839#: en/help_topics/configuration.txt:702 10840msgid "" 10841"The following markers can be used in the command-line to substitute " 10842"filenames\n" 10843"involved in the merge conflict::" 10844msgstr "" 10845 10846#: en/help_topics/configuration.txt:705 10847msgid "" 10848" {base} file.BASE\n" 10849" {this} file.THIS\n" 10850" {other} file.OTHER\n" 10851" {result} output file\n" 10852" {this_temp} temp copy of file.THIS, used to overwrite output file if " 10853"merge\n" 10854" succeeds." 10855msgstr "" 10856 10857#: en/help_topics/configuration.txt:714 10858msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}" 10859msgstr "" 10860 10861#: en/help_topics/configuration.txt:716 10862msgid "" 10863"Because ``mergetool`` and ``config`` itself both use curly braces as\n" 10864"interpolation markers, trying to display the mergetool line results in the\n" 10865"following problem::" 10866msgstr "" 10867 10868#: en/help_topics/configuration.txt:720 10869msgid "" 10870"\n" 10871" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o " 10872"{result}'\n" 10873" $ bzr config bzr.mergetool.kdiff3\n" 10874" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} " 10875"{this} {other} -o {result}\"." 10876msgstr "" 10877 10878#: en/help_topics/configuration.txt:725 10879msgid "" 10880"To avoid this, ``config`` can be instructed not to try expanding variables::" 10881msgstr "" 10882 10883#: en/help_topics/configuration.txt:727 10884msgid "" 10885" $ bzr config --all bzr.mergetool.kdiff3\n" 10886" branch:\n" 10887" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}" 10888msgstr "" 10889 10890#: en/help_topics/configuration.txt:731 10891msgid "" 10892"\n" 10893"bzr.default_mergetool\n" 10894"~~~~~~~~~~~~~~~~~~~~~" 10895msgstr "" 10896 10897#: en/help_topics/configuration.txt:735 10898msgid "" 10899"Specifies which external merge tool (as defined above) should be selected " 10900"by\n" 10901"default in tools such as ``bzr qconflicts``." 10902msgstr "" 10903 10904#: en/help_topics/configuration.txt:740 10905msgid " bzr.default_mergetool = kdiff3\n" 10906msgstr "" 10907 10908#: en/help_topics/conflict-types.txt:1 10909msgid "" 10910"Conflict Types\n" 10911"==============" 10912msgstr "" 10913 10914#: en/help_topics/conflict-types.txt:4 10915msgid "" 10916"Some operations, like merge, revert and pull, modify the contents of your\n" 10917"working tree. These modifications are programmatically generated, and so " 10918"they\n" 10919"may conflict with the current state of your working tree. " 10920msgstr "" 10921 10922#: en/help_topics/conflict-types.txt:8 10923msgid "" 10924"When conflicts are present in your working tree (as shown by ``brz\n" 10925"conflicts``), you should resolve them and then inform brz that the " 10926"conflicts\n" 10927"have been resolved." 10928msgstr "" 10929 10930#: en/help_topics/conflict-types.txt:12 10931msgid "" 10932"Resolving conflicts is sometimes not obvious. Either because the user that\n" 10933"should resolve them is not the one responsible for their occurrence, as is " 10934"the\n" 10935"case when merging other people's work or because some conflicts are " 10936"presented\n" 10937"in a way that is not easy to understand." 10938msgstr "" 10939 10940#: en/help_topics/conflict-types.txt:17 10941msgid "" 10942"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n" 10943"conflict if and only if there's an actual conceptual conflict in the source\n" 10944"tree. Because Bazaar doesn't understand the real meaning of the files " 10945"being\n" 10946"versioned, it can, when faced with ambiguities, fall short in either " 10947"direction\n" 10948"trying to resolve the conflict itself. Many kinds of changes can be " 10949"combined\n" 10950"programmatically, but sometimes only a human can determine the right thing " 10951"to\n" 10952"do." 10953msgstr "" 10954 10955#: en/help_topics/conflict-types.txt:25 10956msgid "" 10957"When Bazaar generates a conflict, it adds information into the working tree " 10958"to\n" 10959"present the conflicting versions, and it's up to you to find the correct\n" 10960"resolution." 10961msgstr "" 10962 10963#: en/help_topics/conflict-types.txt:29 10964msgid "Whatever the conflict is, resolving it is roughly done in two steps:" 10965msgstr "" 10966 10967#: en/help_topics/conflict-types.txt:31 10968msgid "" 10969"1. Modify the working tree content so that the conflicted item is now in " 10970"the\n" 10971" state you want to keep, then" 10972msgstr "" 10973 10974#: en/help_topics/conflict-types.txt:34 10975msgid "" 10976"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n" 10977" remaining generated information (``brz resolve <item>``)." 10978msgstr "" 10979 10980#: en/help_topics/conflict-types.txt:37 10981msgid "" 10982"For most conflict types, there are some obvious ways to modify the working\n" 10983"tree and put it into the desired state. For some types of conflicts, Bazaar\n" 10984"itself already made a choice, when possible." 10985msgstr "" 10986 10987#: en/help_topics/conflict-types.txt:41 10988msgid "" 10989"Yet, whether Bazaar makes a choice or not, there are some other simple but\n" 10990"different ways to resolve the conflict." 10991msgstr "" 10992 10993#: en/help_topics/conflict-types.txt:44 10994msgid "" 10995"Each type of conflict is explained below, and the action which must be done " 10996"to\n" 10997"resolve the conflict is outlined." 10998msgstr "" 10999 11000#: en/help_topics/conflict-types.txt:47 11001msgid "" 11002"Various actions are available depending on the kind of conflict, for some " 11003"of\n" 11004"these actions, Bazaar can provide some help. In the end you should at least\n" 11005"inform Bazaar that you're done with the conflict with::" 11006msgstr "" 11007 11008#: en/help_topics/conflict-types.txt:51 11009msgid " ``brz resolve FILE --action=done'" 11010msgstr "" 11011 11012#: en/help_topics/conflict-types.txt:53 11013msgid "" 11014"Note that this is the default action when a single file is involved so you " 11015"can\n" 11016"simply use::" 11017msgstr "" 11018 11019#: en/help_topics/conflict-types.txt:56 11020msgid " ``brz resolve FILE``" 11021msgstr "" 11022 11023#: en/help_topics/conflict-types.txt:58 11024msgid "See ``brz help resolve`` for more details." 11025msgstr "" 11026 11027#: en/help_topics/conflict-types.txt:60 11028msgid "" 11029"Text conflicts\n" 11030"--------------" 11031msgstr "" 11032 11033#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120 11034#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175 11035#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213 11036#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281 11037#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339 11038msgid "Typical message::" 11039msgstr "" 11040 11041#: en/help_topics/conflict-types.txt:65 11042msgid " Text conflict in FILE" 11043msgstr "" 11044 11045#: en/help_topics/conflict-types.txt:67 11046msgid "" 11047"These are produced when a text merge cannot completely reconcile two sets " 11048"of\n" 11049"text changes. Bazaar will emit files for each version with the extensions\n" 11050"THIS, OTHER, and BASE. THIS is the version of the file from the target " 11051"tree,\n" 11052"i.e. the tree that you are merging changes into. OTHER is the version that " 11053"you\n" 11054"are merging into the target. BASE is an older version that is used as a " 11055"basis\n" 11056"for comparison." 11057msgstr "" 11058 11059#: en/help_topics/conflict-types.txt:74 11060msgid "" 11061"In the main copy of the file, Bazaar will include all the changes that it\n" 11062"could reconcile, and any un-reconciled conflicts are surrounded by\n" 11063"\"herringbone\" markers like ``<<<<<<<``." 11064msgstr "" 11065 11066#: en/help_topics/conflict-types.txt:78 11067msgid "" 11068"Say the initial text is \"The project leader released it.\", and THIS " 11069"modifies it\n" 11070"to \"Martin Pool released it.\", while OTHER modifies it to \"The project " 11071"leader\n" 11072"released Bazaar.\" A conflict would look like this::" 11073msgstr "" 11074 11075#: en/help_topics/conflict-types.txt:82 11076msgid "" 11077" <<<<<<< TREE\n" 11078" Martin Pool released it.\n" 11079" =======\n" 11080" The project leader released Bazaar.\n" 11081" >>>>>>> MERGE-SOURCE" 11082msgstr "" 11083 11084#: en/help_topics/conflict-types.txt:88 11085msgid "The correct resolution would be \"Martin Pool released Bazaar.\"" 11086msgstr "" 11087 11088#: en/help_topics/conflict-types.txt:90 11089msgid "" 11090"You can handle text conflicts either by editing the main copy of the file,\n" 11091"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n" 11092"worth mentioning that resolving text conflicts rarely involves picking one\n" 11093"set of changes over the other (but see below when you encounter these\n" 11094"cases). More often, the two sets of changes must be intelligently combined." 11095msgstr "" 11096 11097#: en/help_topics/conflict-types.txt:96 11098msgid "" 11099"If you edit the main copy, be sure to remove the herringbone markers. When\n" 11100"you are done editing, the file should look like it never had a conflict, and " 11101"be\n" 11102"ready to commit." 11103msgstr "" 11104 11105#: en/help_topics/conflict-types.txt:100 11106msgid "" 11107"When you have resolved text conflicts, just run ``brz resolve --auto``, and\n" 11108"Bazaar will auto-detect which conflicts you have resolved." 11109msgstr "" 11110 11111#: en/help_topics/conflict-types.txt:103 11112msgid "" 11113"When the conflict is resolved, Bazaar deletes the previously generated\n" 11114"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n" 11115"working tree." 11116msgstr "" 11117 11118#: en/help_topics/conflict-types.txt:107 11119msgid "" 11120"\n" 11121"When you want to pick one set of changes over the other, you can use ``brz\n" 11122"resolve`` with one of the following actions:" 11123msgstr "" 11124 11125#: en/help_topics/conflict-types.txt:111 11126msgid "" 11127"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n" 11128"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``." 11129msgstr "" 11130 11131#: en/help_topics/conflict-types.txt:114 11132msgid "" 11133"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n" 11134"modifications will be taken into account." 11135msgstr "" 11136 11137#: en/help_topics/conflict-types.txt:117 11138msgid "" 11139"Content conflicts\n" 11140"-----------------" 11141msgstr "" 11142 11143#: en/help_topics/conflict-types.txt:122 11144msgid " Contents conflict in FILE" 11145msgstr "" 11146 11147#: en/help_topics/conflict-types.txt:124 11148msgid "" 11149"This conflict happens when there are conflicting changes in the working " 11150"tree\n" 11151"and the merge source, but the conflicted items are not text files. They " 11152"may\n" 11153"be binary files, or symlinks, or directories. It can even happen with " 11154"files\n" 11155"that are deleted on one side, and modified on the other." 11156msgstr "" 11157 11158#: en/help_topics/conflict-types.txt:129 11159msgid "" 11160"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may " 11161"be\n" 11162"regular files, symlinks or directories). But it will not include a \"main " 11163"copy\"\n" 11164"of the file with herringbone conflict markers. It will appear that the " 11165"\"main\n" 11166"copy\" has been renamed to THIS or OTHER." 11167msgstr "" 11168 11169#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182 11170msgid "" 11171"To resolve that kind of conflict, you should rebuild FILE from either " 11172"version\n" 11173"or a combination of both." 11174msgstr "" 11175 11176#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185 11177#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252 11178#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326 11179#: en/help_topics/conflict-types.txt:361 11180msgid "``brz resolve`` recognizes the following actions:" 11181msgstr "" 11182 11183#: en/help_topics/conflict-types.txt:139 11184msgid "" 11185"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n" 11186"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n" 11187"* ``--action=done`` will just mark the conflict as resolved." 11188msgstr "" 11189 11190#: en/help_topics/conflict-types.txt:143 11191msgid "" 11192"Any action will also delete the previously generated ``.BASE``, ``.THIS`` " 11193"and\n" 11194"``.OTHER`` files if they are still present in the working tree." 11195msgstr "" 11196 11197#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193 11198#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276 11199#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334 11200#: en/help_topics/conflict-types.txt:369 11201msgid "" 11202"Bazaar cannot auto-detect when conflicts of this kind have been resolved." 11203msgstr "" 11204 11205#: en/help_topics/conflict-types.txt:148 11206msgid "" 11207"Tag conflicts\n" 11208"-------------" 11209msgstr "" 11210 11211#: en/help_topics/conflict-types.txt:153 11212msgid "" 11213" Conflicting tags:\n" 11214" version-0.1" 11215msgstr "" 11216 11217#: en/help_topics/conflict-types.txt:156 11218msgid "" 11219"When pulling from or pushing to another branch, Bazaar informs you about " 11220"tags\n" 11221"that conflict between the two branches; that is the same tag points to two\n" 11222"different revisions. You need not resolve these conflicts, but subsequent\n" 11223"uses of pull or push will result in the same message." 11224msgstr "" 11225 11226#: en/help_topics/conflict-types.txt:161 11227msgid "" 11228"To resolve the conflict, you must apply the correct tags to either the " 11229"target\n" 11230"branch or the source branch as appropriate. Use \"brz tags --show-ids -d\n" 11231"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n" 11232"target branch's tags match the source branch, then in the target branch do\n" 11233"``brz tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n" 11234"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the " 11235"source\n" 11236"branch. You need not call \"brz resolve\" after doing this. To resolve in\n" 11237"favor of the target branch, you need to similarly use ``tag --force`` in " 11238"the\n" 11239"source branch. (Note that pulling or pushing using --overwrite will " 11240"overwrite\n" 11241"all tags as well.)" 11242msgstr "" 11243 11244#: en/help_topics/conflict-types.txt:172 11245msgid "" 11246"Duplicate paths\n" 11247"---------------" 11248msgstr "" 11249 11250#: en/help_topics/conflict-types.txt:177 11251msgid " Conflict adding file FILE. Moved existing file to FILE.moved." 11252msgstr "" 11253 11254#: en/help_topics/conflict-types.txt:179 11255msgid "" 11256"Sometimes Bazaar will attempt to create a file using a pathname that has\n" 11257"already been used. The existing file will be renamed to \"FILE.moved\". " 11258msgstr "" 11259 11260#: en/help_topics/conflict-types.txt:187 11261msgid "" 11262"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved " 11263"FILE``,\n" 11264"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n" 11265"* ``--action=done`` will just mark the conflict as resolved." 11266msgstr "" 11267 11268#: en/help_topics/conflict-types.txt:191 11269msgid "" 11270"Note that you must get rid of FILE.moved before using ``--action=done``." 11271msgstr "" 11272 11273#: en/help_topics/conflict-types.txt:195 11274msgid "" 11275"Unversioned parent\n" 11276"------------------" 11277msgstr "" 11278 11279#: en/help_topics/conflict-types.txt:200 11280msgid " Conflict because FILE is not versioned, but has versioned children." 11281msgstr "" 11282 11283#: en/help_topics/conflict-types.txt:202 11284msgid "" 11285"Sometimes Bazaar will attempt to create a file whose parent directory is " 11286"not\n" 11287"versioned. This happens when the directory has been deleted in the target,\n" 11288"but has a new child in the source, or vice versa. In this situation, " 11289"Bazaar\n" 11290"will version the parent directory as well. Resolving this issue depends\n" 11291"very much on the particular scenario. You may wish to rename or delete " 11292"either\n" 11293"the file or the directory. When you are satisfied, you can run \"brz " 11294"resolve\n" 11295"FILE\" to mark the conflict as resolved." 11296msgstr "" 11297 11298#: en/help_topics/conflict-types.txt:210 11299msgid "" 11300"Missing parent\n" 11301"--------------" 11302msgstr "" 11303 11304#: en/help_topics/conflict-types.txt:215 11305msgid " Conflict adding files to FILE. Created directory." 11306msgstr "" 11307 11308#: en/help_topics/conflict-types.txt:217 11309msgid "" 11310"This happens when a directory has been deleted in the target, but has new\n" 11311"children in the source. This is similar to the \"unversioned parent\" " 11312"conflict,\n" 11313"except that the parent directory does not *exist*, instead of just being\n" 11314"unversioned. In this situation, Bazaar will create the missing parent.\n" 11315"Resolving this issue depends very much on the particular scenario." 11316msgstr "" 11317 11318#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249 11319msgid "" 11320"To resolve that kind of conflict, you should either remove or rename the\n" 11321"children or the directory or a combination of both." 11322msgstr "" 11323 11324#: en/help_topics/conflict-types.txt:228 11325msgid "" 11326"* ``--action=take-this`` will issue ``brz rm directory`` including the\n" 11327" children,\n" 11328"* ``--action=take-other`` will acknowledge Bazaar choice to keep the " 11329"children\n" 11330" and restoring the directory,\n" 11331"* ``--action=done`` will just mark the conflict as resolved." 11332msgstr "" 11333 11334#: en/help_topics/conflict-types.txt:236 11335msgid "" 11336"Deleting parent\n" 11337"---------------" 11338msgstr "" 11339 11340#: en/help_topics/conflict-types.txt:241 11341msgid " Conflict: can't delete DIR because it is not empty. Not deleting." 11342msgstr "" 11343 11344#: en/help_topics/conflict-types.txt:243 11345msgid "" 11346"This is the opposite of \"missing parent\". A directory is deleted in the\n" 11347"source, but has new children in the target (either because a directory\n" 11348"deletion is merged or because the merge introduce new children). Bazaar\n" 11349"will retain the directory. Resolving this issue depends very much on the\n" 11350"particular scenario." 11351msgstr "" 11352 11353#: en/help_topics/conflict-types.txt:254 11354msgid "" 11355"* ``--action=take-this`` will acknowledge Bazaar choice to keep the " 11356"directory," 11357msgstr "" 11358 11359#: en/help_topics/conflict-types.txt:256 11360msgid "" 11361"* ``--action=take-other`` will issue ``brz rm directory`` including the \n" 11362" children," 11363msgstr "" 11364 11365#: en/help_topics/conflict-types.txt:259 11366msgid "* ``--action=done`` will just mark the conflict as resolved." 11367msgstr "" 11368 11369#: en/help_topics/conflict-types.txt:261 11370msgid "" 11371"Note that when merging a directory deletion, if unversioned files are\n" 11372"present, they become potential orphans has they don't have a directory\n" 11373"parent anymore." 11374msgstr "" 11375 11376#: en/help_topics/conflict-types.txt:265 11377msgid "" 11378"Handling such orphans, *before* the conflict is created, is controlled by\n" 11379"setting the ``brz.transform.orphan_policy`` configuration option." 11380msgstr "" 11381 11382#: en/help_topics/conflict-types.txt:268 11383msgid "There are two possible values for this option:" 11384msgstr "" 11385 11386#: en/help_topics/conflict-types.txt:270 11387msgid "" 11388"* ``conflict`` (the default): will leave the orphans in place and\n" 11389" generate a conflicts," 11390msgstr "" 11391 11392#: en/help_topics/conflict-types.txt:273 11393msgid "" 11394"* ``move``: will move the orphans to a ``brz-orphans`` directory at the " 11395"root\n" 11396" of the working tree with names like ``<file>.~#~``." 11397msgstr "" 11398 11399#: en/help_topics/conflict-types.txt:278 11400msgid "" 11401"Path conflict\n" 11402"-------------" 11403msgstr "" 11404 11405#: en/help_topics/conflict-types.txt:283 11406msgid " Path conflict: PATH1 / PATH2" 11407msgstr "" 11408 11409#: en/help_topics/conflict-types.txt:285 11410msgid "" 11411"This happens when the source and target have each modified the name or " 11412"parent\n" 11413"directory of a file. Bazaar will use the path elements from the source." 11414msgstr "" 11415 11416#: en/help_topics/conflict-types.txt:288 11417msgid "" 11418"To resolve that kind of conflict, you just have to decide what name should " 11419"be\n" 11420"retained for the file involved." 11421msgstr "" 11422 11423#: en/help_topics/conflict-types.txt:293 11424msgid "" 11425"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n" 11426" issuing ``brz mv PATH2 PATH1``,\n" 11427"* ``--action=take-other`` will acknowledge Bazaar choice of keeping " 11428"``PATH2``,\n" 11429"* ``--action=done`` will just mark the conflict as resolved." 11430msgstr "" 11431 11432#: en/help_topics/conflict-types.txt:300 11433msgid "" 11434"Parent loop\n" 11435"-----------" 11436msgstr "" 11437 11438#: en/help_topics/conflict-types.txt:305 11439msgid " Conflict moving FILE into DIRECTORY. Cancelled move." 11440msgstr "" 11441 11442#: en/help_topics/conflict-types.txt:307 11443msgid "" 11444"This happens when the source and the target have each moved directories, so\n" 11445"that, if the change could be applied, a directory would be contained by " 11446"itself.\n" 11447"For example::" 11448msgstr "" 11449 11450#: en/help_topics/conflict-types.txt:311 11451msgid "" 11452" $ brz init\n" 11453" $ brz mkdir white\n" 11454" $ brz mkdir black\n" 11455" $ brz commit -m \"BASE\"\n" 11456" $ brz branch . ../other\n" 11457" $ brz mv white black\n" 11458" $ brz commit -m \"THIS\"\n" 11459" $ brz mv ../other/black ../other/white\n" 11460" $ brz commit ../other -m \"OTHER\"\n" 11461" $ brz merge ../other" 11462msgstr "" 11463 11464#: en/help_topics/conflict-types.txt:322 11465msgid "" 11466"In this situation, Bazaar will cancel the move, and leave ``white`` in\n" 11467"``black``. To resolve that kind of conflict, you just have to decide what\n" 11468"name should be retained for the directories involved." 11469msgstr "" 11470 11471#: en/help_topics/conflict-types.txt:328 11472msgid "" 11473"* ``--action=take-this`` will acknowledge Bazaar choice of leaving " 11474"``white`` \n" 11475" in ``black``,\n" 11476"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n" 11477" ``white`` by issuing ``brz mv black/white white ; brz mv black white``,\n" 11478"* ``--action=done`` will just mark the conflict as resolved." 11479msgstr "" 11480 11481#: en/help_topics/conflict-types.txt:336 11482msgid "" 11483"Non-directory parent\n" 11484"--------------------" 11485msgstr "" 11486 11487#: en/help_topics/conflict-types.txt:341 11488msgid "" 11489" Conflict: foo.new is not a directory, but has files in it.\n" 11490" Created directory." 11491msgstr "" 11492 11493#: en/help_topics/conflict-types.txt:344 11494msgid "" 11495"This happens when one side has added files to a directory, and the other " 11496"side\n" 11497"has changed the directory into a file or symlink. For example::" 11498msgstr "" 11499 11500#: en/help_topics/conflict-types.txt:347 11501msgid "" 11502" $ brz init\n" 11503" $ brz mkdir foo\n" 11504" $ brz commit -m \"BASE\"\n" 11505" $ brz branch . ../other\n" 11506" $ rmdir foo\n" 11507" $ touch foo\n" 11508" $ brz commit -m \"THIS\"\n" 11509" $ brz mkdir ../other/foo/bar\n" 11510" $ brz commit ../other -m \"OTHER\"\n" 11511" $ brz merge ../other" 11512msgstr "" 11513 11514#: en/help_topics/conflict-types.txt:358 11515msgid "" 11516"To resolve that kind of conflict, you have to decide what name should be\n" 11517"retained for the file, directory or symlink involved." 11518msgstr "" 11519 11520#: en/help_topics/conflict-types.txt:363 11521msgid "" 11522"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n" 11523" ``brz add foo``,\n" 11524"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n" 11525" ``brz mv foo.new foo``,\n" 11526"* ``--action=done`` will just mark the conflict as resolved." 11527msgstr "" 11528 11529#: en/help_topics/conflict-types.txt:371 11530msgid "" 11531"MalformedTransform\n" 11532"------------------" 11533msgstr "" 11534 11535#: en/help_topics/conflict-types.txt:374 11536msgid "" 11537"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n" 11538"exception. This means that Bazaar encountered a filesystem conflict that it " 11539"was\n" 11540"unable to resolve. This usually indicates a bug. Please let us know if " 11541"you\n" 11542"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n" 11543msgstr "" 11544 11545#: en/help_topics/content-filters.txt:1 11546msgid "" 11547"Content Filters\n" 11548"===============" 11549msgstr "" 11550 11551#: en/help_topics/content-filters.txt:4 11552msgid "" 11553"Content formats\n" 11554"---------------" 11555msgstr "" 11556 11557#: en/help_topics/content-filters.txt:7 11558msgid "" 11559"Bazaar's content filtering allows you to store files in a different\n" 11560"format from the copy in your working tree. This lets you, or your\n" 11561"co-developers, use Windows development tools that expect CRLF files\n" 11562"on projects that use other line-ending conventions. Among other things,\n" 11563"content filters also let Unix developers more easily work on projects\n" 11564"using Windows line-ending conventions, keyword expansion/compression,\n" 11565"and trailing spaces on lines in text files to be implicitly stripped\n" 11566"when committed." 11567msgstr "" 11568 11569#: en/help_topics/content-filters.txt:16 11570msgid "To generalize, there are two content formats supported by Bazaar:" 11571msgstr "" 11572 11573#: en/help_topics/content-filters.txt:18 11574msgid "" 11575"* a canonical format - how files are stored internally\n" 11576"* a convenience format - how files are created in a working tree." 11577msgstr "" 11578 11579#: en/help_topics/content-filters.txt:21 11580msgid "" 11581"\n" 11582"Format conversion\n" 11583"-----------------" 11584msgstr "" 11585 11586#: en/help_topics/content-filters.txt:25 11587msgid "" 11588"The conversion between these formats is done by content filters.\n" 11589"A content filter has two parts:" 11590msgstr "" 11591 11592#: en/help_topics/content-filters.txt:28 11593msgid "" 11594"* a read converter - converts from convenience to canonical format\n" 11595"* a write converter - converts from canonical to convenience format." 11596msgstr "" 11597 11598#: en/help_topics/content-filters.txt:31 11599msgid "" 11600"Many of these converters will provide *round-trip* conversion,\n" 11601"i.e. applying the read converter followed by the write converter\n" 11602"gives back the original content. However, others may provide an\n" 11603"asymmetric conversion. For example, a read converter might strip\n" 11604"trailing whitespace off lines in source code while the matching\n" 11605"write converter might pass content through unchanged." 11606msgstr "" 11607 11608#: en/help_topics/content-filters.txt:38 11609msgid "" 11610"\n" 11611"Enabling content filters\n" 11612"------------------------" 11613msgstr "" 11614 11615#: en/help_topics/content-filters.txt:42 11616msgid "" 11617"Content filters are typically provided by plugins, so the first step\n" 11618"in using them is to install the relevant plugins and read their\n" 11619"documentation. Some plugins may be very specific about which files\n" 11620"they filter, e.g. only files ending in ``.java`` or ``.php``.\n" 11621"In other cases, the plugin may leave it in the user's hands to\n" 11622"define which files are to be filtered. This is typically done\n" 11623"using rule-based preferences. See ``brz help rules`` for general\n" 11624"information about defining these." 11625msgstr "" 11626 11627#: en/help_topics/content-filters.txt:51 11628msgid "" 11629"\n" 11630"Impact on commands\n" 11631"------------------" 11632msgstr "" 11633 11634#: en/help_topics/content-filters.txt:55 11635msgid "" 11636"Read converters are only applied to commands that read content from\n" 11637"a working tree, e.g. status, diff and commit. For example, ``brz diff``\n" 11638"will apply read converters to files in the working tree, then compare\n" 11639"the results to the content last committed." 11640msgstr "" 11641 11642#: en/help_topics/content-filters.txt:60 11643msgid "" 11644"Write converters are only applied by commands that **create files in a\n" 11645"working tree**, e.g. branch, checkout, update. If you wish to see the\n" 11646"canonical format of a file or tree, use ``brz cat`` or ``brz export``\n" 11647"respectively." 11648msgstr "" 11649 11650#: en/help_topics/content-filters.txt:65 11651msgid "" 11652"Note: ``brz commit`` does not implicitly apply write converters after\n" 11653"comitting files. If this makes sense for a given plugin providing\n" 11654"a content filter, the plugin can usually achieve this effect by using a\n" 11655"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n" 11656"for more information on hooks." 11657msgstr "" 11658 11659#: en/help_topics/content-filters.txt:71 11660msgid "" 11661"\n" 11662"Refreshing your working tree\n" 11663"----------------------------" 11664msgstr "" 11665 11666#: en/help_topics/content-filters.txt:75 11667msgid "" 11668"For performance reasons, Bazaar caches the timestamps of files in\n" 11669"a working tree, and assumes files are unchanged if their timestamps\n" 11670"match the cached values. As a consequence, there are times when\n" 11671"you may need to explicitly ask for content filtering to be reapplied\n" 11672"in one or both directions, e.g. after installing or reconfiguring\n" 11673"plugins providing it." 11674msgstr "" 11675 11676#: en/help_topics/content-filters.txt:82 11677msgid "Here are some general guidelines for doing this:" 11678msgstr "" 11679 11680#: en/help_topics/content-filters.txt:84 11681msgid "" 11682" * To reapply read converters, ``touch`` files, i.e. update their\n" 11683" timestamp. Operations like ``brz status`` should then reapply the\n" 11684" relevant read converters and compare the end result with the\n" 11685" canonical format." 11686msgstr "" 11687 11688#: en/help_topics/content-filters.txt:89 11689msgid "" 11690" * To reapply write converters, ensure there are no local changes,\n" 11691" delete the relevant files and run ``brz revert`` on those files." 11692msgstr "" 11693 11694#: en/help_topics/content-filters.txt:92 11695msgid "" 11696"Note: In the future, it is likely that additional options will be added\n" 11697"to commands to make this refreshing process faster and safer.\n" 11698msgstr "" 11699 11700#: en/help_topics/current-formats.txt:1 11701msgid "Current Storage Formats" 11702msgstr "" 11703 11704#: en/help_topics/current-formats.txt:3 11705msgid "" 11706":2a:\n" 11707" (native) (default) Format for the bzr 2.0 series. Uses group-\n" 11708" compress storage. Provides rich roots which are a one-way\n" 11709" transition." 11710msgstr "" 11711 11712#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17 11713msgid "" 11714"\n" 11715"See :doc:`formats-help` for more about storage formats." 11716msgstr "" 11717 11718#: en/help_topics/debug-flags.txt:1 11719msgid "" 11720"Debug Flags\n" 11721"===========" 11722msgstr "" 11723 11724#: en/help_topics/debug-flags.txt:4 11725msgid "" 11726"These flags can be passed on the brz command line or (without the ``-D``\n" 11727"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``." 11728msgstr "" 11729 11730#: en/help_topics/debug-flags.txt:7 11731msgid "" 11732"-Dauth Trace authentication sections used.\n" 11733"-Dbytes Print out how many bytes were transferred\n" 11734"-Ddirstate Trace dirstate activity (verbose!)\n" 11735"-Derror Instead of normal error handling, always print a " 11736"traceback\n" 11737" on error.\n" 11738"-Devil Capture call sites that do expensive or badly-scaling\n" 11739" operations.\n" 11740"-Dfetch Trace history copying between repositories.\n" 11741"-Dfilters Emit information for debugging content filtering.\n" 11742"-Dforceinvdeltas Force use of inventory deltas during generic streaming " 11743"fetch.\n" 11744"-Dgraph Trace graph traversal.\n" 11745"-Dhashcache Log every time a working file is read to determine its " 11746"hash.\n" 11747"-Dhooks Trace hook execution.\n" 11748"-Dhpss Trace smart protocol requests and responses.\n" 11749"-Dhpssdetail More hpss details.\n" 11750"-Dhpssvfs Traceback on vfs access to Remote objects.\n" 11751"-Dhttp Trace http connections, requests and responses.\n" 11752"-Dindex Trace major index operations.\n" 11753"-Dknit Trace knit operations.\n" 11754"-Dlock Trace when lockdir locks are taken or released.\n" 11755"-Dnoretry If a connection is reset, fail immediately rather than\n" 11756" retrying the request.\n" 11757"-Dprogress Trace progress bar operations.\n" 11758"-Dmem_dump Dump memory to a file upon an out of memory error.\n" 11759"-Dmerge Emit information for debugging merges.\n" 11760"-Dno_apport Don't use apport to report crashes.\n" 11761"-Dno_activity \t Don't show transport activity indicator in progress bar.\n" 11762"-Dpack Emit information about pack operations.\n" 11763"-Drelock Emit a message every time a branch or repository object " 11764"is\n" 11765" unlocked then relocked the same way.\n" 11766"-Dsftp Trace SFTP internals.\n" 11767"-Dstatic_tuple Error when a tuple is used where a StaticTuple is " 11768"expected\n" 11769"-Dstream Trace fetch streams.\n" 11770"-Dstrict_locks Trace when OS locks are potentially used in a non-" 11771"portable\n" 11772" manner.\n" 11773"-Dunlock Some errors during unlock are treated as warnings.\n" 11774"-DIDS_never Never use InterDifferingSerializer when fetching.\n" 11775"-DIDS_always Always use InterDifferingSerializer to fetch if " 11776"appropriate\n" 11777" for the format, even for non-local fetches.\n" 11778msgstr "" 11779 11780#: en/help_topics/diverged-branches.txt:1 11781msgid "" 11782"Diverged Branches\n" 11783"=================" 11784msgstr "" 11785 11786#: en/help_topics/diverged-branches.txt:4 11787msgid "" 11788"When Bazaar tries to push one branch onto another, it requires that the\n" 11789"destination branch must be ready to receive the source branch. If this " 11790"isn't\n" 11791"the case, then we say that the branches have ``diverged``. Branches are\n" 11792"considered diverged if the destination branch's most recent commit is one " 11793"that\n" 11794"has not been merged (directly or indirectly) by the source branch. To " 11795"recover\n" 11796"from diverged branches, one must merge the missing revisions into the " 11797"source\n" 11798"branch." 11799msgstr "" 11800 11801#: en/help_topics/diverged-branches.txt:12 11802msgid "" 11803"This situation commonly arises when using a centralized workflow with local\n" 11804"commits. If someone else has committed new work to the mainline since your\n" 11805"last pull and you have local commits that have not yet been pushed to the\n" 11806"mainline, then your local branch and the mainline have diverged." 11807msgstr "" 11808 11809#: en/help_topics/diverged-branches.txt:17 11810msgid "" 11811"Discovering What Has Diverged\n" 11812"-----------------------------" 11813msgstr "" 11814 11815#: en/help_topics/diverged-branches.txt:20 11816msgid "" 11817"The ``brz missing`` command is used to find out what revisions are in " 11818"another\n" 11819"branch that are not present in the current branch, and vice-versa. It shows " 11820"a\n" 11821"summary of which extra revisions exist in each branch. If you want to see " 11822"the\n" 11823"precise effects of those revisions, you can use ``brz diff --" 11824"old=other_branch``\n" 11825"to show the differences between other_branch and your current branch." 11826msgstr "" 11827 11828#: en/help_topics/diverged-branches.txt:26 11829msgid "" 11830"A Solution\n" 11831"----------" 11832msgstr "" 11833 11834#: en/help_topics/diverged-branches.txt:29 11835msgid "" 11836"The solution is to merge the revisions from the mainline into your local\n" 11837"branch. To do so, use ``brz merge`` to get the new revisions from the\n" 11838"mainline. This merge may result in conflicts if the other developer's " 11839"changes\n" 11840"overlap with your changes. These conflicts should be resolved before\n" 11841"continuing. After any conflicts have been resolved, or even if there were " 11842"no\n" 11843"conflicts, Bazaar requires that you explicitly commit these new revisions\n" 11844"to your local branch. This requirement gives you an opportunity to test " 11845"the\n" 11846"resulting working tree for correctness, since the merged revisions could " 11847"have\n" 11848"made arbitrary changes. After testing, you should commit the merge using\n" 11849"``brz commit``. This clears up the diverged branches situation. Your " 11850"local\n" 11851"branch can now be pushed to the mainline.\n" 11852msgstr "" 11853 11854#: en/help_topics/env-variables.txt:1 11855msgid "Environment Variables" 11856msgstr "" 11857 11858#: en/help_topics/env-variables.txt:3 11859msgid "See bzr help configuration for more details." 11860msgstr "" 11861 11862#: en/help_topics/env-variables.txt:5 11863msgid "" 11864"=================== " 11865"===========================================================\n" 11866"BZRPATH Path where bzr is to look for shell plugin external\n" 11867" commands.\n" 11868"BRZ_EMAIL E-Mail address of the user. Overrides EMAIL.\n" 11869"EMAIL E-Mail address of the user.\n" 11870"BRZ_EDITOR Editor for editing commit messages. Overrides EDITOR.\n" 11871"EDITOR Editor for editing commit messages.\n" 11872"BRZ_PLUGIN_PATH Paths where bzr should look for plugins.\n" 11873"BRZ_DISABLE_PLUGINS Plugins that bzr should not load.\n" 11874"BRZ_PLUGINS_AT Plugins to load from a directory not in " 11875"BRZ_PLUGIN_PATH.\n" 11876"BRZ_HOME Directory holding .bazaar config dir. Overrides HOME.\n" 11877"BRZ_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA " 11878"and\n" 11879" HOME.\n" 11880"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// " 11881"URLs).\n" 11882"BRZ_SSH Path to SSH client, or one of paramiko, openssh, " 11883"sshcorp,\n" 11884" plink or lsh.\n" 11885"BRZ_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n" 11886"BRZ_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n" 11887"BRZ_COLUMNS Override implicit terminal width.\n" 11888"BRZ_CONCURRENCY Number of processes that can be run concurrently " 11889"(selftest)\n" 11890"BRZ_PROGRESS_BAR Override the progress display. Values are 'none' or " 11891"'text'.\n" 11892"BRZ_PDB Control whether to launch a debugger on error.\n" 11893"BRZ_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n" 11894" breakin debugger.\n" 11895"BRZ_TEXTUI_INPUT Force console input mode for prompts to line-based " 11896"(instead\n" 11897" of char-based).\n" 11898"=================== " 11899"===========================================================\n" 11900msgstr "" 11901 11902#: en/help_topics/eol.txt:1 11903msgid "" 11904"End of Line Conversion\n" 11905"======================" 11906msgstr "" 11907 11908#: en/help_topics/eol.txt:4 11909msgid "" 11910"EOL conversion is provided as a content filter where Bazaar internally\n" 11911"stores a canonical format but outputs a convenience format. See\n" 11912"``brz help content-filters`` for general information about using these." 11913msgstr "" 11914 11915#: en/help_topics/eol.txt:8 11916msgid "" 11917"Note: Content filtering is only supported in recently added formats,\n" 11918"e.g. 1.14. Be sure that both the repository *and* the branch are\n" 11919"in a recent format. (Just setting the format on the repository\n" 11920"is not enough.) If content filtering does not appear to be working, use\n" 11921"'brz info -v' to confirm that the branch is using \"Working tree format 5\"\n" 11922"or later." 11923msgstr "" 11924 11925#: en/help_topics/eol.txt:15 11926msgid "" 11927"EOL conversion needs to be enabled for selected file patterns using\n" 11928"rules. See ``brz help rules`` for general information on defining rules.\n" 11929"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n" 11930"%brz_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n" 11931"supported in a future verison of Bazaar." 11932msgstr "" 11933 11934#: en/help_topics/eol.txt:21 11935msgid "" 11936"To configure which files to filter, set ``eol`` to one of the values below.\n" 11937"(If a value is not set, ``exact`` is the default.)" 11938msgstr "" 11939 11940#: en/help_topics/eol.txt:24 11941msgid "" 11942" ========== ===================================== ======================\n" 11943" Value Checkout end-of-lines as Commit end-of-lines as\n" 11944" ========== ===================================== ======================\n" 11945" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n" 11946" ---------- ------------------------------------- ----------------------\n" 11947" ``lf`` ``lf`` ``lf``\n" 11948" ---------- ------------------------------------- ----------------------\n" 11949" ``crlf`` ``crlf`` ``lf``\n" 11950" ---------- ------------------------------------- ----------------------\n" 11951" ``exact`` No conversion Exactly as in file\n" 11952" ========== ===================================== ======================" 11953msgstr "" 11954 11955#: en/help_topics/eol.txt:36 11956msgid "" 11957"Note: For safety reasons, no conversion is applied to any file where a null\n" 11958"byte is detected in the file." 11959msgstr "" 11960 11961#: en/help_topics/eol.txt:39 11962msgid "" 11963"For users working on a cross-platform project, here is a suggested rule\n" 11964"to use as a starting point::" 11965msgstr "" 11966 11967#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52 11968#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82 11969msgid "" 11970" [name *]\n" 11971" eol = native" 11972msgstr "" 11973 11974#: en/help_topics/eol.txt:45 11975msgid "" 11976"If you have binary files that do not contain a null byte though, be\n" 11977"sure to add ``eol = exact`` rules for those as well. You can do this\n" 11978"by giving more explicit patterns earlier in the rules file. For example::" 11979msgstr "" 11980 11981#: en/help_topics/eol.txt:49 11982msgid "" 11983" [name *.png]\n" 11984" eol = exact" 11985msgstr "" 11986 11987#: en/help_topics/eol.txt:55 11988msgid "" 11989"If your working tree is on a network drive shared by users on different\n" 11990"operating systems, you typically want to force certain conventions for\n" 11991"certain files. In that way, if a file is created with the wrong line\n" 11992"endings or line endings get mixed during editing, it gets committed\n" 11993"correctly and gets checked out correctly. For example::" 11994msgstr "" 11995 11996#: en/help_topics/eol.txt:61 11997msgid "" 11998" [name *.bat]\n" 11999" eol = crlf" 12000msgstr "" 12001 12002#: en/help_topics/eol.txt:64 12003msgid "" 12004" [name *.sh]\n" 12005" eol = lf" 12006msgstr "" 12007 12008#: en/help_topics/eol.txt:70 12009msgid "" 12010"If you take the care to create files with their required endings, you can\n" 12011"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n" 12012"safer to use ``lf`` and ``crlf`` though because edits accidentally\n" 12013"introducing mixed line endings will be corrected during commit for files\n" 12014"with those settings." 12015msgstr "" 12016 12017#: en/help_topics/eol.txt:76 12018msgid "" 12019"If you have sample test data that deliberately has text files with mixed\n" 12020"newline conventions, you can ask for those to be left alone like this::" 12021msgstr "" 12022 12023#: en/help_topics/eol.txt:79 12024msgid "" 12025" [name test_data/]\n" 12026" eol = exact" 12027msgstr "" 12028 12029#: en/help_topics/eol.txt:85 12030msgid "" 12031"Note that ``exact`` does not imply the file is binary but it does mean\n" 12032"that no conversion of end-of-lines will be done. (Bazaar currently relies\n" 12033"of content analysis to detect binary files for commands like ``diff``.\n" 12034"In the future, a ``binary = true`` rule may be added but it is not\n" 12035"supported yet.)" 12036msgstr "" 12037 12038#: en/help_topics/eol.txt:91 12039msgid "" 12040"If you have an existing repository with text files already stored using\n" 12041"Windows newline conventions (``crlf``), then you may want to keep using " 12042"that\n" 12043"convention in the repository. Forcing certain files to this convention\n" 12044"may also help users who do not have rules configured. To do this, set\n" 12045"``eol`` to one of the values below." 12046msgstr "" 12047 12048#: en/help_topics/eol.txt:97 12049msgid "" 12050" ============================ ======================== " 12051"======================\n" 12052" Value Checkout end-of-lines as Commit end-of-lines " 12053"as\n" 12054" ============================ ======================== " 12055"======================\n" 12056" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n" 12057" ``lf`` otherwise\n" 12058" ---------------------------- ------------------------ " 12059"----------------------\n" 12060" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n" 12061" ---------------------------- ------------------------ " 12062"----------------------\n" 12063" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n" 12064" ============================ ======================== ======================" 12065msgstr "" 12066 12067#: en/help_topics/eol.txt:108 12068msgid "" 12069"For users working on an existing project that uses Windows newline\n" 12070"conventions in their Bazaar repository, this rule is suggested as a\n" 12071"starting point::" 12072msgstr "" 12073 12074#: en/help_topics/eol.txt:112 12075msgid "" 12076" [name *]\n" 12077" eol = native-with-crlf-in-repo" 12078msgstr "" 12079 12080#: en/help_topics/eol.txt:115 12081msgid "" 12082"For new projects, it is recommended that end-of-lines be stored as ``lf``\n" 12083"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n" 12084"``crlf`` and ``exact``." 12085msgstr "" 12086 12087#: en/help_topics/eol.txt:119 12088msgid "" 12089"Note: Bazaar's EOL conversion will convert the content of files but\n" 12090"never reject files because a given line ending or mixed line endings\n" 12091"are found. A precommit hook should be used if you wish to validate\n" 12092"(and not just convert) content before committing.\n" 12093msgstr "" 12094 12095#: en/help_topics/hidden-commands.txt:1 12096msgid "" 12097"added List files added in working tree.\n" 12098"ancestry List all revisions merged into this branch.\n" 12099"assert-fail Test reporting of assertion failures\n" 12100"bundle-info Output interesting stats about a bundle\n" 12101"bundle-revisions Create a merge-directive for submitting changes.\n" 12102"cat-revision Write out metadata for a revision.\n" 12103"dump-btree Dump the contents of a btree index file to stdout.\n" 12104"export-pot Export command helps and error messages in po format.\n" 12105"file-id Print file_id of a particular file or directory.\n" 12106"file-path Print path of file_ids to a file or directory.\n" 12107"find-merge-base Find and print a base revision for merging two " 12108"branches.\n" 12109"hooks Show hooks.\n" 12110"inventory Show inventory of the current working copy or a " 12111"revision.\n" 12112"local-time-offset Show the offset in seconds from GMT to local time.\n" 12113"lookup-revision Lookup the revision-id from a revision-number\n" 12114"merge-directive Generate a merge directive for auto-merge tools.\n" 12115"modified List files modified in working tree.\n" 12116"re-sign Create a digital signature for an existing revision.\n" 12117"reference list, view and set branch locations for nested trees.\n" 12118"relpath Show path of a file relative to root\n" 12119"repair-workingtree Reset the working tree state file.\n" 12120"revision-history Display the list of revision ids on a branch.\n" 12121"revision-info Show revision number and revision id for a given " 12122"revision\n" 12123" identifier.\n" 12124"rocks Statement of optimism.\n" 12125"selftest Run internal test suite.\n" 12126"shell-complete Show appropriate completions for context.\n" 12127"test-script Run a shell-like test from a file.\n" 12128"touching-revisions Return revision-ids which affected a particular file.\n" 12129"unknowns List unknown files.\n" 12130"wait-until-signalled Test helper for\n" 12131" test_start_and_stop_brz_subprocess_send_signal.\n" 12132msgstr "" 12133 12134#: en/help_topics/hooks.txt:1 12135msgid "" 12136"\n" 12137"Hooks\n" 12138"=====" 12139msgstr "" 12140 12141#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4 12142msgid "" 12143"Introduction\n" 12144"------------" 12145msgstr "" 12146 12147#: en/help_topics/hooks.txt:8 12148msgid "A hook of type *xxx* of class *yyy* needs to be registered using::" 12149msgstr "" 12150 12151#: en/help_topics/hooks.txt:10 12152msgid " yyy.hooks.install_named_hook(\"xxx\", ...)" 12153msgstr "" 12154 12155#: en/help_topics/hooks.txt:12 12156msgid "" 12157"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples." 12158msgstr "" 12159 12160#: en/help_topics/hooks.txt:14 12161msgid "" 12162"The class that contains each hook is given before the hooks it supplies. " 12163"For\n" 12164"instance, BranchHooks as the class is the hooks class for\n" 12165"`breezy.branch.Branch.hooks`." 12166msgstr "" 12167 12168#: en/help_topics/hooks.txt:18 12169msgid "" 12170"Each description also indicates whether the hook runs on the client (the\n" 12171"machine where bzr was invoked) or the server (the machine addressed by\n" 12172"the branch URL). These may be, but are not necessarily, the same machine." 12173msgstr "" 12174 12175#: en/help_topics/hooks.txt:22 12176msgid "" 12177"Plugins (including hooks) are run on the server if all of these is true:" 12178msgstr "" 12179 12180#: en/help_topics/hooks.txt:24 12181msgid "" 12182" * The connection is via a smart server (accessed with a URL starting with\n" 12183" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a " 12184"\"http://\"\n" 12185" URL when a smart server is available via HTTP)." 12186msgstr "" 12187 12188#: en/help_topics/hooks.txt:28 12189msgid "" 12190" * The hook is either server specific or part of general infrastructure " 12191"rather\n" 12192" than client specific code (such as commit)." 12193msgstr "" 12194 12195#: en/help_topics/hooks.txt:31 12196msgid "" 12197"\n" 12198"BranchHooks\n" 12199"-----------" 12200msgstr "" 12201 12202#: en/help_topics/hooks.txt:35 12203msgid "" 12204"automatic_tag_name\n" 12205"~~~~~~~~~~~~~~~~~~" 12206msgstr "" 12207 12208#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56 12209#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262 12210msgid "Introduced in: 2.2" 12211msgstr "" 12212 12213#: en/help_topics/hooks.txt:40 12214msgid "" 12215"Called to determine an automatic tag name for a revision.\n" 12216"automatic_tag_name is called with (branch, revision_id) and should\n" 12217"return a tag name or None if no tag name could be determined. The\n" 12218"first non-None tag name returned will be used." 12219msgstr "" 12220 12221#: en/help_topics/hooks.txt:45 12222msgid "" 12223"open\n" 12224"~~~~" 12225msgstr "" 12226 12227#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293 12228#: en/help_topics/hooks.txt:307 12229msgid "Introduced in: 1.8" 12230msgstr "" 12231 12232#: en/help_topics/hooks.txt:50 12233msgid "" 12234"Called with the Branch object that has been opened after a branch is\n" 12235"opened." 12236msgstr "" 12237 12238#: en/help_topics/hooks.txt:53 12239msgid "" 12240"post_branch_init\n" 12241"~~~~~~~~~~~~~~~~" 12242msgstr "" 12243 12244#: en/help_topics/hooks.txt:58 12245msgid "" 12246"Called after new branch initialization completes. post_branch_init is\n" 12247"called with a breezy.branch.BranchInitHookParams. Note that init,\n" 12248"branch and checkout (both heavyweight and lightweight) will all\n" 12249"trigger this hook." 12250msgstr "" 12251 12252#: en/help_topics/hooks.txt:63 12253msgid "" 12254"post_change_branch_tip\n" 12255"~~~~~~~~~~~~~~~~~~~~~~" 12256msgstr "" 12257 12258#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421 12259msgid "Introduced in: 1.4" 12260msgstr "" 12261 12262#: en/help_topics/hooks.txt:68 12263msgid "" 12264"Called in bzr client and server after a change to the tip of a branch\n" 12265"is made. post_change_branch_tip is called with a\n" 12266"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n" 12267"uncommit will all trigger this hook." 12268msgstr "" 12269 12270#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392 12271msgid "" 12272"post_commit\n" 12273"~~~~~~~~~~~" 12274msgstr "" 12275 12276#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86 12277#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110 12278msgid "Introduced in: 0.15" 12279msgstr "" 12280 12281#: en/help_topics/hooks.txt:78 12282msgid "" 12283"Called in the bzr client after a commit has completed. post_commit is\n" 12284"called with (local, master, old_revno, old_revid, new_revno,\n" 12285"new_revid). old_revid is NULL_REVISION for the first commit to a\n" 12286"branch." 12287msgstr "" 12288 12289#: en/help_topics/hooks.txt:83 12290msgid "" 12291"post_pull\n" 12292"~~~~~~~~~" 12293msgstr "" 12294 12295#: en/help_topics/hooks.txt:88 12296msgid "" 12297"Called after a pull operation completes. post_pull is called with a\n" 12298"breezy.branch.PullResult object and only runs in the bzr client." 12299msgstr "" 12300 12301#: en/help_topics/hooks.txt:91 12302msgid "" 12303"post_push\n" 12304"~~~~~~~~~" 12305msgstr "" 12306 12307#: en/help_topics/hooks.txt:96 12308msgid "" 12309"Called after a push operation completes. post_push is called with a\n" 12310"breezy.branch.BranchPushResult object and only runs in the bzr client." 12311msgstr "" 12312 12313#: en/help_topics/hooks.txt:99 12314msgid "" 12315"post_switch\n" 12316"~~~~~~~~~~~" 12317msgstr "" 12318 12319#: en/help_topics/hooks.txt:104 12320msgid "" 12321"Called after a checkout switches branch. post_switch is called with a\n" 12322"breezy.branch.SwitchHookParams." 12323msgstr "" 12324 12325#: en/help_topics/hooks.txt:107 12326msgid "" 12327"post_uncommit\n" 12328"~~~~~~~~~~~~~" 12329msgstr "" 12330 12331#: en/help_topics/hooks.txt:112 12332msgid "" 12333"Called in the bzr client after an uncommit completes. post_uncommit is\n" 12334"called with (local, master, old_revno, old_revid, new_revno,\n" 12335"new_revid) where local is the local branch or None, master is the\n" 12336"target branch, and an empty branch receives new_revno of 0, new_revid\n" 12337"of None." 12338msgstr "" 12339 12340#: en/help_topics/hooks.txt:118 12341msgid "" 12342"pre_change_branch_tip\n" 12343"~~~~~~~~~~~~~~~~~~~~~" 12344msgstr "" 12345 12346#: en/help_topics/hooks.txt:121 12347msgid "Introduced in: 1.6" 12348msgstr "" 12349 12350#: en/help_topics/hooks.txt:123 12351msgid "" 12352"Called in bzr client and server before a change to the tip of a branch\n" 12353"is made. pre_change_branch_tip is called with a\n" 12354"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n" 12355"uncommit will all trigger this hook." 12356msgstr "" 12357 12358#: en/help_topics/hooks.txt:128 12359msgid "" 12360"pre_commit\n" 12361"~~~~~~~~~~" 12362msgstr "" 12363 12364#: en/help_topics/hooks.txt:131 12365msgid "Introduced in: 0.91" 12366msgstr "" 12367 12368#: en/help_topics/hooks.txt:133 12369msgid "" 12370"Called after a commit is calculated but before it is completed.\n" 12371"pre_commit is called with (local, master, old_revno, old_revid,\n" 12372"future_revno, future_revid, tree_delta, future_tree). old_revid is\n" 12373"NULL_REVISION for the first commit to a branch, tree_delta is a\n" 12374"TreeDelta object describing changes from the basis revision. hooks\n" 12375"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n" 12376"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n" 12377"tree." 12378msgstr "" 12379 12380#: en/help_topics/hooks.txt:142 12381msgid "" 12382"transform_fallback_location\n" 12383"~~~~~~~~~~~~~~~~~~~~~~~~~~~" 12384msgstr "" 12385 12386#: en/help_topics/hooks.txt:145 12387msgid "Introduced in: 1.9" 12388msgstr "" 12389 12390#: en/help_topics/hooks.txt:147 12391msgid "" 12392"Called when a stacked branch is activating its fallback locations.\n" 12393"transform_fallback_location is called with (branch, url), and should\n" 12394"return a new url. Returning the same url allows it to be used as-is,\n" 12395"returning a different one can be used to cause the branch to stack on\n" 12396"a closer copy of that fallback_location. Note that the branch cannot\n" 12397"have history accessing methods called on it during this hook because\n" 12398"the fallback locations have not been activated. When there are\n" 12399"multiple hooks installed for transform_fallback_location, all are\n" 12400"called with the url returned from the previous hook.The order is\n" 12401"however undefined." 12402msgstr "" 12403 12404#: en/help_topics/hooks.txt:158 12405msgid "" 12406"CommandHooks\n" 12407"------------" 12408msgstr "" 12409 12410#: en/help_topics/hooks.txt:161 12411msgid "" 12412"extend_command\n" 12413"~~~~~~~~~~~~~~" 12414msgstr "" 12415 12416#: en/help_topics/hooks.txt:164 12417msgid "Introduced in: 1.13" 12418msgstr "" 12419 12420#: en/help_topics/hooks.txt:166 12421msgid "" 12422"Called after creating a command object to allow modifications such as\n" 12423"adding or removing options, docs etc. Called with the new\n" 12424"breezy.commands.Command object." 12425msgstr "" 12426 12427#: en/help_topics/hooks.txt:170 12428msgid "" 12429"get_command\n" 12430"~~~~~~~~~~~" 12431msgstr "" 12432 12433#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185 12434#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467 12435msgid "Introduced in: 1.17" 12436msgstr "" 12437 12438#: en/help_topics/hooks.txt:175 12439msgid "" 12440"Called when creating a single command. Called with (cmd_or_None,\n" 12441"command_name). get_command should either return the cmd_or_None\n" 12442"parameter, or a replacement Command object that should be used for the\n" 12443"command. Note that the Command.hooks hooks are core infrastructure.\n" 12444"Many users will prefer to use breezy.commands.register_command or\n" 12445"plugin_cmds.register_lazy." 12446msgstr "" 12447 12448#: en/help_topics/hooks.txt:182 12449msgid "" 12450"get_missing_command\n" 12451"~~~~~~~~~~~~~~~~~~~" 12452msgstr "" 12453 12454#: en/help_topics/hooks.txt:187 12455msgid "" 12456"Called when creating a single command if no command could be found.\n" 12457"Called with (command_name). get_missing_command should either return\n" 12458"None, or a Command object to be used for the command." 12459msgstr "" 12460 12461#: en/help_topics/hooks.txt:191 12462msgid "" 12463"list_commands\n" 12464"~~~~~~~~~~~~~" 12465msgstr "" 12466 12467#: en/help_topics/hooks.txt:196 12468msgid "" 12469"Called when enumerating commands. Called with a set of cmd_name\n" 12470"strings for all the commands found so far. This set is safe to mutate\n" 12471"- e.g. to remove a command. list_commands should return the updated\n" 12472"set of command names." 12473msgstr "" 12474 12475#: en/help_topics/hooks.txt:201 12476msgid "" 12477"post_command\n" 12478"~~~~~~~~~~~~" 12479msgstr "" 12480 12481#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211 12482msgid "Introduced in: 2.6" 12483msgstr "" 12484 12485#: en/help_topics/hooks.txt:206 12486msgid "Called after executing a command. Called with the command object." 12487msgstr "" 12488 12489#: en/help_topics/hooks.txt:208 12490msgid "" 12491"pre_command\n" 12492"~~~~~~~~~~~" 12493msgstr "" 12494 12495#: en/help_topics/hooks.txt:213 12496msgid "Called prior to executing a command. Called with the command object." 12497msgstr "" 12498 12499#: en/help_topics/hooks.txt:215 12500msgid "" 12501"_ConfigHooks\n" 12502"------------" 12503msgstr "" 12504 12505#: en/help_topics/hooks.txt:218 12506msgid "" 12507"get\n" 12508"~~~" 12509msgstr "" 12510 12511#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229 12512#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244 12513#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373 12514#: en/help_topics/hooks.txt:446 12515msgid "Introduced in: 2.4" 12516msgstr "" 12517 12518#: en/help_topics/hooks.txt:223 12519msgid "" 12520"Invoked when a config option is read. The signature is (stack, name,\n" 12521"value)." 12522msgstr "" 12523 12524#: en/help_topics/hooks.txt:226 12525msgid "" 12526"load\n" 12527"~~~~" 12528msgstr "" 12529 12530#: en/help_topics/hooks.txt:231 12531msgid "Invoked when a config store is loaded. The signature is (store)." 12532msgstr "" 12533 12534#: en/help_topics/hooks.txt:233 12535msgid "" 12536"remove\n" 12537"~~~~~~" 12538msgstr "" 12539 12540#: en/help_topics/hooks.txt:238 12541msgid "" 12542"Invoked when a config option is removed. The signature is (stack,\n" 12543"name)." 12544msgstr "" 12545 12546#: en/help_topics/hooks.txt:241 12547msgid "" 12548"save\n" 12549"~~~~" 12550msgstr "" 12551 12552#: en/help_topics/hooks.txt:246 12553msgid "Invoked when a config store is saved. The signature is (store)." 12554msgstr "" 12555 12556#: en/help_topics/hooks.txt:248 12557msgid "" 12558"set\n" 12559"~~~" 12560msgstr "" 12561 12562#: en/help_topics/hooks.txt:253 12563msgid "" 12564"Invoked when a config option is set. The signature is (stack, name,\n" 12565"value)." 12566msgstr "" 12567 12568#: en/help_topics/hooks.txt:256 12569msgid "" 12570"ControlDirHooks\n" 12571"---------------" 12572msgstr "" 12573 12574#: en/help_topics/hooks.txt:259 12575msgid "" 12576"post_repo_init\n" 12577"~~~~~~~~~~~~~~" 12578msgstr "" 12579 12580#: en/help_topics/hooks.txt:264 12581msgid "" 12582"Invoked after a repository has been initialized. post_repo_init is\n" 12583"called with a breezy.controldir.RepoInitHookParams." 12584msgstr "" 12585 12586#: en/help_topics/hooks.txt:267 12587msgid "" 12588"pre_open\n" 12589"~~~~~~~~" 12590msgstr "" 12591 12592#: en/help_topics/hooks.txt:270 12593msgid "Introduced in: 1.14" 12594msgstr "" 12595 12596#: en/help_topics/hooks.txt:272 12597msgid "" 12598"Invoked before attempting to open a ControlDir with the transport that\n" 12599"the open will use." 12600msgstr "" 12601 12602#: en/help_topics/hooks.txt:275 12603msgid "" 12604"InfoHooks\n" 12605"---------" 12606msgstr "" 12607 12608#: en/help_topics/hooks.txt:278 12609msgid "" 12610"repository\n" 12611"~~~~~~~~~~" 12612msgstr "" 12613 12614#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300 12615#: en/help_topics/hooks.txt:524 12616msgid "Introduced in: 1.15" 12617msgstr "" 12618 12619#: en/help_topics/hooks.txt:283 12620msgid "" 12621"Invoked when displaying the statistics for a repository. repository is\n" 12622"called with a statistics dictionary as returned by the repository and\n" 12623"a file-like object to write to." 12624msgstr "" 12625 12626#: en/help_topics/hooks.txt:287 12627msgid "" 12628"LockHooks\n" 12629"---------" 12630msgstr "" 12631 12632#: en/help_topics/hooks.txt:290 12633msgid "" 12634"lock_acquired\n" 12635"~~~~~~~~~~~~~" 12636msgstr "" 12637 12638#: en/help_topics/hooks.txt:295 12639msgid "Called with a breezy.lock.LockResult when a physical lock is acquired." 12640msgstr "" 12641 12642#: en/help_topics/hooks.txt:297 12643msgid "" 12644"lock_broken\n" 12645"~~~~~~~~~~~" 12646msgstr "" 12647 12648#: en/help_topics/hooks.txt:302 12649msgid "Called with a breezy.lock.LockResult when a physical lock is broken." 12650msgstr "" 12651 12652#: en/help_topics/hooks.txt:304 12653msgid "" 12654"lock_released\n" 12655"~~~~~~~~~~~~~" 12656msgstr "" 12657 12658#: en/help_topics/hooks.txt:309 12659msgid "Called with a breezy.lock.LockResult when a physical lock is released." 12660msgstr "" 12661 12662#: en/help_topics/hooks.txt:311 12663msgid "" 12664"MergeHooks\n" 12665"----------" 12666msgstr "" 12667 12668#: en/help_topics/hooks.txt:314 12669msgid "" 12670"merge_file_content\n" 12671"~~~~~~~~~~~~~~~~~~" 12672msgstr "" 12673 12674#: en/help_topics/hooks.txt:317 12675msgid "Introduced in: 2.1" 12676msgstr "" 12677 12678#: en/help_topics/hooks.txt:319 12679msgid "" 12680"Called with a breezy.merge.Merger object to create a per file merge\n" 12681"object when starting a merge. Should return either None or a subclass\n" 12682"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n" 12683"called per file that needs to be merged (including when one side has\n" 12684"deleted the file and the other has changed it). See the\n" 12685"AbstractPerFileMerger API docs for details on how it is used by merge." 12686msgstr "" 12687 12688#: en/help_topics/hooks.txt:326 12689msgid "" 12690"post_merge\n" 12691"~~~~~~~~~~" 12692msgstr "" 12693 12694#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337 12695#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405 12696#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512 12697msgid "Introduced in: 2.5" 12698msgstr "" 12699 12700#: en/help_topics/hooks.txt:331 12701msgid "" 12702"Called after a merge. Receives a Merger object as the single argument.\n" 12703"The return value is ignored." 12704msgstr "" 12705 12706#: en/help_topics/hooks.txt:334 12707msgid "" 12708"pre_merge\n" 12709"~~~~~~~~~" 12710msgstr "" 12711 12712#: en/help_topics/hooks.txt:339 12713msgid "" 12714"Called before a merge. Receives a Merger object as the single\n" 12715"argument." 12716msgstr "" 12717 12718#: en/help_topics/hooks.txt:342 12719msgid "" 12720"MergeDirectiveHooks\n" 12721"-------------------" 12722msgstr "" 12723 12724#: en/help_topics/hooks.txt:345 12725msgid "" 12726"merge_request_body\n" 12727"~~~~~~~~~~~~~~~~~~" 12728msgstr "" 12729 12730#: en/help_topics/hooks.txt:348 12731msgid "Introduced in: 1.15.0" 12732msgstr "" 12733 12734#: en/help_topics/hooks.txt:350 12735msgid "" 12736"Called with a MergeRequestBodyParams when a body is needed for a merge\n" 12737"request. Callbacks must return a body. If more than one callback is\n" 12738"registered, the output of one callback is provided to the next." 12739msgstr "" 12740 12741#: en/help_topics/hooks.txt:354 12742msgid "" 12743"MessageEditorHooks\n" 12744"------------------" 12745msgstr "" 12746 12747#: en/help_topics/hooks.txt:357 12748msgid "" 12749"commit_message_template\n" 12750"~~~~~~~~~~~~~~~~~~~~~~~" 12751msgstr "" 12752 12753#: en/help_topics/hooks.txt:360 12754msgid "Introduced in: 1.10" 12755msgstr "" 12756 12757#: en/help_topics/hooks.txt:362 12758msgid "" 12759"Called when a commit message is being generated.\n" 12760"commit_message_template is called with the breezy.commit.Commit object\n" 12761"and the message that is known so far. commit_message_template must\n" 12762"return a new message to use (which could be the same as it was given).\n" 12763"When there are multiple hooks registered for commit_message_template,\n" 12764"they are chained with the result from the first passed into the\n" 12765"second, and so on." 12766msgstr "" 12767 12768#: en/help_topics/hooks.txt:370 12769msgid "" 12770"set_commit_message\n" 12771"~~~~~~~~~~~~~~~~~~" 12772msgstr "" 12773 12774#: en/help_topics/hooks.txt:375 12775msgid "" 12776"Set a fixed commit message. set_commit_message is called with the\n" 12777"breezy.commit.Commit object (so you can also change e.g. revision\n" 12778"properties by editing commit.builder._revprops) and the message so\n" 12779"far. set_commit_message must return the message to use or None if it\n" 12780"should use the message editor as normal." 12781msgstr "" 12782 12783#: en/help_topics/hooks.txt:381 12784msgid "" 12785"MutableTreeHooks\n" 12786"----------------" 12787msgstr "" 12788 12789#: en/help_topics/hooks.txt:384 12790msgid "" 12791"post_build_tree\n" 12792"~~~~~~~~~~~~~~~" 12793msgstr "" 12794 12795#: en/help_topics/hooks.txt:389 12796msgid "" 12797"Called after a completely new tree is built. The hook is called with\n" 12798"the tree as its only argument." 12799msgstr "" 12800 12801#: en/help_topics/hooks.txt:395 12802msgid "Introduced in: 2.0" 12803msgstr "" 12804 12805#: en/help_topics/hooks.txt:397 12806msgid "" 12807"Called after a commit is performed on a tree. The hook is called with\n" 12808"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n" 12809"commit was performed on is available via the mutable_tree attribute of\n" 12810"that object." 12811msgstr "" 12812 12813#: en/help_topics/hooks.txt:402 12814msgid "" 12815"post_transform\n" 12816"~~~~~~~~~~~~~~" 12817msgstr "" 12818 12819#: en/help_topics/hooks.txt:407 12820msgid "" 12821"Called after a tree transform has been performed on a tree. The hook\n" 12822"is called with the tree that is being transformed and the transform." 12823msgstr "" 12824 12825#: en/help_topics/hooks.txt:410 12826msgid "" 12827"pre_transform\n" 12828"~~~~~~~~~~~~~" 12829msgstr "" 12830 12831#: en/help_topics/hooks.txt:415 12832msgid "" 12833"Called before a tree transform on this tree. The hook is called with\n" 12834"the tree that is being transformed and the transform." 12835msgstr "" 12836 12837#: en/help_topics/hooks.txt:418 12838msgid "" 12839"start_commit\n" 12840"~~~~~~~~~~~~" 12841msgstr "" 12842 12843#: en/help_topics/hooks.txt:423 12844msgid "" 12845"Called before a commit is performed on a tree. The start commit hook\n" 12846"is able to change the tree before the commit takes place. start_commit\n" 12847"is called with the breezy.mutabletree.MutableTree that the commit is\n" 12848"being performed on." 12849msgstr "" 12850 12851#: en/help_topics/hooks.txt:428 12852msgid "" 12853"SmartClientHooks\n" 12854"----------------" 12855msgstr "" 12856 12857#: en/help_topics/hooks.txt:431 12858msgid "" 12859"call\n" 12860"~~~~" 12861msgstr "" 12862 12863#: en/help_topics/hooks.txt:434 12864msgid "Introduced in: unknown" 12865msgstr "" 12866 12867#: en/help_topics/hooks.txt:436 12868msgid "" 12869"Called when the smart client is submitting a request to the smart\n" 12870"server. Called with a breezy.smart.client.CallHookParams object.\n" 12871"Streaming request bodies, and responses, are not accessible." 12872msgstr "" 12873 12874#: en/help_topics/hooks.txt:440 12875msgid "" 12876"SmartServerHooks\n" 12877"----------------" 12878msgstr "" 12879 12880#: en/help_topics/hooks.txt:443 12881msgid "" 12882"server_exception\n" 12883"~~~~~~~~~~~~~~~~" 12884msgstr "" 12885 12886#: en/help_topics/hooks.txt:448 12887msgid "" 12888"Called by the bzr server when an exception occurs. server_exception is\n" 12889"called with the sys.exc_info() tuple return true for the hook if the\n" 12890"exception has been handled, in which case the server will exit\n" 12891"normally." 12892msgstr "" 12893 12894#: en/help_topics/hooks.txt:453 12895msgid "" 12896"server_started\n" 12897"~~~~~~~~~~~~~~" 12898msgstr "" 12899 12900#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475 12901msgid "Introduced in: 0.16" 12902msgstr "" 12903 12904#: en/help_topics/hooks.txt:458 12905msgid "" 12906"Called by the bzr server when it starts serving a directory.\n" 12907"server_started is called with (backing urls, public url), where\n" 12908"backing_url is a list of URLs giving the server-specific directory\n" 12909"locations, and public_url is the public URL for the directory being\n" 12910"served." 12911msgstr "" 12912 12913#: en/help_topics/hooks.txt:464 12914msgid "" 12915"server_started_ex\n" 12916"~~~~~~~~~~~~~~~~~" 12917msgstr "" 12918 12919#: en/help_topics/hooks.txt:469 12920msgid "" 12921"Called by the bzr server when it starts serving a directory.\n" 12922"server_started is called with (backing_urls, server_obj)." 12923msgstr "" 12924 12925#: en/help_topics/hooks.txt:472 12926msgid "" 12927"server_stopped\n" 12928"~~~~~~~~~~~~~~" 12929msgstr "" 12930 12931#: en/help_topics/hooks.txt:477 12932msgid "" 12933"Called by the bzr server when it stops serving a directory.\n" 12934"server_stopped is called with the same parameters as the\n" 12935"server_started hook: (backing_urls, public_url)." 12936msgstr "" 12937 12938#: en/help_topics/hooks.txt:481 12939msgid "" 12940"StatusHooks\n" 12941"-----------" 12942msgstr "" 12943 12944#: en/help_topics/hooks.txt:484 12945msgid "" 12946"post_status\n" 12947"~~~~~~~~~~~" 12948msgstr "" 12949 12950#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498 12951msgid "Introduced in: 2.3" 12952msgstr "" 12953 12954#: en/help_topics/hooks.txt:489 12955msgid "" 12956"Called with argument StatusHookParams after Bazaar has displayed the\n" 12957"status. StatusHookParams has the attributes (old_tree, new_tree,\n" 12958"to_file, versioned, show_ids, short, verbose). The last four arguments\n" 12959"correspond to the command line options specified by the user for the\n" 12960"status command. to_file is the output stream for writing." 12961msgstr "" 12962 12963#: en/help_topics/hooks.txt:495 12964msgid "" 12965"pre_status\n" 12966"~~~~~~~~~~" 12967msgstr "" 12968 12969#: en/help_topics/hooks.txt:500 12970msgid "" 12971"Called with argument StatusHookParams before Bazaar displays the\n" 12972"status. StatusHookParams has the attributes (old_tree, new_tree,\n" 12973"to_file, versioned, show_ids, short, verbose). The last four arguments\n" 12974"correspond to the command line options specified by the user for the\n" 12975"status command. to_file is the output stream for writing." 12976msgstr "" 12977 12978#: en/help_topics/hooks.txt:506 12979msgid "" 12980"TransportHooks\n" 12981"--------------" 12982msgstr "" 12983 12984#: en/help_topics/hooks.txt:509 12985msgid "" 12986"post_connect\n" 12987"~~~~~~~~~~~~" 12988msgstr "" 12989 12990#: en/help_topics/hooks.txt:514 12991msgid "" 12992"Called after a new connection is established or a reconnect occurs.\n" 12993"The sole argument passed is either the connected transport or smart\n" 12994"medium instance." 12995msgstr "" 12996 12997#: en/help_topics/hooks.txt:518 12998msgid "" 12999"RioVersionInfoBuilderHooks\n" 13000"--------------------------" 13001msgstr "" 13002 13003#: en/help_topics/hooks.txt:521 13004msgid "" 13005"revision\n" 13006"~~~~~~~~" 13007msgstr "" 13008 13009#: en/help_topics/hooks.txt:526 13010msgid "" 13011"Invoked when adding information about a revision to the RIO stanza\n" 13012"that is printed. revision is called with a revision object and a RIO\n" 13013"stanza.\n" 13014msgstr "" 13015 13016#: en/help_topics/location-alias.txt:1 13017msgid "" 13018"Location aliases\n" 13019"================" 13020msgstr "" 13021 13022#: en/help_topics/location-alias.txt:4 13023msgid "" 13024"Bazaar defines several aliases for locations associated with a branch. " 13025"These\n" 13026"can be used with most commands that expect a location, such as `bzr push`." 13027msgstr "" 13028 13029#: en/help_topics/location-alias.txt:7 13030msgid "The aliases are::" 13031msgstr "" 13032 13033#: en/help_topics/location-alias.txt:9 13034msgid "" 13035" :bound The branch this branch is bound to, for bound branches.\n" 13036" :parent The parent of this branch.\n" 13037" :public The public location of this branch.\n" 13038" :push The saved location used for `bzr push` with no arguments.\n" 13039" :submit The submit branch for this branch.\n" 13040" :this This branch." 13041msgstr "" 13042 13043#: en/help_topics/location-alias.txt:16 13044msgid "For example, to push to the parent location::" 13045msgstr "" 13046 13047#: en/help_topics/location-alias.txt:18 13048msgid " bzr push :parent\n" 13049msgstr "" 13050 13051#: en/help_topics/log-formats.txt:1 13052msgid "" 13053"Log Formats\n" 13054"===========" 13055msgstr "" 13056 13057#: en/help_topics/log-formats.txt:4 13058msgid "" 13059"A log format controls how information about each revision is displayed.\n" 13060"The standard log formats are compared below::" 13061msgstr "" 13062 13063#: en/help_topics/log-formats.txt:7 13064msgid "" 13065" Feature long short line\n" 13066" ---------------------- ------------- ------------ -------------------\n" 13067" design goal detailed view concise view 1 revision per line\n" 13068" committer name+email name only name only\n" 13069" author name+email - -\n" 13070" date-time format full date only date only\n" 13071" commit message full full top line\n" 13072" tags yes yes yes\n" 13073" merges indicator - yes -\n" 13074" status/delta optional optional -\n" 13075" diff/patch optional optional -\n" 13076" revision-id optional optional -\n" 13077" branch nick yes - -\n" 13078" foreign vcs properties yes yes -\n" 13079" preferred levels all 1 1\n" 13080" digital signature optional - -" 13081msgstr "" 13082 13083#: en/help_topics/log-formats.txt:24 13084msgid "" 13085"The default format is ``long``. To change this, define the ``log_format``\n" 13086"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::" 13087msgstr "" 13088 13089#: en/help_topics/log-formats.txt:27 13090msgid "" 13091" [DEFAULT]\n" 13092" log_format = short" 13093msgstr "" 13094 13095#: en/help_topics/log-formats.txt:30 13096msgid "" 13097"Alternatively, to change the log format used for a given query, use the\n" 13098"--long, --short or --line options." 13099msgstr "" 13100 13101#: en/help_topics/log-formats.txt:33 13102msgid "" 13103"If one of the standard log formats does not meet your needs, additional\n" 13104"formats can be provided by plugins.\n" 13105msgstr "" 13106 13107#: en/help_topics/other-formats.txt:1 13108msgid "Other Storage Formats" 13109msgstr "" 13110 13111#: en/help_topics/other-formats.txt:3 13112msgid "Experimental formats are shown below." 13113msgstr "" 13114 13115#: en/help_topics/other-formats.txt:5 13116msgid "" 13117":development-colo:\n" 13118" (native) The 2a format with experimental support for colocated\n" 13119" branches." 13120msgstr "" 13121 13122#: en/help_topics/other-formats.txt:9 13123msgid "" 13124"\n" 13125"Deprecated formats are shown below." 13126msgstr "" 13127 13128#: en/help_topics/other-formats.txt:12 13129msgid "" 13130":pack-0.92:\n" 13131" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n" 13132" Interoperates with bzr repositories before 0.92 but cannot be read\n" 13133" by bzr < 0.92." 13134msgstr "" 13135 13136#: en/help_topics/patterns.txt:1 13137msgid "" 13138"Patterns\n" 13139"========" 13140msgstr "" 13141 13142#: en/help_topics/patterns.txt:4 13143msgid "" 13144"Bazaar uses patterns to match files at various times. For example,\n" 13145"the ``add`` command skips over files that match ignore patterns\n" 13146"and preferences can be associated with files using rule patterns.\n" 13147"The pattern syntax is described below." 13148msgstr "" 13149 13150#: en/help_topics/patterns.txt:9 13151msgid "" 13152"Trailing slashes on patterns are ignored. If the pattern contains a\n" 13153"slash or is a regular expression, it is compared to the whole path\n" 13154"from the branch root. Otherwise, it is compared to only the last\n" 13155"component of the path. To match a file only in the root directory,\n" 13156"prepend ``./``. Patterns specifying absolute paths are not allowed." 13157msgstr "" 13158 13159#: en/help_topics/patterns.txt:15 13160msgid "Patterns may include globbing wildcards such as::" 13161msgstr "" 13162 13163#: en/help_topics/patterns.txt:17 13164msgid "" 13165" ? - Matches any single character except '/'\n" 13166" * - Matches 0 or more characters except '/'\n" 13167" /**/ - Matches 0 or more directories in a path\n" 13168" [a-z] - Matches a single character from within a group of characters" 13169msgstr "" 13170 13171#: en/help_topics/patterns.txt:22 13172msgid "" 13173"Patterns may also be `Python regular expressions`_. Regular expression\n" 13174"patterns are identified by a ``RE:`` prefix followed by the regular\n" 13175"expression. Regular expression patterns may not include named or\n" 13176"numbered groups." 13177msgstr "" 13178 13179#: en/help_topics/patterns.txt:27 13180msgid "" 13181"Case insensitive ignore patterns can be specified with regular expressions\n" 13182"by using the ``i`` (for ignore case) flag in the pattern." 13183msgstr "" 13184 13185#: en/help_topics/patterns.txt:30 13186msgid "For example, a case insensitive match for ``foo`` may be specified as::" 13187msgstr "" 13188 13189#: en/help_topics/patterns.txt:32 13190msgid " RE:(?i)foo" 13191msgstr "" 13192 13193#: en/help_topics/patterns.txt:34 13194msgid "" 13195"Ignore patterns may be prefixed with ``!``, which means that a filename\n" 13196"matched by that pattern will not be ignored." 13197msgstr "" 13198 13199#: en/help_topics/patterns.txt:37 13200msgid ".. _Python regular expressions: http://docs.python.org/library/re.html" 13201msgstr "" 13202 13203#: en/help_topics/revisionspec.txt:1 13204msgid "Revision Identifiers" 13205msgstr "" 13206 13207#: en/help_topics/revisionspec.txt:3 13208msgid "" 13209"A revision identifier refers to a specific state of a branch's history. It\n" 13210"can be expressed in several ways. It can begin with a keyword to\n" 13211"unambiguously specify a given lookup type; some examples are 'last:1',\n" 13212"'before:yesterday' and 'submit:'." 13213msgstr "" 13214 13215#: en/help_topics/revisionspec.txt:8 13216msgid "" 13217"Alternately, it can be given without a keyword, in which case it will be\n" 13218"checked as a revision number, a tag, a revision id, a date specification, or " 13219"a\n" 13220"branch specification, in that order. For example, 'date:today' could be\n" 13221"written as simply 'today', though if you have a tag called 'today' that " 13222"will\n" 13223"be found first." 13224msgstr "" 13225 13226#: en/help_topics/revisionspec.txt:14 13227msgid "" 13228"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n" 13229"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n" 13230"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes " 13231"or\n" 13232"spaces around the '..')." 13233msgstr "" 13234 13235#: en/help_topics/revisionspec.txt:19 13236msgid "" 13237"Ranges are interpreted differently by different commands. To the \"log\" " 13238"command,\n" 13239"a range is a sequence of log messages, but to the \"diff\" command, the " 13240"range\n" 13241"denotes a change between revisions (and not a sequence of changes). In\n" 13242"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" " 13243"consider it\n" 13244"to be open-ended, that is, they include one end but not the other. For " 13245"example:\n" 13246"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and " 13247"3649,\n" 13248"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 " 13249"and\n" 13250"3649, but not 3647." 13251msgstr "" 13252 13253#: en/help_topics/revisionspec.txt:28 13254msgid "The keywords used as revision selection methods are the following:" 13255msgstr "" 13256 13257#: en/help_topics/revisionspec.txt:30 13258msgid "" 13259":revid:\n" 13260"\tSelects a revision using the revision id.\n" 13261":submit:\n" 13262"\tSelects a common ancestor with the submit branch.\n" 13263":ancestor:\n" 13264"\tSelects a common ancestor with a second branch.\n" 13265":date:\n" 13266"\tSelects a revision on the basis of a datestamp.\n" 13267":branch:\n" 13268"\tSelects the last revision of a specified branch.\n" 13269":tag:\n" 13270"\tSelects a revision identified by a tag name.\n" 13271":revno:\n" 13272"\tSelects a revision using a number.\n" 13273":before:\n" 13274"\tSelects the parent of the revision specified.\n" 13275":annotate:\n" 13276"\tSelect the revision that last modified the specified line.\n" 13277":mainline:\n" 13278"\tSelect mainline revision that merged the specified revision.\n" 13279":last:\n" 13280"\tSelects the nth revision from the end." 13281msgstr "" 13282 13283#: en/help_topics/revisionspec.txt:53 13284msgid "In addition, plugins can provide other keywords." 13285msgstr "" 13286 13287#: en/help_topics/revisionspec.txt:55 13288msgid "A detailed description of each keyword is given below." 13289msgstr "" 13290 13291#: en/help_topics/revisionspec.txt:57 13292msgid ":revid:" 13293msgstr "" 13294 13295#: en/help_topics/revisionspec.txt:59 13296msgid "" 13297" Supply a specific revision id, that can be used to specify any\n" 13298" revision id in the ancestry of the branch.\n" 13299" Including merges, and pending merges.\n" 13300" Examples::" 13301msgstr "" 13302 13303#: en/help_topics/revisionspec.txt:64 13304msgid "" 13305" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'" 13306msgstr "" 13307 13308#: en/help_topics/revisionspec.txt:66 13309msgid ":submit:" 13310msgstr "" 13311 13312#: en/help_topics/revisionspec.txt:68 13313msgid "" 13314" Diffing against this shows all the changes that were made in this " 13315"branch,\n" 13316" and is a good predictor of what merge will do. The submit branch is\n" 13317" used by the bundle and merge directive commands. If no submit branch\n" 13318" is specified, the parent branch is used instead." 13319msgstr "" 13320 13321#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85 13322msgid "" 13323" The common ancestor is the last revision that existed in both\n" 13324" branches. Usually this is the branch point, but it could also be\n" 13325" a revision that was merged." 13326msgstr "" 13327 13328#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93 13329#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119 13330#: en/help_topics/revisionspec.txt:153 13331msgid " Examples::" 13332msgstr "" 13333 13334#: en/help_topics/revisionspec.txt:79 13335msgid " $ bzr diff -r submit:" 13336msgstr "" 13337 13338#: en/help_topics/revisionspec.txt:81 13339msgid ":ancestor:" 13340msgstr "" 13341 13342#: en/help_topics/revisionspec.txt:83 13343msgid " Supply the path to a branch to select the common ancestor." 13344msgstr "" 13345 13346#: en/help_topics/revisionspec.txt:89 13347msgid "" 13348" This is frequently used with 'diff' to return all of the changes\n" 13349" that your branch introduces, while excluding the changes that you\n" 13350" have not merged from the remote branch." 13351msgstr "" 13352 13353#: en/help_topics/revisionspec.txt:95 13354msgid "" 13355" ancestor:/path/to/branch\n" 13356" $ bzr diff -r ancestor:../../mainline/branch" 13357msgstr "" 13358 13359#: en/help_topics/revisionspec.txt:98 13360msgid ":date:" 13361msgstr "" 13362 13363#: en/help_topics/revisionspec.txt:100 13364msgid "" 13365" Supply a datestamp to select the first revision that matches the date.\n" 13366" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n" 13367" Matches the first entry after a given date (either at midnight or\n" 13368" at a specified time)." 13369msgstr "" 13370 13371#: en/help_topics/revisionspec.txt:105 13372msgid " One way to display all the changes since yesterday would be::" 13373msgstr "" 13374 13375#: en/help_topics/revisionspec.txt:107 13376msgid " bzr log -r date:yesterday.." 13377msgstr "" 13378 13379#: en/help_topics/revisionspec.txt:111 13380msgid "" 13381" date:yesterday -> select the first revision since " 13382"yesterday\n" 13383" date:2006-08-14,17:10:14 -> select the first revision after\n" 13384" August 14th, 2006 at 5:10pm." 13385msgstr "" 13386 13387#: en/help_topics/revisionspec.txt:115 13388msgid ":branch:" 13389msgstr "" 13390 13391#: en/help_topics/revisionspec.txt:117 13392msgid " Supply the path to a branch to select its last revision." 13393msgstr "" 13394 13395#: en/help_topics/revisionspec.txt:121 13396msgid " branch:/path/to/branch" 13397msgstr "" 13398 13399#: en/help_topics/revisionspec.txt:123 13400msgid ":tag:" 13401msgstr "" 13402 13403#: en/help_topics/revisionspec.txt:125 13404msgid " Tags are stored in the branch and created by the 'tag' command." 13405msgstr "" 13406 13407#: en/help_topics/revisionspec.txt:127 13408msgid ":revno:" 13409msgstr "" 13410 13411#: en/help_topics/revisionspec.txt:129 13412msgid "" 13413" Use an integer to specify a revision in the history of the branch.\n" 13414" Optionally a branch can be specified. A negative number will count\n" 13415" from the end of the branch (-1 is the last revision, -2 the previous\n" 13416" one). If the negative number is larger than the branch's history, the\n" 13417" first revision is returned.\n" 13418" Examples::" 13419msgstr "" 13420 13421#: en/help_topics/revisionspec.txt:136 13422msgid "" 13423" revno:1 -> return the first revision of this branch\n" 13424" revno:3:/path/to/branch -> return the 3rd revision of\n" 13425" the branch '/path/to/branch'\n" 13426" revno:-1 -> The last revision in a branch.\n" 13427" -2:http://other/branch -> The second to last revision in the\n" 13428" remote branch.\n" 13429" -1000000 -> Most likely the first revision, unless\n" 13430" your history is very long." 13431msgstr "" 13432 13433#: en/help_topics/revisionspec.txt:145 13434msgid ":before:" 13435msgstr "" 13436 13437#: en/help_topics/revisionspec.txt:147 13438msgid "" 13439" Supply any revision spec to return the parent of that revision. This " 13440"is\n" 13441" mostly useful when inspecting revisions that are not in the revision " 13442"history\n" 13443" of a branch." 13444msgstr "" 13445 13446#: en/help_topics/revisionspec.txt:151 13447msgid "" 13448" It is an error to request the parent of the null revision (before:0)." 13449msgstr "" 13450 13451#: en/help_topics/revisionspec.txt:155 13452msgid "" 13453" before:1913 -> Return the parent of revno 1913 (revno 1912)\n" 13454" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n" 13455" aaaa@bbbb-1234567890\n" 13456" bzr diff -r before:1913..1913\n" 13457" -> Find the changes between revision 1913 and its parent " 13458"(1912).\n" 13459" (What changes did revision 1913 introduce).\n" 13460" This is equivalent to: bzr diff -c 1913" 13461msgstr "" 13462 13463#: en/help_topics/revisionspec.txt:163 13464msgid ":annotate:" 13465msgstr "" 13466 13467#: en/help_topics/revisionspec.txt:165 13468msgid "" 13469" Select the revision that last modified the specified line. Line is\n" 13470" specified as path:number. Path is a relative path to the file. " 13471"Numbers\n" 13472" start at 1, and are relative to the current version, not the last-\n" 13473" committed version of the file." 13474msgstr "" 13475 13476#: en/help_topics/revisionspec.txt:170 13477msgid ":mainline:" 13478msgstr "" 13479 13480#: en/help_topics/revisionspec.txt:172 13481msgid "" 13482" Select the revision that merged the specified revision into mainline." 13483msgstr "" 13484 13485#: en/help_topics/revisionspec.txt:174 13486msgid ":last:" 13487msgstr "" 13488 13489#: en/help_topics/revisionspec.txt:176 13490msgid "" 13491" Supply a positive number to get the nth revision from the end.\n" 13492" This is the same as supplying negative numbers to the 'revno:' spec.\n" 13493" Examples::" 13494msgstr "" 13495 13496#: en/help_topics/revisionspec.txt:180 13497msgid "" 13498" last:1 -> return the last revision\n" 13499" last:3 -> return the revision 2 before the end.\n" 13500msgstr "" 13501 13502#: en/help_topics/rules.txt:1 13503msgid "" 13504"Rules\n" 13505"=====" 13506msgstr "" 13507 13508#: en/help_topics/rules.txt:7 13509msgid "" 13510"Rules are defined in ini file format where the sections are file glob\n" 13511"patterns and the contents of each section are the preferences for files\n" 13512"matching that pattern(s). For example::" 13513msgstr "" 13514 13515#: en/help_topics/rules.txt:11 13516msgid "" 13517" [name *.bat]\n" 13518" eol = native" 13519msgstr "" 13520 13521#: en/help_topics/rules.txt:14 13522msgid "" 13523" [name *.html *.xml]\n" 13524" keywords = xml_escape" 13525msgstr "" 13526 13527#: en/help_topics/rules.txt:17 13528msgid "" 13529"Preferences like these are useful for commands and plugins wishing to\n" 13530"provide custom behaviour for selected files. For more information on \n" 13531"end of line conversion see :doc:`eol-help`.\n" 13532"Keyword support is provided by the `keywords plugin\n" 13533"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_." 13534msgstr "" 13535 13536#: en/help_topics/rules.txt:23 13537msgid "" 13538"Files\n" 13539"-----" 13540msgstr "" 13541 13542#: en/help_topics/rules.txt:26 13543msgid "" 13544"Default rules for all branches are defined in the optional file\n" 13545"``BRZ_HOME/rules``. " 13546msgstr "" 13547 13548#: en/help_topics/rules.txt:29 13549msgid "" 13550"Rule Patterns\n" 13551"-------------" 13552msgstr "" 13553 13554#: en/help_topics/rules.txt:32 13555msgid "" 13556"Patterns are ordered and searching stops as soon as one matches.\n" 13557"As a consequence, more explicit patterns should be placed towards\n" 13558"the top of the file. Rule patterns use exactly the same conventions\n" 13559"as ignore patterns. See :doc:`patterns-help` for details." 13560msgstr "" 13561 13562#: en/help_topics/rules.txt:37 13563msgid ".. note::" 13564msgstr "" 13565 13566#: en/help_topics/rules.txt:39 13567msgid "" 13568" Patterns containing square brackets or spaces should be\n" 13569" surrounded in quotes to ensure they are correctly parsed.\n" 13570msgstr "" 13571 13572#: en/help_topics/topics.txt:1 13573msgid "" 13574"authentication Information on configuring authentication\n" 13575"basic Basic commands\n" 13576"branches Information on what a branch is\n" 13577"bugs Bug tracker settings\n" 13578"checkouts Information on what a checkout is\n" 13579"commands Basic help for all commands\n" 13580"configuration Details on the configuration settings available\n" 13581"conflict-types Types of conflicts and what to do about them\n" 13582"content-filters Conversion of content into/from working trees\n" 13583"criss-cross Information on criss-cross merging\n" 13584"current-formats Current storage formats\n" 13585"debug-flags Options to show or record debug information\n" 13586"diverged-branches How to fix diverged branches\n" 13587"env-variables Environment variable names and values\n" 13588"eol Information on end-of-line handling\n" 13589"files Information on configuration and log files\n" 13590"formats Information on choosing a storage format\n" 13591"global-options Options that control how Bazaar runs\n" 13592"hidden-commands All hidden commands\n" 13593"hooks Points at which custom processing can be added\n" 13594"launchpad Using Bazaar with Launchpad.net\n" 13595"location-alias Aliases for remembered locations\n" 13596"log-formats Details on the logging formats available\n" 13597"other-formats Experimental and deprecated storage formats\n" 13598"patterns Information on the pattern syntax\n" 13599"repositories Basic information on shared repositories.\n" 13600"revisionspec Explain how to use --revision\n" 13601"rules Information on defining rule-based preferences\n" 13602"standalone-trees Information on what a standalone tree is\n" 13603"standard-options Options that can be used with any command\n" 13604"status-flags Help on status flags\n" 13605"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n" 13606"topics Topics list\n" 13607"url-special-chars Special character handling in URLs\n" 13608"urlspec Supported transport protocols\n" 13609"working-trees Information on working trees\n" 13610msgstr "" 13611 13612#: en/help_topics/url-special-chars.txt:1 13613msgid "" 13614"Special character handling in URLs\n" 13615"==================================" 13616msgstr "" 13617 13618#: en/help_topics/url-special-chars.txt:4 13619msgid "Bazaar allows locations to be specified in multiple ways, either:" 13620msgstr "" 13621 13622#: en/help_topics/url-special-chars.txt:6 13623msgid " * Fully qualified URLs" 13624msgstr "" 13625 13626#: en/help_topics/url-special-chars.txt:8 13627msgid " * File system paths, relative or absolute" 13628msgstr "" 13629 13630#: en/help_topics/url-special-chars.txt:10 13631msgid "" 13632"Internally brz treats all locations as URLs. For any file system paths\n" 13633"that are specified it will automatically determine the appropriate URL\n" 13634"representation, and escape special characters where necessary." 13635msgstr "" 13636 13637#: en/help_topics/url-special-chars.txt:14 13638msgid "" 13639"There are a few characters which have special meaning in URLs and need " 13640"careful\n" 13641"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n" 13642"value in URLs. Any non-ASCII characters in a file path will automatically " 13643"be\n" 13644"urlencoded when the path is converted to a URL." 13645msgstr "" 13646 13647#: en/help_topics/url-special-chars.txt:19 13648msgid "" 13649"URLs represent non-ASCII characters in an encoding defined by the server, " 13650"but\n" 13651"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to " 13652"be\n" 13653"generous in what it accepts as a URL and to print them in a way that\n" 13654"will be readable." 13655msgstr "" 13656 13657#: en/help_topics/url-special-chars.txt:24 13658msgid "" 13659"For example, if you have a directory named '/tmp/%2False' these are all " 13660"valid\n" 13661"ways of accessing the content (0x2F, or 47, is the ASCII code for forward " 13662"slash)::" 13663msgstr "" 13664 13665#: en/help_topics/url-special-chars.txt:27 13666msgid "" 13667" cd /tmp\n" 13668" brz log /tmp/%2False\n" 13669" brz log %2False\n" 13670" brz log file:///tmp/%252False\n" 13671" brz log file://localhost/tmp/%252False\n" 13672" brz log file:%252False" 13673msgstr "" 13674 13675#: en/help_topics/url-special-chars.txt:34 13676msgid "These are valid but do not refer to the same file::" 13677msgstr "" 13678 13679#: en/help_topics/url-special-chars.txt:36 13680msgid "" 13681" brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n" 13682" brz log %252False (refers to a file called /tmp/%252False)" 13683msgstr "" 13684 13685#: en/help_topics/url-special-chars.txt:39 13686msgid "" 13687"Comma also has special meaning in URLs, because it denotes `segment " 13688"parameters`_" 13689msgstr "" 13690 13691#: en/help_topics/url-special-chars.txt:41 13692msgid "" 13693"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)" 13694msgstr "" 13695 13696#: en/help_topics/url-special-chars.txt:43 13697msgid "" 13698"Comma is also special in any file system paths that are specified. To use a " 13699"literal\n" 13700"comma in a file system path, specify a URL and URL encode the comma::" 13701msgstr "" 13702 13703#: en/help_topics/url-special-chars.txt:46 13704msgid "" 13705" brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch" 13706"\" set to \"bla\"\n" 13707" brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n" 13708" brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch" 13709"\" set to \"bla\"\n" 13710msgstr "" 13711 13712#: en/help_topics/urlspec.txt:1 13713msgid "URL Identifiers" 13714msgstr "" 13715 13716#: en/help_topics/urlspec.txt:3 13717msgid "Supported URL prefixes::" 13718msgstr "" 13719 13720#: en/help_topics/urlspec.txt:5 13721msgid "" 13722" aftp:// Access using active FTP.\n" 13723" bzr:// Fast access using the Bazaar smart server.\n" 13724" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n" 13725" file:// Access using the standard filesystem (default)\n" 13726" ftp:// Access using passive FTP.\n" 13727" http:// Read-only access of branches exported on the web.\n" 13728" https:// Read-only access of branches exported on the web using " 13729"SSL.\n" 13730" sftp:// Access using SFTP (most SSH servers provide SFTP)." 13731msgstr "" 13732 13733#: en/help_topics/urlspec.txt:14 13734msgid "Supported modifiers::" 13735msgstr "" 13736 13737#: en/help_topics/urlspec.txt:16 13738msgid " gio+ Access using any GIO supported protocols." 13739msgstr "" 13740 13741#: en/help_topics/urlspec.txt:18 13742msgid "Bazaar supports all of the standard parts within the URL::" 13743msgstr "" 13744 13745#: en/help_topics/urlspec.txt:20 13746msgid " <protocol>://[user[:password]@]host[:port]/[path]" 13747msgstr "" 13748 13749#: en/help_topics/urlspec.txt:22 13750msgid "allowing URLs such as::" 13751msgstr "" 13752 13753#: en/help_topics/urlspec.txt:24 13754msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk" 13755msgstr "" 13756 13757#: en/help_topics/urlspec.txt:26 13758msgid "" 13759"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n" 13760"with '~' as meaning that the rest of the path should be interpreted\n" 13761"relative to the remote user's home directory. For example if the user\n" 13762"``remote`` has a home directory of ``/home/remote`` on the server\n" 13763"shell.example.com, then::" 13764msgstr "" 13765 13766#: en/help_topics/urlspec.txt:32 13767msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk" 13768msgstr "" 13769 13770#: en/help_topics/urlspec.txt:34 13771msgid "would refer to ``/home/remote/myproject/trunk``." 13772msgstr "" 13773 13774#: en/help_topics/urlspec.txt:36 13775msgid "" 13776"Many commands that accept URLs also accept location aliases too.\n" 13777"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n" 13778msgstr "" 13779