Bazaar

Merge lp:~jr/bzr/i18n-bzr.pot-update into lp:bzr

  1. i18n-bzr.pot-update
  2. Merge into bzr.dev
Proposed by Jonathan Riddell
Status: Rejected
Rejected by: Jonathan Riddell
Proposed branch: lp:~jr/bzr/i18n-bzr.pot-update
Merge into: lp:bzr
Diff against target: 1086 lines (+831/-29)
2 files modified
bzrlib/export_pot.py (+1/-0)
po/bzr.pot (+830/-29)
To merge this branch: bzr merge lp:~jr/bzr/i18n-bzr.pot-update
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+75761@code.launchpad.net

Commit message

update bzr.pot

Description of the change

update bzr.pot

To post a comment you must log in.

Unmerged revisions

6145. By Jonathan Riddell

update bzr.pot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/export_pot.py'
2--- bzrlib/export_pot.py 2011-09-15 11:31:47 +0000
3+++ bzrlib/export_pot.py 2011-09-16 15:52:09 +0000
4@@ -34,6 +34,7 @@
5 mutter,
6 note,
7 )
8+from bzrlib.i18n import gettext
9
10
11 def _escape(s):
12
13=== modified file 'po/bzr.pot'
14--- po/bzr.pot 2011-09-16 09:15:19 +0000
15+++ po/bzr.pot 2011-09-16 15:52:09 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: bzr\n"
19 "Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
20-"POT-Creation-Date: 2011-09-16 10:15+0100\n"
21+"POT-Creation-Date: 2011-09-16 16:30+0100\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25@@ -18,7 +18,39 @@
26 "Content-Transfer-Encoding: 8bit\n"
27 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
28
29-#: bzrlib/builtins.py:116 bzrlib/builtins.py:2758
30+#: bzrlib/add.py:95
31+msgid "skipping {0} (larger than {1} of {2} bytes)"
32+msgstr ""
33+
34+#: bzrlib/branch.py:3138
35+#, python-format
36+msgid "Pushed up to revision %d."
37+msgstr ""
38+
39+#: bzrlib/branch.py:3140
40+#, python-format
41+msgid "%d tag(s) updated."
42+msgstr ""
43+
44+#: bzrlib/branch.py:3143
45+msgid "No new revisions or tags to push."
46+msgstr ""
47+
48+#: bzrlib/branch.py:3145
49+msgid "No new revisions to push."
50+msgstr ""
51+
52+#: bzrlib/branch.py:3165
53+#, python-format
54+msgid "checked branch %s format %s"
55+msgstr ""
56+
57+#: bzrlib/branch.py:3168
58+#, python-format
59+msgid "found error:%s"
60+msgstr ""
61+
62+#: bzrlib/builtins.py:116 bzrlib/builtins.py:2758 bzrlib/workingtree.py:306
63 #, python-format
64 msgid "Ignoring files outside view. View is %s"
65 msgstr ""
66@@ -559,7 +591,7 @@
67 msgid "Could not determine branch to refer to."
68 msgstr ""
69
70-#: bzrlib/builtins.py:1198
71+#: bzrlib/builtins.py:1198 bzrlib/foreign.py:306
72 msgid "No push location known or specified."
73 msgstr ""
74
75@@ -641,7 +673,7 @@
76 msgid "The branch {0} has no revision {1}."
77 msgstr ""
78
79-#: bzrlib/builtins.py:1323
80+#: bzrlib/builtins.py:1323 bzrlib/push.py:51
81 #, python-format
82 msgid "Created new stacked branch referring to %s."
83 msgstr ""
84@@ -961,7 +993,7 @@
85 msgid "Create a branch without a working tree."
86 msgstr ""
87
88-#: bzrlib/builtins.py:1843
89+#: bzrlib/builtins.py:1843 bzrlib/push.py:108
90 #, python-format
91 msgid ""
92 "Parent directory of %s does not exist.\n"
93@@ -1926,6 +1958,11 @@
94 "changed."
95 msgstr ""
96
97+#: bzrlib/builtins.py:3055
98+#, python-format
99+msgid "Unsupported export format: %s"
100+msgstr ""
101+
102 #: bzrlib/builtins.py:3059
103 msgid "Write the contents of a file as of a given revision to standard output."
104 msgstr ""
105@@ -2656,7 +2693,7 @@
106 msgid "merger: "
107 msgstr ""
108
109-#: bzrlib/builtins.py:4137
110+#: bzrlib/builtins.py:4137 bzrlib/bundle/apply_bundle.py:67
111 msgid "Nothing to do."
112 msgstr ""
113
114@@ -3331,7 +3368,7 @@
115 msgid "No submit branch specified or known"
116 msgstr ""
117
118-#: bzrlib/builtins.py:5366
119+#: bzrlib/builtins.py:5366 bzrlib/send.py:105
120 msgid "No public branch specified or known"
121 msgstr ""
122
123@@ -4144,34 +4181,205 @@
124 msgid "Do not prompt before deleting."
125 msgstr ""
126
127-#: bzrlib/cmd_version_info.py:50
128+#: bzrlib/bundle/__init__.py:57
129+msgid "A directory cannot be a bundle"
130+msgstr ""
131+
132+#: bzrlib/bundle/serializer/v4.py:326
133+#, python-format
134+msgid "Bundling %d revision(s)."
135+msgstr ""
136+
137+#: bzrlib/bzrdir.py:636
138+#, python-format
139+msgid ""
140+"making backup of %s\n"
141+" to %s"
142+msgstr ""
143+
144+#: bzrlib/bzrdir.py:659
145+msgid "renamed {0} to {1}"
146+msgstr ""
147+
148+#: bzrlib/bzrdir.py:851
149+msgid "{0} is{1} redirected to {2}"
150+msgstr ""
151+
152+#: bzrlib/bzrdir.py:1727
153+#, python-format
154+msgid ""
155+"Source repository format does not support stacking, using format:\n"
156+" %s"
157+msgstr ""
158+
159+#: bzrlib/bzrdir.py:1747
160+#, python-format
161+msgid ""
162+"Source branch format does not support stacking, using format:\n"
163+" %s"
164+msgstr ""
165+
166+#: bzrlib/bzrdir.py:1858
167+msgid "starting repository conversion"
168+msgstr ""
169+
170+#: bzrlib/check.py:203
171+msgid "checked repository {0} format {1}"
172+msgstr ""
173+
174+#: bzrlib/check.py:206
175+#, python-format
176+msgid "%6d revisions"
177+msgstr ""
178+
179+#: bzrlib/check.py:207
180+#, python-format
181+msgid "%6d file-ids"
182+msgstr ""
183+
184+#: bzrlib/check.py:209
185+#, python-format
186+msgid "%6d unreferenced text versions"
187+msgstr ""
188+
189+#: bzrlib/check.py:213
190+msgid "unreferenced version: {{{0}}} in {1}"
191+msgstr ""
192+
193+#: bzrlib/check.py:216
194+#, python-format
195+msgid "%6d revisions are missing inventory_sha1"
196+msgstr ""
197+
198+#: bzrlib/check.py:219
199+#, python-format
200+msgid "%6d revisions are mentioned but not present"
201+msgstr ""
202+
203+#: bzrlib/check.py:222
204+#, python-format
205+msgid "%6d ghost revisions"
206+msgstr ""
207+
208+#: bzrlib/check.py:227
209+#, python-format
210+msgid "%6d revisions missing parents in ancestry"
211+msgstr ""
212+
213+#: bzrlib/check.py:231
214+#, python-format
215+msgid " %s should be in the ancestry for:"
216+msgstr ""
217+
218+#: bzrlib/check.py:235
219+#, python-format
220+msgid "%6d inconsistent parents"
221+msgstr ""
222+
223+#: bzrlib/check.py:239
224+msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
225+msgstr ""
226+
227+#: bzrlib/check.py:245
228+#, python-format
229+msgid "%6d revisions have incorrect parents in the revision index"
230+msgstr ""
231+
232+#: bzrlib/check.py:251
233+msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
234+msgstr ""
235+
236+#: bzrlib/check.py:265
237+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
238+msgstr ""
239+
240+#: bzrlib/check.py:294
241+msgid ""
242+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
243+"{{{4}}}"
244+msgstr ""
245+
246+#: bzrlib/check.py:352
247+#, python-format
248+msgid "Checking branch at '%s'."
249+msgstr ""
250+
251+#: bzrlib/check.py:372
252+#, python-format
253+msgid "Checking working tree at '%s'."
254+msgstr ""
255+
256+#: bzrlib/check.py:425 bzrlib/check.py:439
257+msgid "No branch found at specified location."
258+msgstr ""
259+
260+#: bzrlib/check.py:427 bzrlib/check.py:437
261+msgid "No working tree found at specified location."
262+msgstr ""
263+
264+#: bzrlib/check.py:430
265+#, python-format
266+msgid "Checking repository at '%s'."
267+msgstr ""
268+
269+#: bzrlib/check.py:441
270+msgid "No repository found at specified location."
271+msgstr ""
272+
273+#: bzrlib/clean_tree.py:62
274+msgid "Nothing to delete."
275+msgstr ""
276+
277+#: bzrlib/clean_tree.py:108
278+#, python-format
279+msgid "unable to remove %s"
280+msgstr ""
281+
282+#: bzrlib/clean_tree.py:112
283+msgid "deleting paths:"
284+msgstr ""
285+
286+#: bzrlib/clean_tree.py:126
287+#, python-format
288+msgid "unable to remove \"%s\": %s."
289+msgstr ""
290+
291+#: bzrlib/clean_tree.py:130
292+msgid "No files deleted."
293+msgstr ""
294+
295+#: bzrlib/cmd_version_info.py:45
296+msgid "No known version info format {0}. Supported types are: {1}"
297+msgstr ""
298+
299+#: bzrlib/cmd_version_info.py:51
300 msgid "Show version information about this tree."
301 msgstr ""
302
303-#: bzrlib/cmd_version_info.py:52
304+#: bzrlib/cmd_version_info.py:53
305 msgid ""
306 "You can use this command to add information about version into\n"
307 "source code of an application. The output can be in one of the\n"
308 "supported formats or in a custom format based on a template."
309 msgstr ""
310
311-#: bzrlib/cmd_version_info.py:56
312+#: bzrlib/cmd_version_info.py:57
313 msgid "For example::"
314 msgstr ""
315
316-#: bzrlib/cmd_version_info.py:58
317+#: bzrlib/cmd_version_info.py:59
318 msgid ""
319 " bzr version-info --custom \\\n"
320 " --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
321 msgstr ""
322
323-#: bzrlib/cmd_version_info.py:61
324+#: bzrlib/cmd_version_info.py:62
325 msgid ""
326 "will produce a C header file with formatted string containing the\n"
327 "current revision number. Other supported variables in templates are:"
328 msgstr ""
329
330-#: bzrlib/cmd_version_info.py:64
331+#: bzrlib/cmd_version_info.py:65
332 msgid ""
333 " * {date} - date of the last revision\n"
334 " * {build_date} - current date\n"
335@@ -4183,35 +4391,40 @@
336 msgstr ""
337
338 # help of 'format' option of 'version-info' command
339-#: bzrlib/cmd_version_info.py:74
340+#: bzrlib/cmd_version_info.py:75
341 msgid "Select the output format."
342 msgstr ""
343
344 # help of 'all' option of 'version-info' command
345-#: bzrlib/cmd_version_info.py:78
346+#: bzrlib/cmd_version_info.py:79
347 msgid "Include all possible information."
348 msgstr ""
349
350 # help of 'check-clean' option of 'version-info' command
351-#: bzrlib/cmd_version_info.py:79
352+#: bzrlib/cmd_version_info.py:80
353 msgid "Check if tree is clean."
354 msgstr ""
355
356 # help of 'include-history' option of 'version-info' command
357-#: bzrlib/cmd_version_info.py:81
358+#: bzrlib/cmd_version_info.py:82
359 msgid "Include the revision-history."
360 msgstr ""
361
362 # help of 'include-file-revisions' option of 'version-info' command
363-#: bzrlib/cmd_version_info.py:83
364+#: bzrlib/cmd_version_info.py:84
365 msgid "Include the last revision for each file."
366 msgstr ""
367
368 # help of 'template' option of 'version-info' command
369-#: bzrlib/cmd_version_info.py:84
370+#: bzrlib/cmd_version_info.py:85
371 msgid "Template for the output."
372 msgstr ""
373
374+#: bzrlib/commands.py:232
375+#, python-format
376+msgid "unknown command \"%s\""
377+msgstr ""
378+
379 #: bzrlib/commands.py:479
380 msgid "No help for this command."
381 msgstr ""
382@@ -4272,6 +4485,69 @@
383 msgid ":See also: %s"
384 msgstr ""
385
386+#: bzrlib/commands.py:818 bzrlib/gpg.py:317
387+msgid "Only ASCII permitted in option names"
388+msgstr ""
389+
390+#: bzrlib/commands.py:843 bzrlib/commands.py:851
391+msgid "command {0!r} needs one or more {1}"
392+msgstr ""
393+
394+#: bzrlib/commands.py:860
395+msgid "command {0!r} requires argument {1}"
396+msgstr ""
397+
398+#: bzrlib/commands.py:867
399+msgid "extra argument to command {0}: {1}"
400+msgstr ""
401+
402+#: bzrlib/commands.py:964
403+#, python-format
404+msgid "Profile data written to \"%s\"."
405+msgstr ""
406+
407+#: bzrlib/commit.py:116 bzrlib/commit.py:709
408+msgid "added"
409+msgstr ""
410+
411+#: bzrlib/commit.py:116 bzrlib/commit.py:717
412+msgid "modified"
413+msgstr ""
414+
415+#: bzrlib/commit.py:130
416+#, python-format
417+msgid "Committing%s"
418+msgstr ""
419+
420+#: bzrlib/commit.py:133
421+#, python-format
422+msgid "Committed revision %d."
423+msgstr ""
424+
425+#: bzrlib/commit.py:142
426+#, python-format
427+msgid "deleted %s"
428+msgstr ""
429+
430+#: bzrlib/commit.py:145
431+#, python-format
432+msgid "missing %s"
433+msgstr ""
434+
435+#: bzrlib/commit.py:471
436+msgid ""
437+"Conflicting tags in bound branch:\n"
438+"{0}"
439+msgstr ""
440+
441+#: bzrlib/commit.py:711
442+msgid "renamed"
443+msgstr ""
444+
445+#: bzrlib/commit.py:946
446+msgid "unchanged"
447+msgstr ""
448+
449 #: bzrlib/commit_signature_commands.py:34
450 msgid "Sign all commits by a given committer."
451 msgstr ""
452@@ -4307,10 +4583,18 @@
453 "verification."
454 msgstr ""
455
456+#: bzrlib/commit_signature_commands.py:145
457+msgid "Cannot verify a range of non-revision-history revisions"
458+msgstr ""
459+
460 #: bzrlib/commit_signature_commands.py:166
461 msgid "All commits signed with verifiable keys"
462 msgstr ""
463
464+#: bzrlib/config.py:448
465+msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
466+msgstr ""
467+
468 #: bzrlib/config.py:3293
469 msgid "Display, set or remove a configuration option."
470 msgstr ""
471@@ -4352,11 +4636,11 @@
472 msgid "Remove the option from the configuration file"
473 msgstr ""
474
475-#: bzrlib/conflicts.py:47
476+#: bzrlib/conflicts.py:48
477 msgid "List files with conflicts."
478 msgstr ""
479
480-#: bzrlib/conflicts.py:49
481+#: bzrlib/conflicts.py:50
482 msgid ""
483 "Merge will do its best to combine the changes in two branches, but there\n"
484 "are some kinds of problems only a human can fix. When it encounters those,\n"
485@@ -4364,32 +4648,32 @@
486 "before you should commit."
487 msgstr ""
488
489-#: bzrlib/conflicts.py:54
490+#: bzrlib/conflicts.py:55
491 msgid ""
492 "Conflicts normally are listed as short, human-readable messages. If --text\n"
493 "is supplied, the pathnames of files with text conflicts are listed,\n"
494 "instead. (This is useful for editing all files with text conflicts.)"
495 msgstr ""
496
497-#: bzrlib/conflicts.py:58
498+#: bzrlib/conflicts.py:59
499 msgid "Use bzr resolve when you have fixed a problem."
500 msgstr ""
501
502 # help of 'text' option of 'conflicts' command
503-#: bzrlib/conflicts.py:63
504+#: bzrlib/conflicts.py:64
505 msgid "List paths of files with text conflicts."
506 msgstr ""
507
508 # help of 'action' option of 'resolve' command
509-#: bzrlib/conflicts.py:95
510+#: bzrlib/conflicts.py:96
511 msgid "How to resolve the conflict."
512 msgstr ""
513
514-#: bzrlib/conflicts.py:101
515+#: bzrlib/conflicts.py:102
516 msgid "Mark a conflict as resolved."
517 msgstr ""
518
519-#: bzrlib/conflicts.py:108
520+#: bzrlib/conflicts.py:109
521 msgid ""
522 "Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
523 "text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
524@@ -4398,15 +4682,43 @@
525 msgstr ""
526
527 # help of 'all' option of 'resolve' command
528-#: bzrlib/conflicts.py:116
529+#: bzrlib/conflicts.py:117
530 msgid "Resolve all conflicts in this tree."
531 msgstr ""
532
533+#: bzrlib/conflicts.py:124
534+msgid "If --all is specified, no FILE may be provided"
535+msgstr ""
536+
537+#: bzrlib/conflicts.py:149
538+#, python-format
539+msgid "%d conflict(s) auto-resolved."
540+msgstr ""
541+
542+#: bzrlib/conflicts.py:150
543+msgid "Remaining conflicts:"
544+msgstr ""
545+
546+#: bzrlib/conflicts.py:155
547+msgid "All conflicts resolved."
548+msgstr ""
549+
550+#: bzrlib/conflicts.py:164
551+msgid "{0} conflict resolved, {1} remaining"
552+msgid_plural "{0} conflicts resolved, {1} remaining"
553+msgstr[0] ""
554+msgstr[1] ""
555+
556 # title of 'action' option of 'resolve' command
557-#: bzrlib/conflicts.py:688
558+#: bzrlib/conflicts.py:690
559 msgid "action"
560 msgstr ""
561
562+#: bzrlib/diff.py:397
563+#, python-format
564+msgid "*** Ignoring files outside view. View is %s"
565+msgstr ""
566+
567 #: bzrlib/errors.py:215
568 msgid "The tree builder is already building a tree."
569 msgstr ""
570@@ -5611,6 +5923,36 @@
571 "%(arguments)s."
572 msgstr ""
573
574+#: bzrlib/export_pot.py:123 bzrlib/export_pot.py:129
575+#, python-format
576+msgid "%r is not found in bzrlib/option.py"
577+msgstr ""
578+
579+#: bzrlib/export_pot.py:185
580+#, python-format
581+msgid "Exporting messages from builtin command: %s"
582+msgstr ""
583+
584+#: bzrlib/export_pot.py:201
585+msgid "Exporting messages from plugin command: {0} in {1}"
586+msgstr ""
587+
588+#: bzrlib/export_pot.py:226
589+#, python-format
590+msgid "Exporting message from error: %s"
591+msgstr ""
592+
593+#: bzrlib/foreign.py:311
594+#, python-format
595+msgid "Using saved location: %s\n"
596+msgstr ""
597+
598+#: bzrlib/foreign.py:321
599+msgid ""
600+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
601+"regular push."
602+msgstr ""
603+
604 #: bzrlib/gpg.py:116 bzrlib/gpg.py:454
605 msgid "{0} commits with valid signatures"
606 msgstr ""
607@@ -5667,6 +6009,55 @@
608 msgstr[0] ""
609 msgstr[1] ""
610
611+#: bzrlib/groupcompress.py:1758
612+#, python-format
613+msgid "Insert claimed random_id=True, but then inserted %r two times"
614+msgstr ""
615+
616+#: bzrlib/lock.py:547
617+#, python-format
618+msgid "%r was %s locked again"
619+msgstr ""
620+
621+#: bzrlib/log.py:562
622+msgid "--exclude-common-ancestry requires two different revisions"
623+msgstr ""
624+
625+#: bzrlib/log.py:564
626+#, python-format
627+msgid "invalid direction %r"
628+msgstr ""
629+
630+#: bzrlib/log.py:611
631+msgid "Start revision not found in left-hand history of end revision."
632+msgstr ""
633+
634+#: bzrlib/log.py:657
635+msgid "Start revision not found in history of end revision."
636+msgstr ""
637+
638+#: bzrlib/log.py:1075 bzrlib/log.py:1133
639+msgid "Logging revision 0 is invalid."
640+msgstr ""
641+
642+#: bzrlib/log.py:1077 bzrlib/log.py:1135
643+msgid "Start revision must be older than the end revision."
644+msgstr ""
645+
646+#: bzrlib/log.py:1821
647+#, python-format
648+msgid "unknown log formatter: %r"
649+msgstr ""
650+
651+#: bzrlib/merge.py:715
652+msgid "All changes applied successfully."
653+msgstr ""
654+
655+#: bzrlib/merge.py:717
656+#, python-format
657+msgid "%d conflicts encountered."
658+msgstr ""
659+
660 # help of 'help' option
661 #: bzrlib/option.py:530
662 msgid "Show help message."
663@@ -5789,6 +6180,24 @@
664 msgid "Branch to operate on, instead of working directory"
665 msgstr ""
666
667+#: bzrlib/osutils.py:93
668+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
669+msgstr ""
670+
671+#: bzrlib/osutils.py:194
672+msgid "lstat/stat of ({0!r}): {1!r}"
673+msgstr ""
674+
675+#: bzrlib/osutils.py:929 bzrlib/osutils.py:940
676+#, python-format
677+msgid "sorry, %r not allowed in path"
678+msgstr ""
679+
680+#: bzrlib/osutils.py:1158
681+#, python-format
682+msgid "%r is too short to calculate a relative path"
683+msgstr ""
684+
685 # help of 'plugin' option of 'bash-completion' command
686 #: bzrlib/plugins/bash_completion/bashcomp.py:407
687 msgid "Enable completions for the selected plugin (default: all plugins)"
688@@ -6022,6 +6431,398 @@
689 msgid " bzr lp-find-proposal -r annotate:README:1"
690 msgstr ""
691
692+#: bzrlib/push.py:54
693+msgid "Created new branch."
694+msgstr ""
695+
696+#: bzrlib/push.py:96
697+#, python-format
698+msgid ""
699+"Target directory %s already contains a .bzr directory, but it is not valid."
700+msgstr ""
701+
702+#: bzrlib/push.py:99
703+#, python-format
704+msgid ""
705+"Target directory %s already exists, but does not have a .bzr directory. "
706+"Supply --use-existing-dir to push there anyway."
707+msgstr ""
708+
709+#: bzrlib/push.py:120
710+#, python-format
711+msgid "Too many redirections trying to make %s."
712+msgstr ""
713+
714+#: bzrlib/push.py:145
715+msgid ""
716+"These branches have diverged. See \"bzr help diverged-branches\" for more "
717+"information."
718+msgstr ""
719+
720+#: bzrlib/push.py:149
721+#, python-format
722+msgid ""
723+"It is not possible to losslessly push to %s. You may want to use dpush "
724+"instead."
725+msgstr ""
726+
727+#: bzrlib/push.py:155
728+#, python-format
729+msgid ""
730+"At %s you have a valid .bzr control directory, but not a branch or "
731+"repository. This is an unsupported configuration. Please move the target "
732+"directory out of the way and try again."
733+msgstr ""
734+
735+#: bzrlib/reconcile.py:96
736+#, python-format
737+msgid "Reconciling branch %s"
738+msgstr ""
739+
740+#: bzrlib/reconcile.py:102
741+#, python-format
742+msgid "Reconciling repository %s"
743+msgstr ""
744+
745+#: bzrlib/reconcile.py:104
746+msgid "Reconciling repository"
747+msgstr ""
748+
749+#: bzrlib/reconcile.py:110
750+#, python-format
751+msgid "%s cannot canonicalize CHKs."
752+msgstr ""
753+
754+#: bzrlib/reconcile.py:118
755+msgid "Reconcile aborted: revision index has inconsistent parents."
756+msgstr ""
757+
758+#: bzrlib/reconcile.py:120
759+msgid "Run \"bzr check\" for more details."
760+msgstr ""
761+
762+#: bzrlib/reconcile.py:122
763+msgid "Reconciliation complete."
764+msgstr ""
765+
766+#: bzrlib/reconcile.py:165
767+#, python-format
768+msgid "Fixing last revision info %s => %s"
769+msgstr ""
770+
771+#: bzrlib/reconcile.py:171
772+msgid "revision_history ok."
773+msgstr ""
774+
775+#: bzrlib/reconcile.py:232
776+msgid "Reading inventory data"
777+msgstr ""
778+
779+#: bzrlib/reconcile.py:252 bzrlib/reconcile.py:382
780+msgid "Inventory ok."
781+msgstr ""
782+
783+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
784+msgid "Backing up inventory"
785+msgstr ""
786+
787+#: bzrlib/reconcile.py:256
788+msgid "Backup inventory created."
789+msgstr ""
790+
791+#: bzrlib/reconcile.py:272 bzrlib/reconcile.py:403
792+msgid "Writing weave"
793+msgstr ""
794+
795+#: bzrlib/reconcile.py:275 bzrlib/reconcile.py:406
796+msgid "Inventory regenerated."
797+msgstr ""
798+
799+#: bzrlib/reconcile.py:369 bzrlib/reconcile.py:371 bzrlib/reconcile.py:374
800+msgid "Reading indexes"
801+msgstr ""
802+
803+#: bzrlib/reconcile.py:378 bzrlib/reconcile.py:380
804+msgid "Checking unused inventories"
805+msgstr ""
806+
807+#: bzrlib/reconcile.py:386
808+msgid "Backup Inventory created"
809+msgstr ""
810+
811+#: bzrlib/reconcile.py:444
812+msgid "Fixing text parents"
813+msgstr ""
814+
815+#: bzrlib/reconfigure.py:52
816+msgid "{0} is now stacked on {1}\n"
817+msgstr ""
818+
819+#: bzrlib/reconfigure.py:67
820+#, python-format
821+msgid "%s is now not stacked\n"
822+msgstr ""
823+
824+#: bzrlib/remote.py:1877
825+msgid "Copying repository content as tarball..."
826+msgstr ""
827+
828+#: bzrlib/rename_map.py:241
829+msgid "{0} => {1}"
830+msgstr ""
831+
832+#: bzrlib/repository.py:284
833+#, python-format
834+msgid "bzr: ERROR (ignored): %s"
835+msgstr ""
836+
837+#: bzrlib/repository.py:1803
838+msgid "Moving repository to repository.backup"
839+msgstr ""
840+
841+#: bzrlib/repository.py:1810
842+msgid "Creating new repository"
843+msgstr ""
844+
845+#: bzrlib/repository.py:1815
846+msgid "Copying content"
847+msgstr ""
848+
849+#: bzrlib/repository.py:1819
850+msgid "Deleting old repository content"
851+msgstr ""
852+
853+#: bzrlib/repository.py:1821
854+msgid "repository converted"
855+msgstr ""
856+
857+#: bzrlib/revisionspec.py:914
858+#, python-format
859+msgid "Using %s %s"
860+msgstr ""
861+
862+#: bzrlib/send.py:56
863+#, python-format
864+msgid "Mail client \"%s\" does not support specifying body"
865+msgstr ""
866+
867+#: bzrlib/send.py:60
868+msgid "--remember requires a branch to be specified."
869+msgstr ""
870+
871+#: bzrlib/send.py:74
872+msgid "No submit branch known or specified"
873+msgstr ""
874+
875+#: bzrlib/send.py:77
876+#, python-format
877+msgid "Using saved %s location \"%s\" to determine what changes to submit."
878+msgstr ""
879+
880+#: bzrlib/send.py:94
881+#, python-format
882+msgid "No such send format '%s'."
883+msgstr ""
884+
885+#: bzrlib/send.py:111
886+msgid "bzr send takes at most two one revision identifiers"
887+msgstr ""
888+
889+#: bzrlib/send.py:124
890+msgid "No revisions to submit."
891+msgstr ""
892+
893+#: bzrlib/send.py:135
894+msgid ""
895+"- not supported for merge directives that use more than one output file."
896+msgstr ""
897+
898+#: bzrlib/send.py:177
899+msgid "Format 0.9 does not permit bundle with no patch"
900+msgstr ""
901+
902+#: bzrlib/shelf_ui.py:69
903+#, python-format
904+msgid "Changes shelved with id \"%d\"."
905+msgstr ""
906+
907+#: bzrlib/shelf_ui.py:73
908+msgid "Selected changes destroyed."
909+msgstr ""
910+
911+#: bzrlib/shelf_ui.py:77
912+msgid "Selected changes:"
913+msgstr ""
914+
915+#: bzrlib/shelf_ui.py:265
916+msgid "You need a controlling terminal."
917+msgstr ""
918+
919+#: bzrlib/shelf_ui.py:415
920+msgid "No changes are shelved."
921+msgstr ""
922+
923+#: bzrlib/shelf_ui.py:473
924+#, python-format
925+msgid "Using changes with id \"%d\"."
926+msgstr ""
927+
928+#: bzrlib/shelf_ui.py:477
929+#, python-format
930+msgid "Message: %s"
931+msgstr ""
932+
933+#: bzrlib/shelf_ui.py:489
934+#, python-format
935+msgid "Deleted changes with id \"%d\"."
936+msgstr ""
937+
938+#: bzrlib/smart/medium.py:565
939+msgid "HPSS calls: {0} ({1} vfs) {2}"
940+msgstr ""
941+
942+#: bzrlib/smart/server.py:355
943+#, python-format
944+msgid "listening on port: %s"
945+msgstr ""
946+
947+#: bzrlib/switch.py:67
948+msgid "Pending merges must be committed or reverted before using switch."
949+msgstr ""
950+
951+#: bzrlib/switch.py:94
952+msgid ""
953+"Cannot switch as local commits found in the checkout. Commit these to the "
954+"bound branch or use --force to throw them away."
955+msgstr ""
956+
957+#: bzrlib/switch.py:99
958+#, python-format
959+msgid ""
960+"Unable to connect to current master branch %(target)s: %(error)s To switch "
961+"anyway, use --force."
962+msgstr ""
963+
964+#: bzrlib/switch.py:108
965+msgid "Cannot switch a branch, only a checkout."
966+msgstr ""
967+
968+#: bzrlib/switch.py:144
969+#, python-format
970+msgid "Tree is up to date at revision %d."
971+msgstr ""
972+
973+#: bzrlib/switch.py:150
974+#, python-format
975+msgid "Updated to revision %d."
976+msgstr ""
977+
978+#: bzrlib/tree.py:635
979+msgid "*** {0} content-filter: {1} => {2!r}"
980+msgstr ""
981+
982+#: bzrlib/upgrade.py:76
983+#, python-format
984+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
985+msgstr ""
986+
987+#: bzrlib/upgrade.py:99
988+#, python-format
989+msgid "cannot upgrade from bzrdir format %s"
990+msgstr ""
991+
992+#: bzrlib/upgrade.py:102
993+#, python-format
994+msgid "starting upgrade of %s"
995+msgstr ""
996+
997+#: bzrlib/upgrade.py:109
998+msgid "finished"
999+msgstr ""
1000+
1001+#: bzrlib/upgrade.py:119
1002+msgid "Deleting backup.bzr"
1003+msgstr ""
1004+
1005+#: bzrlib/upgrade.py:150
1006+msgid ""
1007+"\n"
1008+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
1009+msgstr ""
1010+
1011+#: bzrlib/upgrade.py:207
1012+#, python-format
1013+msgid "Found %d dependent branches - upgrading ..."
1014+msgstr ""
1015+
1016+#: bzrlib/upgrade.py:275
1017+msgid "Upgrading bzrdirs"
1018+msgstr ""
1019+
1020+#: bzrlib/upgrade.py:281
1021+#, python-format
1022+msgid "Upgrading %s"
1023+msgstr ""
1024+
1025+#: bzrlib/upgrade.py:282
1026+msgid "Upgrading {0} {1} ..."
1027+msgstr ""
1028+
1029+#: bzrlib/upgrade.py:296
1030+msgid "Removing backup ..."
1031+msgstr ""
1032+
1033+#: bzrlib/upgrade.py:300
1034+msgid "failed to clean-up {0}: {1}"
1035+msgstr ""
1036+
1037+#: bzrlib/win32utils.py:132
1038+msgid "Failed to GetProcessMemoryInfo()"
1039+msgstr ""
1040+
1041+#: bzrlib/win32utils.py:153
1042+msgid "Cannot debug memory on win32 without ctypes or win32process"
1043+msgstr ""
1044+
1045+#: bzrlib/win32utils.py:158
1046+#, python-format
1047+msgid "WorkingSize %7dKiB\tPeakWorking %7dKiB\t%s"
1048+msgstr ""
1049+
1050+#: bzrlib/win32utils.py:166
1051+#, python-format
1052+msgid "WorkingSize %8d KiB"
1053+msgstr ""
1054+
1055+#: bzrlib/win32utils.py:167
1056+#, python-format
1057+msgid "PeakWorking %8d KiB"
1058+msgstr ""
1059+
1060+#: bzrlib/win32utils.py:168
1061+#, python-format
1062+msgid "PagefileUsage %8d KiB"
1063+msgstr ""
1064+
1065+#: bzrlib/win32utils.py:169
1066+#, python-format
1067+msgid "PeakPagefileUsage %8d KiB"
1068+msgstr ""
1069+
1070+#: bzrlib/win32utils.py:171
1071+#, python-format
1072+msgid "PrivateUsage %8d KiB"
1073+msgstr ""
1074+
1075+#: bzrlib/win32utils.py:172
1076+#, python-format
1077+msgid "PageFaultCount %8d"
1078+msgstr ""
1079+
1080+#: bzrlib/workingtree.py:1502
1081+msgid "Rerun update after fixing the conflicts."
1082+msgstr ""
1083+
1084 #: dummy/help_topics/authentication/summary.txt:1
1085 msgid "Information on configuring authentication"
1086 msgstr ""