Merge lp:~andrewfister/deja-dup/bugfix-lp-672781 into lp:~deja-dup-team/deja-dup/trunk

[Andrew Fister]

This bug fix makes the date format in the restore assistant consistent in the two cases:

1) where just the date is shown

2) where the date and time are shown (multiple backups on a single day)

Note: I'm using Martin Owens' GroundControl, and it uploaded those po files, though the only relevant change is to AssistantRestore.vala, I think.

[lp:~andrewfister/deja-dup/bugfix-lp-672781]

744. By Andrew Fister on 2010-11-18

Added copyright to AssistantRestore.vala

[Michael Terry (mterry)]

Thanks, Andrew! I merged this with a slight change. I made the "%x %X" string translatable, in case say, the locale is right-to-left and it might make sense. Or for some reason in a language, those two strings don't go well together. I added the following help for translators:

// Translators: %x is the current date, %X is the current time.
// This will be in a list with other strings that just have %x (the
// current date). So make sure if you change this, it still makes
// sense in that context.

Also, you may be interested since you use Ground Control, I just added a .gcfunctions file to provide some extra functions when you look at a deja-dup branch in it.

[Michael Terry (mterry)]

Also, about those man page changes, that's not Ground Control, that's deja-dup's stupid po4a support for man pages. I keep meaning to fix that, but the upshot is that when you run 'make', generally all the man pages have their timestamp updated. po4a doesn't seem to have a way to stop that, but I could probably spend some time to stop it. I generally just 'bzr revert man' to stop it.

[Andrew Fister (andrewfister)]

What I meant is that because I was using ground control, there's no integrated way to exclude files that get updated from something like a make script. Ground Control assumes the only files you'd want to exclude are new files.

I used this branch as an example in a bug report on ground control, asking for a feature to be able to easily include or exclude any file in the project on a branch upload.

Thanks for the merge! :-)

=== modified file 'deja-dup/AssistantRestore.vala'
--- deja-dup/AssistantRestore.vala	2010-10-26 02:16:05 +0000
+++ deja-dup/AssistantRestore.vala	2010-11-18 08:41:46 +0000
@@ -2,6 +2,7 @@
 /*
     This file is part of Déjà Dup.
     © 2008,2009 Michael Terry <[e-mail]>
+    © 2010 Andrew Fister <[e-mail]>
 
     Déjà Dup is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -340,7 +341,7 @@
       string format = "%x";
       if ((i.prev != null && is_same_day(i.prev.data, tv)) ||
           (i.next != null && is_same_day(i.next.data, tv)))
-        format = "%c";
+        format = "%x %X";
 
       Time t = Time.local(tv.tv_sec);
       string user_str = t.format(format);

=== modified file 'man/translations/ar.po'
--- man/translations/ar.po	2010-09-18 15:05:34 +0000
+++ man/translations/ar.po	2010-11-18 08:41:46 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-03-17 21:11-0300\n"
+"POT-Creation-Date: 2010-07-12 21:53-0300\n"
 "PO-Revision-Date: 2010-03-19 04:39+0000\n"
 "Last-Translator: Amr Hassan <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,63 +21,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-monitor.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr ""
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-monitor.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr ""
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-monitor.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-monitor.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-monitor.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-monitor.1:7 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -84,133 +85,109 @@
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-monitor.1:12 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-monitor.1:13 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-monitor.1:16 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-monitor.1:16 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-monitor.1:19 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-monitor.1:19 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr ""
 
 #. type: TH
-#: ./C/deja-dup-monitor.1:1
-#, no-wrap
-msgid "deja-dup-monitor"
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:4
-msgid "deja-dup-monitor - backup your data"
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:7
-msgid "B<deja-dup-monitor> [OPTIONS]"
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:12
-msgid ""
-"deja-dup-monitor is a session daemon that handles scheduled backups.  It is "
-"started by default whenever a user logs in.  When a scheduled backup is due, "
-"it starts B<deja-dup>(1)."
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:20 ./C/deja-dup-preferences.1:18
-msgid "B<deja-dup>(1)"
-msgstr ""
-
-#. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr ""
 
+#. type: Plain text
+#: C/deja-dup-preferences.1:18
+msgid "B<deja-dup>(1)"
+msgstr ""
+
 #~ msgid "Backup your files"
 #~ msgstr "عمل نسخة احتياطية من الملفات"
 

=== modified file 'man/translations/bg.po'
--- man/translations/bg.po	2010-09-18 15:05:34 +0000
+++ man/translations/bg.po	2010-11-18 08:41:46 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-23 20:47-0300\n"
+"POT-Creation-Date: 2010-07-12 21:53-0300\n"
 "PO-Revision-Date: 2010-05-24 00:37+0000\n"
 "Last-Translator: Michael Terry <[e-mail]>\n"
 "Language-Team: Bulgarian <[e-mail]>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,63 +20,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr "Deja Dup"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr "%DATE%"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr "ПОТРЕБИТЕЛСКИ КОМАНДИ"
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr "ИМЕ"
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr "Deja Dup - запазете резервно копие на вашите данни"
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "РЕЗЮМЕ"
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -83,105 +84,105 @@
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr ""
 
 #. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:18
+#: C/deja-dup-preferences.1:18
 msgid "B<deja-dup>(1)"
 msgstr ""

=== modified file 'man/translations/cs.po'
--- man/translations/cs.po	2010-10-03 23:23:40 +0000
+++ man/translations/cs.po	2010-11-18 08:41:46 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2010-09-28 04:24+0000\n"
 "Last-Translator: Michael Terry <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,63 +20,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr "deja-dup"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr "%DATE%"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr "UŽIVATELSKÉ PŘÍKAZY"
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr "JMÉNO"
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr "deja-dup - zálohujte svá data"
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "OBSAH"
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr "B<deja-dup> [MOŽNOSTI]"
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr "B<deja-dup> --backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr "B<deja-dup> --restore [SOUBORY]"
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "POPIS"
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -86,105 +87,105 @@
 "stejně tak jako plánovat zálohy v pravidelných intervalech."
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr "MOŽNOSTI"
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr "-?, --help"
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr "Zobraz informace o užívání"
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr "--verze"
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr "Vypíše název programu a verzi"
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr "--backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr "Okamžitě začne zálohovat"
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr "--restore"
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr "Obnoví pouze určené soubory"
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENVIRONMENT"
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr "DEJA_DUP_DEBUG"
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr "Nastav na 1 pro podrobnější výpis. Užitečné pro ladění."
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SEE ALSO"
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr "B<duplicity>(1)"
 
 #. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr "deja-dup-preferences"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr "deja-dup-preferences - zálohujte svá data"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr "B<deja-dup-preferences> [MOŽNOSTI]"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr "deja-dup-preferences je dialog možností pro B<deja-dup>(1)."
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:18
+#: C/deja-dup-preferences.1:18
 msgid "B<deja-dup>(1)"
 msgstr "B<deja-dup>(1)"

=== modified file 'man/translations/da.po'
--- man/translations/da.po	2010-09-18 15:05:34 +0000
+++ man/translations/da.po	2010-11-18 08:41:46 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-03-17 21:11-0300\n"
+"POT-Creation-Date: 2010-07-12 21:53-0300\n"
 "PO-Revision-Date: 2010-03-19 04:42+0000\n"
 "Last-Translator: Michael Terry <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,63 +20,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-monitor.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr ""
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-monitor.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr ""
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-monitor.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-monitor.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-monitor.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-monitor.1:7 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -83,133 +84,109 @@
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-monitor.1:12 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-monitor.1:13 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-monitor.1:16 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-monitor.1:16 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-monitor.1:19 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr ""
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-monitor.1:19 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr ""
 
 #. type: TH
-#: ./C/deja-dup-monitor.1:1
-#, no-wrap
-msgid "deja-dup-monitor"
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:4
-msgid "deja-dup-monitor - backup your data"
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:7
-msgid "B<deja-dup-monitor> [OPTIONS]"
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:12
-msgid ""
-"deja-dup-monitor is a session daemon that handles scheduled backups.  It is "
-"started by default whenever a user logs in.  When a scheduled backup is due, "
-"it starts B<deja-dup>(1)."
-msgstr ""
-
-#. type: Plain text
-#: ./C/deja-dup-monitor.1:20 ./C/deja-dup-preferences.1:18
-msgid "B<deja-dup>(1)"
-msgstr ""
-
-#. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr ""
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr ""
 
+#. type: Plain text
+#: C/deja-dup-preferences.1:18
+msgid "B<deja-dup>(1)"
+msgstr ""
+
 #~ msgid "Backup your files"
 #~ msgstr "Backup dine filer"
 

=== modified file 'man/translations/de.po'
--- man/translations/de.po	2010-09-18 15:05:34 +0000
+++ man/translations/de.po	2010-11-18 08:41:46 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-03 18:06-0300\n"
+"POT-Creation-Date: 2010-07-12 21:53-0300\n"
 "PO-Revision-Date: 2010-05-04 14:32+0000\n"
 "Last-Translator: MixCool <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,63 +20,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr "deja-dup"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr "%DATE%"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr "USER COMMANDS"
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr "NAME"
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr "deja-dup - Datensicherung"
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "ÜBERSICHT"
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr "B<deja-dup> [OPTIONS]"
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr "B<deja-dup> --backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr "B<deja-dup> --restore [DATEIEN]"
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -87,112 +88,111 @@
 "Datensicherung lässt sich durch ein Zeitintervall festsetzen."
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr "-?, --help"
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr "Benutzerinfos anzeigen"
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr "--version"
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr "Gibt Name und Version des Programms aus"
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr "--backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr "Unmittelbar eine Sicherung starten"
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr "--restore"
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr "Nur die angegebenen Dateien wiederherstellen"
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "UMGEBUNG"
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr "DEJA_DUP_DEBUG"
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr ""
 "Auf 1 setzen, um eine ausführlichere Ausgabe zu erhalten. Nützlich zur "
 "Fehlerdiagnose."
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr "B<duplicity>(1)"
 
 #. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr "deja-dup-preferences"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr "deja-dup-preferences - Datensicherung"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr "B<deja-dup-preferences> [OPTIONEN]"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr "deja-dup-preferences ist der Einstellungsdialog für B<deja-dup>(1)."
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:18
+#: C/deja-dup-preferences.1:18
 msgid "B<deja-dup>(1)"
 msgstr "B<deja-dup>(1)"
 
-#, no-wrap
 #~ msgid "deja-dup-monitor"
 #~ msgstr "deja-dup-monitor"
 
@@ -203,14 +203,14 @@
 #~ msgstr "B<deja-dup-monitor> [OPTIONEN]"
 
 #~ msgid ""
-#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It is "
-#~ "started by default whenever a user logs in.  When a scheduled backup is due, "
-#~ "it starts B<deja-dup>(1)."
+#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It "
+#~ "is started by default whenever a user logs in.  When a scheduled backup "
+#~ "is due, it starts B<deja-dup>(1)."
 #~ msgstr ""
 #~ "deja-dup-monitor ist ein Sitzungsdienst, der regelmäßige Sicherungen "
-#~ "ausführen kann. Dieser Dienst wird per Vorgabe beim Anmelden eines Benutzers "
-#~ "gestartet. Wenn eine planmäßige Sicherung ausgeführt werden soll, wird "
-#~ "B<deja-dup>(1) aufgerufen."
+#~ "ausführen kann. Dieser Dienst wird per Vorgabe beim Anmelden eines "
+#~ "Benutzers gestartet. Wenn eine planmäßige Sicherung ausgeführt werden "
+#~ "soll, wird B<deja-dup>(1) aufgerufen."
 
 #~ msgid "C"
 #~ msgstr "C"
@@ -224,13 +224,13 @@
 #~ "Datensicherung."
 
 #~ msgid ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administrators</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administrators</ulink></publishername> </publisher>"
 #~ msgstr ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administratoren</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administratoren</ulink></publishername> </publisher>"
 
 #~ msgid "Michael"
 #~ msgstr "Michael"
@@ -248,11 +248,11 @@
 #~ msgstr "Michael Terry <email>[e-mail]</email>"
 
 #~ msgid ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> Administrators</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> Administrators</ulink>"
 #~ msgstr ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application>-Administratoren</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application>-Administratoren</ulink>"
 
 #~ msgid "This manual describes version %VERSION% of Déjà Dup."
 #~ msgstr "Dieses Handbuch beschreibt Version %VERSION% von Déjà Dup."
@@ -261,15 +261,15 @@
 #~ msgstr "Rückmeldungen"
 
 #~ msgid ""
-#~ "To report a bug or make a suggestion regarding the <application>Déjà "
-#~ "Dup</application> application or this manual, visit the <ulink "
-#~ "url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application> project page</ulink>."
+#~ "To report a bug or make a suggestion regarding the <application>Déjà Dup</"
+#~ "application> application or this manual, visit the <ulink url=\"http://"
+#~ "bugs.launchpad.net/deja-dup/+filebug\" type=\"http\"><application>Déjà "
+#~ "Dup</application> project page</ulink>."
 #~ msgstr ""
 #~ "Um einen Fehler zu melden oder einen Vorschlag zur Anwendung "
 #~ "<application>Déjà Dup</application> oder zu diesem Handbuch zu machen, "
-#~ "besuchen Sie die <ulink url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application>-Projektseite</ulink>."
+#~ "besuchen Sie die <ulink url=\"http://bugs.launchpad.net/deja-dup/+filebug"
+#~ "\" type=\"http\"><application>Déjà Dup</application>-Projektseite</ulink>."
 
 #~ msgid "Déjà Dup"
 #~ msgstr "Déjà Dup"
@@ -287,7 +287,8 @@
 #~ "(verschlüsselt, extern und regulär) und verwendet »duplicity« als Backend."
 
 #~ msgid "<application>Déjà Dup</application> provides the following features:"
-#~ msgstr "<application>Déjà Dup</application> bietet die folgenden Funktionen:"
+#~ msgstr ""
+#~ "<application>Déjà Dup</application> bietet die folgenden Funktionen:"
 
 #~ msgid "Support for local or remote backup locations, including Amazon S3"
 #~ msgstr ""
@@ -327,8 +328,8 @@
 #~ msgstr "Befehlszeile"
 
 #~ msgid ""
-#~ "To start <application>Déjà Dup</application> from a command line, type the "
-#~ "following command, then press <keycap>Return</keycap>:"
+#~ "To start <application>Déjà Dup</application> from a command line, type "
+#~ "the following command, then press <keycap>Return</keycap>:"
 #~ msgstr ""
 #~ "Um <application>Déjà Dup</application> aus einer Befehlszeile zu starten, "
 #~ "geben Sie folgenden Befehl ein und drücken anschließend die "
@@ -341,14 +342,13 @@
 #~ msgstr "Datensicherung"
 
 #~ msgid ""
-#~ "To backup, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Backup</guimenuitem></menuc"
-#~ "hoice>. Or press the <guibutton>Backup</guibutton> button on the main window."
+#~ "To backup, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Backup</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Backup</guibutton> button on the main window."
 #~ msgstr ""
-#~ "Um die Daten zu sichern, wählen Sie "
-#~ "<menuchoice><guimenu>Sicherung</guimenu><guimenuitem>Sicherung</guimenuitem><"
-#~ "/menuchoice>. Oder klicken Sie auf den Knopf "
-#~ "<guibutton>Sicherung</guibutton> im Hauptfenster."
+#~ "Um die Daten zu sichern, wählen Sie <menuchoice><guimenu>Sicherung</"
+#~ "guimenu><guimenuitem>Sicherung</guimenuitem></menuchoice>. Oder klicken "
+#~ "Sie auf den Knopf <guibutton>Sicherung</guibutton> im Hauptfenster."
 
 #~ msgid "Restoring"
 #~ msgstr "Wiederherstellung"
@@ -358,13 +358,12 @@
 
 #~ msgid ""
 #~ "To configure <application>Déjà Dup</application>, choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice>."
+#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice>."
 #~ msgstr ""
 #~ "Um die Einstellungen von <application>Déjà Dup</application> zu ändern, "
-#~ "wählen Sie "
-#~ "<menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenui"
-#~ "tem></menuchoice>."
+#~ "wählen Sie <menuchoice><guimenu>Bearbeiten</"
+#~ "guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>."
 
 #~ msgid "<guilabel>Backup location</guilabel>"
 #~ msgstr "<guilabel>Ort der Datensicherung</guilabel>"
@@ -373,8 +372,8 @@
 #~ "Use this drop-down list box to specify the backup location that "
 #~ "<application>Déjà Dup</application> uses when backing up or restoring:"
 #~ msgstr ""
-#~ "Geben Sie in diesem Auswahlfeld den Ort an, den <application>Déjà "
-#~ "Dup</application> zum Sichern oder Wiederherstellen benutzen soll:"
+#~ "Geben Sie in diesem Auswahlfeld den Ort an, den <application>Déjà Dup</"
+#~ "application> zum Sichern oder Wiederherstellen benutzen soll:"
 
 #~ msgid "<guilabel>Amazon S3</guilabel>"
 #~ msgstr "<guilabel>Amazon S3</guilabel>"
@@ -382,17 +381,18 @@
 #~ msgid ""
 #~ "This service costs money.  Read their rates carefully before using it."
 #~ msgstr ""
-#~ "Dieser Dienst kostet Geld. Lesen Sie die Tarife gründlich durch, bevor Sie "
-#~ "diesen Dienst benutzen."
+#~ "Dieser Dienst kostet Geld. Lesen Sie die Tarife gründlich durch, bevor "
+#~ "Sie diesen Dienst benutzen."
 
 #~ msgid "Removable Media"
 #~ msgstr "Wechseldatenträger"
 
 #~ msgid ""
-#~ "You may see removable media like external hard drives or thumb drives listed."
+#~ "You may see removable media like external hard drives or thumb drives "
+#~ "listed."
 #~ msgstr ""
-#~ "Eventuell werden Ihnen Wechseldatenträger, wie externe Festplatten oder USB-"
-#~ "Sticks angezeigt."
+#~ "Eventuell werden Ihnen Wechseldatenträger, wie externe Festplatten oder "
+#~ "USB-Sticks angezeigt."
 
 #~ msgid "Connected Servers"
 #~ msgstr "Verbundene Server"
@@ -403,18 +403,19 @@
 #~ "<guibutton>Connect to Server...</guibutton>.  This will let you enter the "
 #~ "server information."
 #~ msgstr ""
-#~ "Falls Sie mit irgendwelchen Servern verbunden sind, werden diese angezeigt. "
-#~ "Um eine Verbindung zu einem nicht aufgelisteten Server herzustellen, wählen "
-#~ "Sie <guilabel>Andere …</guilabel> und klicken anschließend auf "
-#~ "<guibutton>Mit Server verbinden …</guibutton>. Hier können Sie dann die "
-#~ "Serverinformationen eingeben."
+#~ "Falls Sie mit irgendwelchen Servern verbunden sind, werden diese "
+#~ "angezeigt. Um eine Verbindung zu einem nicht aufgelisteten Server "
+#~ "herzustellen, wählen Sie <guilabel>Andere …</guilabel> und klicken "
+#~ "anschließend auf <guibutton>Mit Server verbinden …</guibutton>. Hier "
+#~ "können Sie dann die Serverinformationen eingeben."
 
 #~ msgid "Local Folders"
 #~ msgstr "Lokale Ordner"
 
 #~ msgid ""
-#~ "You may also want to choose a local folder as a backup location.  Note that "
-#~ "backups can be quite large, so make sure you have enough free disk space."
+#~ "You may also want to choose a local folder as a backup location.  Note "
+#~ "that backups can be quite large, so make sure you have enough free disk "
+#~ "space."
 #~ msgstr ""
 #~ "Sie können such einen lokalen Ordner als Ort für Sicherungen auswählen. "
 #~ "Bedenken Sie hierbei, dass Datensicherungen sehr umfangreich sein können. "
@@ -434,19 +435,19 @@
 #~ msgstr "<guilabel>Ordner</guilabel>"
 
 #~ msgid ""
-#~ "Some of your data may be large and not very important to you.  In that case, "
-#~ "you can save yourself some time and space by not backing them up."
+#~ "Some of your data may be large and not very important to you.  In that "
+#~ "case, you can save yourself some time and space by not backing them up."
 #~ msgstr ""
-#~ "Einige Ihrer Daten sind evtl. groß und nciht sehr wichtig für Sie. In diesem "
-#~ "Fall können Sie sich Zeit und Speicherplatz sparen, wenn Sie diese Daten "
-#~ "vond er Sicherung ausschließen."
+#~ "Einige Ihrer Daten sind evtl. groß und nciht sehr wichtig für Sie. In "
+#~ "diesem Fall können Sie sich Zeit und Speicherplatz sparen, wenn Sie diese "
+#~ "Daten vond er Sicherung ausschließen."
 
 #~ msgid ""
-#~ "There are some locations that <application>Déjà Dup</application> excludes "
-#~ "by default:"
+#~ "There are some locations that <application>Déjà Dup</application> "
+#~ "excludes by default:"
 #~ msgstr ""
-#~ "Es gibt einige Orte, die <application>Déjà Dup</application> per Vorgabe von "
-#~ "der Sicherung ausschließt:"
+#~ "Es gibt einige Orte, die <application>Déjà Dup</application> per Vorgabe "
+#~ "von der Sicherung ausschließt:"
 
 #~ msgid "~/.cache"
 #~ msgstr "~/.cache"
@@ -482,29 +483,29 @@
 #~ msgstr "<guilabel>Sicherungsdateien verschlüsseln</guilabel>"
 
 #~ msgid ""
-#~ "Encrypting your backup files is recommended to keep your data safe. If you "
-#~ "don't have exclusive physical control of your backup location, or if it is "
-#~ "stolen, an encrypted backup prevents others from looking at your personal "
-#~ "data."
+#~ "Encrypting your backup files is recommended to keep your data safe. If "
+#~ "you don't have exclusive physical control of your backup location, or if "
+#~ "it is stolen, an encrypted backup prevents others from looking at your "
+#~ "personal data."
 #~ msgstr ""
 #~ "Die Verschlüsselung der zu sichernden Daten wird empfohlen, um Ihre Daten "
-#~ "sicher aufzubewahren. Falls Sie beispielsweise nicht als einziger Zugang zum "
-#~ "Speichermedium haben oder die Festplatte gestohlen wird, so schützt Sie eine "
-#~ "verschlüsselte Datensicherung davor, dass fremde Personen Ihre Daten ansehen "
-#~ "können."
+#~ "sicher aufzubewahren. Falls Sie beispielsweise nicht als einziger Zugang "
+#~ "zum Speichermedium haben oder die Festplatte gestohlen wird, so schützt "
+#~ "Sie eine verschlüsselte Datensicherung davor, dass fremde Personen Ihre "
+#~ "Daten ansehen können."
 
 #~ msgid ""
 #~ "If on, you will be prompted for a password. Keep this password safe, you "
 #~ "will need it to restore your data."
 #~ msgstr ""
-#~ "Falls aktiviert, werden Sie aufgefordert, ein Passwort einzugeben. Bewahren "
-#~ "Sie dieses Passwort gut auf, Sie benötigen es, um später ihre Daten "
-#~ "wiederherzustellen."
+#~ "Falls aktiviert, werden Sie aufgefordert, ein Passwort einzugeben. "
+#~ "Bewahren Sie dieses Passwort gut auf, Sie benötigen es, um später ihre "
+#~ "Daten wiederherzustellen."
 
 #~ msgid "<guilabel>Automatically backup on a regular schedule</guilabel>"
 #~ msgstr ""
-#~ "<guilabel>Automatische Datensicherung zu einem regelmäßigen "
-#~ "Zeitpunkt</guilabel>"
+#~ "<guilabel>Automatische Datensicherung zu einem regelmäßigen Zeitpunkt</"
+#~ "guilabel>"
 
 #~ msgid "Default: <userinput>Off</userinput>."
 #~ msgstr "Standard: <userinput>Aus</userinput>."
@@ -569,10 +570,10 @@
 #~ msgstr "Anzahl der Tage zwischen den Datensicherungen"
 
 #~ msgid ""
-#~ "This list of directories will be backed up. Reserved values $HOME, $DESKTOP, "
-#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, "
-#~ "and $VIDEO are recognized as the user's special directories. Relative "
-#~ "entries are relative to the user's home directory."
+#~ "This list of directories will be backed up. Reserved values $HOME, "
+#~ "$DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
+#~ "$TEMPLATES, $TRASH, and $VIDEO are recognized as the user's special "
+#~ "directories. Relative entries are relative to the user's home directory."
 #~ msgstr ""
 #~ "Diese Liste von Ordnern wird gesichert. Die reservierten Werte $HOME, "
 #~ "$DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
@@ -586,8 +587,8 @@
 #~ "directories. Relative entries are relative to the user's home directory. "
 #~ "This list takes precedence over the include list."
 #~ msgstr ""
-#~ "Diese Liste von Ordnern wird nicht gesichert. Die reservierten Werte $HOME, "
-#~ "$DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
+#~ "Diese Liste von Ordnern wird nicht gesichert. Die reservierten Werte "
+#~ "$HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
 #~ "$TEMPLATES, $TRASH und $VIDEO werden als Spezialordner des Benutzers "
 #~ "erkannt. Relative Einträge sind relativ zu den Benutzerverzeichnis. Diese "
 #~ "Liste hat Vorrang gegenüber der Datensicherungsliste."
@@ -603,11 +604,11 @@
 #~ msgstr "Ob die Datensicherungen verschlüsselt werden sollen."
 
 #~ msgid ""
-#~ "Whether to encrypt your backup files in the storage location. It's strongly "
-#~ "recommended to leave this as 'true'."
+#~ "Whether to encrypt your backup files in the storage location. It's "
+#~ "strongly recommended to leave this as 'true'."
 #~ msgstr ""
-#~ "Ob die Datensicherungsdateien im Zielordner verschlüsselt werden sollen. Es "
-#~ "wird dringend empfohlen, diese Option aktiviert zu belassen."
+#~ "Ob die Datensicherungsdateien im Zielordner verschlüsselt werden sollen. "
+#~ "Es wird dringend empfohlen, diese Option aktiviert zu belassen."
 
 #~ msgid "Whether to periodically backup"
 #~ msgstr "Ob die Datensicherung regelmäßig durchgeführt werden soll."
@@ -617,7 +618,8 @@
 #~ "already. Only legal hostname strings are valid."
 #~ msgstr ""
 #~ "In welchem Amazon S3 bucket die Dateien gespeichert werden sollen. Der "
-#~ "Ordner muss nicht bereits existieren. Nur korrekte Servernamen sind gültig."
+#~ "Ordner muss nicht bereits existieren. Nur korrekte Servernamen sind "
+#~ "gültig."
 
 #~ msgid "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
 #~ msgstr ""
@@ -653,8 +655,8 @@
 
 #~ msgid "Please enter the encryption password for your backup files."
 #~ msgstr ""
-#~ "Bitte geben Sie das Verschlüsselungspasswort für die Datensicherungsdateien "
-#~ "ein."
+#~ "Bitte geben Sie das Verschlüsselungspasswort für die "
+#~ "Datensicherungsdateien ein."
 
 #~ msgid "Enter"
 #~ msgstr "Eingabe"
@@ -809,11 +811,11 @@
 #~ msgstr "Amazon S3 Passwort"
 
 #~ msgid ""
-#~ "Enter your Amazon Web Services user ID and secret key.  This is not the same "
-#~ "as your amazon.com username and password."
+#~ "Enter your Amazon Web Services user ID and secret key.  This is not the "
+#~ "same as your amazon.com username and password."
 #~ msgstr ""
-#~ "Bitte Amazon Web Services Benutzer-ID und geheimen Schlüssel eingeben. Dies "
-#~ "entspricht nicht dem amazon.com Benutzernamen und Passwort."
+#~ "Bitte Amazon Web Services Benutzer-ID und geheimen Schlüssel eingeben. "
+#~ "Dies entspricht nicht dem amazon.com Benutzernamen und Passwort."
 
 #~ msgid "Connect to _Server..."
 #~ msgstr "Mit _Server verbinden..."
@@ -877,8 +879,8 @@
 #~ msgstr "Die Version von duplicity ist zu alt."
 
 #~ msgid ""
-#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only found "
-#~ "version %d.%d.%.2d"
+#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only "
+#~ "found version %d.%d.%.2d"
 #~ msgstr ""
 #~ "Déjà Dup benötigt mindestens duplicity Version %d.%d.%.2d, es konnte aber "
 #~ "nur duplicity Version %d.%d.%.2d gefunden werden."
@@ -903,9 +905,11 @@
 #~ msgid "Invalid secret key."
 #~ msgstr "ungültiger geheimer Schlüssel."
 
-#~ msgid "Your Amazon Web Services account is not signed up for the S3 service."
+#~ msgid ""
+#~ "Your Amazon Web Services account is not signed up for the S3 service."
 #~ msgstr ""
-#~ "Der angegebene Amazon Web Services Account ist für den S3 Dienst eingetragen."
+#~ "Der angegebene Amazon Web Services Account ist für den S3 Dienst "
+#~ "eingetragen."
 
 #~ msgid "S3 bucket name is not available."
 #~ msgstr "S3 bucket Name nicht verfügbar."
@@ -933,9 +937,9 @@
 
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License as published by the Free "
-#~ "Software Foundation; either version 3 of the License, or (at your option) "
-#~ "any later version."
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 3 of the License, or (at your "
+#~ "option) any later version."
 #~ msgstr ""
 #~ "Dieses Programm ist freie Software, Sie können sie weitergeben und/oder "
 #~ "verändern solange Sie sich an die Regeln der GNU General Public License "
@@ -944,10 +948,10 @@
 #~ "folgenden Lizenz."
 
 #~ msgid ""
-#~ "This program is distributed in the hope that it will be useful, but WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-#~ "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-#~ "more details."
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
 #~ msgstr ""
 #~ "Die Veröffentlichung dieses Programmes erfolgt in der Hoffnung, dass es "
 #~ "Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
@@ -982,8 +986,9 @@
 #~ "Not all files could be restored. Any files that could not be restored may "
 #~ "still be found in %s."
 #~ msgstr ""
-#~ "Nicht alle Dateien konnten wiederhergestellt werden. Die Dateien, die nicht "
-#~ "wiederhergestellt werden konnten, befinden sich möglicherweise noch in %s."
+#~ "Nicht alle Dateien konnten wiederhergestellt werden. Die Dateien, die "
+#~ "nicht wiederhergestellt werden konnten, befinden sich möglicherweise noch "
+#~ "in %s."
 
 #~ msgid "Could not restore %s: %s"
 #~ msgstr "%s: %s konnte nicht wiederhergestellt werden"
@@ -996,8 +1001,8 @@
 
 #~ msgid "Enter the password used to encrypt your backup files."
 #~ msgstr ""
-#~ "geben Sie das Passwort ein, mit dem die Datensicherung verschlüsselt werden "
-#~ "soll."
+#~ "geben Sie das Passwort ein, mit dem die Datensicherung verschlüsselt "
+#~ "werden soll."
 
 #~ msgid "Déjà Dup backup passphrase"
 #~ msgstr "Déjà DupDatensicherung Passwortsatz"
@@ -1052,14 +1057,14 @@
 #~ msgstr "konnte den Ordner nicht hinzufügen"
 
 #~ msgid ""
-#~ "You should have received a copy of the GNU General Public License along with "
-#~ "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-#~ "Place - Suite 330, Boston, MA  02111-1307, USA."
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program; if not, write to the Free Software Foundation, Inc., "
+#~ "59 Temple Place - Suite 330, Boston, MA  02111-1307, USA."
 #~ msgstr ""
 #~ "Sie sollten ein Exemplar der GNU General Public License zusammen mit\r\n"
 #~ "diesem Programm erhalten haben. Falls nicht, schreiben Sie an die Free\r\n"
-#~ "Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307, "
-#~ "USA."
+#~ "Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA "
+#~ "02111-1307, USA."
 
 #~ msgid "I_nclude:"
 #~ msgstr "_Einbeziehen:"
@@ -1086,8 +1091,8 @@
 #~ msgstr "der Port, der für SSH-Verbindungen verwendet wird"
 
 #~ msgid ""
-#~ "The protocol used for the backup location. Valid values are 's3', 'file', or "
-#~ "'ssh'."
+#~ "The protocol used for the backup location. Valid values are 's3', 'file', "
+#~ "or 'ssh'."
 #~ msgstr ""
 #~ "Das für Datensicherungen verwendete Protokoll. Gültige Werte sind \"s3\", "
 #~ "\"file\" oder \"ssh\"."
@@ -1130,11 +1135,11 @@
 #~ msgstr "Hilfe"
 
 #~ msgid ""
-#~ "Choose <menuchoice><guisubmenu>Accessories</guisubmenu><guimenuitem>Déjà Dup "
-#~ "Backup Tool</guimenuitem></menuchoice>."
+#~ "Choose <menuchoice><guisubmenu>Accessories</guisubmenu><guimenuitem>Déjà "
+#~ "Dup Backup Tool</guimenuitem></menuchoice>."
 #~ msgstr ""
-#~ "Wählen Sie <menuchoice><guisubmenu>Zubehör</guisubmenu><guimenuitem>Déjà Dup "
-#~ "Datensicherung</guimenuitem></menuchoice>."
+#~ "Wählen Sie <menuchoice><guisubmenu>Zubehör</guisubmenu><guimenuitem>Déjà "
+#~ "Dup Datensicherung</guimenuitem></menuchoice>."
 
 #~ msgid "translator-credits"
 #~ msgstr ""

=== modified file 'man/translations/en_GB.po'
--- man/translations/en_GB.po	2010-09-18 15:05:34 +0000
+++ man/translations/en_GB.po	2010-11-18 08:41:46 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-03 18:06-0300\n"
+"POT-Creation-Date: 2010-07-12 21:53-0300\n"
 "PO-Revision-Date: 2010-05-04 14:57+0000\n"
 "Last-Translator: Matthew Gall <[e-mail]>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,63 +20,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr "deja-dup"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr "%DATE%"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr "USER COMMANDS"
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr "NAME"
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr "deja-dup - backup your data"
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr "B<deja-dup> [OPTIONS]"
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr "B<deja-dup> --backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr "B<deja-dup> --restore [FILES]"
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -86,110 +87,109 @@
 "well as schedule backups at regular intervals."
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr "-?, --help"
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr "Display usage information"
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr "--version"
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr "Prints program name and version"
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr "--backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr "Immediately starts a backup"
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr "--restore"
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr "Restores only the specified files"
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENVIRONMENT"
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr "DEJA_DUP_DEBUG"
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr "Set to 1 to enable more verbose output. Helpful for debugging."
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SEE ALSO"
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr "B<duplicity>(1)"
 
 #. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr "deja-dup-preferences"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr "deja-dup-preferences - backup your data"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr "B<deja-dup-preferences> [OPTIONS]"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:18
+#: C/deja-dup-preferences.1:18
 msgid "B<deja-dup>(1)"
 msgstr "B<deja-dup>(1)"
 
-#, no-wrap
 #~ msgid "deja-dup-monitor"
 #~ msgstr "deja-dup-monitor"
 
@@ -200,13 +200,13 @@
 #~ msgstr "B<deja-dup-monitor> [OPTIONS]"
 
 #~ msgid ""
-#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It is "
-#~ "started by default whenever a user logs in.  When a scheduled backup is due, "
-#~ "it starts B<deja-dup>(1)."
+#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It "
+#~ "is started by default whenever a user logs in.  When a scheduled backup "
+#~ "is due, it starts B<deja-dup>(1)."
 #~ msgstr ""
-#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It is "
-#~ "started by default whenever a user logs in.  When a scheduled backup is due, "
-#~ "it starts B<deja-dup>(1)."
+#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It "
+#~ "is started by default whenever a user logs in.  When a scheduled backup "
+#~ "is due, it starts B<deja-dup>(1)."
 
 #~ msgid "C"
 #~ msgstr "C"
@@ -218,37 +218,37 @@
 #~ msgstr "<application>Déjà Dup</application> is a simple backup tool."
 
 #~ msgid ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administrators</ulink></publishername> </publisher>"
-#~ msgstr ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administrators</ulink></publishername> </publisher>"
-
-#~ msgid ""
-#~ "Permission is granted to copy, distribute and/or modify this document under "
-#~ "the terms of the GNU General Public License (GPL), Version 3 or any later "
-#~ "version published by the Free Software Foundation.  You can find a copy of "
-#~ "the GPL at this <ulink type=\"help\" url=\"ghelp:gpl\">link</ulink> or in "
-#~ "the file COPYING distributed with this manual."
-#~ msgstr ""
-#~ "Permission is granted to copy, distribute and/or modify this document under "
-#~ "the terms of the GNU General Public License (GPL), Version 3 or any later "
-#~ "version published by the Free Software Foundation.  You can find a copy of "
-#~ "the GPL at this <ulink type=\"help\" url=\"ghelp:gpl\">link</ulink> or in "
-#~ "the file COPYING distributed with this manual."
-
-#~ msgid ""
-#~ "This manual is distributed in the hope that it will be useful, but WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-#~ "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-#~ "more details."
-#~ msgstr ""
-#~ "This manual is distributed in the hope that it will be useful, but WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-#~ "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-#~ "more details."
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administrators</ulink></publishername> </publisher>"
+#~ msgstr ""
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administrators</ulink></publishername> </publisher>"
+
+#~ msgid ""
+#~ "Permission is granted to copy, distribute and/or modify this document "
+#~ "under the terms of the GNU General Public License (GPL), Version 3 or any "
+#~ "later version published by the Free Software Foundation.  You can find a "
+#~ "copy of the GPL at this <ulink type=\"help\" url=\"ghelp:gpl\">link</"
+#~ "ulink> or in the file COPYING distributed with this manual."
+#~ msgstr ""
+#~ "Permission is granted to copy, distribute and/or modify this document "
+#~ "under the terms of the GNU General Public License (GPL), Version 3 or any "
+#~ "later version published by the Free Software Foundation.  You can find a "
+#~ "copy of the GPL at this <ulink type=\"help\" url=\"ghelp:gpl\">link</"
+#~ "ulink> or in the file COPYING distributed with this manual."
+
+#~ msgid ""
+#~ "This manual is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
+#~ msgstr ""
+#~ "This manual is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
 
 #~ msgid "Michael"
 #~ msgstr "Michael"
@@ -266,11 +266,11 @@
 #~ msgstr "Michael Terry <email>[e-mail]</email>"
 
 #~ msgid ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> Administrators</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> Administrators</ulink>"
 #~ msgstr ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> Administrators</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> Administrators</ulink>"
 
 #~ msgid "This manual describes version %VERSION% of Déjà Dup."
 #~ msgstr "This manual describes version %VERSION% of Déjà Dup."
@@ -279,15 +279,15 @@
 #~ msgstr "Feedback"
 
 #~ msgid ""
-#~ "To report a bug or make a suggestion regarding the <application>Déjà "
-#~ "Dup</application> application or this manual, visit the <ulink "
-#~ "url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application> project page</ulink>."
+#~ "To report a bug or make a suggestion regarding the <application>Déjà Dup</"
+#~ "application> application or this manual, visit the <ulink url=\"http://"
+#~ "bugs.launchpad.net/deja-dup/+filebug\" type=\"http\"><application>Déjà "
+#~ "Dup</application> project page</ulink>."
 #~ msgstr ""
-#~ "To report a bug or make a suggestion regarding the <application>Déjà "
-#~ "Dup</application> application or this manual, visit the <ulink "
-#~ "url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application> project page</ulink>."
+#~ "To report a bug or make a suggestion regarding the <application>Déjà Dup</"
+#~ "application> application or this manual, visit the <ulink url=\"http://"
+#~ "bugs.launchpad.net/deja-dup/+filebug\" type=\"http\"><application>Déjà "
+#~ "Dup</application> project page</ulink>."
 
 #~ msgid "Déjà Dup"
 #~ msgstr "Déjà Dup"
@@ -305,7 +305,8 @@
 #~ "regular) and uses duplicity as the backend."
 
 #~ msgid "<application>Déjà Dup</application> provides the following features:"
-#~ msgstr "<application>Déjà Dup</application> provides the following features:"
+#~ msgstr ""
+#~ "<application>Déjà Dup</application> provides the following features:"
 
 #~ msgid "Support for local or remote backup locations, including Amazon S3"
 #~ msgstr "Support for local or remote backup locations, including Amazon S3"
@@ -349,11 +350,11 @@
 #~ msgstr "Command line"
 
 #~ msgid ""
-#~ "To start <application>Déjà Dup</application> from a command line, type the "
-#~ "following command, then press <keycap>Return</keycap>:"
+#~ "To start <application>Déjà Dup</application> from a command line, type "
+#~ "the following command, then press <keycap>Return</keycap>:"
 #~ msgstr ""
-#~ "To start <application>Déjà Dup</application> from a command line, type the "
-#~ "following command, then press <keycap>Return</keycap>:"
+#~ "To start <application>Déjà Dup</application> from a command line, type "
+#~ "the following command, then press <keycap>Return</keycap>:"
 
 #~ msgid "<command>deja-dup</command>"
 #~ msgstr "<command>deja-dup</command>"
@@ -362,70 +363,72 @@
 #~ msgstr "Backing Up"
 
 #~ msgid ""
-#~ "To backup, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Backup</guimenuitem></menuc"
-#~ "hoice>. Or press the <guibutton>Backup</guibutton> button on the main window."
+#~ "To backup, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Backup</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Backup</guibutton> button on the main window."
 #~ msgstr ""
-#~ "To backup, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Backup</guimenuitem></menuc"
-#~ "hoice>. Or press the <guibutton>Backup</guibutton> button on the main window."
+#~ "To backup, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Backup</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Backup</guibutton> button on the main window."
 
 #~ msgid ""
-#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location and which files to include or exclude.  On the "
-#~ "Summary page, click <guibutton>Backup</guibutton> to start the backup."
+#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location and which files to include or exclude.  "
+#~ "On the Summary page, click <guibutton>Backup</guibutton> to start the "
+#~ "backup."
 #~ msgstr ""
-#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location and which files to include or exclude.  On the "
-#~ "Summary page, click <guibutton>Backup</guibutton> to start the backup."
+#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location and which files to include or exclude.  "
+#~ "On the Summary page, click <guibutton>Backup</guibutton> to start the "
+#~ "backup."
 
 #~ msgid "Restoring"
 #~ msgstr "Restoring"
 
 #~ msgid ""
-#~ "To restore, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Restore</guimenuitem></menu"
-#~ "choice>. Or press the <guibutton>Restore</guibutton> button on the main "
-#~ "window."
-#~ msgstr ""
-#~ "To restore, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Restore</guimenuitem></menu"
-#~ "choice>. Or press the <guibutton>Restore</guibutton> button on the main "
-#~ "window."
-
-#~ msgid ""
-#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location.  Then choose which backup date to restore from "
-#~ "and where to put the restored files. You can either restore them to their "
-#~ "original locations or put them in a folder of your choice."
-#~ msgstr ""
-#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location.  Then choose which backup date to restore from "
-#~ "and where to put the restored files. You can either restore them to their "
-#~ "original locations or put them in a folder of your choice."
-
-#~ msgid ""
-#~ "After clicking <guibutton>Forward</guibutton>, you can review your restore "
-#~ "options, then click <guibutton>Restore</guibutton> to start the restore."
-#~ msgstr ""
-#~ "After clicking <guibutton>Forward</guibutton>, you can review your restore "
-#~ "options, then click <guibutton>Restore</guibutton> to start the restore."
+#~ "To restore, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Restore</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Restore</guibutton> button on the main window."
+#~ msgstr ""
+#~ "To restore, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Restore</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Restore</guibutton> button on the main window."
+
+#~ msgid ""
+#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location.  Then choose which backup date to "
+#~ "restore from and where to put the restored files. You can either restore "
+#~ "them to their original locations or put them in a folder of your choice."
+#~ msgstr ""
+#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location.  Then choose which backup date to "
+#~ "restore from and where to put the restored files. You can either restore "
+#~ "them to their original locations or put them in a folder of your choice."
+
+#~ msgid ""
+#~ "After clicking <guibutton>Forward</guibutton>, you can review your "
+#~ "restore options, then click <guibutton>Restore</guibutton> to start the "
+#~ "restore."
+#~ msgstr ""
+#~ "After clicking <guibutton>Forward</guibutton>, you can review your "
+#~ "restore options, then click <guibutton>Restore</guibutton> to start the "
+#~ "restore."
 
 #~ msgid "Preferences"
 #~ msgstr "Preferences"
 
 #~ msgid ""
 #~ "To configure <application>Déjà Dup</application>, choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice>."
+#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice>."
 #~ msgstr ""
 #~ "To configure <application>Déjà Dup</application>, choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice>."
+#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice>."
 
 #~ msgid "<guilabel>Backup location</guilabel>"
 #~ msgstr "<guilabel>Backup location</guilabel>"
@@ -443,17 +446,17 @@
 #~ msgid ""
 #~ "This backup location uses the S3 storage service from Amazon. For a small "
 #~ "fee per gigabyte, they hold your data for you. This is the recommended "
-#~ "default because it is an easy way to keep your data offsite (meaning out of "
-#~ "your home: in case of disaster or theft, your data will still be safe). You "
-#~ "can sign up <ulink url=\"http://aws.amazon.com/s3/\" "
-#~ "type=\"http\">online</ulink>."
+#~ "default because it is an easy way to keep your data offsite (meaning out "
+#~ "of your home: in case of disaster or theft, your data will still be "
+#~ "safe). You can sign up <ulink url=\"http://aws.amazon.com/s3/\" type="
+#~ "\"http\">online</ulink>."
 #~ msgstr ""
 #~ "This backup location uses the S3 storage service from Amazon. For a small "
 #~ "fee per gigabyte, they hold your data for you. This is the recommended "
-#~ "default because it is an easy way to keep your data offsite (meaning out of "
-#~ "your home: in case of disaster or theft, your data will still be safe). You "
-#~ "can sign up <ulink url=\"http://aws.amazon.com/s3/\" "
-#~ "type=\"http\">online</ulink>."
+#~ "default because it is an easy way to keep your data offsite (meaning out "
+#~ "of your home: in case of disaster or theft, your data will still be "
+#~ "safe). You can sign up <ulink url=\"http://aws.amazon.com/s3/\" type="
+#~ "\"http\">online</ulink>."
 
 #~ msgid ""
 #~ "This service costs money.  Read their rates carefully before using it."
@@ -464,9 +467,11 @@
 #~ msgstr "Removable Media"
 
 #~ msgid ""
-#~ "You may see removable media like external hard drives or thumb drives listed."
+#~ "You may see removable media like external hard drives or thumb drives "
+#~ "listed."
 #~ msgstr ""
-#~ "You may see removable media like external hard drives or thumb drives listed."
+#~ "You may see removable media like external hard drives or thumb drives "
+#~ "listed."
 
 #~ msgid "Connected Servers"
 #~ msgstr "Connected Servers"
@@ -486,11 +491,13 @@
 #~ msgstr "Local Folders"
 
 #~ msgid ""
-#~ "You may also want to choose a local folder as a backup location.  Note that "
-#~ "backups can be quite large, so make sure you have enough free disk space."
+#~ "You may also want to choose a local folder as a backup location.  Note "
+#~ "that backups can be quite large, so make sure you have enough free disk "
+#~ "space."
 #~ msgstr ""
-#~ "You may also want to choose a local folder as a backup location.  Note that "
-#~ "backups can be quite large, so make sure you have enough free disk space."
+#~ "You may also want to choose a local folder as a backup location.  Note "
+#~ "that backups can be quite large, so make sure you have enough free disk "
+#~ "space."
 
 #~ msgid "Default: <guilabel>Amazon S3</guilabel>."
 #~ msgstr "Default: <guilabel>Amazon S3</guilabel>."
@@ -506,12 +513,12 @@
 #~ "location has been selected."
 
 #~ msgid ""
-#~ "This is your Access Key ID that Amazon gave you when you signed up for S3. "
-#~ "It is like a username for logging into S3. If left empty, you will be "
+#~ "This is your Access Key ID that Amazon gave you when you signed up for "
+#~ "S3. It is like a username for logging into S3. If left empty, you will be "
 #~ "prompted for it as you backup or restore."
 #~ msgstr ""
-#~ "This is your Access Key ID that Amazon gave you when you signed up for S3. "
-#~ "It is like a username for logging into S3. If left empty, you will be "
+#~ "This is your Access Key ID that Amazon gave you when you signed up for "
+#~ "S3. It is like a username for logging into S3. If left empty, you will be "
 #~ "prompted for it as you backup or restore."
 
 #~ msgid "<guilabel>Folder</guilabel>"
@@ -523,48 +530,48 @@
 #~ "which to put your files."
 #~ msgstr ""
 #~ "If you have multiple backups, you may want to keep them separated in "
-#~ "multiple folders. Use this option to enter a path on the S3 service in which "
-#~ "to put your files."
+#~ "multiple folders. Use this option to enter a path on the S3 service in "
+#~ "which to put your files."
 
 #~ msgid "<guilabel>Include files in folders</guilabel>"
 #~ msgstr "<guilabel>Include files in folders</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to backup. Press the <guibutton>Add</guibutton> "
-#~ "or <guibutton>Remove</guibutton> buttons to modify the list. If you are only "
-#~ "interested in backing up your own data, the default of <guilabel>Home "
-#~ "Folder</guilabel> is sufficient."
+#~ "Select a list of directories to backup. Press the <guibutton>Add</"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "If you are only interested in backing up your own data, the default of "
+#~ "<guilabel>Home Folder</guilabel> is sufficient."
 #~ msgstr ""
-#~ "Select a list of directories to backup. Press the <guibutton>Add</guibutton> "
-#~ "or <guibutton>Remove</guibutton> buttons to modify the list. If you are only "
-#~ "interested in backing up your own data, the default of <guilabel>Home "
-#~ "Folder</guilabel> is sufficient."
+#~ "Select a list of directories to backup. Press the <guibutton>Add</"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "If you are only interested in backing up your own data, the default of "
+#~ "<guilabel>Home Folder</guilabel> is sufficient."
 
 #~ msgid "<guilabel>Except files in folders</guilabel>"
 #~ msgstr "<guilabel>Except files in folders</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to not backup. Press the <guibutton>Add "
-#~ "</guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
-#~ "This list takes precedence over the list of included directories."
-#~ msgstr ""
-#~ "Select a list of directories to not backup. Press the <guibutton>Add "
-#~ "</guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
-#~ "This list takes precedence over the list of included directories."
-
-#~ msgid ""
-#~ "Some of your data may be large and not very important to you.  In that case, "
-#~ "you can save yourself some time and space by not backing them up."
-#~ msgstr ""
-#~ "Some of your data may be large and not very important to you. In that case, "
-#~ "you can save yourself some time and space by not backing them up."
-
-#~ msgid ""
-#~ "There are some locations that <application>Déjà Dup</application> excludes "
-#~ "by default:"
-#~ msgstr ""
-#~ "There are some locations that <application>Déjà Dup</application> excludes "
-#~ "by default:"
+#~ "Select a list of directories to not backup. Press the <guibutton>Add </"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "This list takes precedence over the list of included directories."
+#~ msgstr ""
+#~ "Select a list of directories to not backup. Press the <guibutton>Add </"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "This list takes precedence over the list of included directories."
+
+#~ msgid ""
+#~ "Some of your data may be large and not very important to you.  In that "
+#~ "case, you can save yourself some time and space by not backing them up."
+#~ msgstr ""
+#~ "Some of your data may be large and not very important to you. In that "
+#~ "case, you can save yourself some time and space by not backing them up."
+
+#~ msgid ""
+#~ "There are some locations that <application>Déjà Dup</application> "
+#~ "excludes by default:"
+#~ msgstr ""
+#~ "There are some locations that <application>Déjà Dup</application> "
+#~ "excludes by default:"
 
 #~ msgid "~/.cache"
 #~ msgstr "~/.cache"
@@ -600,15 +607,15 @@
 #~ msgstr "<guilabel>Encrypt backup files</guilabel>"
 
 #~ msgid ""
-#~ "Encrypting your backup files is recommended to keep your data safe. If you "
-#~ "don't have exclusive physical control of your backup location, or if it is "
-#~ "stolen, an encrypted backup prevents others from looking at your personal "
-#~ "data."
+#~ "Encrypting your backup files is recommended to keep your data safe. If "
+#~ "you don't have exclusive physical control of your backup location, or if "
+#~ "it is stolen, an encrypted backup prevents others from looking at your "
+#~ "personal data."
 #~ msgstr ""
-#~ "Encrypting your backup files is recommended to keep your data safe. If you "
-#~ "don't have exclusive physical control of your backup location, or if it is "
-#~ "stolen, an encrypted backup prevents others from looking at your personal "
-#~ "data."
+#~ "Encrypting your backup files is recommended to keep your data safe. If "
+#~ "you don't have exclusive physical control of your backup location, or if "
+#~ "it is stolen, an encrypted backup prevents others from looking at your "
+#~ "personal data."
 
 #~ msgid ""
 #~ "If on, you will be prompted for a password. Keep this password safe, you "
@@ -625,14 +632,14 @@
 
 #~ msgid ""
 #~ "Turn this option on to have <application>Déjà Dup</application> "
-#~ "automatically backup for you. This is recommended so that you don't forget "
-#~ "to backup. Backups are more useful the more recently you have made them, so "
-#~ "it is important to regularly do so."
+#~ "automatically backup for you. This is recommended so that you don't "
+#~ "forget to backup. Backups are more useful the more recently you have made "
+#~ "them, so it is important to regularly do so."
 #~ msgstr ""
 #~ "Turn this option on to have <application>Déjà Dup</application> "
-#~ "automatically backup for you. This is recommended so that you don't forget "
-#~ "to backup. Backups are more useful the more recently you have made them, so "
-#~ "it is important to regularly do so."
+#~ "automatically backup for you. This is recommended so that you don't "
+#~ "forget to backup. Backups are more useful the more recently you have made "
+#~ "them, so it is important to regularly do so."
 
 #~ msgid "Default: <userinput>Off</userinput>."
 #~ msgstr "Default: <userinput>Off</userinput>."
@@ -651,14 +658,14 @@
 
 #~ msgid ""
 #~ "Choose the minimum amount of time to keep backup files.  If you find that "
-#~ "the backup files are taking up too much space, you may want to decrease this "
-#~ "duration.  Due to implementation details, files may be kept a bit longer "
-#~ "than the chosen time.  But no files will be deleted early."
+#~ "the backup files are taking up too much space, you may want to decrease "
+#~ "this duration.  Due to implementation details, files may be kept a bit "
+#~ "longer than the chosen time.  But no files will be deleted early."
 #~ msgstr ""
 #~ "Choose the minimum amount of time to keep backup files.  If you find that "
-#~ "the backup files are taking up too much space, you may want to decrease this "
-#~ "duration.  Due to implementation details, files may be kept a bit longer "
-#~ "than the chosen time.  But no files will be deleted early."
+#~ "the backup files are taking up too much space, you may want to decrease "
+#~ "this duration.  Due to implementation details, files may be kept a bit "
+#~ "longer than the chosen time.  But no files will be deleted early."
 
 #~ msgid "Default: <guilabel>Forever</guilabel>."
 #~ msgstr "Default: <guilabel>Forever</guilabel>."
@@ -686,42 +693,42 @@
 #~ msgstr "B<deja-dup>(1), B<deja-dup-applet>(1)"
 
 #~ msgid ""
-#~ "To report a bug or make a suggestion regarding the <application>Déjà "
-#~ "Dup</application> application or this manual, visit the <ulink "
-#~ "url=\"http://bugs.launchpad.net/deja-dup\" type=\"http\"><application>Déjà "
-#~ "Dup</application> project page</ulink>."
-#~ msgstr ""
-#~ "To report a bug or make a suggestion regarding the <application>Déjà "
-#~ "Dup</application> application or this manual, visit the <ulink "
-#~ "url=\"http://bugs.launchpad.net/deja-dup\" type=\"http\"><application>Déjà "
-#~ "Dup</application> project page</ulink>."
-
-#~ msgid ""
-#~ "<application>Déjà Dup</application> is a simple backup program. It hides the "
-#~ "complexity of doing backups the 'right way' (encrypted, off-site, and "
-#~ "regular) and uses duplicity as the backend."
-#~ msgstr ""
-#~ "<application>Déjà Dup</application> is a simple backup program. It hides the "
-#~ "complexity of doing backups the 'right way' (encrypted, off-site, and "
-#~ "regular) and uses duplicity as the backend."
-
-#~ msgid ""
-#~ "To backup, choose "
-#~ "<menuchoice><guimenu>File</guimenu><guimenuitem>Backup</guimenuitem></menucho"
-#~ "ice>. Or press the <guibutton>Backup</guibutton> button on the main window."
-#~ msgstr ""
-#~ "To backup, choose "
-#~ "<menuchoice><guimenu>File</guimenu><guimenuitem>Backup</guimenuitem></menucho"
-#~ "ice>. Or press the <guibutton>Backup</guibutton> button on the main window."
-
-#~ msgid ""
-#~ "To restore, choose "
-#~ "<menuchoice><guimenu>File</guimenu><guimenuitem>Restore</guimenuitem></menuch"
-#~ "oice>. Or press the <guibutton>Restore</guibutton> button on the main window."
-#~ msgstr ""
-#~ "To restore, choose "
-#~ "<menuchoice><guimenu>File</guimenu><guimenuitem>Restore</guimenuitem></menuch"
-#~ "oice>. Or press the <guibutton>Restore</guibutton> button on the main window."
+#~ "To report a bug or make a suggestion regarding the <application>Déjà Dup</"
+#~ "application> application or this manual, visit the <ulink url=\"http://"
+#~ "bugs.launchpad.net/deja-dup\" type=\"http\"><application>Déjà Dup</"
+#~ "application> project page</ulink>."
+#~ msgstr ""
+#~ "To report a bug or make a suggestion regarding the <application>Déjà Dup</"
+#~ "application> application or this manual, visit the <ulink url=\"http://"
+#~ "bugs.launchpad.net/deja-dup\" type=\"http\"><application>Déjà Dup</"
+#~ "application> project page</ulink>."
+
+#~ msgid ""
+#~ "<application>Déjà Dup</application> is a simple backup program. It hides "
+#~ "the complexity of doing backups the 'right way' (encrypted, off-site, and "
+#~ "regular) and uses duplicity as the backend."
+#~ msgstr ""
+#~ "<application>Déjà Dup</application> is a simple backup program. It hides "
+#~ "the complexity of doing backups the 'right way' (encrypted, off-site, and "
+#~ "regular) and uses duplicity as the backend."
+
+#~ msgid ""
+#~ "To backup, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Backup</"
+#~ "guimenuitem></menuchoice>. Or press the <guibutton>Backup</guibutton> "
+#~ "button on the main window."
+#~ msgstr ""
+#~ "To backup, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Backup</"
+#~ "guimenuitem></menuchoice>. Or press the <guibutton>Backup</guibutton> "
+#~ "button on the main window."
+
+#~ msgid ""
+#~ "To restore, choose <menuchoice><guimenu>File</"
+#~ "guimenu><guimenuitem>Restore</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Restore</guibutton> button on the main window."
+#~ msgstr ""
+#~ "To restore, choose <menuchoice><guimenu>File</"
+#~ "guimenu><guimenuitem>Restore</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Restore</guibutton> button on the main window."
 
 #~ msgid "Backup your files"
 #~ msgstr "Backup your files"
@@ -770,15 +777,15 @@
 #~ msgstr "The number of days between backups."
 
 #~ msgid ""
-#~ "This list of directories will be backed up. Reserved values $HOME, $DESKTOP, "
-#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, "
-#~ "and $VIDEO are recognized as the user's special directories. Relative "
-#~ "entries are relative to the user's home directory."
+#~ "This list of directories will be backed up. Reserved values $HOME, "
+#~ "$DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
+#~ "$TEMPLATES, $TRASH, and $VIDEO are recognized as the user's special "
+#~ "directories. Relative entries are relative to the user's home directory."
 #~ msgstr ""
 #~ "This list of folders will be backed up. Reserved values $HOME, $DESKTOP, "
-#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, "
-#~ "and $VIDEO are recognised as the user's special folders. Relative entries "
-#~ "are relative to the user's home folder."
+#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, "
+#~ "$TRASH, and $VIDEO are recognised as the user's special folders. Relative "
+#~ "entries are relative to the user's home folder."
 
 #~ msgid ""
 #~ "This list of directories will not be backed up. Reserved values $HOME, "
@@ -787,11 +794,11 @@
 #~ "directories. Relative entries are relative to the user's home directory. "
 #~ "This list takes precedence over the include list."
 #~ msgstr ""
-#~ "This list of folders will not be backed up. Reserved values $HOME, $DESKTOP, "
-#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, "
-#~ "and $VIDEO are recognised as the user's special folders. Relative entries "
-#~ "are relative to the user's home folder. This list takes precedence over the "
-#~ "include list."
+#~ "This list of folders will not be backed up. Reserved values $HOME, "
+#~ "$DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
+#~ "$TEMPLATES, $TRASH, and $VIDEO are recognised as the user's special "
+#~ "folders. Relative entries are relative to the user's home folder. This "
+#~ "list takes precedence over the include list."
 
 #~ msgid "Type of location to store backup"
 #~ msgstr "Type of location to store backup"
@@ -803,11 +810,11 @@
 #~ msgstr "Whether to encrypt your backup"
 
 #~ msgid ""
-#~ "Whether to encrypt your backup files in the storage location. It's strongly "
-#~ "recommended to leave this as 'true'."
+#~ "Whether to encrypt your backup files in the storage location. It's "
+#~ "strongly recommended to leave this as 'true'."
 #~ msgstr ""
-#~ "Whether to encrypt your backup files in the storage location. It's strongly "
-#~ "recommended to leave this as 'true'."
+#~ "Whether to encrypt your backup files in the storage location. It's "
+#~ "strongly recommended to leave this as 'true'."
 
 #~ msgid "Whether to periodically backup"
 #~ msgstr "Whether to periodically backup"
@@ -820,7 +827,8 @@
 #~ "already. Only legal hostname strings are valid."
 
 #~ msgid "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
-#~ msgstr "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
+#~ msgstr ""
+#~ "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
 
 #~ msgid "Show version"
 #~ msgstr "Show version"
@@ -997,11 +1005,11 @@
 #~ msgstr "Amazon S3 Password"
 
 #~ msgid ""
-#~ "Enter your Amazon Web Services user ID and secret key.  This is not the same "
-#~ "as your amazon.com username and password."
+#~ "Enter your Amazon Web Services user ID and secret key.  This is not the "
+#~ "same as your amazon.com username and password."
 #~ msgstr ""
-#~ "Enter your Amazon Web Services user ID and secret key.  This is not the same "
-#~ "as your amazon.com username and password."
+#~ "Enter your Amazon Web Services user ID and secret key.  This is not the "
+#~ "same as your amazon.com username and password."
 
 #~ msgid "Home Folder"
 #~ msgstr "Home Folder"
@@ -1053,11 +1061,11 @@
 #~ msgstr "Duplicity's version is too old"
 
 #~ msgid ""
-#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only found "
-#~ "version %d.%d.%.2d"
+#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only "
+#~ "found version %d.%d.%.2d"
 #~ msgstr ""
-#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only found "
-#~ "version %d.%d.%.2d"
+#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only "
+#~ "found version %d.%d.%.2d"
 
 #~ msgid "Preparing..."
 #~ msgstr "Preparing..."
@@ -1077,7 +1085,8 @@
 #~ msgid "Invalid secret key."
 #~ msgstr "Invalid secret key."
 
-#~ msgid "Your Amazon Web Services account is not signed up for the S3 service."
+#~ msgid ""
+#~ "Your Amazon Web Services account is not signed up for the S3 service."
 #~ msgstr ""
 #~ "Your Amazon Web Services account is not signed up for the S3 service."
 
@@ -1098,25 +1107,25 @@
 
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License as published by the Free "
-#~ "Software Foundation; either version 3 of the License, or (at your option) "
-#~ "any later version."
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 3 of the License, or (at your "
+#~ "option) any later version."
 #~ msgstr ""
 #~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public Licence as published by the Free "
-#~ "Software Foundation; either version 3 of the Licence, or (at your option) "
-#~ "any later version."
+#~ "under the terms of the GNU General Public Licence as published by the "
+#~ "Free Software Foundation; either version 3 of the Licence, or (at your "
+#~ "option) any later version."
 
 #~ msgid ""
-#~ "This program is distributed in the hope that it will be useful, but WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-#~ "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-#~ "more details."
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
 #~ msgstr ""
-#~ "This program is distributed in the hope that it will be useful, but WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-#~ "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for "
-#~ "more details."
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public Licence for more details."
 
 #~ msgid "Unknown"
 #~ msgstr "Unknown"
@@ -1199,13 +1208,13 @@
 #~ msgstr "Could not add the folder"
 
 #~ msgid ""
-#~ "You should have received a copy of the GNU General Public License along with "
-#~ "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-#~ "Place - Suite 330, Boston, MA  02111-1307, USA."
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program; if not, write to the Free Software Foundation, Inc., "
+#~ "59 Temple Place - Suite 330, Boston, MA  02111-1307, USA."
 #~ msgstr ""
-#~ "You should have received a copy of the GNU General Public Licence along with "
-#~ "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-#~ "Place - Suite 330, Boston, MA  02111-1307, USA."
+#~ "You should have received a copy of the GNU General Public Licence along "
+#~ "with this program; if not, write to the Free Software Foundation, Inc., "
+#~ "59 Temple Place - Suite 330, Boston, MA  02111-1307, USA."
 
 #~ msgid "I_nclude:"
 #~ msgstr "I_nclude:"
@@ -1232,11 +1241,11 @@
 #~ msgstr "The port used for SSH connections."
 
 #~ msgid ""
-#~ "The protocol used for the backup location. Valid values are 's3', 'file', or "
-#~ "'ssh'."
+#~ "The protocol used for the backup location. Valid values are 's3', 'file', "
+#~ "or 'ssh'."
 #~ msgstr ""
-#~ "The protocol used for the backup location. Valid values are 's3', 'file', or "
-#~ "'ssh'."
+#~ "The protocol used for the backup location. Valid values are 's3', 'file', "
+#~ "or 'ssh'."
 
 #~ msgid "The server used for SSH connections."
 #~ msgstr "The server used for SSH connections."
@@ -1314,24 +1323,24 @@
 #~ msgstr "When You Start <application>Déjà Dup</application>"
 
 #~ msgid ""
-#~ "If this is the first time you have run <application>Déjà Dup</application>, "
-#~ "you should configure your backup before continuing.  You'll need to decide "
-#~ "where to put the backup files and which folders to include or exclude."
+#~ "If this is the first time you have run <application>Déjà Dup</"
+#~ "application>, you should configure your backup before continuing.  You'll "
+#~ "need to decide where to put the backup files and which folders to include "
+#~ "or exclude."
 #~ msgstr ""
-#~ "If this is the first time you have run <application>Déjà Dup</application>, "
-#~ "you should configure your backup before continuing. You'll need to decide "
-#~ "where to put the backup files and which folders to include or exclude."
+#~ "If this is the first time you have run <application>Déjà Dup</"
+#~ "application>, you should configure your backup before continuing. You'll "
+#~ "need to decide where to put the backup files and which folders to include "
+#~ "or exclude."
 
 #~ msgid ""
-#~ "Choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice> to open the <link linkend=\"deja-dup-prefs\">Preferences "
-#~ "window</link>."
+#~ "Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice> to open the <link linkend=\"deja-dup-prefs"
+#~ "\">Preferences window</link>."
 #~ msgstr ""
-#~ "Choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice> to open the <link linkend=\"deja-dup-prefs\">Preferences "
-#~ "window</link>."
+#~ "Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice> to open the <link linkend=\"deja-dup-prefs"
+#~ "\">Preferences window</link>."
 
 #~ msgid ""
 #~ "Use this drop-down list box to specify the backup location that "
@@ -1346,47 +1355,47 @@
 #~ msgstr "<guilabel>Local Folder</guilabel>"
 
 #~ msgid ""
-#~ "This is the backup location to pick if you have an external hard drive that "
-#~ "you want to use for backups."
+#~ "This is the backup location to pick if you have an external hard drive "
+#~ "that you want to use for backups."
 #~ msgstr ""
-#~ "This is the backup location to pick if you have an external hard drive that "
-#~ "you want to use for backups."
+#~ "This is the backup location to pick if you have an external hard drive "
+#~ "that you want to use for backups."
 
 #~ msgid "<guilabel>SSH</guilabel>"
 #~ msgstr "<guilabel>SSH</guilabel>"
 
 #~ msgid ""
 #~ "If you have access to a server running SSH (a protocol that lets remote "
-#~ "users log in), pick this location. Web hosts or data servers often provide "
-#~ "SSH access."
+#~ "users log in), pick this location. Web hosts or data servers often "
+#~ "provide SSH access."
 #~ msgstr ""
 #~ "If you have access to a server running SSH (a protocol that lets remote "
-#~ "users log in), pick this location. Web hosts or data servers often provide "
-#~ "SSH access."
-
-#~ msgid ""
-#~ "This option only appears if the <guilabel>Local Folder</guilabel> backup "
-#~ "location has been selected."
-#~ msgstr ""
-#~ "This option only appears if the <guilabel>Local Folder</guilabel> backup "
-#~ "location has been selected."
-
-#~ msgid ""
-#~ "Choose the folder into which you want to store the backup files. This often "
-#~ "will be an external drive that you plug in."
-#~ msgstr ""
-#~ "Choose the folder into which you want to store the backup files. This often "
-#~ "will be an external drive that you plug in."
+#~ "users log in), pick this location. Web hosts or data servers often "
+#~ "provide SSH access."
+
+#~ msgid ""
+#~ "This option only appears if the <guilabel>Local Folder</guilabel> backup "
+#~ "location has been selected."
+#~ msgstr ""
+#~ "This option only appears if the <guilabel>Local Folder</guilabel> backup "
+#~ "location has been selected."
+
+#~ msgid ""
+#~ "Choose the folder into which you want to store the backup files. This "
+#~ "often will be an external drive that you plug in."
+#~ msgstr ""
+#~ "Choose the folder into which you want to store the backup files. This "
+#~ "often will be an external drive that you plug in."
 
 #~ msgid "<guilabel>Username</guilabel>"
 #~ msgstr "<guilabel>Username</guilabel>"
 
 #~ msgid ""
-#~ "This option only appears if the <guilabel>SSH</guilabel> backup location has "
-#~ "been selected."
+#~ "This option only appears if the <guilabel>SSH</guilabel> backup location "
+#~ "has been selected."
 #~ msgstr ""
-#~ "This option only appears if the <guilabel>SSH</guilabel> backup location has "
-#~ "been selected."
+#~ "This option only appears if the <guilabel>SSH</guilabel> backup location "
+#~ "has been selected."
 
 #~ msgid "Enter the username used to log in to the server."
 #~ msgstr "Enter the username used to log in to the server."
@@ -1405,11 +1414,11 @@
 #~ msgstr "<guilabel>Port</guilabel>"
 
 #~ msgid ""
-#~ "Enter the SSH port for the server. This is almost always best left blank or "
-#~ "as the default <userinput>22</userinput>."
+#~ "Enter the SSH port for the server. This is almost always best left blank "
+#~ "or as the default <userinput>22</userinput>."
 #~ msgstr ""
-#~ "Enter the SSH port for the server. This is almost always best left blank or "
-#~ "as the default <userinput>22</userinput>."
+#~ "Enter the SSH port for the server. This is almost always best left blank "
+#~ "or as the default <userinput>22</userinput>."
 
 #~ msgid "<guilabel>Directory</guilabel>"
 #~ msgstr "<guilabel>Folder</guilabel>"
@@ -1445,82 +1454,86 @@
 #~ "their original locations or put them under a folder of your choice."
 
 #~ msgid ""
-#~ "After clicking <guibutton>Forward</guibutton>, you can review your restore "
-#~ "options, then click <guibutton>Apply</guibutton> to start the restore. A "
-#~ "progress bar will appear. If an error occurs, the dialog will display an "
-#~ "error message."
-#~ msgstr ""
-#~ "After clicking <guibutton>Forward</guibutton>, you can review your restore "
-#~ "options, then click <guibutton>Apply</guibutton> to start the restore. A "
-#~ "progress bar will appear. If an error occurs, the dialog will display an "
-#~ "error message."
-
-#~ msgid ""
-#~ "Permission is granted to copy, distribute and/or modify this document under "
-#~ "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-#~ "later version published by the Free Software Foundation with no Invariant "
-#~ "Sections, no Front-Cover Texts, and no Back-Cover Texts.  You can find a "
-#~ "copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> "
-#~ "or in the file COPYING-DOCS distributed with this manual."
-#~ msgstr ""
-#~ "Permission is granted to copy, distribute and/or modify this document under "
-#~ "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-#~ "later version published by the Free Software Foundation with no Invariant "
-#~ "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-#~ "of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-#~ "in the file COPYING-DOCS distributed with this manual."
-
-#~ msgid ""
-#~ "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-#~ "OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:"
-#~ msgstr ""
-#~ "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-#~ "OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:"
-
-#~ msgid ""
-#~ "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-#~ "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-#~ "THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-#~ "MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-#~ "RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-#~ "MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-#~ "MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-#~ "WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-#~ "SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-#~ "ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-#~ "OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND "
-#~ "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-#~ "NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-#~ "CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-#~ "DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-#~ "FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-#~ "ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-#~ "WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-#~ "OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-#~ "VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-#~ "POSSIBILITY OF SUCH DAMAGES."
-#~ msgstr ""
-#~ "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-#~ "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-#~ "THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-#~ "MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-#~ "RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-#~ "MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-#~ "MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-#~ "WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-#~ "SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-#~ "ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-#~ "OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND "
-#~ "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-#~ "NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-#~ "CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-#~ "DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-#~ "FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-#~ "ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-#~ "WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-#~ "OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-#~ "VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-#~ "POSSIBILITY OF SUCH DAMAGES."
+#~ "After clicking <guibutton>Forward</guibutton>, you can review your "
+#~ "restore options, then click <guibutton>Apply</guibutton> to start the "
+#~ "restore. A progress bar will appear. If an error occurs, the dialog will "
+#~ "display an error message."
+#~ msgstr ""
+#~ "After clicking <guibutton>Forward</guibutton>, you can review your "
+#~ "restore options, then click <guibutton>Apply</guibutton> to start the "
+#~ "restore. A progress bar will appear. If an error occurs, the dialog will "
+#~ "display an error message."
+
+#~ msgid ""
+#~ "Permission is granted to copy, distribute and/or modify this document "
+#~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 "
+#~ "or any later version published by the Free Software Foundation with no "
+#~ "Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  You "
+#~ "can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl"
+#~ "\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+#~ msgstr ""
+#~ "Permission is granted to copy, distribute and/or modify this document "
+#~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 "
+#~ "or any later version published by the Free Software Foundation with no "
+#~ "Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You "
+#~ "can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl"
+#~ "\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+
+#~ msgid ""
+#~ "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE "
+#~ "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER "
+#~ "UNDERSTANDING THAT:"
+#~ msgstr ""
+#~ "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE "
+#~ "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER "
+#~ "UNDERSTANDING THAT:"
+
+#~ msgid ""
+#~ "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
+#~ "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
+#~ "THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
+#~ "MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
+#~ "RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
+#~ "MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
+#~ "MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
+#~ "WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
+#~ "SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES "
+#~ "AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED "
+#~ "VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS "
+#~ "DISCLAIMER; AND UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER "
+#~ "IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, "
+#~ "INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR "
+#~ "MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, "
+#~ "BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR "
+#~ "CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, "
+#~ "DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR "
+#~ "MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR "
+#~ "RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, "
+#~ "EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH "
+#~ "DAMAGES."
+#~ msgstr ""
+#~ "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
+#~ "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
+#~ "THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
+#~ "MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
+#~ "RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
+#~ "MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
+#~ "MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
+#~ "WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
+#~ "SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES "
+#~ "AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED "
+#~ "VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS "
+#~ "DISCLAIMER; AND UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER "
+#~ "IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, "
+#~ "INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR "
+#~ "MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, "
+#~ "BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR "
+#~ "CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, "
+#~ "DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR "
+#~ "MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR "
+#~ "RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, "
+#~ "EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH "
+#~ "DAMAGES."
 
 #~ msgid "translator-credits"
 #~ msgstr ""

=== modified file 'man/translations/es.po'
--- man/translations/es.po	2010-09-18 15:05:34 +0000
+++ man/translations/es.po	2010-11-18 08:41:46 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-03 18:06-0300\n"
+"POT-Creation-Date: 2010-07-12 21:53-0300\n"
 "PO-Revision-Date: 2010-05-04 14:39+0000\n"
 "Last-Translator: Paco Molinero <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,63 +20,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr "deja-dup"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr "%FECHA%"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr "ÓRDENES DE USUARIO"
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr "NOMBRE"
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr "deja-dup - respalde su información"
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SINOPSIS"
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr "B<deja-dup> [OPCIONES]"
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr "B<deja-dup> --backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr "B<deja-dup> --restore [ARCHIVOS]"
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIÓN"
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -87,111 +88,110 @@
 "intervalos regulares."
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPCIONES"
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr "-?, --help"
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr "Muestra información de uso"
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr "--version"
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr "Imprime el nombre y la versión del programa"
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr "--backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr "Comienza un respaldo inmediatamente"
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr "--restore"
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr "Restaura sólo los archivos señalados"
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr "DEJA_DUP_DEBUG"
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr "Establecer en 1 para activar la salida detallada. Útil para depurar"
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEA TAMBIÉN"
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr "B<duplicity>(1)"
 
 #. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr "deja-dup-preferences"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr "deja-dup-preferences - respalde sus datos"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr "B<deja-dup-preferences> [OPCIONES]"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr ""
 "deja-dup-preferences es el diálogo de preferencias para B<deja-dup>(1)."
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:18
+#: C/deja-dup-preferences.1:18
 msgid "B<deja-dup>(1)"
 msgstr "B<deja-dup>(1)"
 
-#, no-wrap
 #~ msgid "deja-dup-monitor"
 #~ msgstr "deja-dup-monitor"
 
@@ -202,13 +202,13 @@
 #~ msgstr "B<deja-dup-monitor> [OPCIONES]"
 
 #~ msgid ""
-#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It is "
-#~ "started by default whenever a user logs in.  When a scheduled backup is due, "
-#~ "it starts B<deja-dup>(1)."
+#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It "
+#~ "is started by default whenever a user logs in.  When a scheduled backup "
+#~ "is due, it starts B<deja-dup>(1)."
 #~ msgstr ""
-#~ "deja-dup-monitor es un servicio que maneja copias de respaldos programada. "
-#~ "Se inicia por defecto, cada vez que el usuario ingresa en el sistema. Cuando "
-#~ "un respaldo es programado lo inicia."
+#~ "deja-dup-monitor es un servicio que maneja copias de respaldos "
+#~ "programada. Se inicia por defecto, cada vez que el usuario ingresa en el "
+#~ "sistema. Cuando un respaldo es programado lo inicia."
 
 #~ msgid "C"
 #~ msgstr "C"
@@ -218,39 +218,41 @@
 
 #~ msgid "<application>Déjà Dup</application> is a simple backup tool."
 #~ msgstr ""
-#~ "<application>Déjà Dup</application> es una herramienta de respaldo sencilla"
+#~ "<application>Déjà Dup</application> es una herramienta de respaldo "
+#~ "sencilla"
 
 #~ msgid ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administrators</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administrators</ulink></publishername> </publisher>"
 #~ msgstr ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administradores</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administradores</ulink></publishername> </publisher>"
 
 #~ msgid ""
-#~ "Permission is granted to copy, distribute and/or modify this document under "
-#~ "the terms of the GNU General Public License (GPL), Version 3 or any later "
-#~ "version published by the Free Software Foundation.  You can find a copy of "
-#~ "the GPL at this <ulink type=\"help\" url=\"ghelp:gpl\">link</ulink> or in "
-#~ "the file COPYING distributed with this manual."
+#~ "Permission is granted to copy, distribute and/or modify this document "
+#~ "under the terms of the GNU General Public License (GPL), Version 3 or any "
+#~ "later version published by the Free Software Foundation.  You can find a "
+#~ "copy of the GPL at this <ulink type=\"help\" url=\"ghelp:gpl\">link</"
+#~ "ulink> or in the file COPYING distributed with this manual."
 #~ msgstr ""
 #~ "Permiso concedido para copiar, distribuir y modificar este documento bajo "
 #~ "los términos de la Licencia Pública General (GPL), Versión 3 o cualquier "
-#~ "versión publicada después por la Free Software Foundation. Puede encontrar "
-#~ "una copia de la GPL aquí <ulink type=\"help\" url=\"ghelp:gpl\">link</ulink> "
-#~ "o en el archivo COPYNG distribuido con este manual."
+#~ "versión publicada después por la Free Software Foundation. Puede "
+#~ "encontrar una copia de la GPL aquí <ulink type=\"help\" url=\"ghelp:gpl"
+#~ "\">link</ulink> o en el archivo COPYNG distribuido con este manual."
 
 #~ msgid ""
-#~ "This manual is distributed in the hope that it will be useful, but WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-#~ "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-#~ "more details."
+#~ "This manual is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
 #~ msgstr ""
-#~ "Este manual es distribuido con la esperanza de que se útil, pero SIN NINGUNA "
-#~ "GARANTÍA; sin ni siquiera la garantía de COMERCIABILIDAD o PARA UN PROPÓSITO "
-#~ "PARTICULAR. Ver la Licencia Pública General GNU para más detalles."
+#~ "Este manual es distribuido con la esperanza de que se útil, pero SIN "
+#~ "NINGUNA GARANTÍA; sin ni siquiera la garantía de COMERCIABILIDAD o PARA "
+#~ "UN PROPÓSITO PARTICULAR. Ver la Licencia Pública General GNU para más "
+#~ "detalles."
 
 #~ msgid "Michael"
 #~ msgstr "Michael"
@@ -268,11 +270,11 @@
 #~ msgstr "Michael Terry <email>[e-mail]</email>"
 
 #~ msgid ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> Administrators</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> Administrators</ulink>"
 #~ msgstr ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> Administradores</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> Administradores</ulink>"
 
 #~ msgid "This manual describes version %VERSION% of Déjà Dup."
 #~ msgstr "Este manual describe  la versión %VERSION% de Déjà Dup."
@@ -281,15 +283,15 @@
 #~ msgstr "Feedback"
 
 #~ msgid ""
-#~ "To report a bug or make a suggestion regarding the <application>Déjà "
-#~ "Dup</application> application or this manual, visit the <ulink "
-#~ "url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application> project page</ulink>."
+#~ "To report a bug or make a suggestion regarding the <application>Déjà Dup</"
+#~ "application> application or this manual, visit the <ulink url=\"http://"
+#~ "bugs.launchpad.net/deja-dup/+filebug\" type=\"http\"><application>Déjà "
+#~ "Dup</application> project page</ulink>."
 #~ msgstr ""
 #~ "Para reportar un error o para hacer una sugerencia en cuanto al programa "
 #~ "<application>Déjà Dup</application> o a este manual, visite la página del "
-#~ "proyecto <ulink url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application></ulink>"
+#~ "proyecto <ulink url=\"http://bugs.launchpad.net/deja-dup/+filebug\" type="
+#~ "\"http\"><application>Déjà Dup</application></ulink>"
 
 #~ msgid "Déjà Dup"
 #~ msgstr "Déjà Dup"
@@ -302,9 +304,10 @@
 #~ "complexity of doing backups the 'right way' (encrypted, off-site, and "
 #~ "regular) and uses duplicity as the backend."
 #~ msgstr ""
-#~ "<application>Déjà Dup</application> es una simple herramienta de respaldo. "
-#~ "Oculta la complejidad haciendo los respaldos en la «forma correcta» "
-#~ "(cifrado, fuera de sitio, y regular) y utiliza duplicity como motor."
+#~ "<application>Déjà Dup</application> es una simple herramienta de "
+#~ "respaldo. Oculta la complejidad haciendo los respaldos en la «forma "
+#~ "correcta» (cifrado, fuera de sitio, y regular) y utiliza duplicity como "
+#~ "motor."
 
 #~ msgid "<application>Déjà Dup</application> provides the following features:"
 #~ msgstr ""
@@ -340,7 +343,8 @@
 #~ msgid ""
 #~ "You can start <application>Déjà Dup</application> in the following ways:"
 #~ msgstr ""
-#~ "Puede iniciar <application>Déjà Dup</application> de las siguientes formas:"
+#~ "Puede iniciar <application>Déjà Dup</application> de las siguientes "
+#~ "formas:"
 
 #~ msgid "<guimenu>Applications</guimenu> menu"
 #~ msgstr "Menú de <guimenu>Aplicaciones</guimenu>"
@@ -349,19 +353,19 @@
 #~ "Choose <menuchoice><guisubmenu>System Tools</guisubmenu><guimenuitem>Déjà "
 #~ "Dup Backup Tool</guimenuitem></menuchoice>."
 #~ msgstr ""
-#~ "Elija <menuchoice><guisubmenu>Herramientas del "
-#~ "sistema</guisubmenu><guimenuitem>Herramienta de respaldo Déjà "
-#~ "Dup</guimenuitem></menuchoice>."
+#~ "Elija <menuchoice><guisubmenu>Herramientas del sistema</"
+#~ "guisubmenu><guimenuitem>Herramienta de respaldo Déjà Dup</guimenuitem></"
+#~ "menuchoice>."
 
 #~ msgid "Command line"
 #~ msgstr "Línea de órdenes"
 
 #~ msgid ""
-#~ "To start <application>Déjà Dup</application> from a command line, type the "
-#~ "following command, then press <keycap>Return</keycap>:"
+#~ "To start <application>Déjà Dup</application> from a command line, type "
+#~ "the following command, then press <keycap>Return</keycap>:"
 #~ msgstr ""
-#~ "Para iniciar <application>Déjà Dup</application> desde la línea de órdenes, "
-#~ "escriba la siguiente orden, después pulse <keycap>Intro</keycap>:"
+#~ "Para iniciar <application>Déjà Dup</application> desde la línea de "
+#~ "órdenes, escriba la siguiente orden, después pulse <keycap>Intro</keycap>:"
 
 #~ msgid "<command>deja-dup</command>"
 #~ msgstr "<command>deja-dup</command>"
@@ -370,73 +374,74 @@
 #~ msgstr "Realizar una copia de seguridad"
 
 #~ msgid ""
-#~ "To backup, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Backup</guimenuitem></menuc"
-#~ "hoice>. Or press the <guibutton>Backup</guibutton> button on the main window."
+#~ "To backup, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Backup</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Backup</guibutton> button on the main window."
 #~ msgstr ""
-#~ "Para respaldar, elija <menuchoice><guimenu>Copia de "
-#~ "seguridad</guimenu><guimenuitem>Copia de "
-#~ "seguridad</guimenuitem></menuchoice>. O pulse el botón <guibutton>Copia de "
-#~ "seguridad</guibutton> en la ventana principal."
+#~ "Para respaldar, elija <menuchoice><guimenu>Copia de seguridad</"
+#~ "guimenu><guimenuitem>Copia de seguridad</guimenuitem></menuchoice>. O "
+#~ "pulse el botón <guibutton>Copia de seguridad</guibutton> en la ventana "
+#~ "principal."
 
 #~ msgid ""
-#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location and which files to include or exclude.  On the "
-#~ "Summary page, click <guibutton>Backup</guibutton> to start the backup."
+#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location and which files to include or exclude.  "
+#~ "On the Summary page, click <guibutton>Backup</guibutton> to start the "
+#~ "backup."
 #~ msgstr ""
 #~ "El diálogo <guilabel>Copia de seguridad</guilabel> se mostrará.  Si es la "
 #~ "primera vez que usa <application>Déjà Dup</application>, se le preguntará "
-#~ "para que elija una ubicación de la copia de seguridad y que archivos incluir "
-#~ "y excluir.  En la página de resumen, pulse <guibutton>Copia de "
+#~ "para que elija una ubicación de la copia de seguridad y que archivos "
+#~ "incluir y excluir.  En la página de resumen, pulse <guibutton>Copia de "
 #~ "seguridad</guibutton> para iniciar la misma."
 
 #~ msgid "Restoring"
 #~ msgstr "Restaurar"
 
 #~ msgid ""
-#~ "To restore, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Restore</guimenuitem></menu"
-#~ "choice>. Or press the <guibutton>Restore</guibutton> button on the main "
-#~ "window."
-#~ msgstr ""
-#~ "Para restaurar, elija <menuchoice><guimenu>Copia de "
-#~ "seguridad</guimenu><guimenuitem>Restaurar</guimenuitem></menuchoice>. O "
-#~ "pulse el botón <guibutton>Restaurar</guibutton> en la ventana principal."
-
-#~ msgid ""
-#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location.  Then choose which backup date to restore from "
-#~ "and where to put the restored files. You can either restore them to their "
-#~ "original locations or put them in a folder of your choice."
-#~ msgstr ""
-#~ "El diálogo <guilabel>Restaurar</guilabel> se mostrará.  Si es la primera vez "
-#~ "que usa <application>Déjà Dup</application>, se le preguntará por la "
-#~ "ubicación de la copia de seguridad.  Elija que fecha de copia de seguridad "
-#~ "desea restaurar desde donde y donde poner los archivos restaurados. Los "
-#~ "puede restaurar en sus ubicaciones originales o ponerlos en una carpeta de "
-#~ "su elección."
-
-#~ msgid ""
-#~ "After clicking <guibutton>Forward</guibutton>, you can review your restore "
-#~ "options, then click <guibutton>Restore</guibutton> to start the restore."
+#~ "To restore, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Restore</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Restore</guibutton> button on the main window."
+#~ msgstr ""
+#~ "Para restaurar, elija <menuchoice><guimenu>Copia de seguridad</"
+#~ "guimenu><guimenuitem>Restaurar</guimenuitem></menuchoice>. O pulse el "
+#~ "botón <guibutton>Restaurar</guibutton> en la ventana principal."
+
+#~ msgid ""
+#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location.  Then choose which backup date to "
+#~ "restore from and where to put the restored files. You can either restore "
+#~ "them to their original locations or put them in a folder of your choice."
+#~ msgstr ""
+#~ "El diálogo <guilabel>Restaurar</guilabel> se mostrará.  Si es la primera "
+#~ "vez que usa <application>Déjà Dup</application>, se le preguntará por la "
+#~ "ubicación de la copia de seguridad.  Elija que fecha de copia de "
+#~ "seguridad desea restaurar desde donde y donde poner los archivos "
+#~ "restaurados. Los puede restaurar en sus ubicaciones originales o ponerlos "
+#~ "en una carpeta de su elección."
+
+#~ msgid ""
+#~ "After clicking <guibutton>Forward</guibutton>, you can review your "
+#~ "restore options, then click <guibutton>Restore</guibutton> to start the "
+#~ "restore."
 #~ msgstr ""
 #~ "Después de pulsar <guibutton>Continuar</guibutton>, puede revisar sus "
-#~ "opciones de restauración, luego pulse <guibutton>Restaurar</guibutton> para "
-#~ "iniciar la restauración."
+#~ "opciones de restauración, luego pulse <guibutton>Restaurar</guibutton> "
+#~ "para iniciar la restauración."
 
 #~ msgid "Preferences"
 #~ msgstr "Preferencias"
 
 #~ msgid ""
 #~ "To configure <application>Déjà Dup</application>, choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice>."
+#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice>."
 #~ msgstr ""
 #~ "Para configurar <application>Déjà Dup</application>, elija "
-#~ "<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferencias</guimenuitem><"
-#~ "/menuchoice>."
+#~ "<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferencias</"
+#~ "guimenuitem></menuchoice>."
 
 #~ msgid "<guilabel>Backup location</guilabel>"
 #~ msgstr "<guilabel>Ubicación del respaldo</guilabel>"
@@ -445,8 +450,9 @@
 #~ "Use this drop-down list box to specify the backup location that "
 #~ "<application>Déjà Dup</application> uses when backing up or restoring:"
 #~ msgstr ""
-#~ "Use esta lista desplegable para especificar la localización del respaldo que "
-#~ "<application>Déjà Dup</application> usará cuando se respalde o se restaure:"
+#~ "Use esta lista desplegable para especificar la localización del respaldo "
+#~ "que <application>Déjà Dup</application> usará cuando se respalde o se "
+#~ "restaure:"
 
 #~ msgid "<guilabel>Amazon S3</guilabel>"
 #~ msgstr "<guilabel>Amazon S3</guilabel>"
@@ -454,29 +460,31 @@
 #~ msgid ""
 #~ "This backup location uses the S3 storage service from Amazon. For a small "
 #~ "fee per gigabyte, they hold your data for you. This is the recommended "
-#~ "default because it is an easy way to keep your data offsite (meaning out of "
-#~ "your home: in case of disaster or theft, your data will still be safe). You "
-#~ "can sign up <ulink url=\"http://aws.amazon.com/s3/\" "
-#~ "type=\"http\">online</ulink>."
+#~ "default because it is an easy way to keep your data offsite (meaning out "
+#~ "of your home: in case of disaster or theft, your data will still be "
+#~ "safe). You can sign up <ulink url=\"http://aws.amazon.com/s3/\" type="
+#~ "\"http\">online</ulink>."
 #~ msgstr ""
-#~ "Esta ubicación de copia de seguridad utiliza el servicio de almacenamiento "
-#~ "S3 de Amazon. Por una pequeña cuota por gigabyte, guardan los datos para "
-#~ "usted. Este es el valor recomendado porque es una manera fácil de mantener "
-#~ "los datos en otro lugar diferente  (esto significa que están fuera de su "
-#~ "casa: en caso de desastre o robo, los datos seguirán estando seguros). Puede "
-#~ "inscribirse en <ulink url=\"http://aws.amazon.com/s3/\" type=\"http\">en "
-#~ "línea</ulink>."
+#~ "Esta ubicación de copia de seguridad utiliza el servicio de "
+#~ "almacenamiento S3 de Amazon. Por una pequeña cuota por gigabyte, guardan "
+#~ "los datos para usted. Este es el valor recomendado porque es una manera "
+#~ "fácil de mantener los datos en otro lugar diferente  (esto significa que "
+#~ "están fuera de su casa: en caso de desastre o robo, los datos seguirán "
+#~ "estando seguros). Puede inscribirse en <ulink url=\"http://aws.amazon.com/"
+#~ "s3/\" type=\"http\">en línea</ulink>."
 
 #~ msgid ""
 #~ "This service costs money.  Read their rates carefully before using it."
 #~ msgstr ""
-#~ "Este servicio cuesta dinero. Lee los precios cuidadosamente antes de usarlo."
+#~ "Este servicio cuesta dinero. Lee los precios cuidadosamente antes de "
+#~ "usarlo."
 
 #~ msgid "Removable Media"
 #~ msgstr "Soporte extraíble"
 
 #~ msgid ""
-#~ "You may see removable media like external hard drives or thumb drives listed."
+#~ "You may see removable media like external hard drives or thumb drives "
+#~ "listed."
 #~ msgstr ""
 #~ "Tal vez vea los discos extraíbles listados como discos duros externos o "
 #~ "unidades flash."
@@ -491,20 +499,21 @@
 #~ "server information."
 #~ msgstr ""
 #~ "Si se ha conectado a algún servidor, aparecerá. Para conectarse a un "
-#~ "servidor que no aparece, seleccione  <guilabel>Otros</guilabel> y pulse en  "
-#~ "<guibutton>Conectar al servidor</guibutton>. Esto le permitirá introducir la "
-#~ "información del servidor."
+#~ "servidor que no aparece, seleccione  <guilabel>Otros</guilabel> y pulse "
+#~ "en  <guibutton>Conectar al servidor</guibutton>. Esto le permitirá "
+#~ "introducir la información del servidor."
 
 #~ msgid "Local Folders"
 #~ msgstr "Carpetas locales"
 
 #~ msgid ""
-#~ "You may also want to choose a local folder as a backup location.  Note that "
-#~ "backups can be quite large, so make sure you have enough free disk space."
+#~ "You may also want to choose a local folder as a backup location.  Note "
+#~ "that backups can be quite large, so make sure you have enough free disk "
+#~ "space."
 #~ msgstr ""
-#~ "Puede escoger también una carpeta local como localización de respaldo. Nota "
-#~ "para los respaldos que son bastante grandes, esté seguro de tener suficiente "
-#~ "espacio en disco."
+#~ "Puede escoger también una carpeta local como localización de respaldo. "
+#~ "Nota para los respaldos que son bastante grandes, esté seguro de tener "
+#~ "suficiente espacio en disco."
 
 #~ msgid "Default: <guilabel>Amazon S3</guilabel>."
 #~ msgstr "Predeterminado: <guilabel>Amazon S3</guilabel>."
@@ -516,16 +525,16 @@
 #~ "This option only appears if the <guilabel>Amazon S3</guilabel> backup "
 #~ "location has been selected."
 #~ msgstr ""
-#~ "Esta opción sólo aparece si la localización de respaldo que ha seleccionado "
-#~ "es <guilabel>Amazon S3</guilabel>."
+#~ "Esta opción sólo aparece si la localización de respaldo que ha "
+#~ "seleccionado es <guilabel>Amazon S3</guilabel>."
 
 #~ msgid ""
-#~ "This is your Access Key ID that Amazon gave you when you signed up for S3. "
-#~ "It is like a username for logging into S3. If left empty, you will be "
+#~ "This is your Access Key ID that Amazon gave you when you signed up for "
+#~ "S3. It is like a username for logging into S3. If left empty, you will be "
 #~ "prompted for it as you backup or restore."
 #~ msgstr ""
-#~ "Esta es la ID de su clave de acceso que Amazon le dio cuando se registró en "
-#~ "S3. Es como su nombre de usuario para iniciar sesión en S3. Si la dejó "
+#~ "Esta es la ID de su clave de acceso que Amazon le dio cuando se registró "
+#~ "en S3. Es como su nombre de usuario para iniciar sesión en S3. Si la dejó "
 #~ "vacía, se le pedirá  para respaldar o restaurar."
 
 #~ msgid "<guilabel>Folder</guilabel>"
@@ -537,48 +546,50 @@
 #~ "which to put your files."
 #~ msgstr ""
 #~ "Si tiene múltiples respaldos, puede guardarlos por separado en múltiples "
-#~ "carpetas. Use esta opción para entrar en la ruta del servicio S3 en el cual "
-#~ "colocará sus archivos."
+#~ "carpetas. Use esta opción para entrar en la ruta del servicio S3 en el "
+#~ "cual colocará sus archivos."
 
 #~ msgid "<guilabel>Include files in folders</guilabel>"
 #~ msgstr "<guilabel>Incluir archivos y carpetas</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to backup. Press the <guibutton>Add</guibutton> "
-#~ "or <guibutton>Remove</guibutton> buttons to modify the list. If you are only "
-#~ "interested in backing up your own data, the default of <guilabel>Home "
-#~ "Folder</guilabel> is sufficient."
+#~ "Select a list of directories to backup. Press the <guibutton>Add</"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "If you are only interested in backing up your own data, the default of "
+#~ "<guilabel>Home Folder</guilabel> is sufficient."
 #~ msgstr ""
 #~ "Seleccione una lista de carpetas para respaldar. Pulse los "
-#~ "botones<guibutton>Añadir</guibutton> o <guibutton>Eliminar</guibutton> para "
-#~ "modificar la lista. Si solo está interesado en respaldar su propios datos,  "
-#~ "es suficiente seleccionar<guilabel>Carpeta personal</guilabel>."
+#~ "botones<guibutton>Añadir</guibutton> o <guibutton>Eliminar</guibutton> "
+#~ "para modificar la lista. Si solo está interesado en respaldar su propios "
+#~ "datos,  es suficiente seleccionar<guilabel>Carpeta personal</guilabel>."
 
 #~ msgid "<guilabel>Except files in folders</guilabel>"
 #~ msgstr "<guilabel>Excepto archivos dentro de carpetas</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to not backup. Press the <guibutton>Add "
-#~ "</guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "Select a list of directories to not backup. Press the <guibutton>Add </"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
 #~ "This list takes precedence over the list of included directories."
 #~ msgstr ""
 #~ "Seleccione una lista de carpetas no respaldadas. Pulse los botones "
 #~ "<guibutton>Añadir</guibutton> o <guibutton>Eliminar</guibutton> para "
-#~ "modificar la lista. Esta tiene preferencia en la lista de carpetas incluidas."
-
-#~ msgid ""
-#~ "Some of your data may be large and not very important to you.  In that case, "
-#~ "you can save yourself some time and space by not backing them up."
-#~ msgstr ""
-#~ "Parte de su información tal vez sea grande y no muy importante para usted. "
-#~ "En ese caso, puede ahorrase algo de tiempo y espacio no respaldando todo."
-
-#~ msgid ""
-#~ "There are some locations that <application>Déjà Dup</application> excludes "
-#~ "by default:"
-#~ msgstr ""
-#~ "Hay algunas ubicaciones que <application>Déjà Dup</application> excluye por "
-#~ "defecto:"
+#~ "modificar la lista. Esta tiene preferencia en la lista de carpetas "
+#~ "incluidas."
+
+#~ msgid ""
+#~ "Some of your data may be large and not very important to you.  In that "
+#~ "case, you can save yourself some time and space by not backing them up."
+#~ msgstr ""
+#~ "Parte de su información tal vez sea grande y no muy importante para "
+#~ "usted. En ese caso, puede ahorrase algo de tiempo y espacio no "
+#~ "respaldando todo."
+
+#~ msgid ""
+#~ "There are some locations that <application>Déjà Dup</application> "
+#~ "excludes by default:"
+#~ msgstr ""
+#~ "Hay algunas ubicaciones que <application>Déjà Dup</application> excluye "
+#~ "por defecto:"
 
 #~ msgid "~/.cache"
 #~ msgstr "~/.cache"
@@ -614,15 +625,15 @@
 #~ msgstr "<guilabel>Cifrar los archivos de respaldo</guilabel>"
 
 #~ msgid ""
-#~ "Encrypting your backup files is recommended to keep your data safe. If you "
-#~ "don't have exclusive physical control of your backup location, or if it is "
-#~ "stolen, an encrypted backup prevents others from looking at your personal "
-#~ "data."
+#~ "Encrypting your backup files is recommended to keep your data safe. If "
+#~ "you don't have exclusive physical control of your backup location, or if "
+#~ "it is stolen, an encrypted backup prevents others from looking at your "
+#~ "personal data."
 #~ msgstr ""
 #~ "Cifrar archivos de la copia de seguridad se recomienda para mantener sus "
-#~ "datos seguros. Si no tiene el control físico exclusivo de la ubicación de su "
-#~ "copia de seguridad, o si esta es robada, una copia de seguridad de cifrado "
-#~ "impide que otros busquen en sus datos personales."
+#~ "datos seguros. Si no tiene el control físico exclusivo de la ubicación de "
+#~ "su copia de seguridad, o si esta es robada, una copia de seguridad de "
+#~ "cifrado impide que otros busquen en sus datos personales."
 
 #~ msgid ""
 #~ "If on, you will be prompted for a password. Keep this password safe, you "
@@ -641,15 +652,15 @@
 
 #~ msgid ""
 #~ "Turn this option on to have <application>Déjà Dup</application> "
-#~ "automatically backup for you. This is recommended so that you don't forget "
-#~ "to backup. Backups are more useful the more recently you have made them, so "
-#~ "it is important to regularly do so."
+#~ "automatically backup for you. This is recommended so that you don't "
+#~ "forget to backup. Backups are more useful the more recently you have made "
+#~ "them, so it is important to regularly do so."
 #~ msgstr ""
 #~ "Active esta opción para que <application>Déjà Dup</application> realice "
-#~ "automáticamente las copias de seguridad. Se recomienda activar esta opción, "
-#~ "de este modo no olvidará realizar la copia de seguridad. Las copias de "
-#~ "seguridad serán más útiles si son recientes, así que es importante que se "
-#~ "realicen regularmente."
+#~ "automáticamente las copias de seguridad. Se recomienda activar esta "
+#~ "opción, de este modo no olvidará realizar la copia de seguridad. Las "
+#~ "copias de seguridad serán más útiles si son recientes, así que es "
+#~ "importante que se realicen regularmente."
 
 #~ msgid "Default: <userinput>Off</userinput>."
 #~ msgstr "Predeterminado: <userinput>Apagado</userinput>."
@@ -668,15 +679,15 @@
 
 #~ msgid ""
 #~ "Choose the minimum amount of time to keep backup files.  If you find that "
-#~ "the backup files are taking up too much space, you may want to decrease this "
-#~ "duration.  Due to implementation details, files may be kept a bit longer "
-#~ "than the chosen time.  But no files will be deleted early."
+#~ "the backup files are taking up too much space, you may want to decrease "
+#~ "this duration.  Due to implementation details, files may be kept a bit "
+#~ "longer than the chosen time.  But no files will be deleted early."
 #~ msgstr ""
-#~ "Elija la cantidad mínima de tiempo para mantener los archivos de la copia de "
-#~ "seguridad. Si encuentra que los archivos de la copia de seguridad están "
-#~ "tomando demasiado espacio, puede desear disminuir esta duración. Debido a "
-#~ "detalles de implementación, los archivos pueden mantenerse un poco más del "
-#~ "tiempo elegido. Pero no hay archivos que se eliminen antes."
+#~ "Elija la cantidad mínima de tiempo para mantener los archivos de la copia "
+#~ "de seguridad. Si encuentra que los archivos de la copia de seguridad "
+#~ "están tomando demasiado espacio, puede desear disminuir esta duración. "
+#~ "Debido a detalles de implementación, los archivos pueden mantenerse un "
+#~ "poco más del tiempo elegido. Pero no hay archivos que se eliminen antes."
 
 #~ msgid "Default: <guilabel>Forever</guilabel>."
 #~ msgstr "Predeterminado: <guilabel>Para siempre</guilabel>."
@@ -722,8 +733,8 @@
 #~ msgstr "Si cifrar su copia de respaldo"
 
 #~ msgid ""
-#~ "Whether to encrypt your backup files in the storage location. It's strongly "
-#~ "recommended to leave this as 'true'."
+#~ "Whether to encrypt your backup files in the storage location. It's "
+#~ "strongly recommended to leave this as 'true'."
 #~ msgstr ""
 #~ "Si cifrar sus archivos respaldados en el lugar de almacenamiento. Es "
 #~ "altamente recomendado dejar esto como 'verdadero'."
@@ -922,8 +933,8 @@
 #~ msgstr "Puerto usado para conexiones SSH"
 
 #~ msgid ""
-#~ "The protocol used for the backup location. Valid values are 's3', 'file', or "
-#~ "'ssh'."
+#~ "The protocol used for the backup location. Valid values are 's3', 'file', "
+#~ "or 'ssh'."
 #~ msgstr ""
 #~ "Protocolo usado por el servicio de copias de seguridad. Los valores "
 #~ "correctos son 's3', 'archivo' o 'ssh'"
@@ -935,10 +946,11 @@
 #~ msgstr "El usuario empleado para conexiones SSH"
 
 #~ msgid ""
-#~ "The protocol used for the backup location. Valid values are 's3' or 'file'."
+#~ "The protocol used for the backup location. Valid values are 's3' or "
+#~ "'file'."
 #~ msgstr ""
-#~ "El protocolo utilizado para el lugar de respaldo. Valores validos son 's3' o "
-#~ "'archivo'."
+#~ "El protocolo utilizado para el lugar de respaldo. Valores validos son "
+#~ "'s3' o 'archivo'."
 
 #~ msgid "Backing up files..."
 #~ msgstr "Respaldando archivos..."

=== modified file 'man/translations/fi.po'
--- man/translations/fi.po	2010-09-18 15:05:34 +0000
+++ man/translations/fi.po	2010-11-18 08:41:46 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-03 18:06-0300\n"
+"POT-Creation-Date: 2010-07-12 21:53-0300\n"
 "PO-Revision-Date: 2010-05-04 15:37+0000\n"
 "Last-Translator: Jussi Aalto <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,63 +20,63 @@
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr "DEJA-DUP"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr "%DATE%"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr "KÄYTTÄJÄN KOMENNOT"
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr "NIMI"
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr "deja-dup - varmuuskopioi tiedostosi"
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "KOMENNON KÄYTTÖ"
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr "B<deja-dup> [VALITSIMET]"
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr "B<deja-dup> --backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr "B<deja-dup> --restore [TIEDOSTOT]"
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "KUVAUS"
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -87,113 +88,112 @@
 "varmuuskopioita."
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr "VALITSIMET"
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr "-?, --help"
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr "Näytä lyhyt ohje käytöstä"
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr "--version"
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr "Tulostaa ohjelman nimen ja version"
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr "--backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr "Aloittaa varmuuskopioinnin välittömästi"
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr "--restore"
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr "Palauttaa vain määritellyt tiedostot"
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "YMPÄRISTÖMUUTTUJAT"
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr "DEJA_DUP_DEBUG"
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr ""
 "Asettamalla arvoksi 1 saadaan näkyville yksityiskohtaisempi tuloste. "
 "Helpottaa vianjäljitystä."
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "KATSO MYÖS"
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr "B<duplicity>(1)"
 
 #. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr "deja-dup-preferences"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr "deja-dup-preferences - varmuuskopioi tiedostosi"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr "B<deja-dup-preferences> [VALITSIMET]"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr ""
 "deja-dup-preferences on valintaikkuna ohjelman B<deja-dup>(1) asetuksille."
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:18
+#: C/deja-dup-preferences.1:18
 msgid "B<deja-dup>(1)"
 msgstr "B<deja-dup>(1)"
 
-#, no-wrap
 #~ msgid "deja-dup-monitor"
 #~ msgstr "deja-dup-monitor"
 
@@ -204,13 +204,14 @@
 #~ msgstr "B<deja-dup-monitor> [VALITSIMET]"
 
 #~ msgid ""
-#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It is "
-#~ "started by default whenever a user logs in.  When a scheduled backup is due, "
-#~ "it starts B<deja-dup>(1)."
+#~ "deja-dup-monitor is a session daemon that handles scheduled backups.  It "
+#~ "is started by default whenever a user logs in.  When a scheduled backup "
+#~ "is due, it starts B<deja-dup>(1)."
 #~ msgstr ""
-#~ "deja-dup-monitor on taustaprosessi, joka hoitaa ajastetut varmuuskopioinnit. "
-#~ "Oletuksena se käynnistetään käyttäjän sisäänkirjautuessa. Kun on ajastetun "
-#~ "varmuuskopioinnin aika, se käynnistää ohjelman B<deja-dup>(1)."
+#~ "deja-dup-monitor on taustaprosessi, joka hoitaa ajastetut "
+#~ "varmuuskopioinnit. Oletuksena se käynnistetään käyttäjän "
+#~ "sisäänkirjautuessa. Kun on ajastetun varmuuskopioinnin aika, se "
+#~ "käynnistää ohjelman B<deja-dup>(1)."
 
 #~ msgid "C"
 #~ msgstr "fi"
@@ -224,13 +225,13 @@
 #~ "varmuuskopiointityökalu."
 
 #~ msgid ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administrators</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administrators</ulink></publishername> </publisher>"
 #~ msgstr ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> -ylläpitäjät</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> -ylläpitäjät</ulink></publishername> </publisher>"
 
 #~ msgid "Michael"
 #~ msgstr "Michael"
@@ -248,11 +249,11 @@
 #~ msgstr "Michael Terry <email>[e-mail]</email>"
 
 #~ msgid ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> Administrators</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> Administrators</ulink>"
 #~ msgstr ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> -ylläpitäjät</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> -ylläpitäjät</ulink>"
 
 #~ msgid "This manual describes version %VERSION% of Déjà Dup."
 #~ msgstr "Tämä käyttöohje on Déjà Dupin versiolle %VERSION%."
@@ -261,16 +262,15 @@
 #~ msgstr "Palaute"
 
 #~ msgid ""
-#~ "To report a bug or make a suggestion regarding the <application>Déjà "
-#~ "Dup</application> application or this manual, visit the <ulink "
-#~ "url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application> project page</ulink>."
+#~ "To report a bug or make a suggestion regarding the <application>Déjà Dup</"
+#~ "application> application or this manual, visit the <ulink url=\"http://"
+#~ "bugs.launchpad.net/deja-dup/+filebug\" type=\"http\"><application>Déjà "
+#~ "Dup</application> project page</ulink>."
 #~ msgstr ""
 #~ "Ilmoittaaksesi ohjelmavirheestä tai tehdäksesi ehdotuksen ohjelmaan "
 #~ "<application>Déjà Dup</application>  tai tähän käyttöohjeeseen, vieraile "
-#~ "<ulink url=\"http://bugs.launchpad.net/deja-dup/+filebug\" "
-#~ "type=\"http\"><application>Déjà Dup</application> -projektin "
-#~ "sivuilla</ulink>."
+#~ "<ulink url=\"http://bugs.launchpad.net/deja-dup/+filebug\" type=\"http"
+#~ "\"><application>Déjà Dup</application> -projektin sivuilla</ulink>."
 
 #~ msgid "Déjà Dup"
 #~ msgstr "Déjà Dup"
@@ -293,8 +293,8 @@
 
 #~ msgid "Support for local or remote backup locations, including Amazon S3"
 #~ msgstr ""
-#~ "Tuki sekä paikallisille sekä verkossa oleville varmuuskopiointisijainneille, "
-#~ "myös Amazon S3:lle."
+#~ "Tuki sekä paikallisille sekä verkossa oleville "
+#~ "varmuuskopiointisijainneille, myös Amazon S3:lle."
 
 #~ msgid "Securely encrypts and compresses your data."
 #~ msgstr "Salaa ja tiivistää tietosi turvallisesti."
@@ -329,16 +329,16 @@
 #~ "Choose <menuchoice><guisubmenu>System Tools</guisubmenu><guimenuitem>Déjà "
 #~ "Dup Backup Tool</guimenuitem></menuchoice>."
 #~ msgstr ""
-#~ "Valitse "
-#~ "<menuchoice><guisubmenu>Järjestelmätyökalut</guisubmenu><guimenuitem>Déjà "
-#~ "Dup -varmuuskopiointityökalu</guimenuitem></menuchoice>."
+#~ "Valitse <menuchoice><guisubmenu>Järjestelmätyökalut</"
+#~ "guisubmenu><guimenuitem>Déjà Dup -varmuuskopiointityökalu</guimenuitem></"
+#~ "menuchoice>."
 
 #~ msgid "Command line"
 #~ msgstr "Komentorivi"
 
 #~ msgid ""
-#~ "To start <application>Déjà Dup</application> from a command line, type the "
-#~ "following command, then press <keycap>Return</keycap>:"
+#~ "To start <application>Déjà Dup</application> from a command line, type "
+#~ "the following command, then press <keycap>Return</keycap>:"
 #~ msgstr ""
 #~ "Käynnistääksesi <application>Déjà Dup</application>in komentoriviltä, "
 #~ "kirjoita seuraava komento ja paina sen jälkeen <keycap>Enter</keycap>:"
@@ -350,24 +350,25 @@
 #~ msgstr "Varmuuskopion tekeminen"
 
 #~ msgid ""
-#~ "To backup, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Backup</guimenuitem></menuc"
-#~ "hoice>. Or press the <guibutton>Backup</guibutton> button on the main window."
+#~ "To backup, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Backup</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Backup</guibutton> button on the main window."
 #~ msgstr ""
-#~ "Tehdäksesi varmuuskopion, valitse "
-#~ "<menuchoice><guimenu>Varmuuskopio</guimenu><guimenuitem>Varmuuskopioi</guimen"
-#~ "uitem></menuchoice>. Vaihtoehtoisesti voit napsauttaa pääikkunan "
-#~ "<guibutton>Varmuuskopioi</guibutton>-painiketta."
+#~ "Tehdäksesi varmuuskopion, valitse <menuchoice><guimenu>Varmuuskopio</"
+#~ "guimenu><guimenuitem>Varmuuskopioi</guimenuitem></menuchoice>. "
+#~ "Vaihtoehtoisesti voit napsauttaa pääikkunan <guibutton>Varmuuskopioi</"
+#~ "guibutton>-painiketta."
 
 #~ msgid ""
-#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location and which files to include or exclude.  On the "
-#~ "Summary page, click <guibutton>Backup</guibutton> to start the backup."
+#~ "The <guilabel>Backup</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location and which files to include or exclude.  "
+#~ "On the Summary page, click <guibutton>Backup</guibutton> to start the "
+#~ "backup."
 #~ msgstr ""
-#~ "Seuraavaksi näytetään <guilabel>Varmuuskopioi</guilabel>-ikkuna. Jos käytät "
-#~ "<application>Déjà Dup</application>ia ensimmäistä kertaa, ohjelma pyytää "
-#~ "valitsemaan varmuuskopion sijainnin ja varmuuskopioitavat sekä "
+#~ "Seuraavaksi näytetään <guilabel>Varmuuskopioi</guilabel>-ikkuna. Jos "
+#~ "käytät <application>Déjà Dup</application>ia ensimmäistä kertaa, ohjelma "
+#~ "pyytää valitsemaan varmuuskopion sijainnin ja varmuuskopioitavat sekä "
 #~ "varmuuskopioinnin ulkopuolelle jätettävät tiedostot. Napsauta Yhteenveto-"
 #~ "sivulla <guibutton>Varmuuskopioi</guibutton>-painiketta aloittaaksesi "
 #~ "varmuuskopioinnin."
@@ -376,49 +377,49 @@
 #~ msgstr "Palauttaminen varmuuskopiosta"
 
 #~ msgid ""
-#~ "To restore, choose "
-#~ "<menuchoice><guimenu>Backup</guimenu><guimenuitem>Restore</guimenuitem></menu"
-#~ "choice>. Or press the <guibutton>Restore</guibutton> button on the main "
-#~ "window."
+#~ "To restore, choose <menuchoice><guimenu>Backup</"
+#~ "guimenu><guimenuitem>Restore</guimenuitem></menuchoice>. Or press the "
+#~ "<guibutton>Restore</guibutton> button on the main window."
 #~ msgstr ""
 #~ "Palauttaaksesi tiedostoja varmuuskopiosta, valitse "
-#~ "<menuchoice><guimenu>Varmuuskopio</guimenu><guimenuitem>Palauta</guimenuitem>"
-#~ "</menuchoice>. Vaihtoehtoisesti voit napsauttaa pääikkunan "
+#~ "<menuchoice><guimenu>Varmuuskopio</guimenu><guimenuitem>Palauta</"
+#~ "guimenuitem></menuchoice>. Vaihtoehtoisesti voit napsauttaa pääikkunan "
 #~ "<guibutton>Palauta</guibutton>-painiketta."
 
 #~ msgid ""
-#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this is "
-#~ "your first time using <application>Déjà Dup</application>, you will be asked "
-#~ "to choose a backup location.  Then choose which backup date to restore from "
-#~ "and where to put the restored files. You can either restore them to their "
-#~ "original locations or put them in a folder of your choice."
+#~ "The <guilabel>Restore</guilabel> dialog will then be displayed.  If this "
+#~ "is your first time using <application>Déjà Dup</application>, you will be "
+#~ "asked to choose a backup location.  Then choose which backup date to "
+#~ "restore from and where to put the restored files. You can either restore "
+#~ "them to their original locations or put them in a folder of your choice."
 #~ msgstr ""
 #~ "Seuraavaksi näytetään <guilabel>Palauta</guilabel>-ikkuna. Jos käytät "
 #~ "<application>Déjà Dup</application>ia ensimmäistä kertaa, ohjelma pyytää "
 #~ "valitsemaan varmuuskopion sijainnin. Valitse seuraavaksi miltä päivältä "
-#~ "haluat palautuksen suorittaa ja minne palautetut tiedostot sijoitetaan. Voit "
-#~ "palauttaa tiedostot joko niiden alkuperäiseen sijaintiinsa tai laittaa ne "
-#~ "haluamaasi kansioon."
+#~ "haluat palautuksen suorittaa ja minne palautetut tiedostot sijoitetaan. "
+#~ "Voit palauttaa tiedostot joko niiden alkuperäiseen sijaintiinsa tai "
+#~ "laittaa ne haluamaasi kansioon."
 
 #~ msgid ""
-#~ "After clicking <guibutton>Forward</guibutton>, you can review your restore "
-#~ "options, then click <guibutton>Restore</guibutton> to start the restore."
+#~ "After clicking <guibutton>Forward</guibutton>, you can review your "
+#~ "restore options, then click <guibutton>Restore</guibutton> to start the "
+#~ "restore."
 #~ msgstr ""
 #~ "Napsautettuasi <guibutton>Seuraava</guibutton>-painiketta voit tarkistaa "
-#~ "palautuksen valinnat. Napsauta <guibutton>Palauta</guibutton> aloittaaksesi "
-#~ "tiedostojen palauttamisen."
+#~ "palautuksen valinnat. Napsauta <guibutton>Palauta</guibutton> "
+#~ "aloittaaksesi tiedostojen palauttamisen."
 
 #~ msgid "Preferences"
 #~ msgstr "Asetukset"
 
 #~ msgid ""
 #~ "To configure <application>Déjà Dup</application>, choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice>."
+#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice>."
 #~ msgstr ""
 #~ "Määrittääksesi <application>Déjà Dup</application>in asetukset, valitse "
-#~ "<menuchoice><guimenu>Muokkaa</guimenu><guimenuitem>Asetukset</guimenuitem></m"
-#~ "enuchoice>."
+#~ "<menuchoice><guimenu>Muokkaa</guimenu><guimenuitem>Asetukset</"
+#~ "guimenuitem></menuchoice>."
 
 #~ msgid "<guilabel>Backup location</guilabel>"
 #~ msgstr "<guilabel>Varmuuskopion sijainti</guilabel>"
@@ -437,17 +438,17 @@
 #~ msgid ""
 #~ "This backup location uses the S3 storage service from Amazon. For a small "
 #~ "fee per gigabyte, they hold your data for you. This is the recommended "
-#~ "default because it is an easy way to keep your data offsite (meaning out of "
-#~ "your home: in case of disaster or theft, your data will still be safe). You "
-#~ "can sign up <ulink url=\"http://aws.amazon.com/s3/\" "
-#~ "type=\"http\">online</ulink>."
+#~ "default because it is an easy way to keep your data offsite (meaning out "
+#~ "of your home: in case of disaster or theft, your data will still be "
+#~ "safe). You can sign up <ulink url=\"http://aws.amazon.com/s3/\" type="
+#~ "\"http\">online</ulink>."
 #~ msgstr ""
 #~ "Tämä varmuuskopion sijainti käyttää Amazonin S3-tallennuspalvelua. Se "
-#~ "säilyttää tietosi pientä maksua vastaan jokaista gigatavua (Gt) kohden. Tämä "
-#~ "on suositeltu oletusasetus, koska se on helppo tapa pitää tiedostosi "
-#~ "turvassa kotisi ulkopuolella (katastrofin tai varkauden sattuessa datasi on "
-#~ "yhä turvassa). Voit luoda käyttäjätunnuksen palveluun <ulink "
-#~ "url=\"http://aws.amazon.com/s3/\" type=\"http\">verkossa</ulink>."
+#~ "säilyttää tietosi pientä maksua vastaan jokaista gigatavua (Gt) kohden. "
+#~ "Tämä on suositeltu oletusasetus, koska se on helppo tapa pitää tiedostosi "
+#~ "turvassa kotisi ulkopuolella (katastrofin tai varkauden sattuessa datasi "
+#~ "on yhä turvassa). Voit luoda käyttäjätunnuksen palveluun <ulink url="
+#~ "\"http://aws.amazon.com/s3/\" type=\"http\">verkossa</ulink>."
 
 #~ msgid ""
 #~ "This service costs money.  Read their rates carefully before using it."
@@ -459,10 +460,11 @@
 #~ msgstr "Irrotettavat tallennusvälineet"
 
 #~ msgid ""
-#~ "You may see removable media like external hard drives or thumb drives listed."
+#~ "You may see removable media like external hard drives or thumb drives "
+#~ "listed."
 #~ msgstr ""
-#~ "Voit nähdä irrotettavia tallennusvälineitä kuten ulkoisia kiintolevyjä tai "
-#~ "muistitikkuja listattuna."
+#~ "Voit nähdä irrotettavia tallennusvälineitä kuten ulkoisia kiintolevyjä "
+#~ "tai muistitikkuja listattuna."
 
 #~ msgid ""
 #~ "If you have connected to any servers, they will appear.  To connect to a "
@@ -479,12 +481,13 @@
 #~ msgstr "Paikalliset kansiot"
 
 #~ msgid ""
-#~ "You may also want to choose a local folder as a backup location.  Note that "
-#~ "backups can be quite large, so make sure you have enough free disk space."
+#~ "You may also want to choose a local folder as a backup location.  Note "
+#~ "that backups can be quite large, so make sure you have enough free disk "
+#~ "space."
 #~ msgstr ""
-#~ "Voit myös halutessasi valita paikallisen kansion varmuuskopion sijainniksi. "
-#~ "Huomaa, että varmuuskopiot voivat olla suuria, joten varmista, että sinulla "
-#~ "on riittävästi tyhjää levytilaa."
+#~ "Voit myös halutessasi valita paikallisen kansion varmuuskopion "
+#~ "sijainniksi. Huomaa, että varmuuskopiot voivat olla suuria, joten "
+#~ "varmista, että sinulla on riittävästi tyhjää levytilaa."
 
 #~ msgid "Default: <guilabel>Amazon S3</guilabel>."
 #~ msgstr "Oletus: <guilabel>Amazon S3</guilabel>."
@@ -500,13 +503,13 @@
 #~ "<guilabel>Amazon S3</guilabel>."
 
 #~ msgid ""
-#~ "This is your Access Key ID that Amazon gave you when you signed up for S3. "
-#~ "It is like a username for logging into S3. If left empty, you will be "
+#~ "This is your Access Key ID that Amazon gave you when you signed up for "
+#~ "S3. It is like a username for logging into S3. If left empty, you will be "
 #~ "prompted for it as you backup or restore."
 #~ msgstr ""
 #~ "Tämä on käyttöavaimesi tunnus, jonka Amazon antoi sinulle luodessasi "
-#~ "käyttäjätilisi S3:lle. Se on kuin käyttäjätunnus S3:een kirjauduttaessa. Jos "
-#~ "se jätetään tyhjäksi, sitä pyydetään sinulta varmuuskopioinnin ja "
+#~ "käyttäjätilisi S3:lle. Se on kuin käyttäjätunnus S3:een kirjauduttaessa. "
+#~ "Jos se jätetään tyhjäksi, sitä pyydetään sinulta varmuuskopioinnin ja "
 #~ "tiedostojen palautuksen yhteydessä."
 
 #~ msgid "<guilabel>Folder</guilabel>"
@@ -525,40 +528,41 @@
 #~ msgstr "<guilabel>Varmuuskopioi tiedostot kansioista</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to backup. Press the <guibutton>Add</guibutton> "
-#~ "or <guibutton>Remove</guibutton> buttons to modify the list. If you are only "
-#~ "interested in backing up your own data, the default of <guilabel>Home "
-#~ "Folder</guilabel> is sufficient."
+#~ "Select a list of directories to backup. Press the <guibutton>Add</"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "If you are only interested in backing up your own data, the default of "
+#~ "<guilabel>Home Folder</guilabel> is sufficient."
 #~ msgstr ""
-#~ "Valitse varmuuskopioitavat hakemistot. Paina <guibutton>Lisää</guibutton>- "
-#~ "tai <guibutton>Poista</guibutton>-painikkeita muokataksesi luetteloa. Jos "
-#~ "haluat varmuuskopioida vain omat tiedostosi, oletuksena oleva "
-#~ "<guilabel>Kotikansio</guilabel> on riittävä."
+#~ "Valitse varmuuskopioitavat hakemistot. Paina <guibutton>Lisää</"
+#~ "guibutton>- tai <guibutton>Poista</guibutton>-painikkeita muokataksesi "
+#~ "luetteloa. Jos haluat varmuuskopioida vain omat tiedostosi, oletuksena "
+#~ "oleva <guilabel>Kotikansio</guilabel> on riittävä."
 
 #~ msgid "<guilabel>Except files in folders</guilabel>"
 #~ msgstr "<guilabel>Ohita tiedostot kansioissa</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to not backup. Press the <guibutton>Add "
-#~ "</guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "Select a list of directories to not backup. Press the <guibutton>Add </"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
 #~ "This list takes precedence over the list of included directories."
 #~ msgstr ""
-#~ "Valitse hakemistot, joita ei varmuuskopioida. Paina "
-#~ "<guibutton>Lisää</guibutton> tai <guibutton>Poista</guibutton> -painikkeita "
-#~ "muokataksesi luetteloa. Tämä luettelo ohittaa varmuuskopiointiin "
-#~ "sisällytettävät hakemistot -luettelon (molemmissa luetteloissa mainittua "
-#~ "kansiota ei varmuuskopioida)."
+#~ "Valitse hakemistot, joita ei varmuuskopioida. Paina <guibutton>Lisää</"
+#~ "guibutton> tai <guibutton>Poista</guibutton> -painikkeita muokataksesi "
+#~ "luetteloa. Tämä luettelo ohittaa varmuuskopiointiin sisällytettävät "
+#~ "hakemistot -luettelon (molemmissa luetteloissa mainittua kansiota ei "
+#~ "varmuuskopioida)."
 
 #~ msgid ""
-#~ "Some of your data may be large and not very important to you.  In that case, "
-#~ "you can save yourself some time and space by not backing them up."
+#~ "Some of your data may be large and not very important to you.  In that "
+#~ "case, you can save yourself some time and space by not backing them up."
 #~ msgstr ""
-#~ "Osa tiedostoistasi voi olla suurikokoisia ja vähäarvoisia. Siinä tapauksessa "
-#~ "voit säästää itseltäsi aikaa ja levytilaa jättämällä ne varmuuskopioimatta."
+#~ "Osa tiedostoistasi voi olla suurikokoisia ja vähäarvoisia. Siinä "
+#~ "tapauksessa voit säästää itseltäsi aikaa ja levytilaa jättämällä ne "
+#~ "varmuuskopioimatta."
 
 #~ msgid ""
-#~ "There are some locations that <application>Déjà Dup</application> excludes "
-#~ "by default:"
+#~ "There are some locations that <application>Déjà Dup</application> "
+#~ "excludes by default:"
 #~ msgstr ""
 #~ "<application>Déjà Dup</application> ei oletuksena varmuuskopioi seuraavia "
 #~ "sijainteja:"
@@ -597,10 +601,10 @@
 #~ msgstr "<guilabel>Salaa varmuuskopioidut tiedostot</guilabel>"
 
 #~ msgid ""
-#~ "Encrypting your backup files is recommended to keep your data safe. If you "
-#~ "don't have exclusive physical control of your backup location, or if it is "
-#~ "stolen, an encrypted backup prevents others from looking at your personal "
-#~ "data."
+#~ "Encrypting your backup files is recommended to keep your data safe. If "
+#~ "you don't have exclusive physical control of your backup location, or if "
+#~ "it is stolen, an encrypted backup prevents others from looking at your "
+#~ "personal data."
 #~ msgstr ""
 #~ "Varmuuskopioiden salaaminen on suositeltavaa tietojesi turvallisuuden "
 #~ "kannalta. Jos et voi fyysisesti hallita varmuuskopion sijaintia, tai se "
@@ -611,8 +615,8 @@
 #~ "If on, you will be prompted for a password. Keep this password safe, you "
 #~ "will need it to restore your data."
 #~ msgstr ""
-#~ "Jos tämä asetus on käytössä, sinulta pyydetään salasana. Pidä tämä salasana "
-#~ "turvassa, tarvitset sitä palauttaaksesi tiedostosi."
+#~ "Jos tämä asetus on käytössä, sinulta pyydetään salasana. Pidä tämä "
+#~ "salasana turvassa, tarvitset sitä palauttaaksesi tiedostosi."
 
 #~ msgid "Default: <userinput>On</userinput>."
 #~ msgstr "Oletus: <userinput>Käytössä</userinput>."
@@ -623,12 +627,12 @@
 
 #~ msgid ""
 #~ "Turn this option on to have <application>Déjà Dup</application> "
-#~ "automatically backup for you. This is recommended so that you don't forget "
-#~ "to backup. Backups are more useful the more recently you have made them, so "
-#~ "it is important to regularly do so."
+#~ "automatically backup for you. This is recommended so that you don't "
+#~ "forget to backup. Backups are more useful the more recently you have made "
+#~ "them, so it is important to regularly do so."
 #~ msgstr ""
-#~ "Ota tämä vaihtoehto käyttöön jos haluat että <application>Déjà "
-#~ "Dup</application> suorittaa varmuuskopioinnin automaattisesti. Tämä on "
+#~ "Ota tämä vaihtoehto käyttöön jos haluat että <application>Déjà Dup</"
+#~ "application> suorittaa varmuuskopioinnin automaattisesti. Tämä on "
 #~ "suositeltavaa, jotta et unohda varmuuskopiointia. Varmuuskopiot ovat sitä "
 #~ "hyödyllisempiä, mitä uudempia ne ovat, joten on tärkeää varmuuskopioida "
 #~ "säännöllisesti."
@@ -650,15 +654,15 @@
 
 #~ msgid ""
 #~ "Choose the minimum amount of time to keep backup files.  If you find that "
-#~ "the backup files are taking up too much space, you may want to decrease this "
-#~ "duration.  Due to implementation details, files may be kept a bit longer "
-#~ "than the chosen time.  But no files will be deleted early."
+#~ "the backup files are taking up too much space, you may want to decrease "
+#~ "this duration.  Due to implementation details, files may be kept a bit "
+#~ "longer than the chosen time.  But no files will be deleted early."
 #~ msgstr ""
-#~ "Valitse vähimmäisaika, jonka verran varmuuskopioita säilytetään. Jos huomaat "
-#~ "varmuuskopioiden vievän liikaa tilaa, voit halutessasi lyhentää "
+#~ "Valitse vähimmäisaika, jonka verran varmuuskopioita säilytetään. Jos "
+#~ "huomaat varmuuskopioiden vievän liikaa tilaa, voit halutessasi lyhentää "
 #~ "säilytysaikaa. Ohjelman toteutuksen yksityiskohdista johtuen tiedostoja "
-#~ "saatetaan säilyttää hieman pidempään kuin valitun ajan. Mitään tiedostoja ei "
-#~ "kuitenkaan tuhota aikaisemmin."
+#~ "saatetaan säilyttää hieman pidempään kuin valitun ajan. Mitään tiedostoja "
+#~ "ei kuitenkaan tuhota aikaisemmin."
 
 #~ msgid "Default: <guilabel>Forever</guilabel>."
 #~ msgstr "Oletus: <guilabel>Ikuisesti</guilabel>."
@@ -710,15 +714,15 @@
 #~ msgstr "Varmuuskopioiden välillä kulunut aika"
 
 #~ msgid ""
-#~ "This list of directories will be backed up. Reserved values $HOME, $DESKTOP, "
-#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, "
-#~ "and $VIDEO are recognized as the user's special directories. Relative "
-#~ "entries are relative to the user's home directory."
+#~ "This list of directories will be backed up. Reserved values $HOME, "
+#~ "$DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
+#~ "$TEMPLATES, $TRASH, and $VIDEO are recognized as the user's special "
+#~ "directories. Relative entries are relative to the user's home directory."
 #~ msgstr ""
-#~ "Seuraavan listan hakemistot varmuuskopioidaan. $HOME, $DESKTOP, $DOCUMENTS, "
-#~ "$DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEO "
-#~ "tunnistetaan käyttäjän erityisinä hakemistoina. Listan muut jäsenet "
-#~ "riippuvat käyttäjän kotihakemistosta."
+#~ "Seuraavan listan hakemistot varmuuskopioidaan. $HOME, $DESKTOP, "
+#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, "
+#~ "$TRASH, and $VIDEO tunnistetaan käyttäjän erityisinä hakemistoina. Listan "
+#~ "muut jäsenet riippuvat käyttäjän kotihakemistosta."
 
 #~ msgid ""
 #~ "This list of directories will not be backed up. Reserved values $HOME, "
@@ -728,9 +732,9 @@
 #~ "This list takes precedence over the include list."
 #~ msgstr ""
 #~ "Seuraavan listan hakemistoja ei varmuuskopioida. $HOME, $DESKTOP, "
-#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, "
-#~ "and $VIDEO tunnistetaan käyttäjän erityisinä hakemistoina. Listan muut "
-#~ "jäsenet riippuvat käyttäjän kotihakemistosta. Tämä lista ohittaa "
+#~ "$DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, "
+#~ "$TRASH, and $VIDEO tunnistetaan käyttäjän erityisinä hakemistoina. Listan "
+#~ "muut jäsenet riippuvat käyttäjän kotihakemistosta. Tämä lista ohittaa "
 #~ "mukaanluettujen listan."
 
 #~ msgid "Type of location to store backup"
@@ -743,8 +747,8 @@
 #~ msgstr "Kryptataanko varmuuskopio"
 
 #~ msgid ""
-#~ "Whether to encrypt your backup files in the storage location. It's strongly "
-#~ "recommended to leave this as 'true'."
+#~ "Whether to encrypt your backup files in the storage location. It's "
+#~ "strongly recommended to leave this as 'true'."
 #~ msgstr ""
 #~ "Kryptataanko varmuuskopioidut tiedostot talletuskohteessa. Suositeltavaa."
 
@@ -755,8 +759,8 @@
 #~ "Which Amazon S3 bucket to store files in. This does not need to exist "
 #~ "already. Only legal hostname strings are valid."
 #~ msgstr ""
-#~ "Mihin Amazon S3 koriin tiedostot tallennetaan. Tuon korin ei vielä tarvitse "
-#~ "olla olemassa. Vain lailliset nimet ovat päteviä."
+#~ "Mihin Amazon S3 koriin tiedostot tallennetaan. Tuon korin ei vielä "
+#~ "tarvitse olla olemassa. Vain lailliset nimet ovat päteviä."
 
 #~ msgid "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
 #~ msgstr "Amazon S3 avaimen identifioija. Se toimii S3 käyttäjätunnuksenasi."
@@ -777,8 +781,8 @@
 #~ "A scheduled backup will shortly begin.  You can instead choose to backup "
 #~ "later or not at all."
 #~ msgstr ""
-#~ "Ennalta valittu varmuuskopiointi alkaa pian. Voit myös luoda varmuuskopion "
-#~ "myöhemmin tai jättää varmuuskopion tekemättä kokonaan."
+#~ "Ennalta valittu varmuuskopiointi alkaa pian. Voit myös luoda "
+#~ "varmuuskopion myöhemmin tai jättää varmuuskopion tekemättä kokonaan."
 
 #~ msgid "Skip Backup"
 #~ msgstr "Ohita varmuuskopiointi"
@@ -936,11 +940,11 @@
 #~ msgstr "Amazon S3 salasana"
 
 #~ msgid ""
-#~ "Enter your Amazon Web Services user ID and secret key.  This is not the same "
-#~ "as your amazon.com username and password."
+#~ "Enter your Amazon Web Services user ID and secret key.  This is not the "
+#~ "same as your amazon.com username and password."
 #~ msgstr ""
-#~ "Anna Amazon Web palveluiden käyttäjätunnus ja avain. Näiden ei tarvitse olla "
-#~ "sinun amazon.com käyttäjänimesi ja salasanasi."
+#~ "Anna Amazon Web palveluiden käyttäjätunnus ja avain. Näiden ei tarvitse "
+#~ "olla sinun amazon.com käyttäjänimesi ja salasanasi."
 
 #~ msgid "Home Folder"
 #~ msgstr "Kotikansio"
@@ -992,11 +996,11 @@
 #~ msgstr "Dublicity:n versio on liian vanha"
 
 #~ msgid ""
-#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only found "
-#~ "version %d.%d.%.2d"
+#~ "Déjà Dup requires at least version %d.%d.%.2d of duplicity, but only "
+#~ "found version %d.%d.%.2d"
 #~ msgstr ""
-#~ "Déjà Dup vaatii ainakin version %d.%d.%.2d Duplicity:stä. Vain versio "
-#~ "%d.%d.%.2d löydettiin."
+#~ "Déjà Dup vaatii ainakin version %d.%d.%.2d Duplicity:stä. Vain versio %d."
+#~ "%d.%.2d löydettiin."
 
 #~ msgid "Preparing..."
 #~ msgstr "Valmistellaan..."
@@ -1016,7 +1020,8 @@
 #~ msgid "Invalid secret key."
 #~ msgstr "Virheellinen salainen avain"
 
-#~ msgid "Your Amazon Web Services account is not signed up for the S3 service."
+#~ msgid ""
+#~ "Your Amazon Web Services account is not signed up for the S3 service."
 #~ msgstr "Amazon Web Service tiliisi ei kuulu S3 palvelua"
 
 #~ msgid "S3 bucket name is not available."
@@ -1036,24 +1041,24 @@
 
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License as published by the Free "
-#~ "Software Foundation; either version 3 of the License, or (at your option) "
-#~ "any later version."
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 3 of the License, or (at your "
+#~ "option) any later version."
 #~ msgstr ""
-#~ "Tämä ohjelma on vapaa ohjelmisto. Saat levittää ja/tai muokata sitä GNU GPL-"
-#~ "lisenssin ehtojen mukaan (Free Software Foundationin julkaisema, joko "
+#~ "Tämä ohjelma on vapaa ohjelmisto. Saat levittää ja/tai muokata sitä GNU "
+#~ "GPL-lisenssin ehtojen mukaan (Free Software Foundationin julkaisema, joko "
 #~ "lisenssin versio 3 tai valitsemasi myöhempi versio)."
 
 #~ msgid ""
-#~ "This program is distributed in the hope that it will be useful, but WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-#~ "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-#~ "more details."
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
 #~ msgstr ""
-#~ "Tätä ohjelmaa levitetään siinä toivossa, että siitä on hyötyä, mutta ILMAN "
-#~ "MITÄÄN TAKUUTA;  ilman edes taetta MYYNTIKELPOISUUDESTA TAI SOVELTUMISESTA "
-#~ "TIETTYYN ERITYISEEN TARKOITUKSEEN. Yksityiskohtien osalta katso GNU:n GPL-"
-#~ "lisenssiä."
+#~ "Tätä ohjelmaa levitetään siinä toivossa, että siitä on hyötyä, mutta "
+#~ "ILMAN MITÄÄN TAKUUTA;  ilman edes taetta MYYNTIKELPOISUUDESTA TAI "
+#~ "SOVELTUMISESTA TIETTYYN ERITYISEEN TARKOITUKSEEN. Yksityiskohtien osalta "
+#~ "katso GNU:n GPL-lisenssiä."
 
 #~ msgid "Unknown"
 #~ msgstr "Tuntematon"
@@ -1068,7 +1073,8 @@
 #~ "Not all files could be restored. Any files that could not be restored may "
 #~ "still be found in %s."
 #~ msgstr ""
-#~ "Kaikkia tiedostoja ei voitu palauttaa. Nämä tiedostot voivat löytyä %s:stä."
+#~ "Kaikkia tiedostoja ei voitu palauttaa. Nämä tiedostot voivat löytyä %s:"
+#~ "stä."
 
 #~ msgid "Could not restore %s: %s"
 #~ msgstr "Ei voinut palauttaa %s:%s"
@@ -1135,9 +1141,9 @@
 #~ msgstr "Ei kyennyt lisäämään kansiota"
 
 #~ msgid ""
-#~ "You should have received a copy of the GNU General Public License along with "
-#~ "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-#~ "Place - Suite 330, Boston, MA  02111-1307, USA."
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program; if not, write to the Free Software Foundation, Inc., "
+#~ "59 Temple Place - Suite 330, Boston, MA  02111-1307, USA."
 #~ msgstr ""
 #~ "Sinun olisi pitänyt saada kopio GNU GPL-lisenssi tämän ohjelman mukana. "
 #~ "Ellet sitä saanut, kirjoita Free Software Foundation, INC.:lle, 59 Temple "
@@ -1168,10 +1174,11 @@
 #~ msgstr "SSH yhteyksiin käytetty portti"
 
 #~ msgid ""
-#~ "The protocol used for the backup location. Valid values are 's3', 'file', or "
-#~ "'ssh'."
+#~ "The protocol used for the backup location. Valid values are 's3', 'file', "
+#~ "or 'ssh'."
 #~ msgstr ""
-#~ "Varmuuskopion sijaintiin käytetty protokolla. Joko 'S3', 'kansio', tai 'SSH'"
+#~ "Varmuuskopion sijaintiin käytetty protokolla. Joko 'S3', 'kansio', tai "
+#~ "'SSH'"
 
 #~ msgid "The server used for SSH connections."
 #~ msgstr "SSH yhteyksiin käytetty palvelin"

=== modified file 'man/translations/fr.po'
--- man/translations/fr.po	2010-09-18 15:05:34 +0000
+++ man/translations/fr.po	2010-11-18 08:41:46 +0000
@@ -11,72 +11,72 @@
 "PO-Revision-Date: 2010-09-08 02:51+0000\n"
 "Last-Translator: Emilien Klein <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Launchpad-Export-Date: 2010-09-09 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"Language: fr\n"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup"
 msgstr "deja-dup"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "%DATE%"
 msgstr "%DATE%"
 
 #. type: TH
-#: ./C/deja-dup.1:1 ./C/deja-dup-preferences.1:1
+#: C/deja-dup.1:1 C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "USER COMMANDS"
 msgstr "COMMANDES DE L' UTILISATEUR"
 
 #. type: SH
-#: ./C/deja-dup.1:2 ./C/deja-dup-preferences.1:2
+#: C/deja-dup.1:2 C/deja-dup-preferences.1:2
 #, no-wrap
 msgid "NAME"
 msgstr "NOM"
 
 #. type: Plain text
-#: ./C/deja-dup.1:4
+#: C/deja-dup.1:4
 msgid "deja-dup - backup your data"
 msgstr "dejo-dup - sauvegarder vos données"
 
 #. type: SH
-#: ./C/deja-dup.1:4 ./C/deja-dup-preferences.1:4
+#: C/deja-dup.1:4 C/deja-dup-preferences.1:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 #. type: Plain text
-#: ./C/deja-dup.1:7
+#: C/deja-dup.1:7
 msgid "B<deja-dup> [OPTIONS]"
 msgstr "B<deja-dup> [OPTIONS]"
 
 #. type: Plain text
-#: ./C/deja-dup.1:10
+#: C/deja-dup.1:10
 msgid "B<deja-dup> --backup"
 msgstr "B<deja-dup> --backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:14
+#: C/deja-dup.1:14
 msgid "B<deja-dup> --restore [FILES]"
 msgstr "B<deja-dup> --restore [FICHIERS]"
 
 #. type: SH
-#: ./C/deja-dup.1:14 ./C/deja-dup-preferences.1:7
+#: C/deja-dup.1:14 C/deja-dup-preferences.1:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
 #. type: Plain text
-#: ./C/deja-dup.1:19
+#: C/deja-dup.1:19
 msgid ""
 "deja-dup is a graphical frontend to B<duplicity>(1).  It can backup and "
 "restore using a local folder or a remote server, including Amazon S3, as "
@@ -87,113 +87,112 @@
 "S3, ainsi que planifier des sauvegardes à intervalles réguliers."
 
 #. type: SH
-#: ./C/deja-dup.1:19 ./C/deja-dup-preferences.1:10
+#: C/deja-dup.1:19 C/deja-dup-preferences.1:10
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 #. type: TP
-#: ./C/deja-dup.1:20 ./C/deja-dup-preferences.1:11
+#: C/deja-dup.1:20 C/deja-dup-preferences.1:11
 #, no-wrap
 msgid "-?, --help"
 msgstr "-?, --help"
 
 #. type: Plain text
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 msgid "Display usage information"
 msgstr "Afficher les informations d'utilisation"
 
 #. type: TP
-#: ./C/deja-dup.1:23 ./C/deja-dup-preferences.1:14
+#: C/deja-dup.1:23 C/deja-dup-preferences.1:14
 #, no-wrap
 msgid "--version"
 msgstr "--version"
 
 #. type: Plain text
-#: ./C/deja-dup.1:26 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:26 C/deja-dup-preferences.1:17
 msgid "Prints program name and version"
 msgstr "indiquer le nom du programme et la version"
 
 #. type: TP
-#: ./C/deja-dup.1:26
+#: C/deja-dup.1:26
 #, no-wrap
 msgid "--backup"
 msgstr "--backup"
 
 #. type: Plain text
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 msgid "Immediately starts a backup"
 msgstr "Démarre immédiatement une sauvegarde"
 
 #. type: TP
-#: ./C/deja-dup.1:29
+#: C/deja-dup.1:29
 #, no-wrap
 msgid "--restore"
 msgstr "--restore"
 
 #. type: Plain text
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 msgid "Restores only the specified files"
 msgstr "Restaurer seulement les fichiers spécifiés"
 
 #. type: SH
-#: ./C/deja-dup.1:32
+#: C/deja-dup.1:32
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENVIRONNEMENT"
 
 #. type: TP
-#: ./C/deja-dup.1:33
+#: C/deja-dup.1:33
 #, no-wrap
 msgid "DEJA_DUP_DEBUG"
 msgstr "DEJA_DUP_DEBUG"
 
 #. type: Plain text
-#: ./C/deja-dup.1:36
+#: C/deja-dup.1:36
 msgid "Set to 1 to enable more verbose output. Helpful for debugging."
 msgstr ""
 "Mettre à 1 pour permettre une sortie plus verbeuse. Utile pour le débogage."
 
 #. type: SH
-#: ./C/deja-dup.1:36 ./C/deja-dup-preferences.1:17
+#: C/deja-dup.1:36 C/deja-dup-preferences.1:17
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
-#: ./C/deja-dup.1:37
+#: C/deja-dup.1:37
 msgid "B<duplicity>(1)"
 msgstr "B<duplicity>(1)"
 
 #. type: TH
-#: ./C/deja-dup-preferences.1:1
+#: C/deja-dup-preferences.1:1
 #, no-wrap
 msgid "deja-dup-preferences"
 msgstr "préférences de deja-dup"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:4
+#: C/deja-dup-preferences.1:4
 msgid "deja-dup-preferences - backup your data"
 msgstr "préférences de deja-dup - sauvegarder vos données"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:7
+#: C/deja-dup-preferences.1:7
 msgid "B<deja-dup-preferences> [OPTIONS]"
 msgstr "B<préférences de deja-dup> [OPTIONS]"
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:10
+#: C/deja-dup-preferences.1:10
 msgid "deja-dup-preferences is the preferences dialog for B<deja-dup>(1)."
 msgstr ""
 "préférences de deja-dup est la boite de dialogue pour les préférences de "
 "B<deja-dup>(1)."
 
 #. type: Plain text
-#: ./C/deja-dup-preferences.1:18
+#: C/deja-dup-preferences.1:18
 msgid "B<deja-dup>(1)"
 msgstr "B<deja-dup>(1)"
 
-#, no-wrap
 #~ msgid "deja-dup-monitor"
 #~ msgstr "superviseur deja-dup"
 
@@ -210,13 +209,13 @@
 #~ msgstr "Manuel de <application>Déjà Dup</application>"
 
 #~ msgid ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administrators</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administrators</ulink></publishername> </publisher>"
 #~ msgstr ""
-#~ "<publisher role=\"maintainer\"> <publishername><ulink "
-#~ "url=\"http://launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà "
-#~ "Dup</application> Administrators</ulink></publishername> </publisher>"
+#~ "<publisher role=\"maintainer\"> <publishername><ulink url=\"http://"
+#~ "launchpad.net/~deja-dup-team\" type=\"http\"><application>Déjà Dup</"
+#~ "application> Administrators</ulink></publishername> </publisher>"
 
 #~ msgid "Michael"
 #~ msgstr "Michael"
@@ -234,8 +233,8 @@
 #~ msgstr "Michael Terry <email>[e-mail]</email>"
 
 #~ msgid ""
-#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" "
-#~ "type=\"http\"><application>Déjà Dup</application> Administrators</ulink>"
+#~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http"
+#~ "\"><application>Déjà Dup</application> Administrators</ulink>"
 #~ msgstr ""
 #~ "<ulink url=\"http://launchpad.net/~deja-dup-team\" type=\"http\">Les "
 #~ "administrateurs de<application>Déjà Dup</application> </ulink>"
@@ -254,11 +253,13 @@
 
 #~ msgid "<application>Déjà Dup</application> provides the following features:"
 #~ msgstr ""
-#~ "<application>Déjà Dup</application> apporte les caractéristiques suivantes:"
+#~ "<application>Déjà Dup</application> apporte les caractéristiques "
+#~ "suivantes:"
 
 #~ msgid "Support for local or remote backup locations, including Amazon S3"
 #~ msgstr ""
-#~ "Supporte un emplacement de sauvegarde local ou en ligne, incluant Amazon S3"
+#~ "Supporte un emplacement de sauvegarde local ou en ligne, incluant Amazon "
+#~ "S3"
 
 #~ msgid "Securely encrypts and compresses your data."
 #~ msgstr "Chiffrer et compresser vos données en toute sécurité."
@@ -284,8 +285,8 @@
 #~ msgid ""
 #~ "You can start <application>Déjà Dup</application> in the following ways:"
 #~ msgstr ""
-#~ "Vous pouvez démarrer <application>Déjà Dup</application> de ces différentes "
-#~ "manières:"
+#~ "Vous pouvez démarrer <application>Déjà Dup</application> de ces "
+#~ "différentes manières:"
 
 #~ msgid "<guimenu>Applications</guimenu> menu"
 #~ msgstr "Menu <guimenu>Applications</guimenu>"
@@ -294,8 +295,8 @@
 #~ msgstr "Ligne de commande"
 
 #~ msgid ""
-#~ "To start <application>Déjà Dup</application> from a command line, type the "
-#~ "following command, then press <keycap>Return</keycap>:"
+#~ "To start <application>Déjà Dup</application> from a command line, type "
+#~ "the following command, then press <keycap>Return</keycap>:"
 #~ msgstr ""
 #~ "Pour démarrer <application>Déjà Dup</application> en ligne de commande, "
 #~ "tapez la commande suivante, puis appuyez sur <keycap>Entrée</keycap>:"
@@ -314,12 +315,12 @@
 
 #~ msgid ""
 #~ "To configure <application>Déjà Dup</application>, choose "
-#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
-#~ "nuchoice>."
+#~ "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</"
+#~ "guimenuitem></menuchoice>."
 #~ msgstr ""
 #~ "Pour configurer <application>Déjà Dup</application>, choisissez "
-#~ "<menuchoice><guimenu>Édition</guimenu><guimenuitem>Préférences</guimenuitem><"
-#~ "/menuchoice>"
+#~ "<menuchoice><guimenu>Édition</guimenu><guimenuitem>Préférences</"
+#~ "guimenuitem></menuchoice>"
 
 #~ msgid "<guilabel>Backup location</guilabel>"
 #~ msgstr "<guilabel>Emplacement de la sauvegarde</guilabel>"
@@ -362,31 +363,31 @@
 #~ "multiple folders.  Use this option to enter a path on the S3 service in "
 #~ "which to put your files."
 #~ msgstr ""
-#~ "Si vous avez plusieurs sauvegardes, vous pouvoir vouloir les garder séparé "
-#~ "dans des dossiers différents. UItilisez cette option pour entrer un "
-#~ "emplacement sur le service S3 où placer vos fichiers."
+#~ "Si vous avez plusieurs sauvegardes, vous pouvoir vouloir les garder "
+#~ "séparé dans des dossiers différents. UItilisez cette option pour entrer "
+#~ "un emplacement sur le service S3 où placer vos fichiers."
 
 #~ msgid "<guilabel>Include files in folders</guilabel>"
 #~ msgstr "<guilabel>Inclure les fichiers dans les dossiers</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to backup. Press the <guibutton>Add</guibutton> "
-#~ "or <guibutton>Remove</guibutton> buttons to modify the list. If you are only "
-#~ "interested in backing up your own data, the default of <guilabel>Home "
-#~ "Folder</guilabel> is sufficient."
+#~ "Select a list of directories to backup. Press the <guibutton>Add</"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "If you are only interested in backing up your own data, the default of "
+#~ "<guilabel>Home Folder</guilabel> is sufficient."
 #~ msgstr ""
 #~ "Choisissez une liste de dossiers à sauvegarder. Appuyez sur les boutons "
 #~ "<guibutton>Ajouter</guibutton> ou <guibutton>Enlever</guibutton> pour "
 #~ "modifier la liste. Si vous êtes seulement intéressé par une sauvegarde de "
-#~ "vos propres données, laisser par défaut <guilabel>Dossier "
-#~ "Personnel</guilabel> sera suffisant."
+#~ "vos propres données, laisser par défaut <guilabel>Dossier Personnel</"
+#~ "guilabel> sera suffisant."
 
 #~ msgid "<guilabel>Except files in folders</guilabel>"
 #~ msgstr "<guilabel>Exclurer les fichiers dans les dossiers</guilabel>"
 
 #~ msgid ""
-#~ "Select a list of directories to not backup. Press the <guibutton>Add "
-#~ "</guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
+#~ "Select a list of directories to not backup. Press the <guibutton>Add </"
+#~ "guibutton> or <guibutton>Remove</guibutton> buttons to modify the list. "
 #~ "This list takes precedence over the list of included directories."
 #~ msgstr ""
 #~ "Choisissez une liste de dossiers à ne pas sauvegarder. Appuyez sur les "
@@ -395,19 +396,19 @@
 #~ "dossiers inclus."
 
 #~ msgid ""
-#~ "Some of your data may be large and not very important to you.  In that case, "
-#~ "you can save yourself some time and space by not backing them up."
+#~ "Some of your data may be large and not very important to you.  In that "
+#~ "case, you can save yourself some time and space by not backing them up."
 #~ msgstr ""
 #~ "Certaines de vos données peuvent être lourdes en poids et ne pas être "
 #~ "importantes pour vous. Dans ce cas, vous pouvez gagner du temps et de la "
 #~ "place en ne les sauvegardant pas."
 
 #~ msgid ""
-#~ "There are some locations that <application>Déjà Dup</application> excludes "
-#~ "by default:"
+#~ "There are some locations that <application>Déjà Dup</application> "
+#~ "excludes by default:"
 #~ msgstr ""
-#~ "Il y a certains emplacements que <application>Déjà Dup</application> exclus "
-#~ "par défaut:"
+#~ "Il y a certains emplacements que <application>Déjà Dup</application> "
+#~ "exclus par défaut:"
 
 #~ msgid "~/.cache"
 #~ msgstr "~/.cache"
@@ -443,13 +444,13 @@
 #~ msgstr "<guilabel>Chiffrement des fichiers sauvegardés</guilabel>"
 
 #~ msgid ""
-#~ "Encrypting your backup files is recommended to keep your data safe. If you "
-#~ "don't have exclusive physical control of your backup location, or if it is "
-#~ "stolen, an encrypted backup prevents others from looking at your personal "
-#~ "data."
+#~ "Encrypting your backup files is recommended to keep your data safe. If "
+#~ "you don't have exclusive physical control of your backup location, or if "
+#~ "it is stolen, an encrypted backup prevents others from looking at your "
+#~ "personal data."
 #~ msgstr ""
-#~ "Chiffrer vos fichiers de sauvegarde est recommandé pour garder vos données "
-#~ "en sécurité. Si vous n\"avez pas le contrôle physique exclusif de "
+#~ "Chiffrer vos fichiers de sauvegarde est recommandé pour garder vos "
+#~ "données en sécurité. Si vous n\"avez pas le contrôle physique exclusif de "
 #~ "l'emplacement de sauvegarde, ou si il est volé, une sauvegarde chiffré "
 #~ "empêche les autres de regarder dans vos données personnelles."
 
@@ -465,19 +466,19 @@
 
 #~ msgid "<guilabel>Automatically backup on a regular schedule</guilabel>"
 #~ msgstr ""
-#~ "<guilabel>Sauvegarder automatiquement selon une planification "
-#~ "régulière</guilabel>"
+#~ "<guilabel>Sauvegarder automatiquement selon une planification régulière</"
+#~ "guilabel>"
 
 #~ msgid ""
 #~ "Turn this option on to have <application>Déjà Dup</application> "
-#~ "automatically backup for you. This is recommended so that you don't forget "
-#~ "to backup. Backups are more useful the more recently you have made them, so "
-#~ "it is important to regularly do so."
+#~ "automatically backup for you. This is recommended so that you don't "
+#~ "forget to backup. Backups are more useful the more recently you have made "
+#~ "them, so it is important to regularly do so."
 #~ msgstr ""
-#~ "Activez cette option pour que <application>Déjà Dup</application> fasse des "
-#~ "sauvegardes automatiquement pour vous. Celà est recommandé pour ne pas "
-#~ "oublier de sauvegarder. Plus les sauvegardes sont récentes et plus elles "
-#~ "sont utiles, il est donc important d'en faire régulièrement."
+#~ "Activez cette option pour que <application>Déjà Dup</application> fasse "
+#~ "des sauvegardes automatiquement pour vous. Celà est recommandé pour ne "
+#~ "pas oublier de sauvegarder. Plus les sauvegardes sont récentes et plus "
+#~ "elles sont utiles, il est donc important d'en faire régulièrement."