Duplicity

Merge lp:~duplicity-team/duplicity/po-updates into lp:duplicity/0.6

  1. po-updates
  2. Merge into 0.6-series
Proposed by Larry Gilbert
Status: Merged
Approved by: Kenneth Loafman
Approved revision: 608
Merged at revision: not available
Proposed branch: lp:~duplicity-team/duplicity/po-updates
Merge into: lp:duplicity/0.6
Diff against target: None lines
To merge this branch: bzr merge lp:~duplicity-team/duplicity/po-updates
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+12124@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Larry Gilbert (l2g) wrote :

These should go into the 0.6 branch since that is what the translations in Rosetta are currently based on. (Launchpad has separate translation setups for different series of code now.)

This includes more Bulgarian and a few more Portuguese translations.

lp:~duplicity-team/duplicity/po-updates updated
609. By Launchpad Code Hosting <codehost@crowberry>

Launchpad automatic translations update.

610. By Launchpad Code Hosting <codehost@crowberry>

Launchpad automatic translations update.

611. By Launchpad Code Hosting <codehost@crowberry>

Launchpad automatic translations update.

612. By Launchpad Code Hosting <codehost@crowberry>

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/bg.po'
2--- po/bg.po 2009-09-08 03:32:43 +0000
3+++ po/bg.po 2009-09-19 11:18:33 +0000
4@@ -7,15 +7,15 @@
5 msgstr ""
6 "Project-Id-Version: duplicity\n"
7 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
8-"POT-Creation-Date: 2009-08-30 23:01-0700\n"
9-"PO-Revision-Date: 2009-09-04 22:23+0000\n"
10-"Last-Translator: Plamen K. Kosseff <Unknown>\n"
11+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
12+"PO-Revision-Date: 2009-09-15 02:39+0000\n"
13+"Last-Translator: Kenneth Loafman <kenneth@loafman.com>\n"
14 "Language-Team: Bulgarian <bg@li.org>\n"
15 "MIME-Version: 1.0\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
18 "Plural-Forms: nplurals=2; plural=n != 1;\n"
19-"X-Launchpad-Export-Date: 2009-09-08 02:56+0000\n"
20+"X-Launchpad-Export-Date: 2009-09-19 11:18+0000\n"
21 "X-Generator: Launchpad (build Unknown)\n"
22
23 #: ../duplicity-bin:191
24@@ -271,24 +271,26 @@
25 #: ../duplicity-bin:1162
26 #, python-format
27 msgid "Last %s backup left a partial set, restarting."
28-msgstr ""
29+msgstr "Предишният опит %s остави частично резервно копие. Рестартиране."
30
31 #: ../duplicity-bin:1166
32 #, python-format
33 msgid "Cleaning up previous partial %s backup set, restarting."
34-msgstr ""
35+msgstr "Премахване на предишното частично резервно копие %s и рестартиране."
36
37 #: ../duplicity-bin:1177
38 msgid "Last full backup date:"
39-msgstr ""
40+msgstr "Дата на последното пълно резервно копие:"
41
42 #: ../duplicity-bin:1179
43 msgid "Last full backup date: none"
44-msgstr ""
45+msgstr "Дата на последното пълно резервно копие: Не съществува"
46
47 #: ../duplicity-bin:1181
48 msgid "Last full backup is too old, forcing full backup"
49 msgstr ""
50+"Последното пълно резервно копие е прекалено старо. Ще бъде направено пълно "
51+"резервно копие."
52
53 #: ../duplicity-bin:1255
54 #, python-format
55@@ -308,7 +310,7 @@
56 #: ../duplicity/asyncscheduler.py:69
57 #, python-format
58 msgid "instantiating at concurrency %d"
59-msgstr ""
60+msgstr "Ще бъдат изпълнявани %d конкурентни операции."
61
62 #: ../duplicity/asyncscheduler.py:96
63 msgid "inserting barrier"
64@@ -316,15 +318,15 @@
65
66 #: ../duplicity/asyncscheduler.py:145
67 msgid "running task synchronously (asynchronicity disabled)"
68-msgstr ""
69+msgstr "Асинхронното изпълнение е забранено. Изпълняване синхронно"
70
71 #: ../duplicity/asyncscheduler.py:151
72 msgid "scheduling task for asynchronous execution"
73-msgstr ""
74+msgstr "Добавяна на асинхронна задача."
75
76 #: ../duplicity/asyncscheduler.py:181
77 msgid "task completed successfully"
78-msgstr ""
79+msgstr "задачата приключи успешно"
80
81 #: ../duplicity/asyncscheduler.py:192
82 msgid ""
83@@ -334,31 +336,31 @@
84 #: ../duplicity/asyncscheduler.py:215 ../duplicity/asyncscheduler.py:236
85 #, python-format
86 msgid "active workers = %d"
87-msgstr ""
88+msgstr "активни задачи = %d"
89
90 #: ../duplicity/asyncscheduler.py:256
91 #, python-format
92 msgid "task execution done (success: %s)"
93-msgstr ""
94+msgstr "задачата приключи успешно %s"
95
96 #: ../duplicity/backend.py:370
97 #, python-format
98 msgid "Running '%s'"
99-msgstr ""
100+msgstr "Изпълнение на '%s'"
101
102 #: ../duplicity/backend.py:384
103 #, python-format
104 msgid "Running '%s' (attempt #%d)"
105 msgid_plural "Running '%s' (attempt #%d)"
106-msgstr[0] ""
107-msgstr[1] ""
108+msgstr[0] "Изпълнение на '%s' (опит #%d)"
109+msgstr[1] "Изпълнение на '%s' (опит #%d)"
110
111 #: ../duplicity/backend.py:389 ../duplicity/backend.py:430
112 #, python-format
113 msgid "Running '%s' failed (attempt #%d)"
114 msgid_plural "Running '%s' failed (attempt #%d)"
115-msgstr[0] ""
116-msgstr[1] ""
117+msgstr[0] "Изпълнението на '%s' се провали (опит #%d)"
118+msgstr[1] "Изпълнението на '%s' се провали (опит #%d)"
119
120 #: ../duplicity/backend.py:392 ../duplicity/backend.py:433
121 #, python-format
122@@ -411,12 +413,12 @@
123 #: ../duplicity/collections.py:375
124 #, python-format
125 msgid "Number of contained backup sets: %d"
126-msgstr ""
127+msgstr "Брой на наличните архивни копия: %d"
128
129 #: ../duplicity/collections.py:377
130 #, python-format
131 msgid "Total number of contained volumes: %d"
132-msgstr ""
133+msgstr "Общ брой на наличните архивни файлове: %d"
134
135 #: ../duplicity/collections.py:379
136 msgid "Type of backup set:"
137@@ -424,7 +426,7 @@
138
139 #: ../duplicity/collections.py:379
140 msgid "Time:"
141-msgstr ""
142+msgstr "Време:"
143
144 #: ../duplicity/collections.py:379
145 msgid "Num volumes:"
146@@ -432,23 +434,23 @@
147
148 #: ../duplicity/collections.py:383
149 msgid "Full"
150-msgstr ""
151+msgstr "Пълно"
152
153 #: ../duplicity/collections.py:386
154 msgid "Incremental"
155-msgstr ""
156+msgstr "Последователно"
157
158 #: ../duplicity/collections.py:446
159 msgid "local"
160-msgstr ""
161+msgstr "локално"
162
163 #: ../duplicity/collections.py:448
164 msgid "remote"
165-msgstr ""
166+msgstr "отдалечено"
167
168 #: ../duplicity/collections.py:600
169 msgid "Collection Status"
170-msgstr ""
171+msgstr "Състояние на колекцията от архивни копия"
172
173 #: ../duplicity/collections.py:602
174 #, python-format
175@@ -494,97 +496,99 @@
176 msgstr[0] ""
177 msgstr[1] ""
178
179-#: ../duplicity/collections.py:633
180-msgid "These may be deleted by running duplicity with the --cleanup option."
181+#. "cleanup" is a hard-coded command, so do not translate it
182+#: ../duplicity/collections.py:634
183+msgid ""
184+"These may be deleted by running duplicity with the \"cleanup\" command."
185 msgstr ""
186
187-#: ../duplicity/collections.py:636
188+#: ../duplicity/collections.py:637
189 msgid "No orphaned or incomplete backup sets found."
190 msgstr ""
191
192-#: ../duplicity/collections.py:652
193+#: ../duplicity/collections.py:653
194 #, python-format
195 msgid "%d file exists on backend"
196 msgid_plural "%d files exist on backend"
197-msgstr[0] ""
198-msgstr[1] ""
199+msgstr[0] "%d файл съществува в отдалечения архив"
200+msgstr[1] "%d файла съществуват в отдалечения архив"
201
202-#: ../duplicity/collections.py:659
203+#: ../duplicity/collections.py:660
204 #, python-format
205 msgid "%d file exists in cache"
206 msgid_plural "%d files exist in cache"
207-msgstr[0] ""
208-msgstr[1] ""
209+msgstr[0] "%d файл съществува в локалния кеш"
210+msgstr[1] "%d файла съществуват в локалния кеш"
211
212-#: ../duplicity/collections.py:711
213+#: ../duplicity/collections.py:712
214 msgid ""
215 "Warning, discarding last backup set, because of missing signature file."
216 msgstr ""
217
218-#: ../duplicity/collections.py:744
219+#: ../duplicity/collections.py:745
220 msgid "Warning, found the following local orphaned signature file:"
221 msgid_plural "Warning, found the following local orphaned signature files:"
222 msgstr[0] ""
223 msgstr[1] ""
224
225-#: ../duplicity/collections.py:753
226+#: ../duplicity/collections.py:754
227 msgid "Warning, found the following remote orphaned signature file:"
228 msgid_plural "Warning, found the following remote orphaned signature files:"
229 msgstr[0] ""
230 msgstr[1] ""
231
232-#: ../duplicity/collections.py:763
233+#: ../duplicity/collections.py:764
234 msgid "Warning, found an unnecessary signature chain"
235 msgid_plural "Warning, found unnecessary signature chains"
236 msgstr[0] ""
237 msgstr[1] ""
238
239-#: ../duplicity/collections.py:771
240+#: ../duplicity/collections.py:772
241 msgid "Warning, found signatures but no corresponding backup files"
242 msgstr ""
243
244-#: ../duplicity/collections.py:775
245+#: ../duplicity/collections.py:776
246 msgid ""
247 "Warning, found incomplete backup sets, probably left from aborted session"
248 msgstr ""
249
250-#: ../duplicity/collections.py:779
251+#: ../duplicity/collections.py:780
252 msgid "Warning, found the following orphaned backup file:"
253 msgid_plural "Warning, found the following orphaned backup files:"
254 msgstr[0] ""
255 msgstr[1] ""
256
257-#: ../duplicity/collections.py:797
258+#: ../duplicity/collections.py:798
259 #, python-format
260 msgid "Extracting backup chains from list of files: %s"
261 msgstr ""
262
263-#: ../duplicity/collections.py:807
264+#: ../duplicity/collections.py:808
265 #, python-format
266 msgid "File %s is part of known set"
267 msgstr ""
268
269-#: ../duplicity/collections.py:810
270+#: ../duplicity/collections.py:811
271 #, python-format
272 msgid "File %s is not part of a known set; creating new set"
273 msgstr ""
274
275-#: ../duplicity/collections.py:815
276+#: ../duplicity/collections.py:816
277 #, python-format
278 msgid "Ignoring file (rejected by backup set) '%s'"
279 msgstr ""
280
281-#: ../duplicity/collections.py:828
282+#: ../duplicity/collections.py:829
283 #, python-format
284 msgid "Found backup chain %s"
285 msgstr ""
286
287-#: ../duplicity/collections.py:833
288+#: ../duplicity/collections.py:834
289 #, python-format
290 msgid "Added set %s to pre-existing chain %s"
291 msgstr ""
292
293-#: ../duplicity/collections.py:837
294+#: ../duplicity/collections.py:838
295 #, python-format
296 msgid "Found orphaned set %s"
297 msgstr ""
298@@ -1045,71 +1049,71 @@
299 msgid "Writing %s of type %s"
300 msgstr ""
301
302-#: ../duplicity/path.py:210 ../duplicity/path.py:269
303+#: ../duplicity/path.py:209 ../duplicity/path.py:268
304 #, python-format
305 msgid "Warning: %s has negative mtime, treating as 0."
306 msgstr ""
307
308-#: ../duplicity/path.py:334
309+#: ../duplicity/path.py:333
310 msgid "Difference found:"
311 msgstr ""
312
313-#: ../duplicity/path.py:340
314+#: ../duplicity/path.py:339
315 #, python-format
316 msgid "New file %s"
317 msgstr ""
318
319-#: ../duplicity/path.py:343
320+#: ../duplicity/path.py:342
321 #, python-format
322 msgid "File %s is missing"
323 msgstr ""
324
325-#: ../duplicity/path.py:346
326+#: ../duplicity/path.py:345
327 #, python-format
328 msgid "File %%s has type %s, expected %s"
329 msgstr ""
330
331-#: ../duplicity/path.py:352 ../duplicity/path.py:378
332+#: ../duplicity/path.py:351 ../duplicity/path.py:377
333 #, python-format
334 msgid "File %%s has permissions %o, expected %o"
335 msgstr ""
336
337-#: ../duplicity/path.py:357
338+#: ../duplicity/path.py:356
339 #, python-format
340 msgid "File %%s has mtime %s, expected %s"
341 msgstr ""
342
343-#: ../duplicity/path.py:365
344+#: ../duplicity/path.py:364
345 #, python-format
346 msgid "Data for file %s is different"
347 msgstr ""
348
349-#: ../duplicity/path.py:373
350+#: ../duplicity/path.py:372
351 #, python-format
352 msgid "Symlink %%s points to %s, expected %s"
353 msgstr ""
354
355-#: ../duplicity/path.py:382
356+#: ../duplicity/path.py:381
357 #, python-format
358 msgid "Device file %%s has numbers %s, expected %s"
359 msgstr ""
360
361-#: ../duplicity/path.py:528
362+#: ../duplicity/path.py:527
363 #, python-format
364 msgid "Making directory %s"
365 msgstr ""
366
367-#: ../duplicity/path.py:538
368+#: ../duplicity/path.py:537
369 #, python-format
370 msgid "Deleting %s"
371 msgstr ""
372
373-#: ../duplicity/path.py:547
374+#: ../duplicity/path.py:546
375 #, python-format
376 msgid "Touching %s"
377 msgstr ""
378
379-#: ../duplicity/path.py:554
380+#: ../duplicity/path.py:553
381 #, python-format
382 msgid "Deleting tree %s"
383 msgstr ""
384@@ -1119,38 +1123,33 @@
385 msgid "Error listing directory %s"
386 msgstr ""
387
388-#: ../duplicity/selection.py:118
389-#, python-format
390-msgid "Skipping socket %s/%s"
391-msgstr ""
392-
393 #: ../duplicity/selection.py:120
394 #, python-format
395-msgid "Error initializing file %s/%s"
396+msgid "Skipping socket %s"
397 msgstr ""
398
399-#: ../duplicity/selection.py:122
400+#: ../duplicity/selection.py:124
401 #, python-format
402-msgid "Error accessing possibly locked file %s/%s"
403+msgid "Error initializing file %s"
404 msgstr ""
405
406-#: ../duplicity/selection.py:141
407+#: ../duplicity/selection.py:128 ../duplicity/selection.py:149
408 #, python-format
409 msgid "Error accessing possibly locked file %s"
410 msgstr ""
411
412-#: ../duplicity/selection.py:154
413+#: ../duplicity/selection.py:164
414 #, python-format
415 msgid "Warning: base %s doesn't exist, continuing"
416 msgstr ""
417
418-#: ../duplicity/selection.py:157 ../duplicity/selection.py:175
419-#: ../duplicity/selection.py:178
420+#: ../duplicity/selection.py:167 ../duplicity/selection.py:185
421+#: ../duplicity/selection.py:188
422 #, python-format
423 msgid "Selecting %s"
424 msgstr ""
425
426-#: ../duplicity/selection.py:259
427+#: ../duplicity/selection.py:269
428 #, python-format
429 msgid ""
430 "Fatal Error: The file specification\n"
431@@ -1161,14 +1160,14 @@
432 "pattern (such as '**') which matches the base directory."
433 msgstr ""
434
435-#: ../duplicity/selection.py:267
436+#: ../duplicity/selection.py:277
437 #, python-format
438 msgid ""
439 "Fatal Error while processing expression\n"
440 "%s"
441 msgstr ""
442
443-#: ../duplicity/selection.py:277
444+#: ../duplicity/selection.py:287
445 #, python-format
446 msgid ""
447 "Last selection expression:\n"
448@@ -1178,43 +1177,43 @@
449 "probably isn't what you meant."
450 msgstr ""
451
452-#: ../duplicity/selection.py:302
453+#: ../duplicity/selection.py:312
454 #, python-format
455 msgid "Reading filelist %s"
456 msgstr ""
457
458-#: ../duplicity/selection.py:305
459+#: ../duplicity/selection.py:315
460 #, python-format
461 msgid "Sorting filelist %s"
462 msgstr ""
463
464-#: ../duplicity/selection.py:332
465+#: ../duplicity/selection.py:342
466 #, python-format
467 msgid ""
468 "Warning: file specification '%s' in filelist %s\n"
469 "doesn't start with correct prefix %s. Ignoring."
470 msgstr ""
471
472-#: ../duplicity/selection.py:336
473+#: ../duplicity/selection.py:346
474 msgid "Future prefix errors will not be logged."
475 msgstr ""
476
477-#: ../duplicity/selection.py:352
478+#: ../duplicity/selection.py:362
479 #, python-format
480 msgid "Error closing filelist %s"
481 msgstr ""
482
483-#: ../duplicity/selection.py:419
484+#: ../duplicity/selection.py:429
485 #, python-format
486 msgid "Reading globbing filelist %s"
487 msgstr ""
488
489-#: ../duplicity/selection.py:452
490+#: ../duplicity/selection.py:462
491 #, python-format
492 msgid "Error compiling regular expression %s"
493 msgstr ""
494
495-#: ../duplicity/selection.py:468
496+#: ../duplicity/selection.py:478
497 msgid ""
498 "Warning: exclude-device-files is not the first selector.\n"
499 "This may not be what you intended"
500
501=== modified file 'po/en_GB.po'
502--- po/en_GB.po 2009-09-08 03:32:43 +0000
503+++ po/en_GB.po 2009-09-19 11:18:33 +0000
504@@ -7,7 +7,7 @@
505 msgstr ""
506 "Project-Id-Version: duplicity\n"
507 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
508-"POT-Creation-Date: 2009-08-30 23:01-0700\n"
509+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
510 "PO-Revision-Date: 2009-09-06 12:51+0000\n"
511 "Last-Translator: Kenneth Loafman <kenneth@loafman.com>\n"
512 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
513@@ -15,7 +15,7 @@
514 "Content-Type: text/plain; charset=UTF-8\n"
515 "Content-Transfer-Encoding: 8bit\n"
516 "Plural-Forms: nplurals=2; plural=n != 1;\n"
517-"X-Launchpad-Export-Date: 2009-09-08 02:56+0000\n"
518+"X-Launchpad-Export-Date: 2009-09-19 11:18+0000\n"
519 "X-Generator: Launchpad (build Unknown)\n"
520
521 #: ../duplicity-bin:191
522@@ -462,97 +462,99 @@
523 msgstr[0] ""
524 msgstr[1] ""
525
526-#: ../duplicity/collections.py:633
527-msgid "These may be deleted by running duplicity with the --cleanup option."
528+#. "cleanup" is a hard-coded command, so do not translate it
529+#: ../duplicity/collections.py:634
530+msgid ""
531+"These may be deleted by running duplicity with the \"cleanup\" command."
532 msgstr ""
533
534-#: ../duplicity/collections.py:636
535+#: ../duplicity/collections.py:637
536 msgid "No orphaned or incomplete backup sets found."
537 msgstr ""
538
539-#: ../duplicity/collections.py:652
540+#: ../duplicity/collections.py:653
541 #, python-format
542 msgid "%d file exists on backend"
543 msgid_plural "%d files exist on backend"
544 msgstr[0] ""
545 msgstr[1] ""
546
547-#: ../duplicity/collections.py:659
548+#: ../duplicity/collections.py:660
549 #, python-format
550 msgid "%d file exists in cache"
551 msgid_plural "%d files exist in cache"
552 msgstr[0] ""
553 msgstr[1] ""
554
555-#: ../duplicity/collections.py:711
556+#: ../duplicity/collections.py:712
557 msgid ""
558 "Warning, discarding last backup set, because of missing signature file."
559 msgstr ""
560
561-#: ../duplicity/collections.py:744
562+#: ../duplicity/collections.py:745
563 msgid "Warning, found the following local orphaned signature file:"
564 msgid_plural "Warning, found the following local orphaned signature files:"
565 msgstr[0] ""
566 msgstr[1] ""
567
568-#: ../duplicity/collections.py:753
569+#: ../duplicity/collections.py:754
570 msgid "Warning, found the following remote orphaned signature file:"
571 msgid_plural "Warning, found the following remote orphaned signature files:"
572 msgstr[0] ""
573 msgstr[1] ""
574
575-#: ../duplicity/collections.py:763
576+#: ../duplicity/collections.py:764
577 msgid "Warning, found an unnecessary signature chain"
578 msgid_plural "Warning, found unnecessary signature chains"
579 msgstr[0] ""
580 msgstr[1] ""
581
582-#: ../duplicity/collections.py:771
583+#: ../duplicity/collections.py:772
584 msgid "Warning, found signatures but no corresponding backup files"
585 msgstr ""
586
587-#: ../duplicity/collections.py:775
588+#: ../duplicity/collections.py:776
589 msgid ""
590 "Warning, found incomplete backup sets, probably left from aborted session"
591 msgstr ""
592
593-#: ../duplicity/collections.py:779
594+#: ../duplicity/collections.py:780
595 msgid "Warning, found the following orphaned backup file:"
596 msgid_plural "Warning, found the following orphaned backup files:"
597 msgstr[0] ""
598 msgstr[1] ""
599
600-#: ../duplicity/collections.py:797
601+#: ../duplicity/collections.py:798
602 #, python-format
603 msgid "Extracting backup chains from list of files: %s"
604 msgstr ""
605
606-#: ../duplicity/collections.py:807
607+#: ../duplicity/collections.py:808
608 #, python-format
609 msgid "File %s is part of known set"
610 msgstr ""
611
612-#: ../duplicity/collections.py:810
613+#: ../duplicity/collections.py:811
614 #, python-format
615 msgid "File %s is not part of a known set; creating new set"
616 msgstr ""
617
618-#: ../duplicity/collections.py:815
619+#: ../duplicity/collections.py:816
620 #, python-format
621 msgid "Ignoring file (rejected by backup set) '%s'"
622 msgstr ""
623
624-#: ../duplicity/collections.py:828
625+#: ../duplicity/collections.py:829
626 #, python-format
627 msgid "Found backup chain %s"
628 msgstr ""
629
630-#: ../duplicity/collections.py:833
631+#: ../duplicity/collections.py:834
632 #, python-format
633 msgid "Added set %s to pre-existing chain %s"
634 msgstr ""
635
636-#: ../duplicity/collections.py:837
637+#: ../duplicity/collections.py:838
638 #, python-format
639 msgid "Found orphaned set %s"
640 msgstr ""
641@@ -1013,71 +1015,71 @@
642 msgid "Writing %s of type %s"
643 msgstr ""
644
645-#: ../duplicity/path.py:210 ../duplicity/path.py:269
646+#: ../duplicity/path.py:209 ../duplicity/path.py:268
647 #, python-format
648 msgid "Warning: %s has negative mtime, treating as 0."
649 msgstr ""
650
651-#: ../duplicity/path.py:334
652+#: ../duplicity/path.py:333
653 msgid "Difference found:"
654 msgstr ""
655
656-#: ../duplicity/path.py:340
657+#: ../duplicity/path.py:339
658 #, python-format
659 msgid "New file %s"
660 msgstr ""
661
662-#: ../duplicity/path.py:343
663+#: ../duplicity/path.py:342
664 #, python-format
665 msgid "File %s is missing"
666 msgstr ""
667
668-#: ../duplicity/path.py:346
669+#: ../duplicity/path.py:345
670 #, python-format
671 msgid "File %%s has type %s, expected %s"
672 msgstr ""
673
674-#: ../duplicity/path.py:352 ../duplicity/path.py:378
675+#: ../duplicity/path.py:351 ../duplicity/path.py:377
676 #, python-format
677 msgid "File %%s has permissions %o, expected %o"
678 msgstr ""
679
680-#: ../duplicity/path.py:357
681+#: ../duplicity/path.py:356
682 #, python-format
683 msgid "File %%s has mtime %s, expected %s"
684 msgstr ""
685
686-#: ../duplicity/path.py:365
687+#: ../duplicity/path.py:364
688 #, python-format
689 msgid "Data for file %s is different"
690 msgstr ""
691
692-#: ../duplicity/path.py:373
693+#: ../duplicity/path.py:372
694 #, python-format
695 msgid "Symlink %%s points to %s, expected %s"
696 msgstr ""
697
698-#: ../duplicity/path.py:382
699+#: ../duplicity/path.py:381
700 #, python-format
701 msgid "Device file %%s has numbers %s, expected %s"
702 msgstr ""
703
704-#: ../duplicity/path.py:528
705+#: ../duplicity/path.py:527
706 #, python-format
707 msgid "Making directory %s"
708 msgstr ""
709
710-#: ../duplicity/path.py:538
711+#: ../duplicity/path.py:537
712 #, python-format
713 msgid "Deleting %s"
714 msgstr ""
715
716-#: ../duplicity/path.py:547
717+#: ../duplicity/path.py:546
718 #, python-format
719 msgid "Touching %s"
720 msgstr ""
721
722-#: ../duplicity/path.py:554
723+#: ../duplicity/path.py:553
724 #, python-format
725 msgid "Deleting tree %s"
726 msgstr ""
727@@ -1087,38 +1089,33 @@
728 msgid "Error listing directory %s"
729 msgstr ""
730
731-#: ../duplicity/selection.py:118
732-#, python-format
733-msgid "Skipping socket %s/%s"
734-msgstr ""
735-
736 #: ../duplicity/selection.py:120
737 #, python-format
738-msgid "Error initializing file %s/%s"
739-msgstr "Error initialising file %s/%s"
740+msgid "Skipping socket %s"
741+msgstr ""
742
743-#: ../duplicity/selection.py:122
744+#: ../duplicity/selection.py:124
745 #, python-format
746-msgid "Error accessing possibly locked file %s/%s"
747+msgid "Error initializing file %s"
748 msgstr ""
749
750-#: ../duplicity/selection.py:141
751+#: ../duplicity/selection.py:128 ../duplicity/selection.py:149
752 #, python-format
753 msgid "Error accessing possibly locked file %s"
754 msgstr ""
755
756-#: ../duplicity/selection.py:154
757+#: ../duplicity/selection.py:164
758 #, python-format
759 msgid "Warning: base %s doesn't exist, continuing"
760 msgstr ""
761
762-#: ../duplicity/selection.py:157 ../duplicity/selection.py:175
763-#: ../duplicity/selection.py:178
764+#: ../duplicity/selection.py:167 ../duplicity/selection.py:185
765+#: ../duplicity/selection.py:188
766 #, python-format
767 msgid "Selecting %s"
768 msgstr ""
769
770-#: ../duplicity/selection.py:259
771+#: ../duplicity/selection.py:269
772 #, python-format
773 msgid ""
774 "Fatal Error: The file specification\n"
775@@ -1129,14 +1126,14 @@
776 "pattern (such as '**') which matches the base directory."
777 msgstr ""
778
779-#: ../duplicity/selection.py:267
780+#: ../duplicity/selection.py:277
781 #, python-format
782 msgid ""
783 "Fatal Error while processing expression\n"
784 "%s"
785 msgstr ""
786
787-#: ../duplicity/selection.py:277
788+#: ../duplicity/selection.py:287
789 #, python-format
790 msgid ""
791 "Last selection expression:\n"
792@@ -1146,43 +1143,43 @@
793 "probably isn't what you meant."
794 msgstr ""
795
796-#: ../duplicity/selection.py:302
797+#: ../duplicity/selection.py:312
798 #, python-format
799 msgid "Reading filelist %s"
800 msgstr ""
801
802-#: ../duplicity/selection.py:305
803+#: ../duplicity/selection.py:315
804 #, python-format
805 msgid "Sorting filelist %s"
806 msgstr ""
807
808-#: ../duplicity/selection.py:332
809+#: ../duplicity/selection.py:342
810 #, python-format
811 msgid ""
812 "Warning: file specification '%s' in filelist %s\n"
813 "doesn't start with correct prefix %s. Ignoring."
814 msgstr ""
815
816-#: ../duplicity/selection.py:336
817+#: ../duplicity/selection.py:346
818 msgid "Future prefix errors will not be logged."
819 msgstr ""
820
821-#: ../duplicity/selection.py:352
822+#: ../duplicity/selection.py:362
823 #, python-format
824 msgid "Error closing filelist %s"
825 msgstr ""
826
827-#: ../duplicity/selection.py:419
828+#: ../duplicity/selection.py:429
829 #, python-format
830 msgid "Reading globbing filelist %s"
831 msgstr ""
832
833-#: ../duplicity/selection.py:452
834+#: ../duplicity/selection.py:462
835 #, python-format
836 msgid "Error compiling regular expression %s"
837 msgstr ""
838
839-#: ../duplicity/selection.py:468
840+#: ../duplicity/selection.py:478
841 msgid ""
842 "Warning: exclude-device-files is not the first selector.\n"
843 "This may not be what you intended"
844@@ -1247,3 +1244,7 @@
845 #, python-format
846 msgid "Could not copy %s to %s"
847 msgstr ""
848+
849+#, python-format
850+#~ msgid "Error initializing file %s/%s"
851+#~ msgstr "Error initialising file %s/%s"
852
853=== modified file 'po/eo.po'
854--- po/eo.po 2009-09-08 03:32:43 +0000
855+++ po/eo.po 2009-09-19 11:18:33 +0000
856@@ -7,7 +7,7 @@
857 msgstr ""
858 "Project-Id-Version: duplicity\n"
859 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
860-"POT-Creation-Date: 2009-08-30 23:01-0700\n"
861+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
862 "PO-Revision-Date: 2009-09-06 12:50+0000\n"
863 "Last-Translator: Kenneth Loafman <kenneth@loafman.com>\n"
864 "Language-Team: Esperanto <eo@li.org>\n"
865@@ -15,7 +15,7 @@
866 "Content-Type: text/plain; charset=UTF-8\n"
867 "Content-Transfer-Encoding: 8bit\n"
868 "Plural-Forms: nplurals=2; plural=n != 1;\n"
869-"X-Launchpad-Export-Date: 2009-09-08 02:56+0000\n"
870+"X-Launchpad-Export-Date: 2009-09-19 11:18+0000\n"
871 "X-Generator: Launchpad (build Unknown)\n"
872
873 #: ../duplicity-bin:191
874@@ -461,97 +461,99 @@
875 msgstr[0] ""
876 msgstr[1] ""
877
878-#: ../duplicity/collections.py:633
879-msgid "These may be deleted by running duplicity with the --cleanup option."
880+#. "cleanup" is a hard-coded command, so do not translate it
881+#: ../duplicity/collections.py:634
882+msgid ""
883+"These may be deleted by running duplicity with the \"cleanup\" command."
884 msgstr ""
885
886-#: ../duplicity/collections.py:636
887+#: ../duplicity/collections.py:637
888 msgid "No orphaned or incomplete backup sets found."
889 msgstr ""
890
891-#: ../duplicity/collections.py:652
892+#: ../duplicity/collections.py:653
893 #, python-format
894 msgid "%d file exists on backend"
895 msgid_plural "%d files exist on backend"
896 msgstr[0] ""
897 msgstr[1] ""
898
899-#: ../duplicity/collections.py:659
900+#: ../duplicity/collections.py:660
901 #, python-format
902 msgid "%d file exists in cache"
903 msgid_plural "%d files exist in cache"
904 msgstr[0] ""
905 msgstr[1] ""
906
907-#: ../duplicity/collections.py:711
908+#: ../duplicity/collections.py:712
909 msgid ""
910 "Warning, discarding last backup set, because of missing signature file."
911 msgstr ""
912
913-#: ../duplicity/collections.py:744
914+#: ../duplicity/collections.py:745
915 msgid "Warning, found the following local orphaned signature file:"
916 msgid_plural "Warning, found the following local orphaned signature files:"
917 msgstr[0] ""
918 msgstr[1] ""
919
920-#: ../duplicity/collections.py:753
921+#: ../duplicity/collections.py:754
922 msgid "Warning, found the following remote orphaned signature file:"
923 msgid_plural "Warning, found the following remote orphaned signature files:"
924 msgstr[0] ""
925 msgstr[1] ""
926
927-#: ../duplicity/collections.py:763
928+#: ../duplicity/collections.py:764
929 msgid "Warning, found an unnecessary signature chain"
930 msgid_plural "Warning, found unnecessary signature chains"
931 msgstr[0] ""
932 msgstr[1] ""
933
934-#: ../duplicity/collections.py:771
935+#: ../duplicity/collections.py:772
936 msgid "Warning, found signatures but no corresponding backup files"
937 msgstr ""
938
939-#: ../duplicity/collections.py:775
940+#: ../duplicity/collections.py:776
941 msgid ""
942 "Warning, found incomplete backup sets, probably left from aborted session"
943 msgstr ""
944
945-#: ../duplicity/collections.py:779
946+#: ../duplicity/collections.py:780
947 msgid "Warning, found the following orphaned backup file:"
948 msgid_plural "Warning, found the following orphaned backup files:"
949 msgstr[0] ""
950 msgstr[1] ""
951
952-#: ../duplicity/collections.py:797
953+#: ../duplicity/collections.py:798
954 #, python-format
955 msgid "Extracting backup chains from list of files: %s"
956 msgstr ""
957
958-#: ../duplicity/collections.py:807
959+#: ../duplicity/collections.py:808
960 #, python-format
961 msgid "File %s is part of known set"
962 msgstr ""
963
964-#: ../duplicity/collections.py:810
965+#: ../duplicity/collections.py:811
966 #, python-format
967 msgid "File %s is not part of a known set; creating new set"
968 msgstr ""
969
970-#: ../duplicity/collections.py:815
971+#: ../duplicity/collections.py:816
972 #, python-format
973 msgid "Ignoring file (rejected by backup set) '%s'"
974 msgstr ""
975
976-#: ../duplicity/collections.py:828
977+#: ../duplicity/collections.py:829
978 #, python-format
979 msgid "Found backup chain %s"
980 msgstr ""
981
982-#: ../duplicity/collections.py:833
983+#: ../duplicity/collections.py:834
984 #, python-format
985 msgid "Added set %s to pre-existing chain %s"
986 msgstr ""
987
988-#: ../duplicity/collections.py:837
989+#: ../duplicity/collections.py:838
990 #, python-format
991 msgid "Found orphaned set %s"
992 msgstr ""
993@@ -1012,71 +1014,71 @@
994 msgid "Writing %s of type %s"
995 msgstr ""
996
997-#: ../duplicity/path.py:210 ../duplicity/path.py:269
998+#: ../duplicity/path.py:209 ../duplicity/path.py:268
999 #, python-format
1000 msgid "Warning: %s has negative mtime, treating as 0."
1001 msgstr ""
1002
1003-#: ../duplicity/path.py:334
1004+#: ../duplicity/path.py:333
1005 msgid "Difference found:"
1006 msgstr ""
1007
1008-#: ../duplicity/path.py:340
1009+#: ../duplicity/path.py:339
1010 #, python-format
1011 msgid "New file %s"
1012 msgstr ""
1013
1014-#: ../duplicity/path.py:343
1015+#: ../duplicity/path.py:342
1016 #, python-format
1017 msgid "File %s is missing"
1018 msgstr ""
1019
1020-#: ../duplicity/path.py:346
1021+#: ../duplicity/path.py:345
1022 #, python-format
1023 msgid "File %%s has type %s, expected %s"
1024 msgstr ""
1025
1026-#: ../duplicity/path.py:352 ../duplicity/path.py:378
1027+#: ../duplicity/path.py:351 ../duplicity/path.py:377
1028 #, python-format
1029 msgid "File %%s has permissions %o, expected %o"
1030 msgstr ""
1031
1032-#: ../duplicity/path.py:357
1033+#: ../duplicity/path.py:356
1034 #, python-format
1035 msgid "File %%s has mtime %s, expected %s"
1036 msgstr ""
1037
1038-#: ../duplicity/path.py:365
1039+#: ../duplicity/path.py:364
1040 #, python-format
1041 msgid "Data for file %s is different"
1042 msgstr ""
1043
1044-#: ../duplicity/path.py:373
1045+#: ../duplicity/path.py:372
1046 #, python-format
1047 msgid "Symlink %%s points to %s, expected %s"
1048 msgstr ""
1049
1050-#: ../duplicity/path.py:382
1051+#: ../duplicity/path.py:381
1052 #, python-format
1053 msgid "Device file %%s has numbers %s, expected %s"
1054 msgstr ""
1055
1056-#: ../duplicity/path.py:528
1057+#: ../duplicity/path.py:527
1058 #, python-format
1059 msgid "Making directory %s"
1060 msgstr ""
1061
1062-#: ../duplicity/path.py:538
1063+#: ../duplicity/path.py:537
1064 #, python-format
1065 msgid "Deleting %s"
1066 msgstr ""
1067
1068-#: ../duplicity/path.py:547
1069+#: ../duplicity/path.py:546
1070 #, python-format
1071 msgid "Touching %s"
1072 msgstr ""
1073
1074-#: ../duplicity/path.py:554
1075+#: ../duplicity/path.py:553
1076 #, python-format
1077 msgid "Deleting tree %s"
1078 msgstr ""
1079@@ -1086,38 +1088,33 @@
1080 msgid "Error listing directory %s"
1081 msgstr ""
1082
1083-#: ../duplicity/selection.py:118
1084-#, python-format
1085-msgid "Skipping socket %s/%s"
1086-msgstr ""
1087-
1088 #: ../duplicity/selection.py:120
1089 #, python-format
1090-msgid "Error initializing file %s/%s"
1091+msgid "Skipping socket %s"
1092 msgstr ""
1093
1094-#: ../duplicity/selection.py:122
1095+#: ../duplicity/selection.py:124
1096 #, python-format
1097-msgid "Error accessing possibly locked file %s/%s"
1098+msgid "Error initializing file %s"
1099 msgstr ""
1100
1101-#: ../duplicity/selection.py:141
1102+#: ../duplicity/selection.py:128 ../duplicity/selection.py:149
1103 #, python-format
1104 msgid "Error accessing possibly locked file %s"
1105 msgstr ""
1106
1107-#: ../duplicity/selection.py:154
1108+#: ../duplicity/selection.py:164
1109 #, python-format
1110 msgid "Warning: base %s doesn't exist, continuing"
1111 msgstr ""
1112
1113-#: ../duplicity/selection.py:157 ../duplicity/selection.py:175
1114-#: ../duplicity/selection.py:178
1115+#: ../duplicity/selection.py:167 ../duplicity/selection.py:185
1116+#: ../duplicity/selection.py:188
1117 #, python-format
1118 msgid "Selecting %s"
1119 msgstr ""
1120
1121-#: ../duplicity/selection.py:259
1122+#: ../duplicity/selection.py:269
1123 #, python-format
1124 msgid ""
1125 "Fatal Error: The file specification\n"
1126@@ -1128,14 +1125,14 @@
1127 "pattern (such as '**') which matches the base directory."
1128 msgstr ""
1129
1130-#: ../duplicity/selection.py:267
1131+#: ../duplicity/selection.py:277
1132 #, python-format
1133 msgid ""
1134 "Fatal Error while processing expression\n"
1135 "%s"
1136 msgstr ""
1137
1138-#: ../duplicity/selection.py:277
1139+#: ../duplicity/selection.py:287
1140 #, python-format
1141 msgid ""
1142 "Last selection expression:\n"
1143@@ -1145,43 +1142,43 @@
1144 "probably isn't what you meant."
1145 msgstr ""
1146
1147-#: ../duplicity/selection.py:302
1148+#: ../duplicity/selection.py:312
1149 #, python-format
1150 msgid "Reading filelist %s"
1151 msgstr ""
1152
1153-#: ../duplicity/selection.py:305
1154+#: ../duplicity/selection.py:315
1155 #, python-format
1156 msgid "Sorting filelist %s"
1157 msgstr ""
1158
1159-#: ../duplicity/selection.py:332
1160+#: ../duplicity/selection.py:342
1161 #, python-format
1162 msgid ""
1163 "Warning: file specification '%s' in filelist %s\n"
1164 "doesn't start with correct prefix %s. Ignoring."
1165 msgstr ""
1166
1167-#: ../duplicity/selection.py:336
1168+#: ../duplicity/selection.py:346
1169 msgid "Future prefix errors will not be logged."
1170 msgstr ""
1171
1172-#: ../duplicity/selection.py:352
1173+#: ../duplicity/selection.py:362
1174 #, python-format
1175 msgid "Error closing filelist %s"
1176 msgstr ""
1177
1178-#: ../duplicity/selection.py:419
1179+#: ../duplicity/selection.py:429
1180 #, python-format
1181 msgid "Reading globbing filelist %s"
1182 msgstr ""
1183
1184-#: ../duplicity/selection.py:452
1185+#: ../duplicity/selection.py:462
1186 #, python-format
1187 msgid "Error compiling regular expression %s"
1188 msgstr ""
1189
1190-#: ../duplicity/selection.py:468
1191+#: ../duplicity/selection.py:478
1192 msgid ""
1193 "Warning: exclude-device-files is not the first selector.\n"
1194 "This may not be what you intended"
1195
1196=== modified file 'po/es.po'
1197--- po/es.po 2009-09-08 03:32:43 +0000
1198+++ po/es.po 2009-09-19 11:18:33 +0000
1199@@ -7,7 +7,7 @@
1200 msgstr ""
1201 "Project-Id-Version: duplicity\n"
1202 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1203-"POT-Creation-Date: 2009-08-30 23:01-0700\n"
1204+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
1205 "PO-Revision-Date: 2009-09-06 12:49+0000\n"
1206 "Last-Translator: Kenneth Loafman <kenneth@loafman.com>\n"
1207 "Language-Team: Spanish <es@li.org>\n"
1208@@ -15,7 +15,7 @@
1209 "Content-Type: text/plain; charset=UTF-8\n"
1210 "Content-Transfer-Encoding: 8bit\n"
1211 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1212-"X-Launchpad-Export-Date: 2009-09-08 02:56+0000\n"
1213+"X-Launchpad-Export-Date: 2009-09-19 11:18+0000\n"
1214 "X-Generator: Launchpad (build Unknown)\n"
1215
1216 #: ../duplicity-bin:191
1217@@ -463,97 +463,99 @@
1218 msgstr[0] ""
1219 msgstr[1] ""
1220
1221-#: ../duplicity/collections.py:633
1222-msgid "These may be deleted by running duplicity with the --cleanup option."
1223+#. "cleanup" is a hard-coded command, so do not translate it
1224+#: ../duplicity/collections.py:634
1225+msgid ""
1226+"These may be deleted by running duplicity with the \"cleanup\" command."
1227 msgstr ""
1228
1229-#: ../duplicity/collections.py:636
1230+#: ../duplicity/collections.py:637
1231 msgid "No orphaned or incomplete backup sets found."
1232 msgstr ""
1233
1234-#: ../duplicity/collections.py:652
1235+#: ../duplicity/collections.py:653
1236 #, python-format
1237 msgid "%d file exists on backend"
1238 msgid_plural "%d files exist on backend"
1239 msgstr[0] ""
1240 msgstr[1] ""
1241
1242-#: ../duplicity/collections.py:659
1243+#: ../duplicity/collections.py:660
1244 #, python-format
1245 msgid "%d file exists in cache"
1246 msgid_plural "%d files exist in cache"
1247 msgstr[0] ""
1248 msgstr[1] ""
1249
1250-#: ../duplicity/collections.py:711
1251+#: ../duplicity/collections.py:712
1252 msgid ""
1253 "Warning, discarding last backup set, because of missing signature file."
1254 msgstr ""
1255
1256-#: ../duplicity/collections.py:744
1257+#: ../duplicity/collections.py:745
1258 msgid "Warning, found the following local orphaned signature file:"
1259 msgid_plural "Warning, found the following local orphaned signature files:"
1260 msgstr[0] ""
1261 msgstr[1] ""
1262
1263-#: ../duplicity/collections.py:753
1264+#: ../duplicity/collections.py:754
1265 msgid "Warning, found the following remote orphaned signature file:"
1266 msgid_plural "Warning, found the following remote orphaned signature files:"
1267 msgstr[0] ""
1268 msgstr[1] ""
1269
1270-#: ../duplicity/collections.py:763
1271+#: ../duplicity/collections.py:764
1272 msgid "Warning, found an unnecessary signature chain"
1273 msgid_plural "Warning, found unnecessary signature chains"
1274 msgstr[0] ""
1275 msgstr[1] ""
1276
1277-#: ../duplicity/collections.py:771
1278+#: ../duplicity/collections.py:772
1279 msgid "Warning, found signatures but no corresponding backup files"
1280 msgstr ""
1281
1282-#: ../duplicity/collections.py:775
1283+#: ../duplicity/collections.py:776
1284 msgid ""
1285 "Warning, found incomplete backup sets, probably left from aborted session"
1286 msgstr ""
1287
1288-#: ../duplicity/collections.py:779
1289+#: ../duplicity/collections.py:780
1290 msgid "Warning, found the following orphaned backup file:"
1291 msgid_plural "Warning, found the following orphaned backup files:"
1292 msgstr[0] ""
1293 msgstr[1] ""
1294
1295-#: ../duplicity/collections.py:797
1296+#: ../duplicity/collections.py:798
1297 #, python-format
1298 msgid "Extracting backup chains from list of files: %s"
1299 msgstr ""
1300
1301-#: ../duplicity/collections.py:807
1302+#: ../duplicity/collections.py:808
1303 #, python-format
1304 msgid "File %s is part of known set"
1305 msgstr ""
1306
1307-#: ../duplicity/collections.py:810
1308+#: ../duplicity/collections.py:811
1309 #, python-format
1310 msgid "File %s is not part of a known set; creating new set"
1311 msgstr ""
1312
1313-#: ../duplicity/collections.py:815
1314+#: ../duplicity/collections.py:816
1315 #, python-format
1316 msgid "Ignoring file (rejected by backup set) '%s'"
1317 msgstr ""
1318
1319-#: ../duplicity/collections.py:828
1320+#: ../duplicity/collections.py:829
1321 #, python-format
1322 msgid "Found backup chain %s"
1323 msgstr ""
1324
1325-#: ../duplicity/collections.py:833
1326+#: ../duplicity/collections.py:834
1327 #, python-format
1328 msgid "Added set %s to pre-existing chain %s"
1329 msgstr ""
1330
1331-#: ../duplicity/collections.py:837
1332+#: ../duplicity/collections.py:838
1333 #, python-format
1334 msgid "Found orphaned set %s"
1335 msgstr ""
1336@@ -1014,71 +1016,71 @@
1337 msgid "Writing %s of type %s"
1338 msgstr ""
1339
1340-#: ../duplicity/path.py:210 ../duplicity/path.py:269
1341+#: ../duplicity/path.py:209 ../duplicity/path.py:268
1342 #, python-format
1343 msgid "Warning: %s has negative mtime, treating as 0."
1344 msgstr ""
1345
1346-#: ../duplicity/path.py:334
1347+#: ../duplicity/path.py:333
1348 msgid "Difference found:"
1349 msgstr ""
1350
1351-#: ../duplicity/path.py:340
1352+#: ../duplicity/path.py:339
1353 #, python-format
1354 msgid "New file %s"
1355 msgstr ""
1356
1357-#: ../duplicity/path.py:343
1358+#: ../duplicity/path.py:342
1359 #, python-format
1360 msgid "File %s is missing"
1361 msgstr ""
1362
1363-#: ../duplicity/path.py:346
1364+#: ../duplicity/path.py:345
1365 #, python-format
1366 msgid "File %%s has type %s, expected %s"
1367 msgstr ""
1368
1369-#: ../duplicity/path.py:352 ../duplicity/path.py:378
1370+#: ../duplicity/path.py:351 ../duplicity/path.py:377
1371 #, python-format
1372 msgid "File %%s has permissions %o, expected %o"
1373 msgstr ""
1374
1375-#: ../duplicity/path.py:357
1376+#: ../duplicity/path.py:356
1377 #, python-format
1378 msgid "File %%s has mtime %s, expected %s"
1379 msgstr ""
1380
1381-#: ../duplicity/path.py:365
1382+#: ../duplicity/path.py:364
1383 #, python-format
1384 msgid "Data for file %s is different"
1385 msgstr ""
1386
1387-#: ../duplicity/path.py:373
1388+#: ../duplicity/path.py:372
1389 #, python-format
1390 msgid "Symlink %%s points to %s, expected %s"
1391 msgstr ""
1392
1393-#: ../duplicity/path.py:382
1394+#: ../duplicity/path.py:381
1395 #, python-format
1396 msgid "Device file %%s has numbers %s, expected %s"
1397 msgstr ""
1398
1399-#: ../duplicity/path.py:528
1400+#: ../duplicity/path.py:527
1401 #, python-format
1402 msgid "Making directory %s"
1403 msgstr ""
1404
1405-#: ../duplicity/path.py:538
1406+#: ../duplicity/path.py:537
1407 #, python-format
1408 msgid "Deleting %s"
1409 msgstr "Borrando %s"
1410
1411-#: ../duplicity/path.py:547
1412+#: ../duplicity/path.py:546
1413 #, python-format
1414 msgid "Touching %s"
1415 msgstr ""
1416
1417-#: ../duplicity/path.py:554
1418+#: ../duplicity/path.py:553
1419 #, python-format
1420 msgid "Deleting tree %s"
1421 msgstr ""
1422@@ -1088,38 +1090,33 @@
1423 msgid "Error listing directory %s"
1424 msgstr ""
1425
1426-#: ../duplicity/selection.py:118
1427-#, python-format
1428-msgid "Skipping socket %s/%s"
1429-msgstr ""
1430-
1431 #: ../duplicity/selection.py:120
1432 #, python-format
1433-msgid "Error initializing file %s/%s"
1434+msgid "Skipping socket %s"
1435 msgstr ""
1436
1437-#: ../duplicity/selection.py:122
1438+#: ../duplicity/selection.py:124
1439 #, python-format
1440-msgid "Error accessing possibly locked file %s/%s"
1441+msgid "Error initializing file %s"
1442 msgstr ""
1443
1444-#: ../duplicity/selection.py:141
1445+#: ../duplicity/selection.py:128 ../duplicity/selection.py:149
1446 #, python-format
1447 msgid "Error accessing possibly locked file %s"
1448 msgstr ""
1449
1450-#: ../duplicity/selection.py:154
1451+#: ../duplicity/selection.py:164
1452 #, python-format
1453 msgid "Warning: base %s doesn't exist, continuing"
1454 msgstr ""
1455
1456-#: ../duplicity/selection.py:157 ../duplicity/selection.py:175
1457-#: ../duplicity/selection.py:178
1458+#: ../duplicity/selection.py:167 ../duplicity/selection.py:185
1459+#: ../duplicity/selection.py:188
1460 #, python-format
1461 msgid "Selecting %s"
1462 msgstr ""
1463
1464-#: ../duplicity/selection.py:259
1465+#: ../duplicity/selection.py:269
1466 #, python-format
1467 msgid ""
1468 "Fatal Error: The file specification\n"
1469@@ -1130,14 +1127,14 @@
1470 "pattern (such as '**') which matches the base directory."
1471 msgstr ""
1472
1473-#: ../duplicity/selection.py:267
1474+#: ../duplicity/selection.py:277
1475 #, python-format
1476 msgid ""
1477 "Fatal Error while processing expression\n"
1478 "%s"
1479 msgstr ""
1480
1481-#: ../duplicity/selection.py:277
1482+#: ../duplicity/selection.py:287
1483 #, python-format
1484 msgid ""
1485 "Last selection expression:\n"
1486@@ -1147,43 +1144,43 @@
1487 "probably isn't what you meant."
1488 msgstr ""
1489
1490-#: ../duplicity/selection.py:302
1491+#: ../duplicity/selection.py:312
1492 #, python-format
1493 msgid "Reading filelist %s"
1494 msgstr ""
1495
1496-#: ../duplicity/selection.py:305
1497+#: ../duplicity/selection.py:315
1498 #, python-format
1499 msgid "Sorting filelist %s"
1500 msgstr ""
1501
1502-#: ../duplicity/selection.py:332
1503+#: ../duplicity/selection.py:342
1504 #, python-format
1505 msgid ""
1506 "Warning: file specification '%s' in filelist %s\n"
1507 "doesn't start with correct prefix %s. Ignoring."
1508 msgstr ""
1509
1510-#: ../duplicity/selection.py:336
1511+#: ../duplicity/selection.py:346
1512 msgid "Future prefix errors will not be logged."
1513 msgstr ""
1514
1515-#: ../duplicity/selection.py:352
1516+#: ../duplicity/selection.py:362
1517 #, python-format
1518 msgid "Error closing filelist %s"
1519 msgstr ""
1520
1521-#: ../duplicity/selection.py:419
1522+#: ../duplicity/selection.py:429
1523 #, python-format
1524 msgid "Reading globbing filelist %s"
1525 msgstr ""
1526
1527-#: ../duplicity/selection.py:452
1528+#: ../duplicity/selection.py:462
1529 #, python-format
1530 msgid "Error compiling regular expression %s"
1531 msgstr ""
1532
1533-#: ../duplicity/selection.py:468
1534+#: ../duplicity/selection.py:478
1535 msgid ""
1536 "Warning: exclude-device-files is not the first selector.\n"
1537 "This may not be what you intended"
1538
1539=== modified file 'po/io.po'
1540--- po/io.po 2009-09-08 03:32:43 +0000
1541+++ po/io.po 2009-09-19 11:18:33 +0000
1542@@ -7,7 +7,7 @@
1543 msgstr ""
1544 "Project-Id-Version: duplicity 0.5.03\n"
1545 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
1546-"POT-Creation-Date: 2009-08-30 23:01-0700\n"
1547+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
1548 "PO-Revision-Date: 2009-07-27 19:06+0000\n"
1549 "Last-Translator: Michael Terry <michael.terry@canonical.com>\n"
1550 "Language-Team: Ido\n"
1551@@ -15,7 +15,7 @@
1552 "Content-Type: text/plain; charset=UTF-8\n"
1553 "Content-Transfer-Encoding: 8bit\n"
1554 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1555-"X-Launchpad-Export-Date: 2009-09-08 02:56+0000\n"
1556+"X-Launchpad-Export-Date: 2009-09-19 11:18+0000\n"
1557 "X-Generator: Launchpad (build Unknown)\n"
1558
1559 #: ../duplicity-bin:191
1560@@ -461,97 +461,99 @@
1561 msgstr[0] ""
1562 msgstr[1] ""
1563
1564-#: ../duplicity/collections.py:633
1565-msgid "These may be deleted by running duplicity with the --cleanup option."
1566+#. "cleanup" is a hard-coded command, so do not translate it
1567+#: ../duplicity/collections.py:634
1568+msgid ""
1569+"These may be deleted by running duplicity with the \"cleanup\" command."
1570 msgstr ""
1571
1572-#: ../duplicity/collections.py:636
1573+#: ../duplicity/collections.py:637
1574 msgid "No orphaned or incomplete backup sets found."
1575 msgstr ""
1576
1577-#: ../duplicity/collections.py:652
1578+#: ../duplicity/collections.py:653
1579 #, python-format
1580 msgid "%d file exists on backend"
1581 msgid_plural "%d files exist on backend"
1582 msgstr[0] ""
1583 msgstr[1] ""
1584
1585-#: ../duplicity/collections.py:659
1586+#: ../duplicity/collections.py:660
1587 #, python-format
1588 msgid "%d file exists in cache"
1589 msgid_plural "%d files exist in cache"
1590 msgstr[0] ""
1591 msgstr[1] ""
1592
1593-#: ../duplicity/collections.py:711
1594+#: ../duplicity/collections.py:712
1595 msgid ""
1596 "Warning, discarding last backup set, because of missing signature file."
1597 msgstr ""
1598
1599-#: ../duplicity/collections.py:744
1600+#: ../duplicity/collections.py:745
1601 msgid "Warning, found the following local orphaned signature file:"
1602 msgid_plural "Warning, found the following local orphaned signature files:"
1603 msgstr[0] ""
1604 msgstr[1] ""
1605
1606-#: ../duplicity/collections.py:753
1607+#: ../duplicity/collections.py:754
1608 msgid "Warning, found the following remote orphaned signature file:"
1609 msgid_plural "Warning, found the following remote orphaned signature files:"
1610 msgstr[0] ""
1611 msgstr[1] ""
1612
1613-#: ../duplicity/collections.py:763
1614+#: ../duplicity/collections.py:764
1615 msgid "Warning, found an unnecessary signature chain"
1616 msgid_plural "Warning, found unnecessary signature chains"
1617 msgstr[0] ""
1618 msgstr[1] ""
1619
1620-#: ../duplicity/collections.py:771
1621+#: ../duplicity/collections.py:772
1622 msgid "Warning, found signatures but no corresponding backup files"
1623 msgstr ""
1624
1625-#: ../duplicity/collections.py:775
1626+#: ../duplicity/collections.py:776
1627 msgid ""
1628 "Warning, found incomplete backup sets, probably left from aborted session"
1629 msgstr ""
1630
1631-#: ../duplicity/collections.py:779
1632+#: ../duplicity/collections.py:780
1633 msgid "Warning, found the following orphaned backup file:"
1634 msgid_plural "Warning, found the following orphaned backup files:"
1635 msgstr[0] ""
1636 msgstr[1] ""
1637
1638-#: ../duplicity/collections.py:797
1639+#: ../duplicity/collections.py:798
1640 #, python-format
1641 msgid "Extracting backup chains from list of files: %s"
1642 msgstr ""
1643
1644-#: ../duplicity/collections.py:807
1645+#: ../duplicity/collections.py:808
1646 #, python-format
1647 msgid "File %s is part of known set"
1648 msgstr ""
1649
1650-#: ../duplicity/collections.py:810
1651+#: ../duplicity/collections.py:811
1652 #, python-format
1653 msgid "File %s is not part of a known set; creating new set"
1654 msgstr ""
1655
1656-#: ../duplicity/collections.py:815
1657+#: ../duplicity/collections.py:816
1658 #, python-format
1659 msgid "Ignoring file (rejected by backup set) '%s'"
1660 msgstr ""
1661
1662-#: ../duplicity/collections.py:828
1663+#: ../duplicity/collections.py:829
1664 #, python-format
1665 msgid "Found backup chain %s"
1666 msgstr ""
1667
1668-#: ../duplicity/collections.py:833
1669+#: ../duplicity/collections.py:834
1670 #, python-format
1671 msgid "Added set %s to pre-existing chain %s"
1672 msgstr ""
1673
1674-#: ../duplicity/collections.py:837
1675+#: ../duplicity/collections.py:838
1676 #, python-format
1677 msgid "Found orphaned set %s"
1678 msgstr ""
1679@@ -1012,71 +1014,71 @@
1680 msgid "Writing %s of type %s"
1681 msgstr ""
1682
1683-#: ../duplicity/path.py:210 ../duplicity/path.py:269
1684+#: ../duplicity/path.py:209 ../duplicity/path.py:268
1685 #, python-format
1686 msgid "Warning: %s has negative mtime, treating as 0."
1687 msgstr ""
1688
1689-#: ../duplicity/path.py:334
1690+#: ../duplicity/path.py:333
1691 msgid "Difference found:"
1692 msgstr ""
1693
1694-#: ../duplicity/path.py:340
1695+#: ../duplicity/path.py:339
1696 #, python-format
1697 msgid "New file %s"
1698 msgstr ""
1699
1700-#: ../duplicity/path.py:343
1701+#: ../duplicity/path.py:342
1702 #, python-format
1703 msgid "File %s is missing"
1704 msgstr ""
1705
1706-#: ../duplicity/path.py:346
1707+#: ../duplicity/path.py:345
1708 #, python-format
1709 msgid "File %%s has type %s, expected %s"
1710 msgstr ""
1711
1712-#: ../duplicity/path.py:352 ../duplicity/path.py:378
1713+#: ../duplicity/path.py:351 ../duplicity/path.py:377
1714 #, python-format
1715 msgid "File %%s has permissions %o, expected %o"
1716 msgstr ""
1717
1718-#: ../duplicity/path.py:357
1719+#: ../duplicity/path.py:356
1720 #, python-format
1721 msgid "File %%s has mtime %s, expected %s"
1722 msgstr ""
1723
1724-#: ../duplicity/path.py:365
1725+#: ../duplicity/path.py:364
1726 #, python-format
1727 msgid "Data for file %s is different"
1728 msgstr ""
1729
1730-#: ../duplicity/path.py:373
1731+#: ../duplicity/path.py:372
1732 #, python-format
1733 msgid "Symlink %%s points to %s, expected %s"
1734 msgstr ""
1735
1736-#: ../duplicity/path.py:382
1737+#: ../duplicity/path.py:381
1738 #, python-format
1739 msgid "Device file %%s has numbers %s, expected %s"
1740 msgstr ""
1741
1742-#: ../duplicity/path.py:528
1743+#: ../duplicity/path.py:527
1744 #, python-format
1745 msgid "Making directory %s"
1746 msgstr ""
1747
1748-#: ../duplicity/path.py:538
1749+#: ../duplicity/path.py:537
1750 #, python-format
1751 msgid "Deleting %s"
1752 msgstr ""
1753
1754-#: ../duplicity/path.py:547
1755+#: ../duplicity/path.py:546
1756 #, python-format
1757 msgid "Touching %s"
1758 msgstr ""
1759
1760-#: ../duplicity/path.py:554
1761+#: ../duplicity/path.py:553
1762 #, python-format
1763 msgid "Deleting tree %s"
1764 msgstr ""
1765@@ -1086,38 +1088,33 @@
1766 msgid "Error listing directory %s"
1767 msgstr ""
1768
1769-#: ../duplicity/selection.py:118
1770-#, python-format
1771-msgid "Skipping socket %s/%s"
1772-msgstr ""
1773-
1774 #: ../duplicity/selection.py:120
1775 #, python-format
1776-msgid "Error initializing file %s/%s"
1777+msgid "Skipping socket %s"
1778 msgstr ""
1779
1780-#: ../duplicity/selection.py:122
1781+#: ../duplicity/selection.py:124
1782 #, python-format
1783-msgid "Error accessing possibly locked file %s/%s"
1784+msgid "Error initializing file %s"
1785 msgstr ""
1786
1787-#: ../duplicity/selection.py:141
1788+#: ../duplicity/selection.py:128 ../duplicity/selection.py:149
1789 #, python-format
1790 msgid "Error accessing possibly locked file %s"
1791 msgstr ""
1792
1793-#: ../duplicity/selection.py:154
1794+#: ../duplicity/selection.py:164
1795 #, python-format
1796 msgid "Warning: base %s doesn't exist, continuing"
1797 msgstr ""
1798
1799-#: ../duplicity/selection.py:157 ../duplicity/selection.py:175
1800-#: ../duplicity/selection.py:178
1801+#: ../duplicity/selection.py:167 ../duplicity/selection.py:185
1802+#: ../duplicity/selection.py:188
1803 #, python-format
1804 msgid "Selecting %s"
1805 msgstr ""
1806
1807-#: ../duplicity/selection.py:259
1808+#: ../duplicity/selection.py:269
1809 #, python-format
1810 msgid ""
1811 "Fatal Error: The file specification\n"
1812@@ -1128,14 +1125,14 @@
1813 "pattern (such as '**') which matches the base directory."
1814 msgstr ""
1815
1816-#: ../duplicity/selection.py:267
1817+#: ../duplicity/selection.py:277
1818 #, python-format
1819 msgid ""
1820 "Fatal Error while processing expression\n"
1821 "%s"
1822 msgstr ""
1823
1824-#: ../duplicity/selection.py:277
1825+#: ../duplicity/selection.py:287
1826 #, python-format
1827 msgid ""
1828 "Last selection expression:\n"
1829@@ -1145,43 +1142,43 @@
1830 "probably isn't what you meant."
1831 msgstr ""
1832
1833-#: ../duplicity/selection.py:302
1834+#: ../duplicity/selection.py:312
1835 #, python-format
1836 msgid "Reading filelist %s"
1837 msgstr ""
1838
1839-#: ../duplicity/selection.py:305
1840+#: ../duplicity/selection.py:315
1841 #, python-format
1842 msgid "Sorting filelist %s"
1843 msgstr ""
1844
1845-#: ../duplicity/selection.py:332
1846+#: ../duplicity/selection.py:342
1847 #, python-format
1848 msgid ""
1849 "Warning: file specification '%s' in filelist %s\n"
1850 "doesn't start with correct prefix %s. Ignoring."
1851 msgstr ""
1852
1853-#: ../duplicity/selection.py:336
1854+#: ../duplicity/selection.py:346
1855 msgid "Future prefix errors will not be logged."
1856 msgstr ""
1857
1858-#: ../duplicity/selection.py:352
1859+#: ../duplicity/selection.py:362
1860 #, python-format
1861 msgid "Error closing filelist %s"
1862 msgstr ""
1863
1864-#: ../duplicity/selection.py:419
1865+#: ../duplicity/selection.py:429
1866 #, python-format
1867 msgid "Reading globbing filelist %s"
1868 msgstr ""
1869
1870-#: ../duplicity/selection.py:452
1871+#: ../duplicity/selection.py:462
1872 #, python-format
1873 msgid "Error compiling regular expression %s"
1874 msgstr ""
1875
1876-#: ../duplicity/selection.py:468
1877+#: ../duplicity/selection.py:478
1878 msgid ""
1879 "Warning: exclude-device-files is not the first selector.\n"
1880 "This may not be what you intended"
1881
1882=== modified file 'po/pt.po'
1883--- po/pt.po 2009-09-08 03:32:43 +0000
1884+++ po/pt.po 2009-09-19 11:18:33 +0000
1885@@ -7,15 +7,15 @@
1886 msgstr ""
1887 "Project-Id-Version: duplicity\n"
1888 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1889-"POT-Creation-Date: 2009-08-30 23:01-0700\n"
1890-"PO-Revision-Date: 2009-09-06 12:52+0000\n"
1891+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
1892+"PO-Revision-Date: 2009-09-15 03:17+0000\n"
1893 "Last-Translator: Kenneth Loafman <kenneth@loafman.com>\n"
1894 "Language-Team: Portuguese <pt@li.org>\n"
1895 "MIME-Version: 1.0\n"
1896 "Content-Type: text/plain; charset=UTF-8\n"
1897 "Content-Transfer-Encoding: 8bit\n"
1898 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1899-"X-Launchpad-Export-Date: 2009-09-08 02:56+0000\n"
1900+"X-Launchpad-Export-Date: 2009-09-19 11:18+0000\n"
1901 "X-Generator: Launchpad (build Unknown)\n"
1902
1903 #: ../duplicity-bin:191
1904@@ -491,105 +491,106 @@
1905 msgstr[0] ""
1906 msgstr[1] ""
1907
1908-#: ../duplicity/collections.py:633
1909-msgid "These may be deleted by running duplicity with the --cleanup option."
1910+#. "cleanup" is a hard-coded command, so do not translate it
1911+#: ../duplicity/collections.py:634
1912+msgid ""
1913+"These may be deleted by running duplicity with the \"cleanup\" command."
1914 msgstr ""
1915-"Estes podem ser removidos executando o duplicity com a opção --cleanup."
1916
1917-#: ../duplicity/collections.py:636
1918+#: ../duplicity/collections.py:637
1919 msgid "No orphaned or incomplete backup sets found."
1920 msgstr ""
1921 "Não foram encontrados conjuntos de cópias de segurança órfãos ou incompletos."
1922
1923-#: ../duplicity/collections.py:652
1924+#: ../duplicity/collections.py:653
1925 #, python-format
1926 msgid "%d file exists on backend"
1927 msgid_plural "%d files exist on backend"
1928 msgstr[0] "Existe %d ficheiro no motor de processamento"
1929 msgstr[1] "Existem %d ficheiros no motor de processamento"
1930
1931-#: ../duplicity/collections.py:659
1932+#: ../duplicity/collections.py:660
1933 #, python-format
1934 msgid "%d file exists in cache"
1935 msgid_plural "%d files exist in cache"
1936 msgstr[0] "Existe %d ficheiro na cache"
1937 msgstr[1] "Existem %d ficheiros na cache"
1938
1939-#: ../duplicity/collections.py:711
1940+#: ../duplicity/collections.py:712
1941 msgid ""
1942 "Warning, discarding last backup set, because of missing signature file."
1943 msgstr ""
1944 "Aviso: a eliminar último conjunto de cópia de segurança devido à ausência de "
1945 "um ficheiro de assinaturas."
1946
1947-#: ../duplicity/collections.py:744
1948+#: ../duplicity/collections.py:745
1949 msgid "Warning, found the following local orphaned signature file:"
1950 msgid_plural "Warning, found the following local orphaned signature files:"
1951 msgstr[0] ""
1952 msgstr[1] ""
1953
1954-#: ../duplicity/collections.py:753
1955+#: ../duplicity/collections.py:754
1956 msgid "Warning, found the following remote orphaned signature file:"
1957 msgid_plural "Warning, found the following remote orphaned signature files:"
1958 msgstr[0] ""
1959 msgstr[1] ""
1960
1961-#: ../duplicity/collections.py:763
1962+#: ../duplicity/collections.py:764
1963 msgid "Warning, found an unnecessary signature chain"
1964 msgid_plural "Warning, found unnecessary signature chains"
1965 msgstr[0] ""
1966 msgstr[1] ""
1967
1968-#: ../duplicity/collections.py:771
1969+#: ../duplicity/collections.py:772
1970 msgid "Warning, found signatures but no corresponding backup files"
1971 msgstr ""
1972 "Aviso: as assinaturas foram encontradas, mas os ficheiros de cópia de "
1973 "segurança correspondentes não"
1974
1975-#: ../duplicity/collections.py:775
1976+#: ../duplicity/collections.py:776
1977 msgid ""
1978 "Warning, found incomplete backup sets, probably left from aborted session"
1979 msgstr ""
1980
1981-#: ../duplicity/collections.py:779
1982+#: ../duplicity/collections.py:780
1983 msgid "Warning, found the following orphaned backup file:"
1984 msgid_plural "Warning, found the following orphaned backup files:"
1985 msgstr[0] ""
1986 msgstr[1] ""
1987
1988-#: ../duplicity/collections.py:797
1989+#: ../duplicity/collections.py:798
1990 #, python-format
1991 msgid "Extracting backup chains from list of files: %s"
1992 msgstr ""
1993
1994-#: ../duplicity/collections.py:807
1995+#: ../duplicity/collections.py:808
1996 #, python-format
1997 msgid "File %s is part of known set"
1998 msgstr "O ficheiro %s pertence a um conjunto conhecido"
1999
2000-#: ../duplicity/collections.py:810
2001+#: ../duplicity/collections.py:811
2002 #, python-format
2003 msgid "File %s is not part of a known set; creating new set"
2004 msgstr ""
2005 "O ficheiro %s não pertence a um conjunto conhecido; a criar um novo conjunto"
2006
2007-#: ../duplicity/collections.py:815
2008+#: ../duplicity/collections.py:816
2009 #, python-format
2010 msgid "Ignoring file (rejected by backup set) '%s'"
2011 msgstr ""
2012 "A ignorar o ficheiro (rejeitado pelo conjunto de cópia de segurança) '%s'"
2013
2014-#: ../duplicity/collections.py:828
2015+#: ../duplicity/collections.py:829
2016 #, python-format
2017 msgid "Found backup chain %s"
2018 msgstr ""
2019
2020-#: ../duplicity/collections.py:833
2021+#: ../duplicity/collections.py:834
2022 #, python-format
2023 msgid "Added set %s to pre-existing chain %s"
2024 msgstr ""
2025
2026-#: ../duplicity/collections.py:837
2027+#: ../duplicity/collections.py:838
2028 #, python-format
2029 msgid "Found orphaned set %s"
2030 msgstr "Foi encontrado o conjunto órfão %s"
2031@@ -1051,73 +1052,73 @@
2032 msgid "Writing %s of type %s"
2033 msgstr ""
2034
2035-#: ../duplicity/path.py:210 ../duplicity/path.py:269
2036+#: ../duplicity/path.py:209 ../duplicity/path.py:268
2037 #, python-format
2038 msgid "Warning: %s has negative mtime, treating as 0."
2039 msgstr "Aviso: %s tem um mtime negativo. A tratar como se fosse 0."
2040
2041-#: ../duplicity/path.py:334
2042+#: ../duplicity/path.py:333
2043 msgid "Difference found:"
2044 msgstr "Diferença encontrada:"
2045
2046-#: ../duplicity/path.py:340
2047+#: ../duplicity/path.py:339
2048 #, python-format
2049 msgid "New file %s"
2050 msgstr "Novo ficheiro %s"
2051
2052-#: ../duplicity/path.py:343
2053+#: ../duplicity/path.py:342
2054 #, python-format
2055 msgid "File %s is missing"
2056 msgstr "Não foi possível encontrar o ficheiro %s"
2057
2058-#: ../duplicity/path.py:346
2059+#: ../duplicity/path.py:345
2060 #, python-format
2061 msgid "File %%s has type %s, expected %s"
2062 msgstr "O ficheiro %%s é do tipo %s. Esperava-se que fosse do tipo %s."
2063
2064-#: ../duplicity/path.py:352 ../duplicity/path.py:378
2065+#: ../duplicity/path.py:351 ../duplicity/path.py:377
2066 #, python-format
2067 msgid "File %%s has permissions %o, expected %o"
2068 msgstr ""
2069 "O ficheiro %%s tem permissões %o. Esperava-se que tivesse permissões %o"
2070
2071-#: ../duplicity/path.py:357
2072+#: ../duplicity/path.py:356
2073 #, python-format
2074 msgid "File %%s has mtime %s, expected %s"
2075 msgstr ""
2076
2077-#: ../duplicity/path.py:365
2078+#: ../duplicity/path.py:364
2079 #, python-format
2080 msgid "Data for file %s is different"
2081 msgstr ""
2082
2083-#: ../duplicity/path.py:373
2084+#: ../duplicity/path.py:372
2085 #, python-format
2086 msgid "Symlink %%s points to %s, expected %s"
2087 msgstr ""
2088 "A ligação simbólica %%s aponta para %s. Esperava-se que apontasse para %s."
2089
2090-#: ../duplicity/path.py:382
2091+#: ../duplicity/path.py:381
2092 #, python-format
2093 msgid "Device file %%s has numbers %s, expected %s"
2094 msgstr ""
2095
2096-#: ../duplicity/path.py:528
2097+#: ../duplicity/path.py:527
2098 #, python-format
2099 msgid "Making directory %s"
2100 msgstr "A criar a pasta %s"
2101
2102-#: ../duplicity/path.py:538
2103+#: ../duplicity/path.py:537
2104 #, python-format
2105 msgid "Deleting %s"
2106 msgstr "A remover %s"
2107
2108-#: ../duplicity/path.py:547
2109+#: ../duplicity/path.py:546
2110 #, python-format
2111 msgid "Touching %s"
2112 msgstr ""
2113
2114-#: ../duplicity/path.py:554
2115+#: ../duplicity/path.py:553
2116 #, python-format
2117 msgid "Deleting tree %s"
2118 msgstr ""
2119@@ -1127,38 +1128,33 @@
2120 msgid "Error listing directory %s"
2121 msgstr "Erro ao tentar listar a pasta %s"
2122
2123-#: ../duplicity/selection.py:118
2124-#, python-format
2125-msgid "Skipping socket %s/%s"
2126-msgstr ""
2127-
2128 #: ../duplicity/selection.py:120
2129 #, python-format
2130-msgid "Error initializing file %s/%s"
2131-msgstr "Erro ao inicializar o ficheiro %s/%s"
2132+msgid "Skipping socket %s"
2133+msgstr ""
2134
2135-#: ../duplicity/selection.py:122
2136+#: ../duplicity/selection.py:124
2137 #, python-format
2138-msgid "Error accessing possibly locked file %s/%s"
2139+msgid "Error initializing file %s"
2140 msgstr ""
2141
2142-#: ../duplicity/selection.py:141
2143+#: ../duplicity/selection.py:128 ../duplicity/selection.py:149
2144 #, python-format
2145 msgid "Error accessing possibly locked file %s"
2146 msgstr ""
2147
2148-#: ../duplicity/selection.py:154
2149+#: ../duplicity/selection.py:164
2150 #, python-format
2151 msgid "Warning: base %s doesn't exist, continuing"
2152 msgstr ""
2153
2154-#: ../duplicity/selection.py:157 ../duplicity/selection.py:175
2155-#: ../duplicity/selection.py:178
2156+#: ../duplicity/selection.py:167 ../duplicity/selection.py:185
2157+#: ../duplicity/selection.py:188
2158 #, python-format
2159 msgid "Selecting %s"
2160 msgstr "A seleccionar %s"
2161
2162-#: ../duplicity/selection.py:259
2163+#: ../duplicity/selection.py:269
2164 #, python-format
2165 msgid ""
2166 "Fatal Error: The file specification\n"
2167@@ -1169,7 +1165,7 @@
2168 "pattern (such as '**') which matches the base directory."
2169 msgstr ""
2170
2171-#: ../duplicity/selection.py:267
2172+#: ../duplicity/selection.py:277
2173 #, python-format
2174 msgid ""
2175 "Fatal Error while processing expression\n"
2176@@ -1178,7 +1174,7 @@
2177 "Erro fatal ao processar a expressão\n"
2178 "%s"
2179
2180-#: ../duplicity/selection.py:277
2181+#: ../duplicity/selection.py:287
2182 #, python-format
2183 msgid ""
2184 "Last selection expression:\n"
2185@@ -1188,43 +1184,43 @@
2186 "probably isn't what you meant."
2187 msgstr ""
2188
2189-#: ../duplicity/selection.py:302
2190+#: ../duplicity/selection.py:312
2191 #, python-format
2192 msgid "Reading filelist %s"
2193 msgstr "A ler a lista de ficheiros %s"
2194
2195-#: ../duplicity/selection.py:305
2196+#: ../duplicity/selection.py:315
2197 #, python-format
2198 msgid "Sorting filelist %s"
2199 msgstr "A ordenar a lista de ficheiros %s"
2200
2201-#: ../duplicity/selection.py:332
2202+#: ../duplicity/selection.py:342
2203 #, python-format
2204 msgid ""
2205 "Warning: file specification '%s' in filelist %s\n"
2206 "doesn't start with correct prefix %s. Ignoring."
2207 msgstr ""
2208
2209-#: ../duplicity/selection.py:336
2210+#: ../duplicity/selection.py:346
2211 msgid "Future prefix errors will not be logged."
2212 msgstr ""
2213
2214-#: ../duplicity/selection.py:352
2215+#: ../duplicity/selection.py:362
2216 #, python-format
2217 msgid "Error closing filelist %s"
2218 msgstr "Erro ao tentar fechar a lista de ficheiros %s"
2219
2220-#: ../duplicity/selection.py:419
2221+#: ../duplicity/selection.py:429
2222 #, python-format
2223 msgid "Reading globbing filelist %s"
2224 msgstr ""
2225
2226-#: ../duplicity/selection.py:452
2227+#: ../duplicity/selection.py:462
2228 #, python-format
2229 msgid "Error compiling regular expression %s"
2230 msgstr "Erro ao compilar a expressão regular %s"
2231
2232-#: ../duplicity/selection.py:468
2233+#: ../duplicity/selection.py:478
2234 msgid ""
2235 "Warning: exclude-device-files is not the first selector.\n"
2236 "This may not be what you intended"
2237@@ -1289,3 +1285,11 @@
2238 #, python-format
2239 msgid "Could not copy %s to %s"
2240 msgstr "Não foi possível copiar %s para %s"
2241+
2242+#~ msgid "These may be deleted by running duplicity with the --cleanup option."
2243+#~ msgstr ""
2244+#~ "Estes podem ser removidos executando o duplicity com a opção --cleanup."
2245+
2246+#, python-format
2247+#~ msgid "Error initializing file %s/%s"
2248+#~ msgstr "Erro ao inicializar o ficheiro %s/%s"
2249
2250=== modified file 'po/zh_CN.po'
2251--- po/zh_CN.po 2009-09-08 03:32:43 +0000
2252+++ po/zh_CN.po 2009-09-19 11:18:33 +0000
2253@@ -7,7 +7,7 @@
2254 msgstr ""
2255 "Project-Id-Version: duplicity\n"
2256 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@loafman.com>\n"
2257-"POT-Creation-Date: 2009-08-30 23:01-0700\n"
2258+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
2259 "PO-Revision-Date: 2009-07-27 19:06+0000\n"
2260 "Last-Translator: Careone <zzbusagain@yahoo.com.cn>\n"
2261 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
2262@@ -15,7 +15,7 @@
2263 "Content-Type: text/plain; charset=UTF-8\n"
2264 "Content-Transfer-Encoding: 8bit\n"
2265 "Plural-Forms: nplurals=1; plural=0;\n"
2266-"X-Launchpad-Export-Date: 2009-09-08 02:56+0000\n"
2267+"X-Launchpad-Export-Date: 2009-09-19 11:18+0000\n"
2268 "X-Generator: Launchpad (build Unknown)\n"
2269
2270 #: ../duplicity-bin:191
2271@@ -461,97 +461,99 @@
2272 msgstr[0] ""
2273 msgstr[1] ""
2274
2275-#: ../duplicity/collections.py:633
2276-msgid "These may be deleted by running duplicity with the --cleanup option."
2277+#. "cleanup" is a hard-coded command, so do not translate it
2278+#: ../duplicity/collections.py:634
2279+msgid ""
2280+"These may be deleted by running duplicity with the \"cleanup\" command."
2281 msgstr ""
2282
2283-#: ../duplicity/collections.py:636
2284+#: ../duplicity/collections.py:637
2285 msgid "No orphaned or incomplete backup sets found."
2286 msgstr ""
2287
2288-#: ../duplicity/collections.py:652
2289+#: ../duplicity/collections.py:653
2290 #, python-format
2291 msgid "%d file exists on backend"
2292 msgid_plural "%d files exist on backend"
2293 msgstr[0] ""
2294 msgstr[1] ""
2295
2296-#: ../duplicity/collections.py:659
2297+#: ../duplicity/collections.py:660
2298 #, python-format
2299 msgid "%d file exists in cache"
2300 msgid_plural "%d files exist in cache"
2301 msgstr[0] ""
2302 msgstr[1] ""
2303
2304-#: ../duplicity/collections.py:711
2305+#: ../duplicity/collections.py:712
2306 msgid ""
2307 "Warning, discarding last backup set, because of missing signature file."
2308 msgstr ""
2309
2310-#: ../duplicity/collections.py:744
2311+#: ../duplicity/collections.py:745
2312 msgid "Warning, found the following local orphaned signature file:"
2313 msgid_plural "Warning, found the following local orphaned signature files:"
2314 msgstr[0] ""
2315 msgstr[1] ""
2316
2317-#: ../duplicity/collections.py:753
2318+#: ../duplicity/collections.py:754
2319 msgid "Warning, found the following remote orphaned signature file:"
2320 msgid_plural "Warning, found the following remote orphaned signature files:"
2321 msgstr[0] ""
2322 msgstr[1] ""
2323
2324-#: ../duplicity/collections.py:763
2325+#: ../duplicity/collections.py:764
2326 msgid "Warning, found an unnecessary signature chain"
2327 msgid_plural "Warning, found unnecessary signature chains"
2328 msgstr[0] ""
2329 msgstr[1] ""
2330
2331-#: ../duplicity/collections.py:771
2332+#: ../duplicity/collections.py:772
2333 msgid "Warning, found signatures but no corresponding backup files"
2334 msgstr ""
2335
2336-#: ../duplicity/collections.py:775
2337+#: ../duplicity/collections.py:776
2338 msgid ""
2339 "Warning, found incomplete backup sets, probably left from aborted session"
2340 msgstr ""
2341
2342-#: ../duplicity/collections.py:779
2343+#: ../duplicity/collections.py:780
2344 msgid "Warning, found the following orphaned backup file:"
2345 msgid_plural "Warning, found the following orphaned backup files:"
2346 msgstr[0] ""
2347 msgstr[1] ""
2348
2349-#: ../duplicity/collections.py:797
2350+#: ../duplicity/collections.py:798
2351 #, python-format
2352 msgid "Extracting backup chains from list of files: %s"
2353 msgstr ""
2354
2355-#: ../duplicity/collections.py:807
2356+#: ../duplicity/collections.py:808
2357 #, python-format
2358 msgid "File %s is part of known set"
2359 msgstr ""
2360
2361-#: ../duplicity/collections.py:810
2362+#: ../duplicity/collections.py:811
2363 #, python-format
2364 msgid "File %s is not part of a known set; creating new set"
2365 msgstr ""
2366
2367-#: ../duplicity/collections.py:815
2368+#: ../duplicity/collections.py:816
2369 #, python-format
2370 msgid "Ignoring file (rejected by backup set) '%s'"
2371 msgstr ""
2372
2373-#: ../duplicity/collections.py:828
2374+#: ../duplicity/collections.py:829
2375 #, python-format
2376 msgid "Found backup chain %s"
2377 msgstr ""
2378
2379-#: ../duplicity/collections.py:833
2380+#: ../duplicity/collections.py:834
2381 #, python-format
2382 msgid "Added set %s to pre-existing chain %s"
2383 msgstr ""
2384
2385-#: ../duplicity/collections.py:837
2386+#: ../duplicity/collections.py:838
2387 #, python-format
2388 msgid "Found orphaned set %s"
2389 msgstr ""
2390@@ -1012,71 +1014,71 @@
2391 msgid "Writing %s of type %s"
2392 msgstr ""
2393
2394-#: ../duplicity/path.py:210 ../duplicity/path.py:269
2395+#: ../duplicity/path.py:209 ../duplicity/path.py:268
2396 #, python-format
2397 msgid "Warning: %s has negative mtime, treating as 0."
2398 msgstr ""
2399
2400-#: ../duplicity/path.py:334
2401+#: ../duplicity/path.py:333
2402 msgid "Difference found:"
2403 msgstr ""
2404
2405-#: ../duplicity/path.py:340
2406+#: ../duplicity/path.py:339
2407 #, python-format
2408 msgid "New file %s"
2409 msgstr ""
2410
2411-#: ../duplicity/path.py:343
2412+#: ../duplicity/path.py:342
2413 #, python-format
2414 msgid "File %s is missing"
2415 msgstr ""
2416
2417-#: ../duplicity/path.py:346
2418+#: ../duplicity/path.py:345
2419 #, python-format
2420 msgid "File %%s has type %s, expected %s"
2421 msgstr ""
2422
2423-#: ../duplicity/path.py:352 ../duplicity/path.py:378
2424+#: ../duplicity/path.py:351 ../duplicity/path.py:377
2425 #, python-format
2426 msgid "File %%s has permissions %o, expected %o"
2427 msgstr ""
2428
2429-#: ../duplicity/path.py:357
2430+#: ../duplicity/path.py:356
2431 #, python-format
2432 msgid "File %%s has mtime %s, expected %s"
2433 msgstr ""
2434
2435-#: ../duplicity/path.py:365
2436+#: ../duplicity/path.py:364
2437 #, python-format
2438 msgid "Data for file %s is different"
2439 msgstr ""
2440
2441-#: ../duplicity/path.py:373
2442+#: ../duplicity/path.py:372
2443 #, python-format
2444 msgid "Symlink %%s points to %s, expected %s"
2445 msgstr ""
2446
2447-#: ../duplicity/path.py:382
2448+#: ../duplicity/path.py:381
2449 #, python-format
2450 msgid "Device file %%s has numbers %s, expected %s"
2451 msgstr ""
2452
2453-#: ../duplicity/path.py:528
2454+#: ../duplicity/path.py:527
2455 #, python-format
2456 msgid "Making directory %s"
2457 msgstr ""
2458
2459-#: ../duplicity/path.py:538
2460+#: ../duplicity/path.py:537
2461 #, python-format
2462 msgid "Deleting %s"
2463 msgstr ""
2464
2465-#: ../duplicity/path.py:547
2466+#: ../duplicity/path.py:546
2467 #, python-format
2468 msgid "Touching %s"
2469 msgstr ""
2470
2471-#: ../duplicity/path.py:554
2472+#: ../duplicity/path.py:553
2473 #, python-format
2474 msgid "Deleting tree %s"
2475 msgstr ""
2476@@ -1086,38 +1088,33 @@
2477 msgid "Error listing directory %s"
2478 msgstr ""
2479
2480-#: ../duplicity/selection.py:118
2481-#, python-format
2482-msgid "Skipping socket %s/%s"
2483-msgstr ""
2484-
2485 #: ../duplicity/selection.py:120
2486 #, python-format
2487-msgid "Error initializing file %s/%s"
2488+msgid "Skipping socket %s"
2489 msgstr ""
2490
2491-#: ../duplicity/selection.py:122
2492+#: ../duplicity/selection.py:124
2493 #, python-format
2494-msgid "Error accessing possibly locked file %s/%s"
2495+msgid "Error initializing file %s"
2496 msgstr ""
2497
2498-#: ../duplicity/selection.py:141
2499+#: ../duplicity/selection.py:128 ../duplicity/selection.py:149
2500 #, python-format
2501 msgid "Error accessing possibly locked file %s"
2502 msgstr ""
2503
2504-#: ../duplicity/selection.py:154
2505+#: ../duplicity/selection.py:164
2506 #, python-format
2507 msgid "Warning: base %s doesn't exist, continuing"
2508 msgstr ""
2509
2510-#: ../duplicity/selection.py:157 ../duplicity/selection.py:175
2511-#: ../duplicity/selection.py:178
2512+#: ../duplicity/selection.py:167 ../duplicity/selection.py:185
2513+#: ../duplicity/selection.py:188
2514 #, python-format
2515 msgid "Selecting %s"
2516 msgstr ""
2517
2518-#: ../duplicity/selection.py:259
2519+#: ../duplicity/selection.py:269
2520 #, python-format
2521 msgid ""
2522 "Fatal Error: The file specification\n"
2523@@ -1128,14 +1125,14 @@
2524 "pattern (such as '**') which matches the base directory."
2525 msgstr ""
2526
2527-#: ../duplicity/selection.py:267
2528+#: ../duplicity/selection.py:277
2529 #, python-format
2530 msgid ""
2531 "Fatal Error while processing expression\n"
2532 "%s"
2533 msgstr ""
2534
2535-#: ../duplicity/selection.py:277
2536+#: ../duplicity/selection.py:287
2537 #, python-format
2538 msgid ""
2539 "Last selection expression:\n"
2540@@ -1145,43 +1142,43 @@
2541 "probably isn't what you meant."
2542 msgstr ""
2543
2544-#: ../duplicity/selection.py:302
2545+#: ../duplicity/selection.py:312
2546 #, python-format
2547 msgid "Reading filelist %s"
2548 msgstr ""
2549
2550-#: ../duplicity/selection.py:305
2551+#: ../duplicity/selection.py:315
2552 #, python-format
2553 msgid "Sorting filelist %s"
2554 msgstr ""
2555
2556-#: ../duplicity/selection.py:332
2557+#: ../duplicity/selection.py:342
2558 #, python-format
2559 msgid ""
2560 "Warning: file specification '%s' in filelist %s\n"
2561 "doesn't start with correct prefix %s. Ignoring."
2562 msgstr ""
2563
2564-#: ../duplicity/selection.py:336
2565+#: ../duplicity/selection.py:346
2566 msgid "Future prefix errors will not be logged."
2567 msgstr ""
2568
2569-#: ../duplicity/selection.py:352
2570+#: ../duplicity/selection.py:362
2571 #, python-format
2572 msgid "Error closing filelist %s"
2573 msgstr ""
2574
2575-#: ../duplicity/selection.py:419
2576+#: ../duplicity/selection.py:429
2577 #, python-format
2578 msgid "Reading globbing filelist %s"
2579 msgstr ""
2580
2581-#: ../duplicity/selection.py:452
2582+#: ../duplicity/selection.py:462
2583 #, python-format
2584 msgid "Error compiling regular expression %s"
2585 msgstr ""
2586
2587-#: ../duplicity/selection.py:468
2588+#: ../duplicity/selection.py:478
2589 msgid ""
2590 "Warning: exclude-device-files is not the first selector.\n"
2591 "This may not be what you intended"

Subscribers

People subscribed via source and target branches

to all changes: