Duplicity

Merge lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests into lp:~duplicity-team/duplicity/0.7-series

  1. fix_POTFILES.in_and_run-tests
  2. Merge into 0.7-series
Proposed by Aaron Whitehouse
Status: Merged
Merged at revision: 1106
Proposed branch: lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 834 lines (+137/-137)
2 files modified
po/POTFILES.in (+2/-2)
po/duplicity.pot (+135/-135)
To merge this branch: bzr merge lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+263731@code.launchpad.net

Description of the change

Fixed two filename references in po/POTFILES.in, a mistake which crept in in rev 1093 and caused testing/run-tests to fail with "IndexError: list index out of range".

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2015-05-11 12:37:05 +0000
3+++ po/POTFILES.in 2015-07-02 23:44:14 +0000
4@@ -1,5 +1,5 @@
5-bin/duplicity.py
6-bin/rdiffdir.py
7+bin/duplicity
8+bin/rdiffdir
9 duplicity/cached_ops.py
10 duplicity/statistics.py
11 duplicity/selection.py
12
13=== modified file 'po/duplicity.pot'
14--- po/duplicity.pot 2015-05-31 19:14:43 +0000
15+++ po/duplicity.pot 2015-07-02 23:44:14 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: PACKAGE VERSION\n"
19 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
20-"POT-Creation-Date: 2015-05-31 14:03-0500\n"
21+"POT-Creation-Date: 2015-07-03 00:28+0100\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25@@ -18,294 +18,294 @@
26 "Content-Transfer-Encoding: 8bit\n"
27 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
28
29-#: ../bin/duplicity.py:127
30+#: ../bin/duplicity:127
31 msgid "Reuse configured PASSPHRASE as SIGN_PASSPHRASE"
32 msgstr ""
33
34-#: ../bin/duplicity.py:134
35+#: ../bin/duplicity:134
36 msgid "Reuse configured SIGN_PASSPHRASE as PASSPHRASE"
37 msgstr ""
38
39-#: ../bin/duplicity.py:173
40+#: ../bin/duplicity:173
41 msgid "PASSPHRASE variable not set, asking user."
42 msgstr ""
43
44-#: ../bin/duplicity.py:188
45+#: ../bin/duplicity:188
46 msgid "GnuPG passphrase for signing key:"
47 msgstr ""
48
49-#: ../bin/duplicity.py:193
50+#: ../bin/duplicity:193
51 msgid "GnuPG passphrase:"
52 msgstr ""
53
54-#: ../bin/duplicity.py:198
55+#: ../bin/duplicity:198
56 msgid "Retype passphrase for signing key to confirm: "
57 msgstr ""
58
59-#: ../bin/duplicity.py:200
60+#: ../bin/duplicity:200
61 msgid "Retype passphrase to confirm: "
62 msgstr ""
63
64-#: ../bin/duplicity.py:203
65+#: ../bin/duplicity:203
66 msgid "First and second passphrases do not match! Please try again."
67 msgstr ""
68
69-#: ../bin/duplicity.py:208
70+#: ../bin/duplicity:208
71 msgid ""
72 "Cannot use empty passphrase with symmetric encryption! Please try again."
73 msgstr ""
74
75-#: ../bin/duplicity.py:264
76+#: ../bin/duplicity:264
77 #, python-format
78 msgid ""
79 "File %s complete in backup set.\n"
80 "Continuing restart on file %s."
81 msgstr ""
82
83-#: ../bin/duplicity.py:273
84+#: ../bin/duplicity:273
85 #, python-format
86 msgid ""
87 "File %s missing in backup set.\n"
88 "Continuing restart on file %s."
89 msgstr ""
90
91-#: ../bin/duplicity.py:322
92+#: ../bin/duplicity:322
93 #, python-format
94 msgid "File %s was corrupted during upload."
95 msgstr ""
96
97-#: ../bin/duplicity.py:355
98+#: ../bin/duplicity:355
99 msgid ""
100 "Restarting backup, but current encryption settings do not match original "
101 "settings"
102 msgstr ""
103
104-#: ../bin/duplicity.py:378
105+#: ../bin/duplicity:378
106 #, python-format
107 msgid "Restarting after volume %s, file %s, block %s"
108 msgstr ""
109
110-#: ../bin/duplicity.py:445
111+#: ../bin/duplicity:445
112 #, python-format
113 msgid "Processed volume %d"
114 msgstr ""
115
116-#: ../bin/duplicity.py:595
117+#: ../bin/duplicity:595
118 msgid ""
119 "Fatal Error: Unable to start incremental backup. Old signatures not found "
120 "and incremental specified"
121 msgstr ""
122
123-#: ../bin/duplicity.py:599
124+#: ../bin/duplicity:599
125 msgid "No signatures found, switching to full backup."
126 msgstr ""
127
128-#: ../bin/duplicity.py:613
129+#: ../bin/duplicity:613
130 msgid "Backup Statistics"
131 msgstr ""
132
133-#: ../bin/duplicity.py:718
134+#: ../bin/duplicity:718
135 #, python-format
136 msgid "%s not found in archive, no files restored."
137 msgstr ""
138
139-#: ../bin/duplicity.py:722
140+#: ../bin/duplicity:722
141 msgid "No files found in archive - nothing restored."
142 msgstr ""
143
144-#: ../bin/duplicity.py:755
145+#: ../bin/duplicity:755
146 #, python-format
147 msgid "Processed volume %d of %d"
148 msgstr ""
149
150-#: ../bin/duplicity.py:789
151+#: ../bin/duplicity:789
152 #, python-format
153 msgid "Invalid data - %s hash mismatch for file:"
154 msgstr ""
155
156-#: ../bin/duplicity.py:791
157+#: ../bin/duplicity:791
158 #, python-format
159 msgid "Calculated hash: %s"
160 msgstr ""
161
162-#: ../bin/duplicity.py:792
163+#: ../bin/duplicity:792
164 #, python-format
165 msgid "Manifest hash: %s"
166 msgstr ""
167
168-#: ../bin/duplicity.py:831
169+#: ../bin/duplicity:831
170 #, python-format
171 msgid "Volume was signed by key %s, not %s"
172 msgstr ""
173
174-#: ../bin/duplicity.py:863
175+#: ../bin/duplicity:863
176 #, python-format
177 msgid "Verify complete: %s, %s."
178 msgstr ""
179
180-#: ../bin/duplicity.py:864
181+#: ../bin/duplicity:864
182 #, python-format
183 msgid "%d file compared"
184 msgid_plural "%d files compared"
185 msgstr[0] ""
186 msgstr[1] ""
187
188-#: ../bin/duplicity.py:866
189+#: ../bin/duplicity:866
190 #, python-format
191 msgid "%d difference found"
192 msgid_plural "%d differences found"
193 msgstr[0] ""
194 msgstr[1] ""
195
196-#: ../bin/duplicity.py:885
197+#: ../bin/duplicity:885
198 msgid "No extraneous files found, nothing deleted in cleanup."
199 msgstr ""
200
201-#: ../bin/duplicity.py:890
202+#: ../bin/duplicity:890
203 msgid "Deleting this file from backend:"
204 msgid_plural "Deleting these files from backend:"
205 msgstr[0] ""
206 msgstr[1] ""
207
208-#: ../bin/duplicity.py:902
209+#: ../bin/duplicity:902
210 msgid "Found the following file to delete:"
211 msgid_plural "Found the following files to delete:"
212 msgstr[0] ""
213 msgstr[1] ""
214
215-#: ../bin/duplicity.py:906
216+#: ../bin/duplicity:906
217 msgid "Run duplicity again with the --force option to actually delete."
218 msgstr ""
219
220-#: ../bin/duplicity.py:949
221+#: ../bin/duplicity:949
222 msgid "There are backup set(s) at time(s):"
223 msgstr ""
224
225-#: ../bin/duplicity.py:951
226+#: ../bin/duplicity:951
227 msgid "Which can't be deleted because newer sets depend on them."
228 msgstr ""
229
230-#: ../bin/duplicity.py:955
231+#: ../bin/duplicity:955
232 msgid ""
233 "Current active backup chain is older than specified time. However, it will "
234 "not be deleted. To remove all your backups, manually purge the repository."
235 msgstr ""
236
237-#: ../bin/duplicity.py:961
238+#: ../bin/duplicity:961
239 msgid "No old backup sets found, nothing deleted."
240 msgstr ""
241
242-#: ../bin/duplicity.py:964
243+#: ../bin/duplicity:964
244 msgid "Deleting backup chain at time:"
245 msgid_plural "Deleting backup chains at times:"
246 msgstr[0] ""
247 msgstr[1] ""
248
249-#: ../bin/duplicity.py:975
250+#: ../bin/duplicity:975
251 #, python-format
252 msgid "Deleting incremental signature chain %s"
253 msgstr ""
254
255-#: ../bin/duplicity.py:977
256+#: ../bin/duplicity:977
257 #, python-format
258 msgid "Deleting incremental backup chain %s"
259 msgstr ""
260
261-#: ../bin/duplicity.py:980
262+#: ../bin/duplicity:980
263 #, python-format
264 msgid "Deleting complete signature chain %s"
265 msgstr ""
266
267-#: ../bin/duplicity.py:982
268+#: ../bin/duplicity:982
269 #, python-format
270 msgid "Deleting complete backup chain %s"
271 msgstr ""
272
273-#: ../bin/duplicity.py:988
274+#: ../bin/duplicity:988
275 msgid "Found old backup chain at the following time:"
276 msgid_plural "Found old backup chains at the following times:"
277 msgstr[0] ""
278 msgstr[1] ""
279
280-#: ../bin/duplicity.py:992
281+#: ../bin/duplicity:992
282 msgid "Rerun command with --force option to actually delete."
283 msgstr ""
284
285-#: ../bin/duplicity.py:1069
286+#: ../bin/duplicity:1069
287 #, python-format
288 msgid "Deleting local %s (not authoritative at backend)."
289 msgstr ""
290
291-#: ../bin/duplicity.py:1073
292+#: ../bin/duplicity:1073
293 #, python-format
294 msgid "Unable to delete %s: %s"
295 msgstr ""
296
297-#: ../bin/duplicity.py:1101 ../duplicity/dup_temp.py:265
298+#: ../bin/duplicity:1101 ../duplicity/dup_temp.py:265
299 #, python-format
300 msgid "Failed to read %s: %s"
301 msgstr ""
302
303-#: ../bin/duplicity.py:1115
304+#: ../bin/duplicity:1115
305 #, python-format
306 msgid "Copying %s to local cache."
307 msgstr ""
308
309-#: ../bin/duplicity.py:1163
310+#: ../bin/duplicity:1163
311 msgid "Local and Remote metadata are synchronized, no sync needed."
312 msgstr ""
313
314-#: ../bin/duplicity.py:1168
315+#: ../bin/duplicity:1168
316 msgid "Synchronizing remote metadata to local cache..."
317 msgstr ""
318
319-#: ../bin/duplicity.py:1183
320+#: ../bin/duplicity:1183
321 msgid "Sync would copy the following from remote to local:"
322 msgstr ""
323
324-#: ../bin/duplicity.py:1186
325+#: ../bin/duplicity:1186
326 msgid "Sync would remove the following spurious local files:"
327 msgstr ""
328
329-#: ../bin/duplicity.py:1229
330+#: ../bin/duplicity:1229
331 msgid "Unable to get free space on temp."
332 msgstr ""
333
334-#: ../bin/duplicity.py:1237
335+#: ../bin/duplicity:1237
336 #, python-format
337 msgid "Temp space has %d available, backup needs approx %d."
338 msgstr ""
339
340-#: ../bin/duplicity.py:1240
341+#: ../bin/duplicity:1240
342 #, python-format
343 msgid "Temp has %d available, backup will use approx %d."
344 msgstr ""
345
346-#: ../bin/duplicity.py:1248
347+#: ../bin/duplicity:1248
348 msgid "Unable to get max open files."
349 msgstr ""
350
351-#: ../bin/duplicity.py:1252
352+#: ../bin/duplicity:1252
353 #, python-format
354 msgid ""
355 "Max open files of %s is too low, should be >= 1024.\n"
356 "Use 'ulimit -n 1024' or higher to correct.\n"
357 msgstr ""
358
359-#: ../bin/duplicity.py:1302
360+#: ../bin/duplicity:1302
361 msgid ""
362 "RESTART: The first volume failed to upload before termination.\n"
363 " Restart is impossible...starting backup from beginning."
364 msgstr ""
365
366-#: ../bin/duplicity.py:1308
367+#: ../bin/duplicity:1308
368 #, python-format
369 msgid ""
370 "RESTART: Volumes %d to %d failed to upload before termination.\n"
371 " Restarting backup at volume %d."
372 msgstr ""
373
374-#: ../bin/duplicity.py:1315
375+#: ../bin/duplicity:1315
376 #, python-format
377 msgid ""
378 "RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
379@@ -314,7 +314,7 @@
380 " backup then restart the backup from the beginning."
381 msgstr ""
382
383-#: ../bin/duplicity.py:1336
384+#: ../bin/duplicity:1336
385 msgid ""
386 "\n"
387 "PYTHONOPTIMIZE in the environment causes duplicity to fail to\n"
388@@ -324,59 +324,59 @@
389 "See https://bugs.launchpad.net/duplicity/+bug/931175\n"
390 msgstr ""
391
392-#: ../bin/duplicity.py:1419
393+#: ../bin/duplicity:1419
394 #, python-format
395 msgid "Last %s backup left a partial set, restarting."
396 msgstr ""
397
398-#: ../bin/duplicity.py:1423
399+#: ../bin/duplicity:1423
400 #, python-format
401 msgid "Cleaning up previous partial %s backup set, restarting."
402 msgstr ""
403
404-#: ../bin/duplicity.py:1434
405+#: ../bin/duplicity:1434
406 msgid "Last full backup date:"
407 msgstr ""
408
409-#: ../bin/duplicity.py:1436
410+#: ../bin/duplicity:1436
411 msgid "Last full backup date: none"
412 msgstr ""
413
414-#: ../bin/duplicity.py:1438
415+#: ../bin/duplicity:1438
416 msgid "Last full backup is too old, forcing full backup"
417 msgstr ""
418
419-#: ../bin/duplicity.py:1484
420+#: ../bin/duplicity:1484
421 msgid ""
422 "When using symmetric encryption, the signing passphrase must equal the "
423 "encryption passphrase."
424 msgstr ""
425
426-#: ../bin/duplicity.py:1537
427+#: ../bin/duplicity:1537
428 msgid "INT intercepted...exiting."
429 msgstr ""
430
431-#: ../bin/duplicity.py:1545
432+#: ../bin/duplicity:1545
433 #, python-format
434 msgid "GPG error detail: %s"
435 msgstr ""
436
437-#: ../bin/duplicity.py:1555
438+#: ../bin/duplicity:1555
439 #, python-format
440 msgid "User error detail: %s"
441 msgstr ""
442
443-#: ../bin/duplicity.py:1565
444+#: ../bin/duplicity:1565
445 #, python-format
446 msgid "Backend error detail: %s"
447 msgstr ""
448
449-#: ../bin/rdiffdir.py:61 ../duplicity/commandline.py:259
450+#: ../bin/rdiffdir:61 ../duplicity/commandline.py:259
451 #, python-format
452 msgid "Error opening file %s"
453 msgstr ""
454
455-#: ../bin/rdiffdir.py:128
456+#: ../bin/rdiffdir:128
457 #, python-format
458 msgid "File %s already exists, will not overwrite."
459 msgstr ""
460@@ -482,8 +482,8 @@
461 #. --archive-dir <path>
462 #: ../duplicity/commandline.py:280 ../duplicity/commandline.py:290
463 #: ../duplicity/commandline.py:307 ../duplicity/commandline.py:381
464-#: ../duplicity/commandline.py:586 ../duplicity/commandline.py:619
465-#: ../duplicity/commandline.py:805
466+#: ../duplicity/commandline.py:399 ../duplicity/commandline.py:588
467+#: ../duplicity/commandline.py:621 ../duplicity/commandline.py:807
468 msgid "path"
469 msgstr ""
470
471@@ -494,8 +494,8 @@
472 #. Used in usage help to represent an ID for a GnuPG key. Example:
473 #. --encrypt-key <gpg_key_id>
474 #: ../duplicity/commandline.py:302 ../duplicity/commandline.py:309
475-#: ../duplicity/commandline.py:403 ../duplicity/commandline.py:570
476-#: ../duplicity/commandline.py:778
477+#: ../duplicity/commandline.py:405 ../duplicity/commandline.py:572
478+#: ../duplicity/commandline.py:780
479 msgid "gpg-key-id"
480 msgstr ""
481
482@@ -503,22 +503,22 @@
483 #. matching one or more files, as described in the documentation.
484 #. Example:
485 #. --exclude <shell_pattern>
486-#: ../duplicity/commandline.py:317 ../duplicity/commandline.py:428
487-#: ../duplicity/commandline.py:828
488+#: ../duplicity/commandline.py:317 ../duplicity/commandline.py:430
489+#: ../duplicity/commandline.py:830
490 msgid "shell_pattern"
491 msgstr ""
492
493 #. Used in usage help to represent the name of a file. Example:
494 #. --log-file <filename>
495 #: ../duplicity/commandline.py:323 ../duplicity/commandline.py:332
496-#: ../duplicity/commandline.py:339 ../duplicity/commandline.py:430
497-#: ../duplicity/commandline.py:437 ../duplicity/commandline.py:450
498-#: ../duplicity/commandline.py:774
499+#: ../duplicity/commandline.py:339 ../duplicity/commandline.py:432
500+#: ../duplicity/commandline.py:439 ../duplicity/commandline.py:452
501+#: ../duplicity/commandline.py:776
502 msgid "filename"
503 msgstr ""
504
505 #. Used in usage help to represent a regular expression (regexp).
506-#: ../duplicity/commandline.py:346 ../duplicity/commandline.py:441
507+#: ../duplicity/commandline.py:346 ../duplicity/commandline.py:443
508 msgid "regular_expression"
509 msgstr ""
510
511@@ -526,20 +526,20 @@
512 #. point in time, as described in the documentation. Example:
513 #. duplicity remove-older-than time [options] target_url
514 #: ../duplicity/commandline.py:350 ../duplicity/commandline.py:393
515-#: ../duplicity/commandline.py:512 ../duplicity/commandline.py:860
516+#: ../duplicity/commandline.py:514 ../duplicity/commandline.py:862
517 msgid "time"
518 msgstr ""
519
520 #. Used in usage help. (Should be consistent with the "Options:"
521 #. header.) Example:
522 #. duplicity [full|incremental] [options] source_dir target_url
523-#: ../duplicity/commandline.py:399 ../duplicity/commandline.py:492
524-#: ../duplicity/commandline.py:515 ../duplicity/commandline.py:578
525-#: ../duplicity/commandline.py:793
526+#: ../duplicity/commandline.py:401 ../duplicity/commandline.py:494
527+#: ../duplicity/commandline.py:517 ../duplicity/commandline.py:580
528+#: ../duplicity/commandline.py:795
529 msgid "options"
530 msgstr ""
531
532-#: ../duplicity/commandline.py:414
533+#: ../duplicity/commandline.py:416
534 #, python-format
535 msgid ""
536 "Running in 'ignore errors' mode due to %s; please re-consider if this was "
537@@ -547,152 +547,152 @@
538 msgstr ""
539
540 #. Used in usage help to represent an imap mailbox
541-#: ../duplicity/commandline.py:426
542+#: ../duplicity/commandline.py:428
543 msgid "imap_mailbox"
544 msgstr ""
545
546-#: ../duplicity/commandline.py:444
547+#: ../duplicity/commandline.py:446
548 msgid "file_descriptor"
549 msgstr ""
550
551 #. Used in usage help to represent a desired number of
552 #. something. Example:
553 #. --num-retries <number>
554-#: ../duplicity/commandline.py:455 ../duplicity/commandline.py:477
555-#: ../duplicity/commandline.py:489 ../duplicity/commandline.py:498
556-#: ../duplicity/commandline.py:536 ../duplicity/commandline.py:541
557-#: ../duplicity/commandline.py:545 ../duplicity/commandline.py:614
558-#: ../duplicity/commandline.py:788
559+#: ../duplicity/commandline.py:457 ../duplicity/commandline.py:479
560+#: ../duplicity/commandline.py:491 ../duplicity/commandline.py:500
561+#: ../duplicity/commandline.py:538 ../duplicity/commandline.py:543
562+#: ../duplicity/commandline.py:547 ../duplicity/commandline.py:616
563+#: ../duplicity/commandline.py:790
564 msgid "number"
565 msgstr ""
566
567 #. Used in usage help (noun)
568-#: ../duplicity/commandline.py:458
569+#: ../duplicity/commandline.py:460
570 msgid "backup name"
571 msgstr ""
572
573 #. noun
574-#: ../duplicity/commandline.py:554 ../duplicity/commandline.py:557
575-#: ../duplicity/commandline.py:759
576+#: ../duplicity/commandline.py:556 ../duplicity/commandline.py:559
577+#: ../duplicity/commandline.py:761
578 msgid "command"
579 msgstr ""
580
581-#: ../duplicity/commandline.py:560
582+#: ../duplicity/commandline.py:562
583 msgid "pyrax|cloudfiles"
584 msgstr ""
585
586-#: ../duplicity/commandline.py:581
587+#: ../duplicity/commandline.py:583
588 msgid "pem formatted bundle of certificate authorities"
589 msgstr ""
590
591 #. Used in usage help. Example:
592 #. --timeout <seconds>
593-#: ../duplicity/commandline.py:591 ../duplicity/commandline.py:822
594+#: ../duplicity/commandline.py:593 ../duplicity/commandline.py:824
595 msgid "seconds"
596 msgstr ""
597
598 #. abbreviation for "character" (noun)
599-#: ../duplicity/commandline.py:597 ../duplicity/commandline.py:756
600+#: ../duplicity/commandline.py:599 ../duplicity/commandline.py:758
601 msgid "char"
602 msgstr ""
603
604-#: ../duplicity/commandline.py:722
605+#: ../duplicity/commandline.py:724
606 #, python-format
607 msgid "Using archive dir: %s"
608 msgstr ""
609
610-#: ../duplicity/commandline.py:723
611+#: ../duplicity/commandline.py:725
612 #, python-format
613 msgid "Using backup name: %s"
614 msgstr ""
615
616-#: ../duplicity/commandline.py:730
617+#: ../duplicity/commandline.py:732
618 #, python-format
619 msgid "Command line error: %s"
620 msgstr ""
621
622-#: ../duplicity/commandline.py:731
623+#: ../duplicity/commandline.py:733
624 msgid "Enter 'duplicity --help' for help screen."
625 msgstr ""
626
627 #. Used in usage help to represent a Unix-style path name. Example:
628 #. rsync://user[:password]@other_host[:port]//absolute_path
629-#: ../duplicity/commandline.py:744
630+#: ../duplicity/commandline.py:746
631 msgid "absolute_path"
632 msgstr ""
633
634 #. Used in usage help. Example:
635 #. tahoe://alias/some_dir
636-#: ../duplicity/commandline.py:748
637+#: ../duplicity/commandline.py:750
638 msgid "alias"
639 msgstr ""
640
641 #. Used in help to represent a "bucket name" for Amazon Web
642 #. Services' Simple Storage Service (S3). Example:
643 #. s3://other.host/bucket_name[/prefix]
644-#: ../duplicity/commandline.py:753
645+#: ../duplicity/commandline.py:755
646 msgid "bucket_name"
647 msgstr ""
648
649 #. Used in usage help to represent the name of a container in
650 #. Amazon Web Services' Cloudfront. Example:
651 #. cf+http://container_name
652-#: ../duplicity/commandline.py:764
653+#: ../duplicity/commandline.py:766
654 msgid "container_name"
655 msgstr ""
656
657 #. noun
658-#: ../duplicity/commandline.py:767
659+#: ../duplicity/commandline.py:769
660 msgid "count"
661 msgstr ""
662
663 #. Used in usage help to represent the name of a file directory
664-#: ../duplicity/commandline.py:770
665+#: ../duplicity/commandline.py:772
666 msgid "directory"
667 msgstr ""
668
669 #. Used in usage help, e.g. to represent the name of a code
670 #. module. Example:
671 #. rsync://user[:password]@other.host[:port]::/module/some_dir
672-#: ../duplicity/commandline.py:783
673+#: ../duplicity/commandline.py:785
674 msgid "module"
675 msgstr ""
676
677 #. Used in usage help to represent an internet hostname. Example:
678 #. ftp://user[:password]@other.host[:port]/some_dir
679-#: ../duplicity/commandline.py:797
680+#: ../duplicity/commandline.py:799
681 msgid "other.host"
682 msgstr ""
683
684 #. Used in usage help. Example:
685 #. ftp://user[:password]@other.host[:port]/some_dir
686-#: ../duplicity/commandline.py:801
687+#: ../duplicity/commandline.py:803
688 msgid "password"
689 msgstr ""
690
691 #. Used in usage help to represent a TCP port number. Example:
692 #. ftp://user[:password]@other.host[:port]/some_dir
693-#: ../duplicity/commandline.py:809
694+#: ../duplicity/commandline.py:811
695 msgid "port"
696 msgstr ""
697
698 #. Used in usage help. This represents a string to be used as a
699 #. prefix to names for backup files created by Duplicity. Example:
700 #. s3://other.host/bucket_name[/prefix]
701-#: ../duplicity/commandline.py:814
702+#: ../duplicity/commandline.py:816
703 msgid "prefix"
704 msgstr ""
705
706 #. Used in usage help to represent a Unix-style path name. Example:
707 #. rsync://user[:password]@other.host[:port]/relative_path
708-#: ../duplicity/commandline.py:818
709+#: ../duplicity/commandline.py:820
710 msgid "relative_path"
711 msgstr ""
712
713 #. Used in usage help to represent the name of a single file
714 #. directory or a Unix-style path to a directory. Example:
715 #. file:///some_dir
716-#: ../duplicity/commandline.py:833
717+#: ../duplicity/commandline.py:835
718 msgid "some_dir"
719 msgstr ""
720
721@@ -700,14 +700,14 @@
722 #. directory or a Unix-style path to a directory where files will be
723 #. coming FROM. Example:
724 #. duplicity [full|incremental] [options] source_dir target_url
725-#: ../duplicity/commandline.py:839
726+#: ../duplicity/commandline.py:841
727 msgid "source_dir"
728 msgstr ""
729
730 #. Used in usage help to represent a URL files will be coming
731 #. FROM. Example:
732 #. duplicity [restore] [options] source_url target_dir
733-#: ../duplicity/commandline.py:844
734+#: ../duplicity/commandline.py:846
735 msgid "source_url"
736 msgstr ""
737
738@@ -715,75 +715,75 @@
739 #. directory or a Unix-style path to a directory. where files will be
740 #. going TO. Example:
741 #. duplicity [restore] [options] source_url target_dir
742-#: ../duplicity/commandline.py:850
743+#: ../duplicity/commandline.py:852
744 msgid "target_dir"
745 msgstr ""
746
747 #. Used in usage help to represent a URL files will be going TO.
748 #. Example:
749 #. duplicity [full|incremental] [options] source_dir target_url
750-#: ../duplicity/commandline.py:855
751+#: ../duplicity/commandline.py:857
752 msgid "target_url"
753 msgstr ""
754
755 #. Used in usage help to represent a user name (i.e. login).
756 #. Example:
757 #. ftp://user[:password]@other.host[:port]/some_dir
758-#: ../duplicity/commandline.py:865
759+#: ../duplicity/commandline.py:867
760 msgid "user"
761 msgstr ""
762
763 #. Header in usage help
764-#: ../duplicity/commandline.py:883
765+#: ../duplicity/commandline.py:885
766 msgid "Backends and their URL formats:"
767 msgstr ""
768
769 #. Header in usage help
770-#: ../duplicity/commandline.py:912
771+#: ../duplicity/commandline.py:914
772 msgid "Commands:"
773 msgstr ""
774
775-#: ../duplicity/commandline.py:936
776+#: ../duplicity/commandline.py:938
777 #, python-format
778 msgid "Specified archive directory '%s' does not exist, or is not a directory"
779 msgstr ""
780
781-#: ../duplicity/commandline.py:945
782+#: ../duplicity/commandline.py:947
783 #, python-format
784 msgid ""
785 "Sign key should be an 8, 16 alt. 40 character hex string, like 'AA0E73D2'.\n"
786 "Received '%s' instead."
787 msgstr ""
788
789-#: ../duplicity/commandline.py:1005
790+#: ../duplicity/commandline.py:1007
791 #, python-format
792 msgid ""
793 "Restore destination directory %s already exists.\n"
794 "Will not overwrite."
795 msgstr ""
796
797-#: ../duplicity/commandline.py:1010
798+#: ../duplicity/commandline.py:1012
799 #, python-format
800 msgid "Verify directory %s does not exist"
801 msgstr ""
802
803-#: ../duplicity/commandline.py:1016
804+#: ../duplicity/commandline.py:1018
805 #, python-format
806 msgid "Backup source directory %s does not exist."
807 msgstr ""
808
809-#: ../duplicity/commandline.py:1047
810+#: ../duplicity/commandline.py:1049
811 #, python-format
812 msgid "Command line warning: %s"
813 msgstr ""
814
815-#: ../duplicity/commandline.py:1047
816+#: ../duplicity/commandline.py:1049
817 msgid ""
818 "Selection options --exclude/--include\n"
819 "currently work only when backing up,not restoring."
820 msgstr ""
821
822-#: ../duplicity/commandline.py:1095
823+#: ../duplicity/commandline.py:1097
824 #, python-format
825 msgid ""
826 "Bad URL '%s'.\n"
827@@ -791,7 +791,7 @@
828 "\"file:///usr/local\". See the man page for more information."
829 msgstr ""
830
831-#: ../duplicity/commandline.py:1120
832+#: ../duplicity/commandline.py:1122
833 msgid "Main action: "
834 msgstr ""
835

Subscribers

People subscribed via source and target branches