Merge lp:~jr/bzr/i18n-add-pot-file into lp:bzr

Proposed by Jonathan Riddell on 2011-08-24
Status: Merged
Approved by: Jelmer Vernooij on 2011-08-24
Approved revision: 6095
Merged at revision: 6102
Proposed branch: lp:~jr/bzr/i18n-add-pot-file
Merge into: lp:bzr
Diff against target: 5313 lines (+5298/-0)
2 files modified
doc/en/release-notes/bzr-2.5.txt (+2/-0)
po/bzr.pot (+5296/-0)
To merge this branch: bzr merge lp:~jr/bzr/i18n-add-pot-file
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) 2011-08-24 Approve on 2011-08-24
Review via email:

Commit message

bzr now ships with translations for command help.

Description of the change

Add .pot file

Add translation template.

I have set Launchpad to import translations from trunk.

This doesn't include topic help yet nor is command output translated.

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :


I guess this depends on your other to MPs, so conditionally approved.

review: Approve
Jonathan Riddell (jr) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt 2011-08-23 10:27:54 +0000
+++ doc/en/release-notes/bzr-2.5.txt 2011-08-24 14:22:26 +0000
@@ -89,6 +89,8 @@
89 option. A value of 0 disables skipping. Named items passed to add are89 option. A value of 0 disables skipping. Named items passed to add are
90 never skipped. (Shannon Weyrick, #54624)90 never skipped. (Shannon Weyrick, #54624)
92* bzr now ships with translations for command help. (Jonathan
93 Riddell, INADA Naoki, #83941)
=== added file 'po/bzr.pot'
--- po/bzr.pot 1970-01-01 00:00:00 +0000
+++ po/bzr.pot 2011-08-24 14:22:26 +0000
@@ -0,0 +1,5296 @@
2# Copyright (C) YEAR Canonical
3# This file is distributed under the same license as the PACKAGE package.
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: bzr\n"
10"Report-Msgid-Bugs-To: <>\n"
11"POT-Creation-Date: 2011-08-24 15:14+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
21#: bzrlib/
22msgid "Display status summary."
23msgstr ""
25#: bzrlib/
26msgid ""
27"This reports on versioned and unknown files, reporting them\n"
28"grouped by state. Possible states are:"
29msgstr ""
31#: bzrlib/
32msgid ""
34" Versioned in the working copy but not in the previous revision."
35msgstr ""
37#: bzrlib/
38msgid ""
40" Versioned in the previous revision but removed or deleted\n"
41" in the working copy."
42msgstr ""
44#: bzrlib/
45msgid ""
47" Path of this file changed from the previous revision;\n"
48" the text may also have changed. This includes files whose\n"
49" parent directory was renamed."
50msgstr ""
52#: bzrlib/
53msgid ""
55" Text has changed since the previous revision."
56msgstr ""
58#: bzrlib/
59msgid ""
60"kind changed\n"
61" File kind has been changed (e.g. from file to directory)."
62msgstr ""
64#: bzrlib/
65msgid ""
67" Not versioned and not matching an ignore pattern."
68msgstr ""
70#: bzrlib/
71msgid ""
72"Additionally for directories, symlinks and files with a changed\n"
73"executable bit, Bazaar indicates their type using a trailing\n"
74"character: '/', '@' or '*' respectively. These decorations can be\n"
75"disabled using the '--no-classify' option."
76msgstr ""
78#: bzrlib/
79msgid ""
80"To see ignored files use 'bzr ignored'. For details on the\n"
81"changes to file texts, use 'bzr diff'."
82msgstr ""
84#: bzrlib/
85msgid ""
86"Note that --short or -S gives status flags for each item, similar\n"
87"to Subversion's status command. To get output similar to svn -q,\n"
88"use bzr status -SV."
89msgstr ""
91#: bzrlib/
92msgid ""
93"If no arguments are specified, the status of the entire working\n"
94"directory is shown. Otherwise, only the status of the specified\n"
95"files or directories is reported. If a directory is given, status\n"
96"is reported for everything inside that directory."
97msgstr ""
99#: bzrlib/
100msgid ""
101"Before merges are committed, the pending merge tip revisions are\n"
102"shown. To see all pending merge revisions, use the -v option.\n"
103"To skip the display of pending merge information altogether, use\n"
104"the no-pending option or specify a file/directory."
105msgstr ""
107#: bzrlib/
108msgid ""
109"To compare the working directory to a specific revision, pass a\n"
110"single revision to the revision argument."
111msgstr ""
113#: bzrlib/
114msgid ""
115"To see which files have changed in a specific revision, or between\n"
116"two revisions, pass a revision range to the revision argument.\n"
117"This will produce the same results as calling 'bzr diff --summarize'."
118msgstr ""
120# help of 'short' option of 'status' command
121#: bzrlib/
122msgid "Use short status indicators."
123msgstr ""
125# help of 'versioned' option of 'status' command
126#: bzrlib/
127msgid "Only show versioned files."
128msgstr ""
130# help of 'no-pending' option of 'status' command
131#: bzrlib/
132msgid "Don't show pending merges."
133msgstr ""
135# help of 'no-classify' option of 'status' command
136#: bzrlib/
137msgid "Do not mark object type using indicator."
138msgstr ""
140#: bzrlib/
141msgid "Remove the working tree from a given branch/checkout."
142msgstr ""
144#: bzrlib/
145msgid ""
146"Since a lightweight checkout is little more than a working tree\n"
147"this will refuse to run against one."
148msgstr ""
150#: bzrlib/
151msgid "To re-create the working tree, use \"bzr checkout\"."
152msgstr ""
154# help of 'force' option of 'remove-tree' command
155#: bzrlib/
156msgid "Remove the working tree even if it has uncommitted or shelved changes."
157msgstr ""
159#: bzrlib/
160msgid "Show current revision number."
161msgstr ""
163#: bzrlib/
164msgid "This is equal to the number of revisions on this branch."
165msgstr ""
167# help of 'tree' option of 'revno' command
168#: bzrlib/
169msgid "Show revno of working tree"
170msgstr ""
172#: bzrlib/
173msgid "Add specified files or directories."
174msgstr ""
176#: bzrlib/
177msgid ""
178"In non-recursive mode, all the named items are added, regardless\n"
179"of whether they were previously ignored. A warning is given if\n"
180"any of the named files are already versioned."
181msgstr ""
183#: bzrlib/
184msgid ""
185"In recursive mode (the default), files are treated the same way\n"
186"but the behaviour for directories is different. Directories that\n"
187"are already versioned do not give a warning. All directories,\n"
188"whether already versioned or not, are searched for files or\n"
189"subdirectories that are neither versioned or ignored, and these\n"
190"are added. This search proceeds recursively into versioned\n"
191"directories. If no names are given '.' is assumed."
192msgstr ""
194#: bzrlib/
195msgid ""
196"Therefore simply saying 'bzr add' will version all files that\n"
197"are currently unknown."
198msgstr ""
200#: bzrlib/
201msgid ""
202"Adding a file whose parent directory is not versioned will\n"
203"implicitly add the parent, and so on up to the root. This means\n"
204"you should never need to explicitly add a directory, they'll just\n"
205"get added when you add a file in the directory."
206msgstr ""
208#: bzrlib/
209msgid ""
210"--dry-run will show which files would be added, but not actually\n"
211"add them."
212msgstr ""
214#: bzrlib/
215msgid ""
216"--file-ids-from will try to use the file ids from the supplied path.\n"
217"It looks up ids trying to find a matching parent directory with the\n"
218"same filename, and then by pure path. This option is rarely needed\n"
219"but can be useful when adding the same logical file into two\n"
220"branches that will be merged later (without showing the two different\n"
221"adds as a conflict). It is also useful when merging another project\n"
222"into a subdirectory of this one."
223msgstr ""
225#: bzrlib/
226msgid ""
227"Any files matching patterns in the ignore list will not be added\n"
228"unless they are explicitly mentioned."
229msgstr ""
231#: bzrlib/
232msgid ""
233"In recursive mode, files larger than the configuration option \n"
234"add.maximum_file_size will be skipped. Named items are never skipped due\n"
235"to file size."
236msgstr ""
238# help of 'no-recurse' option of 'add' command
239#: bzrlib/
240msgid "Don't recursively add the contents of directories."
241msgstr ""
243# help of 'file-ids-from' option of 'add' command
244#: bzrlib/
245msgid "Lookup file ids from this tree."
246msgstr ""
248#: bzrlib/
249msgid "Create a new versioned directory."
250msgstr ""
252#: bzrlib/
253msgid "This is equivalent to creating the directory and then adding it."
254msgstr ""
256#: bzrlib/
257msgid "Move or rename a file."
258msgstr ""
260#: bzrlib/
261msgid " bzr mv SOURCE... DESTINATION"
262msgstr ""
264#: bzrlib/
265msgid ""
266"If the last argument is a versioned directory, all the other names\n"
267"are moved into it. Otherwise, there must be exactly two arguments\n"
268"and the file is changed to a new name."
269msgstr ""
271#: bzrlib/
272msgid ""
273"If OLDNAME does not exist on the filesystem but is versioned and\n"
274"NEWNAME does exist on the filesystem but is not versioned, mv\n"
275"assumes that the file has been manually moved and only updates\n"
276"its internal inventory to reflect that change.\n"
277"The same is valid when moving many SOURCE files to a DESTINATION."
278msgstr ""
280#: bzrlib/
281msgid "Files cannot be moved between branches."
282msgstr ""
284# help of 'after' option of 'mv' command
285#: bzrlib/
286msgid ""
287"Move only the bzr identifier of the file, because the file has already been "
289msgstr ""
291# help of 'auto' option of 'mv' command
292#: bzrlib/
293msgid "Automatically guess renames."
294msgstr ""
296# help of 'dry-run' option of 'mv' command
297#: bzrlib/
298msgid "Avoid making changes when guessing renames."
299msgstr ""
301#: bzrlib/
302msgid "Turn this branch into a mirror of another branch."
303msgstr ""
305#: bzrlib/
306msgid ""
307"By default, this command only works on branches that have not diverged.\n"
308"Branches are considered diverged if the destination branch's most recent \n"
309"commit is one that has not been merged (directly or indirectly) into the \n"
311msgstr ""
313#: bzrlib/
314msgid ""
315"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
316"from one into the other. Once one branch has merged, the other should\n"
317"be able to pull it again."
318msgstr ""
320#: bzrlib/
321msgid ""
322"If you want to replace your local changes and just want your branch to\n"
323"match the remote one, use pull --overwrite. This will work even if the two\n"
324"branches have diverged."
325msgstr ""
327#: bzrlib/
328msgid ""
329"If there is no default location set, the first pull will set it (use\n"
330"--no-remember to avoid settting it). After that, you can omit the\n"
331"location to use the default. To change the default, use --remember. The\n"
332"value will only be saved if the remote location can be accessed."
333msgstr ""
335#: bzrlib/
336msgid ""
337"Note: The location can be specified either in the form of a branch,\n"
338"or in the form of a path to a file containing a merge directive generated\n"
339"with bzr send."
340msgstr ""
342# help of 'verbose' option of 'pull' command
343#: bzrlib/
344msgid "Show logs of pulled revisions."
345msgstr ""
347# help of 'directory' option of 'pull' command
348#: bzrlib/
349msgid ""
350"Branch to pull into, rather than the one containing the working directory."
351msgstr ""
353# help of 'local' option of 'pull' command
354#: bzrlib/
355msgid ""
356"Perform a local pull in a bound branch. Local pulls are not applied to the "
357"master branch."
358msgstr ""
360#: bzrlib/
361msgid "Update a mirror of this branch."
362msgstr ""
364#: bzrlib/
365msgid ""
366"The target branch will not have its working tree populated because this\n"
367"is both expensive, and is not supported on remote file systems."
368msgstr ""
370#: bzrlib/
371msgid ""
372"Some smart servers or protocols *may* put the working tree in place in\n"
373"the future."
374msgstr ""
376#: bzrlib/
377msgid ""
378"This command only works on branches that have not diverged. Branches are\n"
379"considered diverged if the destination branch's most recent commit is one\n"
380"that has not been merged (directly or indirectly) by the source branch."
381msgstr ""
383#: bzrlib/
384msgid ""
385"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
386"the other branch completely, discarding its unmerged changes."
387msgstr ""
389#: bzrlib/
390msgid ""
391"If you want to ensure you have the different changes in the other branch,\n"
392"do a merge (see bzr help merge) from the other branch, and commit that.\n"
393"After that you will be able to do a push without '--overwrite'."
394msgstr ""
396#: bzrlib/
397msgid ""
398"If there is no default push location set, the first push will set it (use\n"
399"--no-remember to avoid settting it). After that, you can omit the\n"
400"location to use the default. To change the default, use --remember. The\n"
401"value will only be saved if the remote location can be accessed."
402msgstr ""
404# help of 'directory' option of 'push' command
405#: bzrlib/
406msgid ""
407"Branch to push from, rather than the one containing the working directory."
408msgstr ""
410# help of 'use-existing-dir' option of 'push' command
411#: bzrlib/
412msgid ""
413"By default push will fail if the target directory exists, but does not "
414"already have a control directory. This flag will allow push to proceed."
415msgstr ""
417# help of 'stacked' option of 'push' command
418#: bzrlib/
419msgid ""
420"Create a stacked branch that references the public location of the parent "
422msgstr ""
424# help of 'stacked-on' option of 'push' command
425#: bzrlib/
426msgid ""
427"Create a stacked branch that refers to another branch for the commit "
428"history. Only the work not present in the referenced branch is included in "
429"the branch created."
430msgstr ""
432# help of 'strict' option of 'push' command
433#: bzrlib/
434msgid ""
435"Refuse to push if there are uncommitted changes in the working tree, --no-"
436"strict disables the check."
437msgstr ""
439# help of 'no-tree' option of 'push' command
440#: bzrlib/
441msgid "Don't populate the working tree, even for protocols that support it."
442msgstr ""
444#: bzrlib/
445msgid "Create a new branch that is a copy of an existing branch."
446msgstr ""
448#: bzrlib/
449msgid ""
450"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
451"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
453"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
454"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
455"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
456"create ./foo-bar."
457msgstr ""
459#: bzrlib/
460msgid ""
461"To retrieve the branch as of a particular revision, supply the --revision\n"
462"parameter, as in \"branch foo/bar -r 5\"."
463msgstr ""
465#: bzrlib/
466msgid "The synonyms 'clone' and 'get' for this command are deprecated."
467msgstr ""
469# help of 'no-tree' option of 'branch' command
470#: bzrlib/
471msgid "Create a branch without a working-tree."
472msgstr ""
474# help of 'switch' option of 'branch' command
475#: bzrlib/
476msgid "Switch the checkout in the current directory to the new branch."
477msgstr ""
479# help of 'stacked' option of 'branch' command
480#: bzrlib/
481msgid ""
482"Create a stacked branch referring to the source branch. The new branch will "
483"depend on the availability of the source branch for all operations."
484msgstr ""
486# help of 'standalone' option of 'branch' command
487#: bzrlib/
488msgid "Do not use a shared repository, even if available."
489msgstr ""
491# help of 'use-existing-dir' option of 'branch' command
492#: bzrlib/
493msgid ""
494"By default branch will fail if the target directory exists, but does not "
495"already have a control directory. This flag will allow branch to proceed."
496msgstr ""
498# help of 'bind' option of 'branch' command
499#: bzrlib/
500msgid "Bind new branch to from location."
501msgstr ""
503#: bzrlib/
504msgid "List the branches available at the current location."
505msgstr ""
507#: bzrlib/
508msgid ""
509"This command will print the names of all the branches at the current "
511msgstr ""
513#: bzrlib/
514msgid "Create a new checkout of an existing branch."
515msgstr ""
517#: bzrlib/
518msgid ""
519"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
521"the branch found in '.'. This is useful if you have removed the working "
523"or if it was never created - i.e. if you pushed the branch to its current\n"
524"location using SFTP."
525msgstr ""
527#: bzrlib/
528msgid ""
529"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
531"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
533"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
534"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
535"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
536"create ./foo-bar."
537msgstr ""
539#: bzrlib/
540msgid ""
541"To retrieve the branch as of a particular revision, supply the --revision\n"
542"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
544"out of date [so you cannot commit] but it may be useful (i.e. to examine "
547msgstr ""
549# help of 'lightweight' option of 'checkout' command
550#: bzrlib/
551msgid ""
552"Perform a lightweight checkout. Lightweight checkouts depend on access to "
553"the branch for every operation. Normal checkouts can perform common "
554"operations like diff and status without such access, and also support local "
556msgstr ""
558# help of 'files-from' option of 'branch' command
559#: bzrlib/
560msgid "Get file contents from this tree."
561msgstr ""
563# help of 'hardlink' option of 'branch' command
564#: bzrlib/
565msgid "Hard-link working tree files where possible."
566msgstr ""
568#: bzrlib/
569msgid ""
570"Show list of renamed files.\n"
571" "
572msgstr ""
574#: bzrlib/
575msgid "Update a tree to have the latest code committed to its branch."
576msgstr ""
578#: bzrlib/
579msgid ""
580"This will perform a merge into the working tree, and may generate\n"
581"conflicts. If you have any local changes, you will still\n"
582"need to commit them after the update for the update to be complete."
583msgstr ""
585#: bzrlib/
586msgid ""
587"If you want to discard your local changes, you can just do a\n"
588"'bzr revert' instead of 'bzr commit' after the update."
589msgstr ""
591#: bzrlib/
592msgid ""
593"If you want to restore a file that has been removed locally, use\n"
594"'bzr revert' instead of 'bzr update'."
595msgstr ""
597#: bzrlib/
598msgid ""
599"If the tree's branch is bound to a master branch, it will also update\n"
600"the branch from the master."
601msgstr ""
603#: bzrlib/
604msgid "Show information about a working tree, branch or repository."
605msgstr ""
607#: bzrlib/
608msgid ""
609"This command will show all known locations and formats associated to the\n"
610"tree, branch or repository."
611msgstr ""
613#: bzrlib/
614msgid ""
615"In verbose mode, statistical information is included with each report.\n"
616"To see extended statistic information, use a verbosity level of 2 or\n"
617"higher by specifying the verbose option multiple times, e.g. -vv."
618msgstr ""
620#: bzrlib/
621msgid "Branches and working trees will also report any missing revisions."
622msgstr ""
624#: bzrlib/
625msgid " Display information on the format and related locations:"
626msgstr ""
628#: bzrlib/
629msgid " bzr info"
630msgstr ""
632#: bzrlib/
633msgid ""
634" Display the above together with extended format information and\n"
635" basic statistics (like the number of files in the working tree and\n"
636" number of revisions in the branch and repository):"
637msgstr ""
639#: bzrlib/
640msgid " bzr info -v"
641msgstr ""
643#: bzrlib/
644msgid " Display the above together with number of committers to the branch:"
645msgstr ""
647#: bzrlib/
648msgid " bzr info -vv"
649msgstr ""
651#: bzrlib/
652msgid "Remove files or directories."
653msgstr ""
655#: bzrlib/
656msgid ""
657"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
658"delete them if they can easily be recovered using revert otherwise they\n"
659"will be backed up (adding an extention of the form .~#~). If no options or\n"
660"parameters are given Bazaar will scan for files that are being tracked by\n"
661"Bazaar but missing in your tree and stop tracking them for you."
662msgstr ""
664# help of 'new' option of 'remove' command
665#: bzrlib/
666msgid "Only remove files that have never been committed."
667msgstr ""
669# help of 'file-deletion-strategy' option of 'remove' command
670#: bzrlib/
671msgid "The file deletion mode to be used."
672msgstr ""
674# title of 'file-deletion-strategy' option of 'remove' command
675#: bzrlib/
676msgid "Deletion Strategy"
677msgstr ""
679#: bzrlib/
680msgid "Reconcile bzr metadata in a branch."
681msgstr ""
683#: bzrlib/
684msgid ""
685"This can correct data mismatches that may have been caused by\n"
686"previous ghost operations or bzr upgrades. You should only\n"
687"need to run this command if 'bzr check' or a bzr developer\n"
688"advises you to run it."
689msgstr ""
691#: bzrlib/
692msgid ""
693"If a second branch is provided, cross-branch reconciliation is\n"
694"also attempted, which will check that data like the tree root\n"
695"id which was not present in very early bzr versions is represented\n"
696"correctly in both branches."
697msgstr ""
699#: bzrlib/
700msgid ""
701"At the same time it is run it may recompress data resulting in\n"
702"a potential saving in disk space or performance gain."
703msgstr ""
705#: bzrlib/
706msgid "The branch *MUST* be on a listable system such as local disk or sftp."
707msgstr ""
709#: bzrlib/
710msgid "Make a directory into a versioned branch."
711msgstr ""
713#: bzrlib/
714msgid ""
715"Use this to create an empty branch, or before importing an\n"
716"existing project."
717msgstr ""
719#: bzrlib/
720msgid ""
721"If there is a repository in a parent directory of the location, then\n"
722"the history of the branch will be stored in the repository. Otherwise\n"
723"init creates a standalone branch which carries its own history\n"
724"in the .bzr directory."
725msgstr ""
727#: bzrlib/
728msgid ""
729"If there is already a branch at the location but it has no working tree,\n"
730"the tree can be populated with 'bzr checkout'."
731msgstr ""
733#: bzrlib/
734msgid "Recipe for importing a tree of files::"
735msgstr ""
737#: bzrlib/
738msgid ""
739" cd ~/project\n"
740" bzr init\n"
741" bzr add .\n"
742" bzr status\n"
743" bzr commit -m \"imported project\""
744msgstr ""
746# help of 'create-prefix' option of 'init' command
747#: bzrlib/
748msgid "Create the path leading up to the branch if it does not already exist."
749msgstr ""
751# help of 'format' option of 'init' command
752#: bzrlib/
753msgid "Specify a format for this branch. See \"help formats\"."
754msgstr ""
756# help of 'append-revisions-only' option of 'init' command
757#: bzrlib/
758msgid "Never change revnos or the existing log. Append revisions to it only."
759msgstr ""
761# help of 'no-tree' option of 'init' command
762#: bzrlib/
763msgid "Create a branch without a working tree."
764msgstr ""
766#: bzrlib/
767msgid "Create a shared repository for branches to share storage space."
768msgstr ""
770#: bzrlib/
771msgid ""
772"New branches created under the repository directory will store their\n"
773"revisions in the repository, not in the branch directory. For branches\n"
774"with shared history, this reduces the amount of storage needed and \n"
775"speeds up the creation of new branches."
776msgstr ""
778#: bzrlib/
779msgid ""
780"If the --no-trees option is given then the branches in the repository\n"
781"will not have working trees by default. They will still exist as \n"
782"directories on disk, but they will not have separate copies of the \n"
783"files at a certain revision. This can be useful for repositories that\n"
784"store branches which are interacted with through checkouts or remote\n"
785"branches, such as on a server."
786msgstr ""
788#: bzrlib/
789msgid ""
791" Create a shared repository holding just branches::"
792msgstr ""
794#: bzrlib/
795msgid ""
796" bzr init-repo --no-trees repo\n"
797" bzr init repo/trunk"
798msgstr ""
800#: bzrlib/
801msgid " Make a lightweight checkout elsewhere::"
802msgstr ""
804#: bzrlib/
805msgid ""
806" bzr checkout --lightweight repo/trunk trunk-checkout\n"
807" cd trunk-checkout\n"
808" (add files here)"
809msgstr ""
811# help of 'format' option of 'init-repository' command
812#: bzrlib/
813msgid ""
814"Specify a format for this repository. See \"bzr help formats\" for details."
815msgstr ""
817# title of 'format' option of 'init-repository' command
818#: bzrlib/
819msgid "Repository format"
820msgstr ""
822# help of 'no-trees' option of 'init-repository' command
823#: bzrlib/
824msgid "Branches in the repository will default to not having a working tree."
825msgstr ""
827#: bzrlib/
828msgid "Show differences in the working tree, between revisions or branches."
829msgstr ""
831#: bzrlib/
832msgid ""
833"If no arguments are given, all changes for the current tree are listed.\n"
834"If files are given, only the changes in those files are listed.\n"
835"Remote and multiple branches can be compared by using the --old and\n"
836"--new options. If not provided, the default for both is derived from\n"
837"the first argument, if any, or the current tree if no arguments are\n"
839msgstr ""
841#: bzrlib/
842msgid ""
843"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
844"produces patches suitable for \"patch -p1\"."
845msgstr ""
847#: bzrlib/
848msgid ""
849"Note that when using the -r argument with a range of revisions, the\n"
850"differences are computed between the two specified revisions. That\n"
851"is, the command does not show the changes introduced by the first \n"
852"revision in the range. This differs from the interpretation of \n"
853"revision ranges used by \"bzr log\" which includes the first revision\n"
854"in the range."
855msgstr ""
857#: bzrlib/
858msgid ""
859":Exit values:\n"
860" 1 - changed\n"
861" 2 - unrepresentable changes\n"
862" 3 - error\n"
863" 0 - no change"
864msgstr ""
866#: bzrlib/
867msgid ""
869" Shows the difference in the working tree versus the last commit::"
870msgstr ""
872#: bzrlib/
873msgid " bzr diff"
874msgstr ""
876#: bzrlib/
877msgid " Difference between the working tree and revision 1::"
878msgstr ""
880#: bzrlib/
881msgid " bzr diff -r1"
882msgstr ""
884#: bzrlib/
885msgid " Difference between revision 3 and revision 1::"
886msgstr ""
888#: bzrlib/
889msgid " bzr diff -r1..3"
890msgstr ""
892#: bzrlib/
893msgid " Difference between revision 3 and revision 1 for branch xxx::"
894msgstr ""
896#: bzrlib/
897msgid " bzr diff -r1..3 xxx"
898msgstr ""
900#: bzrlib/
901msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
902msgstr ""
904#: bzrlib/
905msgid " bzr diff -c2"
906msgstr ""
908#: bzrlib/
909msgid ""
910" To see the changes introduced by revision X::\n"
911" \n"
912" bzr diff -cX"
913msgstr ""
915#: bzrlib/
916msgid ""
917" Note that in the case of a merge, the -c option shows the changes\n"
918" compared to the left hand parent. To see the changes against\n"
919" another parent, use::"
920msgstr ""
922#: bzrlib/
923msgid " bzr diff -r<chosen_parent>..X"
924msgstr ""
926#: bzrlib/
927msgid ""
928" The changes between the current revision and the previous revision\n"
929" (equivalent to -c-1 and -r-2..-1)"
930msgstr ""
932#: bzrlib/
933msgid " bzr diff -r-2.."
934msgstr ""
936#: bzrlib/
937msgid " Show just the differences for file NEWS::"
938msgstr ""
940#: bzrlib/
941msgid " bzr diff NEWS"
942msgstr ""
944#: bzrlib/
945msgid " Show the differences in working tree xxx for file NEWS::"
946msgstr ""
948#: bzrlib/
949msgid " bzr diff xxx/NEWS"
950msgstr ""
952#: bzrlib/
953msgid " Show the differences from branch xxx to this working tree:"
954msgstr ""
956#: bzrlib/
957msgid " bzr diff --old xxx"
958msgstr ""
960#: bzrlib/
961msgid " Show the differences between two branches for file NEWS::"
962msgstr ""
964#: bzrlib/
965msgid " bzr diff --old xxx --new yyy NEWS"
966msgstr ""
968#: bzrlib/
969msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
970msgstr ""
972#: bzrlib/
973msgid ""
974" bzr diff --prefix old/:new/\n"
975" \n"
976" Show the differences using a custom diff program with options::\n"
977" \n"
978" bzr diff --using /usr/bin/diff --diff-options -wu"
979msgstr ""
981# help of 'diff-options' option of 'diff' command
982#: bzrlib/
983msgid "Pass these options to the external diff program."
984msgstr ""
986# help of 'prefix' option of 'diff' command
987#: bzrlib/
988msgid ""
989"Set prefixes added to old and new filenames, as two values separated by a "
990"colon. (eg \"old/:new/\")."
991msgstr ""
993# help of 'old' option of 'diff' command
994#: bzrlib/
995msgid "Branch/tree to compare from."
996msgstr ""
998# help of 'new' option of 'diff' command
999#: bzrlib/
1000msgid "Branch/tree to compare to."
1001msgstr ""
1003# help of 'using' option of 'diff' command
1004#: bzrlib/
1005msgid "Use this command to compare files."
1006msgstr ""
1008# help of 'format' option of 'diff' command
1009#: bzrlib/
1010msgid "Diff format to use."
1011msgstr ""
1013# title of 'format' option of 'diff' command
1014#: bzrlib/
1015msgid "Diff format"
1016msgstr ""
1018#: bzrlib/
1019msgid ""
1020"List files deleted in the working tree.\n"
1021" "
1022msgstr ""
1024#: bzrlib/
1025msgid "Show the tree root directory."
1026msgstr ""
1028#: bzrlib/
1029msgid ""
1030"The root is the nearest enclosing directory with a .bzr control\n"
1032msgstr ""
1034#: bzrlib/
1035msgid "Show historical log for a branch or subset of a branch."
1036msgstr ""
1038#: bzrlib/
1039msgid ""
1040"log is bzr's default tool for exploring the history of a branch.\n"
1041"The branch to use is taken from the first parameter. If no parameters\n"
1042"are given, the branch containing the working directory is logged.\n"
1043"Here are some simple examples::"
1044msgstr ""
1046#: bzrlib/
1047msgid ""
1048" bzr log log the current branch\n"
1049" bzr log log a file in its branch\n"
1050" bzr log http://server/branch log a branch on a server"
1051msgstr ""
1053#: bzrlib/
1054msgid ""
1055"The filtering, ordering and information shown for each revision can\n"
1056"be controlled as explained below. By default, all revisions are\n"
1057"shown sorted (topologically) so that newer revisions appear before\n"
1058"older ones and descendants always appear before ancestors. If displayed,\n"
1059"merged revisions are shown indented under the revision in which they\n"
1060"were merged."
1061msgstr ""
1063#: bzrlib/
1064msgid ":Output control:"
1065msgstr ""
1067#: bzrlib/
1068msgid ""
1069" The log format controls how information about each revision is\n"
1070" displayed. The standard log formats are called ``long``, ``short``\n"
1071" and ``line``. The default is long. See ``bzr help log-formats``\n"
1072" for more details on log formats."
1073msgstr ""
1075#: bzrlib/
1076msgid ""
1077" The following options can be used to control what information is\n"
1078" displayed::"
1079msgstr ""
1081#: bzrlib/
1082msgid ""
1083" -l N display a maximum of N revisions\n"
1084" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1085" -v display a status summary (delta) for each revision\n"
1086" -p display a diff (patch) for each revision\n"
1087" --show-ids display revision-ids (and file-ids), not just revnos"
1088msgstr ""
1090#: bzrlib/
1091msgid ""
1092" Note that the default number of levels to display is a function of the\n"
1093" log format. If the -n option is not used, the standard log formats show\n"
1094" just the top level (mainline)."
1095msgstr ""
1097#: bzrlib/
1098msgid ""
1099" Status summaries are shown using status flags like A, M, etc. To see\n"
1100" the changes explained using words like ``added`` and ``modified``\n"
1101" instead, use the -vv option."
1102msgstr ""
1104#: bzrlib/
1105msgid ":Ordering control:"
1106msgstr ""
1108#: bzrlib/
1109msgid ""
1110" To display revisions from oldest to newest, use the --forward option.\n"
1111" In most cases, using this option will have little impact on the total\n"
1112" time taken to produce a log, though --forward does not incrementally\n"
1113" display revisions like --reverse does when it can."
1114msgstr ""
1116#: bzrlib/
1117msgid ":Revision filtering:"
1118msgstr ""
1120#: bzrlib/
1121msgid ""
1122" The -r option can be used to specify what revision or range of revisions\n"
1123" to filter against. The various forms are shown below::"
1124msgstr ""
1126#: bzrlib/
1127msgid ""
1128" -rX display revision X\n"
1129" -rX.. display revision X and later\n"
1130" -r..Y display up to and including revision Y\n"
1131" -rX..Y display from X to Y inclusive"
1132msgstr ""
1134#: bzrlib/
1135msgid ""
1136" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1137" Some common examples are given below::"
1138msgstr ""
1140#: bzrlib/
1141msgid ""
1142" -r-1 show just the tip\n"
1143" -r-10.. show the last 10 mainline revisions\n"
1144" -rsubmit:.. show what's new on this branch\n"
1145" -rancestor:path.. show changes since the common ancestor of this\n"
1146" branch and the one at location path\n"
1147" -rdate:yesterday.. show changes since yesterday"
1148msgstr ""
1150#: bzrlib/
1151msgid ""
1152" When logging a range of revisions using -rX..Y, log starts at\n"
1153" revision Y and searches back in history through the primary\n"
1154" (\"left-hand\") parents until it finds X. When logging just the\n"
1155" top level (using -n1), an error is reported if X is not found\n"
1156" along the way. If multi-level logging is used (-n0), X may be\n"
1157" a nested merge revision and the log will be truncated accordingly."
1158msgstr ""
1160#: bzrlib/
1161msgid ":Path filtering:"
1162msgstr ""
1164#: bzrlib/
1165msgid ""
1166" If parameters are given and the first one is not a branch, the log\n"
1167" will be filtered to show only those revisions that changed the\n"
1168" nominated files or directories."
1169msgstr ""
1171#: bzrlib/
1172msgid ""
1173" Filenames are interpreted within their historical context. To log a\n"
1174" deleted file, specify a revision range so that the file existed at\n"
1175" the end or start of the range."
1176msgstr ""
1178#: bzrlib/
1179msgid ""
1180" Historical context is also important when interpreting pathnames of\n"
1181" renamed files/directories. Consider the following example:"
1182msgstr ""
1184#: bzrlib/
1185msgid ""
1186" * revision 1: add tutorial.txt\n"
1187" * revision 2: modify tutorial.txt\n"
1188" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1189msgstr ""
1191#: bzrlib/
1192msgid " In this case:"
1193msgstr ""
1195#: bzrlib/
1196msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1197msgstr ""
1199#: bzrlib/
1200msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1201msgstr ""
1203#: bzrlib/
1204msgid ""
1205" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1206" the original file in revision 2."
1207msgstr ""
1209#: bzrlib/
1210msgid ""
1211" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1212" was no file called guide.txt in revision 2."
1213msgstr ""
1215#: bzrlib/
1216msgid ""
1217" Renames are always followed by log. By design, there is no need to\n"
1218" explicitly ask for this (and no way to stop logging a file back\n"
1219" until it was last renamed)."
1220msgstr ""
1222#: bzrlib/
1223msgid ":Other filtering:"
1224msgstr ""
1226#: bzrlib/
1227msgid ""
1228" The --match option can be used for finding revisions that match a\n"
1229" regular expression in a commit message, committer, author or bug.\n"
1230" Specifying the option several times will match any of the supplied\n"
1231" expressions. --match-author, --match-bugs, --match-committer and\n"
1232" --match-message can be used to only match a specific field."
1233msgstr ""
1235#: bzrlib/
1236msgid ":Tips & tricks:"
1237msgstr ""
1239#: bzrlib/
1240msgid ""
1241" GUI tools and IDEs are often better at exploring history than command\n"
1242" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1243" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1244" Guide <> and\n"
1245" <>. "
1246msgstr ""
1248#: bzrlib/
1249msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1250msgstr ""
1252#: bzrlib/
1253msgid ""
1254" [ALIASES]\n"
1255" tip = log -r-1\n"
1256" top = log -l10 --line\n"
1257" show = log -v -p"
1258msgstr ""
1260#: bzrlib/
1261msgid ""
1262" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1263" will show the last 10 mainline revisions. To see the details of a\n"
1264" particular revision X, ``bzr show -rX``."
1265msgstr ""
1267#: bzrlib/
1268msgid ""
1269" If you are interested in looking deeper into a particular merge X,\n"
1270" use ``bzr log -n0 -rX``."
1271msgstr ""
1273#: bzrlib/
1274msgid ""
1275" ``bzr log -v`` on a branch with lots of history is currently\n"
1276" very slow. A fix for this issue is currently under development.\n"
1277" With or without that fix, it is recommended that a revision range\n"
1278" be given when using the -v option."
1279msgstr ""
1281#: bzrlib/
1282msgid ""
1283" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1284" used to find revisions matching user names, commit messages, etc.\n"
1285" Among other features, this plugin can find all revisions containing\n"
1286" a list of words but not others."
1287msgstr ""
1289#: bzrlib/
1290msgid ""
1291" When exploring non-mainline history on large projects with deep\n"
1292" history, the performance of log can be greatly improved by installing\n"
1293" the historycache plugin. This plugin buffers historical information\n"
1294" trading disk space for faster speed."
1295msgstr ""
1297# help of 'forward' option of 'log' command
1298#: bzrlib/
1299msgid "Show from oldest to newest."
1300msgstr ""
1302# help of 'verbose' option of 'log' command
1303#: bzrlib/
1304msgid "Show files changed in each revision."
1305msgstr ""
1307# help of 'change' option of 'log' command
1308#: bzrlib/
1309msgid "Show just the specified revision. See also \"help revisionspec\"."
1310msgstr ""
1312# help of 'authors' option of 'log' command
1313#: bzrlib/
1314msgid "What names to list as authors - first, all or committer."
1315msgstr ""
1317# title of 'authors' option of 'log' command
1318#: bzrlib/
1319msgid "Authors"
1320msgstr ""
1322# help of 'levels' option of 'log' command
1323#: bzrlib/
1324msgid "Number of levels to display - 0 for all, 1 for flat."
1325msgstr ""
1327# help of 'limit' option of 'log' command
1328#: bzrlib/
1329msgid "Limit the output to the first N revisions."
1330msgstr ""
1332# help of 'show-diff' option of 'log' command
1333#: bzrlib/
1334msgid "Show changes made in each revision as a patch."
1335msgstr ""
1337# help of 'include-merges' option of 'log' command
1338#: bzrlib/
1339msgid "Show merged revisions like --levels 0 does."
1340msgstr ""
1342# help of 'exclude-common-ancestry' option of 'log' command
1343#: bzrlib/
1344msgid ""
1345"Display only the revisions that are not part of both ancestries (require -"
1347msgstr ""
1349# help of 'signatures' option of 'log' command
1350#: bzrlib/
1351msgid "Show digital signature validity"
1352msgstr ""
1354# help of 'match' option of 'log' command
1355#: bzrlib/
1356msgid "Show revisions whose properties match this expression."
1357msgstr ""
1359# help of 'match-message' option of 'log' command
1360#: bzrlib/
1361msgid "Show revisions whose message matches this expression."
1362msgstr ""
1364# help of 'match-committer' option of 'log' command
1365#: bzrlib/
1366msgid "Show revisions whose committer matches this expression."
1367msgstr ""
1369# help of 'match-author' option of 'log' command
1370#: bzrlib/
1371msgid "Show revisions whose authors match this expression."
1372msgstr ""
1374# help of 'match-bugs' option of 'log' command
1375#: bzrlib/
1376msgid "Show revisions whose bugs match this expression."
1377msgstr ""
1379#: bzrlib/
1380msgid ""
1381"List files in a tree.\n"
1382" "
1383msgstr ""
1385# help of 'recursive' option of 'ls' command
1386#: bzrlib/
1387msgid "Recurse into subdirectories."
1388msgstr ""
1390# help of 'from-root' option of 'ls' command
1391#: bzrlib/
1392msgid "Print paths relative to the root of the branch."
1393msgstr ""
1395# help of 'unknown' option of 'ls' command
1396#: bzrlib/
1397msgid "Print unknown files."
1398msgstr ""
1400# help of 'versioned' option of 'ls' command
1401#: bzrlib/
1402msgid "Print versioned files."
1403msgstr ""
1405# help of 'ignored' option of 'ls' command
1406#: bzrlib/
1407msgid "Print ignored files."
1408msgstr ""
1410# help of 'kind' option of 'ls' command
1411#: bzrlib/
1412msgid "List entries of a particular kind: file, directory, symlink."
1413msgstr ""
1415#: bzrlib/
1416msgid "Ignore specified files or patterns."
1417msgstr ""
1419#: bzrlib/
1420msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1421msgstr ""
1423#: bzrlib/
1424msgid ""
1425"If a .bzrignore file does not exist, the ignore command\n"
1426"will create one and add the specified files or patterns to the newly\n"
1427"created file. The ignore command will also automatically add the \n"
1428".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1429"the use of the ignore command will require an explicit add command."
1430msgstr ""
1432#: bzrlib/
1433msgid ""
1434"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1435"After adding, editing or deleting that file either indirectly by\n"
1436"using this command or directly by using an editor, be sure to commit\n"
1438msgstr ""
1440#: bzrlib/
1441msgid ""
1442"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1443"the global ignore file can be found in the application data directory as\n"
1444"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1445"Global ignores are not touched by this command. The global ignore file\n"
1446"can be edited directly using an editor."
1447msgstr ""
1449#: bzrlib/
1450msgid ""
1451"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1452"precedence over regular ignores. Such exceptions are used to specify\n"
1453"files that should be versioned which would otherwise be ignored."
1454msgstr ""
1456#: bzrlib/
1457msgid ""
1458"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1459"precedence over the '!' exception patterns."
1460msgstr ""
1462#: bzrlib/
1463msgid ""
1464":Notes: \n"
1465" \n"
1466"* Ignore patterns containing shell wildcards must be quoted from\n"
1467" the shell on Unix."
1468msgstr ""
1470#: bzrlib/
1471msgid ""
1472"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1473" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1474msgstr ""
1476#: bzrlib/
1477msgid ""
1479" Ignore the top level Makefile::"
1480msgstr ""
1482#: bzrlib/
1483msgid " bzr ignore ./Makefile"
1484msgstr ""
1486#: bzrlib/
1487msgid " Ignore .class files in all directories...::"
1488msgstr ""
1490#: bzrlib/
1491msgid " bzr ignore \"*.class\""
1492msgstr ""
1494#: bzrlib/
1495msgid " ...but do not ignore \"special.class\"::"
1496msgstr ""
1498#: bzrlib/
1499msgid " bzr ignore \"!special.class\""
1500msgstr ""
1502#: bzrlib/
1503msgid " Ignore files whose name begins with the \"#\" character::"
1504msgstr ""
1506#: bzrlib/
1507msgid " bzr ignore \"RE:^#\""
1508msgstr ""
1510#: bzrlib/
1511msgid " Ignore .o files under the lib directory::"
1512msgstr ""
1514#: bzrlib/
1515msgid " bzr ignore \"lib/**/*.o\""
1516msgstr ""
1518#: bzrlib/
1519msgid " bzr ignore \"RE:lib/.*\\.o\""
1520msgstr ""
1522#: bzrlib/
1523msgid " Ignore everything but the \"debian\" toplevel directory::"
1524msgstr ""
1526#: bzrlib/
1527msgid ""
1528" bzr ignore \"RE:(?!debian/).*\"\n"
1529" \n"
1530" Ignore everything except the \"local\" toplevel directory,\n"
1531" but always ignore autosave files ending in ~, even under local/::\n"
1532" \n"
1533" bzr ignore \"*\"\n"
1534" bzr ignore \"!./local\"\n"
1535" bzr ignore \"!!*~\""
1536msgstr ""
1538# help of 'default-rules' option of 'ignore' command
1539#: bzrlib/
1540msgid "Display the default ignore rules that bzr uses."
1541msgstr ""
1543#: bzrlib/
1544msgid "List ignored files and the patterns that matched them."
1545msgstr ""
1547#: bzrlib/
1548msgid ""
1549"List all the ignored files and the ignore pattern that caused the file to\n"
1550"be ignored."
1551msgstr ""
1553#: bzrlib/
1554msgid "Alternatively, to list just the files::"
1555msgstr ""
1557#: bzrlib/
1558msgid " bzr ls --ignored"
1559msgstr ""
1561#: bzrlib/
1562msgid "Export current or past revision to a destination directory or archive."
1563msgstr ""
1565#: bzrlib/
1566msgid "If no revision is specified this exports the last committed revision."
1567msgstr ""
1569#: bzrlib/
1570msgid ""
1571"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1572"given, try to find the format with the extension. If no extension\n"
1573"is found exports to a directory (equivalent to --format=dir)."
1574msgstr ""
1576#: bzrlib/
1577msgid ""
1578"If root is supplied, it will be used as the root directory inside\n"
1579"container formats (tar, zip, etc). If it is not supplied it will default\n"
1580"to the exported filename. The root option has no effect for 'dir' format."
1581msgstr ""
1583#: bzrlib/
1584msgid ""
1585"If branch is omitted then the branch containing the current working\n"
1586"directory will be used."
1587msgstr ""
1589#: bzrlib/
1590msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1591msgstr ""
1593#: bzrlib/
1594msgid ""
1595" ================= =========================\n"
1596" Supported formats Autodetected by extension\n"
1597" ================= =========================\n"
1598" dir (none)\n"
1599" tar .tar\n"
1600" tbz2 .tar.bz2, .tbz2\n"
1601" tgz .tar.gz, .tgz\n"
1602" zip .zip\n"
1603" ================= ========================="
1604msgstr ""
1606# help of 'format' option of 'export' command
1607#: bzrlib/
1608msgid "Type of file to export to."
1609msgstr ""
1611# help of 'filters' option of 'export' command
1612#: bzrlib/
1613msgid "Apply content filters to export the convenient form."
1614msgstr ""
1616# help of 'root' option of 'export' command
1617#: bzrlib/
1618msgid "Name of the root directory inside the exported file."
1619msgstr ""
1621# help of 'per-file-timestamps' option of 'export' command
1622#: bzrlib/
1623msgid ""
1624"Set modification time of files to that of the last revision in which it was "
1626msgstr ""
1628#: bzrlib/
1629msgid "Write the contents of a file as of a given revision to standard output."
1630msgstr ""
1632#: bzrlib/
1633msgid "If no revision is nominated, the last revision is used."
1634msgstr ""
1636#: bzrlib/
1637msgid ""
1638"Note: Take care to redirect standard output when using this command on a\n"
1639"binary file."
1640msgstr ""
1642# help of 'filters' option of 'cat' command
1643#: bzrlib/
1644msgid "Apply content filters to display the convenience form."
1645msgstr ""
1647#: bzrlib/
1648msgid "Commit changes into a new revision."
1649msgstr ""
1651#: bzrlib/
1652msgid ""
1653"An explanatory message needs to be given for each commit. This is\n"
1654"often done by using the --message option (getting the message from the\n"
1655"command line) or by using the --file option (getting the message from\n"
1656"a file). If neither of these options is given, an editor is opened for\n"
1657"the user to enter the message. To see the changed files in the\n"
1658"boilerplate text loaded into the editor, use the --show-diff option."
1659msgstr ""
1661#: bzrlib/
1662msgid ""
1663"By default, the entire tree is committed and the person doing the\n"
1664"commit is assumed to be the author. These defaults can be overridden\n"
1665"as explained below."
1666msgstr ""
1668#: bzrlib/
1669msgid ":Selective commits:"
1670msgstr ""
1672#: bzrlib/
1673msgid ""
1674" If selected files are specified, only changes to those files are\n"
1675" committed. If a directory is specified then the directory and\n"
1676" everything within it is committed."
1677msgstr ""
1679#: bzrlib/
1680msgid ""
1681" When excludes are given, they take precedence over selected files.\n"
1682" For example, to commit only changes within foo, but not changes\n"
1683" within foo/bar::"
1684msgstr ""
1686#: bzrlib/
1687msgid " bzr commit foo -x foo/bar"
1688msgstr ""
1690#: bzrlib/
1691msgid " A selective commit after a merge is not yet supported."
1692msgstr ""
1694#: bzrlib/
1695msgid ":Custom authors:"
1696msgstr ""
1698#: bzrlib/
1699msgid ""
1700" If the author of the change is not the same person as the committer,\n"
1701" you can specify the author's name using the --author option. The\n"
1702" name should be in the same format as a committer-id, e.g.\n"
1703" \"John Doe <>\". If there is more than one author of\n"
1704" the change you can specify the option multiple times, once for each\n"
1705" author."
1706msgstr ""
1708#: bzrlib/
1709msgid ":Checks:"
1710msgstr ""
1712#: bzrlib/
1713msgid ""
1714" A common mistake is to forget to add a new file or directory before\n"
1715" running the commit command. The --strict option checks for unknown\n"
1716" files and aborts the commit if any are found. More advanced pre-commit\n"
1717" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
1718" for details."
1719msgstr ""
1721#: bzrlib/
1722msgid ":Things to note:"
1723msgstr ""
1725#: bzrlib/
1726msgid ""
1727" If you accidentially commit the wrong changes or make a spelling\n"
1728" mistake in the commit message say, you can use the uncommit command\n"
1729" to undo it. See ``bzr help uncommit`` for details."
1730msgstr ""
1732#: bzrlib/
1733msgid ""
1734" Hooks can also be configured to run after a commit. This allows you\n"
1735" to trigger updates to external systems like bug trackers. The --fixes\n"
1736" option can be used to record the association between a revision and\n"
1737" one or more bugs. See ``bzr help bugs`` for details."
1738msgstr ""
1740# help of 'exclude' option of 'commit' command
1741#: bzrlib/
1742msgid "Do not consider changes made to a given path."
1743msgstr ""
1745# help of 'message' option of 'commit' command
1746#: bzrlib/
1747msgid "Description of the new revision."
1748msgstr ""
1750# help of 'unchanged' option of 'commit' command
1751#: bzrlib/
1752msgid "Commit even if nothing has changed."
1753msgstr ""
1755# help of 'file' option of 'commit' command
1756#: bzrlib/
1757msgid "Take commit message from this file."
1758msgstr ""
1760# help of 'strict' option of 'commit' command
1761#: bzrlib/
1762msgid "Refuse to commit if there are unknown files in the working tree."
1763msgstr ""
1765# help of 'commit-time' option of 'commit' command
1766#: bzrlib/
1767msgid ""
1768"Manually set a commit time using commit date format, e.g. '2009-10-10 "
1769"08:00:00 +0100'."
1770msgstr ""
1772# help of 'fixes' option of 'commit' command
1773#: bzrlib/
1774msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
1775msgstr ""
1777# help of 'author' option of 'commit' command
1778#: bzrlib/
1779msgid "Set the author's name, if it's different from the committer."
1780msgstr ""
1782# help of 'local' option of 'commit' command
1783#: bzrlib/
1784msgid ""
1785"Perform a local commit in a bound branch. Local commits are not pushed to "
1786"the master branch until a normal commit is performed."
1787msgstr ""
1789# help of 'show-diff' option of 'commit' command
1790#: bzrlib/
1791msgid ""
1792"When no message is supplied, show the diff along with the status summary in "
1793"the message editor."
1794msgstr ""
1796# help of 'lossy' option of 'commit' command
1797#: bzrlib/
1798msgid ""
1799"When committing to a foreign version control system do not push data that "
1800"can not be natively represented."
1801msgstr ""
1803#: bzrlib/
1804msgid ""
1805"Validate working tree structure, branch consistency and repository history."
1806msgstr ""
1808#: bzrlib/
1809msgid ""
1810"This command checks various invariants about branch and repository storage\n"
1811"to detect data corruption or bzr bugs."
1812msgstr ""
1814#: bzrlib/
1815msgid ""
1816"The working tree and branch checks will only give output if a problem is\n"
1817"detected. The output fields of the repository check are:"
1818msgstr ""
1820#: bzrlib/
1821msgid ""
1823" This is just the number of revisions checked. It doesn't\n"
1824" indicate a problem."
1825msgstr ""
1827#: bzrlib/
1828msgid ""
1830" This is just the number of versionedfiles checked. It\n"
1831" doesn't indicate a problem."
1832msgstr ""
1834#: bzrlib/
1835msgid ""
1836"unreferenced ancestors\n"
1837" Texts that are ancestors of other texts, but\n"
1838" are not properly referenced by the revision ancestry. This is a\n"
1839" subtle problem that Bazaar can work around."
1840msgstr ""
1842#: bzrlib/
1843msgid ""
1844"unique file texts\n"
1845" This is the total number of unique file contents\n"
1846" seen in the checked revisions. It does not indicate a problem."
1847msgstr ""
1849#: bzrlib/
1850msgid ""
1851"repeated file texts\n"
1852" This is the total number of repeated texts seen\n"
1853" in the checked revisions. Texts can be repeated when their file\n"
1854" entries are modified, but the file contents are not. It does not\n"
1855" indicate a problem."
1856msgstr ""
1858#: bzrlib/
1859msgid ""
1860"If no restrictions are specified, all Bazaar data that is found at the "
1862"location will be checked."
1863msgstr ""
1865#: bzrlib/
1866msgid ":Examples:"
1867msgstr ""
1869#: bzrlib/
1870msgid " Check the tree and branch at 'foo'::"
1871msgstr ""
1873#: bzrlib/
1874msgid " bzr check --tree --branch foo"
1875msgstr ""
1877#: bzrlib/
1878msgid " Check only the repository at 'bar'::"
1879msgstr ""
1881#: bzrlib/
1882msgid " bzr check --repo bar"
1883msgstr ""
1885#: bzrlib/
1886msgid " Check everything at 'baz'::"
1887msgstr ""
1889#: bzrlib/
1890msgid " bzr check baz"
1891msgstr ""
1893# help of 'branch' option of 'check' command
1894#: bzrlib/
1895msgid "Check the branch related to the current directory."
1896msgstr ""
1898# help of 'repo' option of 'check' command
1899#: bzrlib/
1900msgid "Check the repository related to the current directory."
1901msgstr ""
1903# help of 'tree' option of 'check' command
1904#: bzrlib/
1905msgid "Check the working tree related to the current directory."
1906msgstr ""
1908#: bzrlib/
1909msgid "Upgrade a repository, branch or working tree to a newer format."
1910msgstr ""
1912#: bzrlib/
1913msgid ""
1914"When the default format has changed after a major new release of\n"
1915"Bazaar, you may be informed during certain operations that you\n"
1916"should upgrade. Upgrading to a newer format may improve performance\n"
1917"or make new features available. It may however limit interoperability\n"
1918"with older repositories or with older versions of Bazaar."
1919msgstr ""
1921#: bzrlib/
1922msgid ""
1923"If you wish to upgrade to a particular format rather than the\n"
1924"current default, that can be specified using the --format option.\n"
1925"As a consequence, you can use the upgrade command this way to\n"
1926"\"downgrade\" to an earlier format, though some conversions are\n"
1927"a one way process (e.g. changing from the 1.x default to the\n"
1928"2.x default) so downgrading is not always possible."
1929msgstr ""
1931#: bzrlib/
1932msgid ""
1933"A backup.bzr.~#~ directory is created at the start of the conversion\n"
1934"process (where # is a number). By default, this is left there on\n"
1935"completion. If the conversion fails, delete the new .bzr directory\n"
1936"and rename this one back in its place. Use the --clean option to ask\n"
1937"for the backup.bzr directory to be removed on successful conversion.\n"
1938"Alternatively, you can delete it by hand if everything looks good\n"
1940msgstr ""
1942#: bzrlib/
1943msgid ""
1944"If the location given is a shared repository, dependent branches\n"
1945"are also converted provided the repository converts successfully.\n"
1946"If the conversion of a branch fails, remaining branches are still\n"
1948msgstr ""
1950#: bzrlib/
1951msgid ""
1952"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
1954msgstr ""
1956# help of 'format' option of 'upgrade' command
1957#: bzrlib/
1958msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
1959msgstr ""
1961# title of 'format' option of 'init' command
1962#: bzrlib/
1963msgid "Branch format"
1964msgstr ""
1966# help of 'clean' option of 'upgrade' command
1967#: bzrlib/
1968msgid "Remove the backup.bzr directory if successful."
1969msgstr ""
1971#: bzrlib/
1972msgid "Show or set bzr user id."
1973msgstr ""
1975#: bzrlib/
1976msgid ""
1978" Show the email of the current user::"
1979msgstr ""
1981#: bzrlib/
1982msgid " bzr whoami --email"
1983msgstr ""
1985#: bzrlib/
1986msgid " Set the current user::"
1987msgstr ""
1989#: bzrlib/
1990msgid " bzr whoami \"Frank Chu <>\""
1991msgstr ""
1993# help of 'email' option of 'whoami' command
1994#: bzrlib/
1995msgid "Display email address only."
1996msgstr ""
1998# help of 'branch' option of 'whoami' command
1999#: bzrlib/
2000msgid "Set identity for the current branch instead of globally."
2001msgstr ""
2003#: bzrlib/
2004msgid "Print or set the branch nickname."
2005msgstr ""
2007#: bzrlib/
2008msgid ""
2009"If unset, the tree root directory name is used as the nickname.\n"
2010"To print the current nickname, execute with no argument."
2011msgstr ""
2013#: bzrlib/
2014msgid ""
2015"Bound branches use the nickname of its master branch unless it is set\n"
2017msgstr ""
2019#: bzrlib/
2020msgid "Set/unset and display aliases."
2021msgstr ""
2023#: bzrlib/
2024msgid ""
2026" Show the current aliases::"
2027msgstr ""
2029#: bzrlib/
2030msgid " bzr alias"
2031msgstr ""
2033#: bzrlib/
2034msgid " Show the alias specified for 'll'::"
2035msgstr ""
2037#: bzrlib/
2038msgid " bzr alias ll"
2039msgstr ""
2041#: bzrlib/
2042msgid " Set an alias for 'll'::"
2043msgstr ""
2045#: bzrlib/
2046msgid " bzr alias ll=\"log --line -r-10..-1\""
2047msgstr ""
2049#: bzrlib/
2050msgid " To remove an alias for 'll'::"
2051msgstr ""
2053#: bzrlib/
2054msgid " bzr alias --remove ll"
2055msgstr ""
2057# help of 'remove' option of 'alias' command
2058#: bzrlib/
2059msgid "Remove the alias."
2060msgstr ""
2062#: bzrlib/
2063msgid "Show version of bzr."
2064msgstr ""
2066# help of 'short' option of 'version' command
2067#: bzrlib/
2068msgid "Print just the version number."
2069msgstr ""
2071#: bzrlib/
2072msgid "Perform a three-way merge."
2073msgstr ""
2075#: bzrlib/
2076msgid ""
2077"The source of the merge can be specified either in the form of a branch,\n"
2078"or in the form of a path to a file containing a merge directive generated\n"
2079"with bzr send. If neither is specified, the default is the upstream branch\n"
2080"or the branch most recently merged using --remember. The source of the\n"
2081"merge may also be specified in the form of a path to a file in another\n"
2082"branch: in this case, only the modifications to that file are merged into\n"
2083"the current working tree."
2084msgstr ""
2086#: bzrlib/
2087msgid ""
2088"When merging from a branch, by default bzr will try to merge in all new\n"
2089"work from the other branch, automatically determining an appropriate base\n"
2090"revision. If this fails, you may need to give an explicit base."
2091msgstr ""
2093#: bzrlib/
2094msgid ""
2095"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2096"try to merge in all new work up to and including revision OTHER."
2097msgstr ""
2099#: bzrlib/
2100msgid ""
2101"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2102"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2103"causes some revisions to be skipped, i.e. if the destination branch does\n"
2104"not already contain revision BASE, such a merge is commonly referred to as\n"
2105"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2106"cherrypicks. The changes look like a normal commit, and the history of the\n"
2107"changes from the other branch is not stored in the commit."
2108msgstr ""
2110#: bzrlib/
2111msgid "Revision numbers are always relative to the source branch."
2112msgstr ""
2114#: bzrlib/
2115msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2116msgstr ""
2118#: bzrlib/
2119msgid ""
2120"If there is no default branch set, the first merge will set it (use\n"
2121"--no-remember to avoid settting it). After that, you can omit the branch\n"
2122"to use the default. To change the default, use --remember. The value will\n"
2123"only be saved if the remote location can be accessed."
2124msgstr ""
2126#: bzrlib/
2127msgid ""
2128"The results of the merge are placed into the destination working\n"
2129"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2130"committed to record the result of the merge."
2131msgstr ""
2133#: bzrlib/
2134msgid ""
2135"merge refuses to run if there are any uncommitted changes, unless\n"
2136"--force is given. If --force is given, then the changes from the source \n"
2137"will be merged with the current working tree, including any uncommitted\n"
2138"changes in the tree. The --force option can also be used to create a\n"
2139"merge revision which has more than two parents."
2140msgstr ""
2142#: bzrlib/
2143msgid ""
2144"If one would like to merge changes from the working tree of the other\n"
2145"branch without merging any committed revisions, the --uncommitted option\n"
2146"can be given."
2147msgstr ""
2149#: bzrlib/
2150msgid ""
2151"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2152"you to apply each diff hunk and file change, similar to \"shelve\"."
2153msgstr ""
2155#: bzrlib/
2156msgid ""
2158" To merge all new revisions from"
2159msgstr ""
2161#: bzrlib/
2162msgid " bzr merge ../"
2163msgstr ""
2165#: bzrlib/
2166msgid " To merge changes up to and including revision 82 from"
2167msgstr ""
2169#: bzrlib/
2170msgid " bzr merge -r 82 ../"
2171msgstr ""
2173#: bzrlib/
2174msgid " To merge the changes introduced by 82, without previous changes::"
2175msgstr ""
2177#: bzrlib/
2178msgid " bzr merge -r 81..82 ../"
2179msgstr ""
2181#: bzrlib/
2182msgid " To apply a merge directive contained in /tmp/merge::"
2183msgstr ""
2185#: bzrlib/
2186msgid " bzr merge /tmp/merge"
2187msgstr ""
2189#: bzrlib/
2190msgid ""
2191" To create a merge revision with three parents from two branches\n"
2192" feature1a and feature1b:"
2193msgstr ""
2195#: bzrlib/
2196msgid ""
2197" bzr merge ../feature1a\n"
2198" bzr merge ../feature1b --force\n"
2199" bzr commit -m 'revision with three parents'"
2200msgstr ""
2202# help of 'force' option of 'merge' command
2203#: bzrlib/
2204msgid "Merge even if the destination tree has uncommitted changes."
2205msgstr ""
2207# help of 'uncommitted' option of 'merge' command
2208#: bzrlib/
2209msgid ""
2210"Apply uncommitted changes from a working copy, instead of branch changes."
2211msgstr ""
2213# help of 'pull' option of 'merge' command
2214#: bzrlib/
2215msgid ""
2216"If the destination is already completely merged into the source, pull from "
2217"the source rather than merging. When this happens, you do not need to "
2218"commit the result."
2219msgstr ""
2221# help of 'directory' option of 'merge' command
2222#: bzrlib/
2223msgid ""
2224"Branch to merge into, rather than the one containing the working directory."
2225msgstr ""
2227# help of 'preview' option of 'merge' command
2228#: bzrlib/
2229msgid "Instead of merging, show a diff of the merge."
2230msgstr ""
2232# help of 'interactive' option of 'merge' command
2233#: bzrlib/
2234msgid "Select changes interactively."
2235msgstr ""
2237#: bzrlib/
2238msgid "Redo a merge."
2239msgstr ""
2241#: bzrlib/
2242msgid ""
2243"Use this if you want to try a different merge technique while resolving\n"
2244"conflicts. Some merge techniques are better than others, and remerge\n"
2245"lets you try different ones on different files."
2246msgstr ""
2248#: bzrlib/
2249msgid ""
2250"The options for remerge have the same meaning and defaults as the ones for\n"
2251"merge. The difference is that remerge can (only) be run when there is a\n"
2252"pending merge, and it lets you specify particular files."
2253msgstr ""
2255#: bzrlib/
2256msgid ""
2258" Re-do the merge of all conflicted files, and show the base text in\n"
2259" conflict regions, in addition to the usual THIS and OTHER texts::"
2260msgstr ""
2262#: bzrlib/
2263msgid " bzr remerge --show-base"
2264msgstr ""
2266#: bzrlib/
2267msgid ""
2268" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2269" additional processing to reduce the size of conflict regions::"
2270msgstr ""
2272#: bzrlib/
2273msgid " bzr remerge --merge-type weave --reprocess foobar"
2274msgstr ""
2276# help of 'show-base' option of 'merge' command
2277#: bzrlib/
2278msgid "Show base revision text in conflicts."
2279msgstr ""
2281#: bzrlib/
2282msgid "Revert files to a previous revision."
2283msgstr ""
2285#: bzrlib/
2286msgid ""
2287"Giving a list of files will revert only those files. Otherwise, all files\n"
2288"will be reverted. If the revision is not specified with '--revision', the\n"
2289"last committed revision is used."
2290msgstr ""
2292#: bzrlib/
2293msgid ""
2294"To remove only some changes, without reverting to a prior version, use\n"
2295"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2296"will remove the changes introduced by the second last commit (-2), without\n"
2297"affecting the changes introduced by the last commit (-1). To remove\n"
2298"certain changes on a hunk-by-hunk basis, see the shelve command."
2299msgstr ""
2301#: bzrlib/
2302msgid ""
2303"By default, any files that have been manually changed will be backed up\n"
2304"first. (Files changed only by merge are not backed up.) Backup files have\n"
2305"'.~#~' appended to their name, where # is a number."
2306msgstr ""
2308#: bzrlib/
2309msgid ""
2310"When you provide files, you can use their current pathname or the pathname\n"
2311"from the target revision. So you can use revert to \"undelete\" a file by\n"
2312"name. If you name a directory, all the contents of that directory will be\n"
2314msgstr ""
2316#: bzrlib/
2317msgid ""
2318"If you have newly added files since the target revision, they will be\n"
2319"removed. If the files to be removed have been changed, backups will be\n"
2320"created as above. Directories containing unknown files will not be\n"
2322msgstr ""
2324#: bzrlib/
2325msgid ""
2326"The working tree contains a list of revisions that have been merged but\n"
2327"not yet committed. These revisions will be included as additional parents\n"
2328"of the next commit. Normally, using revert clears that list as well as\n"
2329"reverting the files. If any files are specified, revert leaves the list\n"
2330"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2331".`` in the tree root to revert all files but keep the recorded merges,\n"
2332"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2333"reverting any files."
2334msgstr ""
2336#: bzrlib/
2337msgid ""
2338"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2339"changes from a branch in a single revision. To do this, perform the merge\n"
2340"as desired. Then doing revert with the \"--forget-merges\" option will "
2342"the content of the tree as it was, but it will clear the list of pending\n"
2343"merges. The next commit will then contain all of the changes that are\n"
2344"present in the other branch, but without any other parent revisions.\n"
2345"Because this technique forgets where these changes originated, it may\n"
2346"cause additional conflicts on later merges involving the same source and\n"
2347"target branches."
2348msgstr ""
2350# help of 'no-backup' option of 'revert' command
2351#: bzrlib/
2352msgid "Do not save backups of reverted files."
2353msgstr ""
2355# help of 'forget-merges' option of 'revert' command
2356#: bzrlib/
2357msgid "Remove pending merge marker, without changing any files."
2358msgstr ""
2360#: bzrlib/
2361msgid ""
2362"Show help on a command or other topic.\n"
2363" "
2364msgstr ""
2366# help of 'long' option of 'help' command
2367#: bzrlib/
2368msgid "Show help on all commands."
2369msgstr ""
2371#: bzrlib/
2372msgid "Show unmerged/unpulled revisions between two branches."
2373msgstr ""
2375#: bzrlib/
2376msgid "OTHER_BRANCH may be local or remote."
2377msgstr ""
2379#: bzrlib/
2380msgid ""
2381"To filter on a range of revisions, you can use the command -r begin..end\n"
2382"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2383"also valid.\n"
2384" \n"
2385":Exit values:\n"
2386" 1 - some missing revisions\n"
2387" 0 - no missing revisions"
2388msgstr ""
2390#: bzrlib/
2391msgid ""
2392" Determine the missing revisions between this and the branch at the\n"
2393" remembered pull location::"
2394msgstr ""
2396#: bzrlib/
2397msgid " bzr missing"
2398msgstr ""
2400#: bzrlib/
2401msgid " Determine the missing revisions between this and another branch::"
2402msgstr ""
2404#: bzrlib/
2405msgid " bzr missing http://server/branch"
2406msgstr ""
2408#: bzrlib/
2409msgid ""
2410" Determine the missing revisions up to a specific revision on the other\n"
2411" branch::"
2412msgstr ""
2414#: bzrlib/
2415msgid " bzr missing -r ..-10"
2416msgstr ""
2418#: bzrlib/
2419msgid ""
2420" Determine the missing revisions up to a specific revision on this\n"
2421" branch::"
2422msgstr ""
2424#: bzrlib/
2425msgid " bzr missing --my-revision ..-10"
2426msgstr ""
2428# help of 'reverse' option of 'missing' command
2429#: bzrlib/
2430msgid "Reverse the order of revisions."
2431msgstr ""
2433# help of 'mine-only' option of 'missing' command
2434#: bzrlib/
2435msgid "Display changes in the local branch only."
2436msgstr ""
2438# help of 'this' option of 'missing' command
2439#: bzrlib/
2440msgid "Same as --mine-only."
2441msgstr ""
2443# help of 'theirs-only' option of 'missing' command
2444#: bzrlib/
2445msgid "Display changes in the remote branch only."
2446msgstr ""
2448# help of 'other' option of 'missing' command
2449#: bzrlib/
2450msgid "Same as --theirs-only."
2451msgstr ""
2453# help of 'revision' option of 'missing' command
2454#: bzrlib/
2455msgid ""
2456"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2458msgstr ""
2460# help of 'my-revision' option of 'missing' command
2461#: bzrlib/
2462msgid ""
2463"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2465msgstr ""
2467# help of 'include-merges' option of 'missing' command
2468#: bzrlib/
2469msgid "Show all revisions in addition to the mainline ones."
2470msgstr ""
2472#: bzrlib/
2473msgid "Compress the data within a repository."
2474msgstr ""
2476#: bzrlib/
2477msgid ""
2478"This operation compresses the data within a bazaar repository. As\n"
2479"bazaar supports automatic packing of repository, this operation is\n"
2480"normally not required to be done manually."
2481msgstr ""
2483#: bzrlib/
2484msgid ""
2485"During the pack operation, bazaar takes a backup of existing repository\n"
2486"data, i.e. pack files. This backup is eventually removed by bazaar\n"
2487"automatically when it is safe to do so. To save disk space by removing\n"
2488"the backed up pack files, the --clean-obsolete-packs option may be\n"
2490msgstr ""
2492#: bzrlib/
2493msgid ""
2494"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
2495"during or immediately after repacking, you may be left with a state\n"
2496"where the deletion has been written to disk but the new packs have not\n"
2497"been. In this case the repository may be unusable."
2498msgstr ""
2500# help of 'clean-obsolete-packs' option of 'pack' command
2501#: bzrlib/
2502msgid "Delete obsolete packs to save disk space."
2503msgstr ""
2505#: bzrlib/
2506msgid "List the installed plugins."
2507msgstr ""
2509#: bzrlib/
2510msgid ""
2511"This command displays the list of installed plugins including\n"
2512"version of plugin and a short description of each."
2513msgstr ""
2515#: bzrlib/
2516msgid "--verbose shows the path where each plugin is located."
2517msgstr ""
2519#: bzrlib/
2520msgid ""
2521"A plugin is an external component for Bazaar that extends the\n"
2522"revision control system, by adding or replacing code in Bazaar.\n"
2523"Plugins can do a variety of things, including overriding commands,\n"
2524"adding new commands, providing additional network transports and\n"
2525"customizing log output."
2526msgstr ""
2528#: bzrlib/
2529msgid ""
2530"See the Bazaar Plugin Guide <>\n"
2531"for further information on plugins including where to find them and how to\n"
2532"install them. Instructions are also provided there on how to write new\n"
2533"plugins using the Python programming language."
2534msgstr ""
2536#: bzrlib/
2537msgid "Show testament (signing-form) of a revision."
2538msgstr ""
2540# help of 'long' option of 'testament' command
2541#: bzrlib/
2542msgid "Produce long-format testament."
2543msgstr ""
2545# help of 'strict' option of 'testament' command
2546#: bzrlib/
2547msgid "Produce a strict-format testament."
2548msgstr ""
2550#: bzrlib/
2551msgid "Show the origin of each line in a file."
2552msgstr ""
2554#: bzrlib/
2555msgid ""
2556"This prints out the given file with an annotation on the left side\n"
2557"indicating which revision, author and date introduced the change."
2558msgstr ""
2560#: bzrlib/
2561msgid ""
2562"If the origin is the same for a run of consecutive lines, it is\n"
2563"shown only at the top, unless the --all option is given."
2564msgstr ""
2566# help of 'all' option of 'annotate' command
2567#: bzrlib/
2568msgid "Show annotations on all lines."
2569msgstr ""
2571# help of 'long' option of 'annotate' command
2572#: bzrlib/
2573msgid "Show commit date in annotations."
2574msgstr ""
2576#: bzrlib/
2577msgid ""
2578"Convert the current branch into a checkout of the supplied branch.\n"
2579"If no branch is supplied, rebind to the last bound location."
2580msgstr ""
2582#: bzrlib/
2583msgid ""
2584"Once converted into a checkout, commits must succeed on the master branch\n"
2585"before they will be applied to the local branch."
2586msgstr ""
2588#: bzrlib/
2589msgid ""
2590"Bound branches use the nickname of its master branch unless it is set\n"
2591"locally, in which case binding will update the local nickname to be\n"
2592"that of the master."
2593msgstr ""
2595#: bzrlib/
2596msgid "Convert the current checkout into a regular branch."
2597msgstr ""
2599#: bzrlib/
2600msgid ""
2601"After unbinding, the local branch is considered independent and subsequent\n"
2602"commits will be local only."
2603msgstr ""
2605#: bzrlib/
2606msgid "Remove the last committed revision."
2607msgstr ""
2609#: bzrlib/
2610msgid ""
2611"--verbose will print out what is being removed.\n"
2612"--dry-run will go through all the motions, but not actually\n"
2613"remove anything."
2614msgstr ""
2616#: bzrlib/
2617msgid ""
2618"If --revision is specified, uncommit revisions to leave the branch at the\n"
2619"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
2620"branch at revision 15."
2621msgstr ""
2623#: bzrlib/
2624msgid ""
2625"Uncommit leaves the working tree ready for a new commit. The only change\n"
2626"it may make is to restore any pending merges that were present before\n"
2627"the commit."
2628msgstr ""
2630# help of 'dry-run' option of 'uncommit' command
2631#: bzrlib/
2632msgid "Don't actually make changes."
2633msgstr ""
2635# help of 'force' option of 'uncommit' command
2636#: bzrlib/
2637msgid "Say yes to all questions."
2638msgstr ""
2640# help of 'local' option of 'uncommit' command
2641#: bzrlib/
2642msgid "Only remove the commits from the local branch when in a checkout."
2643msgstr ""
2645#: bzrlib/
2646msgid "Break a dead lock."
2647msgstr ""
2649#: bzrlib/
2650msgid ""
2651"This command breaks a lock on a repository, branch, working directory or\n"
2652"config file."
2653msgstr ""
2655#: bzrlib/
2656msgid ""
2657"CAUTION: Locks should only be broken when you are sure that the process\n"
2658"holding the lock has been stopped."
2659msgstr ""
2661#: bzrlib/
2662msgid ""
2663"You can get information on what locks are open via the 'bzr info\n"
2664"[location]' command."
2665msgstr ""
2667#: bzrlib/
2668msgid ""
2670" bzr break-lock\n"
2671" bzr break-lock bzr+ssh://\n"
2672" bzr break-lock --conf ~/.bazaar"
2673msgstr ""
2675# help of 'config' option of 'break-lock' command
2676#: bzrlib/
2677msgid "LOCATION is the directory where the config lock is."
2678msgstr ""
2680# help of 'force' option of 'break-lock' command
2681#: bzrlib/
2682msgid "Do not ask for confirmation before breaking the lock."
2683msgstr ""
2685#: bzrlib/
2686msgid "Run the bzr server."
2687msgstr ""
2689# help of 'inet' option of 'serve' command
2690#: bzrlib/
2691msgid "Serve on stdin/out for use from inetd or sshd."
2692msgstr ""
2694# title of 'protocol' option of 'serve' command
2695#: bzrlib/
2696msgid "protocol"
2697msgstr ""
2699# help of 'protocol' option of 'serve' command
2700#: bzrlib/
2701msgid "Protocol to serve."
2702msgstr ""
2704# help of 'port' option of 'serve' command
2705#: bzrlib/
2706msgid ""
2707"Listen for connections on nominated port of the form [hostname:]portnumber. "
2708"Passing 0 as the port number will result in a dynamically allocated port. "
2709"The default port depends on the protocol."
2710msgstr ""
2712# help of 'directory' option of 'serve' command
2713#: bzrlib/
2714msgid "Serve contents of this directory."
2715msgstr ""
2717# help of 'allow-writes' option of 'serve' command
2718#: bzrlib/
2719msgid ""
2720"By default the server is a readonly server. Supplying --allow-writes "
2721"enables write access to the contents of the served directory and below. "
2722"Note that ``bzr serve`` does not perform authentication, so unless some form "
2723"of external authentication is arranged supplying this option leads to global "
2724"uncontrolled write access to your file system."
2725msgstr ""
2727#: bzrlib/
2728msgid "Combine a tree into its containing tree."
2729msgstr ""
2731#: bzrlib/
2732msgid "This command requires the target tree to be in a rich-root format."
2733msgstr ""
2735#: bzrlib/
2736msgid ""
2737"The TREE argument should be an independent tree, inside another tree, but\n"
2738"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
2739"running \"bzr branch\" with the target inside a tree.)"
2740msgstr ""
2742#: bzrlib/
2743msgid ""
2744"The result is a combined tree, with the subtree no longer an independent\n"
2745"part. This is marked as a merge of the subtree into the containing tree,\n"
2746"and all history is preserved."
2747msgstr ""
2749#: bzrlib/
2750msgid "Split a subdirectory of a tree into a separate tree."
2751msgstr ""
2753#: bzrlib/
2754msgid ""
2755"This command will produce a target tree in a format that supports\n"
2756"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
2757"converted into earlier formats like 'dirstate-tags'."
2758msgstr ""
2760#: bzrlib/
2761msgid ""
2762"The TREE argument should be a subdirectory of a working tree. That\n"
2763"subdirectory will be converted into an independent tree, with its own\n"
2764"branch. Commits in the top-level tree will not apply to the new subtree."
2765msgstr ""
2767#: bzrlib/
2768msgid "Mail or create a merge-directive for submitting changes."
2769msgstr ""
2771#: bzrlib/
2772msgid "A merge directive provides many things needed for requesting merges:"
2773msgstr ""
2775#: bzrlib/
2776msgid "* A machine-readable description of the merge to perform"
2777msgstr ""
2779#: bzrlib/
2780msgid "* An optional patch that is a preview of the changes requested"
2781msgstr ""
2783#: bzrlib/
2784msgid ""
2785"* An optional bundle of revision data, so that the changes can be applied\n"
2786" directly from the merge directive, without retrieving data from a\n"
2787" branch."
2788msgstr ""
2790#: bzrlib/
2791msgid ""
2792"`bzr send` creates a compact data set that, when applied using bzr\n"
2793"merge, has the same effect as merging from the source branch. "
2794msgstr ""
2796#: bzrlib/
2797msgid ""
2798"By default the merge directive is self-contained and can be applied to any\n"
2799"branch containing submit_branch in its ancestory without needing access to\n"
2800"the source branch."
2801msgstr ""
2803#: bzrlib/
2804msgid ""
2805"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
2806"revisions, but only a structured request to merge from the\n"
2807"public_location. In that case the public_branch is needed and it must be\n"
2808"up-to-date and accessible to the recipient. The public_branch is always\n"
2809"included if known, so that people can check it later."
2810msgstr ""
2812#: bzrlib/
2813msgid ""
2814"The submit branch defaults to the parent of the source branch, but can be\n"
2815"overridden. Both submit branch and public branch will be remembered in\n"
2816"branch.conf the first time they are used for a particular branch. The\n"
2817"source branch defaults to that containing the working directory, but can\n"
2818"be changed using --from."
2819msgstr ""
2821#: bzrlib/
2822msgid ""
2823"Both the submit branch and the public branch follow the usual behavior with\n"
2824"respect to --remember: If there is no default location set, the first send\n"
2825"will set it (use --no-remember to avoid settting it). After that, you can\n"
2826"omit the location to use the default. To change the default, use\n"
2827"--remember. The value will only be saved if the location can be accessed."
2828msgstr ""
2830#: bzrlib/
2831msgid ""
2832"In order to calculate those changes, bzr must analyse the submit branch.\n"
2833"Therefore it is most efficient for the submit branch to be a local mirror.\n"
2834"If a public location is known for the submit_branch, that location is used\n"
2835"in the merge directive."
2836msgstr ""
2838#: bzrlib/
2839msgid ""
2840"The default behaviour is to send the merge directive by mail, unless -o is\n"
2841"given, in which case it is sent to a file."
2842msgstr ""
2844#: bzrlib/
2845msgid ""
2846"Mail is sent using your preferred mail program. This should be transparent\n"
2847"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
2848"If the preferred client can't be found (or used), your editor will be used."
2849msgstr ""
2851#: bzrlib/
2852msgid ""
2853"To use a specific mail program, set the mail_client configuration option.\n"
2854"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
2855"specific clients are \"claws\", \"evolution\", \"kmail\", \""
2856"\" (MacOS X's\n"
2857", \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
2858"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
2860"supported clients."
2861msgstr ""
2863#: bzrlib/
2864msgid ""
2865"If mail is being sent, a to address is required. This can be supplied\n"
2866"either on the commandline, by setting the submit_to configuration\n"
2867"option in the branch itself or the child_submit_to configuration option\n"
2868"in the submit branch."
2869msgstr ""
2871#: bzrlib/
2872msgid ""
2873"Two formats are currently supported: \"4\" uses revision bundle format 4 "
2875"merge directive format 2. It is significantly faster and smaller than\n"
2876"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
2877"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
2878"format 1. It is compatible with Bazaar 0.12 - 0.18."
2879msgstr ""
2881#: bzrlib/
2882msgid ""
2883"The merge directives created by bzr send may be applied using bzr merge or\n"
2884"bzr pull by specifying a file containing a merge directive as the location."
2885msgstr ""
2887#: bzrlib/
2888msgid ""
2889"bzr send makes extensive use of public locations to map local locations "
2891"URLs that can be used by other people. See `bzr help configuration` to\n"
2892"set them, and use `bzr info` to display them."
2893msgstr ""
2895# help of 'output' option of 'send' command
2896#: bzrlib/
2897msgid "Write merge directive to this file or directory; use - for stdout."
2898msgstr ""
2900# help of 'strict' option of 'send' command
2901#: bzrlib/
2902msgid ""
2903"Refuse to send if there are uncommitted changes in the working tree, --no-"
2904"strict disables the check."
2905msgstr ""
2907# help of 'mail-to' option of 'send' command
2908#: bzrlib/
2909msgid "Mail the request to this address."
2910msgstr ""
2912# help of 'body' option of 'send' command
2913#: bzrlib/
2914msgid "Body for the email."
2915msgstr ""
2917# help of 'no-bundle' option of 'send' command
2918#: bzrlib/
2919msgid "Do not include a bundle in the merge directive."
2920msgstr ""
2922# help of 'no-patch' option of 'send' command
2923#: bzrlib/
2924msgid "Do not include a preview patch in the merge directive."
2925msgstr ""
2927# help of 'remember' option of 'send' command
2928#: bzrlib/
2929msgid "Remember submit and public branch."
2930msgstr ""
2932# help of 'from' option of 'send' command
2933#: bzrlib/
2934msgid ""
2935"Branch to generate the submission from, rather than the one containing the "
2936"working directory."
2937msgstr ""
2939# title of 'format' option of 'send' command
2940#: bzrlib/
2941msgid "format"
2942msgstr ""
2944# help of 'format' option of 'send' command
2945#: bzrlib/
2946msgid "Use the specified output format."
2947msgstr ""
2949#: bzrlib/
2950msgid "Create, remove or modify a tag naming a revision."
2951msgstr ""
2953#: bzrlib/
2954msgid ""
2955"Tags give human-meaningful names to revisions. Commands that take a -r\n"
2956"(--revision) option can be given -rtag:X, where X is any previously\n"
2957"created tag."
2958msgstr ""
2960#: bzrlib/
2961msgid ""
2962"Tags are stored in the branch. Tags are copied from one branch to another\n"
2963"along when you branch, push, pull or merge."
2964msgstr ""
2966#: bzrlib/
2967msgid ""
2968"It is an error to give a tag name that already exists unless you pass\n"
2969"--force, in which case the tag is moved to point to the new revision."
2970msgstr ""
2972#: bzrlib/
2973msgid ""
2974"To rename a tag (change the name but keep it on the same revsion), run "
2976"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
2977msgstr ""
2979#: bzrlib/
2980msgid ""
2981"If no tag name is specified it will be determined through the \n"
2982"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
2983"upstream releases by reading See ``bzr help hooks`` for\n"
2985msgstr ""
2987# help of 'delete' option of 'tag' command
2988#: bzrlib/
2989msgid "Delete this tag rather than placing it."
2990msgstr ""
2992# help of 'directory' option of 'tag' command
2993#: bzrlib/
2994msgid "Branch in which to place the tag."
2995msgstr ""
2997# help of 'force' option of 'tag' command
2998#: bzrlib/
2999msgid "Replace existing tags."
3000msgstr ""
3002#: bzrlib/
3003msgid "List tags."
3004msgstr ""
3006#: bzrlib/
3007msgid ""
3008"This command shows a table of tag names and the revisions they reference."
3009msgstr ""
3011# help of 'directory' option of 'tags' command
3012#: bzrlib/
3013msgid "Branch whose tags should be displayed."
3014msgstr ""
3016# help of 'sort' option of 'tags' command
3017#: bzrlib/
3018msgid "Sort tags by different criteria."
3019msgstr ""
3021# title of 'sort' option of 'tags' command
3022#: bzrlib/
3023msgid "Sorting"
3024msgstr ""
3026#: bzrlib/
3027msgid "Reconfigure the type of a bzr directory."
3028msgstr ""
3030#: bzrlib/
3031msgid "A target configuration must be specified."
3032msgstr ""
3034#: bzrlib/
3035msgid ""
3036"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3037"The order of preference is\n"
3038"1. For a lightweight checkout, the current bound location.\n"
3039"2. For branches that used to be checkouts, the previously-bound location.\n"
3040"3. The push location.\n"
3041"4. The parent location.\n"
3042"If none of these is available, --bind-to must be specified."
3043msgstr ""
3045# title of 'target_type' option of 'reconfigure' command
3046#: bzrlib/
3047msgid "Target type"
3048msgstr ""
3050# help of 'target_type' option of 'reconfigure' command
3051#: bzrlib/
3052msgid "The type to reconfigure the directory to."
3053msgstr ""
3055# help of 'bind-to' option of 'reconfigure' command
3056#: bzrlib/
3057msgid "Branch to bind checkout to."
3058msgstr ""
3060# help of 'force' option of 'reconfigure' command
3061#: bzrlib/
3062msgid "Perform reconfiguration even if local changes will be lost."
3063msgstr ""
3065# help of 'stacked-on' option of 'reconfigure' command
3066#: bzrlib/
3067msgid "Reconfigure a branch to be stacked on another branch."
3068msgstr ""
3070# help of 'unstacked' option of 'reconfigure' command
3071#: bzrlib/
3072msgid ""
3073"Reconfigure a branch to be unstacked. This may require copying substantial "
3074"data into it."
3075msgstr ""
3077#: bzrlib/
3078msgid "Set the branch of a checkout and update."
3079msgstr ""
3081#: bzrlib/
3082msgid ""
3083"For lightweight checkouts, this changes the branch being referenced.\n"
3084"For heavyweight checkouts, this checks that there are no local commits\n"
3085"versus the current bound branch, then it makes the local branch a mirror\n"
3086"of the new location and binds to it."
3087msgstr ""
3089#: bzrlib/
3090msgid ""
3091"In both cases, the working tree is updated and uncommitted changes\n"
3092"are merged. The user can commit or revert these as they desire."
3093msgstr ""
3095#: bzrlib/
3096msgid "Pending merges need to be committed or reverted before using switch."
3097msgstr ""
3099#: bzrlib/
3100msgid ""
3101"The path to the branch to switch to can be specified relative to the parent\n"
3102"directory of the current branch. For example, if you are currently in a\n"
3103"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3105msgstr ""
3107#: bzrlib/
3108msgid ""
3109"Bound branches use the nickname of its master branch unless it is set\n"
3110"locally, in which case switching will update the local nickname to be\n"
3111"that of the master."
3112msgstr ""
3114# help of 'force' option of 'switch' command
3115#: bzrlib/
3116msgid "Switch even if local commits will be lost."
3117msgstr ""
3119# help of 'create-branch' option of 'switch' command
3120#: bzrlib/
3121msgid "Create the target branch from this one before switching to it."
3122msgstr ""
3124#: bzrlib/
3125msgid "Manage filtered views."
3126msgstr ""
3128#: bzrlib/
3129msgid ""
3130"Views provide a mask over the tree so that users can focus on\n"
3131"a subset of a tree when doing their work. After creating a view,\n"
3132"commands that support a list of files - status, diff, commit, etc -\n"
3133"effectively have that list of files implicitly given each time.\n"
3134"An explicit list of files can still be given but those files\n"
3135"must be within the current view."
3136msgstr ""
3138#: bzrlib/
3139msgid ""
3140"In most cases, a view has a short life-span: it is created to make\n"
3141"a selected change and is deleted once that change is committed.\n"
3142"At other times, you may wish to create one or more named views\n"
3143"and switch between them."
3144msgstr ""
3146#: bzrlib/
3147msgid ""
3148"To disable the current view without deleting it, you can switch to\n"
3149"the pseudo view called ``off``. This can be useful when you need\n"
3150"to see the whole tree for an operation or two (e.g. merge) but\n"
3151"want to switch back to your view after that."
3152msgstr ""
3154#: bzrlib/
3155msgid ""
3157" To define the current view::"
3158msgstr ""
3160#: bzrlib/
3161msgid " bzr view file1 dir1 ..."
3162msgstr ""
3164#: bzrlib/
3165msgid " To list the current view::"
3166msgstr ""
3168#: bzrlib/
3169msgid " bzr view"
3170msgstr ""
3172#: bzrlib/
3173msgid " To delete the current view::"
3174msgstr ""
3176#: bzrlib/
3177msgid " bzr view --delete"
3178msgstr ""
3180#: bzrlib/
3181msgid " To disable the current view without deleting it::"
3182msgstr ""
3184#: bzrlib/
3185msgid " bzr view --switch off"
3186msgstr ""
3188#: bzrlib/
3189msgid " To define a named view and switch to it::"
3190msgstr ""
3192#: bzrlib/
3193msgid " bzr view --name view-name file1 dir1 ..."
3194msgstr ""
3196#: bzrlib/
3197msgid " To list a named view::"
3198msgstr ""
3200#: bzrlib/
3201msgid " bzr view --name view-name"
3202msgstr ""
3204#: bzrlib/
3205msgid " To delete a named view::"
3206msgstr ""
3208#: bzrlib/
3209msgid " bzr view --name view-name --delete"
3210msgstr ""
3212#: bzrlib/
3213msgid " To switch to a named view::"
3214msgstr ""
3216#: bzrlib/
3217msgid " bzr view --switch view-name"
3218msgstr ""
3220#: bzrlib/
3221msgid " To list all views defined::"
3222msgstr ""
3224#: bzrlib/
3225msgid " bzr view --all"
3226msgstr ""
3228#: bzrlib/
3229msgid " To delete all views::"
3230msgstr ""
3232#: bzrlib/
3233msgid " bzr view --delete --all"
3234msgstr ""
3236# help of 'all' option of 'view' command
3237#: bzrlib/
3238msgid "Apply list or delete action to all views."
3239msgstr ""
3241# help of 'delete' option of 'view' command
3242#: bzrlib/
3243msgid "Delete the view."
3244msgstr ""
3246# help of 'name' option of 'view' command
3247#: bzrlib/
3248msgid "Name of the view to define, list or delete."
3249msgstr ""
3251# help of 'switch' option of 'view' command
3252#: bzrlib/
3253msgid "Name of the view to switch to."
3254msgstr ""
3256#: bzrlib/
3257msgid "Remove a branch."
3258msgstr ""
3260#: bzrlib/
3261msgid ""
3262"This will remove the branch from the specified location but \n"
3263"will keep any working tree or repository in place."
3264msgstr ""
3266#: bzrlib/
3267msgid " Remove the branch at repo/trunk::"
3268msgstr ""
3270#: bzrlib/
3271msgid " bzr remove-branch repo/trunk"
3272msgstr ""
3274#: bzrlib/
3275msgid "Temporarily set aside some changes from the current tree."
3276msgstr ""
3278#: bzrlib/
3279msgid ""
3280"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
3281"ie. out of the way, until a later time when you can bring them back from\n"
3282"the shelf with the 'unshelve' command. The changes are stored alongside\n"
3283"your working tree, and so they aren't propagated along with your branch nor\n"
3284"will they survive its deletion."
3285msgstr ""
3287#: bzrlib/
3288msgid "If shelve --list is specified, previously-shelved changes are listed."
3289msgstr ""
3291#: bzrlib/
3292msgid ""
3293"Shelve is intended to help separate several sets of changes that have\n"
3294"been inappropriately mingled. If you just want to get rid of all changes\n"
3295"and you don't need to restore them later, use revert. If you want to\n"
3296"shelve all text changes at once, use shelve --all."
3297msgstr ""
3299#: bzrlib/
3300msgid ""
3301"If filenames are specified, only the changes to those files will be\n"
3302"shelved. Other files will be left untouched."
3303msgstr ""
3305#: bzrlib/
3306msgid ""
3307"If a revision is specified, changes since that revision will be shelved."
3308msgstr ""
3310#: bzrlib/
3311msgid ""
3312"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
3313"restore the most recently shelved changes."
3314msgstr ""
3316#: bzrlib/
3317msgid ""
3318"For complicated changes, it is possible to edit the changes in a separate\n"
3319"editor program to decide what the file remaining in the working copy\n"
3320"should look like. To do this, add the configuration option"
3321msgstr ""
3323#: bzrlib/
3324msgid " change_editor = PROGRAM @new_path @old_path"
3325msgstr ""
3327#: bzrlib/
3328msgid ""
3329"where @new_path is replaced with the path of the new version of the \n"
3330"file and @old_path is replaced with the path of the old version of \n"
3331"the file. The PROGRAM should save the new file with the desired \n"
3332"contents of the file in the working tree.\n"
3333" "
3334msgstr ""
3336# help of 'all' option of 'shelve' command
3337#: bzrlib/
3338msgid "Shelve all changes."
3339msgstr ""
3341# help of 'writer' option of 'shelve' command
3342#: bzrlib/
3343msgid "Method to use for writing diffs."
3344msgstr ""
3346# title of 'writer' option of 'shelve' command
3347#: bzrlib/
3348msgid "writer"
3349msgstr ""
3351# help of 'list' option of 'shelve' command
3352#: bzrlib/
3353msgid "List shelved changes."
3354msgstr ""
3356# help of 'destroy' option of 'shelve' command
3357#: bzrlib/
3358msgid "Destroy removed changes instead of shelving them."
3359msgstr ""
3361#: bzrlib/
3362msgid "Restore shelved changes."
3363msgstr ""
3365#: bzrlib/
3366msgid ""
3367"By default, the most recently shelved changes are restored. However if you\n"
3368"specify a shelf by id those changes will be restored instead. This works\n"
3369"best when the changes don't depend on each other."
3370msgstr ""
3372# help of 'action' option of 'unshelve' command
3373#: bzrlib/
3374msgid "The action to perform."
3375msgstr ""
3377#: bzrlib/
3378msgid "Remove unwanted files from working tree."
3379msgstr ""
3381#: bzrlib/
3382msgid ""
3383"By default, only unknown files, not ignored files, are deleted. Versioned\n"
3384"files are never deleted."
3385msgstr ""
3387#: bzrlib/
3388msgid ""
3389"Another class is 'detritus', which includes files emitted by bzr during\n"
3390"normal operations and selftests. (The value of these files decreases with\n"
3392msgstr ""
3394#: bzrlib/
3395msgid ""
3396"If no options are specified, unknown files are deleted. Otherwise, option\n"
3397"flags are respected, and may be combined."
3398msgstr ""
3400#: bzrlib/
3401msgid "To check what clean-tree will do, use --dry-run."
3402msgstr ""
3404# help of 'ignored' option of 'clean-tree' command
3405#: bzrlib/
3406msgid "Delete all ignored files."
3407msgstr ""
3409# help of 'detritus' option of 'clean-tree' command
3410#: bzrlib/
3411msgid ""
3412"Delete conflict files, merge and revert backups, and failed selftest dirs."
3413msgstr ""
3415# help of 'unknown' option of 'clean-tree' command
3416#: bzrlib/
3417msgid "Delete files unknown to bzr (default)."
3418msgstr ""
3420# help of 'dry-run' option of 'clean-tree' command
3421#: bzrlib/
3422msgid "Show files to delete instead of deleting them."
3423msgstr ""
3425# help of 'force' option of 'clean-tree' command
3426#: bzrlib/
3427msgid "Do not prompt before deleting."
3428msgstr ""
3430#: bzrlib/
3431msgid "Show version information about this tree."
3432msgstr ""
3434#: bzrlib/
3435msgid ""
3436"You can use this command to add information about version into\n"
3437"source code of an application. The output can be in one of the\n"
3438"supported formats or in a custom format based on a template."
3439msgstr ""
3441#: bzrlib/
3442msgid "For example::"
3443msgstr ""
3445#: bzrlib/
3446msgid ""
3447" bzr version-info --custom \\\n"
3448" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
3449msgstr ""
3451#: bzrlib/
3452msgid ""
3453"will produce a C header file with formatted string containing the\n"
3454"current revision number. Other supported variables in templates are:"
3455msgstr ""
3457#: bzrlib/
3458msgid ""
3459" * {date} - date of the last revision\n"
3460" * {build_date} - current date\n"
3461" * {revno} - revision number\n"
3462" * {revision_id} - revision id\n"
3463" * {branch_nick} - branch nickname\n"
3464" * {clean} - 0 if the source tree contains uncommitted changes,\n"
3465" otherwise 1"
3466msgstr ""
3468# help of 'format' option of 'version-info' command
3469#: bzrlib/
3470msgid "Select the output format."
3471msgstr ""
3473# help of 'all' option of 'version-info' command
3474#: bzrlib/
3475msgid "Include all possible information."
3476msgstr ""
3478# help of 'check-clean' option of 'version-info' command
3479#: bzrlib/
3480msgid "Check if tree is clean."
3481msgstr ""
3483# help of 'include-history' option of 'version-info' command
3484#: bzrlib/
3485msgid "Include the revision-history."
3486msgstr ""
3488# help of 'include-file-revisions' option of 'version-info' command
3489#: bzrlib/
3490msgid "Include the last revision for each file."
3491msgstr ""
3493# help of 'template' option of 'version-info' command
3494#: bzrlib/
3495msgid "Template for the output."
3496msgstr ""
3498#: bzrlib/
3499msgid "No help for this command."
3500msgstr ""
3502#: bzrlib/
3503#, python-format
3504msgid ":Purpose: %s\n"
3505msgstr ""
3507#: bzrlib/
3508#, python-format
3509msgid ""
3512msgstr ""
3514#: bzrlib/
3515#, python-format
3516msgid ":Usage: %s\n"
3517msgstr ""
3519#: bzrlib/
3520#, python-format
3521msgid ":Options:%s"
3522msgstr ""
3524#: bzrlib/
3525#, python-format
3526msgid ""
3528" %s\n"
3530msgstr ""
3532#: bzrlib/
3533#, python-format
3534msgid ""
3535"See bzr help %s for more details and examples.\n"
3537msgstr ""
3539#: bzrlib/
3540msgid ":Aliases: "
3541msgstr ""
3543#: bzrlib/
3544#, python-format
3545msgid ":From: plugin \"%s\"\n"
3546msgstr ""
3548#: bzrlib/
3549#, python-format
3550msgid ":doc:`%s <%s-help>`"
3551msgstr ""
3553#: bzrlib/
3554#, python-format
3555msgid ":See also: %s"
3556msgstr ""
3558#: bzrlib/
3559msgid "Sign all commits by a given committer."
3560msgstr ""
3562#: bzrlib/
3563msgid ""
3564"If location is not specified the local tree is used.\n"
3565"If committer is not specified the default committer is used."
3566msgstr ""
3568#: bzrlib/
3569msgid "This does not sign commits that already have signatures."
3570msgstr ""
3572# help of 'dry-run' option of 'sign-my-commits' command
3573#: bzrlib/
3574msgid ""
3575"Don't actually sign anything, just print the revisions that would be signed."
3576msgstr ""
3578#: bzrlib/
3579msgid "Verify all commit signatures."
3580msgstr ""
3582#: bzrlib/
3583msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
3584msgstr ""
3586# help of 'acceptable-keys' option of 'verify-signatures' command
3587#: bzrlib/
3588msgid ""
3589"Comma separated list of GPG key patterns which are acceptable for "
3591msgstr ""
3593#: bzrlib/
3594msgid "All commits signed with verifiable keys"
3595msgstr ""
3597#: bzrlib/
3598msgid "Display, set or remove a configuration option."
3599msgstr ""
3601#: bzrlib/
3602msgid "Display the active value for a given option."
3603msgstr ""
3605#: bzrlib/
3606msgid ""
3607"If --all is specified, NAME is interpreted as a regular expression and all\n"
3608"matching options are displayed mentioning their scope. The active value\n"
3609"that bzr will take into account is the first one displayed for each option."
3610msgstr ""
3612#: bzrlib/
3613msgid "If no NAME is given, --all .* is implied."
3614msgstr ""
3616#: bzrlib/
3617msgid ""
3618"Setting a value is achieved by using name=value without spaces. The value\n"
3619"is set in the most relevant scope and can be checked by displaying the\n"
3620"option again."
3621msgstr ""
3623# help of 'scope' option of 'config' command
3624#: bzrlib/
3625msgid "Reduce the scope to the specified configuration file"
3626msgstr ""
3628# help of 'all' option of 'config' command
3629#: bzrlib/
3630msgid "Display all the defined values for the matching options."
3631msgstr ""
3633# help of 'remove' option of 'config' command
3634#: bzrlib/
3635msgid "Remove the option from the configuration file"
3636msgstr ""
3638#: bzrlib/
3639msgid "List files with conflicts."
3640msgstr ""
3642#: bzrlib/
3643msgid ""
3644"Merge will do its best to combine the changes in two branches, but there\n"
3645"are some kinds of problems only a human can fix. When it encounters those,\n"
3646"it will mark a conflict. A conflict means that you need to fix something,\n"
3647"before you should commit."
3648msgstr ""
3650#: bzrlib/
3651msgid ""
3652"Conflicts normally are listed as short, human-readable messages. If --text\n"
3653"is supplied, the pathnames of files with text conflicts are listed,\n"
3654"instead. (This is useful for editing all files with text conflicts.)"