~bzr-pqm/bzr/bzr.dev

# French translation for bzr

# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011

# This file is distributed under the same license as the bzr package.

# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.

#

msgid ""

msgstr ""

"Project-Id-Version: bzr\n"

"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

"POT-Creation-Date: 2012-07-10 11:35+0200\n"

"PO-Revision-Date: 2011-11-19 06:51+0000\n"

"Last-Translator: Nicolas Delvaux <Unknown>\n"

"Language-Team: French <fr@li.org>\n"

"MIME-Version: 1.0\n"

"Content-Type: text/plain; charset=UTF-8\n"

"Content-Transfer-Encoding: 8bit\n"

"Plural-Forms: nplurals=2; plural=n > 1;\n"

"X-Launchpad-Export-Date: 2012-07-11 04:31+0000\n"

"X-Generator: Launchpad (build 15593)\n"

#: bzrlib/add.py:93

msgid "skipping {0} (larger than {1} of {2} bytes)"

msgstr ""

#: bzrlib/branch.py:854

msgid "Unstacking"

msgstr "Dépilement"

#: bzrlib/branch.py:2955

#, python-format

msgid "Pushed up to revision %d."

msgstr "Publication jusqu'à la révision %d."

#: bzrlib/branch.py:2957

#, python-format

msgid "%d tag updated."

msgid_plural "%d tags updated."

msgstr[0] "%d étiquette mise à jour."

msgstr[1] "%d étiquettes mises à jour."

#: bzrlib/branch.py:2960

msgid "No new revisions or tags to push."

msgstr "Pas de nouvelles révisions ou étiquettes à publier."

#: bzrlib/branch.py:2962

msgid "No new revisions to push."

msgstr "Aucune nouvelle révision à envoyer."

#: bzrlib/branch.py:2982

msgid "checked branch {0} format {1}"

msgstr ""

#: bzrlib/branch.py:2985

#, python-format

msgid "found error:%s"

msgstr "erreur trouvée : %s"

#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323

#, python-format

msgid "Ignoring files outside view. View is %s"

msgstr ""

#: bzrlib/builtins.py:260

#, python-format

msgid "bzr %s --revision takes exactly one revision identifier"

msgstr ""

#: bzrlib/builtins.py:315

msgid "Display status summary."

msgstr ""

#: bzrlib/builtins.py:317

msgid ""

"This reports on versioned and unknown files, reporting them\n"

"grouped by state.  Possible states are:"

msgstr ""

"Ceci informe sur les fichiers versionnés et inconnus, regroupés\n"

"selon leur état. Les différents états sont :"

#: bzrlib/builtins.py:320

msgid ""

"added\n"

"    Versioned in the working copy but not in the previous revision."

msgstr ""

"ajouté\n"

"    Versionné dans la copie de travail mais pas dans la révision précédente."

#: bzrlib/builtins.py:323

msgid ""

"removed\n"

"    Versioned in the previous revision but removed or deleted\n"

"    in the working copy."

msgstr ""

"retiré\n"

"    Versionné dans la révision précédente mais enlevé ou supprimé\n"

"    de la copie de travail."

#: bzrlib/builtins.py:327

msgid ""

"renamed\n"

"    Path of this file changed from the previous revision;\n"

"    the text may also have changed.  This includes files whose\n"

"    parent directory was renamed."

msgstr ""

"renommé\n"

"    l'emplacement de ce fichier a changé depuis la révision précédente ;\n"

"    le texte peut également avoir été modifié. Ceci inclut les fichiers "

"dont\n"

"    le répertoire parent a été renommé."

#: bzrlib/builtins.py:332

msgid ""

"modified\n"

"    Text has changed since the previous revision."

msgstr ""

"modifié\n"

"    Le texte a été modifié depuis la révision précédente."

#: bzrlib/builtins.py:335

msgid ""

"kind changed\n"

"    File kind has been changed (e.g. from file to directory)."

msgstr ""

"type modifié\n"

"    le type du fichier a été modifiée (ex. de fichier à répertoire)."

#: bzrlib/builtins.py:338

msgid ""

"unknown\n"

"    Not versioned and not matching an ignore pattern."

msgstr ""

"inconnu\n"

"    Non versionné et ne correspond pas à une règle d'exclusion."

#: bzrlib/builtins.py:341

msgid ""

"Additionally for directories, symlinks and files with a changed\n"

"executable bit, Bazaar indicates their type using a trailing\n"

"character: '/', '@' or '*' respectively. These decorations can be\n"

"disabled using the '--no-classify' option."

msgstr ""

#: bzrlib/builtins.py:346

msgid ""

"To see ignored files use 'bzr ignored'.  For details on the\n"

"changes to file texts, use 'bzr diff'."

msgstr ""

"Pour voir la liste des fichiers ignorés, utilisez « bzr ignored ».\n"

"Pour le détail des modifications sur les fichiers textes,\n"

"utilisez « bzr diff »."

#: bzrlib/builtins.py:349

msgid ""

"Note that --short or -S gives status flags for each item, similar\n"

"to Subversion's status command. To get output similar to svn -q,\n"

"use bzr status -SV."

msgstr ""

#: bzrlib/builtins.py:353

msgid ""

"If no arguments are specified, the status of the entire working\n"

"directory is shown.  Otherwise, only the status of the specified\n"

"files or directories is reported.  If a directory is given, status\n"

"is reported for everything inside that directory."

msgstr ""

#: bzrlib/builtins.py:358

msgid ""

"Before merges are committed, the pending merge tip revisions are\n"

"shown. To see all pending merge revisions, use the -v option.\n"

"To skip the display of pending merge information altogether, use\n"

"the no-pending option or specify a file/directory."

msgstr ""

#: bzrlib/builtins.py:363

msgid ""

"To compare the working directory to a specific revision, pass a\n"

"single revision to the revision argument."

msgstr ""

#: bzrlib/builtins.py:366

msgid ""

"To see which files have changed in a specific revision, or between\n"

"two revisions, pass a revision range to the revision argument.\n"

"This will produce the same results as calling 'bzr diff --summarize'."

msgstr ""

#: bzrlib/builtins.py:375

msgid "Use short status indicators."

msgstr ""

#: bzrlib/builtins.py:377

msgid "Only show versioned files."

msgstr ""

#: bzrlib/builtins.py:379

msgid "Don't show pending merges."

msgstr ""

#: bzrlib/builtins.py:382

msgid "Do not mark object type using indicator."

msgstr ""

#: bzrlib/builtins.py:397

msgid "bzr status --revision takes exactly one or two revision specifiers"

msgstr ""

"bzr status --revision prend exactement un ou deux numéros de révision"

#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230

msgid "You can only supply one of revision_id or --revision"

msgstr ""

#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232

msgid "You must supply either --revision or a revision_id"

msgstr ""

#: bzrlib/builtins.py:451

#, python-format

msgid "Repository %r does not support access to raw revision texts"

msgstr ""

#: bzrlib/builtins.py:462

msgid "The repository {0} contains no revision {1}."

msgstr "Le répertoire {0} ne contient aucune révision {1}."

#: bzrlib/builtins.py:469

msgid "You cannot specify a NULL revision."

msgstr ""

#: bzrlib/builtins.py:561

msgid "Remove the working tree from a given branch/checkout."

msgstr ""

#: bzrlib/builtins.py:563

msgid ""

"Since a lightweight checkout is little more than a working tree\n"

"this will refuse to run against one."

msgstr ""

#: bzrlib/builtins.py:566

msgid "To re-create the working tree, use \"bzr checkout\"."

msgstr ""

#: bzrlib/builtins.py:572

msgid ""

"Remove the working tree even if it has uncommitted or shelved changes."

msgstr ""

#: bzrlib/builtins.py:586

msgid "No working tree to remove"

msgstr ""

#: bzrlib/builtins.py:588

msgid "You cannot remove the working tree of a remote path"

msgstr ""

#: bzrlib/builtins.py:597

msgid "You cannot remove the working tree from a lightweight checkout"

msgstr ""

#: bzrlib/builtins.py:637

msgid ""

"The tree does not appear to be corrupt. You probably want \"bzr revert\" "

"instead. Use \"--force\" if you are sure you want to reset the working tree."

msgstr ""

#: bzrlib/builtins.py:648

msgid ""

", the header appears corrupt, try passing -r -1 to set the state to the last "

"commit"

msgstr ""

#: bzrlib/builtins.py:652

msgid "failed to reset the tree state{0}"

msgstr ""

#: bzrlib/builtins.py:656

msgid "Show current revision number."

msgstr "Afficher le numéro de la révision actuelle."

#: bzrlib/builtins.py:658

msgid "This is equal to the number of revisions on this branch."

msgstr ""

#: bzrlib/builtins.py:671

msgid "--tree and --revision can not be used together"

msgstr ""

#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986

msgid "Tags can only be placed on a single revision, not on a range"

msgstr ""

#: bzrlib/builtins.py:712

msgid "Show revno of working tree."

msgstr ""

#: bzrlib/builtins.py:760

msgid "Add specified files or directories."

msgstr ""

#: bzrlib/builtins.py:762

msgid ""

"In non-recursive mode, all the named items are added, regardless\n"

"of whether they were previously ignored.  A warning is given if\n"

"any of the named files are already versioned."

msgstr ""

#: bzrlib/builtins.py:766

msgid ""

"In recursive mode (the default), files are treated the same way\n"

"but the behaviour for directories is different.  Directories that\n"

"are already versioned do not give a warning.  All directories,\n"

"whether already versioned or not, are searched for files or\n"

"subdirectories that are neither versioned or ignored, and these\n"

"are added.  This search proceeds recursively into versioned\n"

"directories.  If no names are given '.' is assumed."

msgstr ""

#: bzrlib/builtins.py:774

msgid ""

"A warning will be printed when nested trees are encountered,\n"

"unless they are explicitly ignored."

msgstr ""

#: bzrlib/builtins.py:777

msgid ""

"Therefore simply saying 'bzr add' will version all files that\n"

"are currently unknown."

msgstr ""

#: bzrlib/builtins.py:780

msgid ""

"Adding a file whose parent directory is not versioned will\n"

"implicitly add the parent, and so on up to the root. This means\n"

"you should never need to explicitly add a directory, they'll just\n"

"get added when you add a file in the directory."

msgstr ""

#: bzrlib/builtins.py:785

msgid ""

"--dry-run will show which files would be added, but not actually\n"

"add them."

msgstr ""

#: bzrlib/builtins.py:788

msgid ""

"--file-ids-from will try to use the file ids from the supplied path.\n"

"It looks up ids trying to find a matching parent directory with the\n"

"same filename, and then by pure path. This option is rarely needed\n"

"but can be useful when adding the same logical file into two\n"

"branches that will be merged later (without showing the two different\n"

"adds as a conflict). It is also useful when merging another project\n"

"into a subdirectory of this one."

msgstr ""

#: bzrlib/builtins.py:796

msgid ""

"Any files matching patterns in the ignore list will not be added\n"

"unless they are explicitly mentioned."

msgstr ""

#: bzrlib/builtins.py:799

msgid ""

"In recursive mode, files larger than the configuration option \n"

"add.maximum_file_size will be skipped. Named items are never skipped due\n"

"to file size."

msgstr ""

#: bzrlib/builtins.py:806

msgid "Don't recursively add the contents of directories."

msgstr ""

#: bzrlib/builtins.py:813

msgid "Lookup file ids from this tree."

msgstr ""

#: bzrlib/builtins.py:849

msgid "ignored {0} matching \"{1}\"\n"

msgstr ""

#: bzrlib/builtins.py:854

msgid "Create a new versioned directory."

msgstr ""

#: bzrlib/builtins.py:856

msgid "This is equivalent to creating the directory and then adding it."

msgstr ""

#: bzrlib/builtins.py:863

msgid "No error if existing, make parent directories as needed."

msgstr ""

#: bzrlib/builtins.py:897

#, python-format

msgid "added %s\n"

msgstr "ajouté %s\n"

#: bzrlib/builtins.py:939

#, python-format

msgid "invalid kind %r specified"

msgstr ""

#: bzrlib/builtins.py:976

msgid "Move or rename a file."

msgstr "Déplacer ou renommer un fichier."

#: bzrlib/builtins.py:978

msgid "    bzr mv SOURCE... DESTINATION"

msgstr ""

#: bzrlib/builtins.py:980

msgid ""

"If the last argument is a versioned directory, all the other names\n"

"are moved into it.  Otherwise, there must be exactly two arguments\n"

"and the file is changed to a new name."

msgstr ""

#: bzrlib/builtins.py:984

msgid ""

"If OLDNAME does not exist on the filesystem but is versioned and\n"

"NEWNAME does exist on the filesystem but is not versioned, mv\n"

"assumes that the file has been manually moved and only updates\n"

"its internal inventory to reflect that change.\n"

"The same is valid when moving many SOURCE files to a DESTINATION."

msgstr ""

#: bzrlib/builtins.py:990

msgid "Files cannot be moved between branches."

msgstr ""

#: bzrlib/builtins.py:997

msgid ""

"Move only the bzr identifier of the file, because the file has already been "

"moved."

msgstr ""

#: bzrlib/builtins.py:999

msgid "Automatically guess renames."

msgstr ""

#: bzrlib/builtins.py:1000

msgid "Avoid making changes when guessing renames."

msgstr ""

#: bzrlib/builtins.py:1009

msgid "--dry-run requires --auto."

msgstr ""

#: bzrlib/builtins.py:1013

msgid "missing file argument"

msgstr ""

#: bzrlib/builtins.py:1017

msgid "can not move root of branch"

msgstr ""

#: bzrlib/builtins.py:1023

msgid "Only one path may be specified to --auto."

msgstr ""

#: bzrlib/builtins.py:1026

msgid "--after cannot be specified with --auto."

msgstr ""

#: bzrlib/builtins.py:1062

msgid "to mv multiple files the destination must be a versioned directory"

msgstr ""

#: bzrlib/builtins.py:1114

msgid "Turn this branch into a mirror of another branch."

msgstr ""

#: bzrlib/builtins.py:1116

msgid ""

"By default, this command only works on branches that have not diverged.\n"

"Branches are considered diverged if the destination branch's most recent \n"

"commit is one that has not been merged (directly or indirectly) into the \n"

"parent."

msgstr ""

#: bzrlib/builtins.py:1121

msgid ""

"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"

"from one into the other.  Once one branch has merged, the other should\n"

"be able to pull it again."

msgstr ""

#: bzrlib/builtins.py:1125

msgid ""

"If you want to replace your local changes and just want your branch to\n"

"match the remote one, use pull --overwrite. This will work even if the two\n"

"branches have diverged."

msgstr ""

#: bzrlib/builtins.py:1129

msgid ""

"If there is no default location set, the first pull will set it (use\n"

"--no-remember to avoid setting it). After that, you can omit the\n"

"location to use the default.  To change the default, use --remember. The\n"

"value will only be saved if the remote location can be accessed."

msgstr ""

#: bzrlib/builtins.py:1134

msgid ""

"The --verbose option will display the revisions pulled using the log_format\n"

"configuration option. You can use a different format by overriding it with\n"

"-Olog_format=<other_format>."

msgstr ""

#: bzrlib/builtins.py:1138

msgid ""

"Note: The location can be specified either in the form of a branch,\n"

"or in the form of a path to a file containing a merge directive generated\n"

"with bzr send."

msgstr ""

#: bzrlib/builtins.py:1146

msgid "Show logs of pulled revisions."

msgstr ""

#: bzrlib/builtins.py:1148

msgid ""

"Branch to pull into, rather than the one containing the working directory."

msgstr ""

#: bzrlib/builtins.py:1151

msgid ""

"Perform a local pull in a bound branch.  Local pulls are not applied to the "

"master branch."

msgstr ""

#: bzrlib/builtins.py:1189

msgid "Need working tree for --show-base."

msgstr ""

#: bzrlib/builtins.py:1205

msgid "No pull location known or specified."

msgstr ""

#: bzrlib/builtins.py:1211

#, python-format

msgid "Using saved parent location: %s\n"

msgstr ""

#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425

msgid "Cannot use -r with merge directives or bundles"

msgstr ""

#: bzrlib/builtins.py:1261

msgid "Update a mirror of this branch."

msgstr ""

#: bzrlib/builtins.py:1263

msgid ""

"The target branch will not have its working tree populated because this\n"

"is both expensive, and is not supported on remote file systems."

msgstr ""

#: bzrlib/builtins.py:1266

msgid ""

"Some smart servers or protocols *may* put the working tree in place in\n"

"the future."

msgstr ""

#: bzrlib/builtins.py:1269

msgid ""

"This command only works on branches that have not diverged.  Branches are\n"

"considered diverged if the destination branch's most recent commit is one\n"

"that has not been merged (directly or indirectly) by the source branch."

msgstr ""

#: bzrlib/builtins.py:1273

msgid ""

"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"

"the other branch completely, discarding its unmerged changes."

msgstr ""

#: bzrlib/builtins.py:1276

msgid ""

"If you want to ensure you have the different changes in the other branch,\n"

"do a merge (see bzr help merge) from the other branch, and commit that.\n"

"After that you will be able to do a push without '--overwrite'."

msgstr ""

#: bzrlib/builtins.py:1280

msgid ""

"If there is no default push location set, the first push will set it (use\n"

"--no-remember to avoid setting it).  After that, you can omit the\n"

"location to use the default.  To change the default, use --remember. The\n"

"value will only be saved if the remote location can be accessed."

msgstr ""

#: bzrlib/builtins.py:1285

msgid ""

"The --verbose option will display the revisions pushed using the log_format\n"

"configuration option. You can use a different format by overriding it with\n"

"-Olog_format=<other_format>."

msgstr ""

#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272

msgid ""

"Branch to push from, rather than the one containing the working directory."

msgstr ""

#: bzrlib/builtins.py:1299

msgid ""

"By default push will fail if the target directory exists, but does not "

"already have a control directory.  This flag will allow push to proceed."

msgstr ""

#: bzrlib/builtins.py:1304

msgid ""

"Create a stacked branch that references the public location of the parent "

"branch."

msgstr ""

#: bzrlib/builtins.py:1307

msgid ""

"Create a stacked branch that refers to another branch for the commit "

"history. Only the work not present in the referenced branch is included in "

"the branch created."

msgstr ""

#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279

msgid ""

"Refuse to push if there are uncommitted changes in the working tree, --no-"

"strict disables the check."

msgstr ""

#: bzrlib/builtins.py:1315

msgid "Don't populate the working tree, even for protocols that support it."

msgstr ""

#: bzrlib/builtins.py:1318

msgid "Overwrite tags only."

msgstr ""

#: bzrlib/builtins.py:1369

msgid "Could not determine branch to refer to."

msgstr ""

#: bzrlib/builtins.py:1378

#, python-format

msgid ""

"No push location known or specified. To push to the parent branch (at %s), "

"use 'bzr push :parent'."

msgstr ""

#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306

msgid "No push location known or specified."

msgstr ""

#: bzrlib/builtins.py:1388

#, python-format

msgid "Using saved push location: %s"

msgstr ""

#: bzrlib/builtins.py:1398

msgid "Create a new branch that is a copy of an existing branch."

msgstr ""

#: bzrlib/builtins.py:1400

msgid ""

"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"

"be used.  In other words, \"branch ../foo/bar\" will attempt to create "

"./bar.\n"

"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"

"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"

"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"

"create ./foo-bar."

msgstr ""

#: bzrlib/builtins.py:1407

msgid ""

"To retrieve the branch as of a particular revision, supply the --revision\n"

"parameter, as in \"branch foo/bar -r 5\"."

msgstr ""

#: bzrlib/builtins.py:1410

msgid "The synonyms 'clone' and 'get' for this command are deprecated."

msgstr ""

#: bzrlib/builtins.py:1420

msgid "Create a branch without a working-tree."

msgstr ""

#: bzrlib/builtins.py:1422

msgid "Switch the checkout in the current directory to the new branch."

msgstr ""

#: bzrlib/builtins.py:1425

msgid ""

"Create a stacked branch referring to the source branch. The new branch will "

"depend on the availability of the source branch for all operations."

msgstr ""

#: bzrlib/builtins.py:1429

msgid "Do not use a shared repository, even if available."

msgstr ""

#: bzrlib/builtins.py:1431

msgid ""

"By default branch will fail if the target directory exists, but does not "

"already have a control directory.  This flag will allow branch to proceed."

msgstr ""

#: bzrlib/builtins.py:1436

msgid "Bind new branch to from location."

msgstr ""

#: bzrlib/builtins.py:1483

#, python-format

msgid "Target directory \"%s\" already exists."

msgstr ""

#: bzrlib/builtins.py:1495

#, python-format

msgid "Parent of \"%s\" does not exist."

msgstr ""

#: bzrlib/builtins.py:1514

msgid "The branch {0} has no revision {1}."

msgstr ""

#: bzrlib/builtins.py:1529 bzrlib/push.py:53

#, python-format

msgid "Created new stacked branch referring to %s."

msgstr ""

#: bzrlib/builtins.py:1533

#, python-format

msgid "Branched %d revision."

msgid_plural "Branched %d revisions."

msgstr[0] ""

msgstr[1] ""

#: bzrlib/builtins.py:1538

#, python-format

msgid "New branch bound to %s"

msgstr ""

#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280

#, python-format

msgid "Switched to branch: %s"

msgstr ""

#: bzrlib/builtins.py:1548

msgid "List the branches available at the current location."

msgstr ""

#: bzrlib/builtins.py:1550

msgid ""

"This command will print the names of all the branches at the current\n"

"location."

msgstr ""

#: bzrlib/builtins.py:1557

msgid ""

"Recursively scan for branches rather than just looking in the specified "

"location."

msgstr ""

#: bzrlib/builtins.py:1586

msgid "(default)"

msgstr ""

#: bzrlib/builtins.py:1598

msgid "Create a new checkout of an existing branch."

msgstr ""

#: bzrlib/builtins.py:1600

msgid ""

"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "

"for\n"

"the branch found in '.'. This is useful if you have removed the working "

"tree\n"

"or if it was never created - i.e. if you pushed the branch to its current\n"

"location using SFTP."

msgstr ""

#: bzrlib/builtins.py:1605

msgid ""

"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "

"will\n"

"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "

"./bar.\n"

"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"

"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"

"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"

"create ./foo-bar."

msgstr ""

#: bzrlib/builtins.py:1612

msgid ""

"To retrieve the branch as of a particular revision, supply the --revision\n"

"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "

"immediately\n"

"out of date [so you cannot commit] but it may be useful (i.e. to examine "

"old\n"

"code.)"

msgstr ""

#: bzrlib/builtins.py:1622

msgid ""

"Perform a lightweight checkout.  Lightweight checkouts depend on access to "

"the branch for every operation.  Normal checkouts can perform common "

"operations like diff and status without such access, and also support local "

"commits."

msgstr ""

#: bzrlib/builtins.py:1629

msgid "Get file contents from this tree."

msgstr ""

#: bzrlib/builtins.py:1631

msgid "Hard-link working tree files where possible."

msgstr ""

#: bzrlib/builtins.py:1672

msgid ""

"Show list of renamed files.\n"

"    "

msgstr ""

#: bzrlib/builtins.py:1700

msgid "Update a working tree to a new revision."

msgstr ""

#: bzrlib/builtins.py:1702

msgid ""

"This will perform a merge of the destination revision (the tip of the\n"

"branch, or the specified revision) into the working tree, and then make\n"

"that revision the basis revision for the working tree.  "

msgstr ""

#: bzrlib/builtins.py:1706

msgid ""

"You can use this to visit an older revision, or to update a working tree\n"

"that is out of date from its branch."

msgstr ""

#: bzrlib/builtins.py:1709

msgid ""

"If there are any uncommitted changes in the tree, they will be carried\n"

"across and remain as uncommitted changes after the update.  To discard\n"

"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"

"with the changes brought in by the change in basis revision."

msgstr ""

#: bzrlib/builtins.py:1714

msgid ""

"If the tree's branch is bound to a master branch, bzr will also update\n"

"the branch from the master."

msgstr ""

#: bzrlib/builtins.py:1717

msgid ""

"You cannot update just a single file or directory, because each Bazaar\n"

"working tree has just a single basis revision.  If you want to restore a\n"

"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"

"update'.  If you want to restore a file to its state in a previous\n"

"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"

"out the old content of that file to a new location."

msgstr ""

#: bzrlib/builtins.py:1724

msgid ""

"The 'dir' argument, if given, must be the location of the root of a\n"

"working tree to update.  By default, the working tree that contains the \n"

"current working directory is used."

msgstr ""

#: bzrlib/builtins.py:1740

msgid "bzr update --revision takes exactly one revision"

msgstr ""

#: bzrlib/builtins.py:1748

msgid "bzr update can only update a whole tree, not a file or subdirectory"

msgstr ""

#: bzrlib/builtins.py:1779

msgid "Tree is up to date at revision {0} of branch {1}"

msgstr ""