Duplicity

Merge lp:~l2g/duplicity/flag-transl-comments into lp:~duplicity-team/duplicity/trunk

  1. flag-transl-comments
  2. Merge into trunk
Proposed by Larry Gilbert
Status: Merged
Approved by: Kenneth Loafman
Approved revision: 599
Merged at revision: not available
Proposed branch: lp:~l2g/duplicity/flag-transl-comments
Merge into: lp:~duplicity-team/duplicity/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~l2g/duplicity/flag-transl-comments
Reviewer Review Type Date Requested Status
Kenneth Loafman Approve
Review via email: mp+10952@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kenneth Loafman (kenneth-loafman) wrote :

Looks like a clean solution. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/commandline.py'
2--- duplicity/commandline.py 2009-07-25 23:47:49 +0000
3+++ duplicity/commandline.py 2009-09-01 00:46:32 +0000
4@@ -440,101 +440,138 @@
5 (paired with its preceding comment, if any) independently of the others."""
6
7 dict = {
8- # Used in usage help to represent a Unix-style path name. Example:
9+ # TRANSL: Used in usage help to represent a Unix-style path name. Example:
10 # rsync://user[:password]@other_host[:port]//absolute_path
11 'absolute_path' : _("absolute_path"),
12- # Used in usage help. Example:
13+
14+ # TRANSL: Used in usage help. Example:
15 # tahoe://alias/some_dir
16 'alias' : _("alias"),
17- # Used in usage help (noun)
18+
19+ # TRANSL: Used in usage help (noun)
20 'backup_name' : _("backup name"),
21- # Used in help to represent a "bucket name" for Amazon Web Services' Simple
22- # Storage Service (S3). Example:
23+
24+ # TRANSL: Used in help to represent a "bucket name" for Amazon Web
25+ # Services' Simple Storage Service (S3). Example:
26 # s3://other.host/bucket_name[/prefix]
27 'bucket_name' : _("bucket_name"),
28- # Used in usage help, abbreviation for "character" (noun)
29+
30+ # TRANSL: abbreviation for "character" (noun)
31 'char' : _("char"),
32- # Used in usage help (noun)
33+
34+ # TRANSL: noun
35 'command' : _("command"),
36- # Used in usage help to represent the name of a container in Amazon Web
37- # Services' Cloudfront. Example:
38+
39+ # TRANSL: Used in usage help to represent the name of a container in
40+ # Amazon Web Services' Cloudfront. Example:
41 # cf+http://container_name
42 'container_name' : _("container_name"),
43- # Used in usage help (noun)
44+
45+ # TRANSL: noun
46 'count' : _("count"),
47- # Used in usage help to represent the name of a file directory
48+
49+ # TRANSL: Used in usage help to represent the name of a file directory
50 'directory' : _("directory"),
51- # Used in usage help to represent the name of a file. Example:
52+
53+ # TRANSL: Used in usage help to represent the name of a file. Example:
54 # --log-file <filename>
55 'filename' : _("filename"),
56- # Used in usage help to represent an ID for a GnuPG key. Example:
57+
58+ # TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
59 # --encrypt-key <gpg_key_id>
60 'gpg_key_id' : _("gpg-key-id"),
61- # Used in usage help, e.g. to represent the name of a code module. Example:
62+
63+ # TRANSL: Used in usage help, e.g. to represent the name of a code
64+ # module. Example:
65 # rsync://user[:password]@other.host[:port]::/module/some_dir
66 'module' : _("module"),
67- # Used in usage help to represent a desired number of something. Example:
68+
69+ # TRANSL: Used in usage help to represent a desired number of
70+ # something. Example:
71 # --num-retries <number>
72 'number' : _("number"),
73- # Used in usage help. (Should be consistent with the "Options:" header.)
74- # Example:
75+
76+ # TRANSL: Used in usage help. (Should be consistent with the "Options:"
77+ # header.) Example:
78 # duplicity [full|incremental] [options] source_dir target_url
79 'options' : _("options"),
80- # Used in usage help to represent an internet hostname. Example:
81+
82+ # TRANSL: Used in usage help to represent an internet hostname. Example:
83 # ftp://user[:password]@other.host[:port]/some_dir
84 'other_host' : _("other.host"),
85- # Used in usage help. Example:
86+
87+ # TRANSL: Used in usage help. Example:
88+ # ftp://user[:password]@other.host[:port]/some_dir
89 'password' : _("password"),
90- # Used in usage help to represent a Unix-style path name. Example:
91+
92+ # TRANSL: Used in usage help to represent a Unix-style path name. Example:
93 # --archive-dir <path>
94 'path' : _("path"),
95- # Used in usage help to represent a TCP port number. Example:
96+
97+ # TRANSL: Used in usage help to represent a TCP port number. Example:
98 # ftp://user[:password]@other.host[:port]/some_dir
99 'port' : _("port"),
100- # Used in usage help. This represents a string to be used as a prefix to
101- # names for backup files created by Duplicity. Example:
102+
103+ # TRANSL: Used in usage help. This represents a string to be used as a
104+ # prefix to names for backup files created by Duplicity. Example:
105 # s3://other.host/bucket_name[/prefix]
106 'prefix' : _("prefix"),
107- # Used in usage help to represent a Unix-style path name. Example:
108+
109+ # TRANSL: Used in usage help to represent a Unix-style path name. Example:
110 # rsync://user[:password]@other.host[:port]/relative_path
111 'relative_path' : _("relative_path"),
112- # Used in usage help. Example:
113+
114+ # TRANSL: Used in usage help. Example:
115 # --timeout <seconds>
116 'seconds' : _("seconds"),
117- # Used in usage help to represent a "glob" style pattern for matching one or
118- # more files, as described in the documentation. Example:
119- # --exclude <%shell_pattern>
120+
121+ # TRANSL: Used in usage help to represent a "glob" style pattern for
122+ # matching one or more files, as described in the documentation.
123+ # Example:
124+ # --exclude <shell_pattern>
125 'shell_pattern' : _("shell_pattern"),
126- # Used in usage help to represent the name of a single file directory or a
127- # Unix-style path to a directory. Example:
128- # file:///%(x_some_dir)s
129+
130+ # TRANSL: Used in usage help to represent the name of a single file
131+ # directory or a Unix-style path to a directory. Example:
132+ # file:///some_dir
133 'some_dir' : _("some_dir"),
134- # Used in usage help to represent the name of a single file directory or a
135- # Unix-style path to a directory where files will be coming FROM. Example:
136+
137+ # TRANSL: Used in usage help to represent the name of a single file
138+ # directory or a Unix-style path to a directory where files will be
139+ # coming FROM. Example:
140 # duplicity [full|incremental] [options] source_dir target_url
141 'source_dir' : _("source_dir"),
142- # Used in usage help to represent a URL files will be coming FROM. Example:
143+
144+ # TRANSL: Used in usage help to represent a URL files will be coming
145+ # FROM. Example:
146 # duplicity [restore] [options] source_url target_dir
147 'source_url' : _("source_url"),
148- # Used in usage help to represent the name of a single file directory or a
149- # Unix-style path to a directory. where files will be going TO. Example:
150+
151+ # TRANSL: Used in usage help to represent the name of a single file
152+ # directory or a Unix-style path to a directory. where files will be
153+ # going TO. Example:
154 # duplicity [restore] [options] source_url target_dir
155 'target_dir' : _("target_dir"),
156- # Used in usage help to represent a URL files will be going TO. Example:
157+
158+ # TRANSL: Used in usage help to represent a URL files will be going TO.
159+ # Example:
160 # duplicity [full|incremental] [options] source_dir target_url
161 'target_url' : _("target_url"),
162- # Used in usage help to represent a time spec for a previous point in time,
163- # as described in the documentation. Example:
164+
165+ # TRANSL: Used in usage help to represent a time spec for a previous
166+ # point in time, as described in the documentation. Example:
167 # duplicity remove-older-than time [options] target_url
168 'time' : _("time"),
169- # Used in usage help to represent a user name (i.e. login). Example:
170+
171+ # TRANSL: Used in usage help to represent a user name (i.e. login).
172+ # Example:
173 # ftp://user[:password]@other.host[:port]/some_dir
174 'user' : _("user") }
175
176 msg = _("duplicity version %s running on %s.") % (globals.version, sys.platform)
177 msg = "\n" + msg + "\n"
178
179- # Header in usage help
180+ # TRANSL: Header in usage help
181 msg = msg + _("Usage:") + """
182 duplicity [full|incremental] [%(options)s] %(source_dir)s %(target_url)s
183 duplicity [restore] [%(options)s] %(source_url)s %(target_dir)s
184@@ -547,7 +584,7 @@
185
186 """ % dict
187
188- # Header in usage help
189+ # TRANSL: Header in usage help
190 msg = msg + _("Backends and their URL formats:") + """
191 cf+http://%(container_name)s
192 file:///%(some_dir)s
193@@ -567,7 +604,7 @@
194
195 """ % dict
196
197- # Header in usage help
198+ # TRANSL: Header in usage help
199 msg = msg + _("Commands:") + """
200 cleanup <%(target_url)s>
201 collection-status <%(target_url)s>
202@@ -581,7 +618,7 @@
203
204 """ % dict
205
206- # Header in usage help
207+ # TRANSL: Header in usage help
208 msg = msg + _("Options:") + """
209 --allow-source-mismatch
210 --archive-dir <%(path)s>
211@@ -633,7 +670,7 @@
212 -v[0-9], --verbosity [0-9]
213 """ % dict
214
215- # In this portion of the usage instructions, "[ewnid]" indicates which
216+ # TRANSL: In this portion of the usage instructions, "[ewnid]" indicates which
217 # characters are permitted (e, w, n, i, or d); the brackets imply their own
218 # meaning in regex; i.e., only one of the characters is allowed in an instance.
219 msg = msg + _(""" Verbosity must be one of: digit [0-9], character [ewnid],
220
221=== modified file 'po/Makevars'
222--- po/Makevars 2009-04-01 15:07:45 +0000
223+++ po/Makevars 2009-09-01 00:46:32 +0000
224@@ -22,7 +22,7 @@
225 DOMAIN = duplicity
226 subdir = po
227 top_builddir = ..
228-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --language=Python
229+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --language=Python --add-comments="TRANSL:"
230 COPYRIGHT_HOLDER = Kenneth Loafman <kenneth@loafman.com>
231 MSGID_BUGS_ADDRESS = Kenneth Loafman <kenneth@loafman.com>
232
233
234=== modified file 'po/duplicity.pot'
235--- po/duplicity.pot 2009-07-29 20:18:09 +0000
236+++ po/duplicity.pot 2009-09-01 00:46:32 +0000
237@@ -8,7 +8,7 @@
238 msgstr ""
239 "Project-Id-Version: PACKAGE VERSION\n"
240 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
241-"POT-Creation-Date: 2009-07-29 15:13-0500\n"
242+"POT-Creation-Date: 2009-08-30 23:01-0700\n"
243 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
244 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
245 "Language-Team: LANGUAGE <LL@li.org>\n"
246@@ -83,8 +83,6 @@
247 msgid "Volume was signed by key %s, not %s"
248 msgstr ""
249
250-#. Unfortunately, ngettext doesn't handle multiple number variables, so we
251-#. split up the string.
252 #: ../duplicity-bin:670
253 #, python-format
254 msgid "Verify complete: %s, %s."
255@@ -158,79 +156,76 @@
256 msgid "Rerun command with --force option to actually delete."
257 msgstr ""
258
259-#: ../duplicity-bin:860
260+#: ../duplicity-bin:863
261 #, python-format
262 msgid "Deleting local %s (not authoritative at backend)."
263 msgstr ""
264
265-#: ../duplicity-bin:885 ../duplicity/dup_temp.py:239
266+#: ../duplicity-bin:888 ../duplicity/dup_temp.py:239
267 #, python-format
268 msgid "Failed to read %s: %s"
269 msgstr ""
270
271-#: ../duplicity-bin:896
272+#: ../duplicity-bin:899
273 #, python-format
274 msgid "Copying %s to local cache."
275 msgstr ""
276
277-#: ../duplicity-bin:940
278+#: ../duplicity-bin:943
279 msgid "Local and Remote metadata are synchronized, no sync needed."
280 msgstr ""
281
282-#: ../duplicity-bin:945
283+#: ../duplicity-bin:948
284 msgid "Synchronizing remote metadata to local cache..."
285 msgstr ""
286
287-#: ../duplicity-bin:952
288+#: ../duplicity-bin:955
289 msgid "Sync would copy the following from remote to local:"
290 msgstr ""
291
292-#: ../duplicity-bin:955
293+#: ../duplicity-bin:958
294 msgid "Sync would remove the following spurious local files:"
295 msgstr ""
296
297-#: ../duplicity-bin:998
298+#: ../duplicity-bin:1001
299 msgid "Unable to get free space on temp."
300 msgstr ""
301
302-#: ../duplicity-bin:1006
303+#: ../duplicity-bin:1009
304 #, python-format
305 msgid "Temp space has %d available, backup needs approx %d."
306 msgstr ""
307
308-#: ../duplicity-bin:1009
309+#: ../duplicity-bin:1012
310 #, python-format
311 msgid "Temp has %d available, backup will use approx %d."
312 msgstr ""
313
314-#: ../duplicity-bin:1017
315+#: ../duplicity-bin:1020
316 msgid "Unable to get max open files."
317 msgstr ""
318
319-#: ../duplicity-bin:1021
320+#: ../duplicity-bin:1024
321 #, python-format
322 msgid ""
323 "Max open files of %s is too low, should be >= 1024.\n"
324 "Use 'ulimit -n 1024' or higher to correct.\n"
325 msgstr ""
326
327-#. upload of 1st vol failed, clean and restart
328-#: ../duplicity-bin:1067
329+#: ../duplicity-bin:1070
330 msgid ""
331 "RESTART: The first volume failed to upload before termination.\n"
332 " Restart is impossible...starting backup from beginning."
333 msgstr ""
334
335-#. upload of N vols failed, fix manifest and restart
336-#: ../duplicity-bin:1073
337+#: ../duplicity-bin:1076
338 #, python-format
339 msgid ""
340 "RESTART: Volumes %d to %d failed to upload before termination.\n"
341 " Restarting backup at volume %d."
342 msgstr ""
343
344-#. this is an 'impossible' state, remove last partial and restart
345-#: ../duplicity-bin:1081
346+#: ../duplicity-bin:1084
347 #, python-format
348 msgid ""
349 "RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
350@@ -239,47 +234,39 @@
351 " backup then restart the backup from the beginning."
352 msgstr ""
353
354-#. log it -- main restart heavy lifting is done in write_multivol
355-#: ../duplicity-bin:1159
356+#: ../duplicity-bin:1162
357 #, python-format
358 msgid "Last %s backup left a partial set, restarting."
359 msgstr ""
360
361-#. remove last partial backup and get new collection status
362-#: ../duplicity-bin:1163
363+#: ../duplicity-bin:1166
364 #, python-format
365 msgid "Cleaning up previous partial %s backup set, restarting."
366 msgstr ""
367
368-#: ../duplicity-bin:1174
369+#: ../duplicity-bin:1177
370 msgid "Last full backup date:"
371 msgstr ""
372
373-#: ../duplicity-bin:1176
374+#: ../duplicity-bin:1179
375 msgid "Last full backup date: none"
376 msgstr ""
377
378-#: ../duplicity-bin:1178
379+#: ../duplicity-bin:1181
380 msgid "Last full backup is too old, forcing full backup"
381 msgstr ""
382
383-#. For gpg errors, don't show an ugly stack trace by
384-#. default. But do with sufficient verbosity.
385-#: ../duplicity-bin:1252
386+#: ../duplicity-bin:1255
387 #, python-format
388 msgid "GPG error detail: %s"
389 msgstr ""
390
391-#. For user errors, don't show an ugly stack trace by
392-#. default. But do with sufficient verbosity.
393-#: ../duplicity-bin:1261
394+#: ../duplicity-bin:1264
395 #, python-format
396 msgid "User error detail: %s"
397 msgstr ""
398
399-#. For backend errors, don't show an ugly stack trace by
400-#. default. But do with sufficient verbosity.
401-#: ../duplicity-bin:1270
402+#: ../duplicity-bin:1273
403 #, python-format
404 msgid "Backend error detail: %s"
405 msgstr ""
406@@ -495,7 +482,6 @@
407 msgstr[0] ""
408 msgstr[1] ""
409
410-#. It matches, remove the last backup set:
411 #: ../duplicity/collections.py:711
412 msgid "Warning, discarding last backup set, because of missing signature file."
413 msgstr ""
414@@ -618,204 +604,213 @@
415
416 #. Used in usage help. Example:
417 #. tahoe://alias/some_dir
418-#: ../duplicity/commandline.py:448
419+#: ../duplicity/commandline.py:449
420 msgid "alias"
421 msgstr ""
422
423 #. Used in usage help (noun)
424-#: ../duplicity/commandline.py:450
425+#: ../duplicity/commandline.py:452
426 msgid "backup name"
427 msgstr ""
428
429-#. Used in help to represent a "bucket name" for Amazon Web Services' Simple
430-#. Storage Service (S3). Example:
431+#. Used in help to represent a "bucket name" for Amazon Web
432+#. Services' Simple Storage Service (S3). Example:
433 #. s3://other.host/bucket_name[/prefix]
434-#: ../duplicity/commandline.py:454
435+#: ../duplicity/commandline.py:457
436 msgid "bucket_name"
437 msgstr ""
438
439-#. Used in usage help, abbreviation for "character" (noun)
440-#: ../duplicity/commandline.py:456
441+#. abbreviation for "character" (noun)
442+#: ../duplicity/commandline.py:460
443 msgid "char"
444 msgstr ""
445
446-#. Used in usage help (noun)
447-#: ../duplicity/commandline.py:458
448+#. noun
449+#: ../duplicity/commandline.py:463
450 msgid "command"
451 msgstr ""
452
453-#. Used in usage help to represent the name of a container in Amazon Web
454-#. Services' Cloudfront. Example:
455+#. Used in usage help to represent the name of a container in
456+#. Amazon Web Services' Cloudfront. Example:
457 #. cf+http://container_name
458-#: ../duplicity/commandline.py:462
459+#: ../duplicity/commandline.py:468
460 msgid "container_name"
461 msgstr ""
462
463-#. Used in usage help (noun)
464-#: ../duplicity/commandline.py:464
465+#. noun
466+#: ../duplicity/commandline.py:471
467 msgid "count"
468 msgstr ""
469
470 #. Used in usage help to represent the name of a file directory
471-#: ../duplicity/commandline.py:466
472+#: ../duplicity/commandline.py:474
473 msgid "directory"
474 msgstr ""
475
476 #. Used in usage help to represent the name of a file. Example:
477 #. --log-file <filename>
478-#: ../duplicity/commandline.py:469
479+#: ../duplicity/commandline.py:478
480 msgid "filename"
481 msgstr ""
482
483 #. Used in usage help to represent an ID for a GnuPG key. Example:
484 #. --encrypt-key <gpg_key_id>
485-#: ../duplicity/commandline.py:472
486+#: ../duplicity/commandline.py:482
487 msgid "gpg-key-id"
488 msgstr ""
489
490-#. Used in usage help, e.g. to represent the name of a code module. Example:
491+#. Used in usage help, e.g. to represent the name of a code
492+#. module. Example:
493 #. rsync://user[:password]@other.host[:port]::/module/some_dir
494-#: ../duplicity/commandline.py:475
495+#: ../duplicity/commandline.py:487
496 msgid "module"
497 msgstr ""
498
499-#. Used in usage help to represent a desired number of something. Example:
500+#. Used in usage help to represent a desired number of
501+#. something. Example:
502 #. --num-retries <number>
503-#: ../duplicity/commandline.py:478
504+#: ../duplicity/commandline.py:492
505 msgid "number"
506 msgstr ""
507
508-#. Used in usage help. (Should be consistent with the "Options:" header.)
509-#. Example:
510+#. Used in usage help. (Should be consistent with the "Options:"
511+#. header.) Example:
512 #. duplicity [full|incremental] [options] source_dir target_url
513-#: ../duplicity/commandline.py:482
514+#: ../duplicity/commandline.py:497
515 msgid "options"
516 msgstr ""
517
518 #. Used in usage help to represent an internet hostname. Example:
519 #. ftp://user[:password]@other.host[:port]/some_dir
520-#: ../duplicity/commandline.py:485
521+#: ../duplicity/commandline.py:501
522 msgid "other.host"
523 msgstr ""
524
525 #. Used in usage help. Example:
526-#: ../duplicity/commandline.py:487
527+#. ftp://user[:password]@other.host[:port]/some_dir
528+#: ../duplicity/commandline.py:505
529 msgid "password"
530 msgstr ""
531
532 #. Used in usage help to represent a Unix-style path name. Example:
533 #. --archive-dir <path>
534-#: ../duplicity/commandline.py:490
535+#: ../duplicity/commandline.py:509
536 msgid "path"
537 msgstr ""
538
539 #. Used in usage help to represent a TCP port number. Example:
540 #. ftp://user[:password]@other.host[:port]/some_dir
541-#: ../duplicity/commandline.py:493
542+#: ../duplicity/commandline.py:513
543 msgid "port"
544 msgstr ""
545
546-#. Used in usage help. This represents a string to be used as a prefix to
547-#. names for backup files created by Duplicity. Example:
548+#. Used in usage help. This represents a string to be used as a
549+#. prefix to names for backup files created by Duplicity. Example:
550 #. s3://other.host/bucket_name[/prefix]
551-#: ../duplicity/commandline.py:497
552+#: ../duplicity/commandline.py:518
553 msgid "prefix"
554 msgstr ""
555
556 #. Used in usage help to represent a Unix-style path name. Example:
557 #. rsync://user[:password]@other.host[:port]/relative_path
558-#: ../duplicity/commandline.py:500
559+#: ../duplicity/commandline.py:522
560 msgid "relative_path"
561 msgstr ""
562
563 #. Used in usage help. Example:
564 #. --timeout <seconds>
565-#: ../duplicity/commandline.py:503
566+#: ../duplicity/commandline.py:526
567 msgid "seconds"
568 msgstr ""
569
570-#. Used in usage help to represent a "glob" style pattern for matching one or
571-#. more files, as described in the documentation. Example:
572-#. --exclude <%shell_pattern>
573-#: ../duplicity/commandline.py:507
574+#. Used in usage help to represent a "glob" style pattern for
575+#. matching one or more files, as described in the documentation.
576+#. Example:
577+#. --exclude <shell_pattern>
578+#: ../duplicity/commandline.py:532
579 msgid "shell_pattern"
580 msgstr ""
581
582-#. Used in usage help to represent the name of a single file directory or a
583-#. Unix-style path to a directory. Example:
584-#. file:///%(x_some_dir)s
585-#: ../duplicity/commandline.py:511
586+#. Used in usage help to represent the name of a single file
587+#. directory or a Unix-style path to a directory. Example:
588+#. file:///some_dir
589+#: ../duplicity/commandline.py:537
590 msgid "some_dir"
591 msgstr ""
592
593-#. Used in usage help to represent the name of a single file directory or a
594-#. Unix-style path to a directory where files will be coming FROM. Example:
595+#. Used in usage help to represent the name of a single file
596+#. directory or a Unix-style path to a directory where files will be
597+#. coming FROM. Example:
598 #. duplicity [full|incremental] [options] source_dir target_url
599-#: ../duplicity/commandline.py:515
600+#: ../duplicity/commandline.py:543
601 msgid "source_dir"
602 msgstr ""
603
604-#. Used in usage help to represent a URL files will be coming FROM. Example:
605+#. Used in usage help to represent a URL files will be coming
606+#. FROM. Example:
607 #. duplicity [restore] [options] source_url target_dir
608-#: ../duplicity/commandline.py:518
609+#: ../duplicity/commandline.py:548
610 msgid "source_url"
611 msgstr ""
612
613-#. Used in usage help to represent the name of a single file directory or a
614-#. Unix-style path to a directory. where files will be going TO. Example:
615+#. Used in usage help to represent the name of a single file
616+#. directory or a Unix-style path to a directory. where files will be
617+#. going TO. Example:
618 #. duplicity [restore] [options] source_url target_dir
619-#: ../duplicity/commandline.py:522
620+#: ../duplicity/commandline.py:554
621 msgid "target_dir"
622 msgstr ""
623
624-#. Used in usage help to represent a URL files will be going TO. Example:
625+#. Used in usage help to represent a URL files will be going TO.
626+#. Example:
627 #. duplicity [full|incremental] [options] source_dir target_url
628-#: ../duplicity/commandline.py:525
629+#: ../duplicity/commandline.py:559
630 msgid "target_url"
631 msgstr ""
632
633-#. Used in usage help to represent a time spec for a previous point in time,
634-#. as described in the documentation. Example:
635+#. Used in usage help to represent a time spec for a previous
636+#. point in time, as described in the documentation. Example:
637 #. duplicity remove-older-than time [options] target_url
638-#: ../duplicity/commandline.py:529
639+#: ../duplicity/commandline.py:564
640 msgid "time"
641 msgstr ""
642
643-#. Used in usage help to represent a user name (i.e. login). Example:
644+#. Used in usage help to represent a user name (i.e. login).
645+#. Example:
646 #. ftp://user[:password]@other.host[:port]/some_dir
647-#: ../duplicity/commandline.py:532
648+#: ../duplicity/commandline.py:569
649 msgid "user"
650 msgstr ""
651
652-#: ../duplicity/commandline.py:534
653+#: ../duplicity/commandline.py:571
654 #, python-format
655 msgid "duplicity version %s running on %s."
656 msgstr ""
657
658 #. Header in usage help
659-#: ../duplicity/commandline.py:538
660+#: ../duplicity/commandline.py:575
661 msgid "Usage:"
662 msgstr ""
663
664 #. Header in usage help
665-#: ../duplicity/commandline.py:551
666+#: ../duplicity/commandline.py:588
667 msgid "Backends and their URL formats:"
668 msgstr ""
669
670 #. Header in usage help
671-#: ../duplicity/commandline.py:571
672+#: ../duplicity/commandline.py:608
673 msgid "Commands:"
674 msgstr ""
675
676 #. Header in usage help
677-#: ../duplicity/commandline.py:585
678+#: ../duplicity/commandline.py:622
679 msgid "Options:"
680 msgstr ""
681
682 #. In this portion of the usage instructions, "[ewnid]" indicates which
683 #. characters are permitted (e, w, n, i, or d); the brackets imply their own
684 #. meaning in regex; i.e., only one of the characters is allowed in an instance.
685-#: ../duplicity/commandline.py:639
686+#: ../duplicity/commandline.py:676
687 msgid ""
688 " Verbosity must be one of: digit [0-9], character [ewnid],\n"
689 " or word ['error', 'warning', 'notice', 'info', 'debug'].\n"
690@@ -823,36 +818,36 @@
691 " that verbosity level is set at 2 (Warning) or higher.\n"
692 msgstr ""
693
694-#: ../duplicity/commandline.py:665
695+#: ../duplicity/commandline.py:702
696 #, python-format
697 msgid "Specified archive directory '%s' does not exist, or is not a directory"
698 msgstr ""
699
700-#: ../duplicity/commandline.py:674
701+#: ../duplicity/commandline.py:711
702 #, python-format
703 msgid ""
704 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
705 "Received '%s' instead."
706 msgstr ""
707
708-#: ../duplicity/commandline.py:732
709+#: ../duplicity/commandline.py:769
710 #, python-format
711 msgid ""
712 "Restore destination directory %s already exists.\n"
713 "Will not overwrite."
714 msgstr ""
715
716-#: ../duplicity/commandline.py:737
717+#: ../duplicity/commandline.py:774
718 #, python-format
719 msgid "Verify directory %s does not exist"
720 msgstr ""
721
722-#: ../duplicity/commandline.py:743
723+#: ../duplicity/commandline.py:780
724 #, python-format
725 msgid "Backup source directory %s does not exist."
726 msgstr ""
727
728-#: ../duplicity/commandline.py:818
729+#: ../duplicity/commandline.py:855
730 #, python-format
731 msgid ""
732 "Bad URL '%s'.\n"
733@@ -860,7 +855,7 @@
734 "\"file:///usr/local\". See the man page for more information."
735 msgstr ""
736
737-#: ../duplicity/commandline.py:843
738+#: ../duplicity/commandline.py:880
739 msgid "Main action: "
740 msgstr ""
741
742@@ -889,7 +884,6 @@
743 msgid "Comparing %s and %s"
744 msgstr ""
745
746-#. but signature says it did
747 #: ../duplicity/diffdir.py:199
748 #, python-format
749 msgid "D %s"
750@@ -998,7 +992,6 @@
751 msgid "Starting to write %s"
752 msgstr ""
753
754-#. special case first index
755 #: ../duplicity/misc.py:107
756 #, python-format
757 msgid ""
758@@ -1080,7 +1073,6 @@
759 msgid "Touching %s"
760 msgstr ""
761
762-#. todo: avoid circ. dep. issue
763 #: ../duplicity/path.py:554
764 #, python-format
765 msgid "Deleting tree %s"
766@@ -1111,7 +1103,6 @@
767 msgid "Error accessing possibly locked file %s"
768 msgstr ""
769
770-#. base doesn't exist
771 #: ../duplicity/selection.py:154
772 #, python-format
773 msgid "Warning: base %s doesn't exist, continuing"
774
775=== modified file 'po/en_GB.po'
776--- po/en_GB.po 2009-07-25 22:43:44 +0000
777+++ po/en_GB.po 2009-09-01 00:46:32 +0000
778@@ -7,7 +7,7 @@
779 msgstr ""
780 "Project-Id-Version: duplicity\n"
781 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
782-"POT-Creation-Date: 2009-07-22 17:34-0700\n"
783+"POT-Creation-Date: 2009-08-30 23:01-0700\n"
784 "PO-Revision-Date: 2009-07-21 18:30+0000\n"
785 "Last-Translator: Larry Gilbert <Unknown>\n"
786 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
787@@ -18,44 +18,260 @@
788 "X-Launchpad-Export-Date: 2009-07-21 22:24+0000\n"
789 "X-Generator: Launchpad (build Unknown)\n"
790
791-#: ../duplicity-bin:669
792-#, c-format
793+#: ../duplicity-bin:191
794+#, python-format
795+msgid ""
796+"Unable to locate last file %s and block %d in backup set.\n"
797+"Attempting restart on the next file %s."
798+msgstr ""
799+
800+#: ../duplicity-bin:197
801+#, python-format
802+msgid ""
803+"Unable to locate last file %s and block %d in backup set.\n"
804+"There are no more files to be backed up."
805+msgstr ""
806+
807+#: ../duplicity-bin:443
808+msgid ""
809+"Fatal Error: Unable to start incremental backup. Old signatures not found "
810+"and incremental specified"
811+msgstr ""
812+
813+#: ../duplicity-bin:447
814+msgid "No signatures found, switching to full backup."
815+msgstr ""
816+
817+#: ../duplicity-bin:461
818+msgid "Backup Statistics"
819+msgstr ""
820+
821+#: ../duplicity-bin:515
822+msgid "No signature data found, unable to list files."
823+msgstr ""
824+
825+#: ../duplicity-bin:544
826+#, python-format
827+msgid "%s not found in archive, no files restored."
828+msgstr ""
829+
830+#: ../duplicity-bin:548
831+msgid "No files found in archive - nothing restored."
832+msgstr ""
833+
834+#: ../duplicity-bin:581
835+#, python-format
836+msgid "Processed volume %d of %d"
837+msgstr ""
838+
839+#: ../duplicity-bin:621
840+#, python-format
841+msgid "Invalid data - %s hash mismatch:"
842+msgstr ""
843+
844+#: ../duplicity-bin:622
845+#, python-format
846+msgid "Calculated hash: %s"
847+msgstr ""
848+
849+#: ../duplicity-bin:623
850+#, python-format
851+msgid "Manifest hash: %s"
852+msgstr ""
853+
854+#: ../duplicity-bin:640
855+#, python-format
856+msgid "Volume was signed by key %s, not %s"
857+msgstr ""
858+
859+#: ../duplicity-bin:670
860+#, python-format
861+msgid "Verify complete: %s, %s."
862+msgstr ""
863+
864+#: ../duplicity-bin:671
865+#, python-format
866 msgid "%d file compared"
867 msgid_plural "%d files compared"
868 msgstr[0] ""
869 msgstr[1] ""
870
871-#: ../duplicity-bin:671
872-#, c-format
873+#: ../duplicity-bin:673
874+#, python-format
875 msgid "%d difference found"
876 msgid_plural "%d differences found"
877 msgstr[0] ""
878 msgstr[1] ""
879
880-#: ../duplicity-bin:695
881+#: ../duplicity-bin:692
882+msgid "No extraneous files found, nothing deleted in cleanup."
883+msgstr ""
884+
885+#: ../duplicity-bin:697
886 msgid "Deleting this file from backend:"
887 msgid_plural "Deleting these files from backend:"
888 msgstr[0] ""
889 msgstr[1] ""
890
891-#: ../duplicity-bin:704
892+#: ../duplicity-bin:706
893 msgid "Found the following file to delete:"
894 msgid_plural "Found the following files to delete:"
895 msgstr[0] ""
896 msgstr[1] ""
897
898-#: ../duplicity-bin:762
899+#: ../duplicity-bin:710
900+msgid "Run duplicity again with the --force option to actually delete."
901+msgstr ""
902+
903+#: ../duplicity-bin:749
904+msgid "There are backup set(s) at time(s):"
905+msgstr ""
906+
907+#: ../duplicity-bin:751
908+msgid "Which can't be deleted because newer sets depend on them."
909+msgstr ""
910+
911+#: ../duplicity-bin:755
912+msgid ""
913+"Current active backup chain is older than specified time. However, it will "
914+"not be deleted. To remove all your backups, manually purge the repository."
915+msgstr ""
916+
917+#: ../duplicity-bin:761
918+msgid "No old backup sets found, nothing deleted."
919+msgstr ""
920+
921+#: ../duplicity-bin:764
922 msgid "Deleting backup set at time:"
923 msgid_plural "Deleting backup sets at times:"
924 msgstr[0] ""
925 msgstr[1] ""
926
927-#: ../duplicity-bin:774
928+#: ../duplicity-bin:776
929 msgid "Found old backup set at the following time:"
930 msgid_plural "Found old backup sets at the following times:"
931 msgstr[0] ""
932 msgstr[1] ""
933
934+#: ../duplicity-bin:780
935+msgid "Rerun command with --force option to actually delete."
936+msgstr ""
937+
938+#: ../duplicity-bin:863
939+#, python-format
940+msgid "Deleting local %s (not authoritative at backend)."
941+msgstr ""
942+
943+#: ../duplicity-bin:888 ../duplicity/dup_temp.py:239
944+#, python-format
945+msgid "Failed to read %s: %s"
946+msgstr ""
947+
948+#: ../duplicity-bin:899
949+#, python-format
950+msgid "Copying %s to local cache."
951+msgstr ""
952+
953+#: ../duplicity-bin:943
954+msgid "Local and Remote metadata are synchronized, no sync needed."
955+msgstr ""
956+
957+#: ../duplicity-bin:948
958+msgid "Synchronizing remote metadata to local cache..."
959+msgstr ""
960+
961+#: ../duplicity-bin:955
962+msgid "Sync would copy the following from remote to local:"
963+msgstr ""
964+
965+#: ../duplicity-bin:958
966+msgid "Sync would remove the following spurious local files:"
967+msgstr ""
968+
969+#: ../duplicity-bin:1001
970+msgid "Unable to get free space on temp."
971+msgstr ""
972+
973+#: ../duplicity-bin:1009
974+#, python-format
975+msgid "Temp space has %d available, backup needs approx %d."
976+msgstr ""
977+
978+#: ../duplicity-bin:1012
979+#, python-format
980+msgid "Temp has %d available, backup will use approx %d."
981+msgstr ""
982+
983+#: ../duplicity-bin:1020
984+msgid "Unable to get max open files."
985+msgstr ""
986+
987+#: ../duplicity-bin:1024
988+#, python-format
989+msgid ""
990+"Max open files of %s is too low, should be >= 1024.\n"
991+"Use 'ulimit -n 1024' or higher to correct.\n"
992+msgstr ""
993+
994+#: ../duplicity-bin:1070
995+msgid ""
996+"RESTART: The first volume failed to upload before termination.\n"
997+" Restart is impossible...starting backup from beginning."
998+msgstr ""
999+
1000+#: ../duplicity-bin:1076
1001+#, python-format
1002+msgid ""
1003+"RESTART: Volumes %d to %d failed to upload before termination.\n"
1004+" Restarting backup at volume %d."
1005+msgstr ""
1006+
1007+#: ../duplicity-bin:1084
1008+#, python-format
1009+msgid ""
1010+"RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
1011+" Restart is impossible ... duplicity will clean off the last "
1012+"partial\n"
1013+" backup then restart the backup from the beginning."
1014+msgstr ""
1015+
1016+#: ../duplicity-bin:1162
1017+#, python-format
1018+msgid "Last %s backup left a partial set, restarting."
1019+msgstr ""
1020+
1021+#: ../duplicity-bin:1166
1022+#, python-format
1023+msgid "Cleaning up previous partial %s backup set, restarting."
1024+msgstr ""
1025+
1026+#: ../duplicity-bin:1177
1027+msgid "Last full backup date:"
1028+msgstr ""
1029+
1030+#: ../duplicity-bin:1179
1031+msgid "Last full backup date: none"
1032+msgstr ""
1033+
1034+#: ../duplicity-bin:1181
1035+msgid "Last full backup is too old, forcing full backup"
1036+msgstr ""
1037+
1038+#: ../duplicity-bin:1255
1039+#, python-format
1040+msgid "GPG error detail: %s"
1041+msgstr ""
1042+
1043+#: ../duplicity-bin:1264
1044+#, python-format
1045+msgid "User error detail: %s"
1046+msgstr ""
1047+
1048+#: ../duplicity-bin:1273
1049+#, python-format
1050+msgid "Backend error detail: %s"
1051+msgstr ""
1052+
1053 #: ../duplicity/asyncscheduler.py:69
1054 #, python-format
1055 msgid "instantiating at concurrency %d"
1056@@ -124,219 +340,218 @@
1057 msgid "Reading results of '%s'"
1058 msgstr ""
1059
1060-#: ../duplicity/collections.py:159
1061+#: ../duplicity/collections.py:176
1062 msgid "Fatal Error: No manifests found for most recent backup"
1063 msgstr ""
1064
1065-#: ../duplicity/collections.py:168
1066+#: ../duplicity/collections.py:185
1067 msgid ""
1068 "Fatal Error: Remote manifest does not match local one. Either the remote "
1069 "backup set or the local archive directory has been corrupted."
1070 msgstr ""
1071
1072-#: ../duplicity/collections.py:176
1073+#: ../duplicity/collections.py:193
1074 msgid "Fatal Error: Neither remote nor local manifest is readable."
1075 msgstr ""
1076
1077-#: ../duplicity/collections.py:280
1078+#: ../duplicity/collections.py:299
1079 msgid "Preferring Backupset over previous one!"
1080 msgstr ""
1081
1082-#: ../duplicity/collections.py:283
1083+#: ../duplicity/collections.py:302
1084 #, python-format
1085 msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)"
1086 msgstr ""
1087
1088-#: ../duplicity/collections.py:288
1089+#: ../duplicity/collections.py:307
1090 #, python-format
1091 msgid "Added incremental Backupset (start_time: %s / end_time: %s)"
1092 msgstr ""
1093
1094-#: ../duplicity/collections.py:354
1095+#: ../duplicity/collections.py:373
1096 msgid "Chain start time: "
1097 msgstr ""
1098
1099-#: ../duplicity/collections.py:355
1100+#: ../duplicity/collections.py:374
1101 msgid "Chain end time: "
1102 msgstr ""
1103
1104-#: ../duplicity/collections.py:356
1105+#: ../duplicity/collections.py:375
1106 #, python-format
1107 msgid "Number of contained backup sets: %d"
1108 msgstr ""
1109
1110-#: ../duplicity/collections.py:358
1111+#: ../duplicity/collections.py:377
1112 #, python-format
1113 msgid "Total number of contained volumes: %d"
1114 msgstr ""
1115
1116-#: ../duplicity/collections.py:360
1117+#: ../duplicity/collections.py:379
1118 msgid "Type of backup set:"
1119 msgstr ""
1120
1121-#: ../duplicity/collections.py:360
1122+#: ../duplicity/collections.py:379
1123 msgid "Time:"
1124 msgstr ""
1125
1126-#: ../duplicity/collections.py:360
1127+#: ../duplicity/collections.py:379
1128 msgid "Num volumes:"
1129 msgstr ""
1130
1131-#: ../duplicity/collections.py:364
1132+#: ../duplicity/collections.py:383
1133 msgid "Full"
1134 msgstr "Full"
1135
1136-#: ../duplicity/collections.py:367
1137+#: ../duplicity/collections.py:386
1138 msgid "Incremental"
1139 msgstr "Incremental"
1140
1141-#: ../duplicity/collections.py:427
1142+#: ../duplicity/collections.py:446
1143 msgid "local"
1144 msgstr "local"
1145
1146-#: ../duplicity/collections.py:429
1147+#: ../duplicity/collections.py:448
1148 msgid "remote"
1149 msgstr "remote"
1150
1151-#: ../duplicity/collections.py:581
1152+#: ../duplicity/collections.py:600
1153 msgid "Collection Status"
1154 msgstr ""
1155
1156-#: ../duplicity/collections.py:583
1157+#: ../duplicity/collections.py:602
1158 #, python-format
1159 msgid "Connecting with backend: %s"
1160 msgstr ""
1161
1162-#: ../duplicity/collections.py:585
1163+#: ../duplicity/collections.py:604
1164 #, python-format
1165 msgid "Archive dir: %s"
1166 msgstr ""
1167
1168-#: ../duplicity/collections.py:588
1169+#: ../duplicity/collections.py:607
1170 #, python-format
1171 msgid "Found %d backup chain without signatures."
1172 msgid_plural "Found %d backup chains without signatures."
1173 msgstr[0] ""
1174 msgstr[1] ""
1175
1176-#: ../duplicity/collections.py:593
1177+#: ../duplicity/collections.py:612
1178 #, python-format
1179 msgid "Signature-less chain %d of %d:"
1180 msgstr ""
1181
1182-#: ../duplicity/collections.py:599
1183+#: ../duplicity/collections.py:618
1184 msgid "Found a complete backup chain with matching signature chain:"
1185 msgstr ""
1186
1187-#: ../duplicity/collections.py:603
1188+#: ../duplicity/collections.py:622
1189 msgid "No backup chains with active signatures found"
1190 msgstr ""
1191
1192-#: ../duplicity/collections.py:606
1193+#: ../duplicity/collections.py:625
1194 #, python-format
1195 msgid "Also found %d backup set not part of any chain,"
1196 msgid_plural "Also found %d backup sets not part of any chain,"
1197 msgstr[0] ""
1198 msgstr[1] ""
1199
1200-#: ../duplicity/collections.py:610
1201+#: ../duplicity/collections.py:629
1202 #, python-format
1203 msgid "and %d incomplete backup set."
1204 msgid_plural "and %d incomplete backup sets."
1205 msgstr[0] ""
1206 msgstr[1] ""
1207
1208-#: ../duplicity/collections.py:614
1209+#: ../duplicity/collections.py:633
1210 msgid "These may be deleted by running duplicity with the --cleanup option."
1211 msgstr ""
1212
1213-#: ../duplicity/collections.py:617
1214+#: ../duplicity/collections.py:636
1215 msgid "No orphaned or incomplete backup sets found."
1216 msgstr ""
1217
1218-#: ../duplicity/collections.py:633
1219+#: ../duplicity/collections.py:652
1220 #, python-format
1221 msgid "%d file exists on backend"
1222 msgid_plural "%d files exist on backend"
1223 msgstr[0] ""
1224 msgstr[1] ""
1225
1226-#: ../duplicity/collections.py:640
1227+#: ../duplicity/collections.py:659
1228 #, python-format
1229 msgid "%d file exists in cache"
1230 msgid_plural "%d files exist in cache"
1231 msgstr[0] ""
1232 msgstr[1] ""
1233
1234-#. It matches, remove the last backup set:
1235-#: ../duplicity/collections.py:692
1236+#: ../duplicity/collections.py:711
1237 msgid "Warning, discarding last backup set, because of missing signature file."
1238 msgstr ""
1239
1240-#: ../duplicity/collections.py:725
1241+#: ../duplicity/collections.py:744
1242 msgid "Warning, found the following local orphaned signature file:"
1243 msgid_plural "Warning, found the following local orphaned signature files:"
1244 msgstr[0] ""
1245 msgstr[1] ""
1246
1247-#: ../duplicity/collections.py:734
1248+#: ../duplicity/collections.py:753
1249 msgid "Warning, found the following remote orphaned signature file:"
1250 msgid_plural "Warning, found the following remote orphaned signature files:"
1251 msgstr[0] ""
1252 msgstr[1] ""
1253
1254-#: ../duplicity/collections.py:744
1255+#: ../duplicity/collections.py:763
1256 msgid "Warning, found an unnecessary signature chain"
1257 msgid_plural "Warning, found unnecessary signature chains"
1258 msgstr[0] ""
1259 msgstr[1] ""
1260
1261-#: ../duplicity/collections.py:752
1262+#: ../duplicity/collections.py:771
1263 msgid "Warning, found signatures but no corresponding backup files"
1264 msgstr ""
1265
1266-#: ../duplicity/collections.py:756
1267+#: ../duplicity/collections.py:775
1268 msgid ""
1269 "Warning, found incomplete backup sets, probably left from aborted session"
1270 msgstr ""
1271
1272-#: ../duplicity/collections.py:760
1273+#: ../duplicity/collections.py:779
1274 msgid "Warning, found the following orphaned backup file:"
1275 msgid_plural "Warning, found the following orphaned backup files:"
1276 msgstr[0] ""
1277 msgstr[1] ""
1278
1279-#: ../duplicity/collections.py:778
1280+#: ../duplicity/collections.py:797
1281 #, python-format
1282 msgid "Extracting backup chains from list of files: %s"
1283 msgstr ""
1284
1285-#: ../duplicity/collections.py:788
1286+#: ../duplicity/collections.py:807
1287 #, python-format
1288 msgid "File %s is part of known set"
1289 msgstr ""
1290
1291-#: ../duplicity/collections.py:791
1292+#: ../duplicity/collections.py:810
1293 #, python-format
1294 msgid "File %s is not part of a known set; creating new set"
1295 msgstr ""
1296
1297-#: ../duplicity/collections.py:796
1298+#: ../duplicity/collections.py:815
1299 #, python-format
1300 msgid "Ignoring file (rejected by backup set) '%s'"
1301 msgstr ""
1302
1303-#: ../duplicity/collections.py:809
1304+#: ../duplicity/collections.py:828
1305 #, python-format
1306 msgid "Found backup chain %s"
1307 msgstr ""
1308
1309-#: ../duplicity/collections.py:814
1310+#: ../duplicity/collections.py:833
1311 #, python-format
1312 msgid "Added set %s to pre-existing chain %s"
1313 msgstr ""
1314
1315-#: ../duplicity/collections.py:818
1316+#: ../duplicity/collections.py:837
1317 #, python-format
1318 msgid "Found orphaned set %s"
1319 msgstr ""
1320@@ -385,210 +600,219 @@
1321
1322 #. Used in usage help to represent a Unix-style path name. Example:
1323 #. rsync://user[:password]@other_host[:port]//absolute_path
1324-#: ../duplicity/commandline.py:444
1325+#: ../duplicity/commandline.py:445
1326 msgid "absolute_path"
1327 msgstr ""
1328
1329 #. Used in usage help. Example:
1330 #. tahoe://alias/some_dir
1331-#: ../duplicity/commandline.py:447
1332+#: ../duplicity/commandline.py:449
1333 msgid "alias"
1334 msgstr ""
1335
1336 #. Used in usage help (noun)
1337-#: ../duplicity/commandline.py:449
1338+#: ../duplicity/commandline.py:452
1339 msgid "backup name"
1340 msgstr ""
1341
1342-#. Used in help to represent a "bucket name" for Amazon Web Services' Simple
1343-#. Storage Service (S3). Example:
1344+#. Used in help to represent a "bucket name" for Amazon Web
1345+#. Services' Simple Storage Service (S3). Example:
1346 #. s3://other.host/bucket_name[/prefix]
1347-#: ../duplicity/commandline.py:453
1348+#: ../duplicity/commandline.py:457
1349 msgid "bucket_name"
1350 msgstr ""
1351
1352-#. Used in usage help, abbreviation for "character" (noun)
1353-#: ../duplicity/commandline.py:455
1354+#. abbreviation for "character" (noun)
1355+#: ../duplicity/commandline.py:460
1356 msgid "char"
1357 msgstr ""
1358
1359-#. Used in usage help (noun)
1360-#: ../duplicity/commandline.py:457
1361+#. noun
1362+#: ../duplicity/commandline.py:463
1363 msgid "command"
1364 msgstr ""
1365
1366-#. Used in usage help to represent the name of a container in Amazon Web Services'
1367-#. Cloudfront. Example:
1368+#. Used in usage help to represent the name of a container in
1369+#. Amazon Web Services' Cloudfront. Example:
1370 #. cf+http://container_name
1371-#: ../duplicity/commandline.py:461
1372+#: ../duplicity/commandline.py:468
1373 msgid "container_name"
1374 msgstr ""
1375
1376-#. Used in usage help (noun)
1377-#: ../duplicity/commandline.py:463
1378+#. noun
1379+#: ../duplicity/commandline.py:471
1380 msgid "count"
1381 msgstr ""
1382
1383 #. Used in usage help to represent the name of a file directory
1384-#: ../duplicity/commandline.py:465
1385+#: ../duplicity/commandline.py:474
1386 msgid "directory"
1387 msgstr ""
1388
1389 #. Used in usage help to represent the name of a file. Example:
1390 #. --log-file <filename>
1391-#: ../duplicity/commandline.py:468
1392+#: ../duplicity/commandline.py:478
1393 msgid "filename"
1394 msgstr ""
1395
1396 #. Used in usage help to represent an ID for a GnuPG key. Example:
1397 #. --encrypt-key <gpg_key_id>
1398-#: ../duplicity/commandline.py:471
1399+#: ../duplicity/commandline.py:482
1400 msgid "gpg-key-id"
1401 msgstr ""
1402
1403-#. Used in usage help, e.g. to represent the name of a code module. Example:
1404+#. Used in usage help, e.g. to represent the name of a code
1405+#. module. Example:
1406 #. rsync://user[:password]@other.host[:port]::/module/some_dir
1407-#: ../duplicity/commandline.py:474
1408+#: ../duplicity/commandline.py:487
1409 msgid "module"
1410 msgstr ""
1411
1412-#. Used in usage help to represent a desired number of something. Example:
1413+#. Used in usage help to represent a desired number of
1414+#. something. Example:
1415 #. --num-retries <number>
1416-#: ../duplicity/commandline.py:477
1417+#: ../duplicity/commandline.py:492
1418 msgid "number"
1419 msgstr ""
1420
1421-#. Used in usage help. (Should be consistent with the "Options:" header.)
1422-#. Example:
1423+#. Used in usage help. (Should be consistent with the "Options:"
1424+#. header.) Example:
1425 #. duplicity [full|incremental] [options] source_dir target_url
1426-#: ../duplicity/commandline.py:481
1427+#: ../duplicity/commandline.py:497
1428 msgid "options"
1429 msgstr ""
1430
1431 #. Used in usage help to represent an internet hostname. Example:
1432 #. ftp://user[:password]@other.host[:port]/some_dir
1433-#: ../duplicity/commandline.py:484
1434+#: ../duplicity/commandline.py:501
1435 msgid "other.host"
1436 msgstr ""
1437
1438 #. Used in usage help. Example:
1439-#: ../duplicity/commandline.py:486
1440+#. ftp://user[:password]@other.host[:port]/some_dir
1441+#: ../duplicity/commandline.py:505
1442 msgid "password"
1443 msgstr ""
1444
1445 #. Used in usage help to represent a Unix-style path name. Example:
1446 #. --archive-dir <path>
1447-#: ../duplicity/commandline.py:489
1448+#: ../duplicity/commandline.py:509
1449 msgid "path"
1450 msgstr ""
1451
1452 #. Used in usage help to represent a TCP port number. Example:
1453 #. ftp://user[:password]@other.host[:port]/some_dir
1454-#: ../duplicity/commandline.py:492
1455+#: ../duplicity/commandline.py:513
1456 msgid "port"
1457 msgstr ""
1458
1459-#. Used in usage help. This represents a string to be used as a prefix to
1460-#. names for backup files created by Duplicity. Example:
1461+#. Used in usage help. This represents a string to be used as a
1462+#. prefix to names for backup files created by Duplicity. Example:
1463 #. s3://other.host/bucket_name[/prefix]
1464-#: ../duplicity/commandline.py:496
1465+#: ../duplicity/commandline.py:518
1466 msgid "prefix"
1467 msgstr ""
1468
1469 #. Used in usage help to represent a Unix-style path name. Example:
1470 #. rsync://user[:password]@other.host[:port]/relative_path
1471-#: ../duplicity/commandline.py:499
1472+#: ../duplicity/commandline.py:522
1473 msgid "relative_path"
1474 msgstr ""
1475
1476 #. Used in usage help. Example:
1477 #. --timeout <seconds>
1478-#: ../duplicity/commandline.py:502
1479+#: ../duplicity/commandline.py:526
1480 msgid "seconds"
1481 msgstr ""
1482
1483-#. Used in usage help to represent a "glob" style pattern for matching one or
1484-#. more files, as described in the documentation. Example:
1485-#. --exclude <%shell_pattern>
1486-#: ../duplicity/commandline.py:506
1487+#. Used in usage help to represent a "glob" style pattern for
1488+#. matching one or more files, as described in the documentation.
1489+#. Example:
1490+#. --exclude <shell_pattern>
1491+#: ../duplicity/commandline.py:532
1492 msgid "shell_pattern"
1493 msgstr ""
1494
1495-#. Used in usage help to represent the name of a single file directory or a
1496-#. Unix-style path to a directory. Example:
1497-#. file:///%(x_some_dir)s
1498-#: ../duplicity/commandline.py:510
1499+#. Used in usage help to represent the name of a single file
1500+#. directory or a Unix-style path to a directory. Example:
1501+#. file:///some_dir
1502+#: ../duplicity/commandline.py:537
1503 msgid "some_dir"
1504 msgstr ""
1505
1506-#. Used in usage help to represent the name of a single file directory or a
1507-#. Unix-style path to a directory where files will be coming FROM. Example:
1508+#. Used in usage help to represent the name of a single file
1509+#. directory or a Unix-style path to a directory where files will be
1510+#. coming FROM. Example:
1511 #. duplicity [full|incremental] [options] source_dir target_url
1512-#: ../duplicity/commandline.py:514
1513+#: ../duplicity/commandline.py:543
1514 msgid "source_dir"
1515 msgstr ""
1516
1517-#. Used in usage help to represent a URL files will be coming FROM. Example:
1518+#. Used in usage help to represent a URL files will be coming
1519+#. FROM. Example:
1520 #. duplicity [restore] [options] source_url target_dir
1521-#: ../duplicity/commandline.py:517
1522+#: ../duplicity/commandline.py:548
1523 msgid "source_url"
1524 msgstr ""
1525
1526-#. Used in usage help to represent the name of a single file directory or a
1527-#. Unix-style path to a directory. where files will be going TO. Example:
1528+#. Used in usage help to represent the name of a single file
1529+#. directory or a Unix-style path to a directory. where files will be
1530+#. going TO. Example:
1531 #. duplicity [restore] [options] source_url target_dir
1532-#: ../duplicity/commandline.py:521
1533+#: ../duplicity/commandline.py:554
1534 msgid "target_dir"
1535 msgstr ""
1536
1537-#. Used in usage help to represent a URL files will be going TO. Example:
1538+#. Used in usage help to represent a URL files will be going TO.
1539+#. Example:
1540 #. duplicity [full|incremental] [options] source_dir target_url
1541-#: ../duplicity/commandline.py:524
1542+#: ../duplicity/commandline.py:559
1543 msgid "target_url"
1544 msgstr ""
1545
1546-#. Used in usage help to represent a time spec for a previous point in time,
1547-#. as described in the documentation. Example:
1548+#. Used in usage help to represent a time spec for a previous
1549+#. point in time, as described in the documentation. Example:
1550 #. duplicity remove-older-than time [options] target_url
1551-#: ../duplicity/commandline.py:528
1552+#: ../duplicity/commandline.py:564
1553 msgid "time"
1554 msgstr ""
1555
1556-#. Used in usage help to represent a user name (i.e. login). Example:
1557+#. Used in usage help to represent a user name (i.e. login).
1558+#. Example:
1559 #. ftp://user[:password]@other.host[:port]/some_dir
1560-#: ../duplicity/commandline.py:531
1561+#: ../duplicity/commandline.py:569
1562 msgid "user"
1563 msgstr ""
1564
1565-#: ../duplicity/commandline.py:533
1566+#: ../duplicity/commandline.py:571
1567 #, python-format
1568 msgid "duplicity version %s running on %s."
1569 msgstr ""
1570
1571 #. Header in usage help
1572-#: ../duplicity/commandline.py:537
1573+#: ../duplicity/commandline.py:575
1574 msgid "Usage:"
1575 msgstr ""
1576
1577 #. Header in usage help
1578-#: ../duplicity/commandline.py:550
1579+#: ../duplicity/commandline.py:588
1580 msgid "Backends and their URL formats:"
1581 msgstr ""
1582
1583 #. Header in usage help
1584-#: ../duplicity/commandline.py:570
1585+#: ../duplicity/commandline.py:608
1586 msgid "Commands:"
1587 msgstr ""
1588
1589 #. Header in usage help
1590-#: ../duplicity/commandline.py:584
1591+#: ../duplicity/commandline.py:622
1592 msgid "Options:"
1593 msgstr ""
1594
1595 #. In this portion of the usage instructions, "[ewnid]" indicates which
1596 #. characters are permitted (e, w, n, i, or d); the brackets imply their own
1597 #. meaning in regex; i.e., only one of the characters is allowed in an instance.
1598-#: ../duplicity/commandline.py:638
1599+#: ../duplicity/commandline.py:676
1600 msgid ""
1601 " Verbosity must be one of: digit [0-9], character [ewnid],\n"
1602 " or word ['error', 'warning', 'notice', 'info', 'debug'].\n"
1603@@ -596,36 +820,36 @@
1604 " that verbosity level is set at 2 (Warning) or higher.\n"
1605 msgstr ""
1606
1607-#: ../duplicity/commandline.py:664
1608+#: ../duplicity/commandline.py:702
1609 #, python-format
1610 msgid "Specified archive directory '%s' does not exist, or is not a directory"
1611 msgstr ""
1612
1613-#: ../duplicity/commandline.py:673
1614+#: ../duplicity/commandline.py:711
1615 #, python-format
1616 msgid ""
1617 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
1618 "Received '%s' instead."
1619 msgstr ""
1620
1621-#: ../duplicity/commandline.py:731
1622+#: ../duplicity/commandline.py:769
1623 #, python-format
1624 msgid ""
1625 "Restore destination directory %s already exists.\n"
1626 "Will not overwrite."
1627 msgstr ""
1628
1629-#: ../duplicity/commandline.py:736
1630+#: ../duplicity/commandline.py:774
1631 #, python-format
1632 msgid "Verify directory %s does not exist"
1633 msgstr ""
1634
1635-#: ../duplicity/commandline.py:742
1636+#: ../duplicity/commandline.py:780
1637 #, python-format
1638 msgid "Backup source directory %s does not exist."
1639 msgstr ""
1640
1641-#: ../duplicity/commandline.py:817
1642+#: ../duplicity/commandline.py:855
1643 #, python-format
1644 msgid ""
1645 "Bad URL '%s'.\n"
1646@@ -633,7 +857,7 @@
1647 "\"file:///usr/local\". See the man page for more information."
1648 msgstr ""
1649
1650-#: ../duplicity/commandline.py:842
1651+#: ../duplicity/commandline.py:880
1652 msgid "Main action: "
1653 msgstr ""
1654
1655@@ -662,17 +886,11 @@
1656 msgid "Comparing %s and %s"
1657 msgstr ""
1658
1659-#. but signature says it did
1660 #: ../duplicity/diffdir.py:199
1661 #, python-format
1662 msgid "D %s"
1663 msgstr ""
1664
1665-#: ../duplicity/dup_temp.py:239
1666-#, python-format
1667-msgid "Failed to read %s: %s"
1668-msgstr ""
1669-
1670 #: ../duplicity/dup_time.py:48
1671 #, python-format
1672 msgid ""
1673@@ -735,39 +953,39 @@
1674 "seeing this message"
1675 msgstr ""
1676
1677-#: ../duplicity/manifest.py:181
1678+#: ../duplicity/manifest.py:193
1679 msgid "Manifests not equal because different volume numbers"
1680 msgstr ""
1681
1682-#: ../duplicity/manifest.py:186
1683+#: ../duplicity/manifest.py:198
1684 msgid "Manifests not equal because volume lists differ"
1685 msgstr ""
1686
1687-#: ../duplicity/manifest.py:191
1688+#: ../duplicity/manifest.py:203
1689 msgid "Manifests not equal because hosts or directories differ"
1690 msgstr ""
1691
1692-#: ../duplicity/manifest.py:338
1693+#: ../duplicity/manifest.py:350
1694 msgid "Warning, found extra Volume identifier"
1695 msgstr ""
1696
1697-#: ../duplicity/manifest.py:364
1698+#: ../duplicity/manifest.py:376
1699 msgid "Other is not VolumeInfo"
1700 msgstr ""
1701
1702-#: ../duplicity/manifest.py:367
1703+#: ../duplicity/manifest.py:379
1704 msgid "Volume numbers don't match"
1705 msgstr ""
1706
1707-#: ../duplicity/manifest.py:370
1708+#: ../duplicity/manifest.py:382
1709 msgid "start_indicies don't match"
1710 msgstr ""
1711
1712-#: ../duplicity/manifest.py:373
1713+#: ../duplicity/manifest.py:385
1714 msgid "end_index don't match"
1715 msgstr ""
1716
1717-#: ../duplicity/manifest.py:380
1718+#: ../duplicity/manifest.py:392
1719 msgid "Hashes don't match"
1720 msgstr ""
1721
1722@@ -776,7 +994,6 @@
1723 msgid "Starting to write %s"
1724 msgstr ""
1725
1726-#. special case first index
1727 #: ../duplicity/misc.py:107
1728 #, python-format
1729 msgid ""
1730@@ -858,7 +1075,6 @@
1731 msgid "Touching %s"
1732 msgstr ""
1733
1734-#. todo: avoid circ. dep. issue
1735 #: ../duplicity/path.py:554
1736 #, python-format
1737 msgid "Deleting tree %s"
1738@@ -889,7 +1105,6 @@
1739 msgid "Error accessing possibly locked file %s"
1740 msgstr ""
1741
1742-#. base doesn't exist
1743 #: ../duplicity/selection.py:154
1744 #, python-format
1745 msgid "Warning: base %s doesn't exist, continuing"
1746
1747=== modified file 'po/eo.po'
1748--- po/eo.po 2009-07-25 22:43:44 +0000
1749+++ po/eo.po 2009-09-01 00:46:32 +0000
1750@@ -7,7 +7,7 @@
1751 msgstr ""
1752 "Project-Id-Version: duplicity\n"
1753 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
1754-"POT-Creation-Date: 2009-07-22 17:34-0700\n"
1755+"POT-Creation-Date: 2009-08-30 23:01-0700\n"
1756 "PO-Revision-Date: 2009-07-21 18:39+0000\n"
1757 "Last-Translator: Larry Gilbert <Unknown>\n"
1758 "Language-Team: Esperanto <eo@li.org>\n"
1759@@ -18,44 +18,260 @@
1760 "X-Launchpad-Export-Date: 2009-07-21 22:24+0000\n"
1761 "X-Generator: Launchpad (build Unknown)\n"
1762
1763-#: ../duplicity-bin:669
1764-#, c-format
1765+#: ../duplicity-bin:191
1766+#, python-format
1767+msgid ""
1768+"Unable to locate last file %s and block %d in backup set.\n"
1769+"Attempting restart on the next file %s."
1770+msgstr ""
1771+
1772+#: ../duplicity-bin:197
1773+#, python-format
1774+msgid ""
1775+"Unable to locate last file %s and block %d in backup set.\n"
1776+"There are no more files to be backed up."
1777+msgstr ""
1778+
1779+#: ../duplicity-bin:443
1780+msgid ""
1781+"Fatal Error: Unable to start incremental backup. Old signatures not found "
1782+"and incremental specified"
1783+msgstr ""
1784+
1785+#: ../duplicity-bin:447
1786+msgid "No signatures found, switching to full backup."
1787+msgstr ""
1788+
1789+#: ../duplicity-bin:461
1790+msgid "Backup Statistics"
1791+msgstr ""
1792+
1793+#: ../duplicity-bin:515
1794+msgid "No signature data found, unable to list files."
1795+msgstr ""
1796+
1797+#: ../duplicity-bin:544
1798+#, python-format
1799+msgid "%s not found in archive, no files restored."
1800+msgstr ""
1801+
1802+#: ../duplicity-bin:548
1803+msgid "No files found in archive - nothing restored."
1804+msgstr ""
1805+
1806+#: ../duplicity-bin:581
1807+#, python-format
1808+msgid "Processed volume %d of %d"
1809+msgstr ""
1810+
1811+#: ../duplicity-bin:621
1812+#, python-format
1813+msgid "Invalid data - %s hash mismatch:"
1814+msgstr ""
1815+
1816+#: ../duplicity-bin:622
1817+#, python-format
1818+msgid "Calculated hash: %s"
1819+msgstr ""
1820+
1821+#: ../duplicity-bin:623
1822+#, python-format
1823+msgid "Manifest hash: %s"
1824+msgstr ""
1825+
1826+#: ../duplicity-bin:640
1827+#, python-format
1828+msgid "Volume was signed by key %s, not %s"
1829+msgstr ""
1830+
1831+#: ../duplicity-bin:670
1832+#, python-format
1833+msgid "Verify complete: %s, %s."
1834+msgstr ""
1835+
1836+#: ../duplicity-bin:671
1837+#, python-format
1838 msgid "%d file compared"
1839 msgid_plural "%d files compared"
1840 msgstr[0] "Komparis %d dosieron."
1841 msgstr[1] "Komparis %d dosierojn."
1842
1843-#: ../duplicity-bin:671
1844-#, c-format
1845+#: ../duplicity-bin:673
1846+#, python-format
1847 msgid "%d difference found"
1848 msgid_plural "%d differences found"
1849 msgstr[0] "Trovis %d diferencon."
1850 msgstr[1] "Trovis %d diferencojn."
1851
1852-#: ../duplicity-bin:695
1853+#: ../duplicity-bin:692
1854+msgid "No extraneous files found, nothing deleted in cleanup."
1855+msgstr ""
1856+
1857+#: ../duplicity-bin:697
1858 msgid "Deleting this file from backend:"
1859 msgid_plural "Deleting these files from backend:"
1860 msgstr[0] ""
1861 msgstr[1] ""
1862
1863-#: ../duplicity-bin:704
1864+#: ../duplicity-bin:706
1865 msgid "Found the following file to delete:"
1866 msgid_plural "Found the following files to delete:"
1867 msgstr[0] ""
1868 msgstr[1] ""
1869
1870-#: ../duplicity-bin:762
1871+#: ../duplicity-bin:710
1872+msgid "Run duplicity again with the --force option to actually delete."
1873+msgstr ""
1874+
1875+#: ../duplicity-bin:749
1876+msgid "There are backup set(s) at time(s):"
1877+msgstr ""
1878+
1879+#: ../duplicity-bin:751
1880+msgid "Which can't be deleted because newer sets depend on them."
1881+msgstr ""
1882+
1883+#: ../duplicity-bin:755
1884+msgid ""
1885+"Current active backup chain is older than specified time. However, it will "
1886+"not be deleted. To remove all your backups, manually purge the repository."
1887+msgstr ""
1888+
1889+#: ../duplicity-bin:761
1890+msgid "No old backup sets found, nothing deleted."
1891+msgstr ""
1892+
1893+#: ../duplicity-bin:764
1894 msgid "Deleting backup set at time:"
1895 msgid_plural "Deleting backup sets at times:"
1896 msgstr[0] ""
1897 msgstr[1] ""
1898
1899-#: ../duplicity-bin:774
1900+#: ../duplicity-bin:776
1901 msgid "Found old backup set at the following time:"
1902 msgid_plural "Found old backup sets at the following times:"
1903 msgstr[0] ""
1904 msgstr[1] ""
1905
1906+#: ../duplicity-bin:780
1907+msgid "Rerun command with --force option to actually delete."
1908+msgstr ""
1909+
1910+#: ../duplicity-bin:863
1911+#, python-format
1912+msgid "Deleting local %s (not authoritative at backend)."
1913+msgstr ""
1914+
1915+#: ../duplicity-bin:888 ../duplicity/dup_temp.py:239
1916+#, python-format
1917+msgid "Failed to read %s: %s"
1918+msgstr ""
1919+
1920+#: ../duplicity-bin:899
1921+#, python-format
1922+msgid "Copying %s to local cache."
1923+msgstr ""
1924+
1925+#: ../duplicity-bin:943
1926+msgid "Local and Remote metadata are synchronized, no sync needed."
1927+msgstr ""
1928+
1929+#: ../duplicity-bin:948
1930+msgid "Synchronizing remote metadata to local cache..."
1931+msgstr ""
1932+
1933+#: ../duplicity-bin:955
1934+msgid "Sync would copy the following from remote to local:"
1935+msgstr ""
1936+
1937+#: ../duplicity-bin:958
1938+msgid "Sync would remove the following spurious local files:"
1939+msgstr ""
1940+
1941+#: ../duplicity-bin:1001
1942+msgid "Unable to get free space on temp."
1943+msgstr ""
1944+
1945+#: ../duplicity-bin:1009
1946+#, python-format
1947+msgid "Temp space has %d available, backup needs approx %d."
1948+msgstr ""
1949+
1950+#: ../duplicity-bin:1012
1951+#, python-format
1952+msgid "Temp has %d available, backup will use approx %d."
1953+msgstr ""
1954+
1955+#: ../duplicity-bin:1020
1956+msgid "Unable to get max open files."
1957+msgstr ""
1958+
1959+#: ../duplicity-bin:1024
1960+#, python-format
1961+msgid ""
1962+"Max open files of %s is too low, should be >= 1024.\n"
1963+"Use 'ulimit -n 1024' or higher to correct.\n"
1964+msgstr ""
1965+
1966+#: ../duplicity-bin:1070
1967+msgid ""
1968+"RESTART: The first volume failed to upload before termination.\n"
1969+" Restart is impossible...starting backup from beginning."
1970+msgstr ""
1971+
1972+#: ../duplicity-bin:1076
1973+#, python-format
1974+msgid ""
1975+"RESTART: Volumes %d to %d failed to upload before termination.\n"
1976+" Restarting backup at volume %d."
1977+msgstr ""
1978+
1979+#: ../duplicity-bin:1084
1980+#, python-format
1981+msgid ""
1982+"RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
1983+" Restart is impossible ... duplicity will clean off the last "
1984+"partial\n"
1985+" backup then restart the backup from the beginning."
1986+msgstr ""
1987+
1988+#: ../duplicity-bin:1162
1989+#, python-format
1990+msgid "Last %s backup left a partial set, restarting."
1991+msgstr ""
1992+
1993+#: ../duplicity-bin:1166
1994+#, python-format
1995+msgid "Cleaning up previous partial %s backup set, restarting."
1996+msgstr ""
1997+
1998+#: ../duplicity-bin:1177
1999+msgid "Last full backup date:"
2000+msgstr ""
2001+
2002+#: ../duplicity-bin:1179
2003+msgid "Last full backup date: none"
2004+msgstr ""
2005+
2006+#: ../duplicity-bin:1181
2007+msgid "Last full backup is too old, forcing full backup"
2008+msgstr ""
2009+
2010+#: ../duplicity-bin:1255
2011+#, python-format
2012+msgid "GPG error detail: %s"
2013+msgstr ""
2014+
2015+#: ../duplicity-bin:1264
2016+#, python-format
2017+msgid "User error detail: %s"
2018+msgstr ""
2019+
2020+#: ../duplicity-bin:1273
2021+#, python-format
2022+msgid "Backend error detail: %s"
2023+msgstr ""
2024+
2025 #: ../duplicity/asyncscheduler.py:69
2026 #, python-format
2027 msgid "instantiating at concurrency %d"
2028@@ -123,219 +339,218 @@
2029 msgid "Reading results of '%s'"
2030 msgstr ""
2031
2032-#: ../duplicity/collections.py:159
2033+#: ../duplicity/collections.py:176
2034 msgid "Fatal Error: No manifests found for most recent backup"
2035 msgstr ""
2036
2037-#: ../duplicity/collections.py:168
2038+#: ../duplicity/collections.py:185
2039 msgid ""
2040 "Fatal Error: Remote manifest does not match local one. Either the remote "
2041 "backup set or the local archive directory has been corrupted."
2042 msgstr ""
2043
2044-#: ../duplicity/collections.py:176
2045+#: ../duplicity/collections.py:193
2046 msgid "Fatal Error: Neither remote nor local manifest is readable."
2047 msgstr ""
2048
2049-#: ../duplicity/collections.py:280
2050+#: ../duplicity/collections.py:299
2051 msgid "Preferring Backupset over previous one!"
2052 msgstr ""
2053
2054-#: ../duplicity/collections.py:283
2055+#: ../duplicity/collections.py:302
2056 #, python-format
2057 msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)"
2058 msgstr ""
2059
2060-#: ../duplicity/collections.py:288
2061+#: ../duplicity/collections.py:307
2062 #, python-format
2063 msgid "Added incremental Backupset (start_time: %s / end_time: %s)"
2064 msgstr ""
2065
2066-#: ../duplicity/collections.py:354
2067+#: ../duplicity/collections.py:373
2068 msgid "Chain start time: "
2069 msgstr ""
2070
2071-#: ../duplicity/collections.py:355
2072+#: ../duplicity/collections.py:374
2073 msgid "Chain end time: "
2074 msgstr ""
2075
2076-#: ../duplicity/collections.py:356
2077+#: ../duplicity/collections.py:375
2078 #, python-format
2079 msgid "Number of contained backup sets: %d"
2080 msgstr ""
2081
2082-#: ../duplicity/collections.py:358
2083+#: ../duplicity/collections.py:377
2084 #, python-format
2085 msgid "Total number of contained volumes: %d"
2086 msgstr ""
2087
2088-#: ../duplicity/collections.py:360
2089+#: ../duplicity/collections.py:379
2090 msgid "Type of backup set:"
2091 msgstr ""
2092
2093-#: ../duplicity/collections.py:360
2094+#: ../duplicity/collections.py:379
2095 msgid "Time:"
2096 msgstr ""
2097
2098-#: ../duplicity/collections.py:360
2099+#: ../duplicity/collections.py:379
2100 msgid "Num volumes:"
2101 msgstr ""
2102
2103-#: ../duplicity/collections.py:364
2104+#: ../duplicity/collections.py:383
2105 msgid "Full"
2106 msgstr ""
2107
2108-#: ../duplicity/collections.py:367
2109+#: ../duplicity/collections.py:386
2110 msgid "Incremental"
2111 msgstr ""
2112
2113-#: ../duplicity/collections.py:427
2114+#: ../duplicity/collections.py:446
2115 msgid "local"
2116 msgstr ""
2117
2118-#: ../duplicity/collections.py:429
2119+#: ../duplicity/collections.py:448
2120 msgid "remote"
2121 msgstr ""
2122
2123-#: ../duplicity/collections.py:581
2124+#: ../duplicity/collections.py:600
2125 msgid "Collection Status"
2126 msgstr ""
2127
2128-#: ../duplicity/collections.py:583
2129+#: ../duplicity/collections.py:602
2130 #, python-format
2131 msgid "Connecting with backend: %s"
2132 msgstr ""
2133
2134-#: ../duplicity/collections.py:585
2135+#: ../duplicity/collections.py:604
2136 #, python-format
2137 msgid "Archive dir: %s"
2138 msgstr ""
2139
2140-#: ../duplicity/collections.py:588
2141+#: ../duplicity/collections.py:607
2142 #, python-format
2143 msgid "Found %d backup chain without signatures."
2144 msgid_plural "Found %d backup chains without signatures."
2145 msgstr[0] ""
2146 msgstr[1] ""
2147
2148-#: ../duplicity/collections.py:593
2149+#: ../duplicity/collections.py:612
2150 #, python-format
2151 msgid "Signature-less chain %d of %d:"
2152 msgstr ""
2153
2154-#: ../duplicity/collections.py:599
2155+#: ../duplicity/collections.py:618
2156 msgid "Found a complete backup chain with matching signature chain:"
2157 msgstr ""
2158
2159-#: ../duplicity/collections.py:603
2160+#: ../duplicity/collections.py:622
2161 msgid "No backup chains with active signatures found"
2162 msgstr ""
2163
2164-#: ../duplicity/collections.py:606
2165+#: ../duplicity/collections.py:625
2166 #, python-format
2167 msgid "Also found %d backup set not part of any chain,"
2168 msgid_plural "Also found %d backup sets not part of any chain,"
2169 msgstr[0] ""
2170 msgstr[1] ""
2171
2172-#: ../duplicity/collections.py:610
2173+#: ../duplicity/collections.py:629
2174 #, python-format
2175 msgid "and %d incomplete backup set."
2176 msgid_plural "and %d incomplete backup sets."
2177 msgstr[0] ""
2178 msgstr[1] ""
2179
2180-#: ../duplicity/collections.py:614
2181+#: ../duplicity/collections.py:633
2182 msgid "These may be deleted by running duplicity with the --cleanup option."
2183 msgstr ""
2184
2185-#: ../duplicity/collections.py:617
2186+#: ../duplicity/collections.py:636
2187 msgid "No orphaned or incomplete backup sets found."
2188 msgstr ""
2189
2190-#: ../duplicity/collections.py:633
2191+#: ../duplicity/collections.py:652
2192 #, python-format
2193 msgid "%d file exists on backend"
2194 msgid_plural "%d files exist on backend"
2195 msgstr[0] ""
2196 msgstr[1] ""
2197
2198-#: ../duplicity/collections.py:640
2199+#: ../duplicity/collections.py:659
2200 #, python-format
2201 msgid "%d file exists in cache"
2202 msgid_plural "%d files exist in cache"
2203 msgstr[0] ""
2204 msgstr[1] ""
2205
2206-#. It matches, remove the last backup set:
2207-#: ../duplicity/collections.py:692
2208+#: ../duplicity/collections.py:711
2209 msgid "Warning, discarding last backup set, because of missing signature file."
2210 msgstr ""
2211
2212-#: ../duplicity/collections.py:725
2213+#: ../duplicity/collections.py:744
2214 msgid "Warning, found the following local orphaned signature file:"
2215 msgid_plural "Warning, found the following local orphaned signature files:"
2216 msgstr[0] ""
2217 msgstr[1] ""
2218
2219-#: ../duplicity/collections.py:734
2220+#: ../duplicity/collections.py:753
2221 msgid "Warning, found the following remote orphaned signature file:"
2222 msgid_plural "Warning, found the following remote orphaned signature files:"
2223 msgstr[0] ""
2224 msgstr[1] ""
2225
2226-#: ../duplicity/collections.py:744
2227+#: ../duplicity/collections.py:763
2228 msgid "Warning, found an unnecessary signature chain"
2229 msgid_plural "Warning, found unnecessary signature chains"
2230 msgstr[0] ""
2231 msgstr[1] ""
2232
2233-#: ../duplicity/collections.py:752
2234+#: ../duplicity/collections.py:771
2235 msgid "Warning, found signatures but no corresponding backup files"
2236 msgstr ""
2237
2238-#: ../duplicity/collections.py:756
2239+#: ../duplicity/collections.py:775
2240 msgid ""
2241 "Warning, found incomplete backup sets, probably left from aborted session"
2242 msgstr ""
2243
2244-#: ../duplicity/collections.py:760
2245+#: ../duplicity/collections.py:779
2246 msgid "Warning, found the following orphaned backup file:"
2247 msgid_plural "Warning, found the following orphaned backup files:"
2248 msgstr[0] ""
2249 msgstr[1] ""
2250
2251-#: ../duplicity/collections.py:778
2252+#: ../duplicity/collections.py:797
2253 #, python-format
2254 msgid "Extracting backup chains from list of files: %s"
2255 msgstr ""
2256
2257-#: ../duplicity/collections.py:788
2258+#: ../duplicity/collections.py:807
2259 #, python-format
2260 msgid "File %s is part of known set"
2261 msgstr ""
2262
2263-#: ../duplicity/collections.py:791
2264+#: ../duplicity/collections.py:810
2265 #, python-format
2266 msgid "File %s is not part of a known set; creating new set"
2267 msgstr ""
2268
2269-#: ../duplicity/collections.py:796
2270+#: ../duplicity/collections.py:815
2271 #, python-format
2272 msgid "Ignoring file (rejected by backup set) '%s'"
2273 msgstr ""
2274
2275-#: ../duplicity/collections.py:809
2276+#: ../duplicity/collections.py:828
2277 #, python-format
2278 msgid "Found backup chain %s"
2279 msgstr ""
2280
2281-#: ../duplicity/collections.py:814
2282+#: ../duplicity/collections.py:833
2283 #, python-format
2284 msgid "Added set %s to pre-existing chain %s"
2285 msgstr ""
2286
2287-#: ../duplicity/collections.py:818
2288+#: ../duplicity/collections.py:837
2289 #, python-format
2290 msgid "Found orphaned set %s"
2291 msgstr ""
2292@@ -384,210 +599,219 @@
2293
2294 #. Used in usage help to represent a Unix-style path name. Example:
2295 #. rsync://user[:password]@other_host[:port]//absolute_path
2296-#: ../duplicity/commandline.py:444
2297+#: ../duplicity/commandline.py:445
2298 msgid "absolute_path"
2299 msgstr ""
2300
2301 #. Used in usage help. Example:
2302 #. tahoe://alias/some_dir
2303-#: ../duplicity/commandline.py:447
2304+#: ../duplicity/commandline.py:449
2305 msgid "alias"
2306 msgstr ""
2307
2308 #. Used in usage help (noun)
2309-#: ../duplicity/commandline.py:449
2310+#: ../duplicity/commandline.py:452
2311 msgid "backup name"
2312 msgstr ""
2313
2314-#. Used in help to represent a "bucket name" for Amazon Web Services' Simple
2315-#. Storage Service (S3). Example:
2316+#. Used in help to represent a "bucket name" for Amazon Web
2317+#. Services' Simple Storage Service (S3). Example:
2318 #. s3://other.host/bucket_name[/prefix]
2319-#: ../duplicity/commandline.py:453
2320+#: ../duplicity/commandline.py:457
2321 msgid "bucket_name"
2322 msgstr ""
2323
2324-#. Used in usage help, abbreviation for "character" (noun)
2325-#: ../duplicity/commandline.py:455
2326+#. abbreviation for "character" (noun)
2327+#: ../duplicity/commandline.py:460
2328 msgid "char"
2329 msgstr ""
2330
2331-#. Used in usage help (noun)
2332-#: ../duplicity/commandline.py:457
2333+#. noun
2334+#: ../duplicity/commandline.py:463
2335 msgid "command"
2336 msgstr ""
2337
2338-#. Used in usage help to represent the name of a container in Amazon Web Services'
2339-#. Cloudfront. Example:
2340+#. Used in usage help to represent the name of a container in
2341+#. Amazon Web Services' Cloudfront. Example:
2342 #. cf+http://container_name
2343-#: ../duplicity/commandline.py:461
2344+#: ../duplicity/commandline.py:468
2345 msgid "container_name"
2346 msgstr ""
2347
2348-#. Used in usage help (noun)
2349-#: ../duplicity/commandline.py:463
2350+#. noun
2351+#: ../duplicity/commandline.py:471
2352 msgid "count"
2353 msgstr ""
2354
2355 #. Used in usage help to represent the name of a file directory
2356-#: ../duplicity/commandline.py:465
2357+#: ../duplicity/commandline.py:474
2358 msgid "directory"
2359 msgstr ""
2360
2361 #. Used in usage help to represent the name of a file. Example:
2362 #. --log-file <filename>
2363-#: ../duplicity/commandline.py:468
2364+#: ../duplicity/commandline.py:478
2365 msgid "filename"
2366 msgstr ""
2367
2368 #. Used in usage help to represent an ID for a GnuPG key. Example:
2369 #. --encrypt-key <gpg_key_id>
2370-#: ../duplicity/commandline.py:471
2371+#: ../duplicity/commandline.py:482
2372 msgid "gpg-key-id"
2373 msgstr ""
2374
2375-#. Used in usage help, e.g. to represent the name of a code module. Example:
2376+#. Used in usage help, e.g. to represent the name of a code
2377+#. module. Example:
2378 #. rsync://user[:password]@other.host[:port]::/module/some_dir
2379-#: ../duplicity/commandline.py:474
2380+#: ../duplicity/commandline.py:487
2381 msgid "module"
2382 msgstr ""
2383
2384-#. Used in usage help to represent a desired number of something. Example:
2385+#. Used in usage help to represent a desired number of
2386+#. something. Example:
2387 #. --num-retries <number>
2388-#: ../duplicity/commandline.py:477
2389+#: ../duplicity/commandline.py:492
2390 msgid "number"
2391 msgstr ""
2392
2393-#. Used in usage help. (Should be consistent with the "Options:" header.)
2394-#. Example:
2395+#. Used in usage help. (Should be consistent with the "Options:"
2396+#. header.) Example:
2397 #. duplicity [full|incremental] [options] source_dir target_url
2398-#: ../duplicity/commandline.py:481
2399+#: ../duplicity/commandline.py:497
2400 msgid "options"
2401 msgstr ""
2402
2403 #. Used in usage help to represent an internet hostname. Example:
2404 #. ftp://user[:password]@other.host[:port]/some_dir
2405-#: ../duplicity/commandline.py:484
2406+#: ../duplicity/commandline.py:501
2407 msgid "other.host"
2408 msgstr ""
2409
2410 #. Used in usage help. Example:
2411-#: ../duplicity/commandline.py:486
2412+#. ftp://user[:password]@other.host[:port]/some_dir
2413+#: ../duplicity/commandline.py:505
2414 msgid "password"
2415 msgstr ""
2416
2417 #. Used in usage help to represent a Unix-style path name. Example:
2418 #. --archive-dir <path>
2419-#: ../duplicity/commandline.py:489
2420+#: ../duplicity/commandline.py:509
2421 msgid "path"
2422 msgstr ""
2423
2424 #. Used in usage help to represent a TCP port number. Example:
2425 #. ftp://user[:password]@other.host[:port]/some_dir
2426-#: ../duplicity/commandline.py:492
2427+#: ../duplicity/commandline.py:513
2428 msgid "port"
2429 msgstr ""
2430
2431-#. Used in usage help. This represents a string to be used as a prefix to
2432-#. names for backup files created by Duplicity. Example:
2433+#. Used in usage help. This represents a string to be used as a
2434+#. prefix to names for backup files created by Duplicity. Example:
2435 #. s3://other.host/bucket_name[/prefix]
2436-#: ../duplicity/commandline.py:496
2437+#: ../duplicity/commandline.py:518
2438 msgid "prefix"
2439 msgstr ""
2440
2441 #. Used in usage help to represent a Unix-style path name. Example:
2442 #. rsync://user[:password]@other.host[:port]/relative_path
2443-#: ../duplicity/commandline.py:499
2444+#: ../duplicity/commandline.py:522
2445 msgid "relative_path"
2446 msgstr ""
2447
2448 #. Used in usage help. Example:
2449 #. --timeout <seconds>
2450-#: ../duplicity/commandline.py:502
2451+#: ../duplicity/commandline.py:526
2452 msgid "seconds"
2453 msgstr ""
2454
2455-#. Used in usage help to represent a "glob" style pattern for matching one or
2456-#. more files, as described in the documentation. Example:
2457-#. --exclude <%shell_pattern>
2458-#: ../duplicity/commandline.py:506
2459+#. Used in usage help to represent a "glob" style pattern for
2460+#. matching one or more files, as described in the documentation.
2461+#. Example:
2462+#. --exclude <shell_pattern>
2463+#: ../duplicity/commandline.py:532
2464 msgid "shell_pattern"
2465 msgstr ""
2466
2467-#. Used in usage help to represent the name of a single file directory or a
2468-#. Unix-style path to a directory. Example:
2469-#. file:///%(x_some_dir)s
2470-#: ../duplicity/commandline.py:510
2471+#. Used in usage help to represent the name of a single file
2472+#. directory or a Unix-style path to a directory. Example:
2473+#. file:///some_dir
2474+#: ../duplicity/commandline.py:537
2475 msgid "some_dir"
2476 msgstr ""
2477
2478-#. Used in usage help to represent the name of a single file directory or a
2479-#. Unix-style path to a directory where files will be coming FROM. Example:
2480+#. Used in usage help to represent the name of a single file
2481+#. directory or a Unix-style path to a directory where files will be
2482+#. coming FROM. Example:
2483 #. duplicity [full|incremental] [options] source_dir target_url
2484-#: ../duplicity/commandline.py:514
2485+#: ../duplicity/commandline.py:543
2486 msgid "source_dir"
2487 msgstr ""
2488
2489-#. Used in usage help to represent a URL files will be coming FROM. Example:
2490+#. Used in usage help to represent a URL files will be coming
2491+#. FROM. Example:
2492 #. duplicity [restore] [options] source_url target_dir
2493-#: ../duplicity/commandline.py:517
2494+#: ../duplicity/commandline.py:548
2495 msgid "source_url"
2496 msgstr ""
2497
2498-#. Used in usage help to represent the name of a single file directory or a
2499-#. Unix-style path to a directory. where files will be going TO. Example:
2500+#. Used in usage help to represent the name of a single file
2501+#. directory or a Unix-style path to a directory. where files will be
2502+#. going TO. Example:
2503 #. duplicity [restore] [options] source_url target_dir
2504-#: ../duplicity/commandline.py:521
2505+#: ../duplicity/commandline.py:554
2506 msgid "target_dir"
2507 msgstr ""
2508
2509-#. Used in usage help to represent a URL files will be going TO. Example:
2510+#. Used in usage help to represent a URL files will be going TO.
2511+#. Example:
2512 #. duplicity [full|incremental] [options] source_dir target_url
2513-#: ../duplicity/commandline.py:524
2514+#: ../duplicity/commandline.py:559
2515 msgid "target_url"
2516 msgstr ""
2517
2518-#. Used in usage help to represent a time spec for a previous point in time,
2519-#. as described in the documentation. Example:
2520+#. Used in usage help to represent a time spec for a previous
2521+#. point in time, as described in the documentation. Example:
2522 #. duplicity remove-older-than time [options] target_url
2523-#: ../duplicity/commandline.py:528
2524+#: ../duplicity/commandline.py:564
2525 msgid "time"
2526 msgstr ""
2527
2528-#. Used in usage help to represent a user name (i.e. login). Example:
2529+#. Used in usage help to represent a user name (i.e. login).
2530+#. Example:
2531 #. ftp://user[:password]@other.host[:port]/some_dir
2532-#: ../duplicity/commandline.py:531
2533+#: ../duplicity/commandline.py:569
2534 msgid "user"
2535 msgstr ""
2536
2537-#: ../duplicity/commandline.py:533
2538+#: ../duplicity/commandline.py:571
2539 #, python-format
2540 msgid "duplicity version %s running on %s."
2541 msgstr ""
2542
2543 #. Header in usage help
2544-#: ../duplicity/commandline.py:537
2545+#: ../duplicity/commandline.py:575
2546 msgid "Usage:"
2547 msgstr ""
2548
2549 #. Header in usage help
2550-#: ../duplicity/commandline.py:550
2551+#: ../duplicity/commandline.py:588
2552 msgid "Backends and their URL formats:"
2553 msgstr ""
2554
2555 #. Header in usage help
2556-#: ../duplicity/commandline.py:570
2557+#: ../duplicity/commandline.py:608
2558 msgid "Commands:"
2559 msgstr ""
2560
2561 #. Header in usage help
2562-#: ../duplicity/commandline.py:584
2563+#: ../duplicity/commandline.py:622
2564 msgid "Options:"
2565 msgstr ""
2566
2567 #. In this portion of the usage instructions, "[ewnid]" indicates which
2568 #. characters are permitted (e, w, n, i, or d); the brackets imply their own
2569 #. meaning in regex; i.e., only one of the characters is allowed in an instance.
2570-#: ../duplicity/commandline.py:638
2571+#: ../duplicity/commandline.py:676
2572 msgid ""
2573 " Verbosity must be one of: digit [0-9], character [ewnid],\n"
2574 " or word ['error', 'warning', 'notice', 'info', 'debug'].\n"
2575@@ -595,36 +819,36 @@
2576 " that verbosity level is set at 2 (Warning) or higher.\n"
2577 msgstr ""
2578
2579-#: ../duplicity/commandline.py:664
2580+#: ../duplicity/commandline.py:702
2581 #, python-format
2582 msgid "Specified archive directory '%s' does not exist, or is not a directory"
2583 msgstr ""
2584
2585-#: ../duplicity/commandline.py:673
2586+#: ../duplicity/commandline.py:711
2587 #, python-format
2588 msgid ""
2589 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
2590 "Received '%s' instead."
2591 msgstr ""
2592
2593-#: ../duplicity/commandline.py:731
2594+#: ../duplicity/commandline.py:769
2595 #, python-format
2596 msgid ""
2597 "Restore destination directory %s already exists.\n"
2598 "Will not overwrite."
2599 msgstr ""
2600
2601-#: ../duplicity/commandline.py:736
2602+#: ../duplicity/commandline.py:774
2603 #, python-format
2604 msgid "Verify directory %s does not exist"
2605 msgstr ""
2606
2607-#: ../duplicity/commandline.py:742
2608+#: ../duplicity/commandline.py:780
2609 #, python-format
2610 msgid "Backup source directory %s does not exist."
2611 msgstr ""
2612
2613-#: ../duplicity/commandline.py:817
2614+#: ../duplicity/commandline.py:855
2615 #, python-format
2616 msgid ""
2617 "Bad URL '%s'.\n"
2618@@ -632,7 +856,7 @@
2619 "\"file:///usr/local\". See the man page for more information."
2620 msgstr ""
2621
2622-#: ../duplicity/commandline.py:842
2623+#: ../duplicity/commandline.py:880
2624 msgid "Main action: "
2625 msgstr ""
2626
2627@@ -661,17 +885,11 @@
2628 msgid "Comparing %s and %s"
2629 msgstr ""
2630
2631-#. but signature says it did
2632 #: ../duplicity/diffdir.py:199
2633 #, python-format
2634 msgid "D %s"
2635 msgstr ""
2636
2637-#: ../duplicity/dup_temp.py:239
2638-#, python-format
2639-msgid "Failed to read %s: %s"
2640-msgstr ""
2641-
2642 #: ../duplicity/dup_time.py:48
2643 #, python-format
2644 msgid ""
2645@@ -734,39 +952,39 @@
2646 "seeing this message"
2647 msgstr ""
2648
2649-#: ../duplicity/manifest.py:181
2650+#: ../duplicity/manifest.py:193
2651 msgid "Manifests not equal because different volume numbers"
2652 msgstr ""
2653
2654-#: ../duplicity/manifest.py:186
2655+#: ../duplicity/manifest.py:198
2656 msgid "Manifests not equal because volume lists differ"
2657 msgstr ""
2658
2659-#: ../duplicity/manifest.py:191
2660+#: ../duplicity/manifest.py:203
2661 msgid "Manifests not equal because hosts or directories differ"
2662 msgstr ""
2663
2664-#: ../duplicity/manifest.py:338
2665+#: ../duplicity/manifest.py:350
2666 msgid "Warning, found extra Volume identifier"
2667 msgstr ""
2668
2669-#: ../duplicity/manifest.py:364
2670+#: ../duplicity/manifest.py:376
2671 msgid "Other is not VolumeInfo"
2672 msgstr ""
2673
2674-#: ../duplicity/manifest.py:367
2675+#: ../duplicity/manifest.py:379
2676 msgid "Volume numbers don't match"
2677 msgstr ""
2678
2679-#: ../duplicity/manifest.py:370
2680+#: ../duplicity/manifest.py:382
2681 msgid "start_indicies don't match"
2682 msgstr ""
2683
2684-#: ../duplicity/manifest.py:373
2685+#: ../duplicity/manifest.py:385
2686 msgid "end_index don't match"
2687 msgstr ""
2688
2689-#: ../duplicity/manifest.py:380
2690+#: ../duplicity/manifest.py:392
2691 msgid "Hashes don't match"
2692 msgstr ""
2693
2694@@ -775,7 +993,6 @@
2695 msgid "Starting to write %s"
2696 msgstr ""
2697
2698-#. special case first index
2699 #: ../duplicity/misc.py:107
2700 #, python-format
2701 msgid ""
2702@@ -857,7 +1074,6 @@
2703 msgid "Touching %s"
2704 msgstr ""
2705
2706-#. todo: avoid circ. dep. issue
2707 #: ../duplicity/path.py:554
2708 #, python-format
2709 msgid "Deleting tree %s"
2710@@ -888,7 +1104,6 @@
2711 msgid "Error accessing possibly locked file %s"
2712 msgstr ""
2713
2714-#. base doesn't exist
2715 #: ../duplicity/selection.py:154
2716 #, python-format
2717 msgid "Warning: base %s doesn't exist, continuing"
2718
2719=== modified file 'po/io.po'
2720--- po/io.po 2009-07-25 22:43:44 +0000
2721+++ po/io.po 2009-09-01 00:46:32 +0000
2722@@ -7,7 +7,7 @@
2723 msgstr ""
2724 "Project-Id-Version: duplicity 0.5.03\n"
2725 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
2726-"POT-Creation-Date: 2009-07-22 17:34-0700\n"
2727+"POT-Creation-Date: 2009-08-30 23:01-0700\n"
2728 "PO-Revision-Date: 2009-07-03 14:45+0000\n"
2729 "Last-Translator: Michael Terry <michael.terry@canonical.com>\n"
2730 "Language-Team: Ido\n"
2731@@ -18,44 +18,260 @@
2732 "X-Launchpad-Export-Date: 2009-07-21 22:24+0000\n"
2733 "X-Generator: Launchpad (build Unknown)\n"
2734
2735-#: ../duplicity-bin:669
2736-#, c-format
2737+#: ../duplicity-bin:191
2738+#, python-format
2739+msgid ""
2740+"Unable to locate last file %s and block %d in backup set.\n"
2741+"Attempting restart on the next file %s."
2742+msgstr ""
2743+
2744+#: ../duplicity-bin:197
2745+#, python-format
2746+msgid ""
2747+"Unable to locate last file %s and block %d in backup set.\n"
2748+"There are no more files to be backed up."
2749+msgstr ""
2750+
2751+#: ../duplicity-bin:443
2752+msgid ""
2753+"Fatal Error: Unable to start incremental backup. Old signatures not found "
2754+"and incremental specified"
2755+msgstr ""
2756+
2757+#: ../duplicity-bin:447
2758+msgid "No signatures found, switching to full backup."
2759+msgstr ""
2760+
2761+#: ../duplicity-bin:461
2762+msgid "Backup Statistics"
2763+msgstr ""
2764+
2765+#: ../duplicity-bin:515
2766+msgid "No signature data found, unable to list files."
2767+msgstr ""
2768+
2769+#: ../duplicity-bin:544
2770+#, python-format
2771+msgid "%s not found in archive, no files restored."
2772+msgstr ""
2773+
2774+#: ../duplicity-bin:548
2775+msgid "No files found in archive - nothing restored."
2776+msgstr ""
2777+
2778+#: ../duplicity-bin:581
2779+#, python-format
2780+msgid "Processed volume %d of %d"
2781+msgstr ""
2782+
2783+#: ../duplicity-bin:621
2784+#, python-format
2785+msgid "Invalid data - %s hash mismatch:"
2786+msgstr ""
2787+
2788+#: ../duplicity-bin:622
2789+#, python-format
2790+msgid "Calculated hash: %s"
2791+msgstr ""
2792+
2793+#: ../duplicity-bin:623
2794+#, python-format
2795+msgid "Manifest hash: %s"
2796+msgstr ""
2797+
2798+#: ../duplicity-bin:640
2799+#, python-format
2800+msgid "Volume was signed by key %s, not %s"
2801+msgstr ""
2802+
2803+#: ../duplicity-bin:670
2804+#, python-format
2805+msgid "Verify complete: %s, %s."
2806+msgstr ""
2807+
2808+#: ../duplicity-bin:671
2809+#, python-format
2810 msgid "%d file compared"
2811 msgid_plural "%d files compared"
2812 msgstr[0] "%d dokumento esis komparar"
2813 msgstr[1] "%d dokumenti esis komparar"
2814
2815-#: ../duplicity-bin:671
2816-#, c-format
2817+#: ../duplicity-bin:673
2818+#, python-format
2819 msgid "%d difference found"
2820 msgid_plural "%d differences found"
2821 msgstr[0] ""
2822 msgstr[1] ""
2823
2824-#: ../duplicity-bin:695
2825+#: ../duplicity-bin:692
2826+msgid "No extraneous files found, nothing deleted in cleanup."
2827+msgstr ""
2828+
2829+#: ../duplicity-bin:697
2830 msgid "Deleting this file from backend:"
2831 msgid_plural "Deleting these files from backend:"
2832 msgstr[0] ""
2833 msgstr[1] ""
2834
2835-#: ../duplicity-bin:704
2836+#: ../duplicity-bin:706
2837 msgid "Found the following file to delete:"
2838 msgid_plural "Found the following files to delete:"
2839 msgstr[0] ""
2840 msgstr[1] ""
2841
2842-#: ../duplicity-bin:762
2843+#: ../duplicity-bin:710
2844+msgid "Run duplicity again with the --force option to actually delete."
2845+msgstr ""
2846+
2847+#: ../duplicity-bin:749
2848+msgid "There are backup set(s) at time(s):"
2849+msgstr ""
2850+
2851+#: ../duplicity-bin:751
2852+msgid "Which can't be deleted because newer sets depend on them."
2853+msgstr ""
2854+
2855+#: ../duplicity-bin:755
2856+msgid ""
2857+"Current active backup chain is older than specified time. However, it will "
2858+"not be deleted. To remove all your backups, manually purge the repository."
2859+msgstr ""
2860+
2861+#: ../duplicity-bin:761
2862+msgid "No old backup sets found, nothing deleted."
2863+msgstr ""
2864+
2865+#: ../duplicity-bin:764
2866 msgid "Deleting backup set at time:"
2867 msgid_plural "Deleting backup sets at times:"
2868 msgstr[0] ""
2869 msgstr[1] ""
2870
2871-#: ../duplicity-bin:774
2872+#: ../duplicity-bin:776
2873 msgid "Found old backup set at the following time:"
2874 msgid_plural "Found old backup sets at the following times:"
2875 msgstr[0] ""
2876 msgstr[1] ""
2877
2878+#: ../duplicity-bin:780
2879+msgid "Rerun command with --force option to actually delete."
2880+msgstr ""
2881+
2882+#: ../duplicity-bin:863
2883+#, python-format
2884+msgid "Deleting local %s (not authoritative at backend)."
2885+msgstr ""
2886+
2887+#: ../duplicity-bin:888 ../duplicity/dup_temp.py:239
2888+#, python-format
2889+msgid "Failed to read %s: %s"
2890+msgstr ""
2891+
2892+#: ../duplicity-bin:899
2893+#, python-format
2894+msgid "Copying %s to local cache."
2895+msgstr ""
2896+
2897+#: ../duplicity-bin:943
2898+msgid "Local and Remote metadata are synchronized, no sync needed."
2899+msgstr ""
2900+
2901+#: ../duplicity-bin:948
2902+msgid "Synchronizing remote metadata to local cache..."
2903+msgstr ""
2904+
2905+#: ../duplicity-bin:955
2906+msgid "Sync would copy the following from remote to local:"
2907+msgstr ""
2908+
2909+#: ../duplicity-bin:958
2910+msgid "Sync would remove the following spurious local files:"
2911+msgstr ""
2912+
2913+#: ../duplicity-bin:1001
2914+msgid "Unable to get free space on temp."
2915+msgstr ""
2916+
2917+#: ../duplicity-bin:1009
2918+#, python-format
2919+msgid "Temp space has %d available, backup needs approx %d."
2920+msgstr ""
2921+
2922+#: ../duplicity-bin:1012
2923+#, python-format
2924+msgid "Temp has %d available, backup will use approx %d."
2925+msgstr ""
2926+
2927+#: ../duplicity-bin:1020
2928+msgid "Unable to get max open files."
2929+msgstr ""
2930+
2931+#: ../duplicity-bin:1024
2932+#, python-format
2933+msgid ""
2934+"Max open files of %s is too low, should be >= 1024.\n"
2935+"Use 'ulimit -n 1024' or higher to correct.\n"
2936+msgstr ""
2937+
2938+#: ../duplicity-bin:1070
2939+msgid ""
2940+"RESTART: The first volume failed to upload before termination.\n"
2941+" Restart is impossible...starting backup from beginning."
2942+msgstr ""
2943+
2944+#: ../duplicity-bin:1076
2945+#, python-format
2946+msgid ""
2947+"RESTART: Volumes %d to %d failed to upload before termination.\n"
2948+" Restarting backup at volume %d."
2949+msgstr ""
2950+
2951+#: ../duplicity-bin:1084
2952+#, python-format
2953+msgid ""
2954+"RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
2955+" Restart is impossible ... duplicity will clean off the last "
2956+"partial\n"
2957+" backup then restart the backup from the beginning."
2958+msgstr ""
2959+
2960+#: ../duplicity-bin:1162
2961+#, python-format
2962+msgid "Last %s backup left a partial set, restarting."
2963+msgstr ""
2964+
2965+#: ../duplicity-bin:1166
2966+#, python-format
2967+msgid "Cleaning up previous partial %s backup set, restarting."
2968+msgstr ""
2969+
2970+#: ../duplicity-bin:1177
2971+msgid "Last full backup date:"
2972+msgstr ""
2973+
2974+#: ../duplicity-bin:1179
2975+msgid "Last full backup date: none"
2976+msgstr ""
2977+
2978+#: ../duplicity-bin:1181
2979+msgid "Last full backup is too old, forcing full backup"
2980+msgstr ""
2981+
2982+#: ../duplicity-bin:1255
2983+#, python-format
2984+msgid "GPG error detail: %s"
2985+msgstr ""
2986+
2987+#: ../duplicity-bin:1264
2988+#, python-format
2989+msgid "User error detail: %s"
2990+msgstr ""
2991+
2992+#: ../duplicity-bin:1273
2993+#, python-format
2994+msgid "Backend error detail: %s"
2995+msgstr ""
2996+
2997 #: ../duplicity/asyncscheduler.py:69
2998 #, python-format
2999 msgid "instantiating at concurrency %d"
3000@@ -123,219 +339,218 @@
3001 msgid "Reading results of '%s'"
3002 msgstr ""
3003
3004-#: ../duplicity/collections.py:159
3005+#: ../duplicity/collections.py:176
3006 msgid "Fatal Error: No manifests found for most recent backup"
3007 msgstr ""
3008
3009-#: ../duplicity/collections.py:168
3010+#: ../duplicity/collections.py:185
3011 msgid ""
3012 "Fatal Error: Remote manifest does not match local one. Either the remote "
3013 "backup set or the local archive directory has been corrupted."
3014 msgstr ""
3015
3016-#: ../duplicity/collections.py:176
3017+#: ../duplicity/collections.py:193
3018 msgid "Fatal Error: Neither remote nor local manifest is readable."
3019 msgstr ""
3020
3021-#: ../duplicity/collections.py:280
3022+#: ../duplicity/collections.py:299
3023 msgid "Preferring Backupset over previous one!"
3024 msgstr ""
3025
3026-#: ../duplicity/collections.py:283
3027+#: ../duplicity/collections.py:302
3028 #, python-format
3029 msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)"
3030 msgstr ""
3031
3032-#: ../duplicity/collections.py:288
3033+#: ../duplicity/collections.py:307
3034 #, python-format
3035 msgid "Added incremental Backupset (start_time: %s / end_time: %s)"
3036 msgstr ""
3037
3038-#: ../duplicity/collections.py:354
3039+#: ../duplicity/collections.py:373
3040 msgid "Chain start time: "
3041 msgstr ""
3042
3043-#: ../duplicity/collections.py:355
3044+#: ../duplicity/collections.py:374
3045 msgid "Chain end time: "
3046 msgstr ""
3047
3048-#: ../duplicity/collections.py:356
3049+#: ../duplicity/collections.py:375
3050 #, python-format
3051 msgid "Number of contained backup sets: %d"
3052 msgstr ""
3053
3054-#: ../duplicity/collections.py:358
3055+#: ../duplicity/collections.py:377
3056 #, python-format
3057 msgid "Total number of contained volumes: %d"
3058 msgstr ""
3059
3060-#: ../duplicity/collections.py:360
3061+#: ../duplicity/collections.py:379
3062 msgid "Type of backup set:"
3063 msgstr ""
3064
3065-#: ../duplicity/collections.py:360
3066+#: ../duplicity/collections.py:379
3067 msgid "Time:"
3068 msgstr "Tempo:"
3069
3070-#: ../duplicity/collections.py:360
3071+#: ../duplicity/collections.py:379
3072 msgid "Num volumes:"
3073 msgstr ""
3074
3075-#: ../duplicity/collections.py:364
3076+#: ../duplicity/collections.py:383
3077 msgid "Full"
3078 msgstr "Integra"
3079
3080-#: ../duplicity/collections.py:367
3081+#: ../duplicity/collections.py:386
3082 msgid "Incremental"
3083 msgstr ""
3084
3085-#: ../duplicity/collections.py:427
3086+#: ../duplicity/collections.py:446
3087 msgid "local"
3088 msgstr ""
3089
3090-#: ../duplicity/collections.py:429
3091+#: ../duplicity/collections.py:448
3092 msgid "remote"
3093 msgstr ""
3094
3095-#: ../duplicity/collections.py:581
3096+#: ../duplicity/collections.py:600
3097 msgid "Collection Status"
3098 msgstr ""
3099
3100-#: ../duplicity/collections.py:583
3101+#: ../duplicity/collections.py:602
3102 #, python-format
3103 msgid "Connecting with backend: %s"
3104 msgstr ""
3105
3106-#: ../duplicity/collections.py:585
3107+#: ../duplicity/collections.py:604
3108 #, python-format
3109 msgid "Archive dir: %s"
3110 msgstr ""
3111
3112-#: ../duplicity/collections.py:588
3113+#: ../duplicity/collections.py:607
3114 #, python-format
3115 msgid "Found %d backup chain without signatures."
3116 msgid_plural "Found %d backup chains without signatures."
3117 msgstr[0] ""
3118 msgstr[1] ""
3119
3120-#: ../duplicity/collections.py:593
3121+#: ../duplicity/collections.py:612
3122 #, python-format
3123 msgid "Signature-less chain %d of %d:"
3124 msgstr ""
3125
3126-#: ../duplicity/collections.py:599
3127+#: ../duplicity/collections.py:618
3128 msgid "Found a complete backup chain with matching signature chain:"
3129 msgstr ""
3130
3131-#: ../duplicity/collections.py:603
3132+#: ../duplicity/collections.py:622
3133 msgid "No backup chains with active signatures found"
3134 msgstr ""
3135
3136-#: ../duplicity/collections.py:606
3137+#: ../duplicity/collections.py:625
3138 #, python-format
3139 msgid "Also found %d backup set not part of any chain,"
3140 msgid_plural "Also found %d backup sets not part of any chain,"
3141 msgstr[0] ""
3142 msgstr[1] ""
3143
3144-#: ../duplicity/collections.py:610
3145+#: ../duplicity/collections.py:629
3146 #, python-format
3147 msgid "and %d incomplete backup set."
3148 msgid_plural "and %d incomplete backup sets."
3149 msgstr[0] ""
3150 msgstr[1] ""
3151
3152-#: ../duplicity/collections.py:614
3153+#: ../duplicity/collections.py:633
3154 msgid "These may be deleted by running duplicity with the --cleanup option."
3155 msgstr ""
3156
3157-#: ../duplicity/collections.py:617
3158+#: ../duplicity/collections.py:636
3159 msgid "No orphaned or incomplete backup sets found."
3160 msgstr ""
3161
3162-#: ../duplicity/collections.py:633
3163+#: ../duplicity/collections.py:652
3164 #, python-format
3165 msgid "%d file exists on backend"
3166 msgid_plural "%d files exist on backend"
3167 msgstr[0] ""
3168 msgstr[1] ""
3169
3170-#: ../duplicity/collections.py:640
3171+#: ../duplicity/collections.py:659
3172 #, python-format
3173 msgid "%d file exists in cache"
3174 msgid_plural "%d files exist in cache"
3175 msgstr[0] ""
3176 msgstr[1] ""
3177
3178-#. It matches, remove the last backup set:
3179-#: ../duplicity/collections.py:692
3180+#: ../duplicity/collections.py:711
3181 msgid "Warning, discarding last backup set, because of missing signature file."
3182 msgstr ""
3183
3184-#: ../duplicity/collections.py:725
3185+#: ../duplicity/collections.py:744
3186 msgid "Warning, found the following local orphaned signature file:"
3187 msgid_plural "Warning, found the following local orphaned signature files:"
3188 msgstr[0] ""
3189 msgstr[1] ""
3190
3191-#: ../duplicity/collections.py:734
3192+#: ../duplicity/collections.py:753
3193 msgid "Warning, found the following remote orphaned signature file:"
3194 msgid_plural "Warning, found the following remote orphaned signature files:"
3195 msgstr[0] ""
3196 msgstr[1] ""
3197
3198-#: ../duplicity/collections.py:744
3199+#: ../duplicity/collections.py:763
3200 msgid "Warning, found an unnecessary signature chain"
3201 msgid_plural "Warning, found unnecessary signature chains"
3202 msgstr[0] ""
3203 msgstr[1] ""
3204
3205-#: ../duplicity/collections.py:752
3206+#: ../duplicity/collections.py:771
3207 msgid "Warning, found signatures but no corresponding backup files"
3208 msgstr ""
3209
3210-#: ../duplicity/collections.py:756
3211+#: ../duplicity/collections.py:775
3212 msgid ""
3213 "Warning, found incomplete backup sets, probably left from aborted session"
3214 msgstr ""
3215
3216-#: ../duplicity/collections.py:760
3217+#: ../duplicity/collections.py:779
3218 msgid "Warning, found the following orphaned backup file:"
3219 msgid_plural "Warning, found the following orphaned backup files:"
3220 msgstr[0] ""
3221 msgstr[1] ""
3222
3223-#: ../duplicity/collections.py:778
3224+#: ../duplicity/collections.py:797
3225 #, python-format
3226 msgid "Extracting backup chains from list of files: %s"
3227 msgstr ""
3228
3229-#: ../duplicity/collections.py:788
3230+#: ../duplicity/collections.py:807
3231 #, python-format
3232 msgid "File %s is part of known set"
3233 msgstr ""
3234
3235-#: ../duplicity/collections.py:791
3236+#: ../duplicity/collections.py:810
3237 #, python-format
3238 msgid "File %s is not part of a known set; creating new set"
3239 msgstr ""
3240
3241-#: ../duplicity/collections.py:796
3242+#: ../duplicity/collections.py:815
3243 #, python-format
3244 msgid "Ignoring file (rejected by backup set) '%s'"
3245 msgstr ""
3246
3247-#: ../duplicity/collections.py:809
3248+#: ../duplicity/collections.py:828
3249 #, python-format
3250 msgid "Found backup chain %s"
3251 msgstr ""
3252
3253-#: ../duplicity/collections.py:814
3254+#: ../duplicity/collections.py:833
3255 #, python-format
3256 msgid "Added set %s to pre-existing chain %s"
3257 msgstr ""
3258
3259-#: ../duplicity/collections.py:818
3260+#: ../duplicity/collections.py:837
3261 #, python-format
3262 msgid "Found orphaned set %s"
3263 msgstr ""
3264@@ -384,210 +599,219 @@
3265
3266 #. Used in usage help to represent a Unix-style path name. Example:
3267 #. rsync://user[:password]@other_host[:port]//absolute_path
3268-#: ../duplicity/commandline.py:444
3269+#: ../duplicity/commandline.py:445
3270 msgid "absolute_path"
3271 msgstr "absoluta_voyo"
3272
3273 #. Used in usage help. Example:
3274 #. tahoe://alias/some_dir
3275-#: ../duplicity/commandline.py:447
3276+#: ../duplicity/commandline.py:449
3277 msgid "alias"
3278 msgstr ""
3279
3280 #. Used in usage help (noun)
3281-#: ../duplicity/commandline.py:449
3282+#: ../duplicity/commandline.py:452
3283 msgid "backup name"
3284 msgstr ""
3285
3286-#. Used in help to represent a "bucket name" for Amazon Web Services' Simple
3287-#. Storage Service (S3). Example:
3288+#. Used in help to represent a "bucket name" for Amazon Web
3289+#. Services' Simple Storage Service (S3). Example:
3290 #. s3://other.host/bucket_name[/prefix]
3291-#: ../duplicity/commandline.py:453
3292+#: ../duplicity/commandline.py:457
3293 msgid "bucket_name"
3294 msgstr "sitela_nomo"
3295
3296-#. Used in usage help, abbreviation for "character" (noun)
3297-#: ../duplicity/commandline.py:455
3298+#. abbreviation for "character" (noun)
3299+#: ../duplicity/commandline.py:460
3300 msgid "char"
3301 msgstr "litero"
3302
3303-#. Used in usage help (noun)
3304-#: ../duplicity/commandline.py:457
3305+#. noun
3306+#: ../duplicity/commandline.py:463
3307 msgid "command"
3308 msgstr "impero"
3309
3310-#. Used in usage help to represent the name of a container in Amazon Web Services'
3311-#. Cloudfront. Example:
3312+#. Used in usage help to represent the name of a container in
3313+#. Amazon Web Services' Cloudfront. Example:
3314 #. cf+http://container_name
3315-#: ../duplicity/commandline.py:461
3316+#: ../duplicity/commandline.py:468
3317 msgid "container_name"
3318 msgstr ""
3319
3320-#. Used in usage help (noun)
3321-#: ../duplicity/commandline.py:463
3322+#. noun
3323+#: ../duplicity/commandline.py:471
3324 msgid "count"
3325 msgstr "konto"
3326
3327 #. Used in usage help to represent the name of a file directory
3328-#: ../duplicity/commandline.py:465
3329+#: ../duplicity/commandline.py:474
3330 msgid "directory"
3331 msgstr "dokumentuyo"
3332
3333 #. Used in usage help to represent the name of a file. Example:
3334 #. --log-file <filename>
3335-#: ../duplicity/commandline.py:468
3336+#: ../duplicity/commandline.py:478
3337 msgid "filename"
3338 msgstr "dokumentonomo"
3339
3340 #. Used in usage help to represent an ID for a GnuPG key. Example:
3341 #. --encrypt-key <gpg_key_id>
3342-#: ../duplicity/commandline.py:471
3343+#: ../duplicity/commandline.py:482
3344 msgid "gpg-key-id"
3345 msgstr ""
3346
3347-#. Used in usage help, e.g. to represent the name of a code module. Example:
3348+#. Used in usage help, e.g. to represent the name of a code
3349+#. module. Example:
3350 #. rsync://user[:password]@other.host[:port]::/module/some_dir
3351-#: ../duplicity/commandline.py:474
3352+#: ../duplicity/commandline.py:487
3353 msgid "module"
3354 msgstr "modulo"
3355
3356-#. Used in usage help to represent a desired number of something. Example:
3357+#. Used in usage help to represent a desired number of
3358+#. something. Example:
3359 #. --num-retries <number>
3360-#: ../duplicity/commandline.py:477
3361+#: ../duplicity/commandline.py:492
3362 msgid "number"
3363 msgstr "nombro"
3364
3365-#. Used in usage help. (Should be consistent with the "Options:" header.)
3366-#. Example:
3367+#. Used in usage help. (Should be consistent with the "Options:"
3368+#. header.) Example:
3369 #. duplicity [full|incremental] [options] source_dir target_url
3370-#: ../duplicity/commandline.py:481
3371+#: ../duplicity/commandline.py:497
3372 msgid "options"
3373 msgstr "selekti"
3374
3375 #. Used in usage help to represent an internet hostname. Example:
3376 #. ftp://user[:password]@other.host[:port]/some_dir
3377-#: ../duplicity/commandline.py:484
3378+#: ../duplicity/commandline.py:501
3379 msgid "other.host"
3380 msgstr "altra.hosto"
3381
3382 #. Used in usage help. Example:
3383-#: ../duplicity/commandline.py:486
3384+#. ftp://user[:password]@other.host[:port]/some_dir
3385+#: ../duplicity/commandline.py:505
3386 msgid "password"
3387 msgstr "pasovorto"
3388
3389 #. Used in usage help to represent a Unix-style path name. Example:
3390 #. --archive-dir <path>
3391-#: ../duplicity/commandline.py:489
3392+#: ../duplicity/commandline.py:509
3393 msgid "path"
3394 msgstr "voyo"
3395
3396 #. Used in usage help to represent a TCP port number. Example:
3397 #. ftp://user[:password]@other.host[:port]/some_dir
3398-#: ../duplicity/commandline.py:492
3399+#: ../duplicity/commandline.py:513
3400 msgid "port"
3401 msgstr "sabordo"
3402
3403-#. Used in usage help. This represents a string to be used as a prefix to
3404-#. names for backup files created by Duplicity. Example:
3405+#. Used in usage help. This represents a string to be used as a
3406+#. prefix to names for backup files created by Duplicity. Example:
3407 #. s3://other.host/bucket_name[/prefix]
3408-#: ../duplicity/commandline.py:496
3409+#: ../duplicity/commandline.py:518
3410 msgid "prefix"
3411 msgstr "prefixo"
3412
3413 #. Used in usage help to represent a Unix-style path name. Example:
3414 #. rsync://user[:password]@other.host[:port]/relative_path
3415-#: ../duplicity/commandline.py:499
3416+#: ../duplicity/commandline.py:522
3417 msgid "relative_path"
3418 msgstr "relatanta_voyo"
3419
3420 #. Used in usage help. Example:
3421 #. --timeout <seconds>
3422-#: ../duplicity/commandline.py:502
3423+#: ../duplicity/commandline.py:526
3424 msgid "seconds"
3425 msgstr "sekundi"
3426
3427-#. Used in usage help to represent a "glob" style pattern for matching one or
3428-#. more files, as described in the documentation. Example:
3429-#. --exclude <%shell_pattern>
3430-#: ../duplicity/commandline.py:506
3431+#. Used in usage help to represent a "glob" style pattern for
3432+#. matching one or more files, as described in the documentation.
3433+#. Example:
3434+#. --exclude <shell_pattern>
3435+#: ../duplicity/commandline.py:532
3436 msgid "shell_pattern"
3437 msgstr ""
3438
3439-#. Used in usage help to represent the name of a single file directory or a
3440-#. Unix-style path to a directory. Example:
3441-#. file:///%(x_some_dir)s
3442-#: ../duplicity/commandline.py:510
3443+#. Used in usage help to represent the name of a single file
3444+#. directory or a Unix-style path to a directory. Example:
3445+#. file:///some_dir
3446+#: ../duplicity/commandline.py:537
3447 msgid "some_dir"
3448 msgstr "ula_dokumentuyo"
3449
3450-#. Used in usage help to represent the name of a single file directory or a
3451-#. Unix-style path to a directory where files will be coming FROM. Example:
3452+#. Used in usage help to represent the name of a single file
3453+#. directory or a Unix-style path to a directory where files will be
3454+#. coming FROM. Example:
3455 #. duplicity [full|incremental] [options] source_dir target_url
3456-#: ../duplicity/commandline.py:514
3457+#: ../duplicity/commandline.py:543
3458 msgid "source_dir"
3459 msgstr "fonta_dokumentuyo"
3460
3461-#. Used in usage help to represent a URL files will be coming FROM. Example:
3462+#. Used in usage help to represent a URL files will be coming
3463+#. FROM. Example:
3464 #. duplicity [restore] [options] source_url target_dir
3465-#: ../duplicity/commandline.py:517
3466+#: ../duplicity/commandline.py:548
3467 msgid "source_url"
3468 msgstr "fonta_url"
3469
3470-#. Used in usage help to represent the name of a single file directory or a
3471-#. Unix-style path to a directory. where files will be going TO. Example:
3472+#. Used in usage help to represent the name of a single file
3473+#. directory or a Unix-style path to a directory. where files will be
3474+#. going TO. Example:
3475 #. duplicity [restore] [options] source_url target_dir
3476-#: ../duplicity/commandline.py:521
3477+#: ../duplicity/commandline.py:554
3478 msgid "target_dir"
3479 msgstr "skopa_dokumentuyo"
3480
3481-#. Used in usage help to represent a URL files will be going TO. Example:
3482+#. Used in usage help to represent a URL files will be going TO.
3483+#. Example:
3484 #. duplicity [full|incremental] [options] source_dir target_url
3485-#: ../duplicity/commandline.py:524
3486+#: ../duplicity/commandline.py:559
3487 msgid "target_url"
3488 msgstr "skopa_url"
3489
3490-#. Used in usage help to represent a time spec for a previous point in time,
3491-#. as described in the documentation. Example:
3492+#. Used in usage help to represent a time spec for a previous
3493+#. point in time, as described in the documentation. Example:
3494 #. duplicity remove-older-than time [options] target_url
3495-#: ../duplicity/commandline.py:528
3496+#: ../duplicity/commandline.py:564
3497 msgid "time"
3498 msgstr "tempo"
3499
3500-#. Used in usage help to represent a user name (i.e. login). Example:
3501+#. Used in usage help to represent a user name (i.e. login).
3502+#. Example:
3503 #. ftp://user[:password]@other.host[:port]/some_dir
3504-#: ../duplicity/commandline.py:531
3505+#: ../duplicity/commandline.py:569
3506 msgid "user"
3507 msgstr "uzero"
3508
3509-#: ../duplicity/commandline.py:533
3510+#: ../duplicity/commandline.py:571
3511 #, python-format
3512 msgid "duplicity version %s running on %s."
3513 msgstr "duplicity versiono %s kuras sur %s."
3514
3515 #. Header in usage help
3516-#: ../duplicity/commandline.py:537
3517+#: ../duplicity/commandline.py:575
3518 msgid "Usage:"
3519 msgstr "Uzado:"
3520
3521 #. Header in usage help
3522-#: ../duplicity/commandline.py:550
3523+#: ../duplicity/commandline.py:588
3524 msgid "Backends and their URL formats:"
3525 msgstr ""
3526
3527 #. Header in usage help
3528-#: ../duplicity/commandline.py:570
3529+#: ../duplicity/commandline.py:608
3530 msgid "Commands:"
3531 msgstr "Imperi:"
3532
3533 #. Header in usage help
3534-#: ../duplicity/commandline.py:584
3535+#: ../duplicity/commandline.py:622
3536 msgid "Options:"
3537 msgstr "Selekti:"
3538
3539 #. In this portion of the usage instructions, "[ewnid]" indicates which
3540 #. characters are permitted (e, w, n, i, or d); the brackets imply their own
3541 #. meaning in regex; i.e., only one of the characters is allowed in an instance.
3542-#: ../duplicity/commandline.py:638
3543+#: ../duplicity/commandline.py:676
3544 msgid ""
3545 " Verbosity must be one of: digit [0-9], character [ewnid],\n"
3546 " or word ['error', 'warning', 'notice', 'info', 'debug'].\n"
3547@@ -595,36 +819,36 @@
3548 " that verbosity level is set at 2 (Warning) or higher.\n"
3549 msgstr ""
3550
3551-#: ../duplicity/commandline.py:664
3552+#: ../duplicity/commandline.py:702
3553 #, python-format
3554 msgid "Specified archive directory '%s' does not exist, or is not a directory"
3555 msgstr ""
3556
3557-#: ../duplicity/commandline.py:673
3558+#: ../duplicity/commandline.py:711
3559 #, python-format
3560 msgid ""
3561 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
3562 "Received '%s' instead."
3563 msgstr ""
3564
3565-#: ../duplicity/commandline.py:731
3566+#: ../duplicity/commandline.py:769
3567 #, python-format
3568 msgid ""
3569 "Restore destination directory %s already exists.\n"
3570 "Will not overwrite."
3571 msgstr ""
3572
3573-#: ../duplicity/commandline.py:736
3574+#: ../duplicity/commandline.py:774
3575 #, python-format
3576 msgid "Verify directory %s does not exist"
3577 msgstr ""
3578
3579-#: ../duplicity/commandline.py:742
3580+#: ../duplicity/commandline.py:780
3581 #, python-format
3582 msgid "Backup source directory %s does not exist."
3583 msgstr ""
3584
3585-#: ../duplicity/commandline.py:817
3586+#: ../duplicity/commandline.py:855
3587 #, python-format
3588 msgid ""
3589 "Bad URL '%s'.\n"
3590@@ -632,7 +856,7 @@
3591 "\"file:///usr/local\". See the man page for more information."
3592 msgstr ""
3593
3594-#: ../duplicity/commandline.py:842
3595+#: ../duplicity/commandline.py:880
3596 msgid "Main action: "
3597 msgstr ""
3598
3599@@ -661,17 +885,11 @@
3600 msgid "Comparing %s and %s"
3601 msgstr ""
3602
3603-#. but signature says it did
3604 #: ../duplicity/diffdir.py:199
3605 #, python-format
3606 msgid "D %s"
3607 msgstr ""
3608
3609-#: ../duplicity/dup_temp.py:239
3610-#, python-format
3611-msgid "Failed to read %s: %s"
3612-msgstr ""
3613-
3614 #: ../duplicity/dup_time.py:48
3615 #, python-format
3616 msgid ""
3617@@ -734,39 +952,39 @@
3618 "seeing this message"
3619 msgstr ""
3620
3621-#: ../duplicity/manifest.py:181
3622+#: ../duplicity/manifest.py:193
3623 msgid "Manifests not equal because different volume numbers"
3624 msgstr ""
3625
3626-#: ../duplicity/manifest.py:186
3627+#: ../duplicity/manifest.py:198
3628 msgid "Manifests not equal because volume lists differ"
3629 msgstr ""
3630
3631-#: ../duplicity/manifest.py:191
3632+#: ../duplicity/manifest.py:203
3633 msgid "Manifests not equal because hosts or directories differ"
3634 msgstr ""
3635
3636-#: ../duplicity/manifest.py:338
3637+#: ../duplicity/manifest.py:350
3638 msgid "Warning, found extra Volume identifier"
3639 msgstr ""
3640
3641-#: ../duplicity/manifest.py:364
3642+#: ../duplicity/manifest.py:376
3643 msgid "Other is not VolumeInfo"
3644 msgstr ""
3645
3646-#: ../duplicity/manifest.py:367
3647+#: ../duplicity/manifest.py:379
3648 msgid "Volume numbers don't match"
3649 msgstr ""
3650
3651-#: ../duplicity/manifest.py:370
3652+#: ../duplicity/manifest.py:382
3653 msgid "start_indicies don't match"
3654 msgstr ""
3655
3656-#: ../duplicity/manifest.py:373
3657+#: ../duplicity/manifest.py:385
3658 msgid "end_index don't match"
3659 msgstr ""
3660
3661-#: ../duplicity/manifest.py:380
3662+#: ../duplicity/manifest.py:392
3663 msgid "Hashes don't match"
3664 msgstr ""
3665
3666@@ -775,7 +993,6 @@
3667 msgid "Starting to write %s"
3668 msgstr ""
3669
3670-#. special case first index
3671 #: ../duplicity/misc.py:107
3672 #, python-format
3673 msgid ""
3674@@ -857,7 +1074,6 @@
3675 msgid "Touching %s"
3676 msgstr ""
3677
3678-#. todo: avoid circ. dep. issue
3679 #: ../duplicity/path.py:554
3680 #, python-format
3681 msgid "Deleting tree %s"
3682@@ -888,7 +1104,6 @@
3683 msgid "Error accessing possibly locked file %s"
3684 msgstr ""
3685
3686-#. base doesn't exist
3687 #: ../duplicity/selection.py:154
3688 #, python-format
3689 msgid "Warning: base %s doesn't exist, continuing"
3690
3691=== modified file 'po/update-pot'
3692--- po/update-pot 2009-07-02 21:51:53 +0000
3693+++ po/update-pot 2009-09-01 00:46:32 +0000
3694@@ -1,3 +1,4 @@
3695 #!/bin/sh
3696
3697 intltool-update --pot -g duplicity
3698+sed -e 's/^#\. TRANSL:/#./' -i '' duplicity.pot
3699
3700=== modified file 'po/zh_CN.po'
3701--- po/zh_CN.po 2009-07-25 22:43:44 +0000
3702+++ po/zh_CN.po 2009-09-01 00:46:32 +0000
3703@@ -7,7 +7,7 @@
3704 msgstr ""
3705 "Project-Id-Version: duplicity\n"
3706 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
3707-"POT-Creation-Date: 2009-07-22 17:34-0700\n"
3708+"POT-Creation-Date: 2009-08-30 23:01-0700\n"
3709 "PO-Revision-Date: 2009-07-08 10:43+0000\n"
3710 "Last-Translator: Careone <zzbusagain@yahoo.com.cn>\n"
3711 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
3712@@ -18,44 +18,260 @@
3713 "X-Launchpad-Export-Date: 2009-07-21 22:24+0000\n"
3714 "X-Generator: Launchpad (build Unknown)\n"
3715
3716-#: ../duplicity-bin:669
3717-#, c-format
3718+#: ../duplicity-bin:191
3719+#, python-format
3720+msgid ""
3721+"Unable to locate last file %s and block %d in backup set.\n"
3722+"Attempting restart on the next file %s."
3723+msgstr ""
3724+
3725+#: ../duplicity-bin:197
3726+#, python-format
3727+msgid ""
3728+"Unable to locate last file %s and block %d in backup set.\n"
3729+"There are no more files to be backed up."
3730+msgstr ""
3731+
3732+#: ../duplicity-bin:443
3733+msgid ""
3734+"Fatal Error: Unable to start incremental backup. Old signatures not found "
3735+"and incremental specified"
3736+msgstr ""
3737+
3738+#: ../duplicity-bin:447
3739+msgid "No signatures found, switching to full backup."
3740+msgstr "找不到标记，转换到完全备份。"
3741+
3742+#: ../duplicity-bin:461
3743+msgid "Backup Statistics"
3744+msgstr "备份统计"
3745+
3746+#: ../duplicity-bin:515
3747+msgid "No signature data found, unable to list files."
3748+msgstr "找不到标记数据，无法列出文件。"
3749+
3750+#: ../duplicity-bin:544
3751+#, fuzzy, python-format
3752+msgid "%s not found in archive, no files restored."
3753+msgstr "压缩包中找不到文件 - 没有进行任何还原。"
3754+
3755+#: ../duplicity-bin:548
3756+msgid "No files found in archive - nothing restored."
3757+msgstr "压缩包中找不到文件 - 没有进行任何还原。"
3758+
3759+#: ../duplicity-bin:581
3760+#, python-format
3761+msgid "Processed volume %d of %d"
3762+msgstr ""
3763+
3764+#: ../duplicity-bin:621
3765+#, python-format
3766+msgid "Invalid data - %s hash mismatch:"
3767+msgstr ""
3768+
3769+#: ../duplicity-bin:622
3770+#, python-format
3771+msgid "Calculated hash: %s"
3772+msgstr "计算 hash 值： %s"
3773+
3774+#: ../duplicity-bin:623
3775+#, python-format
3776+msgid "Manifest hash: %s"
3777+msgstr "清单的 hash 值：%s"
3778+
3779+#: ../duplicity-bin:640
3780+#, python-format
3781+msgid "Volume was signed by key %s, not %s"
3782+msgstr ""
3783+
3784+#: ../duplicity-bin:670
3785+#, python-format
3786+msgid "Verify complete: %s, %s."
3787+msgstr ""
3788+
3789+#: ../duplicity-bin:671
3790+#, python-format
3791 msgid "%d file compared"
3792 msgid_plural "%d files compared"
3793 msgstr[0] ""
3794 msgstr[1] ""
3795
3796-#: ../duplicity-bin:671
3797-#, c-format
3798+#: ../duplicity-bin:673
3799+#, python-format
3800 msgid "%d difference found"
3801 msgid_plural "%d differences found"
3802 msgstr[0] ""
3803 msgstr[1] ""
3804
3805-#: ../duplicity-bin:695
3806+#: ../duplicity-bin:692
3807+msgid "No extraneous files found, nothing deleted in cleanup."
3808+msgstr ""
3809+
3810+#: ../duplicity-bin:697
3811 msgid "Deleting this file from backend:"
3812 msgid_plural "Deleting these files from backend:"
3813 msgstr[0] ""
3814 msgstr[1] ""
3815
3816-#: ../duplicity-bin:704
3817+#: ../duplicity-bin:706
3818 msgid "Found the following file to delete:"
3819 msgid_plural "Found the following files to delete:"
3820 msgstr[0] ""
3821 msgstr[1] ""
3822
3823-#: ../duplicity-bin:762
3824+#: ../duplicity-bin:710
3825+msgid "Run duplicity again with the --force option to actually delete."
3826+msgstr ""
3827+
3828+#: ../duplicity-bin:749
3829+msgid "There are backup set(s) at time(s):"
3830+msgstr ""
3831+
3832+#: ../duplicity-bin:751
3833+msgid "Which can't be deleted because newer sets depend on them."
3834+msgstr ""
3835+
3836+#: ../duplicity-bin:755
3837+msgid ""
3838+"Current active backup chain is older than specified time. However, it will "
3839+"not be deleted. To remove all your backups, manually purge the repository."
3840+msgstr ""
3841+
3842+#: ../duplicity-bin:761
3843+msgid "No old backup sets found, nothing deleted."
3844+msgstr ""
3845+
3846+#: ../duplicity-bin:764
3847 msgid "Deleting backup set at time:"
3848 msgid_plural "Deleting backup sets at times:"
3849 msgstr[0] ""
3850 msgstr[1] ""
3851
3852-#: ../duplicity-bin:774
3853+#: ../duplicity-bin:776
3854 msgid "Found old backup set at the following time:"
3855 msgid_plural "Found old backup sets at the following times:"
3856 msgstr[0] ""
3857 msgstr[1] ""
3858
3859+#: ../duplicity-bin:780
3860+msgid "Rerun command with --force option to actually delete."
3861+msgstr ""
3862+
3863+#: ../duplicity-bin:863
3864+#, python-format
3865+msgid "Deleting local %s (not authoritative at backend)."
3866+msgstr ""
3867+
3868+#: ../duplicity-bin:888 ../duplicity/dup_temp.py:239
3869+#, python-format
3870+msgid "Failed to read %s: %s"
3871+msgstr ""
3872+
3873+#: ../duplicity-bin:899
3874+#, python-format
3875+msgid "Copying %s to local cache."
3876+msgstr ""
3877+
3878+#: ../duplicity-bin:943
3879+msgid "Local and Remote metadata are synchronized, no sync needed."
3880+msgstr ""
3881+
3882+#: ../duplicity-bin:948
3883+msgid "Synchronizing remote metadata to local cache..."
3884+msgstr ""
3885+
3886+#: ../duplicity-bin:955
3887+msgid "Sync would copy the following from remote to local:"
3888+msgstr ""
3889+
3890+#: ../duplicity-bin:958
3891+msgid "Sync would remove the following spurious local files:"
3892+msgstr ""
3893+
3894+#: ../duplicity-bin:1001
3895+msgid "Unable to get free space on temp."
3896+msgstr ""
3897+
3898+#: ../duplicity-bin:1009
3899+#, python-format
3900+msgid "Temp space has %d available, backup needs approx %d."
3901+msgstr ""
3902+
3903+#: ../duplicity-bin:1012
3904+#, python-format
3905+msgid "Temp has %d available, backup will use approx %d."
3906+msgstr ""
3907+
3908+#: ../duplicity-bin:1020
3909+msgid "Unable to get max open files."
3910+msgstr ""
3911+
3912+#: ../duplicity-bin:1024
3913+#, python-format
3914+msgid ""
3915+"Max open files of %s is too low, should be >= 1024.\n"
3916+"Use 'ulimit -n 1024' or higher to correct.\n"
3917+msgstr ""
3918+
3919+#: ../duplicity-bin:1070
3920+msgid ""
3921+"RESTART: The first volume failed to upload before termination.\n"
3922+" Restart is impossible...starting backup from beginning."
3923+msgstr ""
3924+
3925+#: ../duplicity-bin:1076
3926+#, python-format
3927+msgid ""
3928+"RESTART: Volumes %d to %d failed to upload before termination.\n"
3929+" Restarting backup at volume %d."
3930+msgstr ""
3931+
3932+#: ../duplicity-bin:1084
3933+#, python-format
3934+msgid ""
3935+"RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
3936+" Restart is impossible ... duplicity will clean off the last "
3937+"partial\n"
3938+" backup then restart the backup from the beginning."
3939+msgstr ""
3940+
3941+#: ../duplicity-bin:1162
3942+#, python-format
3943+msgid "Last %s backup left a partial set, restarting."
3944+msgstr ""
3945+
3946+#: ../duplicity-bin:1166
3947+#, python-format
3948+msgid "Cleaning up previous partial %s backup set, restarting."
3949+msgstr ""
3950+
3951+#: ../duplicity-bin:1177
3952+msgid "Last full backup date:"
3953+msgstr ""
3954+
3955+#: ../duplicity-bin:1179
3956+msgid "Last full backup date: none"
3957+msgstr ""
3958+
3959+#: ../duplicity-bin:1181
3960+msgid "Last full backup is too old, forcing full backup"
3961+msgstr ""
3962+
3963+#: ../duplicity-bin:1255
3964+#, python-format
3965+msgid "GPG error detail: %s"
3966+msgstr ""
3967+
3968+#: ../duplicity-bin:1264
3969+#, python-format
3970+msgid "User error detail: %s"
3971+msgstr ""
3972+
3973+#: ../duplicity-bin:1273
3974+#, python-format
3975+msgid "Backend error detail: %s"
3976+msgstr ""
3977+
3978 #: ../duplicity/asyncscheduler.py:69
3979 #, python-format
3980 msgid "instantiating at concurrency %d"
3981@@ -123,219 +339,218 @@
3982 msgid "Reading results of '%s'"
3983 msgstr ""
3984
3985-#: ../duplicity/collections.py:159
3986+#: ../duplicity/collections.py:176
3987 msgid "Fatal Error: No manifests found for most recent backup"
3988 msgstr ""
3989
3990-#: ../duplicity/collections.py:168
3991+#: ../duplicity/collections.py:185
3992 msgid ""
3993 "Fatal Error: Remote manifest does not match local one. Either the remote "
3994 "backup set or the local archive directory has been corrupted."
3995 msgstr ""
3996
3997-#: ../duplicity/collections.py:176
3998+#: ../duplicity/collections.py:193
3999 msgid "Fatal Error: Neither remote nor local manifest is readable."
4000 msgstr ""
4001
4002-#: ../duplicity/collections.py:280
4003+#: ../duplicity/collections.py:299
4004 msgid "Preferring Backupset over previous one!"
4005 msgstr ""
4006
4007-#: ../duplicity/collections.py:283
4008+#: ../duplicity/collections.py:302
4009 #, python-format
4010 msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)"
4011 msgstr ""
4012
4013-#: ../duplicity/collections.py:288
4014+#: ../duplicity/collections.py:307
4015 #, python-format
4016 msgid "Added incremental Backupset (start_time: %s / end_time: %s)"
4017 msgstr ""
4018
4019-#: ../duplicity/collections.py:354
4020+#: ../duplicity/collections.py:373
4021 msgid "Chain start time: "
4022 msgstr ""
4023
4024-#: ../duplicity/collections.py:355
4025+#: ../duplicity/collections.py:374
4026 msgid "Chain end time: "
4027 msgstr ""
4028
4029-#: ../duplicity/collections.py:356
4030+#: ../duplicity/collections.py:375
4031 #, python-format
4032 msgid "Number of contained backup sets: %d"
4033 msgstr ""
4034
4035-#: ../duplicity/collections.py:358
4036+#: ../duplicity/collections.py:377
4037 #, python-format
4038 msgid "Total number of contained volumes: %d"
4039 msgstr ""
4040
4041-#: ../duplicity/collections.py:360
4042+#: ../duplicity/collections.py:379
4043 msgid "Type of backup set:"
4044 msgstr ""
4045
4046-#: ../duplicity/collections.py:360
4047+#: ../duplicity/collections.py:379
4048 msgid "Time:"
4049 msgstr ""
4050
4051-#: ../duplicity/collections.py:360
4052+#: ../duplicity/collections.py:379
4053 msgid "Num volumes:"
4054 msgstr ""
4055
4056-#: ../duplicity/collections.py:364
4057+#: ../duplicity/collections.py:383
4058 msgid "Full"
4059 msgstr ""
4060
4061-#: ../duplicity/collections.py:367
4062+#: ../duplicity/collections.py:386
4063 msgid "Incremental"
4064 msgstr ""
4065
4066-#: ../duplicity/collections.py:427
4067+#: ../duplicity/collections.py:446
4068 msgid "local"
4069 msgstr ""
4070
4071-#: ../duplicity/collections.py:429
4072+#: ../duplicity/collections.py:448
4073 msgid "remote"
4074 msgstr ""
4075
4076-#: ../duplicity/collections.py:581
4077+#: ../duplicity/collections.py:600
4078 msgid "Collection Status"
4079 msgstr ""
4080
4081-#: ../duplicity/collections.py:583
4082+#: ../duplicity/collections.py:602
4083 #, python-format
4084 msgid "Connecting with backend: %s"
4085 msgstr ""
4086
4087-#: ../duplicity/collections.py:585
4088+#: ../duplicity/collections.py:604
4089 #, python-format
4090 msgid "Archive dir: %s"
4091 msgstr ""
4092
4093-#: ../duplicity/collections.py:588
4094+#: ../duplicity/collections.py:607
4095 #, python-format
4096 msgid "Found %d backup chain without signatures."
4097 msgid_plural "Found %d backup chains without signatures."
4098 msgstr[0] ""
4099 msgstr[1] ""
4100
4101-#: ../duplicity/collections.py:593
4102+#: ../duplicity/collections.py:612
4103 #, python-format
4104 msgid "Signature-less chain %d of %d:"
4105 msgstr ""
4106
4107-#: ../duplicity/collections.py:599
4108+#: ../duplicity/collections.py:618
4109 msgid "Found a complete backup chain with matching signature chain:"
4110 msgstr ""
4111
4112-#: ../duplicity/collections.py:603
4113+#: ../duplicity/collections.py:622
4114 msgid "No backup chains with active signatures found"
4115 msgstr ""
4116
4117-#: ../duplicity/collections.py:606
4118+#: ../duplicity/collections.py:625
4119 #, python-format
4120 msgid "Also found %d backup set not part of any chain,"
4121 msgid_plural "Also found %d backup sets not part of any chain,"
4122 msgstr[0] ""
4123 msgstr[1] ""
4124
4125-#: ../duplicity/collections.py:610
4126+#: ../duplicity/collections.py:629
4127 #, python-format
4128 msgid "and %d incomplete backup set."
4129 msgid_plural "and %d incomplete backup sets."
4130 msgstr[0] ""
4131 msgstr[1] ""
4132
4133-#: ../duplicity/collections.py:614
4134+#: ../duplicity/collections.py:633
4135 msgid "These may be deleted by running duplicity with the --cleanup option."
4136 msgstr ""
4137
4138-#: ../duplicity/collections.py:617
4139+#: ../duplicity/collections.py:636
4140 msgid "No orphaned or incomplete backup sets found."
4141 msgstr ""
4142
4143-#: ../duplicity/collections.py:633
4144+#: ../duplicity/collections.py:652
4145 #, python-format
4146 msgid "%d file exists on backend"
4147 msgid_plural "%d files exist on backend"
4148 msgstr[0] ""
4149 msgstr[1] ""
4150
4151-#: ../duplicity/collections.py:640
4152+#: ../duplicity/collections.py:659
4153 #, python-format
4154 msgid "%d file exists in cache"
4155 msgid_plural "%d files exist in cache"
4156 msgstr[0] ""
4157 msgstr[1] ""
4158
4159-#. It matches, remove the last backup set:
4160-#: ../duplicity/collections.py:692
4161+#: ../duplicity/collections.py:711
4162 msgid "Warning, discarding last backup set, because of missing signature file."
4163 msgstr ""
4164
4165-#: ../duplicity/collections.py:725
4166+#: ../duplicity/collections.py:744
4167 msgid "Warning, found the following local orphaned signature file:"
4168 msgid_plural "Warning, found the following local orphaned signature files:"
4169 msgstr[0] ""
4170 msgstr[1] ""
4171
4172-#: ../duplicity/collections.py:734
4173+#: ../duplicity/collections.py:753
4174 msgid "Warning, found the following remote orphaned signature file:"
4175 msgid_plural "Warning, found the following remote orphaned signature files:"
4176 msgstr[0] ""
4177 msgstr[1] ""
4178
4179-#: ../duplicity/collections.py:744
4180+#: ../duplicity/collections.py:763
4181 msgid "Warning, found an unnecessary signature chain"
4182 msgid_plural "Warning, found unnecessary signature chains"
4183 msgstr[0] ""
4184 msgstr[1] ""
4185
4186-#: ../duplicity/collections.py:752
4187+#: ../duplicity/collections.py:771
4188 msgid "Warning, found signatures but no corresponding backup files"
4189 msgstr ""
4190
4191-#: ../duplicity/collections.py:756
4192+#: ../duplicity/collections.py:775
4193 msgid ""
4194 "Warning, found incomplete backup sets, probably left from aborted session"
4195 msgstr ""
4196
4197-#: ../duplicity/collections.py:760
4198+#: ../duplicity/collections.py:779
4199 msgid "Warning, found the following orphaned backup file:"
4200 msgid_plural "Warning, found the following orphaned backup files:"
4201 msgstr[0] ""
4202 msgstr[1] ""
4203
4204-#: ../duplicity/collections.py:778
4205+#: ../duplicity/collections.py:797
4206 #, python-format
4207 msgid "Extracting backup chains from list of files: %s"
4208 msgstr ""
4209
4210-#: ../duplicity/collections.py:788
4211+#: ../duplicity/collections.py:807
4212 #, python-format
4213 msgid "File %s is part of known set"
4214 msgstr ""
4215
4216-#: ../duplicity/collections.py:791
4217+#: ../duplicity/collections.py:810
4218 #, python-format
4219 msgid "File %s is not part of a known set; creating new set"
4220 msgstr ""
4221
4222-#: ../duplicity/collections.py:796
4223+#: ../duplicity/collections.py:815
4224 #, python-format
4225 msgid "Ignoring file (rejected by backup set) '%s'"
4226 msgstr ""
4227
4228-#: ../duplicity/collections.py:809
4229+#: ../duplicity/collections.py:828
4230 #, python-format
4231 msgid "Found backup chain %s"
4232 msgstr ""
4233
4234-#: ../duplicity/collections.py:814
4235+#: ../duplicity/collections.py:833
4236 #, python-format
4237 msgid "Added set %s to pre-existing chain %s"
4238 msgstr ""
4239
4240-#: ../duplicity/collections.py:818
4241+#: ../duplicity/collections.py:837
4242 #, python-format
4243 msgid "Found orphaned set %s"
4244 msgstr ""
4245@@ -384,210 +599,219 @@
4246
4247 #. Used in usage help to represent a Unix-style path name. Example:
4248 #. rsync://user[:password]@other_host[:port]//absolute_path
4249-#: ../duplicity/commandline.py:444
4250+#: ../duplicity/commandline.py:445
4251 msgid "absolute_path"
4252 msgstr ""
4253
4254 #. Used in usage help. Example:
4255 #. tahoe://alias/some_dir
4256-#: ../duplicity/commandline.py:447
4257+#: ../duplicity/commandline.py:449
4258 msgid "alias"
4259 msgstr ""
4260
4261 #. Used in usage help (noun)
4262-#: ../duplicity/commandline.py:449
4263+#: ../duplicity/commandline.py:452
4264 msgid "backup name"
4265 msgstr ""
4266
4267-#. Used in help to represent a "bucket name" for Amazon Web Services' Simple
4268-#. Storage Service (S3). Example:
4269+#. Used in help to represent a "bucket name" for Amazon Web
4270+#. Services' Simple Storage Service (S3). Example:
4271 #. s3://other.host/bucket_name[/prefix]
4272-#: ../duplicity/commandline.py:453
4273+#: ../duplicity/commandline.py:457
4274 msgid "bucket_name"
4275 msgstr ""
4276
4277-#. Used in usage help, abbreviation for "character" (noun)
4278-#: ../duplicity/commandline.py:455
4279+#. abbreviation for "character" (noun)
4280+#: ../duplicity/commandline.py:460
4281 msgid "char"
4282 msgstr ""
4283
4284-#. Used in usage help (noun)
4285-#: ../duplicity/commandline.py:457
4286+#. noun
4287+#: ../duplicity/commandline.py:463
4288 msgid "command"
4289 msgstr ""
4290
4291-#. Used in usage help to represent the name of a container in Amazon Web Services'
4292-#. Cloudfront. Example:
4293+#. Used in usage help to represent the name of a container in
4294+#. Amazon Web Services' Cloudfront. Example:
4295 #. cf+http://container_name
4296-#: ../duplicity/commandline.py:461
4297+#: ../duplicity/commandline.py:468
4298 msgid "container_name"
4299 msgstr ""
4300
4301-#. Used in usage help (noun)
4302-#: ../duplicity/commandline.py:463
4303+#. noun
4304+#: ../duplicity/commandline.py:471
4305 msgid "count"
4306 msgstr ""
4307
4308 #. Used in usage help to represent the name of a file directory
4309-#: ../duplicity/commandline.py:465
4310+#: ../duplicity/commandline.py:474
4311 msgid "directory"
4312 msgstr ""
4313
4314 #. Used in usage help to represent the name of a file. Example:
4315 #. --log-file <filename>
4316-#: ../duplicity/commandline.py:468
4317+#: ../duplicity/commandline.py:478
4318 msgid "filename"
4319 msgstr ""
4320
4321 #. Used in usage help to represent an ID for a GnuPG key. Example:
4322 #. --encrypt-key <gpg_key_id>
4323-#: ../duplicity/commandline.py:471
4324+#: ../duplicity/commandline.py:482
4325 msgid "gpg-key-id"
4326 msgstr ""
4327
4328-#. Used in usage help, e.g. to represent the name of a code module. Example:
4329+#. Used in usage help, e.g. to represent the name of a code
4330+#. module. Example:
4331 #. rsync://user[:password]@other.host[:port]::/module/some_dir
4332-#: ../duplicity/commandline.py:474
4333+#: ../duplicity/commandline.py:487
4334 msgid "module"
4335 msgstr ""
4336
4337-#. Used in usage help to represent a desired number of something. Example:
4338+#. Used in usage help to represent a desired number of
4339+#. something. Example:
4340 #. --num-retries <number>
4341-#: ../duplicity/commandline.py:477
4342+#: ../duplicity/commandline.py:492
4343 msgid "number"
4344 msgstr ""
4345
4346-#. Used in usage help. (Should be consistent with the "Options:" header.)
4347-#. Example:
4348+#. Used in usage help. (Should be consistent with the "Options:"
4349+#. header.) Example:
4350 #. duplicity [full|incremental] [options] source_dir target_url
4351-#: ../duplicity/commandline.py:481
4352+#: ../duplicity/commandline.py:497
4353 msgid "options"
4354 msgstr ""
4355
4356 #. Used in usage help to represent an internet hostname. Example:
4357 #. ftp://user[:password]@other.host[:port]/some_dir
4358-#: ../duplicity/commandline.py:484
4359+#: ../duplicity/commandline.py:501
4360 msgid "other.host"
4361 msgstr ""
4362
4363 #. Used in usage help. Example:
4364-#: ../duplicity/commandline.py:486
4365+#. ftp://user[:password]@other.host[:port]/some_dir
4366+#: ../duplicity/commandline.py:505
4367 msgid "password"
4368 msgstr ""
4369
4370 #. Used in usage help to represent a Unix-style path name. Example:
4371 #. --archive-dir <path>
4372-#: ../duplicity/commandline.py:489
4373+#: ../duplicity/commandline.py:509
4374 msgid "path"
4375 msgstr ""
4376
4377 #. Used in usage help to represent a TCP port number. Example:
4378 #. ftp://user[:password]@other.host[:port]/some_dir
4379-#: ../duplicity/commandline.py:492
4380+#: ../duplicity/commandline.py:513
4381 msgid "port"
4382 msgstr ""
4383
4384-#. Used in usage help. This represents a string to be used as a prefix to
4385-#. names for backup files created by Duplicity. Example:
4386+#. Used in usage help. This represents a string to be used as a
4387+#. prefix to names for backup files created by Duplicity. Example:
4388 #. s3://other.host/bucket_name[/prefix]
4389-#: ../duplicity/commandline.py:496
4390+#: ../duplicity/commandline.py:518
4391 msgid "prefix"
4392 msgstr ""
4393
4394 #. Used in usage help to represent a Unix-style path name. Example:
4395 #. rsync://user[:password]@other.host[:port]/relative_path
4396-#: ../duplicity/commandline.py:499
4397+#: ../duplicity/commandline.py:522
4398 msgid "relative_path"
4399 msgstr ""
4400
4401 #. Used in usage help. Example:
4402 #. --timeout <seconds>
4403-#: ../duplicity/commandline.py:502
4404+#: ../duplicity/commandline.py:526
4405 msgid "seconds"
4406 msgstr ""
4407
4408-#. Used in usage help to represent a "glob" style pattern for matching one or
4409-#. more files, as described in the documentation. Example:
4410-#. --exclude <%shell_pattern>
4411-#: ../duplicity/commandline.py:506
4412+#. Used in usage help to represent a "glob" style pattern for
4413+#. matching one or more files, as described in the documentation.
4414+#. Example:
4415+#. --exclude <shell_pattern>
4416+#: ../duplicity/commandline.py:532
4417 msgid "shell_pattern"
4418 msgstr ""
4419
4420-#. Used in usage help to represent the name of a single file directory or a
4421-#. Unix-style path to a directory. Example:
4422-#. file:///%(x_some_dir)s
4423-#: ../duplicity/commandline.py:510
4424+#. Used in usage help to represent the name of a single file
4425+#. directory or a Unix-style path to a directory. Example:
4426+#. file:///some_dir
4427+#: ../duplicity/commandline.py:537
4428 msgid "some_dir"
4429 msgstr ""
4430
4431-#. Used in usage help to represent the name of a single file directory or a
4432-#. Unix-style path to a directory where files will be coming FROM. Example:
4433+#. Used in usage help to represent the name of a single file
4434+#. directory or a Unix-style path to a directory where files will be
4435+#. coming FROM. Example:
4436 #. duplicity [full|incremental] [options] source_dir target_url
4437-#: ../duplicity/commandline.py:514
4438+#: ../duplicity/commandline.py:543
4439 msgid "source_dir"
4440 msgstr ""
4441
4442-#. Used in usage help to represent a URL files will be coming FROM. Example:
4443+#. Used in usage help to represent a URL files will be coming
4444+#. FROM. Example:
4445 #. duplicity [restore] [options] source_url target_dir
4446-#: ../duplicity/commandline.py:517
4447+#: ../duplicity/commandline.py:548
4448 msgid "source_url"
4449 msgstr ""
4450
4451-#. Used in usage help to represent the name of a single file directory or a
4452-#. Unix-style path to a directory. where files will be going TO. Example:
4453+#. Used in usage help to represent the name of a single file
4454+#. directory or a Unix-style path to a directory. where files will be
4455+#. going TO. Example:
4456 #. duplicity [restore] [options] source_url target_dir
4457-#: ../duplicity/commandline.py:521
4458+#: ../duplicity/commandline.py:554
4459 msgid "target_dir"
4460 msgstr ""
4461
4462-#. Used in usage help to represent a URL files will be going TO. Example:
4463+#. Used in usage help to represent a URL files will be going TO.
4464+#. Example:
4465 #. duplicity [full|incremental] [options] source_dir target_url
4466-#: ../duplicity/commandline.py:524
4467+#: ../duplicity/commandline.py:559
4468 msgid "target_url"
4469 msgstr ""
4470
4471-#. Used in usage help to represent a time spec for a previous point in time,
4472-#. as described in the documentation. Example:
4473+#. Used in usage help to represent a time spec for a previous
4474+#. point in time, as described in the documentation. Example:
4475 #. duplicity remove-older-than time [options] target_url
4476-#: ../duplicity/commandline.py:528
4477+#: ../duplicity/commandline.py:564
4478 msgid "time"
4479 msgstr ""
4480
4481-#. Used in usage help to represent a user name (i.e. login). Example:
4482+#. Used in usage help to represent a user name (i.e. login).
4483+#. Example:
4484 #. ftp://user[:password]@other.host[:port]/some_dir
4485-#: ../duplicity/commandline.py:531
4486+#: ../duplicity/commandline.py:569
4487 msgid "user"
4488 msgstr ""
4489
4490-#: ../duplicity/commandline.py:533
4491+#: ../duplicity/commandline.py:571
4492 #, python-format
4493 msgid "duplicity version %s running on %s."
4494 msgstr ""
4495
4496 #. Header in usage help
4497-#: ../duplicity/commandline.py:537
4498+#: ../duplicity/commandline.py:575
4499 msgid "Usage:"
4500 msgstr ""
4501
4502 #. Header in usage help
4503-#: ../duplicity/commandline.py:550
4504+#: ../duplicity/commandline.py:588
4505 msgid "Backends and their URL formats:"
4506 msgstr ""
4507
4508 #. Header in usage help
4509-#: ../duplicity/commandline.py:570
4510+#: ../duplicity/commandline.py:608
4511 msgid "Commands:"
4512 msgstr ""
4513
4514 #. Header in usage help
4515-#: ../duplicity/commandline.py:584
4516+#: ../duplicity/commandline.py:622
4517 msgid "Options:"
4518 msgstr ""
4519
4520 #. In this portion of the usage instructions, "[ewnid]" indicates which
4521 #. characters are permitted (e, w, n, i, or d); the brackets imply their own
4522 #. meaning in regex; i.e., only one of the characters is allowed in an instance.
4523-#: ../duplicity/commandline.py:638
4524+#: ../duplicity/commandline.py:676
4525 msgid ""
4526 " Verbosity must be one of: digit [0-9], character [ewnid],\n"
4527 " or word ['error', 'warning', 'notice', 'info', 'debug'].\n"
4528@@ -595,36 +819,36 @@
4529 " that verbosity level is set at 2 (Warning) or higher.\n"
4530 msgstr ""
4531
4532-#: ../duplicity/commandline.py:664
4533+#: ../duplicity/commandline.py:702
4534 #, python-format
4535 msgid "Specified archive directory '%s' does not exist, or is not a directory"
4536 msgstr ""
4537
4538-#: ../duplicity/commandline.py:673
4539+#: ../duplicity/commandline.py:711
4540 #, python-format
4541 msgid ""
4542 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
4543 "Received '%s' instead."
4544 msgstr ""
4545
4546-#: ../duplicity/commandline.py:731
4547+#: ../duplicity/commandline.py:769
4548 #, python-format
4549 msgid ""
4550 "Restore destination directory %s already exists.\n"
4551 "Will not overwrite."
4552 msgstr ""
4553
4554-#: ../duplicity/commandline.py:736
4555+#: ../duplicity/commandline.py:774
4556 #, python-format
4557 msgid "Verify directory %s does not exist"
4558 msgstr ""
4559
4560-#: ../duplicity/commandline.py:742
4561+#: ../duplicity/commandline.py:780
4562 #, python-format
4563 msgid "Backup source directory %s does not exist."
4564 msgstr ""
4565
4566-#: ../duplicity/commandline.py:817
4567+#: ../duplicity/commandline.py:855
4568 #, python-format
4569 msgid ""
4570 "Bad URL '%s'.\n"
4571@@ -632,7 +856,7 @@
4572 "\"file:///usr/local\". See the man page for more information."
4573 msgstr ""
4574
4575-#: ../duplicity/commandline.py:842
4576+#: ../duplicity/commandline.py:880
4577 msgid "Main action: "
4578 msgstr ""
4579
4580@@ -661,17 +885,11 @@
4581 msgid "Comparing %s and %s"
4582 msgstr ""
4583
4584-#. but signature says it did
4585 #: ../duplicity/diffdir.py:199
4586 #, python-format
4587 msgid "D %s"
4588 msgstr ""
4589
4590-#: ../duplicity/dup_temp.py:239
4591-#, python-format
4592-msgid "Failed to read %s: %s"
4593-msgstr ""
4594-
4595 #: ../duplicity/dup_time.py:48
4596 #, python-format
4597 msgid ""
4598@@ -734,39 +952,39 @@
4599 "seeing this message"
4600 msgstr ""
4601
4602-#: ../duplicity/manifest.py:181
4603+#: ../duplicity/manifest.py:193
4604 msgid "Manifests not equal because different volume numbers"
4605 msgstr ""
4606
4607-#: ../duplicity/manifest.py:186
4608+#: ../duplicity/manifest.py:198
4609 msgid "Manifests not equal because volume lists differ"
4610 msgstr ""
4611
4612-#: ../duplicity/manifest.py:191
4613+#: ../duplicity/manifest.py:203
4614 msgid "Manifests not equal because hosts or directories differ"
4615 msgstr ""
4616
4617-#: ../duplicity/manifest.py:338
4618+#: ../duplicity/manifest.py:350
4619 msgid "Warning, found extra Volume identifier"
4620 msgstr ""
4621
4622-#: ../duplicity/manifest.py:364
4623+#: ../duplicity/manifest.py:376
4624 msgid "Other is not VolumeInfo"
4625 msgstr ""
4626
4627-#: ../duplicity/manifest.py:367
4628+#: ../duplicity/manifest.py:379
4629 msgid "Volume numbers don't match"
4630 msgstr ""
4631
4632-#: ../duplicity/manifest.py:370
4633+#: ../duplicity/manifest.py:382
4634 msgid "start_indicies don't match"
4635 msgstr ""
4636
4637-#: ../duplicity/manifest.py:373
4638+#: ../duplicity/manifest.py:385
4639 msgid "end_index don't match"
4640 msgstr ""
4641
4642-#: ../duplicity/manifest.py:380
4643+#: ../duplicity/manifest.py:392
4644 msgid "Hashes don't match"
4645 msgstr ""
4646
4647@@ -775,7 +993,6 @@
4648 msgid "Starting to write %s"
4649 msgstr ""
4650
4651-#. special case first index
4652 #: ../duplicity/misc.py:107
4653 #, python-format
4654 msgid ""
4655@@ -857,7 +1074,6 @@
4656 msgid "Touching %s"
4657 msgstr ""
4658
4659-#. todo: avoid circ. dep. issue
4660 #: ../duplicity/path.py:554
4661 #, python-format
4662 msgid "Deleting tree %s"
4663@@ -888,7 +1104,6 @@
4664 msgid "Error accessing possibly locked file %s"
4665 msgstr ""
4666
4667-#. base doesn't exist
4668 #: ../duplicity/selection.py:154
4669 #, python-format
4670 msgid "Warning: base %s doesn't exist, continuing"
4671@@ -1029,21 +1244,3 @@
4672 #, python-format
4673 msgid "Could not copy %s to %s"
4674 msgstr ""
4675-
4676-#~ msgid "No signatures found, switching to full backup."
4677-#~ msgstr "找不到标记，转换到完全备份。"
4678-
4679-#~ msgid "Backup Statistics"
4680-#~ msgstr "备份统计"
4681-
4682-#~ msgid "No signature data found, unable to list files."
4683-#~ msgstr "找不到标记数据，无法列出文件。"
4684-
4685-#~ msgid "No files found in archive - nothing restored."
4686-#~ msgstr "压缩包中找不到文件 - 没有进行任何还原。"
4687-
4688-#~ msgid "Calculated hash: %s"
4689-#~ msgstr "计算 hash 值： %s"
4690-
4691-#~ msgid "Manifest hash: %s"
4692-#~ msgstr "清单的 hash 值：%s"

Subscribers

People subscribed via source and target branches

to all changes: