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: mp+72725@code.launchpad.net

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 :

W00T!

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)
9191
92* bzr now ships with translations for command help. (Jonathan
93 Riddell, INADA Naoki, #83941)
9294
93Improvements95Improvements
94************96************
9597
=== 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 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: bzr\n"
10"Report-Msgid-Bugs-To: <bazaar@canonical.com>\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 <LL@li.org>\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"
20
21#: bzrlib/builtins.py:209
22msgid "Display status summary."
23msgstr ""
24
25#: bzrlib/builtins.py:211
26msgid ""
27"This reports on versioned and unknown files, reporting them\n"
28"grouped by state. Possible states are:"
29msgstr ""
30
31#: bzrlib/builtins.py:214
32msgid ""
33"added\n"
34" Versioned in the working copy but not in the previous revision."
35msgstr ""
36
37#: bzrlib/builtins.py:217
38msgid ""
39"removed\n"
40" Versioned in the previous revision but removed or deleted\n"
41" in the working copy."
42msgstr ""
43
44#: bzrlib/builtins.py:221
45msgid ""
46"renamed\n"
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 ""
51
52#: bzrlib/builtins.py:226
53msgid ""
54"modified\n"
55" Text has changed since the previous revision."
56msgstr ""
57
58#: bzrlib/builtins.py:229
59msgid ""
60"kind changed\n"
61" File kind has been changed (e.g. from file to directory)."
62msgstr ""
63
64#: bzrlib/builtins.py:232
65msgid ""
66"unknown\n"
67" Not versioned and not matching an ignore pattern."
68msgstr ""
69
70#: bzrlib/builtins.py:235
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 ""
77
78#: bzrlib/builtins.py:240
79msgid ""
80"To see ignored files use 'bzr ignored'. For details on the\n"
81"changes to file texts, use 'bzr diff'."
82msgstr ""
83
84#: bzrlib/builtins.py:243
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 ""
90
91#: bzrlib/builtins.py:247
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 ""
98
99#: bzrlib/builtins.py:252
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 ""
106
107#: bzrlib/builtins.py:257
108msgid ""
109"To compare the working directory to a specific revision, pass a\n"
110"single revision to the revision argument."
111msgstr ""
112
113#: bzrlib/builtins.py:260
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 ""
119
120# help of 'short' option of 'status' command
121#: bzrlib/builtins.py:269
122msgid "Use short status indicators."
123msgstr ""
124
125# help of 'versioned' option of 'status' command
126#: bzrlib/builtins.py:271
127msgid "Only show versioned files."
128msgstr ""
129
130# help of 'no-pending' option of 'status' command
131#: bzrlib/builtins.py:273
132msgid "Don't show pending merges."
133msgstr ""
134
135# help of 'no-classify' option of 'status' command
136#: bzrlib/builtins.py:276
137msgid "Do not mark object type using indicator."
138msgstr ""
139
140#: bzrlib/builtins.py:455
141msgid "Remove the working tree from a given branch/checkout."
142msgstr ""
143
144#: bzrlib/builtins.py:457
145msgid ""
146"Since a lightweight checkout is little more than a working tree\n"
147"this will refuse to run against one."
148msgstr ""
149
150#: bzrlib/builtins.py:460
151msgid "To re-create the working tree, use \"bzr checkout\"."
152msgstr ""
153
154# help of 'force' option of 'remove-tree' command
155#: bzrlib/builtins.py:466
156msgid "Remove the working tree even if it has uncommitted or shelved changes."
157msgstr ""
158
159#: bzrlib/builtins.py:551
160msgid "Show current revision number."
161msgstr ""
162
163#: bzrlib/builtins.py:553
164msgid "This is equal to the number of revisions on this branch."
165msgstr ""
166
167# help of 'tree' option of 'revno' command
168#: bzrlib/builtins.py:594
169msgid "Show revno of working tree"
170msgstr ""
171
172#: bzrlib/builtins.py:642
173msgid "Add specified files or directories."
174msgstr ""
175
176#: bzrlib/builtins.py:644
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 ""
182
183#: bzrlib/builtins.py:648
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 ""
193
194#: bzrlib/builtins.py:656
195msgid ""
196"Therefore simply saying 'bzr add' will version all files that\n"
197"are currently unknown."
198msgstr ""
199
200#: bzrlib/builtins.py:659
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 ""
207
208#: bzrlib/builtins.py:664
209msgid ""
210"--dry-run will show which files would be added, but not actually\n"
211"add them."
212msgstr ""
213
214#: bzrlib/builtins.py:667
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 ""
224
225#: bzrlib/builtins.py:675
226msgid ""
227"Any files matching patterns in the ignore list will not be added\n"
228"unless they are explicitly mentioned."
229msgstr ""
230
231#: bzrlib/builtins.py:678
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 ""
237
238# help of 'no-recurse' option of 'add' command
239#: bzrlib/builtins.py:685
240msgid "Don't recursively add the contents of directories."
241msgstr ""
242
243# help of 'file-ids-from' option of 'add' command
244#: bzrlib/builtins.py:691
245msgid "Lookup file ids from this tree."
246msgstr ""
247
248#: bzrlib/builtins.py:731
249msgid "Create a new versioned directory."
250msgstr ""
251
252#: bzrlib/builtins.py:733
253msgid "This is equivalent to creating the directory and then adding it."
254msgstr ""
255
256#: bzrlib/builtins.py:828
257msgid "Move or rename a file."
258msgstr ""
259
260#: bzrlib/builtins.py:830
261msgid " bzr mv SOURCE... DESTINATION"
262msgstr ""
263
264#: bzrlib/builtins.py:832
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 ""
270
271#: bzrlib/builtins.py:836
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 ""
279
280#: bzrlib/builtins.py:842
281msgid "Files cannot be moved between branches."
282msgstr ""
283
284# help of 'after' option of 'mv' command
285#: bzrlib/builtins.py:849
286msgid ""
287"Move only the bzr identifier of the file, because the file has already been "
288"moved."
289msgstr ""
290
291# help of 'auto' option of 'mv' command
292#: bzrlib/builtins.py:851
293msgid "Automatically guess renames."
294msgstr ""
295
296# help of 'dry-run' option of 'mv' command
297#: bzrlib/builtins.py:852
298msgid "Avoid making changes when guessing renames."
299msgstr ""
300
301#: bzrlib/builtins.py:964
302msgid "Turn this branch into a mirror of another branch."
303msgstr ""
304
305#: bzrlib/builtins.py:966
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"
310"parent."
311msgstr ""
312
313#: bzrlib/builtins.py:971
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 ""
319
320#: bzrlib/builtins.py:975
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 ""
326
327#: bzrlib/builtins.py:979
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 ""
334
335#: bzrlib/builtins.py:984
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 ""
341
342# help of 'verbose' option of 'pull' command
343#: bzrlib/builtins.py:992
344msgid "Show logs of pulled revisions."
345msgstr ""
346
347# help of 'directory' option of 'pull' command
348#: bzrlib/builtins.py:994
349msgid ""
350"Branch to pull into, rather than the one containing the working directory."
351msgstr ""
352
353# help of 'local' option of 'pull' command
354#: bzrlib/builtins.py:997
355msgid ""
356"Perform a local pull in a bound branch. Local pulls are not applied to the "
357"master branch."
358msgstr ""
359
360#: bzrlib/builtins.py:1097
361msgid "Update a mirror of this branch."
362msgstr ""
363
364#: bzrlib/builtins.py:1099
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 ""
369
370#: bzrlib/builtins.py:1102
371msgid ""
372"Some smart servers or protocols *may* put the working tree in place in\n"
373"the future."
374msgstr ""
375
376#: bzrlib/builtins.py:1105
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 ""
382
383#: bzrlib/builtins.py:1109
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 ""
388
389#: bzrlib/builtins.py:1112
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 ""
395
396#: bzrlib/builtins.py:1116
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 ""
403
404# help of 'directory' option of 'push' command
405#: bzrlib/builtins.py:1128
406msgid ""
407"Branch to push from, rather than the one containing the working directory."
408msgstr ""
409
410# help of 'use-existing-dir' option of 'push' command
411#: bzrlib/builtins.py:1131
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 ""
416
417# help of 'stacked' option of 'push' command
418#: bzrlib/builtins.py:1136
419msgid ""
420"Create a stacked branch that references the public location of the parent "
421"branch."
422msgstr ""
423
424# help of 'stacked-on' option of 'push' command
425#: bzrlib/builtins.py:1139
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 ""
431
432# help of 'strict' option of 'push' command
433#: bzrlib/builtins.py:1144
434msgid ""
435"Refuse to push if there are uncommitted changes in the working tree, --no-"
436"strict disables the check."
437msgstr ""
438
439# help of 'no-tree' option of 'push' command
440#: bzrlib/builtins.py:1147
441msgid "Don't populate the working tree, even for protocols that support it."
442msgstr ""
443
444#: bzrlib/builtins.py:1212
445msgid "Create a new branch that is a copy of an existing branch."
446msgstr ""
447
448#: bzrlib/builtins.py:1214
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 ./"
452"bar.\n"
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 ""
458
459#: bzrlib/builtins.py:1221
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 ""
464
465#: bzrlib/builtins.py:1224
466msgid "The synonyms 'clone' and 'get' for this command are deprecated."
467msgstr ""
468
469# help of 'no-tree' option of 'branch' command
470#: bzrlib/builtins.py:1234
471msgid "Create a branch without a working-tree."
472msgstr ""
473
474# help of 'switch' option of 'branch' command
475#: bzrlib/builtins.py:1236
476msgid "Switch the checkout in the current directory to the new branch."
477msgstr ""
478
479# help of 'stacked' option of 'branch' command
480#: bzrlib/builtins.py:1239
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 ""
485
486# help of 'standalone' option of 'branch' command
487#: bzrlib/builtins.py:1243
488msgid "Do not use a shared repository, even if available."
489msgstr ""
490
491# help of 'use-existing-dir' option of 'branch' command
492#: bzrlib/builtins.py:1245
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 ""
497
498# help of 'bind' option of 'branch' command
499#: bzrlib/builtins.py:1250
500msgid "Bind new branch to from location."
501msgstr ""
502
503#: bzrlib/builtins.py:1342
504msgid "List the branches available at the current location."
505msgstr ""
506
507#: bzrlib/builtins.py:1344
508msgid ""
509"This command will print the names of all the branches at the current "
510"location."
511msgstr ""
512
513#: bzrlib/builtins.py:1359
514msgid "Create a new checkout of an existing branch."
515msgstr ""
516
517#: bzrlib/builtins.py:1361
518msgid ""
519"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
520"for\n"
521"the branch found in '.'. This is useful if you have removed the working "
522"tree\n"
523"or if it was never created - i.e. if you pushed the branch to its current\n"
524"location using SFTP."
525msgstr ""
526
527#: bzrlib/builtins.py:1366
528msgid ""
529"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
530"will\n"
531"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
532"bar.\n"
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 ""
538
539#: bzrlib/builtins.py:1373
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 "
543"immediately\n"
544"out of date [so you cannot commit] but it may be useful (i.e. to examine "
545"old\n"
546"code.)"
547msgstr ""
548
549# help of 'lightweight' option of 'checkout' command
550#: bzrlib/builtins.py:1383
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 "
555"commits."
556msgstr ""
557
558# help of 'files-from' option of 'branch' command
559#: bzrlib/builtins.py:1390
560msgid "Get file contents from this tree."
561msgstr ""
562
563# help of 'hardlink' option of 'branch' command
564#: bzrlib/builtins.py:1392
565msgid "Hard-link working tree files where possible."
566msgstr ""
567
568#: bzrlib/builtins.py:1433
569msgid ""
570"Show list of renamed files.\n"
571" "
572msgstr ""
573
574#: bzrlib/builtins.py:1463
575msgid "Update a tree to have the latest code committed to its branch."
576msgstr ""
577
578#: bzrlib/builtins.py:1465
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 ""
584
585#: bzrlib/builtins.py:1469
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 ""
590
591#: bzrlib/builtins.py:1472
592msgid ""
593"If you want to restore a file that has been removed locally, use\n"
594"'bzr revert' instead of 'bzr update'."
595msgstr ""
596
597#: bzrlib/builtins.py:1475
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 ""
602
603#: bzrlib/builtins.py:1556
604msgid "Show information about a working tree, branch or repository."
605msgstr ""
606
607#: bzrlib/builtins.py:1558
608msgid ""
609"This command will show all known locations and formats associated to the\n"
610"tree, branch or repository."
611msgstr ""
612
613#: bzrlib/builtins.py:1561
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 ""
619
620#: bzrlib/builtins.py:1565
621msgid "Branches and working trees will also report any missing revisions."
622msgstr ""
623
624#: bzrlib/builtins.py:1569
625msgid " Display information on the format and related locations:"
626msgstr ""
627
628#: bzrlib/builtins.py:1571
629msgid " bzr info"
630msgstr ""
631
632#: bzrlib/builtins.py:1573
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 ""
638
639#: bzrlib/builtins.py:1577
640msgid " bzr info -v"
641msgstr ""
642
643#: bzrlib/builtins.py:1579
644msgid " Display the above together with number of committers to the branch:"
645msgstr ""
646
647#: bzrlib/builtins.py:1581
648msgid " bzr info -vv"
649msgstr ""
650
651#: bzrlib/builtins.py:1600
652msgid "Remove files or directories."
653msgstr ""
654
655#: bzrlib/builtins.py:1602
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 ""
663
664# help of 'new' option of 'remove' command
665#: bzrlib/builtins.py:1610
666msgid "Only remove files that have never been committed."
667msgstr ""
668
669# help of 'file-deletion-strategy' option of 'remove' command
670#: bzrlib/builtins.py:1612
671msgid "The file deletion mode to be used."
672msgstr ""
673
674# title of 'file-deletion-strategy' option of 'remove' command
675#: bzrlib/builtins.py:1613
676msgid "Deletion Strategy"
677msgstr ""
678
679#: bzrlib/builtins.py:1704
680msgid "Reconcile bzr metadata in a branch."
681msgstr ""
682
683#: bzrlib/builtins.py:1706
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 ""
690
691#: bzrlib/builtins.py:1711
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 ""
698
699#: bzrlib/builtins.py:1716
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 ""
704
705#: bzrlib/builtins.py:1719
706msgid "The branch *MUST* be on a listable system such as local disk or sftp."
707msgstr ""
708
709#: bzrlib/builtins.py:1783
710msgid "Make a directory into a versioned branch."
711msgstr ""
712
713#: bzrlib/builtins.py:1785
714msgid ""
715"Use this to create an empty branch, or before importing an\n"
716"existing project."
717msgstr ""
718
719#: bzrlib/builtins.py:1788
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 ""
726
727#: bzrlib/builtins.py:1793
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 ""
732
733#: bzrlib/builtins.py:1796
734msgid "Recipe for importing a tree of files::"
735msgstr ""
736
737#: bzrlib/builtins.py:1798
738msgid ""
739" cd ~/project\n"
740" bzr init\n"
741" bzr add .\n"
742" bzr status\n"
743" bzr commit -m \"imported project\""
744msgstr ""
745
746# help of 'create-prefix' option of 'init' command
747#: bzrlib/builtins.py:1809
748msgid "Create the path leading up to the branch if it does not already exist."
749msgstr ""
750
751# help of 'format' option of 'init' command
752#: bzrlib/builtins.py:1812
753msgid "Specify a format for this branch. See \"help formats\"."
754msgstr ""
755
756# help of 'append-revisions-only' option of 'init' command
757#: bzrlib/builtins.py:1820
758msgid "Never change revnos or the existing log. Append revisions to it only."
759msgstr ""
760
761# help of 'no-tree' option of 'init' command
762#: bzrlib/builtins.py:1823
763msgid "Create a branch without a working tree."
764msgstr ""
765
766#: bzrlib/builtins.py:1900
767msgid "Create a shared repository for branches to share storage space."
768msgstr ""
769
770#: bzrlib/builtins.py:1902
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 ""
777
778#: bzrlib/builtins.py:1907
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 ""
787
788#: bzrlib/builtins.py:1914
789msgid ""
790":Examples:\n"
791" Create a shared repository holding just branches::"
792msgstr ""
793
794#: bzrlib/builtins.py:1917
795msgid ""
796" bzr init-repo --no-trees repo\n"
797" bzr init repo/trunk"
798msgstr ""
799
800#: bzrlib/builtins.py:1920
801msgid " Make a lightweight checkout elsewhere::"
802msgstr ""
803
804#: bzrlib/builtins.py:1922
805msgid ""
806" bzr checkout --lightweight repo/trunk trunk-checkout\n"
807" cd trunk-checkout\n"
808" (add files here)"
809msgstr ""
810
811# help of 'format' option of 'init-repository' command
812#: bzrlib/builtins.py:1930
813msgid ""
814"Specify a format for this repository. See \"bzr help formats\" for details."
815msgstr ""
816
817# title of 'format' option of 'init-repository' command
818#: bzrlib/builtins.py:1934
819msgid "Repository format"
820msgstr ""
821
822# help of 'no-trees' option of 'init-repository' command
823#: bzrlib/builtins.py:1936
824msgid "Branches in the repository will default to not having a working tree."
825msgstr ""
826
827#: bzrlib/builtins.py:1960
828msgid "Show differences in the working tree, between revisions or branches."
829msgstr ""
830
831#: bzrlib/builtins.py:1962
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"
838"given."
839msgstr ""
840
841#: bzrlib/builtins.py:1969
842msgid ""
843"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
844"produces patches suitable for \"patch -p1\"."
845msgstr ""
846
847#: bzrlib/builtins.py:1972
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 ""
856
857#: bzrlib/builtins.py:1979
858msgid ""
859":Exit values:\n"
860" 1 - changed\n"
861" 2 - unrepresentable changes\n"
862" 3 - error\n"
863" 0 - no change"
864msgstr ""
865
866#: bzrlib/builtins.py:1985
867msgid ""
868":Examples:\n"
869" Shows the difference in the working tree versus the last commit::"
870msgstr ""
871
872#: bzrlib/builtins.py:1988
873msgid " bzr diff"
874msgstr ""
875
876#: bzrlib/builtins.py:1990
877msgid " Difference between the working tree and revision 1::"
878msgstr ""
879
880#: bzrlib/builtins.py:1992
881msgid " bzr diff -r1"
882msgstr ""
883
884#: bzrlib/builtins.py:1994
885msgid " Difference between revision 3 and revision 1::"
886msgstr ""
887
888#: bzrlib/builtins.py:1996
889msgid " bzr diff -r1..3"
890msgstr ""
891
892#: bzrlib/builtins.py:1998
893msgid " Difference between revision 3 and revision 1 for branch xxx::"
894msgstr ""
895
896#: bzrlib/builtins.py:2000
897msgid " bzr diff -r1..3 xxx"
898msgstr ""
899
900#: bzrlib/builtins.py:2002
901msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
902msgstr ""
903
904#: bzrlib/builtins.py:2004
905msgid " bzr diff -c2"
906msgstr ""
907
908#: bzrlib/builtins.py:2006
909msgid ""
910" To see the changes introduced by revision X::\n"
911" \n"
912" bzr diff -cX"
913msgstr ""
914
915#: bzrlib/builtins.py:2010
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 ""
921
922#: bzrlib/builtins.py:2014
923msgid " bzr diff -r<chosen_parent>..X"
924msgstr ""
925
926#: bzrlib/builtins.py:2016
927msgid ""
928" The changes between the current revision and the previous revision\n"
929" (equivalent to -c-1 and -r-2..-1)"
930msgstr ""
931
932#: bzrlib/builtins.py:2019
933msgid " bzr diff -r-2.."
934msgstr ""
935
936#: bzrlib/builtins.py:2021
937msgid " Show just the differences for file NEWS::"
938msgstr ""
939
940#: bzrlib/builtins.py:2023
941msgid " bzr diff NEWS"
942msgstr ""
943
944#: bzrlib/builtins.py:2025
945msgid " Show the differences in working tree xxx for file NEWS::"
946msgstr ""
947
948#: bzrlib/builtins.py:2027
949msgid " bzr diff xxx/NEWS"
950msgstr ""
951
952#: bzrlib/builtins.py:2029
953msgid " Show the differences from branch xxx to this working tree:"
954msgstr ""
955
956#: bzrlib/builtins.py:2031
957msgid " bzr diff --old xxx"
958msgstr ""
959
960#: bzrlib/builtins.py:2033
961msgid " Show the differences between two branches for file NEWS::"
962msgstr ""
963
964#: bzrlib/builtins.py:2035
965msgid " bzr diff --old xxx --new yyy NEWS"
966msgstr ""
967
968#: bzrlib/builtins.py:2037
969msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
970msgstr ""
971
972#: bzrlib/builtins.py:2039
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 ""
980
981# help of 'diff-options' option of 'diff' command
982#: bzrlib/builtins.py:2049
983msgid "Pass these options to the external diff program."
984msgstr ""
985
986# help of 'prefix' option of 'diff' command
987#: bzrlib/builtins.py:2052
988msgid ""
989"Set prefixes added to old and new filenames, as two values separated by a "
990"colon. (eg \"old/:new/\")."
991msgstr ""
992
993# help of 'old' option of 'diff' command
994#: bzrlib/builtins.py:2055
995msgid "Branch/tree to compare from."
996msgstr ""
997
998# help of 'new' option of 'diff' command
999#: bzrlib/builtins.py:2059
1000msgid "Branch/tree to compare to."
1001msgstr ""
1002
1003# help of 'using' option of 'diff' command
1004#: bzrlib/builtins.py:2065
1005msgid "Use this command to compare files."
1006msgstr ""
1007
1008# help of 'format' option of 'diff' command
1009#: bzrlib/builtins.py:2070
1010msgid "Diff format to use."
1011msgstr ""
1012
1013# title of 'format' option of 'diff' command
1014#: bzrlib/builtins.py:2072
1015msgid "Diff format"
1016msgstr ""
1017
1018#: bzrlib/builtins.py:2122
1019msgid ""
1020"List files deleted in the working tree.\n"
1021" "
1022msgstr ""
1023
1024#: bzrlib/builtins.py:2200
1025msgid "Show the tree root directory."
1026msgstr ""
1027
1028#: bzrlib/builtins.py:2202
1029msgid ""
1030"The root is the nearest enclosing directory with a .bzr control\n"
1031"directory."
1032msgstr ""
1033
1034#: bzrlib/builtins.py:2230
1035msgid "Show historical log for a branch or subset of a branch."
1036msgstr ""
1037
1038#: bzrlib/builtins.py:2232
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 ""
1045
1046#: bzrlib/builtins.py:2237
1047msgid ""
1048" bzr log log the current branch\n"
1049" bzr log foo.py log a file in its branch\n"
1050" bzr log http://server/branch log a branch on a server"
1051msgstr ""
1052
1053#: bzrlib/builtins.py:2241
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 ""
1062
1063#: bzrlib/builtins.py:2248
1064msgid ":Output control:"
1065msgstr ""
1066
1067#: bzrlib/builtins.py:2250
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 ""
1074
1075#: bzrlib/builtins.py:2255
1076msgid ""
1077" The following options can be used to control what information is\n"
1078" displayed::"
1079msgstr ""
1080
1081#: bzrlib/builtins.py:2258
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 ""
1089
1090#: bzrlib/builtins.py:2264
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 ""
1096
1097#: bzrlib/builtins.py:2268
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 ""
1103
1104#: bzrlib/builtins.py:2272
1105msgid ":Ordering control:"
1106msgstr ""
1107
1108#: bzrlib/builtins.py:2274
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 ""
1115
1116#: bzrlib/builtins.py:2279
1117msgid ":Revision filtering:"
1118msgstr ""
1119
1120#: bzrlib/builtins.py:2281
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 ""
1125
1126#: bzrlib/builtins.py:2284
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 ""
1133
1134#: bzrlib/builtins.py:2289
1135msgid ""
1136" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1137" Some common examples are given below::"
1138msgstr ""
1139
1140#: bzrlib/builtins.py:2292
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 ""
1149
1150#: bzrlib/builtins.py:2299
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 ""
1159
1160#: bzrlib/builtins.py:2306
1161msgid ":Path filtering:"
1162msgstr ""
1163
1164#: bzrlib/builtins.py:2308
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 ""
1170
1171#: bzrlib/builtins.py:2312
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 ""
1177
1178#: bzrlib/builtins.py:2316
1179msgid ""
1180" Historical context is also important when interpreting pathnames of\n"
1181" renamed files/directories. Consider the following example:"
1182msgstr ""
1183
1184#: bzrlib/builtins.py:2319
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 ""
1190
1191#: bzrlib/builtins.py:2323
1192msgid " In this case:"
1193msgstr ""
1194
1195#: bzrlib/builtins.py:2325
1196msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1197msgstr ""
1198
1199#: bzrlib/builtins.py:2327
1200msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1201msgstr ""
1202
1203#: bzrlib/builtins.py:2329
1204msgid ""
1205" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1206" the original file in revision 2."
1207msgstr ""
1208
1209#: bzrlib/builtins.py:2332
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 ""
1214
1215#: bzrlib/builtins.py:2335
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 ""
1221
1222#: bzrlib/builtins.py:2339
1223msgid ":Other filtering:"
1224msgstr ""
1225
1226#: bzrlib/builtins.py:2341
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 ""
1234
1235#: bzrlib/builtins.py:2347
1236msgid ":Tips & tricks:"
1237msgstr ""
1238
1239#: bzrlib/builtins.py:2349
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 <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1245" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1246msgstr ""
1247
1248#: bzrlib/builtins.py:2355
1249msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1250msgstr ""
1251
1252#: bzrlib/builtins.py:2357
1253msgid ""
1254" [ALIASES]\n"
1255" tip = log -r-1\n"
1256" top = log -l10 --line\n"
1257" show = log -v -p"
1258msgstr ""
1259
1260#: bzrlib/builtins.py:2362
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 ""
1266
1267#: bzrlib/builtins.py:2366
1268msgid ""
1269" If you are interested in looking deeper into a particular merge X,\n"
1270" use ``bzr log -n0 -rX``."
1271msgstr ""
1272
1273#: bzrlib/builtins.py:2369
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 ""
1280
1281#: bzrlib/builtins.py:2374
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 ""
1288
1289#: bzrlib/builtins.py:2379
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 ""
1296
1297# help of 'forward' option of 'log' command
1298#: bzrlib/builtins.py:2388
1299msgid "Show from oldest to newest."
1300msgstr ""
1301
1302# help of 'verbose' option of 'log' command
1303#: bzrlib/builtins.py:2391
1304msgid "Show files changed in each revision."
1305msgstr ""
1306
1307# help of 'change' option of 'log' command
1308#: bzrlib/builtins.py:2397
1309msgid "Show just the specified revision. See also \"help revisionspec\"."
1310msgstr ""
1311
1312# help of 'authors' option of 'log' command
1313#: bzrlib/builtins.py:2401
1314msgid "What names to list as authors - first, all or committer."
1315msgstr ""
1316
1317# title of 'authors' option of 'log' command
1318#: bzrlib/builtins.py:2402
1319msgid "Authors"
1320msgstr ""
1321
1322# help of 'levels' option of 'log' command
1323#: bzrlib/builtins.py:2407
1324msgid "Number of levels to display - 0 for all, 1 for flat."
1325msgstr ""
1326
1327# help of 'limit' option of 'log' command
1328#: bzrlib/builtins.py:2417
1329msgid "Limit the output to the first N revisions."
1330msgstr ""
1331
1332# help of 'show-diff' option of 'log' command
1333#: bzrlib/builtins.py:2422
1334msgid "Show changes made in each revision as a patch."
1335msgstr ""
1336
1337# help of 'include-merges' option of 'log' command
1338#: bzrlib/builtins.py:2424
1339msgid "Show merged revisions like --levels 0 does."
1340msgstr ""
1341
1342# help of 'exclude-common-ancestry' option of 'log' command
1343#: bzrlib/builtins.py:2426
1344msgid ""
1345"Display only the revisions that are not part of both ancestries (require -"
1346"rX..Y)"
1347msgstr ""
1348
1349# help of 'signatures' option of 'log' command
1350#: bzrlib/builtins.py:2430
1351msgid "Show digital signature validity"
1352msgstr ""
1353
1354# help of 'match' option of 'log' command
1355#: bzrlib/builtins.py:2433
1356msgid "Show revisions whose properties match this expression."
1357msgstr ""
1358
1359# help of 'match-message' option of 'log' command
1360#: bzrlib/builtins.py:2437
1361msgid "Show revisions whose message matches this expression."
1362msgstr ""
1363
1364# help of 'match-committer' option of 'log' command
1365#: bzrlib/builtins.py:2441
1366msgid "Show revisions whose committer matches this expression."
1367msgstr ""
1368
1369# help of 'match-author' option of 'log' command
1370#: bzrlib/builtins.py:2445
1371msgid "Show revisions whose authors match this expression."
1372msgstr ""
1373
1374# help of 'match-bugs' option of 'log' command
1375#: bzrlib/builtins.py:2449
1376msgid "Show revisions whose bugs match this expression."
1377msgstr ""
1378
1379#: bzrlib/builtins.py:2690
1380msgid ""
1381"List files in a tree.\n"
1382" "
1383msgstr ""
1384
1385# help of 'recursive' option of 'ls' command
1386#: bzrlib/builtins.py:2699
1387msgid "Recurse into subdirectories."
1388msgstr ""
1389
1390# help of 'from-root' option of 'ls' command
1391#: bzrlib/builtins.py:2701
1392msgid "Print paths relative to the root of the branch."
1393msgstr ""
1394
1395# help of 'unknown' option of 'ls' command
1396#: bzrlib/builtins.py:2703
1397msgid "Print unknown files."
1398msgstr ""
1399
1400# help of 'versioned' option of 'ls' command
1401#: bzrlib/builtins.py:2704
1402msgid "Print versioned files."
1403msgstr ""
1404
1405# help of 'ignored' option of 'ls' command
1406#: bzrlib/builtins.py:2707
1407msgid "Print ignored files."
1408msgstr ""
1409
1410# help of 'kind' option of 'ls' command
1411#: bzrlib/builtins.py:2709
1412msgid "List entries of a particular kind: file, directory, symlink."
1413msgstr ""
1414
1415#: bzrlib/builtins.py:2821
1416msgid "Ignore specified files or patterns."
1417msgstr ""
1418
1419#: bzrlib/builtins.py:2823
1420msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1421msgstr ""
1422
1423#: bzrlib/builtins.py:2825
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 ""
1431
1432#: bzrlib/builtins.py:2831
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"
1437"it."
1438msgstr ""
1439
1440#: bzrlib/builtins.py:2836
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 ""
1448
1449#: bzrlib/builtins.py:2842
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 ""
1455
1456#: bzrlib/builtins.py:2846
1457msgid ""
1458"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1459"precedence over the '!' exception patterns."
1460msgstr ""
1461
1462#: bzrlib/builtins.py:2849
1463msgid ""
1464":Notes: \n"
1465" \n"
1466"* Ignore patterns containing shell wildcards must be quoted from\n"
1467" the shell on Unix."
1468msgstr ""
1469
1470#: bzrlib/builtins.py:2854
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 ""
1475
1476#: bzrlib/builtins.py:2857
1477msgid ""
1478":Examples:\n"
1479" Ignore the top level Makefile::"
1480msgstr ""
1481
1482#: bzrlib/builtins.py:2860
1483msgid " bzr ignore ./Makefile"
1484msgstr ""
1485
1486#: bzrlib/builtins.py:2862
1487msgid " Ignore .class files in all directories...::"
1488msgstr ""
1489
1490#: bzrlib/builtins.py:2864
1491msgid " bzr ignore \"*.class\""
1492msgstr ""
1493
1494#: bzrlib/builtins.py:2866
1495msgid " ...but do not ignore \"special.class\"::"
1496msgstr ""
1497
1498#: bzrlib/builtins.py:2868
1499msgid " bzr ignore \"!special.class\""
1500msgstr ""
1501
1502#: bzrlib/builtins.py:2870
1503msgid " Ignore files whose name begins with the \"#\" character::"
1504msgstr ""
1505
1506#: bzrlib/builtins.py:2872
1507msgid " bzr ignore \"RE:^#\""
1508msgstr ""
1509
1510#: bzrlib/builtins.py:2874
1511msgid " Ignore .o files under the lib directory::"
1512msgstr ""
1513
1514#: bzrlib/builtins.py:2876
1515msgid " bzr ignore \"lib/**/*.o\""
1516msgstr ""
1517
1518#: bzrlib/builtins.py:2880
1519msgid " bzr ignore \"RE:lib/.*\\.o\""
1520msgstr ""
1521
1522#: bzrlib/builtins.py:2882
1523msgid " Ignore everything but the \"debian\" toplevel directory::"
1524msgstr ""
1525
1526#: bzrlib/builtins.py:2884
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 ""
1537
1538# help of 'default-rules' option of 'ignore' command
1539#: bzrlib/builtins.py:2898
1540msgid "Display the default ignore rules that bzr uses."
1541msgstr ""
1542
1543#: bzrlib/builtins.py:2946
1544msgid "List ignored files and the patterns that matched them."
1545msgstr ""
1546
1547#: bzrlib/builtins.py:2948
1548msgid ""
1549"List all the ignored files and the ignore pattern that caused the file to\n"
1550"be ignored."
1551msgstr ""
1552
1553#: bzrlib/builtins.py:2951
1554msgid "Alternatively, to list just the files::"
1555msgstr ""
1556
1557#: bzrlib/builtins.py:2953
1558msgid " bzr ls --ignored"
1559msgstr ""
1560
1561#: bzrlib/builtins.py:2994
1562msgid "Export current or past revision to a destination directory or archive."
1563msgstr ""
1564
1565#: bzrlib/builtins.py:2996
1566msgid "If no revision is specified this exports the last committed revision."
1567msgstr ""
1568
1569#: bzrlib/builtins.py:2998
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 ""
1575
1576#: bzrlib/builtins.py:3002
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 ""
1582
1583#: bzrlib/builtins.py:3006
1584msgid ""
1585"If branch is omitted then the branch containing the current working\n"
1586"directory will be used."
1587msgstr ""
1588
1589#: bzrlib/builtins.py:3009
1590msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1591msgstr ""
1592
1593#: bzrlib/builtins.py:3011
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 ""
1605
1606# help of 'format' option of 'export' command
1607#: bzrlib/builtins.py:3025
1608msgid "Type of file to export to."
1609msgstr ""
1610
1611# help of 'filters' option of 'export' command
1612#: bzrlib/builtins.py:3028
1613msgid "Apply content filters to export the convenient form."
1614msgstr ""
1615
1616# help of 'root' option of 'export' command
1617#: bzrlib/builtins.py:3032
1618msgid "Name of the root directory inside the exported file."
1619msgstr ""
1620
1621# help of 'per-file-timestamps' option of 'export' command
1622#: bzrlib/builtins.py:3034
1623msgid ""
1624"Set modification time of files to that of the last revision in which it was "
1625"changed."
1626msgstr ""
1627
1628#: bzrlib/builtins.py:3058
1629msgid "Write the contents of a file as of a given revision to standard output."
1630msgstr ""
1631
1632#: bzrlib/builtins.py:3060
1633msgid "If no revision is nominated, the last revision is used."
1634msgstr ""
1635
1636#: bzrlib/builtins.py:3062
1637msgid ""
1638"Note: Take care to redirect standard output when using this command on a\n"
1639"binary file."
1640msgstr ""
1641
1642# help of 'filters' option of 'cat' command
1643#: bzrlib/builtins.py:3069
1644msgid "Apply content filters to display the convenience form."
1645msgstr ""
1646
1647#: bzrlib/builtins.py:3140
1648msgid "Commit changes into a new revision."
1649msgstr ""
1650
1651#: bzrlib/builtins.py:3142
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 ""
1660
1661#: bzrlib/builtins.py:3149
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 ""
1667
1668#: bzrlib/builtins.py:3153
1669msgid ":Selective commits:"
1670msgstr ""
1671
1672#: bzrlib/builtins.py:3155
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 ""
1678
1679#: bzrlib/builtins.py:3159
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 ""
1685
1686#: bzrlib/builtins.py:3163
1687msgid " bzr commit foo -x foo/bar"
1688msgstr ""
1689
1690#: bzrlib/builtins.py:3165
1691msgid " A selective commit after a merge is not yet supported."
1692msgstr ""
1693
1694#: bzrlib/builtins.py:3167
1695msgid ":Custom authors:"
1696msgstr ""
1697
1698#: bzrlib/builtins.py:3169
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 <jdoe@example.com>\". 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 ""
1707
1708#: bzrlib/builtins.py:3176
1709msgid ":Checks:"
1710msgstr ""
1711
1712#: bzrlib/builtins.py:3178
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 ""
1720
1721#: bzrlib/builtins.py:3184
1722msgid ":Things to note:"
1723msgstr ""
1724
1725#: bzrlib/builtins.py:3186
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 ""
1731
1732#: bzrlib/builtins.py:3190
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 ""
1739
1740# help of 'exclude' option of 'commit' command
1741#: bzrlib/builtins.py:3200
1742msgid "Do not consider changes made to a given path."
1743msgstr ""
1744
1745# help of 'message' option of 'commit' command
1746#: bzrlib/builtins.py:3203
1747msgid "Description of the new revision."
1748msgstr ""
1749
1750# help of 'unchanged' option of 'commit' command
1751#: bzrlib/builtins.py:3206
1752msgid "Commit even if nothing has changed."
1753msgstr ""
1754
1755# help of 'file' option of 'commit' command
1756#: bzrlib/builtins.py:3210
1757msgid "Take commit message from this file."
1758msgstr ""
1759
1760# help of 'strict' option of 'commit' command
1761#: bzrlib/builtins.py:3212
1762msgid "Refuse to commit if there are unknown files in the working tree."
1763msgstr ""
1764
1765# help of 'commit-time' option of 'commit' command
1766#: bzrlib/builtins.py:3215
1767msgid ""
1768"Manually set a commit time using commit date format, e.g. '2009-10-10 "
1769"08:00:00 +0100'."
1770msgstr ""
1771
1772# help of 'fixes' option of 'commit' command
1773#: bzrlib/builtins.py:3218
1774msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
1775msgstr ""
1776
1777# help of 'author' option of 'commit' command
1778#: bzrlib/builtins.py:3221
1779msgid "Set the author's name, if it's different from the committer."
1780msgstr ""
1781
1782# help of 'local' option of 'commit' command
1783#: bzrlib/builtins.py:3224
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 ""
1788
1789# help of 'show-diff' option of 'commit' command
1790#: bzrlib/builtins.py:3230
1791msgid ""
1792"When no message is supplied, show the diff along with the status summary in "
1793"the message editor."
1794msgstr ""
1795
1796# help of 'lossy' option of 'commit' command
1797#: bzrlib/builtins.py:3233
1798msgid ""
1799"When committing to a foreign version control system do not push data that "
1800"can not be natively represented."
1801msgstr ""
1802
1803#: bzrlib/builtins.py:3391
1804msgid ""
1805"Validate working tree structure, branch consistency and repository history."
1806msgstr ""
1807
1808#: bzrlib/builtins.py:3393
1809msgid ""
1810"This command checks various invariants about branch and repository storage\n"
1811"to detect data corruption or bzr bugs."
1812msgstr ""
1813
1814#: bzrlib/builtins.py:3396
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 ""
1819
1820#: bzrlib/builtins.py:3399
1821msgid ""
1822"revisions\n"
1823" This is just the number of revisions checked. It doesn't\n"
1824" indicate a problem."
1825msgstr ""
1826
1827#: bzrlib/builtins.py:3403
1828msgid ""
1829"versionedfiles\n"
1830" This is just the number of versionedfiles checked. It\n"
1831" doesn't indicate a problem."
1832msgstr ""
1833
1834#: bzrlib/builtins.py:3407
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 ""
1841
1842#: bzrlib/builtins.py:3412
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 ""
1848
1849#: bzrlib/builtins.py:3416
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 ""
1857
1858#: bzrlib/builtins.py:3422
1859msgid ""
1860"If no restrictions are specified, all Bazaar data that is found at the "
1861"given\n"
1862"location will be checked."
1863msgstr ""
1864
1865#: bzrlib/builtins.py:3425
1866msgid ":Examples:"
1867msgstr ""
1868
1869#: bzrlib/builtins.py:3427
1870msgid " Check the tree and branch at 'foo'::"
1871msgstr ""
1872
1873#: bzrlib/builtins.py:3429
1874msgid " bzr check --tree --branch foo"
1875msgstr ""
1876
1877#: bzrlib/builtins.py:3431
1878msgid " Check only the repository at 'bar'::"
1879msgstr ""
1880
1881#: bzrlib/builtins.py:3433
1882msgid " bzr check --repo bar"
1883msgstr ""
1884
1885#: bzrlib/builtins.py:3435
1886msgid " Check everything at 'baz'::"
1887msgstr ""
1888
1889#: bzrlib/builtins.py:3437
1890msgid " bzr check baz"
1891msgstr ""
1892
1893# help of 'branch' option of 'check' command
1894#: bzrlib/builtins.py:3443
1895msgid "Check the branch related to the current directory."
1896msgstr ""
1897
1898# help of 'repo' option of 'check' command
1899#: bzrlib/builtins.py:3445
1900msgid "Check the repository related to the current directory."
1901msgstr ""
1902
1903# help of 'tree' option of 'check' command
1904#: bzrlib/builtins.py:3447
1905msgid "Check the working tree related to the current directory."
1906msgstr ""
1907
1908#: bzrlib/builtins.py:3461
1909msgid "Upgrade a repository, branch or working tree to a newer format."
1910msgstr ""
1911
1912#: bzrlib/builtins.py:3463
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 ""
1920
1921#: bzrlib/builtins.py:3469
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 ""
1930
1931#: bzrlib/builtins.py:3476
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"
1939"afterwards."
1940msgstr ""
1941
1942#: bzrlib/builtins.py:3484
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"
1947"tried."
1948msgstr ""
1949
1950#: bzrlib/builtins.py:3489
1951msgid ""
1952"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
1953"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
1954msgstr ""
1955
1956# help of 'format' option of 'upgrade' command
1957#: bzrlib/builtins.py:3497
1958msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
1959msgstr ""
1960
1961# title of 'format' option of 'init' command
1962#: bzrlib/builtins.py:3501
1963msgid "Branch format"
1964msgstr ""
1965
1966# help of 'clean' option of 'upgrade' command
1967#: bzrlib/builtins.py:3503
1968msgid "Remove the backup.bzr directory if successful."
1969msgstr ""
1970
1971#: bzrlib/builtins.py:3520
1972msgid "Show or set bzr user id."
1973msgstr ""
1974
1975#: bzrlib/builtins.py:3522
1976msgid ""
1977":Examples:\n"
1978" Show the email of the current user::"
1979msgstr ""
1980
1981#: bzrlib/builtins.py:3525
1982msgid " bzr whoami --email"
1983msgstr ""
1984
1985#: bzrlib/builtins.py:3527
1986msgid " Set the current user::"
1987msgstr ""
1988
1989#: bzrlib/builtins.py:3529
1990msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
1991msgstr ""
1992
1993# help of 'email' option of 'whoami' command
1994#: bzrlib/builtins.py:3533
1995msgid "Display email address only."
1996msgstr ""
1997
1998# help of 'branch' option of 'whoami' command
1999#: bzrlib/builtins.py:3535
2000msgid "Set identity for the current branch instead of globally."
2001msgstr ""
2002
2003#: bzrlib/builtins.py:3581
2004msgid "Print or set the branch nickname."
2005msgstr ""
2006
2007#: bzrlib/builtins.py:3583
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 ""
2012
2013#: bzrlib/builtins.py:3586
2014msgid ""
2015"Bound branches use the nickname of its master branch unless it is set\n"
2016"locally."
2017msgstr ""
2018
2019#: bzrlib/builtins.py:3606
2020msgid "Set/unset and display aliases."
2021msgstr ""
2022
2023#: bzrlib/builtins.py:3608
2024msgid ""
2025":Examples:\n"
2026" Show the current aliases::"
2027msgstr ""
2028
2029#: bzrlib/builtins.py:3611
2030msgid " bzr alias"
2031msgstr ""
2032
2033#: bzrlib/builtins.py:3613
2034msgid " Show the alias specified for 'll'::"
2035msgstr ""
2036
2037#: bzrlib/builtins.py:3615
2038msgid " bzr alias ll"
2039msgstr ""
2040
2041#: bzrlib/builtins.py:3617
2042msgid " Set an alias for 'll'::"
2043msgstr ""
2044
2045#: bzrlib/builtins.py:3619
2046msgid " bzr alias ll=\"log --line -r-10..-1\""
2047msgstr ""
2048
2049#: bzrlib/builtins.py:3621
2050msgid " To remove an alias for 'll'::"
2051msgstr ""
2052
2053#: bzrlib/builtins.py:3623
2054msgid " bzr alias --remove ll"
2055msgstr ""
2056
2057# help of 'remove' option of 'alias' command
2058#: bzrlib/builtins.py:3628
2059msgid "Remove the alias."
2060msgstr ""
2061
2062#: bzrlib/builtins.py:3867
2063msgid "Show version of bzr."
2064msgstr ""
2065
2066# help of 'short' option of 'version' command
2067#: bzrlib/builtins.py:3871
2068msgid "Print just the version number."
2069msgstr ""
2070
2071#: bzrlib/builtins.py:3918
2072msgid "Perform a three-way merge."
2073msgstr ""
2074
2075#: bzrlib/builtins.py:3920
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 ""
2085
2086#: bzrlib/builtins.py:3928
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 ""
2092
2093#: bzrlib/builtins.py:3932
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 ""
2098
2099#: bzrlib/builtins.py:3935
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 ""
2109
2110#: bzrlib/builtins.py:3943
2111msgid "Revision numbers are always relative to the source branch."
2112msgstr ""
2113
2114#: bzrlib/builtins.py:3950
2115msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2116msgstr ""
2117
2118#: bzrlib/builtins.py:3952
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 ""
2125
2126#: bzrlib/builtins.py:3957
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 ""
2132
2133#: bzrlib/builtins.py:3961
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 ""
2141
2142#: bzrlib/builtins.py:3967
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 ""
2148
2149#: bzrlib/builtins.py:3971
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 ""
2154
2155#: bzrlib/builtins.py:3974
2156msgid ""
2157":Examples:\n"
2158" To merge all new revisions from bzr.dev::"
2159msgstr ""
2160
2161#: bzrlib/builtins.py:3977
2162msgid " bzr merge ../bzr.dev"
2163msgstr ""
2164
2165#: bzrlib/builtins.py:3979
2166msgid " To merge changes up to and including revision 82 from bzr.dev::"
2167msgstr ""
2168
2169#: bzrlib/builtins.py:3981
2170msgid " bzr merge -r 82 ../bzr.dev"
2171msgstr ""
2172
2173#: bzrlib/builtins.py:3983
2174msgid " To merge the changes introduced by 82, without previous changes::"
2175msgstr ""
2176
2177#: bzrlib/builtins.py:3985
2178msgid " bzr merge -r 81..82 ../bzr.dev"
2179msgstr ""
2180
2181#: bzrlib/builtins.py:3987
2182msgid " To apply a merge directive contained in /tmp/merge::"
2183msgstr ""
2184
2185#: bzrlib/builtins.py:3989
2186msgid " bzr merge /tmp/merge"
2187msgstr ""
2188
2189#: bzrlib/builtins.py:3991
2190msgid ""
2191" To create a merge revision with three parents from two branches\n"
2192" feature1a and feature1b:"
2193msgstr ""
2194
2195#: bzrlib/builtins.py:3994
2196msgid ""
2197" bzr merge ../feature1a\n"
2198" bzr merge ../feature1b --force\n"
2199" bzr commit -m 'revision with three parents'"
2200msgstr ""
2201
2202# help of 'force' option of 'merge' command
2203#: bzrlib/builtins.py:4006
2204msgid "Merge even if the destination tree has uncommitted changes."
2205msgstr ""
2206
2207# help of 'uncommitted' option of 'merge' command
2208#: bzrlib/builtins.py:4012
2209msgid ""
2210"Apply uncommitted changes from a working copy, instead of branch changes."
2211msgstr ""
2212
2213# help of 'pull' option of 'merge' command
2214#: bzrlib/builtins.py:4014
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 ""
2220
2221# help of 'directory' option of 'merge' command
2222#: bzrlib/builtins.py:4019
2223msgid ""
2224"Branch to merge into, rather than the one containing the working directory."
2225msgstr ""
2226
2227# help of 'preview' option of 'merge' command
2228#: bzrlib/builtins.py:4021
2229msgid "Instead of merging, show a diff of the merge."
2230msgstr ""
2231
2232# help of 'interactive' option of 'merge' command
2233#: bzrlib/builtins.py:4023
2234msgid "Select changes interactively."
2235msgstr ""
2236
2237#: bzrlib/builtins.py:4307
2238msgid "Redo a merge."
2239msgstr ""
2240
2241#: bzrlib/builtins.py:4309
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 ""
2247
2248#: bzrlib/builtins.py:4313
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 ""
2254
2255#: bzrlib/builtins.py:4317
2256msgid ""
2257":Examples:\n"
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 ""
2261
2262#: bzrlib/builtins.py:4321
2263msgid " bzr remerge --show-base"
2264msgstr ""
2265
2266#: bzrlib/builtins.py:4323
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 ""
2271
2272#: bzrlib/builtins.py:4326
2273msgid " bzr remerge --merge-type weave --reprocess foobar"
2274msgstr ""
2275
2276# help of 'show-base' option of 'merge' command
2277#: bzrlib/builtins.py:4333
2278msgid "Show base revision text in conflicts."
2279msgstr ""
2280
2281#: bzrlib/builtins.py:4401
2282msgid "Revert files to a previous revision."
2283msgstr ""
2284
2285#: bzrlib/builtins.py:4403
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 ""
2291
2292#: bzrlib/builtins.py:4407
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 ""
2300
2301#: bzrlib/builtins.py:4413
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 ""
2307
2308#: bzrlib/builtins.py:4417
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"
2313"reverted."
2314msgstr ""
2315
2316#: bzrlib/builtins.py:4422
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"
2321"deleted."
2322msgstr ""
2323
2324#: bzrlib/builtins.py:4427
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 ""
2335
2336#: bzrlib/builtins.py:4436
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 "
2341"keep\n"
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 ""
2349
2350# help of 'no-backup' option of 'revert' command
2351#: bzrlib/builtins.py:4450
2352msgid "Do not save backups of reverted files."
2353msgstr ""
2354
2355# help of 'forget-merges' option of 'revert' command
2356#: bzrlib/builtins.py:4452
2357msgid "Remove pending merge marker, without changing any files."
2358msgstr ""
2359
2360#: bzrlib/builtins.py:4483
2361msgid ""
2362"Show help on a command or other topic.\n"
2363" "
2364msgstr ""
2365
2366# help of 'long' option of 'help' command
2367#: bzrlib/builtins.py:4488
2368msgid "Show help on all commands."
2369msgstr ""
2370
2371#: bzrlib/builtins.py:4517
2372msgid "Show unmerged/unpulled revisions between two branches."
2373msgstr ""
2374
2375#: bzrlib/builtins.py:4519
2376msgid "OTHER_BRANCH may be local or remote."
2377msgstr ""
2378
2379#: bzrlib/builtins.py:4521
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 ""
2389
2390#: bzrlib/builtins.py:4531
2391msgid ""
2392" Determine the missing revisions between this and the branch at the\n"
2393" remembered pull location::"
2394msgstr ""
2395
2396#: bzrlib/builtins.py:4534
2397msgid " bzr missing"
2398msgstr ""
2399
2400#: bzrlib/builtins.py:4536
2401msgid " Determine the missing revisions between this and another branch::"
2402msgstr ""
2403
2404#: bzrlib/builtins.py:4538
2405msgid " bzr missing http://server/branch"
2406msgstr ""
2407
2408#: bzrlib/builtins.py:4540
2409msgid ""
2410" Determine the missing revisions up to a specific revision on the other\n"
2411" branch::"
2412msgstr ""
2413
2414#: bzrlib/builtins.py:4543
2415msgid " bzr missing -r ..-10"
2416msgstr ""
2417
2418#: bzrlib/builtins.py:4545
2419msgid ""
2420" Determine the missing revisions up to a specific revision on this\n"
2421" branch::"
2422msgstr ""
2423
2424#: bzrlib/builtins.py:4548
2425msgid " bzr missing --my-revision ..-10"
2426msgstr ""
2427
2428# help of 'reverse' option of 'missing' command
2429#: bzrlib/builtins.py:4555
2430msgid "Reverse the order of revisions."
2431msgstr ""
2432
2433# help of 'mine-only' option of 'missing' command
2434#: bzrlib/builtins.py:4557
2435msgid "Display changes in the local branch only."
2436msgstr ""
2437
2438# help of 'this' option of 'missing' command
2439#: bzrlib/builtins.py:4558
2440msgid "Same as --mine-only."
2441msgstr ""
2442
2443# help of 'theirs-only' option of 'missing' command
2444#: bzrlib/builtins.py:4560
2445msgid "Display changes in the remote branch only."
2446msgstr ""
2447
2448# help of 'other' option of 'missing' command
2449#: bzrlib/builtins.py:4561
2450msgid "Same as --theirs-only."
2451msgstr ""
2452
2453# help of 'revision' option of 'missing' command
2454#: bzrlib/builtins.py:4566
2455msgid ""
2456"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2457"details."
2458msgstr ""
2459
2460# help of 'my-revision' option of 'missing' command
2461#: bzrlib/builtins.py:4570
2462msgid ""
2463"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2464"details."
2465msgstr ""
2466
2467# help of 'include-merges' option of 'missing' command
2468#: bzrlib/builtins.py:4573
2469msgid "Show all revisions in addition to the mainline ones."
2470msgstr ""
2471
2472#: bzrlib/builtins.py:4689
2473msgid "Compress the data within a repository."
2474msgstr ""
2475
2476#: bzrlib/builtins.py:4691
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 ""
2482
2483#: bzrlib/builtins.py:4695
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"
2489"used."
2490msgstr ""
2491
2492#: bzrlib/builtins.py:4701
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 ""
2499
2500# help of 'clean-obsolete-packs' option of 'pack' command
2501#: bzrlib/builtins.py:4710
2502msgid "Delete obsolete packs to save disk space."
2503msgstr ""
2504
2505#: bzrlib/builtins.py:4724
2506msgid "List the installed plugins."
2507msgstr ""
2508
2509#: bzrlib/builtins.py:4726
2510msgid ""
2511"This command displays the list of installed plugins including\n"
2512"version of plugin and a short description of each."
2513msgstr ""
2514
2515#: bzrlib/builtins.py:4729
2516msgid "--verbose shows the path where each plugin is located."
2517msgstr ""
2518
2519#: bzrlib/builtins.py:4731
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 ""
2527
2528#: bzrlib/builtins.py:4737
2529msgid ""
2530"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\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 ""
2535
2536#: bzrlib/builtins.py:4753
2537msgid "Show testament (signing-form) of a revision."
2538msgstr ""
2539
2540# help of 'long' option of 'testament' command
2541#: bzrlib/builtins.py:4756
2542msgid "Produce long-format testament."
2543msgstr ""
2544
2545# help of 'strict' option of 'testament' command
2546#: bzrlib/builtins.py:4758
2547msgid "Produce a strict-format testament."
2548msgstr ""
2549
2550#: bzrlib/builtins.py:4784
2551msgid "Show the origin of each line in a file."
2552msgstr ""
2553
2554#: bzrlib/builtins.py:4786
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 ""
2559
2560#: bzrlib/builtins.py:4789
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 ""
2565
2566# help of 'all' option of 'annotate' command
2567#: bzrlib/builtins.py:4797
2568msgid "Show annotations on all lines."
2569msgstr ""
2570
2571# help of 'long' option of 'annotate' command
2572#: bzrlib/builtins.py:4798
2573msgid "Show commit date in annotations."
2574msgstr ""
2575
2576#: bzrlib/builtins.py:4901
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 ""
2581
2582#: bzrlib/builtins.py:4904
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 ""
2587
2588#: bzrlib/builtins.py:4907
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 ""
2594
2595#: bzrlib/builtins.py:4942
2596msgid "Convert the current checkout into a regular branch."
2597msgstr ""
2598
2599#: bzrlib/builtins.py:4944
2600msgid ""
2601"After unbinding, the local branch is considered independent and subsequent\n"
2602"commits will be local only."
2603msgstr ""
2604
2605#: bzrlib/builtins.py:4959
2606msgid "Remove the last committed revision."
2607msgstr ""
2608
2609#: bzrlib/builtins.py:4961
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 ""
2615
2616#: bzrlib/builtins.py:4965
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 ""
2622
2623#: bzrlib/builtins.py:4969
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 ""
2629
2630# help of 'dry-run' option of 'uncommit' command
2631#: bzrlib/builtins.py:4980
2632msgid "Don't actually make changes."
2633msgstr ""
2634
2635# help of 'force' option of 'uncommit' command
2636#: bzrlib/builtins.py:4981
2637msgid "Say yes to all questions."
2638msgstr ""
2639
2640# help of 'local' option of 'uncommit' command
2641#: bzrlib/builtins.py:4983
2642msgid "Only remove the commits from the local branch when in a checkout."
2643msgstr ""
2644
2645#: bzrlib/builtins.py:5068
2646msgid "Break a dead lock."
2647msgstr ""
2648
2649#: bzrlib/builtins.py:5070
2650msgid ""
2651"This command breaks a lock on a repository, branch, working directory or\n"
2652"config file."
2653msgstr ""
2654
2655#: bzrlib/builtins.py:5073
2656msgid ""
2657"CAUTION: Locks should only be broken when you are sure that the process\n"
2658"holding the lock has been stopped."
2659msgstr ""
2660
2661#: bzrlib/builtins.py:5076
2662msgid ""
2663"You can get information on what locks are open via the 'bzr info\n"
2664"[location]' command."
2665msgstr ""
2666
2667#: bzrlib/builtins.py:5079
2668msgid ""
2669":Examples:\n"
2670" bzr break-lock\n"
2671" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
2672" bzr break-lock --conf ~/.bazaar"
2673msgstr ""
2674
2675# help of 'config' option of 'break-lock' command
2676#: bzrlib/builtins.py:5088
2677msgid "LOCATION is the directory where the config lock is."
2678msgstr ""
2679
2680# help of 'force' option of 'break-lock' command
2681#: bzrlib/builtins.py:5090
2682msgid "Do not ask for confirmation before breaking the lock."
2683msgstr ""
2684
2685#: bzrlib/builtins.py:5126
2686msgid "Run the bzr server."
2687msgstr ""
2688
2689# help of 'inet' option of 'serve' command
2690#: bzrlib/builtins.py:5132
2691msgid "Serve on stdin/out for use from inetd or sshd."
2692msgstr ""
2693
2694# title of 'protocol' option of 'serve' command
2695#: bzrlib/builtins.py:5133
2696msgid "protocol"
2697msgstr ""
2698
2699# help of 'protocol' option of 'serve' command
2700#: bzrlib/builtins.py:5134
2701msgid "Protocol to serve."
2702msgstr ""
2703
2704# help of 'port' option of 'serve' command
2705#: bzrlib/builtins.py:5138
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 ""
2711
2712# help of 'directory' option of 'serve' command
2713#: bzrlib/builtins.py:5144
2714msgid "Serve contents of this directory."
2715msgstr ""
2716
2717# help of 'allow-writes' option of 'serve' command
2718#: bzrlib/builtins.py:5146
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 ""
2726
2727#: bzrlib/builtins.py:5191
2728msgid "Combine a tree into its containing tree."
2729msgstr ""
2730
2731#: bzrlib/builtins.py:5193
2732msgid "This command requires the target tree to be in a rich-root format."
2733msgstr ""
2734
2735#: bzrlib/builtins.py:5195
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 ""
2741
2742#: bzrlib/builtins.py:5199
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 ""
2748
2749#: bzrlib/builtins.py:5237
2750msgid "Split a subdirectory of a tree into a separate tree."
2751msgstr ""
2752
2753#: bzrlib/builtins.py:5239
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 ""
2759
2760#: bzrlib/builtins.py:5243
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 ""
2766
2767#: bzrlib/builtins.py:5364
2768msgid "Mail or create a merge-directive for submitting changes."
2769msgstr ""
2770
2771#: bzrlib/builtins.py:5366
2772msgid "A merge directive provides many things needed for requesting merges:"
2773msgstr ""
2774
2775#: bzrlib/builtins.py:5368
2776msgid "* A machine-readable description of the merge to perform"
2777msgstr ""
2778
2779#: bzrlib/builtins.py:5370
2780msgid "* An optional patch that is a preview of the changes requested"
2781msgstr ""
2782
2783#: bzrlib/builtins.py:5372
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 ""
2789
2790#: bzrlib/builtins.py:5376
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 ""
2795
2796#: bzrlib/builtins.py:5379
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 ""
2802
2803#: bzrlib/builtins.py:5383
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 ""
2811
2812#: bzrlib/builtins.py:5389
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 ""
2820
2821#: bzrlib/builtins.py:5395
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 ""
2829
2830#: bzrlib/builtins.py:5401
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 ""
2837
2838#: bzrlib/builtins.py:5406
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 ""
2843
2844#: bzrlib/builtins.py:5409
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 ""
2850
2851#: bzrlib/builtins.py:5413
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\", \"mail.app"
2856"\" (MacOS X's\n"
2857"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
2858"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
2859"add\n"
2860"supported clients."
2861msgstr ""
2862
2863#: bzrlib/builtins.py:5420
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 ""
2870
2871#: bzrlib/builtins.py:5425
2872msgid ""
2873"Two formats are currently supported: \"4\" uses revision bundle format 4 "
2874"and\n"
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 ""
2880
2881#: bzrlib/builtins.py:5431
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 ""
2886
2887#: bzrlib/builtins.py:5434
2888msgid ""
2889"bzr send makes extensive use of public locations to map local locations "
2890"into\n"
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 ""
2894
2895# help of 'output' option of 'send' command
2896#: bzrlib/builtins.py:5458
2897msgid "Write merge directive to this file or directory; use - for stdout."
2898msgstr ""
2899
2900# help of 'strict' option of 'send' command
2901#: bzrlib/builtins.py:5462
2902msgid ""
2903"Refuse to send if there are uncommitted changes in the working tree, --no-"
2904"strict disables the check."
2905msgstr ""
2906
2907# help of 'mail-to' option of 'send' command
2908#: bzrlib/builtins.py:5464
2909msgid "Mail the request to this address."
2910msgstr ""
2911
2912# help of 'body' option of 'send' command
2913#: bzrlib/builtins.py:5468
2914msgid "Body for the email."
2915msgstr ""
2916
2917# help of 'no-bundle' option of 'send' command
2918#: bzrlib/builtins.py:5521
2919msgid "Do not include a bundle in the merge directive."
2920msgstr ""
2921
2922# help of 'no-patch' option of 'send' command
2923#: bzrlib/builtins.py:5522
2924msgid "Do not include a preview patch in the merge directive."
2925msgstr ""
2926
2927# help of 'remember' option of 'send' command
2928#: bzrlib/builtins.py:5525
2929msgid "Remember submit and public branch."
2930msgstr ""
2931
2932# help of 'from' option of 'send' command
2933#: bzrlib/builtins.py:5527
2934msgid ""
2935"Branch to generate the submission from, rather than the one containing the "
2936"working directory."
2937msgstr ""
2938
2939# title of 'format' option of 'send' command
2940#: bzrlib/builtins.py:5537
2941msgid "format"
2942msgstr ""
2943
2944# help of 'format' option of 'send' command
2945#: bzrlib/builtins.py:5538
2946msgid "Use the specified output format."
2947msgstr ""
2948
2949#: bzrlib/builtins.py:5560
2950msgid "Create, remove or modify a tag naming a revision."
2951msgstr ""
2952
2953#: bzrlib/builtins.py:5562
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 ""
2959
2960#: bzrlib/builtins.py:5566
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 ""
2965
2966#: bzrlib/builtins.py:5569
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 ""
2971
2972#: bzrlib/builtins.py:5572
2973msgid ""
2974"To rename a tag (change the name but keep it on the same revsion), run "
2975"``bzr\n"
2976"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
2977msgstr ""
2978
2979#: bzrlib/builtins.py:5575
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 configure.ac. See ``bzr help hooks`` for\n"
2984"details."
2985msgstr ""
2986
2987# help of 'delete' option of 'tag' command
2988#: bzrlib/builtins.py:5585
2989msgid "Delete this tag rather than placing it."
2990msgstr ""
2991
2992# help of 'directory' option of 'tag' command
2993#: bzrlib/builtins.py:5588
2994msgid "Branch in which to place the tag."
2995msgstr ""
2996
2997# help of 'force' option of 'tag' command
2998#: bzrlib/builtins.py:5590
2999msgid "Replace existing tags."
3000msgstr ""
3001
3002#: bzrlib/builtins.py:5629
3003msgid "List tags."
3004msgstr ""
3005
3006#: bzrlib/builtins.py:5631
3007msgid ""
3008"This command shows a table of tag names and the revisions they reference."
3009msgstr ""
3010
3011# help of 'directory' option of 'tags' command
3012#: bzrlib/builtins.py:5637
3013msgid "Branch whose tags should be displayed."
3014msgstr ""
3015
3016# help of 'sort' option of 'tags' command
3017#: bzrlib/builtins.py:5639
3018msgid "Sort tags by different criteria."
3019msgstr ""
3020
3021# title of 'sort' option of 'tags' command
3022#: bzrlib/builtins.py:5639
3023msgid "Sorting"
3024msgstr ""
3025
3026#: bzrlib/builtins.py:5684
3027msgid "Reconfigure the type of a bzr directory."
3028msgstr ""
3029
3030#: bzrlib/builtins.py:5686
3031msgid "A target configuration must be specified."
3032msgstr ""
3033
3034#: bzrlib/builtins.py:5688
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 ""
3044
3045# title of 'target_type' option of 'reconfigure' command
3046#: bzrlib/builtins.py:5702
3047msgid "Target type"
3048msgstr ""
3049
3050# help of 'target_type' option of 'reconfigure' command
3051#: bzrlib/builtins.py:5703
3052msgid "The type to reconfigure the directory to."
3053msgstr ""
3054
3055# help of 'bind-to' option of 'reconfigure' command
3056#: bzrlib/builtins.py:5718
3057msgid "Branch to bind checkout to."
3058msgstr ""
3059
3060# help of 'force' option of 'reconfigure' command
3061#: bzrlib/builtins.py:5720
3062msgid "Perform reconfiguration even if local changes will be lost."
3063msgstr ""
3064
3065# help of 'stacked-on' option of 'reconfigure' command
3066#: bzrlib/builtins.py:5723
3067msgid "Reconfigure a branch to be stacked on another branch."
3068msgstr ""
3069
3070# help of 'unstacked' option of 'reconfigure' command
3071#: bzrlib/builtins.py:5727
3072msgid ""
3073"Reconfigure a branch to be unstacked. This may require copying substantial "
3074"data into it."
3075msgstr ""
3076
3077#: bzrlib/builtins.py:5775
3078msgid "Set the branch of a checkout and update."
3079msgstr ""
3080
3081#: bzrlib/builtins.py:5777
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 ""
3088
3089#: bzrlib/builtins.py:5782
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 ""
3094
3095#: bzrlib/builtins.py:5785
3096msgid "Pending merges need to be committed or reverted before using switch."
3097msgstr ""
3098
3099#: bzrlib/builtins.py:5787
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"
3104"/path/to/newbranch."
3105msgstr ""
3106
3107#: bzrlib/builtins.py:5792
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 ""
3113
3114# help of 'force' option of 'switch' command
3115#: bzrlib/builtins.py:5800
3116msgid "Switch even if local commits will be lost."
3117msgstr ""
3118
3119# help of 'create-branch' option of 'switch' command
3120#: bzrlib/builtins.py:5803
3121msgid "Create the target branch from this one before switching to it."
3122msgstr ""
3123
3124#: bzrlib/builtins.py:5872
3125msgid "Manage filtered views."
3126msgstr ""
3127
3128#: bzrlib/builtins.py:5874
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 ""
3137
3138#: bzrlib/builtins.py:5881
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 ""
3145
3146#: bzrlib/builtins.py:5886
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 ""
3153
3154#: bzrlib/builtins.py:5891
3155msgid ""
3156":Examples:\n"
3157" To define the current view::"
3158msgstr ""
3159
3160#: bzrlib/builtins.py:5894
3161msgid " bzr view file1 dir1 ..."
3162msgstr ""
3163
3164#: bzrlib/builtins.py:5896
3165msgid " To list the current view::"
3166msgstr ""
3167
3168#: bzrlib/builtins.py:5898
3169msgid " bzr view"
3170msgstr ""
3171
3172#: bzrlib/builtins.py:5900
3173msgid " To delete the current view::"
3174msgstr ""
3175
3176#: bzrlib/builtins.py:5902
3177msgid " bzr view --delete"
3178msgstr ""
3179
3180#: bzrlib/builtins.py:5904
3181msgid " To disable the current view without deleting it::"
3182msgstr ""
3183
3184#: bzrlib/builtins.py:5906
3185msgid " bzr view --switch off"
3186msgstr ""
3187
3188#: bzrlib/builtins.py:5908
3189msgid " To define a named view and switch to it::"
3190msgstr ""
3191
3192#: bzrlib/builtins.py:5910
3193msgid " bzr view --name view-name file1 dir1 ..."
3194msgstr ""
3195
3196#: bzrlib/builtins.py:5912
3197msgid " To list a named view::"
3198msgstr ""
3199
3200#: bzrlib/builtins.py:5914
3201msgid " bzr view --name view-name"
3202msgstr ""
3203
3204#: bzrlib/builtins.py:5916
3205msgid " To delete a named view::"
3206msgstr ""
3207
3208#: bzrlib/builtins.py:5918
3209msgid " bzr view --name view-name --delete"
3210msgstr ""
3211
3212#: bzrlib/builtins.py:5920
3213msgid " To switch to a named view::"
3214msgstr ""
3215
3216#: bzrlib/builtins.py:5922
3217msgid " bzr view --switch view-name"
3218msgstr ""
3219
3220#: bzrlib/builtins.py:5924
3221msgid " To list all views defined::"
3222msgstr ""
3223
3224#: bzrlib/builtins.py:5926
3225msgid " bzr view --all"
3226msgstr ""
3227
3228#: bzrlib/builtins.py:5928
3229msgid " To delete all views::"
3230msgstr ""
3231
3232#: bzrlib/builtins.py:5930
3233msgid " bzr view --delete --all"
3234msgstr ""
3235
3236# help of 'all' option of 'view' command
3237#: bzrlib/builtins.py:5937
3238msgid "Apply list or delete action to all views."
3239msgstr ""
3240
3241# help of 'delete' option of 'view' command
3242#: bzrlib/builtins.py:5940
3243msgid "Delete the view."
3244msgstr ""
3245
3246# help of 'name' option of 'view' command
3247#: bzrlib/builtins.py:5943
3248msgid "Name of the view to define, list or delete."
3249msgstr ""
3250
3251# help of 'switch' option of 'view' command
3252#: bzrlib/builtins.py:5947
3253msgid "Name of the view to switch to."
3254msgstr ""
3255
3256#: bzrlib/builtins.py:6047
3257msgid "Remove a branch."
3258msgstr ""
3259
3260#: bzrlib/builtins.py:6049
3261msgid ""
3262"This will remove the branch from the specified location but \n"
3263"will keep any working tree or repository in place."
3264msgstr ""
3265
3266#: bzrlib/builtins.py:6054
3267msgid " Remove the branch at repo/trunk::"
3268msgstr ""
3269
3270#: bzrlib/builtins.py:6056
3271msgid " bzr remove-branch repo/trunk"
3272msgstr ""
3273
3274#: bzrlib/builtins.py:6072
3275msgid "Temporarily set aside some changes from the current tree."
3276msgstr ""
3277
3278#: bzrlib/builtins.py:6074
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 ""
3286
3287#: bzrlib/builtins.py:6080
3288msgid "If shelve --list is specified, previously-shelved changes are listed."
3289msgstr ""
3290
3291#: bzrlib/builtins.py:6082
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 ""
3298
3299#: bzrlib/builtins.py:6087
3300msgid ""
3301"If filenames are specified, only the changes to those files will be\n"
3302"shelved. Other files will be left untouched."
3303msgstr ""
3304
3305#: bzrlib/builtins.py:6090
3306msgid ""
3307"If a revision is specified, changes since that revision will be shelved."
3308msgstr ""
3309
3310#: bzrlib/builtins.py:6092
3311msgid ""
3312"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
3313"restore the most recently shelved changes."
3314msgstr ""
3315
3316#: bzrlib/builtins.py:6095
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 ""
3322
3323#: bzrlib/builtins.py:6099
3324msgid " change_editor = PROGRAM @new_path @old_path"
3325msgstr ""
3326
3327#: bzrlib/builtins.py:6101
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 ""
3335
3336# help of 'all' option of 'shelve' command
3337#: bzrlib/builtins.py:6113
3338msgid "Shelve all changes."
3339msgstr ""
3340
3341# help of 'writer' option of 'shelve' command
3342#: bzrlib/builtins.py:6115
3343msgid "Method to use for writing diffs."
3344msgstr ""
3345
3346# title of 'writer' option of 'shelve' command
3347#: bzrlib/builtins.py:6115
3348msgid "writer"
3349msgstr ""
3350
3351# help of 'list' option of 'shelve' command
3352#: bzrlib/builtins.py:6119
3353msgid "List shelved changes."
3354msgstr ""
3355
3356# help of 'destroy' option of 'shelve' command
3357#: bzrlib/builtins.py:6121
3358msgid "Destroy removed changes instead of shelving them."
3359msgstr ""
3360
3361#: bzrlib/builtins.py:6161
3362msgid "Restore shelved changes."
3363msgstr ""
3364
3365#: bzrlib/builtins.py:6163
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 ""
3371
3372# help of 'action' option of 'unshelve' command
3373#: bzrlib/builtins.py:6172
3374msgid "The action to perform."
3375msgstr ""
3376
3377#: bzrlib/builtins.py:6194
3378msgid "Remove unwanted files from working tree."
3379msgstr ""
3380
3381#: bzrlib/builtins.py:6196
3382msgid ""
3383"By default, only unknown files, not ignored files, are deleted. Versioned\n"
3384"files are never deleted."
3385msgstr ""
3386
3387#: bzrlib/builtins.py:6199
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"
3391"time.)"
3392msgstr ""
3393
3394#: bzrlib/builtins.py:6203
3395msgid ""
3396"If no options are specified, unknown files are deleted. Otherwise, option\n"
3397"flags are respected, and may be combined."
3398msgstr ""
3399
3400#: bzrlib/builtins.py:6206
3401msgid "To check what clean-tree will do, use --dry-run."
3402msgstr ""
3403
3404# help of 'ignored' option of 'clean-tree' command
3405#: bzrlib/builtins.py:6209
3406msgid "Delete all ignored files."
3407msgstr ""
3408
3409# help of 'detritus' option of 'clean-tree' command
3410#: bzrlib/builtins.py:6210
3411msgid ""
3412"Delete conflict files, merge and revert backups, and failed selftest dirs."
3413msgstr ""
3414
3415# help of 'unknown' option of 'clean-tree' command
3416#: bzrlib/builtins.py:6213
3417msgid "Delete files unknown to bzr (default)."
3418msgstr ""
3419
3420# help of 'dry-run' option of 'clean-tree' command
3421#: bzrlib/builtins.py:6214
3422msgid "Show files to delete instead of deleting them."
3423msgstr ""
3424
3425# help of 'force' option of 'clean-tree' command
3426#: bzrlib/builtins.py:6216
3427msgid "Do not prompt before deleting."
3428msgstr ""
3429
3430#: bzrlib/cmd_version_info.py:50
3431msgid "Show version information about this tree."
3432msgstr ""
3433
3434#: bzrlib/cmd_version_info.py:52
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 ""
3440
3441#: bzrlib/cmd_version_info.py:56
3442msgid "For example::"
3443msgstr ""
3444
3445#: bzrlib/cmd_version_info.py:58
3446msgid ""
3447" bzr version-info --custom \\\n"
3448" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
3449msgstr ""
3450
3451#: bzrlib/cmd_version_info.py:61
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 ""
3456
3457#: bzrlib/cmd_version_info.py:64
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 ""
3467
3468# help of 'format' option of 'version-info' command
3469#: bzrlib/cmd_version_info.py:74
3470msgid "Select the output format."
3471msgstr ""
3472
3473# help of 'all' option of 'version-info' command
3474#: bzrlib/cmd_version_info.py:78
3475msgid "Include all possible information."
3476msgstr ""
3477
3478# help of 'check-clean' option of 'version-info' command
3479#: bzrlib/cmd_version_info.py:79
3480msgid "Check if tree is clean."
3481msgstr ""
3482
3483# help of 'include-history' option of 'version-info' command
3484#: bzrlib/cmd_version_info.py:81
3485msgid "Include the revision-history."
3486msgstr ""
3487
3488# help of 'include-file-revisions' option of 'version-info' command
3489#: bzrlib/cmd_version_info.py:83
3490msgid "Include the last revision for each file."
3491msgstr ""
3492
3493# help of 'template' option of 'version-info' command
3494#: bzrlib/cmd_version_info.py:84
3495msgid "Template for the output."
3496msgstr ""
3497
3498#: bzrlib/commands.py:479
3499msgid "No help for this command."
3500msgstr ""
3501
3502#: bzrlib/commands.py:492
3503#, python-format
3504msgid ":Purpose: %s\n"
3505msgstr ""
3506
3507#: bzrlib/commands.py:494
3508#, python-format
3509msgid ""
3510":Usage:\n"
3511"%s\n"
3512msgstr ""
3513
3514#: bzrlib/commands.py:496
3515#, python-format
3516msgid ":Usage: %s\n"
3517msgstr ""
3518
3519#: bzrlib/commands.py:515
3520#, python-format
3521msgid ":Options:%s"
3522msgstr ""
3523
3524#: bzrlib/commands.py:526
3525#, python-format
3526msgid ""
3527":Description:\n"
3528" %s\n"
3529"\n"
3530msgstr ""
3531
3532#: bzrlib/commands.py:536
3533#, python-format
3534msgid ""
3535"See bzr help %s for more details and examples.\n"
3536"\n"
3537msgstr ""
3538
3539#: bzrlib/commands.py:541
3540msgid ":Aliases: "
3541msgstr ""
3542
3543#: bzrlib/commands.py:545
3544#, python-format
3545msgid ":From: plugin \"%s\"\n"
3546msgstr ""
3547
3548#: bzrlib/commands.py:557
3549#, python-format
3550msgid ":doc:`%s <%s-help>`"
3551msgstr ""
3552
3553#: bzrlib/commands.py:560
3554#, python-format
3555msgid ":See also: %s"
3556msgstr ""
3557
3558#: bzrlib/commit_signature_commands.py:34
3559msgid "Sign all commits by a given committer."
3560msgstr ""
3561
3562#: bzrlib/commit_signature_commands.py:36
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 ""
3567
3568#: bzrlib/commit_signature_commands.py:39
3569msgid "This does not sign commits that already have signatures."
3570msgstr ""
3571
3572# help of 'dry-run' option of 'sign-my-commits' command
3573#: bzrlib/commit_signature_commands.py:47
3574msgid ""
3575"Don't actually sign anything, just print the revisions that would be signed."
3576msgstr ""
3577
3578#: bzrlib/commit_signature_commands.py:101
3579msgid "Verify all commit signatures."
3580msgstr ""
3581
3582#: bzrlib/commit_signature_commands.py:103
3583msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
3584msgstr ""
3585
3586# help of 'acceptable-keys' option of 'verify-signatures' command
3587#: bzrlib/commit_signature_commands.py:108
3588msgid ""
3589"Comma separated list of GPG key patterns which are acceptable for "
3590"verification."
3591msgstr ""
3592
3593#: bzrlib/commit_signature_commands.py:166
3594msgid "All commits signed with verifiable keys"
3595msgstr ""
3596
3597#: bzrlib/config.py:3118
3598msgid "Display, set or remove a configuration option."
3599msgstr ""
3600
3601#: bzrlib/config.py:3120
3602msgid "Display the active value for a given option."
3603msgstr ""
3604
3605#: bzrlib/config.py:3122
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 ""
3611
3612#: bzrlib/config.py:3126
3613msgid "If no NAME is given, --all .* is implied."
3614msgstr ""
3615
3616#: bzrlib/config.py:3128
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 ""
3622
3623# help of 'scope' option of 'config' command
3624#: bzrlib/config.py:3139
3625msgid "Reduce the scope to the specified configuration file"
3626msgstr ""
3627
3628# help of 'all' option of 'config' command
3629#: bzrlib/config.py:3143
3630msgid "Display all the defined values for the matching options."
3631msgstr ""
3632
3633# help of 'remove' option of 'config' command
3634#: bzrlib/config.py:3145
3635msgid "Remove the option from the configuration file"
3636msgstr ""
3637
3638#: bzrlib/conflicts.py:47
3639msgid "List files with conflicts."
3640msgstr ""
3641
3642#: bzrlib/conflicts.py:49
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 ""
3649
3650#: bzrlib/conflicts.py:54
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