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
1=== modified file 'doc/en/release-notes/bzr-2.5.txt'
2--- doc/en/release-notes/bzr-2.5.txt 2011-08-23 10:27:54 +0000
3+++ doc/en/release-notes/bzr-2.5.txt 2011-08-24 14:22:26 +0000
4@@ -89,6 +89,8 @@
5 option. A value of 0 disables skipping. Named items passed to add are
6 never skipped. (Shannon Weyrick, #54624)
7
8+* bzr now ships with translations for command help. (Jonathan
9+ Riddell, INADA Naoki, #83941)
10
11 Improvements
12 ************
13
14=== added file 'po/bzr.pot'
15--- po/bzr.pot 1970-01-01 00:00:00 +0000
16+++ po/bzr.pot 2011-08-24 14:22:26 +0000
17@@ -0,0 +1,5296 @@
18+# SOME DESCRIPTIVE TITLE.
19+# Copyright (C) YEAR Canonical
20+# This file is distributed under the same license as the PACKAGE package.
21+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
22+#
23+#, fuzzy
24+msgid ""
25+msgstr ""
26+"Project-Id-Version: bzr\n"
27+"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
28+"POT-Creation-Date: 2011-08-24 15:14+0100\n"
29+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
30+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
31+"Language-Team: LANGUAGE <LL@li.org>\n"
32+"Language: \n"
33+"MIME-Version: 1.0\n"
34+"Content-Type: text/plain; charset=CHARSET\n"
35+"Content-Transfer-Encoding: 8bit\n"
36+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
37+
38+#: bzrlib/builtins.py:209
39+msgid "Display status summary."
40+msgstr ""
41+
42+#: bzrlib/builtins.py:211
43+msgid ""
44+"This reports on versioned and unknown files, reporting them\n"
45+"grouped by state. Possible states are:"
46+msgstr ""
47+
48+#: bzrlib/builtins.py:214
49+msgid ""
50+"added\n"
51+" Versioned in the working copy but not in the previous revision."
52+msgstr ""
53+
54+#: bzrlib/builtins.py:217
55+msgid ""
56+"removed\n"
57+" Versioned in the previous revision but removed or deleted\n"
58+" in the working copy."
59+msgstr ""
60+
61+#: bzrlib/builtins.py:221
62+msgid ""
63+"renamed\n"
64+" Path of this file changed from the previous revision;\n"
65+" the text may also have changed. This includes files whose\n"
66+" parent directory was renamed."
67+msgstr ""
68+
69+#: bzrlib/builtins.py:226
70+msgid ""
71+"modified\n"
72+" Text has changed since the previous revision."
73+msgstr ""
74+
75+#: bzrlib/builtins.py:229
76+msgid ""
77+"kind changed\n"
78+" File kind has been changed (e.g. from file to directory)."
79+msgstr ""
80+
81+#: bzrlib/builtins.py:232
82+msgid ""
83+"unknown\n"
84+" Not versioned and not matching an ignore pattern."
85+msgstr ""
86+
87+#: bzrlib/builtins.py:235
88+msgid ""
89+"Additionally for directories, symlinks and files with a changed\n"
90+"executable bit, Bazaar indicates their type using a trailing\n"
91+"character: '/', '@' or '*' respectively. These decorations can be\n"
92+"disabled using the '--no-classify' option."
93+msgstr ""
94+
95+#: bzrlib/builtins.py:240
96+msgid ""
97+"To see ignored files use 'bzr ignored'. For details on the\n"
98+"changes to file texts, use 'bzr diff'."
99+msgstr ""
100+
101+#: bzrlib/builtins.py:243
102+msgid ""
103+"Note that --short or -S gives status flags for each item, similar\n"
104+"to Subversion's status command. To get output similar to svn -q,\n"
105+"use bzr status -SV."
106+msgstr ""
107+
108+#: bzrlib/builtins.py:247
109+msgid ""
110+"If no arguments are specified, the status of the entire working\n"
111+"directory is shown. Otherwise, only the status of the specified\n"
112+"files or directories is reported. If a directory is given, status\n"
113+"is reported for everything inside that directory."
114+msgstr ""
115+
116+#: bzrlib/builtins.py:252
117+msgid ""
118+"Before merges are committed, the pending merge tip revisions are\n"
119+"shown. To see all pending merge revisions, use the -v option.\n"
120+"To skip the display of pending merge information altogether, use\n"
121+"the no-pending option or specify a file/directory."
122+msgstr ""
123+
124+#: bzrlib/builtins.py:257
125+msgid ""
126+"To compare the working directory to a specific revision, pass a\n"
127+"single revision to the revision argument."
128+msgstr ""
129+
130+#: bzrlib/builtins.py:260
131+msgid ""
132+"To see which files have changed in a specific revision, or between\n"
133+"two revisions, pass a revision range to the revision argument.\n"
134+"This will produce the same results as calling 'bzr diff --summarize'."
135+msgstr ""
136+
137+# help of 'short' option of 'status' command
138+#: bzrlib/builtins.py:269
139+msgid "Use short status indicators."
140+msgstr ""
141+
142+# help of 'versioned' option of 'status' command
143+#: bzrlib/builtins.py:271
144+msgid "Only show versioned files."
145+msgstr ""
146+
147+# help of 'no-pending' option of 'status' command
148+#: bzrlib/builtins.py:273
149+msgid "Don't show pending merges."
150+msgstr ""
151+
152+# help of 'no-classify' option of 'status' command
153+#: bzrlib/builtins.py:276
154+msgid "Do not mark object type using indicator."
155+msgstr ""
156+
157+#: bzrlib/builtins.py:455
158+msgid "Remove the working tree from a given branch/checkout."
159+msgstr ""
160+
161+#: bzrlib/builtins.py:457
162+msgid ""
163+"Since a lightweight checkout is little more than a working tree\n"
164+"this will refuse to run against one."
165+msgstr ""
166+
167+#: bzrlib/builtins.py:460
168+msgid "To re-create the working tree, use \"bzr checkout\"."
169+msgstr ""
170+
171+# help of 'force' option of 'remove-tree' command
172+#: bzrlib/builtins.py:466
173+msgid "Remove the working tree even if it has uncommitted or shelved changes."
174+msgstr ""
175+
176+#: bzrlib/builtins.py:551
177+msgid "Show current revision number."
178+msgstr ""
179+
180+#: bzrlib/builtins.py:553
181+msgid "This is equal to the number of revisions on this branch."
182+msgstr ""
183+
184+# help of 'tree' option of 'revno' command
185+#: bzrlib/builtins.py:594
186+msgid "Show revno of working tree"
187+msgstr ""
188+
189+#: bzrlib/builtins.py:642
190+msgid "Add specified files or directories."
191+msgstr ""
192+
193+#: bzrlib/builtins.py:644
194+msgid ""
195+"In non-recursive mode, all the named items are added, regardless\n"
196+"of whether they were previously ignored. A warning is given if\n"
197+"any of the named files are already versioned."
198+msgstr ""
199+
200+#: bzrlib/builtins.py:648
201+msgid ""
202+"In recursive mode (the default), files are treated the same way\n"
203+"but the behaviour for directories is different. Directories that\n"
204+"are already versioned do not give a warning. All directories,\n"
205+"whether already versioned or not, are searched for files or\n"
206+"subdirectories that are neither versioned or ignored, and these\n"
207+"are added. This search proceeds recursively into versioned\n"
208+"directories. If no names are given '.' is assumed."
209+msgstr ""
210+
211+#: bzrlib/builtins.py:656
212+msgid ""
213+"Therefore simply saying 'bzr add' will version all files that\n"
214+"are currently unknown."
215+msgstr ""
216+
217+#: bzrlib/builtins.py:659
218+msgid ""
219+"Adding a file whose parent directory is not versioned will\n"
220+"implicitly add the parent, and so on up to the root. This means\n"
221+"you should never need to explicitly add a directory, they'll just\n"
222+"get added when you add a file in the directory."
223+msgstr ""
224+
225+#: bzrlib/builtins.py:664
226+msgid ""
227+"--dry-run will show which files would be added, but not actually\n"
228+"add them."
229+msgstr ""
230+
231+#: bzrlib/builtins.py:667
232+msgid ""
233+"--file-ids-from will try to use the file ids from the supplied path.\n"
234+"It looks up ids trying to find a matching parent directory with the\n"
235+"same filename, and then by pure path. This option is rarely needed\n"
236+"but can be useful when adding the same logical file into two\n"
237+"branches that will be merged later (without showing the two different\n"
238+"adds as a conflict). It is also useful when merging another project\n"
239+"into a subdirectory of this one."
240+msgstr ""
241+
242+#: bzrlib/builtins.py:675
243+msgid ""
244+"Any files matching patterns in the ignore list will not be added\n"
245+"unless they are explicitly mentioned."
246+msgstr ""
247+
248+#: bzrlib/builtins.py:678
249+msgid ""
250+"In recursive mode, files larger than the configuration option \n"
251+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
252+"to file size."
253+msgstr ""
254+
255+# help of 'no-recurse' option of 'add' command
256+#: bzrlib/builtins.py:685
257+msgid "Don't recursively add the contents of directories."
258+msgstr ""
259+
260+# help of 'file-ids-from' option of 'add' command
261+#: bzrlib/builtins.py:691
262+msgid "Lookup file ids from this tree."
263+msgstr ""
264+
265+#: bzrlib/builtins.py:731
266+msgid "Create a new versioned directory."
267+msgstr ""
268+
269+#: bzrlib/builtins.py:733
270+msgid "This is equivalent to creating the directory and then adding it."
271+msgstr ""
272+
273+#: bzrlib/builtins.py:828
274+msgid "Move or rename a file."
275+msgstr ""
276+
277+#: bzrlib/builtins.py:830
278+msgid " bzr mv SOURCE... DESTINATION"
279+msgstr ""
280+
281+#: bzrlib/builtins.py:832
282+msgid ""
283+"If the last argument is a versioned directory, all the other names\n"
284+"are moved into it. Otherwise, there must be exactly two arguments\n"
285+"and the file is changed to a new name."
286+msgstr ""
287+
288+#: bzrlib/builtins.py:836
289+msgid ""
290+"If OLDNAME does not exist on the filesystem but is versioned and\n"
291+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
292+"assumes that the file has been manually moved and only updates\n"
293+"its internal inventory to reflect that change.\n"
294+"The same is valid when moving many SOURCE files to a DESTINATION."
295+msgstr ""
296+
297+#: bzrlib/builtins.py:842
298+msgid "Files cannot be moved between branches."
299+msgstr ""
300+
301+# help of 'after' option of 'mv' command
302+#: bzrlib/builtins.py:849
303+msgid ""
304+"Move only the bzr identifier of the file, because the file has already been "
305+"moved."
306+msgstr ""
307+
308+# help of 'auto' option of 'mv' command
309+#: bzrlib/builtins.py:851
310+msgid "Automatically guess renames."
311+msgstr ""
312+
313+# help of 'dry-run' option of 'mv' command
314+#: bzrlib/builtins.py:852
315+msgid "Avoid making changes when guessing renames."
316+msgstr ""
317+
318+#: bzrlib/builtins.py:964
319+msgid "Turn this branch into a mirror of another branch."
320+msgstr ""
321+
322+#: bzrlib/builtins.py:966
323+msgid ""
324+"By default, this command only works on branches that have not diverged.\n"
325+"Branches are considered diverged if the destination branch's most recent \n"
326+"commit is one that has not been merged (directly or indirectly) into the \n"
327+"parent."
328+msgstr ""
329+
330+#: bzrlib/builtins.py:971
331+msgid ""
332+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
333+"from one into the other. Once one branch has merged, the other should\n"
334+"be able to pull it again."
335+msgstr ""
336+
337+#: bzrlib/builtins.py:975
338+msgid ""
339+"If you want to replace your local changes and just want your branch to\n"
340+"match the remote one, use pull --overwrite. This will work even if the two\n"
341+"branches have diverged."
342+msgstr ""
343+
344+#: bzrlib/builtins.py:979
345+msgid ""
346+"If there is no default location set, the first pull will set it (use\n"
347+"--no-remember to avoid settting it). After that, you can omit the\n"
348+"location to use the default. To change the default, use --remember. The\n"
349+"value will only be saved if the remote location can be accessed."
350+msgstr ""
351+
352+#: bzrlib/builtins.py:984
353+msgid ""
354+"Note: The location can be specified either in the form of a branch,\n"
355+"or in the form of a path to a file containing a merge directive generated\n"
356+"with bzr send."
357+msgstr ""
358+
359+# help of 'verbose' option of 'pull' command
360+#: bzrlib/builtins.py:992
361+msgid "Show logs of pulled revisions."
362+msgstr ""
363+
364+# help of 'directory' option of 'pull' command
365+#: bzrlib/builtins.py:994
366+msgid ""
367+"Branch to pull into, rather than the one containing the working directory."
368+msgstr ""
369+
370+# help of 'local' option of 'pull' command
371+#: bzrlib/builtins.py:997
372+msgid ""
373+"Perform a local pull in a bound branch. Local pulls are not applied to the "
374+"master branch."
375+msgstr ""
376+
377+#: bzrlib/builtins.py:1097
378+msgid "Update a mirror of this branch."
379+msgstr ""
380+
381+#: bzrlib/builtins.py:1099
382+msgid ""
383+"The target branch will not have its working tree populated because this\n"
384+"is both expensive, and is not supported on remote file systems."
385+msgstr ""
386+
387+#: bzrlib/builtins.py:1102
388+msgid ""
389+"Some smart servers or protocols *may* put the working tree in place in\n"
390+"the future."
391+msgstr ""
392+
393+#: bzrlib/builtins.py:1105
394+msgid ""
395+"This command only works on branches that have not diverged. Branches are\n"
396+"considered diverged if the destination branch's most recent commit is one\n"
397+"that has not been merged (directly or indirectly) by the source branch."
398+msgstr ""
399+
400+#: bzrlib/builtins.py:1109
401+msgid ""
402+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
403+"the other branch completely, discarding its unmerged changes."
404+msgstr ""
405+
406+#: bzrlib/builtins.py:1112
407+msgid ""
408+"If you want to ensure you have the different changes in the other branch,\n"
409+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
410+"After that you will be able to do a push without '--overwrite'."
411+msgstr ""
412+
413+#: bzrlib/builtins.py:1116
414+msgid ""
415+"If there is no default push location set, the first push will set it (use\n"
416+"--no-remember to avoid settting it). After that, you can omit the\n"
417+"location to use the default. To change the default, use --remember. The\n"
418+"value will only be saved if the remote location can be accessed."
419+msgstr ""
420+
421+# help of 'directory' option of 'push' command
422+#: bzrlib/builtins.py:1128
423+msgid ""
424+"Branch to push from, rather than the one containing the working directory."
425+msgstr ""
426+
427+# help of 'use-existing-dir' option of 'push' command
428+#: bzrlib/builtins.py:1131
429+msgid ""
430+"By default push will fail if the target directory exists, but does not "
431+"already have a control directory. This flag will allow push to proceed."
432+msgstr ""
433+
434+# help of 'stacked' option of 'push' command
435+#: bzrlib/builtins.py:1136
436+msgid ""
437+"Create a stacked branch that references the public location of the parent "
438+"branch."
439+msgstr ""
440+
441+# help of 'stacked-on' option of 'push' command
442+#: bzrlib/builtins.py:1139
443+msgid ""
444+"Create a stacked branch that refers to another branch for the commit "
445+"history. Only the work not present in the referenced branch is included in "
446+"the branch created."
447+msgstr ""
448+
449+# help of 'strict' option of 'push' command
450+#: bzrlib/builtins.py:1144
451+msgid ""
452+"Refuse to push if there are uncommitted changes in the working tree, --no-"
453+"strict disables the check."
454+msgstr ""
455+
456+# help of 'no-tree' option of 'push' command
457+#: bzrlib/builtins.py:1147
458+msgid "Don't populate the working tree, even for protocols that support it."
459+msgstr ""
460+
461+#: bzrlib/builtins.py:1212
462+msgid "Create a new branch that is a copy of an existing branch."
463+msgstr ""
464+
465+#: bzrlib/builtins.py:1214
466+msgid ""
467+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
468+"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
469+"bar.\n"
470+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
471+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
472+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
473+"create ./foo-bar."
474+msgstr ""
475+
476+#: bzrlib/builtins.py:1221
477+msgid ""
478+"To retrieve the branch as of a particular revision, supply the --revision\n"
479+"parameter, as in \"branch foo/bar -r 5\"."
480+msgstr ""
481+
482+#: bzrlib/builtins.py:1224
483+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
484+msgstr ""
485+
486+# help of 'no-tree' option of 'branch' command
487+#: bzrlib/builtins.py:1234
488+msgid "Create a branch without a working-tree."
489+msgstr ""
490+
491+# help of 'switch' option of 'branch' command
492+#: bzrlib/builtins.py:1236
493+msgid "Switch the checkout in the current directory to the new branch."
494+msgstr ""
495+
496+# help of 'stacked' option of 'branch' command
497+#: bzrlib/builtins.py:1239
498+msgid ""
499+"Create a stacked branch referring to the source branch. The new branch will "
500+"depend on the availability of the source branch for all operations."
501+msgstr ""
502+
503+# help of 'standalone' option of 'branch' command
504+#: bzrlib/builtins.py:1243
505+msgid "Do not use a shared repository, even if available."
506+msgstr ""
507+
508+# help of 'use-existing-dir' option of 'branch' command
509+#: bzrlib/builtins.py:1245
510+msgid ""
511+"By default branch will fail if the target directory exists, but does not "
512+"already have a control directory. This flag will allow branch to proceed."
513+msgstr ""
514+
515+# help of 'bind' option of 'branch' command
516+#: bzrlib/builtins.py:1250
517+msgid "Bind new branch to from location."
518+msgstr ""
519+
520+#: bzrlib/builtins.py:1342
521+msgid "List the branches available at the current location."
522+msgstr ""
523+
524+#: bzrlib/builtins.py:1344
525+msgid ""
526+"This command will print the names of all the branches at the current "
527+"location."
528+msgstr ""
529+
530+#: bzrlib/builtins.py:1359
531+msgid "Create a new checkout of an existing branch."
532+msgstr ""
533+
534+#: bzrlib/builtins.py:1361
535+msgid ""
536+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
537+"for\n"
538+"the branch found in '.'. This is useful if you have removed the working "
539+"tree\n"
540+"or if it was never created - i.e. if you pushed the branch to its current\n"
541+"location using SFTP."
542+msgstr ""
543+
544+#: bzrlib/builtins.py:1366
545+msgid ""
546+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
547+"will\n"
548+"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
549+"bar.\n"
550+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
551+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
552+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
553+"create ./foo-bar."
554+msgstr ""
555+
556+#: bzrlib/builtins.py:1373
557+msgid ""
558+"To retrieve the branch as of a particular revision, supply the --revision\n"
559+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
560+"immediately\n"
561+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
562+"old\n"
563+"code.)"
564+msgstr ""
565+
566+# help of 'lightweight' option of 'checkout' command
567+#: bzrlib/builtins.py:1383
568+msgid ""
569+"Perform a lightweight checkout. Lightweight checkouts depend on access to "
570+"the branch for every operation. Normal checkouts can perform common "
571+"operations like diff and status without such access, and also support local "
572+"commits."
573+msgstr ""
574+
575+# help of 'files-from' option of 'branch' command
576+#: bzrlib/builtins.py:1390
577+msgid "Get file contents from this tree."
578+msgstr ""
579+
580+# help of 'hardlink' option of 'branch' command
581+#: bzrlib/builtins.py:1392
582+msgid "Hard-link working tree files where possible."
583+msgstr ""
584+
585+#: bzrlib/builtins.py:1433
586+msgid ""
587+"Show list of renamed files.\n"
588+" "
589+msgstr ""
590+
591+#: bzrlib/builtins.py:1463
592+msgid "Update a tree to have the latest code committed to its branch."
593+msgstr ""
594+
595+#: bzrlib/builtins.py:1465
596+msgid ""
597+"This will perform a merge into the working tree, and may generate\n"
598+"conflicts. If you have any local changes, you will still\n"
599+"need to commit them after the update for the update to be complete."
600+msgstr ""
601+
602+#: bzrlib/builtins.py:1469
603+msgid ""
604+"If you want to discard your local changes, you can just do a\n"
605+"'bzr revert' instead of 'bzr commit' after the update."
606+msgstr ""
607+
608+#: bzrlib/builtins.py:1472
609+msgid ""
610+"If you want to restore a file that has been removed locally, use\n"
611+"'bzr revert' instead of 'bzr update'."
612+msgstr ""
613+
614+#: bzrlib/builtins.py:1475
615+msgid ""
616+"If the tree's branch is bound to a master branch, it will also update\n"
617+"the branch from the master."
618+msgstr ""
619+
620+#: bzrlib/builtins.py:1556
621+msgid "Show information about a working tree, branch or repository."
622+msgstr ""
623+
624+#: bzrlib/builtins.py:1558
625+msgid ""
626+"This command will show all known locations and formats associated to the\n"
627+"tree, branch or repository."
628+msgstr ""
629+
630+#: bzrlib/builtins.py:1561
631+msgid ""
632+"In verbose mode, statistical information is included with each report.\n"
633+"To see extended statistic information, use a verbosity level of 2 or\n"
634+"higher by specifying the verbose option multiple times, e.g. -vv."
635+msgstr ""
636+
637+#: bzrlib/builtins.py:1565
638+msgid "Branches and working trees will also report any missing revisions."
639+msgstr ""
640+
641+#: bzrlib/builtins.py:1569
642+msgid " Display information on the format and related locations:"
643+msgstr ""
644+
645+#: bzrlib/builtins.py:1571
646+msgid " bzr info"
647+msgstr ""
648+
649+#: bzrlib/builtins.py:1573
650+msgid ""
651+" Display the above together with extended format information and\n"
652+" basic statistics (like the number of files in the working tree and\n"
653+" number of revisions in the branch and repository):"
654+msgstr ""
655+
656+#: bzrlib/builtins.py:1577
657+msgid " bzr info -v"
658+msgstr ""
659+
660+#: bzrlib/builtins.py:1579
661+msgid " Display the above together with number of committers to the branch:"
662+msgstr ""
663+
664+#: bzrlib/builtins.py:1581
665+msgid " bzr info -vv"
666+msgstr ""
667+
668+#: bzrlib/builtins.py:1600
669+msgid "Remove files or directories."
670+msgstr ""
671+
672+#: bzrlib/builtins.py:1602
673+msgid ""
674+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
675+"delete them if they can easily be recovered using revert otherwise they\n"
676+"will be backed up (adding an extention of the form .~#~). If no options or\n"
677+"parameters are given Bazaar will scan for files that are being tracked by\n"
678+"Bazaar but missing in your tree and stop tracking them for you."
679+msgstr ""
680+
681+# help of 'new' option of 'remove' command
682+#: bzrlib/builtins.py:1610
683+msgid "Only remove files that have never been committed."
684+msgstr ""
685+
686+# help of 'file-deletion-strategy' option of 'remove' command
687+#: bzrlib/builtins.py:1612
688+msgid "The file deletion mode to be used."
689+msgstr ""
690+
691+# title of 'file-deletion-strategy' option of 'remove' command
692+#: bzrlib/builtins.py:1613
693+msgid "Deletion Strategy"
694+msgstr ""
695+
696+#: bzrlib/builtins.py:1704
697+msgid "Reconcile bzr metadata in a branch."
698+msgstr ""
699+
700+#: bzrlib/builtins.py:1706
701+msgid ""
702+"This can correct data mismatches that may have been caused by\n"
703+"previous ghost operations or bzr upgrades. You should only\n"
704+"need to run this command if 'bzr check' or a bzr developer\n"
705+"advises you to run it."
706+msgstr ""
707+
708+#: bzrlib/builtins.py:1711
709+msgid ""
710+"If a second branch is provided, cross-branch reconciliation is\n"
711+"also attempted, which will check that data like the tree root\n"
712+"id which was not present in very early bzr versions is represented\n"
713+"correctly in both branches."
714+msgstr ""
715+
716+#: bzrlib/builtins.py:1716
717+msgid ""
718+"At the same time it is run it may recompress data resulting in\n"
719+"a potential saving in disk space or performance gain."
720+msgstr ""
721+
722+#: bzrlib/builtins.py:1719
723+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
724+msgstr ""
725+
726+#: bzrlib/builtins.py:1783
727+msgid "Make a directory into a versioned branch."
728+msgstr ""
729+
730+#: bzrlib/builtins.py:1785
731+msgid ""
732+"Use this to create an empty branch, or before importing an\n"
733+"existing project."
734+msgstr ""
735+
736+#: bzrlib/builtins.py:1788
737+msgid ""
738+"If there is a repository in a parent directory of the location, then\n"
739+"the history of the branch will be stored in the repository. Otherwise\n"
740+"init creates a standalone branch which carries its own history\n"
741+"in the .bzr directory."
742+msgstr ""
743+
744+#: bzrlib/builtins.py:1793
745+msgid ""
746+"If there is already a branch at the location but it has no working tree,\n"
747+"the tree can be populated with 'bzr checkout'."
748+msgstr ""
749+
750+#: bzrlib/builtins.py:1796
751+msgid "Recipe for importing a tree of files::"
752+msgstr ""
753+
754+#: bzrlib/builtins.py:1798
755+msgid ""
756+" cd ~/project\n"
757+" bzr init\n"
758+" bzr add .\n"
759+" bzr status\n"
760+" bzr commit -m \"imported project\""
761+msgstr ""
762+
763+# help of 'create-prefix' option of 'init' command
764+#: bzrlib/builtins.py:1809
765+msgid "Create the path leading up to the branch if it does not already exist."
766+msgstr ""
767+
768+# help of 'format' option of 'init' command
769+#: bzrlib/builtins.py:1812
770+msgid "Specify a format for this branch. See \"help formats\"."
771+msgstr ""
772+
773+# help of 'append-revisions-only' option of 'init' command
774+#: bzrlib/builtins.py:1820
775+msgid "Never change revnos or the existing log. Append revisions to it only."
776+msgstr ""
777+
778+# help of 'no-tree' option of 'init' command
779+#: bzrlib/builtins.py:1823
780+msgid "Create a branch without a working tree."
781+msgstr ""
782+
783+#: bzrlib/builtins.py:1900
784+msgid "Create a shared repository for branches to share storage space."
785+msgstr ""
786+
787+#: bzrlib/builtins.py:1902
788+msgid ""
789+"New branches created under the repository directory will store their\n"
790+"revisions in the repository, not in the branch directory. For branches\n"
791+"with shared history, this reduces the amount of storage needed and \n"
792+"speeds up the creation of new branches."
793+msgstr ""
794+
795+#: bzrlib/builtins.py:1907
796+msgid ""
797+"If the --no-trees option is given then the branches in the repository\n"
798+"will not have working trees by default. They will still exist as \n"
799+"directories on disk, but they will not have separate copies of the \n"
800+"files at a certain revision. This can be useful for repositories that\n"
801+"store branches which are interacted with through checkouts or remote\n"
802+"branches, such as on a server."
803+msgstr ""
804+
805+#: bzrlib/builtins.py:1914
806+msgid ""
807+":Examples:\n"
808+" Create a shared repository holding just branches::"
809+msgstr ""
810+
811+#: bzrlib/builtins.py:1917
812+msgid ""
813+" bzr init-repo --no-trees repo\n"
814+" bzr init repo/trunk"
815+msgstr ""
816+
817+#: bzrlib/builtins.py:1920
818+msgid " Make a lightweight checkout elsewhere::"
819+msgstr ""
820+
821+#: bzrlib/builtins.py:1922
822+msgid ""
823+" bzr checkout --lightweight repo/trunk trunk-checkout\n"
824+" cd trunk-checkout\n"
825+" (add files here)"
826+msgstr ""
827+
828+# help of 'format' option of 'init-repository' command
829+#: bzrlib/builtins.py:1930
830+msgid ""
831+"Specify a format for this repository. See \"bzr help formats\" for details."
832+msgstr ""
833+
834+# title of 'format' option of 'init-repository' command
835+#: bzrlib/builtins.py:1934
836+msgid "Repository format"
837+msgstr ""
838+
839+# help of 'no-trees' option of 'init-repository' command
840+#: bzrlib/builtins.py:1936
841+msgid "Branches in the repository will default to not having a working tree."
842+msgstr ""
843+
844+#: bzrlib/builtins.py:1960
845+msgid "Show differences in the working tree, between revisions or branches."
846+msgstr ""
847+
848+#: bzrlib/builtins.py:1962
849+msgid ""
850+"If no arguments are given, all changes for the current tree are listed.\n"
851+"If files are given, only the changes in those files are listed.\n"
852+"Remote and multiple branches can be compared by using the --old and\n"
853+"--new options. If not provided, the default for both is derived from\n"
854+"the first argument, if any, or the current tree if no arguments are\n"
855+"given."
856+msgstr ""
857+
858+#: bzrlib/builtins.py:1969
859+msgid ""
860+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
861+"produces patches suitable for \"patch -p1\"."
862+msgstr ""
863+
864+#: bzrlib/builtins.py:1972
865+msgid ""
866+"Note that when using the -r argument with a range of revisions, the\n"
867+"differences are computed between the two specified revisions. That\n"
868+"is, the command does not show the changes introduced by the first \n"
869+"revision in the range. This differs from the interpretation of \n"
870+"revision ranges used by \"bzr log\" which includes the first revision\n"
871+"in the range."
872+msgstr ""
873+
874+#: bzrlib/builtins.py:1979
875+msgid ""
876+":Exit values:\n"
877+" 1 - changed\n"
878+" 2 - unrepresentable changes\n"
879+" 3 - error\n"
880+" 0 - no change"
881+msgstr ""
882+
883+#: bzrlib/builtins.py:1985
884+msgid ""
885+":Examples:\n"
886+" Shows the difference in the working tree versus the last commit::"
887+msgstr ""
888+
889+#: bzrlib/builtins.py:1988
890+msgid " bzr diff"
891+msgstr ""
892+
893+#: bzrlib/builtins.py:1990
894+msgid " Difference between the working tree and revision 1::"
895+msgstr ""
896+
897+#: bzrlib/builtins.py:1992
898+msgid " bzr diff -r1"
899+msgstr ""
900+
901+#: bzrlib/builtins.py:1994
902+msgid " Difference between revision 3 and revision 1::"
903+msgstr ""
904+
905+#: bzrlib/builtins.py:1996
906+msgid " bzr diff -r1..3"
907+msgstr ""
908+
909+#: bzrlib/builtins.py:1998
910+msgid " Difference between revision 3 and revision 1 for branch xxx::"
911+msgstr ""
912+
913+#: bzrlib/builtins.py:2000
914+msgid " bzr diff -r1..3 xxx"
915+msgstr ""
916+
917+#: bzrlib/builtins.py:2002
918+msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
919+msgstr ""
920+
921+#: bzrlib/builtins.py:2004
922+msgid " bzr diff -c2"
923+msgstr ""
924+
925+#: bzrlib/builtins.py:2006
926+msgid ""
927+" To see the changes introduced by revision X::\n"
928+" \n"
929+" bzr diff -cX"
930+msgstr ""
931+
932+#: bzrlib/builtins.py:2010
933+msgid ""
934+" Note that in the case of a merge, the -c option shows the changes\n"
935+" compared to the left hand parent. To see the changes against\n"
936+" another parent, use::"
937+msgstr ""
938+
939+#: bzrlib/builtins.py:2014
940+msgid " bzr diff -r<chosen_parent>..X"
941+msgstr ""
942+
943+#: bzrlib/builtins.py:2016
944+msgid ""
945+" The changes between the current revision and the previous revision\n"
946+" (equivalent to -c-1 and -r-2..-1)"
947+msgstr ""
948+
949+#: bzrlib/builtins.py:2019
950+msgid " bzr diff -r-2.."
951+msgstr ""
952+
953+#: bzrlib/builtins.py:2021
954+msgid " Show just the differences for file NEWS::"
955+msgstr ""
956+
957+#: bzrlib/builtins.py:2023
958+msgid " bzr diff NEWS"
959+msgstr ""
960+
961+#: bzrlib/builtins.py:2025
962+msgid " Show the differences in working tree xxx for file NEWS::"
963+msgstr ""
964+
965+#: bzrlib/builtins.py:2027
966+msgid " bzr diff xxx/NEWS"
967+msgstr ""
968+
969+#: bzrlib/builtins.py:2029
970+msgid " Show the differences from branch xxx to this working tree:"
971+msgstr ""
972+
973+#: bzrlib/builtins.py:2031
974+msgid " bzr diff --old xxx"
975+msgstr ""
976+
977+#: bzrlib/builtins.py:2033
978+msgid " Show the differences between two branches for file NEWS::"
979+msgstr ""
980+
981+#: bzrlib/builtins.py:2035
982+msgid " bzr diff --old xxx --new yyy NEWS"
983+msgstr ""
984+
985+#: bzrlib/builtins.py:2037
986+msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
987+msgstr ""
988+
989+#: bzrlib/builtins.py:2039
990+msgid ""
991+" bzr diff --prefix old/:new/\n"
992+" \n"
993+" Show the differences using a custom diff program with options::\n"
994+" \n"
995+" bzr diff --using /usr/bin/diff --diff-options -wu"
996+msgstr ""
997+
998+# help of 'diff-options' option of 'diff' command
999+#: bzrlib/builtins.py:2049
1000+msgid "Pass these options to the external diff program."
1001+msgstr ""
1002+
1003+# help of 'prefix' option of 'diff' command
1004+#: bzrlib/builtins.py:2052
1005+msgid ""
1006+"Set prefixes added to old and new filenames, as two values separated by a "
1007+"colon. (eg \"old/:new/\")."
1008+msgstr ""
1009+
1010+# help of 'old' option of 'diff' command
1011+#: bzrlib/builtins.py:2055
1012+msgid "Branch/tree to compare from."
1013+msgstr ""
1014+
1015+# help of 'new' option of 'diff' command
1016+#: bzrlib/builtins.py:2059
1017+msgid "Branch/tree to compare to."
1018+msgstr ""
1019+
1020+# help of 'using' option of 'diff' command
1021+#: bzrlib/builtins.py:2065
1022+msgid "Use this command to compare files."
1023+msgstr ""
1024+
1025+# help of 'format' option of 'diff' command
1026+#: bzrlib/builtins.py:2070
1027+msgid "Diff format to use."
1028+msgstr ""
1029+
1030+# title of 'format' option of 'diff' command
1031+#: bzrlib/builtins.py:2072
1032+msgid "Diff format"
1033+msgstr ""
1034+
1035+#: bzrlib/builtins.py:2122
1036+msgid ""
1037+"List files deleted in the working tree.\n"
1038+" "
1039+msgstr ""
1040+
1041+#: bzrlib/builtins.py:2200
1042+msgid "Show the tree root directory."
1043+msgstr ""
1044+
1045+#: bzrlib/builtins.py:2202
1046+msgid ""
1047+"The root is the nearest enclosing directory with a .bzr control\n"
1048+"directory."
1049+msgstr ""
1050+
1051+#: bzrlib/builtins.py:2230
1052+msgid "Show historical log for a branch or subset of a branch."
1053+msgstr ""
1054+
1055+#: bzrlib/builtins.py:2232
1056+msgid ""
1057+"log is bzr's default tool for exploring the history of a branch.\n"
1058+"The branch to use is taken from the first parameter. If no parameters\n"
1059+"are given, the branch containing the working directory is logged.\n"
1060+"Here are some simple examples::"
1061+msgstr ""
1062+
1063+#: bzrlib/builtins.py:2237
1064+msgid ""
1065+" bzr log log the current branch\n"
1066+" bzr log foo.py log a file in its branch\n"
1067+" bzr log http://server/branch log a branch on a server"
1068+msgstr ""
1069+
1070+#: bzrlib/builtins.py:2241
1071+msgid ""
1072+"The filtering, ordering and information shown for each revision can\n"
1073+"be controlled as explained below. By default, all revisions are\n"
1074+"shown sorted (topologically) so that newer revisions appear before\n"
1075+"older ones and descendants always appear before ancestors. If displayed,\n"
1076+"merged revisions are shown indented under the revision in which they\n"
1077+"were merged."
1078+msgstr ""
1079+
1080+#: bzrlib/builtins.py:2248
1081+msgid ":Output control:"
1082+msgstr ""
1083+
1084+#: bzrlib/builtins.py:2250
1085+msgid ""
1086+" The log format controls how information about each revision is\n"
1087+" displayed. The standard log formats are called ``long``, ``short``\n"
1088+" and ``line``. The default is long. See ``bzr help log-formats``\n"
1089+" for more details on log formats."
1090+msgstr ""
1091+
1092+#: bzrlib/builtins.py:2255
1093+msgid ""
1094+" The following options can be used to control what information is\n"
1095+" displayed::"
1096+msgstr ""
1097+
1098+#: bzrlib/builtins.py:2258
1099+msgid ""
1100+" -l N display a maximum of N revisions\n"
1101+" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1102+" -v display a status summary (delta) for each revision\n"
1103+" -p display a diff (patch) for each revision\n"
1104+" --show-ids display revision-ids (and file-ids), not just revnos"
1105+msgstr ""
1106+
1107+#: bzrlib/builtins.py:2264
1108+msgid ""
1109+" Note that the default number of levels to display is a function of the\n"
1110+" log format. If the -n option is not used, the standard log formats show\n"
1111+" just the top level (mainline)."
1112+msgstr ""
1113+
1114+#: bzrlib/builtins.py:2268
1115+msgid ""
1116+" Status summaries are shown using status flags like A, M, etc. To see\n"
1117+" the changes explained using words like ``added`` and ``modified``\n"
1118+" instead, use the -vv option."
1119+msgstr ""
1120+
1121+#: bzrlib/builtins.py:2272
1122+msgid ":Ordering control:"
1123+msgstr ""
1124+
1125+#: bzrlib/builtins.py:2274
1126+msgid ""
1127+" To display revisions from oldest to newest, use the --forward option.\n"
1128+" In most cases, using this option will have little impact on the total\n"
1129+" time taken to produce a log, though --forward does not incrementally\n"
1130+" display revisions like --reverse does when it can."
1131+msgstr ""
1132+
1133+#: bzrlib/builtins.py:2279
1134+msgid ":Revision filtering:"
1135+msgstr ""
1136+
1137+#: bzrlib/builtins.py:2281
1138+msgid ""
1139+" The -r option can be used to specify what revision or range of revisions\n"
1140+" to filter against. The various forms are shown below::"
1141+msgstr ""
1142+
1143+#: bzrlib/builtins.py:2284
1144+msgid ""
1145+" -rX display revision X\n"
1146+" -rX.. display revision X and later\n"
1147+" -r..Y display up to and including revision Y\n"
1148+" -rX..Y display from X to Y inclusive"
1149+msgstr ""
1150+
1151+#: bzrlib/builtins.py:2289
1152+msgid ""
1153+" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1154+" Some common examples are given below::"
1155+msgstr ""
1156+
1157+#: bzrlib/builtins.py:2292
1158+msgid ""
1159+" -r-1 show just the tip\n"
1160+" -r-10.. show the last 10 mainline revisions\n"
1161+" -rsubmit:.. show what's new on this branch\n"
1162+" -rancestor:path.. show changes since the common ancestor of this\n"
1163+" branch and the one at location path\n"
1164+" -rdate:yesterday.. show changes since yesterday"
1165+msgstr ""
1166+
1167+#: bzrlib/builtins.py:2299
1168+msgid ""
1169+" When logging a range of revisions using -rX..Y, log starts at\n"
1170+" revision Y and searches back in history through the primary\n"
1171+" (\"left-hand\") parents until it finds X. When logging just the\n"
1172+" top level (using -n1), an error is reported if X is not found\n"
1173+" along the way. If multi-level logging is used (-n0), X may be\n"
1174+" a nested merge revision and the log will be truncated accordingly."
1175+msgstr ""
1176+
1177+#: bzrlib/builtins.py:2306
1178+msgid ":Path filtering:"
1179+msgstr ""
1180+
1181+#: bzrlib/builtins.py:2308
1182+msgid ""
1183+" If parameters are given and the first one is not a branch, the log\n"
1184+" will be filtered to show only those revisions that changed the\n"
1185+" nominated files or directories."
1186+msgstr ""
1187+
1188+#: bzrlib/builtins.py:2312
1189+msgid ""
1190+" Filenames are interpreted within their historical context. To log a\n"
1191+" deleted file, specify a revision range so that the file existed at\n"
1192+" the end or start of the range."
1193+msgstr ""
1194+
1195+#: bzrlib/builtins.py:2316
1196+msgid ""
1197+" Historical context is also important when interpreting pathnames of\n"
1198+" renamed files/directories. Consider the following example:"
1199+msgstr ""
1200+
1201+#: bzrlib/builtins.py:2319
1202+msgid ""
1203+" * revision 1: add tutorial.txt\n"
1204+" * revision 2: modify tutorial.txt\n"
1205+" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1206+msgstr ""
1207+
1208+#: bzrlib/builtins.py:2323
1209+msgid " In this case:"
1210+msgstr ""
1211+
1212+#: bzrlib/builtins.py:2325
1213+msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1214+msgstr ""
1215+
1216+#: bzrlib/builtins.py:2327
1217+msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1218+msgstr ""
1219+
1220+#: bzrlib/builtins.py:2329
1221+msgid ""
1222+" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1223+" the original file in revision 2."
1224+msgstr ""
1225+
1226+#: bzrlib/builtins.py:2332
1227+msgid ""
1228+" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1229+" was no file called guide.txt in revision 2."
1230+msgstr ""
1231+
1232+#: bzrlib/builtins.py:2335
1233+msgid ""
1234+" Renames are always followed by log. By design, there is no need to\n"
1235+" explicitly ask for this (and no way to stop logging a file back\n"
1236+" until it was last renamed)."
1237+msgstr ""
1238+
1239+#: bzrlib/builtins.py:2339
1240+msgid ":Other filtering:"
1241+msgstr ""
1242+
1243+#: bzrlib/builtins.py:2341
1244+msgid ""
1245+" The --match option can be used for finding revisions that match a\n"
1246+" regular expression in a commit message, committer, author or bug.\n"
1247+" Specifying the option several times will match any of the supplied\n"
1248+" expressions. --match-author, --match-bugs, --match-committer and\n"
1249+" --match-message can be used to only match a specific field."
1250+msgstr ""
1251+
1252+#: bzrlib/builtins.py:2347
1253+msgid ":Tips & tricks:"
1254+msgstr ""
1255+
1256+#: bzrlib/builtins.py:2349
1257+msgid ""
1258+" GUI tools and IDEs are often better at exploring history than command\n"
1259+" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1260+" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1261+" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1262+" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1263+msgstr ""
1264+
1265+#: bzrlib/builtins.py:2355
1266+msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1267+msgstr ""
1268+
1269+#: bzrlib/builtins.py:2357
1270+msgid ""
1271+" [ALIASES]\n"
1272+" tip = log -r-1\n"
1273+" top = log -l10 --line\n"
1274+" show = log -v -p"
1275+msgstr ""
1276+
1277+#: bzrlib/builtins.py:2362
1278+msgid ""
1279+" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1280+" will show the last 10 mainline revisions. To see the details of a\n"
1281+" particular revision X, ``bzr show -rX``."
1282+msgstr ""
1283+
1284+#: bzrlib/builtins.py:2366
1285+msgid ""
1286+" If you are interested in looking deeper into a particular merge X,\n"
1287+" use ``bzr log -n0 -rX``."
1288+msgstr ""
1289+
1290+#: bzrlib/builtins.py:2369
1291+msgid ""
1292+" ``bzr log -v`` on a branch with lots of history is currently\n"
1293+" very slow. A fix for this issue is currently under development.\n"
1294+" With or without that fix, it is recommended that a revision range\n"
1295+" be given when using the -v option."
1296+msgstr ""
1297+
1298+#: bzrlib/builtins.py:2374
1299+msgid ""
1300+" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1301+" used to find revisions matching user names, commit messages, etc.\n"
1302+" Among other features, this plugin can find all revisions containing\n"
1303+" a list of words but not others."
1304+msgstr ""
1305+
1306+#: bzrlib/builtins.py:2379
1307+msgid ""
1308+" When exploring non-mainline history on large projects with deep\n"
1309+" history, the performance of log can be greatly improved by installing\n"
1310+" the historycache plugin. This plugin buffers historical information\n"
1311+" trading disk space for faster speed."
1312+msgstr ""
1313+
1314+# help of 'forward' option of 'log' command
1315+#: bzrlib/builtins.py:2388
1316+msgid "Show from oldest to newest."
1317+msgstr ""
1318+
1319+# help of 'verbose' option of 'log' command
1320+#: bzrlib/builtins.py:2391
1321+msgid "Show files changed in each revision."
1322+msgstr ""
1323+
1324+# help of 'change' option of 'log' command
1325+#: bzrlib/builtins.py:2397
1326+msgid "Show just the specified revision. See also \"help revisionspec\"."
1327+msgstr ""
1328+
1329+# help of 'authors' option of 'log' command
1330+#: bzrlib/builtins.py:2401
1331+msgid "What names to list as authors - first, all or committer."
1332+msgstr ""
1333+
1334+# title of 'authors' option of 'log' command
1335+#: bzrlib/builtins.py:2402
1336+msgid "Authors"
1337+msgstr ""
1338+
1339+# help of 'levels' option of 'log' command
1340+#: bzrlib/builtins.py:2407
1341+msgid "Number of levels to display - 0 for all, 1 for flat."
1342+msgstr ""
1343+
1344+# help of 'limit' option of 'log' command
1345+#: bzrlib/builtins.py:2417
1346+msgid "Limit the output to the first N revisions."
1347+msgstr ""
1348+
1349+# help of 'show-diff' option of 'log' command
1350+#: bzrlib/builtins.py:2422
1351+msgid "Show changes made in each revision as a patch."
1352+msgstr ""
1353+
1354+# help of 'include-merges' option of 'log' command
1355+#: bzrlib/builtins.py:2424
1356+msgid "Show merged revisions like --levels 0 does."
1357+msgstr ""
1358+
1359+# help of 'exclude-common-ancestry' option of 'log' command
1360+#: bzrlib/builtins.py:2426
1361+msgid ""
1362+"Display only the revisions that are not part of both ancestries (require -"
1363+"rX..Y)"
1364+msgstr ""
1365+
1366+# help of 'signatures' option of 'log' command
1367+#: bzrlib/builtins.py:2430
1368+msgid "Show digital signature validity"
1369+msgstr ""
1370+
1371+# help of 'match' option of 'log' command
1372+#: bzrlib/builtins.py:2433
1373+msgid "Show revisions whose properties match this expression."
1374+msgstr ""
1375+
1376+# help of 'match-message' option of 'log' command
1377+#: bzrlib/builtins.py:2437
1378+msgid "Show revisions whose message matches this expression."
1379+msgstr ""
1380+
1381+# help of 'match-committer' option of 'log' command
1382+#: bzrlib/builtins.py:2441
1383+msgid "Show revisions whose committer matches this expression."
1384+msgstr ""
1385+
1386+# help of 'match-author' option of 'log' command
1387+#: bzrlib/builtins.py:2445
1388+msgid "Show revisions whose authors match this expression."
1389+msgstr ""
1390+
1391+# help of 'match-bugs' option of 'log' command
1392+#: bzrlib/builtins.py:2449
1393+msgid "Show revisions whose bugs match this expression."
1394+msgstr ""
1395+
1396+#: bzrlib/builtins.py:2690
1397+msgid ""
1398+"List files in a tree.\n"
1399+" "
1400+msgstr ""
1401+
1402+# help of 'recursive' option of 'ls' command
1403+#: bzrlib/builtins.py:2699
1404+msgid "Recurse into subdirectories."
1405+msgstr ""
1406+
1407+# help of 'from-root' option of 'ls' command
1408+#: bzrlib/builtins.py:2701
1409+msgid "Print paths relative to the root of the branch."
1410+msgstr ""
1411+
1412+# help of 'unknown' option of 'ls' command
1413+#: bzrlib/builtins.py:2703
1414+msgid "Print unknown files."
1415+msgstr ""
1416+
1417+# help of 'versioned' option of 'ls' command
1418+#: bzrlib/builtins.py:2704
1419+msgid "Print versioned files."
1420+msgstr ""
1421+
1422+# help of 'ignored' option of 'ls' command
1423+#: bzrlib/builtins.py:2707
1424+msgid "Print ignored files."
1425+msgstr ""
1426+
1427+# help of 'kind' option of 'ls' command
1428+#: bzrlib/builtins.py:2709
1429+msgid "List entries of a particular kind: file, directory, symlink."
1430+msgstr ""
1431+
1432+#: bzrlib/builtins.py:2821
1433+msgid "Ignore specified files or patterns."
1434+msgstr ""
1435+
1436+#: bzrlib/builtins.py:2823
1437+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1438+msgstr ""
1439+
1440+#: bzrlib/builtins.py:2825
1441+msgid ""
1442+"If a .bzrignore file does not exist, the ignore command\n"
1443+"will create one and add the specified files or patterns to the newly\n"
1444+"created file. The ignore command will also automatically add the \n"
1445+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1446+"the use of the ignore command will require an explicit add command."
1447+msgstr ""
1448+
1449+#: bzrlib/builtins.py:2831
1450+msgid ""
1451+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1452+"After adding, editing or deleting that file either indirectly by\n"
1453+"using this command or directly by using an editor, be sure to commit\n"
1454+"it."
1455+msgstr ""
1456+
1457+#: bzrlib/builtins.py:2836
1458+msgid ""
1459+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1460+"the global ignore file can be found in the application data directory as\n"
1461+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1462+"Global ignores are not touched by this command. The global ignore file\n"
1463+"can be edited directly using an editor."
1464+msgstr ""
1465+
1466+#: bzrlib/builtins.py:2842
1467+msgid ""
1468+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1469+"precedence over regular ignores. Such exceptions are used to specify\n"
1470+"files that should be versioned which would otherwise be ignored."
1471+msgstr ""
1472+
1473+#: bzrlib/builtins.py:2846
1474+msgid ""
1475+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1476+"precedence over the '!' exception patterns."
1477+msgstr ""
1478+
1479+#: bzrlib/builtins.py:2849
1480+msgid ""
1481+":Notes: \n"
1482+" \n"
1483+"* Ignore patterns containing shell wildcards must be quoted from\n"
1484+" the shell on Unix."
1485+msgstr ""
1486+
1487+#: bzrlib/builtins.py:2854
1488+msgid ""
1489+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1490+" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1491+msgstr ""
1492+
1493+#: bzrlib/builtins.py:2857
1494+msgid ""
1495+":Examples:\n"
1496+" Ignore the top level Makefile::"
1497+msgstr ""
1498+
1499+#: bzrlib/builtins.py:2860
1500+msgid " bzr ignore ./Makefile"
1501+msgstr ""
1502+
1503+#: bzrlib/builtins.py:2862
1504+msgid " Ignore .class files in all directories...::"
1505+msgstr ""
1506+
1507+#: bzrlib/builtins.py:2864
1508+msgid " bzr ignore \"*.class\""
1509+msgstr ""
1510+
1511+#: bzrlib/builtins.py:2866
1512+msgid " ...but do not ignore \"special.class\"::"
1513+msgstr ""
1514+
1515+#: bzrlib/builtins.py:2868
1516+msgid " bzr ignore \"!special.class\""
1517+msgstr ""
1518+
1519+#: bzrlib/builtins.py:2870
1520+msgid " Ignore files whose name begins with the \"#\" character::"
1521+msgstr ""
1522+
1523+#: bzrlib/builtins.py:2872
1524+msgid " bzr ignore \"RE:^#\""
1525+msgstr ""
1526+
1527+#: bzrlib/builtins.py:2874
1528+msgid " Ignore .o files under the lib directory::"
1529+msgstr ""
1530+
1531+#: bzrlib/builtins.py:2876
1532+msgid " bzr ignore \"lib/**/*.o\""
1533+msgstr ""
1534+
1535+#: bzrlib/builtins.py:2880
1536+msgid " bzr ignore \"RE:lib/.*\\.o\""
1537+msgstr ""
1538+
1539+#: bzrlib/builtins.py:2882
1540+msgid " Ignore everything but the \"debian\" toplevel directory::"
1541+msgstr ""
1542+
1543+#: bzrlib/builtins.py:2884
1544+msgid ""
1545+" bzr ignore \"RE:(?!debian/).*\"\n"
1546+" \n"
1547+" Ignore everything except the \"local\" toplevel directory,\n"
1548+" but always ignore autosave files ending in ~, even under local/::\n"
1549+" \n"
1550+" bzr ignore \"*\"\n"
1551+" bzr ignore \"!./local\"\n"
1552+" bzr ignore \"!!*~\""
1553+msgstr ""
1554+
1555+# help of 'default-rules' option of 'ignore' command
1556+#: bzrlib/builtins.py:2898
1557+msgid "Display the default ignore rules that bzr uses."
1558+msgstr ""
1559+
1560+#: bzrlib/builtins.py:2946
1561+msgid "List ignored files and the patterns that matched them."
1562+msgstr ""
1563+
1564+#: bzrlib/builtins.py:2948
1565+msgid ""
1566+"List all the ignored files and the ignore pattern that caused the file to\n"
1567+"be ignored."
1568+msgstr ""
1569+
1570+#: bzrlib/builtins.py:2951
1571+msgid "Alternatively, to list just the files::"
1572+msgstr ""
1573+
1574+#: bzrlib/builtins.py:2953
1575+msgid " bzr ls --ignored"
1576+msgstr ""
1577+
1578+#: bzrlib/builtins.py:2994
1579+msgid "Export current or past revision to a destination directory or archive."
1580+msgstr ""
1581+
1582+#: bzrlib/builtins.py:2996
1583+msgid "If no revision is specified this exports the last committed revision."
1584+msgstr ""
1585+
1586+#: bzrlib/builtins.py:2998
1587+msgid ""
1588+"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1589+"given, try to find the format with the extension. If no extension\n"
1590+"is found exports to a directory (equivalent to --format=dir)."
1591+msgstr ""
1592+
1593+#: bzrlib/builtins.py:3002
1594+msgid ""
1595+"If root is supplied, it will be used as the root directory inside\n"
1596+"container formats (tar, zip, etc). If it is not supplied it will default\n"
1597+"to the exported filename. The root option has no effect for 'dir' format."
1598+msgstr ""
1599+
1600+#: bzrlib/builtins.py:3006
1601+msgid ""
1602+"If branch is omitted then the branch containing the current working\n"
1603+"directory will be used."
1604+msgstr ""
1605+
1606+#: bzrlib/builtins.py:3009
1607+msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1608+msgstr ""
1609+
1610+#: bzrlib/builtins.py:3011
1611+msgid ""
1612+" ================= =========================\n"
1613+" Supported formats Autodetected by extension\n"
1614+" ================= =========================\n"
1615+" dir (none)\n"
1616+" tar .tar\n"
1617+" tbz2 .tar.bz2, .tbz2\n"
1618+" tgz .tar.gz, .tgz\n"
1619+" zip .zip\n"
1620+" ================= ========================="
1621+msgstr ""
1622+
1623+# help of 'format' option of 'export' command
1624+#: bzrlib/builtins.py:3025
1625+msgid "Type of file to export to."
1626+msgstr ""
1627+
1628+# help of 'filters' option of 'export' command
1629+#: bzrlib/builtins.py:3028
1630+msgid "Apply content filters to export the convenient form."
1631+msgstr ""
1632+
1633+# help of 'root' option of 'export' command
1634+#: bzrlib/builtins.py:3032
1635+msgid "Name of the root directory inside the exported file."
1636+msgstr ""
1637+
1638+# help of 'per-file-timestamps' option of 'export' command
1639+#: bzrlib/builtins.py:3034
1640+msgid ""
1641+"Set modification time of files to that of the last revision in which it was "
1642+"changed."
1643+msgstr ""
1644+
1645+#: bzrlib/builtins.py:3058
1646+msgid "Write the contents of a file as of a given revision to standard output."
1647+msgstr ""
1648+
1649+#: bzrlib/builtins.py:3060
1650+msgid "If no revision is nominated, the last revision is used."
1651+msgstr ""
1652+
1653+#: bzrlib/builtins.py:3062
1654+msgid ""
1655+"Note: Take care to redirect standard output when using this command on a\n"
1656+"binary file."
1657+msgstr ""
1658+
1659+# help of 'filters' option of 'cat' command
1660+#: bzrlib/builtins.py:3069
1661+msgid "Apply content filters to display the convenience form."
1662+msgstr ""
1663+
1664+#: bzrlib/builtins.py:3140
1665+msgid "Commit changes into a new revision."
1666+msgstr ""
1667+
1668+#: bzrlib/builtins.py:3142
1669+msgid ""
1670+"An explanatory message needs to be given for each commit. This is\n"
1671+"often done by using the --message option (getting the message from the\n"
1672+"command line) or by using the --file option (getting the message from\n"
1673+"a file). If neither of these options is given, an editor is opened for\n"
1674+"the user to enter the message. To see the changed files in the\n"
1675+"boilerplate text loaded into the editor, use the --show-diff option."
1676+msgstr ""
1677+
1678+#: bzrlib/builtins.py:3149
1679+msgid ""
1680+"By default, the entire tree is committed and the person doing the\n"
1681+"commit is assumed to be the author. These defaults can be overridden\n"
1682+"as explained below."
1683+msgstr ""
1684+
1685+#: bzrlib/builtins.py:3153
1686+msgid ":Selective commits:"
1687+msgstr ""
1688+
1689+#: bzrlib/builtins.py:3155
1690+msgid ""
1691+" If selected files are specified, only changes to those files are\n"
1692+" committed. If a directory is specified then the directory and\n"
1693+" everything within it is committed."
1694+msgstr ""
1695+
1696+#: bzrlib/builtins.py:3159
1697+msgid ""
1698+" When excludes are given, they take precedence over selected files.\n"
1699+" For example, to commit only changes within foo, but not changes\n"
1700+" within foo/bar::"
1701+msgstr ""
1702+
1703+#: bzrlib/builtins.py:3163
1704+msgid " bzr commit foo -x foo/bar"
1705+msgstr ""
1706+
1707+#: bzrlib/builtins.py:3165
1708+msgid " A selective commit after a merge is not yet supported."
1709+msgstr ""
1710+
1711+#: bzrlib/builtins.py:3167
1712+msgid ":Custom authors:"
1713+msgstr ""
1714+
1715+#: bzrlib/builtins.py:3169
1716+msgid ""
1717+" If the author of the change is not the same person as the committer,\n"
1718+" you can specify the author's name using the --author option. The\n"
1719+" name should be in the same format as a committer-id, e.g.\n"
1720+" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
1721+" the change you can specify the option multiple times, once for each\n"
1722+" author."
1723+msgstr ""
1724+
1725+#: bzrlib/builtins.py:3176
1726+msgid ":Checks:"
1727+msgstr ""
1728+
1729+#: bzrlib/builtins.py:3178
1730+msgid ""
1731+" A common mistake is to forget to add a new file or directory before\n"
1732+" running the commit command. The --strict option checks for unknown\n"
1733+" files and aborts the commit if any are found. More advanced pre-commit\n"
1734+" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
1735+" for details."
1736+msgstr ""
1737+
1738+#: bzrlib/builtins.py:3184
1739+msgid ":Things to note:"
1740+msgstr ""
1741+
1742+#: bzrlib/builtins.py:3186
1743+msgid ""
1744+" If you accidentially commit the wrong changes or make a spelling\n"
1745+" mistake in the commit message say, you can use the uncommit command\n"
1746+" to undo it. See ``bzr help uncommit`` for details."
1747+msgstr ""
1748+
1749+#: bzrlib/builtins.py:3190
1750+msgid ""
1751+" Hooks can also be configured to run after a commit. This allows you\n"
1752+" to trigger updates to external systems like bug trackers. The --fixes\n"
1753+" option can be used to record the association between a revision and\n"
1754+" one or more bugs. See ``bzr help bugs`` for details."
1755+msgstr ""
1756+
1757+# help of 'exclude' option of 'commit' command
1758+#: bzrlib/builtins.py:3200
1759+msgid "Do not consider changes made to a given path."
1760+msgstr ""
1761+
1762+# help of 'message' option of 'commit' command
1763+#: bzrlib/builtins.py:3203
1764+msgid "Description of the new revision."
1765+msgstr ""
1766+
1767+# help of 'unchanged' option of 'commit' command
1768+#: bzrlib/builtins.py:3206
1769+msgid "Commit even if nothing has changed."
1770+msgstr ""
1771+
1772+# help of 'file' option of 'commit' command
1773+#: bzrlib/builtins.py:3210
1774+msgid "Take commit message from this file."
1775+msgstr ""
1776+
1777+# help of 'strict' option of 'commit' command
1778+#: bzrlib/builtins.py:3212
1779+msgid "Refuse to commit if there are unknown files in the working tree."
1780+msgstr ""
1781+
1782+# help of 'commit-time' option of 'commit' command
1783+#: bzrlib/builtins.py:3215
1784+msgid ""
1785+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
1786+"08:00:00 +0100'."
1787+msgstr ""
1788+
1789+# help of 'fixes' option of 'commit' command
1790+#: bzrlib/builtins.py:3218
1791+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
1792+msgstr ""
1793+
1794+# help of 'author' option of 'commit' command
1795+#: bzrlib/builtins.py:3221
1796+msgid "Set the author's name, if it's different from the committer."
1797+msgstr ""
1798+
1799+# help of 'local' option of 'commit' command
1800+#: bzrlib/builtins.py:3224
1801+msgid ""
1802+"Perform a local commit in a bound branch. Local commits are not pushed to "
1803+"the master branch until a normal commit is performed."
1804+msgstr ""
1805+
1806+# help of 'show-diff' option of 'commit' command
1807+#: bzrlib/builtins.py:3230
1808+msgid ""
1809+"When no message is supplied, show the diff along with the status summary in "
1810+"the message editor."
1811+msgstr ""
1812+
1813+# help of 'lossy' option of 'commit' command
1814+#: bzrlib/builtins.py:3233
1815+msgid ""
1816+"When committing to a foreign version control system do not push data that "
1817+"can not be natively represented."
1818+msgstr ""
1819+
1820+#: bzrlib/builtins.py:3391
1821+msgid ""
1822+"Validate working tree structure, branch consistency and repository history."
1823+msgstr ""
1824+
1825+#: bzrlib/builtins.py:3393
1826+msgid ""
1827+"This command checks various invariants about branch and repository storage\n"
1828+"to detect data corruption or bzr bugs."
1829+msgstr ""
1830+
1831+#: bzrlib/builtins.py:3396
1832+msgid ""
1833+"The working tree and branch checks will only give output if a problem is\n"
1834+"detected. The output fields of the repository check are:"
1835+msgstr ""
1836+
1837+#: bzrlib/builtins.py:3399
1838+msgid ""
1839+"revisions\n"
1840+" This is just the number of revisions checked. It doesn't\n"
1841+" indicate a problem."
1842+msgstr ""
1843+
1844+#: bzrlib/builtins.py:3403
1845+msgid ""
1846+"versionedfiles\n"
1847+" This is just the number of versionedfiles checked. It\n"
1848+" doesn't indicate a problem."
1849+msgstr ""
1850+
1851+#: bzrlib/builtins.py:3407
1852+msgid ""
1853+"unreferenced ancestors\n"
1854+" Texts that are ancestors of other texts, but\n"
1855+" are not properly referenced by the revision ancestry. This is a\n"
1856+" subtle problem that Bazaar can work around."
1857+msgstr ""
1858+
1859+#: bzrlib/builtins.py:3412
1860+msgid ""
1861+"unique file texts\n"
1862+" This is the total number of unique file contents\n"
1863+" seen in the checked revisions. It does not indicate a problem."
1864+msgstr ""
1865+
1866+#: bzrlib/builtins.py:3416
1867+msgid ""
1868+"repeated file texts\n"
1869+" This is the total number of repeated texts seen\n"
1870+" in the checked revisions. Texts can be repeated when their file\n"
1871+" entries are modified, but the file contents are not. It does not\n"
1872+" indicate a problem."
1873+msgstr ""
1874+
1875+#: bzrlib/builtins.py:3422
1876+msgid ""
1877+"If no restrictions are specified, all Bazaar data that is found at the "
1878+"given\n"
1879+"location will be checked."
1880+msgstr ""
1881+
1882+#: bzrlib/builtins.py:3425
1883+msgid ":Examples:"
1884+msgstr ""
1885+
1886+#: bzrlib/builtins.py:3427
1887+msgid " Check the tree and branch at 'foo'::"
1888+msgstr ""
1889+
1890+#: bzrlib/builtins.py:3429
1891+msgid " bzr check --tree --branch foo"
1892+msgstr ""
1893+
1894+#: bzrlib/builtins.py:3431
1895+msgid " Check only the repository at 'bar'::"
1896+msgstr ""
1897+
1898+#: bzrlib/builtins.py:3433
1899+msgid " bzr check --repo bar"
1900+msgstr ""
1901+
1902+#: bzrlib/builtins.py:3435
1903+msgid " Check everything at 'baz'::"
1904+msgstr ""
1905+
1906+#: bzrlib/builtins.py:3437
1907+msgid " bzr check baz"
1908+msgstr ""
1909+
1910+# help of 'branch' option of 'check' command
1911+#: bzrlib/builtins.py:3443
1912+msgid "Check the branch related to the current directory."
1913+msgstr ""
1914+
1915+# help of 'repo' option of 'check' command
1916+#: bzrlib/builtins.py:3445
1917+msgid "Check the repository related to the current directory."
1918+msgstr ""
1919+
1920+# help of 'tree' option of 'check' command
1921+#: bzrlib/builtins.py:3447
1922+msgid "Check the working tree related to the current directory."
1923+msgstr ""
1924+
1925+#: bzrlib/builtins.py:3461
1926+msgid "Upgrade a repository, branch or working tree to a newer format."
1927+msgstr ""
1928+
1929+#: bzrlib/builtins.py:3463
1930+msgid ""
1931+"When the default format has changed after a major new release of\n"
1932+"Bazaar, you may be informed during certain operations that you\n"
1933+"should upgrade. Upgrading to a newer format may improve performance\n"
1934+"or make new features available. It may however limit interoperability\n"
1935+"with older repositories or with older versions of Bazaar."
1936+msgstr ""
1937+
1938+#: bzrlib/builtins.py:3469
1939+msgid ""
1940+"If you wish to upgrade to a particular format rather than the\n"
1941+"current default, that can be specified using the --format option.\n"
1942+"As a consequence, you can use the upgrade command this way to\n"
1943+"\"downgrade\" to an earlier format, though some conversions are\n"
1944+"a one way process (e.g. changing from the 1.x default to the\n"
1945+"2.x default) so downgrading is not always possible."
1946+msgstr ""
1947+
1948+#: bzrlib/builtins.py:3476
1949+msgid ""
1950+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
1951+"process (where # is a number). By default, this is left there on\n"
1952+"completion. If the conversion fails, delete the new .bzr directory\n"
1953+"and rename this one back in its place. Use the --clean option to ask\n"
1954+"for the backup.bzr directory to be removed on successful conversion.\n"
1955+"Alternatively, you can delete it by hand if everything looks good\n"
1956+"afterwards."
1957+msgstr ""
1958+
1959+#: bzrlib/builtins.py:3484
1960+msgid ""
1961+"If the location given is a shared repository, dependent branches\n"
1962+"are also converted provided the repository converts successfully.\n"
1963+"If the conversion of a branch fails, remaining branches are still\n"
1964+"tried."
1965+msgstr ""
1966+
1967+#: bzrlib/builtins.py:3489
1968+msgid ""
1969+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
1970+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
1971+msgstr ""
1972+
1973+# help of 'format' option of 'upgrade' command
1974+#: bzrlib/builtins.py:3497
1975+msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
1976+msgstr ""
1977+
1978+# title of 'format' option of 'init' command
1979+#: bzrlib/builtins.py:3501
1980+msgid "Branch format"
1981+msgstr ""
1982+
1983+# help of 'clean' option of 'upgrade' command
1984+#: bzrlib/builtins.py:3503
1985+msgid "Remove the backup.bzr directory if successful."
1986+msgstr ""
1987+
1988+#: bzrlib/builtins.py:3520
1989+msgid "Show or set bzr user id."
1990+msgstr ""
1991+
1992+#: bzrlib/builtins.py:3522
1993+msgid ""
1994+":Examples:\n"
1995+" Show the email of the current user::"
1996+msgstr ""
1997+
1998+#: bzrlib/builtins.py:3525
1999+msgid " bzr whoami --email"
2000+msgstr ""
2001+
2002+#: bzrlib/builtins.py:3527
2003+msgid " Set the current user::"
2004+msgstr ""
2005+
2006+#: bzrlib/builtins.py:3529
2007+msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2008+msgstr ""
2009+
2010+# help of 'email' option of 'whoami' command
2011+#: bzrlib/builtins.py:3533
2012+msgid "Display email address only."
2013+msgstr ""
2014+
2015+# help of 'branch' option of 'whoami' command
2016+#: bzrlib/builtins.py:3535
2017+msgid "Set identity for the current branch instead of globally."
2018+msgstr ""
2019+
2020+#: bzrlib/builtins.py:3581
2021+msgid "Print or set the branch nickname."
2022+msgstr ""
2023+
2024+#: bzrlib/builtins.py:3583
2025+msgid ""
2026+"If unset, the tree root directory name is used as the nickname.\n"
2027+"To print the current nickname, execute with no argument."
2028+msgstr ""
2029+
2030+#: bzrlib/builtins.py:3586
2031+msgid ""
2032+"Bound branches use the nickname of its master branch unless it is set\n"
2033+"locally."
2034+msgstr ""
2035+
2036+#: bzrlib/builtins.py:3606
2037+msgid "Set/unset and display aliases."
2038+msgstr ""
2039+
2040+#: bzrlib/builtins.py:3608
2041+msgid ""
2042+":Examples:\n"
2043+" Show the current aliases::"
2044+msgstr ""
2045+
2046+#: bzrlib/builtins.py:3611
2047+msgid " bzr alias"
2048+msgstr ""
2049+
2050+#: bzrlib/builtins.py:3613
2051+msgid " Show the alias specified for 'll'::"
2052+msgstr ""
2053+
2054+#: bzrlib/builtins.py:3615
2055+msgid " bzr alias ll"
2056+msgstr ""
2057+
2058+#: bzrlib/builtins.py:3617
2059+msgid " Set an alias for 'll'::"
2060+msgstr ""
2061+
2062+#: bzrlib/builtins.py:3619
2063+msgid " bzr alias ll=\"log --line -r-10..-1\""
2064+msgstr ""
2065+
2066+#: bzrlib/builtins.py:3621
2067+msgid " To remove an alias for 'll'::"
2068+msgstr ""
2069+
2070+#: bzrlib/builtins.py:3623
2071+msgid " bzr alias --remove ll"
2072+msgstr ""
2073+
2074+# help of 'remove' option of 'alias' command
2075+#: bzrlib/builtins.py:3628
2076+msgid "Remove the alias."
2077+msgstr ""
2078+
2079+#: bzrlib/builtins.py:3867
2080+msgid "Show version of bzr."
2081+msgstr ""
2082+
2083+# help of 'short' option of 'version' command
2084+#: bzrlib/builtins.py:3871
2085+msgid "Print just the version number."
2086+msgstr ""
2087+
2088+#: bzrlib/builtins.py:3918
2089+msgid "Perform a three-way merge."
2090+msgstr ""
2091+
2092+#: bzrlib/builtins.py:3920
2093+msgid ""
2094+"The source of the merge can be specified either in the form of a branch,\n"
2095+"or in the form of a path to a file containing a merge directive generated\n"
2096+"with bzr send. If neither is specified, the default is the upstream branch\n"
2097+"or the branch most recently merged using --remember. The source of the\n"
2098+"merge may also be specified in the form of a path to a file in another\n"
2099+"branch: in this case, only the modifications to that file are merged into\n"
2100+"the current working tree."
2101+msgstr ""
2102+
2103+#: bzrlib/builtins.py:3928
2104+msgid ""
2105+"When merging from a branch, by default bzr will try to merge in all new\n"
2106+"work from the other branch, automatically determining an appropriate base\n"
2107+"revision. If this fails, you may need to give an explicit base."
2108+msgstr ""
2109+
2110+#: bzrlib/builtins.py:3932
2111+msgid ""
2112+"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2113+"try to merge in all new work up to and including revision OTHER."
2114+msgstr ""
2115+
2116+#: bzrlib/builtins.py:3935
2117+msgid ""
2118+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2119+"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2120+"causes some revisions to be skipped, i.e. if the destination branch does\n"
2121+"not already contain revision BASE, such a merge is commonly referred to as\n"
2122+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2123+"cherrypicks. The changes look like a normal commit, and the history of the\n"
2124+"changes from the other branch is not stored in the commit."
2125+msgstr ""
2126+
2127+#: bzrlib/builtins.py:3943
2128+msgid "Revision numbers are always relative to the source branch."
2129+msgstr ""
2130+
2131+#: bzrlib/builtins.py:3950
2132+msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2133+msgstr ""
2134+
2135+#: bzrlib/builtins.py:3952
2136+msgid ""
2137+"If there is no default branch set, the first merge will set it (use\n"
2138+"--no-remember to avoid settting it). After that, you can omit the branch\n"
2139+"to use the default. To change the default, use --remember. The value will\n"
2140+"only be saved if the remote location can be accessed."
2141+msgstr ""
2142+
2143+#: bzrlib/builtins.py:3957
2144+msgid ""
2145+"The results of the merge are placed into the destination working\n"
2146+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2147+"committed to record the result of the merge."
2148+msgstr ""
2149+
2150+#: bzrlib/builtins.py:3961
2151+msgid ""
2152+"merge refuses to run if there are any uncommitted changes, unless\n"
2153+"--force is given. If --force is given, then the changes from the source \n"
2154+"will be merged with the current working tree, including any uncommitted\n"
2155+"changes in the tree. The --force option can also be used to create a\n"
2156+"merge revision which has more than two parents."
2157+msgstr ""
2158+
2159+#: bzrlib/builtins.py:3967
2160+msgid ""
2161+"If one would like to merge changes from the working tree of the other\n"
2162+"branch without merging any committed revisions, the --uncommitted option\n"
2163+"can be given."
2164+msgstr ""
2165+
2166+#: bzrlib/builtins.py:3971
2167+msgid ""
2168+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2169+"you to apply each diff hunk and file change, similar to \"shelve\"."
2170+msgstr ""
2171+
2172+#: bzrlib/builtins.py:3974
2173+msgid ""
2174+":Examples:\n"
2175+" To merge all new revisions from bzr.dev::"
2176+msgstr ""
2177+
2178+#: bzrlib/builtins.py:3977
2179+msgid " bzr merge ../bzr.dev"
2180+msgstr ""
2181+
2182+#: bzrlib/builtins.py:3979
2183+msgid " To merge changes up to and including revision 82 from bzr.dev::"
2184+msgstr ""
2185+
2186+#: bzrlib/builtins.py:3981
2187+msgid " bzr merge -r 82 ../bzr.dev"
2188+msgstr ""
2189+
2190+#: bzrlib/builtins.py:3983
2191+msgid " To merge the changes introduced by 82, without previous changes::"
2192+msgstr ""
2193+
2194+#: bzrlib/builtins.py:3985
2195+msgid " bzr merge -r 81..82 ../bzr.dev"
2196+msgstr ""
2197+
2198+#: bzrlib/builtins.py:3987
2199+msgid " To apply a merge directive contained in /tmp/merge::"
2200+msgstr ""
2201+
2202+#: bzrlib/builtins.py:3989
2203+msgid " bzr merge /tmp/merge"
2204+msgstr ""
2205+
2206+#: bzrlib/builtins.py:3991
2207+msgid ""
2208+" To create a merge revision with three parents from two branches\n"
2209+" feature1a and feature1b:"
2210+msgstr ""
2211+
2212+#: bzrlib/builtins.py:3994
2213+msgid ""
2214+" bzr merge ../feature1a\n"
2215+" bzr merge ../feature1b --force\n"
2216+" bzr commit -m 'revision with three parents'"
2217+msgstr ""
2218+
2219+# help of 'force' option of 'merge' command
2220+#: bzrlib/builtins.py:4006
2221+msgid "Merge even if the destination tree has uncommitted changes."
2222+msgstr ""
2223+
2224+# help of 'uncommitted' option of 'merge' command
2225+#: bzrlib/builtins.py:4012
2226+msgid ""
2227+"Apply uncommitted changes from a working copy, instead of branch changes."
2228+msgstr ""
2229+
2230+# help of 'pull' option of 'merge' command
2231+#: bzrlib/builtins.py:4014
2232+msgid ""
2233+"If the destination is already completely merged into the source, pull from "
2234+"the source rather than merging. When this happens, you do not need to "
2235+"commit the result."
2236+msgstr ""
2237+
2238+# help of 'directory' option of 'merge' command
2239+#: bzrlib/builtins.py:4019
2240+msgid ""
2241+"Branch to merge into, rather than the one containing the working directory."
2242+msgstr ""
2243+
2244+# help of 'preview' option of 'merge' command
2245+#: bzrlib/builtins.py:4021
2246+msgid "Instead of merging, show a diff of the merge."
2247+msgstr ""
2248+
2249+# help of 'interactive' option of 'merge' command
2250+#: bzrlib/builtins.py:4023
2251+msgid "Select changes interactively."
2252+msgstr ""
2253+
2254+#: bzrlib/builtins.py:4307
2255+msgid "Redo a merge."
2256+msgstr ""
2257+
2258+#: bzrlib/builtins.py:4309
2259+msgid ""
2260+"Use this if you want to try a different merge technique while resolving\n"
2261+"conflicts. Some merge techniques are better than others, and remerge\n"
2262+"lets you try different ones on different files."
2263+msgstr ""
2264+
2265+#: bzrlib/builtins.py:4313
2266+msgid ""
2267+"The options for remerge have the same meaning and defaults as the ones for\n"
2268+"merge. The difference is that remerge can (only) be run when there is a\n"
2269+"pending merge, and it lets you specify particular files."
2270+msgstr ""
2271+
2272+#: bzrlib/builtins.py:4317
2273+msgid ""
2274+":Examples:\n"
2275+" Re-do the merge of all conflicted files, and show the base text in\n"
2276+" conflict regions, in addition to the usual THIS and OTHER texts::"
2277+msgstr ""
2278+
2279+#: bzrlib/builtins.py:4321
2280+msgid " bzr remerge --show-base"
2281+msgstr ""
2282+
2283+#: bzrlib/builtins.py:4323
2284+msgid ""
2285+" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2286+" additional processing to reduce the size of conflict regions::"
2287+msgstr ""
2288+
2289+#: bzrlib/builtins.py:4326
2290+msgid " bzr remerge --merge-type weave --reprocess foobar"
2291+msgstr ""
2292+
2293+# help of 'show-base' option of 'merge' command
2294+#: bzrlib/builtins.py:4333
2295+msgid "Show base revision text in conflicts."
2296+msgstr ""
2297+
2298+#: bzrlib/builtins.py:4401
2299+msgid "Revert files to a previous revision."
2300+msgstr ""
2301+
2302+#: bzrlib/builtins.py:4403
2303+msgid ""
2304+"Giving a list of files will revert only those files. Otherwise, all files\n"
2305+"will be reverted. If the revision is not specified with '--revision', the\n"
2306+"last committed revision is used."
2307+msgstr ""
2308+
2309+#: bzrlib/builtins.py:4407
2310+msgid ""
2311+"To remove only some changes, without reverting to a prior version, use\n"
2312+"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2313+"will remove the changes introduced by the second last commit (-2), without\n"
2314+"affecting the changes introduced by the last commit (-1). To remove\n"
2315+"certain changes on a hunk-by-hunk basis, see the shelve command."
2316+msgstr ""
2317+
2318+#: bzrlib/builtins.py:4413
2319+msgid ""
2320+"By default, any files that have been manually changed will be backed up\n"
2321+"first. (Files changed only by merge are not backed up.) Backup files have\n"
2322+"'.~#~' appended to their name, where # is a number."
2323+msgstr ""
2324+
2325+#: bzrlib/builtins.py:4417
2326+msgid ""
2327+"When you provide files, you can use their current pathname or the pathname\n"
2328+"from the target revision. So you can use revert to \"undelete\" a file by\n"
2329+"name. If you name a directory, all the contents of that directory will be\n"
2330+"reverted."
2331+msgstr ""
2332+
2333+#: bzrlib/builtins.py:4422
2334+msgid ""
2335+"If you have newly added files since the target revision, they will be\n"
2336+"removed. If the files to be removed have been changed, backups will be\n"
2337+"created as above. Directories containing unknown files will not be\n"
2338+"deleted."
2339+msgstr ""
2340+
2341+#: bzrlib/builtins.py:4427
2342+msgid ""
2343+"The working tree contains a list of revisions that have been merged but\n"
2344+"not yet committed. These revisions will be included as additional parents\n"
2345+"of the next commit. Normally, using revert clears that list as well as\n"
2346+"reverting the files. If any files are specified, revert leaves the list\n"
2347+"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2348+".`` in the tree root to revert all files but keep the recorded merges,\n"
2349+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2350+"reverting any files."
2351+msgstr ""
2352+
2353+#: bzrlib/builtins.py:4436
2354+msgid ""
2355+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2356+"changes from a branch in a single revision. To do this, perform the merge\n"
2357+"as desired. Then doing revert with the \"--forget-merges\" option will "
2358+"keep\n"
2359+"the content of the tree as it was, but it will clear the list of pending\n"
2360+"merges. The next commit will then contain all of the changes that are\n"
2361+"present in the other branch, but without any other parent revisions.\n"
2362+"Because this technique forgets where these changes originated, it may\n"
2363+"cause additional conflicts on later merges involving the same source and\n"
2364+"target branches."
2365+msgstr ""
2366+
2367+# help of 'no-backup' option of 'revert' command
2368+#: bzrlib/builtins.py:4450
2369+msgid "Do not save backups of reverted files."
2370+msgstr ""
2371+
2372+# help of 'forget-merges' option of 'revert' command
2373+#: bzrlib/builtins.py:4452
2374+msgid "Remove pending merge marker, without changing any files."
2375+msgstr ""
2376+
2377+#: bzrlib/builtins.py:4483
2378+msgid ""
2379+"Show help on a command or other topic.\n"
2380+" "
2381+msgstr ""
2382+
2383+# help of 'long' option of 'help' command
2384+#: bzrlib/builtins.py:4488
2385+msgid "Show help on all commands."
2386+msgstr ""
2387+
2388+#: bzrlib/builtins.py:4517
2389+msgid "Show unmerged/unpulled revisions between two branches."
2390+msgstr ""
2391+
2392+#: bzrlib/builtins.py:4519
2393+msgid "OTHER_BRANCH may be local or remote."
2394+msgstr ""
2395+
2396+#: bzrlib/builtins.py:4521
2397+msgid ""
2398+"To filter on a range of revisions, you can use the command -r begin..end\n"
2399+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2400+"also valid.\n"
2401+" \n"
2402+":Exit values:\n"
2403+" 1 - some missing revisions\n"
2404+" 0 - no missing revisions"
2405+msgstr ""
2406+
2407+#: bzrlib/builtins.py:4531
2408+msgid ""
2409+" Determine the missing revisions between this and the branch at the\n"
2410+" remembered pull location::"
2411+msgstr ""
2412+
2413+#: bzrlib/builtins.py:4534
2414+msgid " bzr missing"
2415+msgstr ""
2416+
2417+#: bzrlib/builtins.py:4536
2418+msgid " Determine the missing revisions between this and another branch::"
2419+msgstr ""
2420+
2421+#: bzrlib/builtins.py:4538
2422+msgid " bzr missing http://server/branch"
2423+msgstr ""
2424+
2425+#: bzrlib/builtins.py:4540
2426+msgid ""
2427+" Determine the missing revisions up to a specific revision on the other\n"
2428+" branch::"
2429+msgstr ""
2430+
2431+#: bzrlib/builtins.py:4543
2432+msgid " bzr missing -r ..-10"
2433+msgstr ""
2434+
2435+#: bzrlib/builtins.py:4545
2436+msgid ""
2437+" Determine the missing revisions up to a specific revision on this\n"
2438+" branch::"
2439+msgstr ""
2440+
2441+#: bzrlib/builtins.py:4548
2442+msgid " bzr missing --my-revision ..-10"
2443+msgstr ""
2444+
2445+# help of 'reverse' option of 'missing' command
2446+#: bzrlib/builtins.py:4555
2447+msgid "Reverse the order of revisions."
2448+msgstr ""
2449+
2450+# help of 'mine-only' option of 'missing' command
2451+#: bzrlib/builtins.py:4557
2452+msgid "Display changes in the local branch only."
2453+msgstr ""
2454+
2455+# help of 'this' option of 'missing' command
2456+#: bzrlib/builtins.py:4558
2457+msgid "Same as --mine-only."
2458+msgstr ""
2459+
2460+# help of 'theirs-only' option of 'missing' command
2461+#: bzrlib/builtins.py:4560
2462+msgid "Display changes in the remote branch only."
2463+msgstr ""
2464+
2465+# help of 'other' option of 'missing' command
2466+#: bzrlib/builtins.py:4561
2467+msgid "Same as --theirs-only."
2468+msgstr ""
2469+
2470+# help of 'revision' option of 'missing' command
2471+#: bzrlib/builtins.py:4566
2472+msgid ""
2473+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2474+"details."
2475+msgstr ""
2476+
2477+# help of 'my-revision' option of 'missing' command
2478+#: bzrlib/builtins.py:4570
2479+msgid ""
2480+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2481+"details."
2482+msgstr ""
2483+
2484+# help of 'include-merges' option of 'missing' command
2485+#: bzrlib/builtins.py:4573
2486+msgid "Show all revisions in addition to the mainline ones."
2487+msgstr ""
2488+
2489+#: bzrlib/builtins.py:4689
2490+msgid "Compress the data within a repository."
2491+msgstr ""
2492+
2493+#: bzrlib/builtins.py:4691
2494+msgid ""
2495+"This operation compresses the data within a bazaar repository. As\n"
2496+"bazaar supports automatic packing of repository, this operation is\n"
2497+"normally not required to be done manually."
2498+msgstr ""
2499+
2500+#: bzrlib/builtins.py:4695
2501+msgid ""
2502+"During the pack operation, bazaar takes a backup of existing repository\n"
2503+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
2504+"automatically when it is safe to do so. To save disk space by removing\n"
2505+"the backed up pack files, the --clean-obsolete-packs option may be\n"
2506+"used."
2507+msgstr ""
2508+
2509+#: bzrlib/builtins.py:4701
2510+msgid ""
2511+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
2512+"during or immediately after repacking, you may be left with a state\n"
2513+"where the deletion has been written to disk but the new packs have not\n"
2514+"been. In this case the repository may be unusable."
2515+msgstr ""
2516+
2517+# help of 'clean-obsolete-packs' option of 'pack' command
2518+#: bzrlib/builtins.py:4710
2519+msgid "Delete obsolete packs to save disk space."
2520+msgstr ""
2521+
2522+#: bzrlib/builtins.py:4724
2523+msgid "List the installed plugins."
2524+msgstr ""
2525+
2526+#: bzrlib/builtins.py:4726
2527+msgid ""
2528+"This command displays the list of installed plugins including\n"
2529+"version of plugin and a short description of each."
2530+msgstr ""
2531+
2532+#: bzrlib/builtins.py:4729
2533+msgid "--verbose shows the path where each plugin is located."
2534+msgstr ""
2535+
2536+#: bzrlib/builtins.py:4731
2537+msgid ""
2538+"A plugin is an external component for Bazaar that extends the\n"
2539+"revision control system, by adding or replacing code in Bazaar.\n"
2540+"Plugins can do a variety of things, including overriding commands,\n"
2541+"adding new commands, providing additional network transports and\n"
2542+"customizing log output."
2543+msgstr ""
2544+
2545+#: bzrlib/builtins.py:4737
2546+msgid ""
2547+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
2548+"for further information on plugins including where to find them and how to\n"
2549+"install them. Instructions are also provided there on how to write new\n"
2550+"plugins using the Python programming language."
2551+msgstr ""
2552+
2553+#: bzrlib/builtins.py:4753
2554+msgid "Show testament (signing-form) of a revision."
2555+msgstr ""
2556+
2557+# help of 'long' option of 'testament' command
2558+#: bzrlib/builtins.py:4756
2559+msgid "Produce long-format testament."
2560+msgstr ""
2561+
2562+# help of 'strict' option of 'testament' command
2563+#: bzrlib/builtins.py:4758
2564+msgid "Produce a strict-format testament."
2565+msgstr ""
2566+
2567+#: bzrlib/builtins.py:4784
2568+msgid "Show the origin of each line in a file."
2569+msgstr ""
2570+
2571+#: bzrlib/builtins.py:4786
2572+msgid ""
2573+"This prints out the given file with an annotation on the left side\n"
2574+"indicating which revision, author and date introduced the change."
2575+msgstr ""
2576+
2577+#: bzrlib/builtins.py:4789
2578+msgid ""
2579+"If the origin is the same for a run of consecutive lines, it is\n"
2580+"shown only at the top, unless the --all option is given."
2581+msgstr ""
2582+
2583+# help of 'all' option of 'annotate' command
2584+#: bzrlib/builtins.py:4797
2585+msgid "Show annotations on all lines."
2586+msgstr ""
2587+
2588+# help of 'long' option of 'annotate' command
2589+#: bzrlib/builtins.py:4798
2590+msgid "Show commit date in annotations."
2591+msgstr ""
2592+
2593+#: bzrlib/builtins.py:4901
2594+msgid ""
2595+"Convert the current branch into a checkout of the supplied branch.\n"
2596+"If no branch is supplied, rebind to the last bound location."
2597+msgstr ""
2598+
2599+#: bzrlib/builtins.py:4904
2600+msgid ""
2601+"Once converted into a checkout, commits must succeed on the master branch\n"
2602+"before they will be applied to the local branch."
2603+msgstr ""
2604+
2605+#: bzrlib/builtins.py:4907
2606+msgid ""
2607+"Bound branches use the nickname of its master branch unless it is set\n"
2608+"locally, in which case binding will update the local nickname to be\n"
2609+"that of the master."
2610+msgstr ""
2611+
2612+#: bzrlib/builtins.py:4942
2613+msgid "Convert the current checkout into a regular branch."
2614+msgstr ""
2615+
2616+#: bzrlib/builtins.py:4944
2617+msgid ""
2618+"After unbinding, the local branch is considered independent and subsequent\n"
2619+"commits will be local only."
2620+msgstr ""
2621+
2622+#: bzrlib/builtins.py:4959
2623+msgid "Remove the last committed revision."
2624+msgstr ""
2625+
2626+#: bzrlib/builtins.py:4961
2627+msgid ""
2628+"--verbose will print out what is being removed.\n"
2629+"--dry-run will go through all the motions, but not actually\n"
2630+"remove anything."
2631+msgstr ""
2632+
2633+#: bzrlib/builtins.py:4965
2634+msgid ""
2635+"If --revision is specified, uncommit revisions to leave the branch at the\n"
2636+"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
2637+"branch at revision 15."
2638+msgstr ""
2639+
2640+#: bzrlib/builtins.py:4969
2641+msgid ""
2642+"Uncommit leaves the working tree ready for a new commit. The only change\n"
2643+"it may make is to restore any pending merges that were present before\n"
2644+"the commit."
2645+msgstr ""
2646+
2647+# help of 'dry-run' option of 'uncommit' command
2648+#: bzrlib/builtins.py:4980
2649+msgid "Don't actually make changes."
2650+msgstr ""
2651+
2652+# help of 'force' option of 'uncommit' command
2653+#: bzrlib/builtins.py:4981
2654+msgid "Say yes to all questions."
2655+msgstr ""
2656+
2657+# help of 'local' option of 'uncommit' command
2658+#: bzrlib/builtins.py:4983
2659+msgid "Only remove the commits from the local branch when in a checkout."
2660+msgstr ""
2661+
2662+#: bzrlib/builtins.py:5068
2663+msgid "Break a dead lock."
2664+msgstr ""
2665+
2666+#: bzrlib/builtins.py:5070
2667+msgid ""
2668+"This command breaks a lock on a repository, branch, working directory or\n"
2669+"config file."
2670+msgstr ""
2671+
2672+#: bzrlib/builtins.py:5073
2673+msgid ""
2674+"CAUTION: Locks should only be broken when you are sure that the process\n"
2675+"holding the lock has been stopped."
2676+msgstr ""
2677+
2678+#: bzrlib/builtins.py:5076
2679+msgid ""
2680+"You can get information on what locks are open via the 'bzr info\n"
2681+"[location]' command."
2682+msgstr ""
2683+
2684+#: bzrlib/builtins.py:5079
2685+msgid ""
2686+":Examples:\n"
2687+" bzr break-lock\n"
2688+" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
2689+" bzr break-lock --conf ~/.bazaar"
2690+msgstr ""
2691+
2692+# help of 'config' option of 'break-lock' command
2693+#: bzrlib/builtins.py:5088
2694+msgid "LOCATION is the directory where the config lock is."
2695+msgstr ""
2696+
2697+# help of 'force' option of 'break-lock' command
2698+#: bzrlib/builtins.py:5090
2699+msgid "Do not ask for confirmation before breaking the lock."
2700+msgstr ""
2701+
2702+#: bzrlib/builtins.py:5126
2703+msgid "Run the bzr server."
2704+msgstr ""
2705+
2706+# help of 'inet' option of 'serve' command
2707+#: bzrlib/builtins.py:5132
2708+msgid "Serve on stdin/out for use from inetd or sshd."
2709+msgstr ""
2710+
2711+# title of 'protocol' option of 'serve' command
2712+#: bzrlib/builtins.py:5133
2713+msgid "protocol"
2714+msgstr ""
2715+
2716+# help of 'protocol' option of 'serve' command
2717+#: bzrlib/builtins.py:5134
2718+msgid "Protocol to serve."
2719+msgstr ""
2720+
2721+# help of 'port' option of 'serve' command
2722+#: bzrlib/builtins.py:5138
2723+msgid ""
2724+"Listen for connections on nominated port of the form [hostname:]portnumber. "
2725+"Passing 0 as the port number will result in a dynamically allocated port. "
2726+"The default port depends on the protocol."
2727+msgstr ""
2728+
2729+# help of 'directory' option of 'serve' command
2730+#: bzrlib/builtins.py:5144
2731+msgid "Serve contents of this directory."
2732+msgstr ""
2733+
2734+# help of 'allow-writes' option of 'serve' command
2735+#: bzrlib/builtins.py:5146
2736+msgid ""
2737+"By default the server is a readonly server. Supplying --allow-writes "
2738+"enables write access to the contents of the served directory and below. "
2739+"Note that ``bzr serve`` does not perform authentication, so unless some form "
2740+"of external authentication is arranged supplying this option leads to global "
2741+"uncontrolled write access to your file system."
2742+msgstr ""
2743+
2744+#: bzrlib/builtins.py:5191
2745+msgid "Combine a tree into its containing tree."
2746+msgstr ""
2747+
2748+#: bzrlib/builtins.py:5193
2749+msgid "This command requires the target tree to be in a rich-root format."
2750+msgstr ""
2751+
2752+#: bzrlib/builtins.py:5195
2753+msgid ""
2754+"The TREE argument should be an independent tree, inside another tree, but\n"
2755+"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
2756+"running \"bzr branch\" with the target inside a tree.)"
2757+msgstr ""
2758+
2759+#: bzrlib/builtins.py:5199
2760+msgid ""
2761+"The result is a combined tree, with the subtree no longer an independent\n"
2762+"part. This is marked as a merge of the subtree into the containing tree,\n"
2763+"and all history is preserved."
2764+msgstr ""
2765+
2766+#: bzrlib/builtins.py:5237
2767+msgid "Split a subdirectory of a tree into a separate tree."
2768+msgstr ""
2769+
2770+#: bzrlib/builtins.py:5239
2771+msgid ""
2772+"This command will produce a target tree in a format that supports\n"
2773+"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
2774+"converted into earlier formats like 'dirstate-tags'."
2775+msgstr ""
2776+
2777+#: bzrlib/builtins.py:5243
2778+msgid ""
2779+"The TREE argument should be a subdirectory of a working tree. That\n"
2780+"subdirectory will be converted into an independent tree, with its own\n"
2781+"branch. Commits in the top-level tree will not apply to the new subtree."
2782+msgstr ""
2783+
2784+#: bzrlib/builtins.py:5364
2785+msgid "Mail or create a merge-directive for submitting changes."
2786+msgstr ""
2787+
2788+#: bzrlib/builtins.py:5366
2789+msgid "A merge directive provides many things needed for requesting merges:"
2790+msgstr ""
2791+
2792+#: bzrlib/builtins.py:5368
2793+msgid "* A machine-readable description of the merge to perform"
2794+msgstr ""
2795+
2796+#: bzrlib/builtins.py:5370
2797+msgid "* An optional patch that is a preview of the changes requested"
2798+msgstr ""
2799+
2800+#: bzrlib/builtins.py:5372
2801+msgid ""
2802+"* An optional bundle of revision data, so that the changes can be applied\n"
2803+" directly from the merge directive, without retrieving data from a\n"
2804+" branch."
2805+msgstr ""
2806+
2807+#: bzrlib/builtins.py:5376
2808+msgid ""
2809+"`bzr send` creates a compact data set that, when applied using bzr\n"
2810+"merge, has the same effect as merging from the source branch. "
2811+msgstr ""
2812+
2813+#: bzrlib/builtins.py:5379
2814+msgid ""
2815+"By default the merge directive is self-contained and can be applied to any\n"
2816+"branch containing submit_branch in its ancestory without needing access to\n"
2817+"the source branch."
2818+msgstr ""
2819+
2820+#: bzrlib/builtins.py:5383
2821+msgid ""
2822+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
2823+"revisions, but only a structured request to merge from the\n"
2824+"public_location. In that case the public_branch is needed and it must be\n"
2825+"up-to-date and accessible to the recipient. The public_branch is always\n"
2826+"included if known, so that people can check it later."
2827+msgstr ""
2828+
2829+#: bzrlib/builtins.py:5389
2830+msgid ""
2831+"The submit branch defaults to the parent of the source branch, but can be\n"
2832+"overridden. Both submit branch and public branch will be remembered in\n"
2833+"branch.conf the first time they are used for a particular branch. The\n"
2834+"source branch defaults to that containing the working directory, but can\n"
2835+"be changed using --from."
2836+msgstr ""
2837+
2838+#: bzrlib/builtins.py:5395
2839+msgid ""
2840+"Both the submit branch and the public branch follow the usual behavior with\n"
2841+"respect to --remember: If there is no default location set, the first send\n"
2842+"will set it (use --no-remember to avoid settting it). After that, you can\n"
2843+"omit the location to use the default. To change the default, use\n"
2844+"--remember. The value will only be saved if the location can be accessed."
2845+msgstr ""
2846+
2847+#: bzrlib/builtins.py:5401
2848+msgid ""
2849+"In order to calculate those changes, bzr must analyse the submit branch.\n"
2850+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
2851+"If a public location is known for the submit_branch, that location is used\n"
2852+"in the merge directive."
2853+msgstr ""
2854+
2855+#: bzrlib/builtins.py:5406
2856+msgid ""
2857+"The default behaviour is to send the merge directive by mail, unless -o is\n"
2858+"given, in which case it is sent to a file."
2859+msgstr ""
2860+
2861+#: bzrlib/builtins.py:5409
2862+msgid ""
2863+"Mail is sent using your preferred mail program. This should be transparent\n"
2864+"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
2865+"If the preferred client can't be found (or used), your editor will be used."
2866+msgstr ""
2867+
2868+#: bzrlib/builtins.py:5413
2869+msgid ""
2870+"To use a specific mail program, set the mail_client configuration option.\n"
2871+"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
2872+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
2873+"\" (MacOS X's\n"
2874+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
2875+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
2876+"add\n"
2877+"supported clients."
2878+msgstr ""
2879+
2880+#: bzrlib/builtins.py:5420
2881+msgid ""
2882+"If mail is being sent, a to address is required. This can be supplied\n"
2883+"either on the commandline, by setting the submit_to configuration\n"
2884+"option in the branch itself or the child_submit_to configuration option\n"
2885+"in the submit branch."
2886+msgstr ""
2887+
2888+#: bzrlib/builtins.py:5425
2889+msgid ""
2890+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
2891+"and\n"
2892+"merge directive format 2. It is significantly faster and smaller than\n"
2893+"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
2894+"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
2895+"format 1. It is compatible with Bazaar 0.12 - 0.18."
2896+msgstr ""
2897+
2898+#: bzrlib/builtins.py:5431
2899+msgid ""
2900+"The merge directives created by bzr send may be applied using bzr merge or\n"
2901+"bzr pull by specifying a file containing a merge directive as the location."
2902+msgstr ""
2903+
2904+#: bzrlib/builtins.py:5434
2905+msgid ""
2906+"bzr send makes extensive use of public locations to map local locations "
2907+"into\n"
2908+"URLs that can be used by other people. See `bzr help configuration` to\n"
2909+"set them, and use `bzr info` to display them."
2910+msgstr ""
2911+
2912+# help of 'output' option of 'send' command
2913+#: bzrlib/builtins.py:5458
2914+msgid "Write merge directive to this file or directory; use - for stdout."
2915+msgstr ""
2916+
2917+# help of 'strict' option of 'send' command
2918+#: bzrlib/builtins.py:5462
2919+msgid ""
2920+"Refuse to send if there are uncommitted changes in the working tree, --no-"
2921+"strict disables the check."
2922+msgstr ""
2923+
2924+# help of 'mail-to' option of 'send' command
2925+#: bzrlib/builtins.py:5464
2926+msgid "Mail the request to this address."
2927+msgstr ""
2928+
2929+# help of 'body' option of 'send' command
2930+#: bzrlib/builtins.py:5468
2931+msgid "Body for the email."
2932+msgstr ""
2933+
2934+# help of 'no-bundle' option of 'send' command
2935+#: bzrlib/builtins.py:5521
2936+msgid "Do not include a bundle in the merge directive."
2937+msgstr ""
2938+
2939+# help of 'no-patch' option of 'send' command
2940+#: bzrlib/builtins.py:5522
2941+msgid "Do not include a preview patch in the merge directive."
2942+msgstr ""
2943+
2944+# help of 'remember' option of 'send' command
2945+#: bzrlib/builtins.py:5525
2946+msgid "Remember submit and public branch."
2947+msgstr ""
2948+
2949+# help of 'from' option of 'send' command
2950+#: bzrlib/builtins.py:5527
2951+msgid ""
2952+"Branch to generate the submission from, rather than the one containing the "
2953+"working directory."
2954+msgstr ""
2955+
2956+# title of 'format' option of 'send' command
2957+#: bzrlib/builtins.py:5537
2958+msgid "format"
2959+msgstr ""
2960+
2961+# help of 'format' option of 'send' command
2962+#: bzrlib/builtins.py:5538
2963+msgid "Use the specified output format."
2964+msgstr ""
2965+
2966+#: bzrlib/builtins.py:5560
2967+msgid "Create, remove or modify a tag naming a revision."
2968+msgstr ""
2969+
2970+#: bzrlib/builtins.py:5562
2971+msgid ""
2972+"Tags give human-meaningful names to revisions. Commands that take a -r\n"
2973+"(--revision) option can be given -rtag:X, where X is any previously\n"
2974+"created tag."
2975+msgstr ""
2976+
2977+#: bzrlib/builtins.py:5566
2978+msgid ""
2979+"Tags are stored in the branch. Tags are copied from one branch to another\n"
2980+"along when you branch, push, pull or merge."
2981+msgstr ""
2982+
2983+#: bzrlib/builtins.py:5569
2984+msgid ""
2985+"It is an error to give a tag name that already exists unless you pass\n"
2986+"--force, in which case the tag is moved to point to the new revision."
2987+msgstr ""
2988+
2989+#: bzrlib/builtins.py:5572
2990+msgid ""
2991+"To rename a tag (change the name but keep it on the same revsion), run "
2992+"``bzr\n"
2993+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
2994+msgstr ""
2995+
2996+#: bzrlib/builtins.py:5575
2997+msgid ""
2998+"If no tag name is specified it will be determined through the \n"
2999+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3000+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3001+"details."
3002+msgstr ""
3003+
3004+# help of 'delete' option of 'tag' command
3005+#: bzrlib/builtins.py:5585
3006+msgid "Delete this tag rather than placing it."
3007+msgstr ""
3008+
3009+# help of 'directory' option of 'tag' command
3010+#: bzrlib/builtins.py:5588
3011+msgid "Branch in which to place the tag."
3012+msgstr ""
3013+
3014+# help of 'force' option of 'tag' command
3015+#: bzrlib/builtins.py:5590
3016+msgid "Replace existing tags."
3017+msgstr ""
3018+
3019+#: bzrlib/builtins.py:5629
3020+msgid "List tags."
3021+msgstr ""
3022+
3023+#: bzrlib/builtins.py:5631
3024+msgid ""
3025+"This command shows a table of tag names and the revisions they reference."
3026+msgstr ""
3027+
3028+# help of 'directory' option of 'tags' command
3029+#: bzrlib/builtins.py:5637
3030+msgid "Branch whose tags should be displayed."
3031+msgstr ""
3032+
3033+# help of 'sort' option of 'tags' command
3034+#: bzrlib/builtins.py:5639
3035+msgid "Sort tags by different criteria."
3036+msgstr ""
3037+
3038+# title of 'sort' option of 'tags' command
3039+#: bzrlib/builtins.py:5639
3040+msgid "Sorting"
3041+msgstr ""
3042+
3043+#: bzrlib/builtins.py:5684
3044+msgid "Reconfigure the type of a bzr directory."
3045+msgstr ""
3046+
3047+#: bzrlib/builtins.py:5686
3048+msgid "A target configuration must be specified."
3049+msgstr ""
3050+
3051+#: bzrlib/builtins.py:5688
3052+msgid ""
3053+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3054+"The order of preference is\n"
3055+"1. For a lightweight checkout, the current bound location.\n"
3056+"2. For branches that used to be checkouts, the previously-bound location.\n"
3057+"3. The push location.\n"
3058+"4. The parent location.\n"
3059+"If none of these is available, --bind-to must be specified."
3060+msgstr ""
3061+
3062+# title of 'target_type' option of 'reconfigure' command
3063+#: bzrlib/builtins.py:5702
3064+msgid "Target type"
3065+msgstr ""
3066+
3067+# help of 'target_type' option of 'reconfigure' command
3068+#: bzrlib/builtins.py:5703
3069+msgid "The type to reconfigure the directory to."
3070+msgstr ""
3071+
3072+# help of 'bind-to' option of 'reconfigure' command
3073+#: bzrlib/builtins.py:5718
3074+msgid "Branch to bind checkout to."
3075+msgstr ""
3076+
3077+# help of 'force' option of 'reconfigure' command
3078+#: bzrlib/builtins.py:5720
3079+msgid "Perform reconfiguration even if local changes will be lost."
3080+msgstr ""
3081+
3082+# help of 'stacked-on' option of 'reconfigure' command
3083+#: bzrlib/builtins.py:5723
3084+msgid "Reconfigure a branch to be stacked on another branch."
3085+msgstr ""
3086+
3087+# help of 'unstacked' option of 'reconfigure' command
3088+#: bzrlib/builtins.py:5727
3089+msgid ""
3090+"Reconfigure a branch to be unstacked. This may require copying substantial "
3091+"data into it."
3092+msgstr ""
3093+
3094+#: bzrlib/builtins.py:5775
3095+msgid "Set the branch of a checkout and update."
3096+msgstr ""
3097+
3098+#: bzrlib/builtins.py:5777
3099+msgid ""
3100+"For lightweight checkouts, this changes the branch being referenced.\n"
3101+"For heavyweight checkouts, this checks that there are no local commits\n"
3102+"versus the current bound branch, then it makes the local branch a mirror\n"
3103+"of the new location and binds to it."
3104+msgstr ""
3105+
3106+#: bzrlib/builtins.py:5782
3107+msgid ""
3108+"In both cases, the working tree is updated and uncommitted changes\n"
3109+"are merged. The user can commit or revert these as they desire."
3110+msgstr ""
3111+
3112+#: bzrlib/builtins.py:5785
3113+msgid "Pending merges need to be committed or reverted before using switch."
3114+msgstr ""
3115+
3116+#: bzrlib/builtins.py:5787
3117+msgid ""
3118+"The path to the branch to switch to can be specified relative to the parent\n"
3119+"directory of the current branch. For example, if you are currently in a\n"
3120+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3121+"/path/to/newbranch."
3122+msgstr ""
3123+
3124+#: bzrlib/builtins.py:5792
3125+msgid ""
3126+"Bound branches use the nickname of its master branch unless it is set\n"
3127+"locally, in which case switching will update the local nickname to be\n"
3128+"that of the master."
3129+msgstr ""
3130+
3131+# help of 'force' option of 'switch' command
3132+#: bzrlib/builtins.py:5800
3133+msgid "Switch even if local commits will be lost."
3134+msgstr ""
3135+
3136+# help of 'create-branch' option of 'switch' command
3137+#: bzrlib/builtins.py:5803
3138+msgid "Create the target branch from this one before switching to it."
3139+msgstr ""
3140+
3141+#: bzrlib/builtins.py:5872
3142+msgid "Manage filtered views."
3143+msgstr ""
3144+
3145+#: bzrlib/builtins.py:5874
3146+msgid ""
3147+"Views provide a mask over the tree so that users can focus on\n"
3148+"a subset of a tree when doing their work. After creating a view,\n"
3149+"commands that support a list of files - status, diff, commit, etc -\n"
3150+"effectively have that list of files implicitly given each time.\n"
3151+"An explicit list of files can still be given but those files\n"
3152+"must be within the current view."
3153+msgstr ""
3154+
3155+#: bzrlib/builtins.py:5881
3156+msgid ""
3157+"In most cases, a view has a short life-span: it is created to make\n"
3158+"a selected change and is deleted once that change is committed.\n"
3159+"At other times, you may wish to create one or more named views\n"
3160+"and switch between them."
3161+msgstr ""
3162+
3163+#: bzrlib/builtins.py:5886
3164+msgid ""
3165+"To disable the current view without deleting it, you can switch to\n"
3166+"the pseudo view called ``off``. This can be useful when you need\n"
3167+"to see the whole tree for an operation or two (e.g. merge) but\n"
3168+"want to switch back to your view after that."
3169+msgstr ""
3170+
3171+#: bzrlib/builtins.py:5891
3172+msgid ""
3173+":Examples:\n"
3174+" To define the current view::"
3175+msgstr ""
3176+
3177+#: bzrlib/builtins.py:5894
3178+msgid " bzr view file1 dir1 ..."
3179+msgstr ""
3180+
3181+#: bzrlib/builtins.py:5896
3182+msgid " To list the current view::"
3183+msgstr ""
3184+
3185+#: bzrlib/builtins.py:5898
3186+msgid " bzr view"
3187+msgstr ""
3188+
3189+#: bzrlib/builtins.py:5900
3190+msgid " To delete the current view::"
3191+msgstr ""
3192+
3193+#: bzrlib/builtins.py:5902
3194+msgid " bzr view --delete"
3195+msgstr ""
3196+
3197+#: bzrlib/builtins.py:5904
3198+msgid " To disable the current view without deleting it::"
3199+msgstr ""
3200+
3201+#: bzrlib/builtins.py:5906
3202+msgid " bzr view --switch off"
3203+msgstr ""
3204+
3205+#: bzrlib/builtins.py:5908
3206+msgid " To define a named view and switch to it::"
3207+msgstr ""
3208+
3209+#: bzrlib/builtins.py:5910
3210+msgid " bzr view --name view-name file1 dir1 ..."
3211+msgstr ""
3212+
3213+#: bzrlib/builtins.py:5912
3214+msgid " To list a named view::"
3215+msgstr ""
3216+
3217+#: bzrlib/builtins.py:5914
3218+msgid " bzr view --name view-name"
3219+msgstr ""
3220+
3221+#: bzrlib/builtins.py:5916
3222+msgid " To delete a named view::"
3223+msgstr ""
3224+
3225+#: bzrlib/builtins.py:5918
3226+msgid " bzr view --name view-name --delete"
3227+msgstr ""
3228+
3229+#: bzrlib/builtins.py:5920
3230+msgid " To switch to a named view::"
3231+msgstr ""
3232+
3233+#: bzrlib/builtins.py:5922
3234+msgid " bzr view --switch view-name"
3235+msgstr ""
3236+
3237+#: bzrlib/builtins.py:5924
3238+msgid " To list all views defined::"
3239+msgstr ""
3240+
3241+#: bzrlib/builtins.py:5926
3242+msgid " bzr view --all"
3243+msgstr ""
3244+
3245+#: bzrlib/builtins.py:5928
3246+msgid " To delete all views::"
3247+msgstr ""
3248+
3249+#: bzrlib/builtins.py:5930
3250+msgid " bzr view --delete --all"
3251+msgstr ""
3252+
3253+# help of 'all' option of 'view' command
3254+#: bzrlib/builtins.py:5937
3255+msgid "Apply list or delete action to all views."
3256+msgstr ""
3257+
3258+# help of 'delete' option of 'view' command
3259+#: bzrlib/builtins.py:5940
3260+msgid "Delete the view."
3261+msgstr ""
3262+
3263+# help of 'name' option of 'view' command
3264+#: bzrlib/builtins.py:5943
3265+msgid "Name of the view to define, list or delete."
3266+msgstr ""
3267+
3268+# help of 'switch' option of 'view' command
3269+#: bzrlib/builtins.py:5947
3270+msgid "Name of the view to switch to."
3271+msgstr ""
3272+
3273+#: bzrlib/builtins.py:6047
3274+msgid "Remove a branch."
3275+msgstr ""
3276+
3277+#: bzrlib/builtins.py:6049
3278+msgid ""
3279+"This will remove the branch from the specified location but \n"
3280+"will keep any working tree or repository in place."
3281+msgstr ""
3282+
3283+#: bzrlib/builtins.py:6054
3284+msgid " Remove the branch at repo/trunk::"
3285+msgstr ""
3286+
3287+#: bzrlib/builtins.py:6056
3288+msgid " bzr remove-branch repo/trunk"
3289+msgstr ""
3290+
3291+#: bzrlib/builtins.py:6072
3292+msgid "Temporarily set aside some changes from the current tree."
3293+msgstr ""
3294+
3295+#: bzrlib/builtins.py:6074
3296+msgid ""
3297+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
3298+"ie. out of the way, until a later time when you can bring them back from\n"
3299+"the shelf with the 'unshelve' command. The changes are stored alongside\n"
3300+"your working tree, and so they aren't propagated along with your branch nor\n"
3301+"will they survive its deletion."
3302+msgstr ""
3303+
3304+#: bzrlib/builtins.py:6080
3305+msgid "If shelve --list is specified, previously-shelved changes are listed."
3306+msgstr ""
3307+
3308+#: bzrlib/builtins.py:6082
3309+msgid ""
3310+"Shelve is intended to help separate several sets of changes that have\n"
3311+"been inappropriately mingled. If you just want to get rid of all changes\n"
3312+"and you don't need to restore them later, use revert. If you want to\n"
3313+"shelve all text changes at once, use shelve --all."
3314+msgstr ""
3315+
3316+#: bzrlib/builtins.py:6087
3317+msgid ""
3318+"If filenames are specified, only the changes to those files will be\n"
3319+"shelved. Other files will be left untouched."
3320+msgstr ""
3321+
3322+#: bzrlib/builtins.py:6090
3323+msgid ""
3324+"If a revision is specified, changes since that revision will be shelved."
3325+msgstr ""
3326+
3327+#: bzrlib/builtins.py:6092
3328+msgid ""
3329+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
3330+"restore the most recently shelved changes."
3331+msgstr ""
3332+
3333+#: bzrlib/builtins.py:6095
3334+msgid ""
3335+"For complicated changes, it is possible to edit the changes in a separate\n"
3336+"editor program to decide what the file remaining in the working copy\n"
3337+"should look like. To do this, add the configuration option"
3338+msgstr ""
3339+
3340+#: bzrlib/builtins.py:6099
3341+msgid " change_editor = PROGRAM @new_path @old_path"
3342+msgstr ""
3343+
3344+#: bzrlib/builtins.py:6101
3345+msgid ""
3346+"where @new_path is replaced with the path of the new version of the \n"
3347+"file and @old_path is replaced with the path of the old version of \n"
3348+"the file. The PROGRAM should save the new file with the desired \n"
3349+"contents of the file in the working tree.\n"
3350+" "
3351+msgstr ""
3352+
3353+# help of 'all' option of 'shelve' command
3354+#: bzrlib/builtins.py:6113
3355+msgid "Shelve all changes."
3356+msgstr ""
3357+
3358+# help of 'writer' option of 'shelve' command
3359+#: bzrlib/builtins.py:6115
3360+msgid "Method to use for writing diffs."
3361+msgstr ""
3362+
3363+# title of 'writer' option of 'shelve' command
3364+#: bzrlib/builtins.py:6115
3365+msgid "writer"
3366+msgstr ""
3367+
3368+# help of 'list' option of 'shelve' command
3369+#: bzrlib/builtins.py:6119
3370+msgid "List shelved changes."
3371+msgstr ""
3372+
3373+# help of 'destroy' option of 'shelve' command
3374+#: bzrlib/builtins.py:6121
3375+msgid "Destroy removed changes instead of shelving them."
3376+msgstr ""
3377+
3378+#: bzrlib/builtins.py:6161
3379+msgid "Restore shelved changes."
3380+msgstr ""
3381+
3382+#: bzrlib/builtins.py:6163
3383+msgid ""
3384+"By default, the most recently shelved changes are restored. However if you\n"
3385+"specify a shelf by id those changes will be restored instead. This works\n"
3386+"best when the changes don't depend on each other."
3387+msgstr ""
3388+
3389+# help of 'action' option of 'unshelve' command
3390+#: bzrlib/builtins.py:6172
3391+msgid "The action to perform."
3392+msgstr ""
3393+
3394+#: bzrlib/builtins.py:6194
3395+msgid "Remove unwanted files from working tree."
3396+msgstr ""
3397+
3398+#: bzrlib/builtins.py:6196
3399+msgid ""
3400+"By default, only unknown files, not ignored files, are deleted. Versioned\n"
3401+"files are never deleted."
3402+msgstr ""
3403+
3404+#: bzrlib/builtins.py:6199
3405+msgid ""
3406+"Another class is 'detritus', which includes files emitted by bzr during\n"
3407+"normal operations and selftests. (The value of these files decreases with\n"
3408+"time.)"
3409+msgstr ""
3410+
3411+#: bzrlib/builtins.py:6203
3412+msgid ""
3413+"If no options are specified, unknown files are deleted. Otherwise, option\n"
3414+"flags are respected, and may be combined."
3415+msgstr ""
3416+
3417+#: bzrlib/builtins.py:6206
3418+msgid "To check what clean-tree will do, use --dry-run."
3419+msgstr ""
3420+
3421+# help of 'ignored' option of 'clean-tree' command
3422+#: bzrlib/builtins.py:6209
3423+msgid "Delete all ignored files."
3424+msgstr ""
3425+
3426+# help of 'detritus' option of 'clean-tree' command
3427+#: bzrlib/builtins.py:6210
3428+msgid ""
3429+"Delete conflict files, merge and revert backups, and failed selftest dirs."
3430+msgstr ""
3431+
3432+# help of 'unknown' option of 'clean-tree' command
3433+#: bzrlib/builtins.py:6213
3434+msgid "Delete files unknown to bzr (default)."
3435+msgstr ""
3436+
3437+# help of 'dry-run' option of 'clean-tree' command
3438+#: bzrlib/builtins.py:6214
3439+msgid "Show files to delete instead of deleting them."
3440+msgstr ""
3441+
3442+# help of 'force' option of 'clean-tree' command
3443+#: bzrlib/builtins.py:6216
3444+msgid "Do not prompt before deleting."
3445+msgstr ""
3446+
3447+#: bzrlib/cmd_version_info.py:50
3448+msgid "Show version information about this tree."
3449+msgstr ""
3450+
3451+#: bzrlib/cmd_version_info.py:52
3452+msgid ""
3453+"You can use this command to add information about version into\n"
3454+"source code of an application. The output can be in one of the\n"
3455+"supported formats or in a custom format based on a template."
3456+msgstr ""
3457+
3458+#: bzrlib/cmd_version_info.py:56
3459+msgid "For example::"
3460+msgstr ""
3461+
3462+#: bzrlib/cmd_version_info.py:58
3463+msgid ""
3464+" bzr version-info --custom \\\n"
3465+" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
3466+msgstr ""
3467+
3468+#: bzrlib/cmd_version_info.py:61
3469+msgid ""
3470+"will produce a C header file with formatted string containing the\n"
3471+"current revision number. Other supported variables in templates are:"
3472+msgstr ""
3473+
3474+#: bzrlib/cmd_version_info.py:64
3475+msgid ""
3476+" * {date} - date of the last revision\n"
3477+" * {build_date} - current date\n"
3478+" * {revno} - revision number\n"
3479+" * {revision_id} - revision id\n"
3480+" * {branch_nick} - branch nickname\n"
3481+" * {clean} - 0 if the source tree contains uncommitted changes,\n"
3482+" otherwise 1"
3483+msgstr ""
3484+
3485+# help of 'format' option of 'version-info' command
3486+#: bzrlib/cmd_version_info.py:74
3487+msgid "Select the output format."
3488+msgstr ""
3489+
3490+# help of 'all' option of 'version-info' command
3491+#: bzrlib/cmd_version_info.py:78
3492+msgid "Include all possible information."
3493+msgstr ""
3494+
3495+# help of 'check-clean' option of 'version-info' command
3496+#: bzrlib/cmd_version_info.py:79
3497+msgid "Check if tree is clean."
3498+msgstr ""
3499+
3500+# help of 'include-history' option of 'version-info' command
3501+#: bzrlib/cmd_version_info.py:81
3502+msgid "Include the revision-history."
3503+msgstr ""
3504+
3505+# help of 'include-file-revisions' option of 'version-info' command
3506+#: bzrlib/cmd_version_info.py:83
3507+msgid "Include the last revision for each file."
3508+msgstr ""
3509+
3510+# help of 'template' option of 'version-info' command
3511+#: bzrlib/cmd_version_info.py:84
3512+msgid "Template for the output."
3513+msgstr ""
3514+
3515+#: bzrlib/commands.py:479
3516+msgid "No help for this command."
3517+msgstr ""
3518+
3519+#: bzrlib/commands.py:492
3520+#, python-format
3521+msgid ":Purpose: %s\n"
3522+msgstr ""
3523+
3524+#: bzrlib/commands.py:494
3525+#, python-format
3526+msgid ""
3527+":Usage:\n"
3528+"%s\n"
3529+msgstr ""
3530+
3531+#: bzrlib/commands.py:496
3532+#, python-format
3533+msgid ":Usage: %s\n"
3534+msgstr ""
3535+
3536+#: bzrlib/commands.py:515
3537+#, python-format
3538+msgid ":Options:%s"
3539+msgstr ""
3540+
3541+#: bzrlib/commands.py:526
3542+#, python-format
3543+msgid ""
3544+":Description:\n"
3545+" %s\n"
3546+"\n"
3547+msgstr ""
3548+
3549+#: bzrlib/commands.py:536
3550+#, python-format
3551+msgid ""
3552+"See bzr help %s for more details and examples.\n"
3553+"\n"
3554+msgstr ""
3555+
3556+#: bzrlib/commands.py:541
3557+msgid ":Aliases: "
3558+msgstr ""
3559+
3560+#: bzrlib/commands.py:545
3561+#, python-format
3562+msgid ":From: plugin \"%s\"\n"
3563+msgstr ""
3564+
3565+#: bzrlib/commands.py:557
3566+#, python-format
3567+msgid ":doc:`%s <%s-help>`"
3568+msgstr ""
3569+
3570+#: bzrlib/commands.py:560
3571+#, python-format
3572+msgid ":See also: %s"
3573+msgstr ""
3574+
3575+#: bzrlib/commit_signature_commands.py:34
3576+msgid "Sign all commits by a given committer."
3577+msgstr ""
3578+
3579+#: bzrlib/commit_signature_commands.py:36
3580+msgid ""
3581+"If location is not specified the local tree is used.\n"
3582+"If committer is not specified the default committer is used."
3583+msgstr ""
3584+
3585+#: bzrlib/commit_signature_commands.py:39
3586+msgid "This does not sign commits that already have signatures."
3587+msgstr ""
3588+
3589+# help of 'dry-run' option of 'sign-my-commits' command
3590+#: bzrlib/commit_signature_commands.py:47
3591+msgid ""
3592+"Don't actually sign anything, just print the revisions that would be signed."
3593+msgstr ""
3594+
3595+#: bzrlib/commit_signature_commands.py:101
3596+msgid "Verify all commit signatures."
3597+msgstr ""
3598+
3599+#: bzrlib/commit_signature_commands.py:103
3600+msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
3601+msgstr ""
3602+
3603+# help of 'acceptable-keys' option of 'verify-signatures' command
3604+#: bzrlib/commit_signature_commands.py:108
3605+msgid ""
3606+"Comma separated list of GPG key patterns which are acceptable for "
3607+"verification."
3608+msgstr ""
3609+
3610+#: bzrlib/commit_signature_commands.py:166
3611+msgid "All commits signed with verifiable keys"
3612+msgstr ""
3613+
3614+#: bzrlib/config.py:3118
3615+msgid "Display, set or remove a configuration option."
3616+msgstr ""
3617+
3618+#: bzrlib/config.py:3120
3619+msgid "Display the active value for a given option."
3620+msgstr ""
3621+
3622+#: bzrlib/config.py:3122
3623+msgid ""
3624+"If --all is specified, NAME is interpreted as a regular expression and all\n"
3625+"matching options are displayed mentioning their scope. The active value\n"
3626+"that bzr will take into account is the first one displayed for each option."
3627+msgstr ""
3628+
3629+#: bzrlib/config.py:3126
3630+msgid "If no NAME is given, --all .* is implied."
3631+msgstr ""
3632+
3633+#: bzrlib/config.py:3128
3634+msgid ""
3635+"Setting a value is achieved by using name=value without spaces. The value\n"
3636+"is set in the most relevant scope and can be checked by displaying the\n"
3637+"option again."
3638+msgstr ""
3639+
3640+# help of 'scope' option of 'config' command
3641+#: bzrlib/config.py:3139
3642+msgid "Reduce the scope to the specified configuration file"
3643+msgstr ""
3644+
3645+# help of 'all' option of 'config' command
3646+#: bzrlib/config.py:3143
3647+msgid "Display all the defined values for the matching options."
3648+msgstr ""
3649+
3650+# help of 'remove' option of 'config' command
3651+#: bzrlib/config.py:3145
3652+msgid "Remove the option from the configuration file"
3653+msgstr ""
3654+
3655+#: bzrlib/conflicts.py:47
3656+msgid "List files with conflicts."
3657+msgstr ""
3658+
3659+#: bzrlib/conflicts.py:49
3660+msgid ""
3661+"Merge will do its best to combine the changes in two branches, but there\n"
3662+"are some kinds of problems only a human can fix. When it encounters those,\n"
3663+"it will mark a conflict. A conflict means that you need to fix something,\n"
3664+"before you should commit."
3665+msgstr ""
3666+
3667+#: bzrlib/conflicts.py:54
3668+msgid ""
3669+"Conflicts normally are listed as short, human-readable messages. If --text\n"
3670+"is supplied, the pathnames of files with text conflicts are listed,\n"
3671+"instead. (This is useful for editing all files with text conflicts.)"
3672+msgstr ""
3673+
3674+#: bzrlib/conflicts.py:58
3675+msgid "Use bzr resolve when you have fixed a problem."
3676+msgstr ""
3677+
3678+# help of 'text' option of 'conflicts' command
3679+#: bzrlib/conflicts.py:63
3680+msgid "List paths of files with text conflicts."
3681+msgstr ""
3682+
3683+# help of 'action' option of 'resolve' command
3684+#: bzrlib/conflicts.py:95
3685+msgid "How to resolve the conflict."
3686+msgstr ""
3687+
3688+#: bzrlib/conflicts.py:101
3689+msgid "Mark a conflict as resolved."
3690+msgstr ""
3691+
3692+#: bzrlib/conflicts.py:108
3693+msgid ""
3694+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
3695+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
3696+"as\n"
3697+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
3698+msgstr ""
3699+
3700+# help of 'all' option of 'resolve' command
3701+#: bzrlib/conflicts.py:116
3702+msgid "Resolve all conflicts in this tree."
3703+msgstr ""
3704+
3705+# title of 'action' option of 'resolve' command
3706+#: bzrlib/conflicts.py:688
3707+msgid "action"
3708+msgstr ""
3709+
3710+#: bzrlib/errors.py:208
3711+msgid "The tree builder is already building a tree."
3712+msgstr ""
3713+
3714+#: bzrlib/errors.py:229
3715+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
3716+msgstr ""
3717+
3718+#: bzrlib/errors.py:248
3719+msgid ""
3720+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
3721+"versions \"%(minimum)s\" to \"%(current)s\"."
3722+msgstr ""
3723+
3724+#: bzrlib/errors.py:260
3725+msgid "The transport '%(transport)s' is only accessible within this process."
3726+msgstr ""
3727+
3728+#: bzrlib/errors.py:278
3729+msgid "Invalid revision number %(revno)s"
3730+msgstr ""
3731+
3732+#: bzrlib/errors.py:287
3733+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
3734+msgstr ""
3735+
3736+#: bzrlib/errors.py:298
3737+msgid "Reserved revision-id {%(revision_id)s}"
3738+msgstr ""
3739+
3740+#: bzrlib/errors.py:312
3741+msgid "There is no public branch set for \"%(branch_url)s\"."
3742+msgstr ""
3743+
3744+#: bzrlib/errors.py:322
3745+msgid ""
3746+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
3747+"obtain a list of topics."
3748+msgstr ""
3749+
3750+#: bzrlib/errors.py:331
3751+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
3752+msgstr ""
3753+
3754+#: bzrlib/errors.py:341
3755+msgid ""
3756+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
3757+msgstr ""
3758+
3759+#: bzrlib/errors.py:350
3760+msgid "The branch '%(branch)s' is not stacked."
3761+msgstr ""
3762+
3763+#: bzrlib/errors.py:364
3764+msgid "No WorkingTree exists for \"%(base)s\"."
3765+msgstr ""
3766+
3767+#: bzrlib/errors.py:373
3768+msgid "Not currently building a tree."
3769+msgstr ""
3770+
3771+#: bzrlib/errors.py:378
3772+msgid "%(url)s is not a local path."
3773+msgstr ""
3774+
3775+#: bzrlib/errors.py:406
3776+msgid "%(not_locked)r is not write locked but needs to be."
3777+msgstr ""
3778+
3779+#: bzrlib/errors.py:414
3780+msgid "Error in command line options"
3781+msgstr ""
3782+
3783+#: bzrlib/errors.py:419
3784+msgid "%(value)s is not an index of type %(_type)s."
3785+msgstr ""
3786+
3787+#: bzrlib/errors.py:429
3788+msgid "Error in data for index %(value)s."
3789+msgstr ""
3790+
3791+#: bzrlib/errors.py:438
3792+msgid "The key '%(key)s' is already in index '%(index)s'."
3793+msgstr ""
3794+
3795+#: bzrlib/errors.py:448
3796+msgid "The key '%(key)s' is not a valid key."
3797+msgstr ""
3798+
3799+#: bzrlib/errors.py:457
3800+msgid "Could not parse options for index %(value)s."
3801+msgstr ""
3802+
3803+#: bzrlib/errors.py:466
3804+msgid "The value '%(value)s' is not a valid value."
3805+msgstr ""
3806+
3807+#: bzrlib/errors.py:494
3808+msgid "Generic path error: %(path)r%(extra)s)"
3809+msgstr ""
3810+
3811+#: bzrlib/errors.py:507
3812+msgid "No such file: %(path)r%(extra)s"
3813+msgstr ""
3814+
3815+#: bzrlib/errors.py:512
3816+msgid "File exists: %(path)r%(extra)s"
3817+msgstr ""
3818+
3819+#: bzrlib/errors.py:518
3820+msgid ""
3821+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
3822+"after to tell bzr about a rename that has already happened)%(extra)s"
3823+msgstr ""
3824+
3825+#: bzrlib/errors.py:534
3826+msgid "\"%(path)s\" is not a directory %(extra)s"
3827+msgstr ""
3828+
3829+#: bzrlib/errors.py:539
3830+msgid "\"%(path)s\" is not in the working directory %(extra)s"
3831+msgstr ""
3832+
3833+#: bzrlib/errors.py:544
3834+msgid "Directory not empty: \"%(path)s\"%(extra)s"
3835+msgstr ""
3836+
3837+#: bzrlib/errors.py:549
3838+msgid "Hard-linking \"%(path)s\" is not supported"
3839+msgstr ""
3840+
3841+#: bzrlib/errors.py:564
3842+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
3843+msgstr ""
3844+
3845+#: bzrlib/errors.py:569
3846+msgid "Permission denied: \"%(path)s\"%(extra)s"
3847+msgstr ""
3848+
3849+#: bzrlib/errors.py:574
3850+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
3851+msgstr ""
3852+
3853+#: bzrlib/errors.py:579
3854+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
3855+msgstr ""
3856+
3857+#: bzrlib/errors.py:590
3858+msgid "URLs differ by more than path: %(from_)r and %(to)r"
3859+msgstr ""
3860+
3861+#: bzrlib/errors.py:612
3862+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
3863+msgstr ""
3864+
3865+#: bzrlib/errors.py:622
3866+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
3867+msgstr ""
3868+
3869+#: bzrlib/errors.py:630
3870+msgid ""
3871+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
3872+"upgrade the branch to permit branch stacking."
3873+msgstr ""
3874+
3875+#: bzrlib/errors.py:641
3876+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
3877+msgstr ""
3878+
3879+#: bzrlib/errors.py:651
3880+msgid ""
3881+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
3882+"need to upgrade the repository to permit branch stacking."
3883+msgstr ""
3884+
3885+#: bzrlib/errors.py:662
3886+msgid "Error reading from %(path)r."
3887+msgstr ""
3888+
3889+#: bzrlib/errors.py:681
3890+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
3891+msgstr ""
3892+
3893+#: bzrlib/errors.py:697
3894+msgid "Path \"%(path)s\" is not unicode normalized"
3895+msgstr ""
3896+
3897+#: bzrlib/errors.py:705
3898+msgid "Not a branch: \"%(path)s\"%(detail)s."
3899+msgstr ""
3900+
3901+#: bzrlib/errors.py:747
3902+msgid "No submit branch available for branch \"%(path)s\""
3903+msgstr ""
3904+
3905+#: bzrlib/errors.py:756
3906+msgid "Already a branch: \"%(path)s\"."
3907+msgstr ""
3908+
3909+#: bzrlib/errors.py:762
3910+msgid ""
3911+"Directory contains a branch, but no working tree (use bzr checkout if you "
3912+"wish to build a working tree): \"%(path)s\""
3913+msgstr ""
3914+
3915+#: bzrlib/errors.py:767
3916+msgid ""
3917+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
3918+msgstr ""
3919+
3920+#: bzrlib/errors.py:777
3921+msgid ""
3922+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
3923+msgstr ""
3924+
3925+#: bzrlib/errors.py:787
3926+msgid "No repository present: \"%(path)s\""
3927+msgstr ""
3928+
3929+#: bzrlib/errors.py:795
3930+msgid "File \"%(path)s\" is not in branch %(branch_base)s."
3931+msgstr ""
3932+
3933+#: bzrlib/errors.py:807
3934+msgid ""
3935+"Unsupported branch format: %(format)s\n"
3936+"Please run 'bzr upgrade'"
3937+msgstr ""
3938+
3939+#: bzrlib/errors.py:813
3940+msgid "Unknown %(kind)s format: %(format)r"
3941+msgstr ""
3942+
3943+#: bzrlib/errors.py:822
3944+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
3945+msgstr ""
3946+
3947+#: bzrlib/errors.py:835
3948+msgid ""
3949+"%(target)s\n"
3950+"is not compatible with\n"
3951+"%(source)s\n"
3952+"%(details)s"
3953+msgstr ""
3954+
3955+#: bzrlib/errors.py:851
3956+msgid "Revision is not compatible with %(repo_format)s"
3957+msgstr ""
3958+
3959+#: bzrlib/errors.py:861
3960+msgid "%(context_info)s%(path)s is already versioned."
3961+msgstr ""
3962+
3963+#: bzrlib/errors.py:882
3964+msgid "%(context_info)s%(path)s is not versioned."
3965+msgstr ""
3966+
3967+#: bzrlib/errors.py:903
3968+msgid "Path(s) are not versioned: %(paths_as_string)s"
3969+msgstr ""
3970+
3971+#: bzrlib/errors.py:914
3972+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
3973+msgstr ""
3974+
3975+#: bzrlib/errors.py:933
3976+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
3977+msgstr ""
3978+
3979+#: bzrlib/errors.py:941
3980+msgid ""
3981+"Filename %(filename)r is not valid in your current filesystem encoding "
3982+"%(fs_encoding)s"
3983+msgstr ""
3984+
3985+#: bzrlib/errors.py:952
3986+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
3987+msgstr ""
3988+
3989+#: bzrlib/errors.py:970
3990+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
3991+msgstr ""
3992+
3993+#: bzrlib/errors.py:1009
3994+msgid "Cannot lock %(lock)s: %(why)s"
3995+msgstr ""
3996+
3997+#: bzrlib/errors.py:1019
3998+msgid ""
3999+"A transaction related operation was attempted after the transaction finished."
4000+msgstr ""
4001+
4002+#: bzrlib/errors.py:1046
4003+msgid "Cannot lock: transport is read only: %(transport)s"
4004+msgstr ""
4005+
4006+#: bzrlib/errors.py:1054
4007+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
4008+msgstr ""
4009+
4010+#: bzrlib/errors.py:1065
4011+msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
4012+msgstr ""
4013+
4014+#: bzrlib/errors.py:1076
4015+msgid ""
4016+"Lock was released and re-acquired before being broken: %(lock)s: held by "
4017+"%(holder)r, wanted to break %(target)r"
4018+msgstr ""
4019+
4020+#: bzrlib/errors.py:1088
4021+msgid ""
4022+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
4023+"Use 'bzr break-lock' to clear it"
4024+msgstr ""
4025+
4026+#: bzrlib/errors.py:1101
4027+msgid "Lock not held: %(lock)s"
4028+msgstr ""
4029+
4030+#: bzrlib/errors.py:1130
4031+msgid "No changes to commit"
4032+msgstr ""
4033+
4034+#: bzrlib/errors.py:1135
4035+msgid ""
4036+"Selected-file commit of merges is not supported yet: files %(files_str)s"
4037+msgstr ""
4038+
4039+#: bzrlib/errors.py:1145
4040+msgid ""
4041+"Excluding paths during commit is not supported by repository at %(repository)"
4042+"r."
4043+msgstr ""
4044+
4045+#: bzrlib/errors.py:1154
4046+msgid ""
4047+"The specified commit message contains characters unsupported by the current "
4048+"encoding."
4049+msgstr ""
4050+
4051+#: bzrlib/errors.py:1160
4052+msgid "Upgrade URL cannot work with readonly URLs."
4053+msgstr ""
4054+
4055+#: bzrlib/errors.py:1165
4056+msgid "The branch format %(format)s is already at the most recent format."
4057+msgstr ""
4058+
4059+#: bzrlib/errors.py:1188
4060+msgid "Option --change does not accept revision ranges"
4061+msgstr ""
4062+
4063+#: bzrlib/errors.py:1193
4064+msgid "No namespace registered for string: %(spec)r"
4065+msgstr ""
4066+
4067+#: bzrlib/errors.py:1212
4068+msgid ""
4069+"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
4070+"%(extra)s"
4071+msgstr ""
4072+
4073+#: bzrlib/errors.py:1226
4074+msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
4075+msgstr ""
4076+
4077+#: bzrlib/errors.py:1231
4078+msgid ""
4079+"Operation denied because it would change the main history, which is not "
4080+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
4081+msgstr ""
4082+
4083+#: bzrlib/errors.py:1242
4084+msgid ""
4085+"These branches have diverged. Use the missing command to see how.\n"
4086+"Use the merge command to reconcile them."
4087+msgstr ""
4088+
4089+#: bzrlib/errors.py:1262
4090+msgid ""
4091+"Branches have no common ancestor, and no merge base revision was specified."
4092+msgstr ""
4093+
4094+#: bzrlib/errors.py:1268
4095+msgid ""
4096+"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
4097+msgstr ""
4098+
4099+#: bzrlib/errors.py:1274
4100+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
4101+msgstr ""
4102+
4103+#: bzrlib/errors.py:1283
4104+msgid ""
4105+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
4106+msgstr ""
4107+
4108+#: bzrlib/errors.py:1292
4109+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
4110+msgstr ""
4111+
4112+#: bzrlib/errors.py:1312
4113+msgid "Branch %(branch)s has no commits."
4114+msgstr ""
4115+
4116+#: bzrlib/errors.py:1330
4117+msgid ""
4118+"Bound branch %(branch)s is out of date with master branch %(master)s."
4119+"%(extra_help)s"
4120+msgstr ""
4121+
4122+#: bzrlib/errors.py:1342
4123+msgid ""
4124+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
4125+"bound to %(remote)s."
4126+msgstr ""
4127+
4128+#: bzrlib/errors.py:1354
4129+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
4130+msgstr ""
4131+
4132+#: bzrlib/errors.py:1363
4133+msgid ""
4134+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
4135+"%(error)s"
4136+msgstr ""
4137+
4138+#: bzrlib/errors.py:1375
4139+msgid "Error in processing weave: %(msg)s"
4140+msgstr ""
4141+
4142+#: bzrlib/errors.py:1384
4143+msgid "Revision {%(revision_id)s} already present in %(weave)s"
4144+msgstr ""
4145+
4146+#: bzrlib/errors.py:1395
4147+msgid "Revision {%(revision_id)s} not present in %(weave)s"
4148+msgstr ""
4149+
4150+#: bzrlib/errors.py:1405
4151+msgid "Weave invariant violated: %(what)s"
4152+msgstr ""
4153+
4154+#: bzrlib/errors.py:1414
4155+msgid "Parents are mismatched between two revisions. %(msg)s"
4156+msgstr ""
4157+
4158+#: bzrlib/errors.py:1436
4159+msgid ""
4160+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
4161+"%(weave_b)s"
4162+msgstr ""
4163+
4164+#: bzrlib/errors.py:1448
4165+msgid "Versioned file error"
4166+msgstr ""
4167+
4168+#: bzrlib/errors.py:1453
4169+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
4170+msgstr ""
4171+
4172+#: bzrlib/errors.py:1463
4173+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
4174+msgstr ""
4175+
4176+#: bzrlib/errors.py:1473
4177+msgid "Text did not match its checksum: %(msg)s"
4178+msgstr ""
4179+
4180+#: bzrlib/errors.py:1598
4181+msgid "Export format %(format)r not supported"
4182+msgstr ""
4183+
4184+#: bzrlib/errors.py:1607
4185+msgid "Transport error: %(msg)s %(orig_error)s"
4186+msgstr ""
4187+
4188+#: bzrlib/errors.py:1633
4189+msgid "Generic bzr smart protocol error: %(details)s"
4190+msgstr ""
4191+
4192+#: bzrlib/errors.py:1641
4193+msgid "Received bad protocol version marker: %(marker)r"
4194+msgstr ""
4195+
4196+#: bzrlib/errors.py:1672
4197+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
4198+msgstr ""
4199+
4200+#: bzrlib/errors.py:1677
4201+msgid "Connection error: %(msg)s %(orig_error)s"
4202+msgstr ""
4203+
4204+#: bzrlib/errors.py:1682
4205+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
4206+msgstr ""
4207+
4208+#: bzrlib/errors.py:1703
4209+msgid "Connection closed: %(msg)s %(orig_error)s"
4210+msgstr ""
4211+
4212+#: bzrlib/errors.py:1708
4213+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
4214+msgstr ""
4215+
4216+#: bzrlib/errors.py:1718
4217+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
4218+msgstr ""
4219+
4220+#: bzrlib/errors.py:1733
4221+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
4222+msgstr ""
4223+
4224+#: bzrlib/errors.py:1747
4225+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
4226+msgstr ""
4227+
4228+#: bzrlib/errors.py:1755
4229+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
4230+msgstr ""
4231+
4232+#: bzrlib/errors.py:1764
4233+msgid "%(source)s is%(permanently)s redirected to %(target)s"
4234+msgstr ""
4235+
4236+#: bzrlib/errors.py:1778
4237+msgid "Too many redirections"
4238+msgstr ""
4239+
4240+#: bzrlib/errors.py:1783
4241+msgid "Working tree has conflicts."
4242+msgstr ""
4243+
4244+#: bzrlib/errors.py:1787
4245+msgid "Config file %(filename)s is not UTF-8 encoded\n"
4246+msgstr ""
4247+
4248+#: bzrlib/errors.py:1796
4249+msgid ""
4250+"Error(s) parsing config file %(filename)s:\n"
4251+"%(errors)s"
4252+msgstr ""
4253+
4254+#: bzrlib/errors.py:1807
4255+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4256+msgstr ""
4257+
4258+#: bzrlib/errors.py:1815
4259+msgid "%(username)r does not seem to contain a reasonable email address"
4260+msgstr ""
4261+
4262+#: bzrlib/errors.py:1824
4263+msgid "Failed to GPG sign data with command \"%(command_line)s\""
4264+msgstr ""
4265+
4266+#: bzrlib/errors.py:1832
4267+msgid "Failed to verify GPG signature data with error \"%(error)s\""
4268+msgstr ""
4269+
4270+#: bzrlib/errors.py:1840
4271+msgid "Unable to import library \"%(library)s\": %(error)s"
4272+msgstr ""
4273+
4274+#: bzrlib/errors.py:1848
4275+msgid "python-gpgme is not installed, it is needed to verify signatures"
4276+msgstr ""
4277+
4278+#: bzrlib/errors.py:1856
4279+msgid ""
4280+"The working tree for %(basedir)s has changed since the last commit, but "
4281+"weave merge requires that it be unchanged"
4282+msgstr ""
4283+
4284+#: bzrlib/errors.py:1866
4285+msgid ""
4286+"Can't reprocess and show base, because reprocessing obscures the "
4287+"relationship of conflicting lines to the base"
4288+msgstr ""
4289+
4290+#: bzrlib/errors.py:1872
4291+msgid "Cycle in graph %(graph)r"
4292+msgstr ""
4293+
4294+#: bzrlib/errors.py:1900
4295+msgid "File %(filename)s is not conflicted."
4296+msgstr ""
4297+
4298+#: bzrlib/errors.py:1922
4299+msgid "No bundle was found in \"%(filename)s\"."
4300+msgstr ""
4301+
4302+#: bzrlib/errors.py:1931
4303+msgid "Unable to handle bundle version %(version)s: %(msg)s"
4304+msgstr ""
4305+
4306+#: bzrlib/errors.py:1941
4307+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
4308+msgstr ""
4309+
4310+#: bzrlib/errors.py:1954
4311+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
4312+msgstr ""
4313+
4314+#: bzrlib/errors.py:1964
4315+msgid "Key %(key)s is already present in map"
4316+msgstr ""
4317+
4318+#: bzrlib/errors.py:1969
4319+msgid "The prefix %(prefix)s is in the help search path twice."
4320+msgstr ""
4321+
4322+#: bzrlib/errors.py:1977
4323+msgid "Tree transform is malformed %(conflicts)r"
4324+msgstr ""
4325+
4326+#: bzrlib/errors.py:1979
4327+msgid ""
4328+"No final name for trans_id %(trans_id)r\n"
4329+"file-id: %(file_id)r\n"
4330+"root trans-id: %(root_trans_id)r\n"
4331+msgstr ""
4332+
4333+#: bzrlib/errors.py:2011
4334+msgid "Attempt to reuse a transform that has already been applied."
4335+msgstr ""
4336+
4337+#: bzrlib/errors.py:2016
4338+msgid "Moving the root directory is not supported at this time"
4339+msgstr ""
4340+
4341+#: bzrlib/errors.py:2021
4342+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
4343+msgstr ""
4344+
4345+#: bzrlib/errors.py:2032
4346+msgid ""
4347+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4348+msgstr ""
4349+
4350+#: bzrlib/errors.py:2068
4351+msgid ""
4352+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4353+msgstr ""
4354+
4355+#: bzrlib/errors.py:2077
4356+msgid ""
4357+"Can't safely remove modified or unknown files:\n"
4358+"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
4359+"regardless."
4360+msgstr ""
4361+
4362+#: bzrlib/errors.py:2114
4363+msgid "Unable to import paramiko (required for sftp support): %(error)s"
4364+msgstr ""
4365+
4366+#: bzrlib/errors.py:2122
4367+msgid "Nothing to merge."
4368+msgstr ""
4369+
4370+#: bzrlib/errors.py:2127
4371+msgid "Format %(format)s cannot be initialised by this version of bzr."
4372+msgstr ""
4373+
4374+#: bzrlib/errors.py:2136
4375+msgid ""
4376+"Cannot convert from format %(from_format)s to format %(format)s. "
4377+"%(problem)s"
4378+msgstr ""
4379+
4380+#: bzrlib/errors.py:2148
4381+msgid "Could not find an appropriate Differ for file \"%(path)s\""
4382+msgstr ""
4383+
4384+#: bzrlib/errors.py:2156
4385+msgid "%(exe_name)s could not be found on this machine"
4386+msgstr ""
4387+
4388+#: bzrlib/errors.py:2164
4389+msgid "Diff is not installed on this machine: %(msg)s"
4390+msgstr ""
4391+
4392+#: bzrlib/errors.py:2172
4393+msgid "Diff3 is not installed on this machine."
4394+msgstr ""
4395+
4396+#: bzrlib/errors.py:2178
4397+msgid "The content being inserted is already present."
4398+msgstr ""
4399+
4400+#: bzrlib/errors.py:2183
4401+msgid ""
4402+"This tree contains left-over files from a failed operation.\n"
4403+" Please examine %(limbo_dir)s to see if it contains any files you wish "
4404+"to\n"
4405+" keep, and delete it when you are done."
4406+msgstr ""
4407+
4408+#: bzrlib/errors.py:2194
4409+msgid ""
4410+"This tree contains left-over files from a failed operation.\n"
4411+" Please examine %(pending_deletion)s to see if it contains any files you\n"
4412+" wish to keep, and delete it when you are done."
4413+msgstr ""
4414+
4415+#: bzrlib/errors.py:2204
4416+msgid ""
4417+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
4418+" Please examine %(limbo_dir)s to see if it contains any files you wish "
4419+"to\n"
4420+" keep, and delete it when you are done."
4421+msgstr ""
4422+
4423+#: bzrlib/errors.py:2215
4424+msgid ""
4425+"Unable to delete transform temporary directory %(pending_deletion)s. Please "
4426+"examine %(pending_deletion)s to see if it contains any files you wish to "
4427+"keep, and delete it when you are done."
4428+msgstr ""
4429+
4430+#: bzrlib/errors.py:2225
4431+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
4432+msgstr ""
4433+
4434+#: bzrlib/errors.py:2239
4435+msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
4436+msgstr ""
4437+
4438+#: bzrlib/errors.py:2252
4439+msgid "Error in merge modified format"
4440+msgstr ""
4441+
4442+#: bzrlib/errors.py:2257
4443+msgid "Format error in conflict listings"
4444+msgstr ""
4445+
4446+#: bzrlib/errors.py:2261
4447+msgid ""
4448+"Inconsistency in dirstate file %(dirstate_path)s.\n"
4449+"Error: %(description)s"
4450+msgstr ""
4451+
4452+#: bzrlib/errors.py:2272
4453+msgid ""
4454+"An error has been detected in the repository %(repo_path)s.\n"
4455+"Please run bzr reconcile on this repository."
4456+msgstr ""
4457+
4458+#: bzrlib/errors.py:2283
4459+msgid ""
4460+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
4461+"reason: %(reason)s"
4462+msgstr ""
4463+
4464+#: bzrlib/errors.py:2296
4465+msgid ""
4466+"An inconsistent delta was supplied: %(delta)r\n"
4467+"reason: %(reason)s"
4468+msgstr ""
4469+
4470+#: bzrlib/errors.py:2308
4471+msgid "To use this feature you must upgrade your branch at %(path)s."
4472+msgstr ""
4473+
4474+#: bzrlib/errors.py:2317
4475+msgid "To use this feature you must upgrade your repository at %(path)s."
4476+msgstr ""
4477+
4478+#: bzrlib/errors.py:2322
4479+msgid ""
4480+"To use this feature you must upgrade your branch at %(path)s to a format "
4481+"which supports rich roots."
4482+msgstr ""
4483+
4484+#: bzrlib/errors.py:2328
4485+msgid "Cannot perform local-only commits on unbound branches."
4486+msgstr ""
4487+
4488+#: bzrlib/errors.py:2333
4489+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
4490+msgstr ""
4491+
4492+#: bzrlib/errors.py:2354
4493+msgid "File is binary but should be text."
4494+msgstr ""
4495+
4496+#: bzrlib/errors.py:2359
4497+msgid "The path %(path)s is not permitted on this platform"
4498+msgstr ""
4499+
4500+#: bzrlib/errors.py:2368
4501+msgid ""
4502+"Testament did not match expected value.\n"
4503+" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
4504+" {%(measured)s}"
4505+msgstr ""
4506+
4507+#: bzrlib/errors.py:2380
4508+msgid "Not a bzr revision-bundle: %(text)r"
4509+msgstr ""
4510+
4511+#: bzrlib/errors.py:2389
4512+msgid "Bad bzr revision-bundle: %(text)r"
4513+msgstr ""
4514+
4515+#: bzrlib/errors.py:2398
4516+msgid "Malformed bzr revision-bundle header: %(text)r"
4517+msgstr ""
4518+
4519+#: bzrlib/errors.py:2403
4520+msgid "Malformed patches in bzr revision-bundle: %(text)r"
4521+msgstr ""
4522+
4523+#: bzrlib/errors.py:2408
4524+msgid "Malformed footer in bzr revision-bundle: %(text)r"
4525+msgstr ""
4526+
4527+#: bzrlib/errors.py:2413
4528+msgid "End of line marker was not \\n in bzr revision-bundle"
4529+msgstr ""
4530+
4531+#: bzrlib/errors.py:2423
4532+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
4533+msgstr ""
4534+
4535+#: bzrlib/errors.py:2433
4536+msgid "Root class for inventory serialization errors"
4537+msgstr ""
4538+
4539+#: bzrlib/errors.py:2437
4540+msgid ""
4541+"The inventory was not in the expected format:\n"
4542+" %(msg)s"
4543+msgstr ""
4544+
4545+#: bzrlib/errors.py:2446
4546+msgid "This operation requires rich root data storage"
4547+msgstr ""
4548+
4549+#: bzrlib/errors.py:2459
4550+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
4551+msgstr ""
4552+
4553+#: bzrlib/errors.py:2468
4554+msgid ""
4555+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
4556+"variable."
4557+msgstr ""
4558+
4559+#: bzrlib/errors.py:2475
4560+msgid ""
4561+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
4562+"ghost at {%(ghost_revision_id)s}"
4563+msgstr ""
4564+
4565+#: bzrlib/errors.py:2485
4566+msgid "Ghost revision {%(revision_id)s} cannot be used here."
4567+msgstr ""
4568+
4569+#: bzrlib/errors.py:2536
4570+msgid ""
4571+"A merge directive must provide either a bundle or a public branch location."
4572+msgstr ""
4573+
4574+#: bzrlib/errors.py:2543
4575+msgid "Bad merge directive payload %(start)r"
4576+msgstr ""
4577+
4578+#: bzrlib/errors.py:2553
4579+msgid "Preview patch does not match requested changes."
4580+msgstr ""
4581+
4582+#: bzrlib/errors.py:2559
4583+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
4584+msgstr ""
4585+
4586+#: bzrlib/errors.py:2569
4587+msgid ""
4588+"Your branch does not have all of the revisions required in order to merge "
4589+"this merge directive and the target location specified in the merge "
4590+"directive is not a branch: %(location)s."
4591+msgstr ""
4592+
4593+#: bzrlib/errors.py:2581
4594+msgid "Unsupported entry kind %(kind)s"
4595+msgstr ""
4596+
4597+#: bzrlib/errors.py:2589
4598+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
4599+msgstr ""
4600+
4601+#: bzrlib/errors.py:2599
4602+msgid "Subsume target %(other_tree)s needs to be upgraded."
4603+msgstr ""
4604+
4605+#: bzrlib/errors.py:2618
4606+msgid "No such tag: %(tag_name)s"
4607+msgstr ""
4608+
4609+#: bzrlib/errors.py:2626
4610+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
4611+msgstr ""
4612+
4613+#: bzrlib/errors.py:2635
4614+msgid "Tag %(tag_name)s already exists."
4615+msgstr ""
4616+
4617+#: bzrlib/errors.py:2643
4618+msgid ""
4619+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
4620+"\" for more information on this feature."
4621+msgstr ""
4622+
4623+#: bzrlib/errors.py:2653
4624+msgid ""
4625+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
4626+msgstr ""
4627+
4628+#: bzrlib/errors.py:2663
4629+msgid ""
4630+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
4631+msgstr ""
4632+
4633+#: bzrlib/errors.py:2673
4634+msgid "Invalid line in bugs property: '%(line)s'"
4635+msgstr ""
4636+
4637+#: bzrlib/errors.py:2681
4638+msgid "Invalid bug status: '%(status)s'"
4639+msgstr ""
4640+
4641+#: bzrlib/errors.py:2689
4642+msgid "Could not understand response from smart server: %(response_tuple)r"
4643+msgstr ""
4644+
4645+#: bzrlib/errors.py:2728
4646+msgid "Server sent an unexpected error: %(error_tuple)r"
4647+msgstr ""
4648+
4649+#: bzrlib/errors.py:2747
4650+msgid "Unrecognised container format: %(container_format)r"
4651+msgstr ""
4652+
4653+#: bzrlib/errors.py:2755
4654+msgid "Unexpected end of container stream"
4655+msgstr ""
4656+
4657+#: bzrlib/errors.py:2760
4658+msgid "Unknown record type: %(record_type)r"
4659+msgstr ""
4660+
4661+#: bzrlib/errors.py:2768
4662+msgid "Invalid record: %(reason)s"
4663+msgstr ""
4664+
4665+#: bzrlib/errors.py:2776
4666+msgid "Container has data after end marker: %(excess)r"
4667+msgstr ""
4668+
4669+#: bzrlib/errors.py:2784
4670+msgid "Container has multiple records with the same name: %(name)s"
4671+msgstr ""
4672+
4673+#: bzrlib/errors.py:2797
4674+msgid "Corrupt or incompatible data stream: %(reason)s"
4675+msgstr ""
4676+
4677+#: bzrlib/errors.py:2805
4678+msgid "SMTP error: %(error)s"
4679+msgstr ""
4680+
4681+#: bzrlib/errors.py:2813
4682+msgid "No message supplied."
4683+msgstr ""
4684+
4685+#: bzrlib/errors.py:2818
4686+msgid "No mail-to address (--mail-to) or output (-o) specified."
4687+msgstr ""
4688+
4689+#: bzrlib/errors.py:2823
4690+msgid "Unknown mail client: %(mail_client)s"
4691+msgstr ""
4692+
4693+#: bzrlib/errors.py:2831
4694+msgid ""
4695+"Unable to find mail client with the following names: "
4696+"%(mail_command_list_string)s"
4697+msgstr ""
4698+
4699+#: bzrlib/errors.py:2841
4700+msgid "SMTP connection to %(host)s refused"
4701+msgstr ""
4702+
4703+#: bzrlib/errors.py:2850
4704+msgid "Please specify smtp_server. No server at default %(host)s."
4705+msgstr ""
4706+
4707+#: bzrlib/errors.py:2864
4708+msgid ""
4709+"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
4710+"reconfigure."
4711+msgstr ""
4712+
4713+#: bzrlib/errors.py:2876
4714+msgid "'%(display_url)s' is already a branch."
4715+msgstr ""
4716+
4717+#: bzrlib/errors.py:2881
4718+msgid "'%(display_url)s' is already a tree."
4719+msgstr ""
4720+
4721+#: bzrlib/errors.py:2886
4722+msgid "'%(display_url)s' is already a checkout."
4723+msgstr ""
4724+
4725+#: bzrlib/errors.py:2891
4726+msgid "'%(display_url)s' is already a lightweight checkout."
4727+msgstr ""
4728+
4729+#: bzrlib/errors.py:2896
4730+msgid "'%(display_url)s' is already using a shared repository."
4731+msgstr ""
4732+
4733+#: bzrlib/errors.py:2901
4734+msgid "'%(display_url)s' is already standalone."
4735+msgstr ""
4736+
4737+#: bzrlib/errors.py:2906
4738+msgid "Shared repository '%(display_url)s' already creates working trees."
4739+msgstr ""
4740+
4741+#: bzrlib/errors.py:2912
4742+msgid ""
4743+"Shared repository '%(display_url)s' already doesn't create working trees."
4744+msgstr ""
4745+
4746+#: bzrlib/errors.py:2918
4747+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
4748+msgstr ""
4749+
4750+#: bzrlib/errors.py:2923
4751+msgid "No location could be found to bind to at %(display_url)s."
4752+msgstr ""
4753+
4754+#: bzrlib/errors.py:2928
4755+msgid ""
4756+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
4757+"%(more)s"
4758+msgstr ""
4759+
4760+#: bzrlib/errors.py:2947
4761+msgid ""
4762+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
4763+"%(more)s"
4764+msgstr ""
4765+
4766+#: bzrlib/errors.py:2953
4767+msgid "Variable {%(name)s} is not available."
4768+msgstr ""
4769+
4770+#: bzrlib/errors.py:2961
4771+msgid "No template specified."
4772+msgstr ""
4773+
4774+#: bzrlib/errors.py:2966
4775+msgid "Unable to create symlink %(path_str)son this platform"
4776+msgstr ""
4777+
4778+#: bzrlib/errors.py:2981
4779+msgid ""
4780+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
4781+"\", \"local\"."
4782+msgstr ""
4783+
4784+#: bzrlib/errors.py:3015
4785+msgid ""
4786+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
4787+msgstr ""
4788+
4789+#: bzrlib/errors.py:3027
4790+msgid "The \"%(config_id)s\" configuration does not exist."
4791+msgstr ""
4792+
4793+#: bzrlib/errors.py:3035
4794+msgid "The \"%(option_name)s\" configuration option does not exist."
4795+msgstr ""
4796+
4797+#: bzrlib/errors.py:3043
4798+msgid "The alias \"%(alias_name)s\" does not exist."
4799+msgstr ""
4800+
4801+#: bzrlib/errors.py:3057
4802+msgid "\"%(alias_name)s\" is not a valid location alias."
4803+msgstr ""
4804+
4805+#: bzrlib/errors.py:3065
4806+msgid "No %(alias_name)s location assigned."
4807+msgstr ""
4808+
4809+#: bzrlib/errors.py:3073
4810+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
4811+msgstr ""
4812+
4813+#: bzrlib/errors.py:3083
4814+msgid "Unknown rules detected: %(unknowns_str)s."
4815+msgstr ""
4816+
4817+#: bzrlib/errors.py:3096
4818+msgid ""
4819+"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
4820+"%(traceback_text)s%(exc_value)s"
4821+msgstr ""
4822+
4823+#: bzrlib/errors.py:3119
4824+msgid "Tip change rejected: %(msg)s"
4825+msgstr ""
4826+
4827+#: bzrlib/errors.py:3127
4828+msgid "Shelf corrupt."
4829+msgstr ""
4830+
4831+#: bzrlib/errors.py:3132
4832+msgid "Corruption while decompressing repository file%(orig_error)s"
4833+msgstr ""
4834+
4835+#: bzrlib/errors.py:3144
4836+msgid "No changes are shelved with id \"%(shelf_id)d\"."
4837+msgstr ""
4838+
4839+#: bzrlib/errors.py:3152
4840+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
4841+msgstr ""
4842+
4843+#: bzrlib/errors.py:3160
4844+msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
4845+msgstr ""
4846+
4847+#: bzrlib/errors.py:3168
4848+msgid "The user aborted the operation."
4849+msgstr ""
4850+
4851+#: bzrlib/errors.py:3173
4852+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
4853+msgstr ""
4854+
4855+#: bzrlib/errors.py:3183
4856+msgid "No such view: %(view_name)s."
4857+msgstr ""
4858+
4859+#: bzrlib/errors.py:3193
4860+msgid ""
4861+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
4862+"to a later format."
4863+msgstr ""
4864+
4865+#: bzrlib/errors.py:3202
4866+msgid ""
4867+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
4868+msgstr ""
4869+
4870+#: bzrlib/errors.py:3269
4871+msgid "%(bzrdir)r does not support co-located branches."
4872+msgstr ""
4873+
4874+#: bzrlib/errors.py:3275
4875+msgid ""
4876+"Unable to determine your name.\n"
4877+"Please, set your name with the 'whoami' command.\n"
4878+"E.g. bzr whoami \"Your Name <name@example.com>\""
4879+msgstr ""
4880+
4881+#: bzrlib/errors.py:3284
4882+msgid "Invalid pattern(s) found. %(msg)s"
4883+msgstr ""
4884+
4885+#: bzrlib/errors.py:3292
4886+msgid ""
4887+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
4888+"unbind` to fix."
4889+msgstr ""
4890+
4891+#: bzrlib/errors.py:3303
4892+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
4893+msgstr ""
4894+
4895+#: bzrlib/errors.py:3312
4896+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
4897+msgstr ""
4898+
4899+#: bzrlib/errors.py:3321
4900+msgid ""
4901+"No compatible object available for operations from %(source)r to %(target)r."
4902+msgstr ""
4903+
4904+#: bzrlib/gpg.py:126 bzrlib/gpg.py:464
4905+msgid "{0} commits with valid signatures"
4906+msgstr ""
4907+
4908+#: bzrlib/gpg.py:130 bzrlib/gpg.py:469
4909+msgid "{0} commit with unknown key"
4910+msgid_plural "{0} commits with unknown keys"
4911+msgstr[0] ""
4912+msgstr[1] ""
4913+
4914+#: bzrlib/gpg.py:136 bzrlib/gpg.py:476
4915+msgid "{0} commit not valid"
4916+msgid_plural "{0} commits not valid"
4917+msgstr[0] ""
4918+msgstr[1] ""
4919+
4920+#: bzrlib/gpg.py:142 bzrlib/gpg.py:483
4921+msgid "{0} commit not signed"
4922+msgid_plural "{0} commits not signed"
4923+msgstr[0] ""
4924+msgstr[1] ""
4925+
4926+#: bzrlib/gpg.py:148 bzrlib/gpg.py:490
4927+msgid "{0} commit with key now expired"
4928+msgid_plural "{0} commits with key now expired"
4929+msgstr[0] ""
4930+msgstr[1] ""
4931+
4932+#: bzrlib/gpg.py:346
4933+msgid "No GnuPG key results for pattern: {}"
4934+msgstr ""
4935+
4936+#: bzrlib/gpg.py:389
4937+msgid "{0} signed {1} commit"
4938+msgid_plural "{0} signed {1} commits"
4939+msgstr[0] ""
4940+msgstr[1] ""
4941+
4942+#: bzrlib/gpg.py:406 bzrlib/gpg.py:422
4943+msgid "{0} commit by author {1}"
4944+msgid_plural "{0} commits by author {1}"
4945+msgstr[0] ""
4946+msgstr[1] ""
4947+
4948+#: bzrlib/gpg.py:436
4949+msgid "Unknown key {0} signed {1} commit"
4950+msgid_plural "Unknown key {0} signed {1} commits"
4951+msgstr[0] ""
4952+msgstr[1] ""
4953+
4954+#: bzrlib/gpg.py:454
4955+msgid "{0} commit by author {1} with key {2} now expired"
4956+msgid_plural "{0} commits by author {1} with key {2} now expired"
4957+msgstr[0] ""
4958+msgstr[1] ""
4959+
4960+# help of 'help' option
4961+#: bzrlib/option.py:515
4962+msgid "Show help message."
4963+msgstr ""
4964+
4965+# help of 'usage' option
4966+#: bzrlib/option.py:517
4967+msgid "Show usage message and options."
4968+msgstr ""
4969+
4970+# help of 'verbose' option
4971+#: bzrlib/option.py:519
4972+msgid "Display more information."
4973+msgstr ""
4974+
4975+# help of 'quiet' option
4976+#: bzrlib/option.py:522
4977+msgid "Only display errors and warnings."
4978+msgstr ""
4979+
4980+# help of 'overwrite' option
4981+#: bzrlib/option.py:527
4982+msgid "Ignore differences between branches and overwrite unconditionally."
4983+msgstr ""
4984+
4985+# help of 'message' option
4986+#: bzrlib/option.py:538
4987+msgid "Message string."
4988+msgstr ""
4989+
4990+# help of 'null' option
4991+#: bzrlib/option.py:541
4992+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
4993+msgstr ""
4994+
4995+# help of 'profile' option
4996+#: bzrlib/option.py:544
4997+msgid "Show performance profiling information."
4998+msgstr ""
4999+
5000+# help of 'revision' option
The diff has been truncated for viewing.