Merge lp:deja-dup/32 into lp:~dupingping86/deja-dup/fix_1309322

[dupingping]

When restoring, the function about "Resume Later" was not effected.

I had fixed a bug(1309322) by this patch.

[lp:deja-dup/32]

1534. By Michael Terry on 2014-04-29

Add Google Drive support

1535. By Michael Terry on 2014-05-02

Support compiling with valac-0.24

1536. By Michael Terry on 2014-05-02

Use autopilot-sandbox-run

1537. By Giovanni Campagna <email address hidden> on 2014-05-04

monitor: fix notifications when connecting to the network or pluggin a disk

We can't use the reactive_check variable directly, because that is
set and reset synchronously around the prepare_run() calls, but
the code that checks it runs after a yield (so after an async call
and at least one mainloop iteration). Instead, use a local temporary
that vala will know to store and retrieve.

1538. By Giovanni Campagna <email address hidden> on 2014-05-04

monitor: fix invalid source warning

Zero out the timeout_id when removing it, so we don't attempt
to remove it again the next time.

1539. By Michael Terry on 2014-06-09

Add summary tag to appdata file

1540. By Michael Terry on 2014-07-22

Update property name to the non-deprecated version; Thanks Laney

1541. By Michael Terry on 2014-09-20

Disable gdrive support until duplicity's backend for it improves

1542. By Michael Terry on 2014-09-20

Bump version; update NEWS; update translations

Unmerged revisions

1542. By Michael Terry on 2014-09-20

Bump version; update NEWS; update translations

1541. By Michael Terry on 2014-09-20

Disable gdrive support until duplicity's backend for it improves

1540. By Michael Terry on 2014-07-22

Update property name to the non-deprecated version; Thanks Laney

1539. By Michael Terry on 2014-06-09

Add summary tag to appdata file

1538. By Giovanni Campagna <email address hidden> on 2014-05-04

monitor: fix invalid source warning

Zero out the timeout_id when removing it, so we don't attempt
to remove it again the next time.

1537. By Giovanni Campagna <email address hidden> on 2014-05-04

monitor: fix notifications when connecting to the network or pluggin a disk

We can't use the reactive_check variable directly, because that is
set and reset synchronously around the prepare_run() calls, but
the code that checks it runs after a yield (so after an async call
and at least one mainloop iteration). Instead, use a local temporary
that vala will know to store and retrieve.

1536. By Michael Terry on 2014-05-02

Use autopilot-sandbox-run

1535. By Michael Terry on 2014-05-02

Support compiling with valac-0.24

1534. By Michael Terry on 2014-04-29

Add Google Drive support

=== modified file 'AUTHORS'
--- AUTHORS	2013-10-04 15:54:05 +0000
+++ AUTHORS	2014-09-20 15:05:16 +0000
@@ -7,7 +7,8 @@
 Copyright: 2008–2011 Michael Terry <[e-mail]>
            2009–2010 Andrew Fister <[e-mail]>
            2010 Urban Skudnik <[e-mail]>
-           2011–2013 Canonical Ltd
+           2011–2014 Canonical Ltd
+           2012 Lars Jegenhorst <[e-mail]>
 Comment: For specific author information, see the bzr logs
 License: GPL-3+
 

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-02 19:08:44 +0000
+++ CMakeLists.txt	2014-09-20 15:05:16 +0000
@@ -18,7 +18,7 @@
 
 project(deja-dup C)
 set(SERIES 32)
-set(VERSION 31.1)
+set(VERSION 32.0)
 cmake_minimum_required(VERSION 2.8)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(DejaDupMacros)

=== modified file 'NEWS'
--- NEWS	2014-04-02 19:08:44 +0000
+++ NEWS	2014-09-20 15:05:16 +0000
@@ -1,7 +1,13 @@
-Déjà Dup 31.1
+Déjà Dup 32.0
 -------------
 Features:
- • Dropped support for Ubuntu One cloud storage, since it is shutting down
+ • Drop support for Ubuntu One cloud storage, since it has shut down
+Packaging:
+ • Fix some compile issues and warnings
+Translations:
+ • New French (Canadian) translation
+ • Updated Basque, Brazilian Portuguese, Dutch, French, German, Hungarian, and
+   Polish translation
 
 Déjà Dup 30.0
 -------------

=== modified file 'cmake/FindVala.cmake'
--- cmake/FindVala.cmake	2013-12-06 17:19:31 +0000
+++ cmake/FindVala.cmake	2014-09-20 15:05:16 +0000
@@ -46,7 +46,7 @@
 
 # Search for the valac executable in the usual system paths
 # Some distributions rename the valac to contain the major.minor in the binary name
-find_program(VALA_EXECUTABLE NAMES valac valac-0.22 valac-0.20 valac-0.18 valac-0.16 valac-0.14 valac-0.12 valac-0.10)
+find_program(VALA_EXECUTABLE NAMES valac valac-0.24 valac-0.22 valac-0.20 valac-0.18 valac-0.16 valac-0.14 valac-0.12 valac-0.10)
 mark_as_advanced(VALA_EXECUTABLE)
 
 # Determine the valac version

=== modified file 'data/org.gnome.DejaDup.gschema.xml.in'
--- data/org.gnome.DejaDup.gschema.xml.in	2014-04-02 18:29:44 +0000
+++ data/org.gnome.DejaDup.gschema.xml.in	2014-09-20 15:05:16 +0000
@@ -65,6 +65,7 @@
       <choices>
         <choice value='auto'/>
         <choice value='file'/>
+        <choice value='gdrive'/>
         <choice value='rackspace'/>
         <choice value='s3'/>
         <choice value='u1'/>
@@ -75,6 +76,7 @@
     </key>
     <child name="rackspace" schema="org.gnome.DejaDup.Rackspace"/>
     <child name="s3" schema="org.gnome.DejaDup.S3"/>
+    <child name="gdrive" schema="org.gnome.DejaDup.GDrive"/>
     <child name="file" schema="org.gnome.DejaDup.File"/>
   </schema>
   <schema id="org.gnome.DejaDup.S3" path="/org/gnome/deja-dup/s3/">
@@ -94,6 +96,18 @@
       <_description>An optional folder name to store files in.  This folder will be created in the chosen bucket.</_description>
     </key>
   </schema>
+  <schema id="org.gnome.DejaDup.GDrive" path="/org/gnome/deja-dup/gdrive/">
+    <key name="email" type="s">
+      <default>''</default>
+      <_summary>The email-address of your Google account</_summary>
+      <_description>The email-address of your Google account.</_description>
+    </key>
+    <key name="folder" type="s">
+      <default>'/deja-dup/$HOSTNAME'</default>
+      <_summary>The folder where backups are stored</_summary>
+      <_description>The folder hierarchy where backups are stored.</_description>
+    </key>
+  </schema>
   <schema id="org.gnome.DejaDup.Rackspace" path="/org/gnome/deja-dup/rackspace/">
     <key name="container" type="s">
       <default>'$HOSTNAME'</default>

=== modified file 'debian/control'
--- debian/control	2014-04-02 18:47:36 +0000
+++ debian/control	2014-09-20 15:05:16 +0000
@@ -73,6 +73,18 @@
  .
  This package adds Rackspace Cloudfiles support to Déjà Dup.
 
+#Package: deja-dup-backend-gdrive
+#Architecture: all
+#Depends: ${misc:Depends},
+#         deja-dup,
+#         python-gdata,
+#Description: Google Drive support for Déjà Dup
+# Déjà Dup is a simple backup tool. It hides the complexity of backing up the
+# Right Way (encrypted, off-site, and regular) and uses duplicity as the
+# backend.
+# .
+# This package adds Google Drive support to Déjà Dup.
+
 Package: deja-dup-backend-s3
 Architecture: all
 Depends: ${misc:Depends},

=== modified file 'deja-dup/deja-dup.appdata.xml.in'
--- deja-dup/deja-dup.appdata.xml.in	2014-04-02 14:51:45 +0000
+++ deja-dup/deja-dup.appdata.xml.in	2014-09-20 15:05:16 +0000
@@ -4,6 +4,7 @@
     <id type="desktop">deja-dup.desktop</id>
     <licence>CC-BY-SA</licence>
     <_name>Déjà Dup Backup Tool</_name>
+    <_summary>Keep your important documents safe from disaster</_summary>
     <description>
         <_p>Déjà Dup is a simple backup tool. It hides the complexity of backing up the Right Way (encrypted, off-site, and regular) and uses duplicity as the backend.</_p>
         <ul>

=== modified file 'deja-dup/help/C/credits.page'
--- deja-dup/help/C/credits.page	2013-06-21 17:50:37 +0000
+++ deja-dup/help/C/credits.page	2014-09-20 15:05:16 +0000
@@ -17,6 +17,7 @@
 <item its:translate="no"><p><link href="mailto:[e-mail]">Michael Terry</link></p></item>
 <item its:translate="no"><p><link href="mailto:[e-mail]">Michael Vogt</link></p></item>
 <item its:translate="no"><p><link href="mailto:[e-mail]">Urban Skudnik</link></p></item>
+<item its:translate="no"><p><link href="mailto:[e-mail]">Lars Jegenhorst</link></p></item>
 <item its:translate="no"><p><link href="http://www.canonical.com/">Canonical Ltd</link></p></item>
 </list>
 </section>

=== modified file 'deja-dup/help/de/de.po'
--- deja-dup/help/de/de.po	2014-01-24 16:29:23 +0000
+++ deja-dup/help/de/de.po	2014-09-20 15:05:16 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-10 18:30-0500\n"
-"PO-Revision-Date: 2013-10-01 02:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-08-07 17:56+0000\n"
+"Last-Translator: Tobias Bannert <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-11 06:38+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-08-08 07:08+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -42,6 +42,7 @@
 "  Michael Terry https://launchpad.net/~mterry\n"
 "  Richy https://launchpad.net/~klemmster\n"
 "  SpaceCafé https://launchpad.net/~spacecafe\n"
+"  Tobias Bannert https://launchpad.net/~toba\n"
 "  Tobias Hermann https://launchpad.net/~tobihermann\n"
 "  Vinzenz Vietzke https://launchpad.net/~vinzv\n"
 "  bongo https://launchpad.net/~bong0\n"
@@ -637,6 +638,7 @@
 "  Michael Terry https://launchpad.net/~mterry\n"
 "  Richy https://launchpad.net/~klemmster\n"
 "  SpaceCafé https://launchpad.net/~spacecafe\n"
+"  Tobias Bannert https://launchpad.net/~toba\n"
 "  Tobias Hermann https://launchpad.net/~tobihermann\n"
 "  Vinzenz Vietzke https://launchpad.net/~vinzv\n"
 "  bongo https://launchpad.net/~bong0\n"
@@ -885,7 +887,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:13
 msgid "<gui>Automatic backup</gui>"
-msgstr ""
+msgstr "<gui>Automatische Sicherung</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:14

=== modified file 'deja-dup/help/eu/eu.po'
--- deja-dup/help/eu/eu.po	2014-01-24 16:29:23 +0000
+++ deja-dup/help/eu/eu.po	2014-09-20 15:05:16 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-10 18:30-0500\n"
-"PO-Revision-Date: 2013-10-01 02:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-08-04 10:28+0000\n"
+"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-11 06:38+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-08-05 06:46+0000\n"
+"X-Generator: Launchpad (build 17147)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -814,7 +814,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:13
 msgid "<gui>Automatic backup</gui>"
-msgstr ""
+msgstr "<gui>Babeskopia automatikoa</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:14
@@ -875,7 +875,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:44
 msgid "<gui>Storage location</gui>"
-msgstr ""
+msgstr "<gui>Biltegiratze-kokapena</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:45
@@ -958,7 +958,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:68
 msgid "<gui>Keep</gui>"
-msgstr ""
+msgstr "<gui>Mantendu</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:69
@@ -1116,13 +1116,13 @@
 #: C/index.page:9
 msgctxt "link"
 msgid "Backup Help"
-msgstr ""
+msgstr "Babeskopiarako laguntza"
 
 #. (itstool) path: info/title
 #: C/index.page:10
 msgctxt "text"
 msgid "Backup Help"
-msgstr ""
+msgstr "Babeskopiarako laguntza"
 
 #. (itstool) path: license/p
 #: C/index.page:16

=== modified file 'deja-dup/help/fr/fr.po'
--- deja-dup/help/fr/fr.po	2014-01-24 16:29:23 +0000
+++ deja-dup/help/fr/fr.po	2014-09-20 15:05:16 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-10 18:30-0500\n"
-"PO-Revision-Date: 2014-01-05 18:06+0000\n"
-"Last-Translator: Neitsab <Unknown>\n"
+"PO-Revision-Date: 2014-03-28 20:11+0000\n"
+"Last-Translator: Jean Marc <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-11 06:38+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-03-29 07:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -869,7 +869,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:13
 msgid "<gui>Automatic backup</gui>"
-msgstr ""
+msgstr "<gui>Sauvegarde automatique</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:14
@@ -959,6 +959,8 @@
 msgid ""
 "These services cost money. Read their rates carefully before using them."
 msgstr ""
+"Ces services sont payants. Lisez leurs tarifs avec attention avant de les "
+"utiliser."
 
 #. (itstool) path: item/title
 #: C/prefs.page:53
@@ -1001,6 +1003,9 @@
 "You may also want to choose a local folder as a storage location. Note that "
 "backups can be quite large, so make sure you have enough free disk space."
 msgstr ""
+"Vous pouvez également choisir un dossier local comme un emplacement de "
+"stockage. Notez que les sauvegardes peuvent être lourdes, alors assurez-vous "
+"que vous avez suffisamment d'espace disque libre."
 
 #. (itstool) path: note/p
 #: C/prefs.page:63
@@ -1036,6 +1041,8 @@
 "Backups are kept forever by default, but still may be deleted earlier if the "
 "storage location begins to run out of space."
 msgstr ""
+"Les sauvegardes sont conservées indéfiniment par défaut, mais peuvent être "
+"supprimées plus tôt si l'emplacement de stockage commence à manquer d'espace."
 
 #. (itstool) path: info/desc
 #: C/contribute.page:8

=== modified file 'deja-dup/help/hu/hu.po'
--- deja-dup/help/hu/hu.po	2014-01-24 16:29:23 +0000
+++ deja-dup/help/hu/hu.po	2014-09-20 15:05:16 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-10 18:30-0500\n"
-"PO-Revision-Date: 2013-10-01 02:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-30 12:56+0000\n"
+"Last-Translator: Gabor Kelemen <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-11 06:38+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -613,7 +613,7 @@
 #: C/backup-first.page:11
 #: C/restore-full.page:20
 msgid "Open your <gui>Backups</gui> settings."
-msgstr ""
+msgstr "Nyissa meg a <gui>Biztonsági mentés</gui> beállításait."
 
 #. (itstool) path: item/p
 #: C/backup-auto.page:13
@@ -662,6 +662,8 @@
 "Click on the <gui style=\"button\">Back Up Now…</gui> button on the "
 "<gui>Overview</gui> page."
 msgstr ""
+"Az <gui>Áttekintés</gui> oldalon nyomja meg a <gui style=\"button\">Mentés "
+"most…</gui> gombot."
 
 #. (itstool) path: item/p
 #: C/backup-first.page:14
@@ -819,7 +821,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:13
 msgid "<gui>Automatic backup</gui>"
-msgstr ""
+msgstr "<gui>Automatikus mentés</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:14
@@ -829,11 +831,14 @@
 "are more useful the more recent they are, so it is important to back up "
 "regularly."
 msgstr ""
+"Kapcsolja ezt be, hogy a <app>Déjà Dup</app> automatikusan mentéseket "
+"készíthessen. Ez azért javasolt, hogy nehogy elfelejtse. A biztonsági "
+"mentések annál hasznosabbak, minél újabbak, így fontos rendszeresen menteni."
 
 #. (itstool) path: item/title
 #: C/prefs.page:17
 msgid "<gui>Folders to save</gui>"
-msgstr ""
+msgstr "<gui>Mentendő mappák</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:18
@@ -843,6 +848,11 @@
 "modify the list. If you are only interested in backing up your own data, the "
 "default of <gui>Home</gui> is sufficient."
 msgstr ""
+"Válassza ki a mentendő mappák listáját. Nyomja meg a <gui "
+"style=\"button\">Hozzáadás</gui> vagy <gui "
+"style=\"button\">Eltávolítás</gui> gombokat a lista módosításához. Ha csak a "
+"saját adatait szeretné menteni, akkor az alapértelmezett <gui>Saját "
+"mappa</gui> megfelelő."
 
 #. (itstool) path: item/title
 #: C/prefs.page:21
@@ -856,6 +866,9 @@
 "style=\"button\">Add</gui> or <gui style=\"button\">Remove</gui> buttons to "
 "modify the list."
 msgstr ""
+"Válassza ki a nem mentendő mappák listáját. Nyomja meg a <gui "
+"style=\"button\">Hozzáadás</gui> vagy <gui "
+"style=\"button\">Eltávolítás</gui> gombokat a lista módosításához."
 
 #. (itstool) path: item/p
 #: C/prefs.page:23
@@ -879,7 +892,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:44
 msgid "<gui>Storage location</gui>"
-msgstr ""
+msgstr "<gui>Tárolási hely</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:45
@@ -887,6 +900,8 @@
 "Use these options to specify the storage location that <app>Déjà Dup</app> "
 "will use when backing up or restoring:"
 msgstr ""
+"Ezen beállításokkal megadhatja a <app>Déjà Dup</app> által mentéskor és "
+"visszaállításkor használandó tárolási helyet:"
 
 #. (itstool) path: item/title
 #: C/prefs.page:48
@@ -902,12 +917,18 @@
 "offsite (meaning out of your home: in case of disaster or theft, your data "
 "will still be safe)."
 msgstr ""
+"Az első néhány tárolási hely különböző cégek felhőszolgáltatásait jelöli. "
+"Csekély díj fejében vállalják adatok tárolását. Ezek azért ajánlottak, mert "
+"egyszerű módszert kínálnak a telephelyen kívüli adattárolásra (azaz otthonán "
+"kívül: adatai katasztrófa vagy lopás esetén is biztonságban vannak)."
 
 #. (itstool) path: note/p
 #: C/prefs.page:50
 msgid ""
 "These services cost money. Read their rates carefully before using them."
 msgstr ""
+"Ezek a szolgáltatások pénzbe kerülnek. Használatuk előtt körültekintően "
+"tájékozódjon áraikról."
 
 #. (itstool) path: item/title
 #: C/prefs.page:53
@@ -949,6 +970,9 @@
 "You may also want to choose a local folder as a storage location. Note that "
 "backups can be quite large, so make sure you have enough free disk space."
 msgstr ""
+"Választhat tárolási helyként helyi mappát is. Ne feledje, hogy a biztonsági "
+"mentések elég nagyok is lehetnek, ezért győződjön meg róla, hogy elegendő "
+"szabad lemezhelye van."
 
 #. (itstool) path: note/p
 #: C/prefs.page:63
@@ -962,7 +986,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:68
 msgid "<gui>Keep</gui>"
-msgstr ""
+msgstr "<gui>Megtartás</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:69
@@ -983,6 +1007,8 @@
 "Backups are kept forever by default, but still may be deleted earlier if the "
 "storage location begins to run out of space."
 msgstr ""
+"A biztonsági mentések alapesetben örökké megtartásra kerülnek, de korábban "
+"is törlésre kerülhetnek, ha a tárolási hely elkezd kifogyni a helyből."
 
 #. (itstool) path: info/desc
 #: C/contribute.page:8
@@ -1114,18 +1140,20 @@
 "external ref='figures/deja-dup-icon.png' "
 "md5='dab2c3256e901fe8c0c13f57bfccda51'"
 msgstr ""
+"external ref='figures/deja-dup-icon.png' "
+"md5='dab2c3256e901fe8c0c13f57bfccda51'"
 
 #. (itstool) path: info/title
 #: C/index.page:9
 msgctxt "link"
 msgid "Backup Help"
-msgstr ""
+msgstr "Biztonsági mentés súgója"
 
 #. (itstool) path: info/title
 #: C/index.page:10
 msgctxt "text"
 msgid "Backup Help"
-msgstr ""
+msgstr "Biztonsági mentés súgója"
 
 #. (itstool) path: license/p
 #: C/index.page:16
@@ -1138,6 +1166,8 @@
 "<media type=\"image\" mime=\"image/png\" src=\"figures/deja-dup-icon.png\"/> "
 "Backup Help"
 msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/deja-dup-icon.png\"/> "
+"Biztonsági mentés súgója"
 
 #. (itstool) path: section/title
 #: C/index.page:25

=== modified file 'deja-dup/help/pl/pl.po'
--- deja-dup/help/pl/pl.po	2014-01-24 16:29:23 +0000
+++ deja-dup/help/pl/pl.po	2014-09-20 15:05:16 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-10 18:30-0500\n"
-"PO-Revision-Date: 2013-10-01 02:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-22 12:06+0000\n"
+"Last-Translator: Seweryn Sobieszyński <Unknown>\n"
 "Language-Team: Polish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-11 06:38+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-05-23 09:13+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,12 +24,14 @@
 "Launchpad Contributions:\n"
 "  Antoni Kudelski https://launchpad.net/~antoni-kudelski-deactivatedaccount\n"
 "  Brunon Bierżeniuk https://launchpad.net/~brubek\n"
+"  Cezar https://launchpad.net/~cezarydom\n"
 "  Jerzy Spendel https://launchpad.net/~yuri20\n"
 "  Krzysiek Karolak https://launchpad.net/~krzysiek-karolak1\n"
 "  Mateusz Pogorzelski https://launchpad.net/~pogoma\n"
 "  Michael Terry https://launchpad.net/~mterry\n"
 "  Michał Rzepiński https://launchpad.net/~micou8\n"
 "  Piotr Strębski https://launchpad.net/~strebski\n"
+"  Seweryn Sobieszyński https://launchpad.net/~seweryn-2\n"
 "  Łukasz Jernaś https://launchpad.net/~deejay1\n"
 "  Łukasz Szeremeta https://launchpad.net/~l-szeremeta"
 
@@ -75,7 +77,7 @@
 "this program. If not, see <link "
 "href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</link>."
 msgstr ""
-"Powinieneś posiadać kopię licencji GNU w tym programie. Jeśli nie, <link "
+"Powinieneś znaleźć kopię licencji GNU w tym programie. Jeśli nie, <link "
 "href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</link>."
 
 #. (itstool) path: info/desc
@@ -314,7 +316,7 @@
 #: C/restore-worst-case.page:58
 #, no-wrap
 msgid "CONTAINER"
-msgstr ""
+msgstr "KONTENER"
 
 #. (itstool) path: item/title
 #: C/restore-worst-case.page:61
@@ -417,7 +419,7 @@
 #. (itstool) path: section/title
 #: C/restore-worst-case.page:101
 msgid "Restoring by Hand"
-msgstr ""
+msgstr "Odtwarzanie ręczne"
 
 #. (itstool) path: section/p
 #: C/restore-worst-case.page:103
@@ -492,6 +494,8 @@
 "To recover data from incremental backups, use <_:cmd-1/> to stitch the files "
 "together. See <_:cmd-2/> for usage."
 msgstr ""
+"Aby odtworzyć dane z kopii przyrostowej, użyj <_:cmd-1/> w celu połączenia "
+"plików. Sprawdź <_:cmd-2/> co do wskazówek użycia."
 
 #. (itstool) path: info/desc
 #: C/support.page:8
@@ -537,7 +541,7 @@
 #. (itstool) path: page/title
 #: C/credits.page:11
 msgid "Credits"
-msgstr "Podziękowania"
+msgstr "Twórcy"
 
 #. (itstool) path: section/title
 #: C/credits.page:14
@@ -547,12 +551,12 @@
 #. (itstool) path: section/title
 #: C/credits.page:25
 msgid "Documentation"
-msgstr "Dokumentcja"
+msgstr "Dokumentacja"
 
 #. (itstool) path: section/title
 #: C/credits.page:33
 msgid "Art"
-msgstr "Sztuka"
+msgstr "Oprawa graficzna"
 
 #. (itstool) path: section/title
 #: C/credits.page:43
@@ -567,19 +571,21 @@
 "Launchpad Contributions:\n"
 "  Antoni Kudelski https://launchpad.net/~antoni-kudelski-deactivatedaccount\n"
 "  Brunon Bierżeniuk https://launchpad.net/~brubek\n"
+"  Cezar https://launchpad.net/~cezarydom\n"
 "  Jerzy Spendel https://launchpad.net/~yuri20\n"
 "  Krzysiek Karolak https://launchpad.net/~krzysiek-karolak1\n"
 "  Mateusz Pogorzelski https://launchpad.net/~pogoma\n"
 "  Michael Terry https://launchpad.net/~mterry\n"
 "  Michał Rzepiński https://launchpad.net/~micou8\n"
 "  Piotr Strębski https://launchpad.net/~strebski\n"
+"  Seweryn Sobieszyński https://launchpad.net/~seweryn-2\n"
 "  Łukasz Jernaś https://launchpad.net/~deejay1\n"
 "  Łukasz Szeremeta https://launchpad.net/~l-szeremeta"
 
 #. (itstool) path: info/desc
 #: C/backup-auto.page:6
 msgid "Give yourself peace of mind"
-msgstr "Odpocznij sobie"
+msgstr "Odetchnij"
 
 #. (itstool) path: page/title
 #: C/backup-auto.page:9
@@ -601,7 +607,7 @@
 #: C/backup-first.page:11
 #: C/restore-full.page:20
 msgid "Open your <gui>Backups</gui> settings."
-msgstr ""
+msgstr "Otwórz ustawienia <gui>Kopii zapasowych</gui>"
 
 #. (itstool) path: item/p
 #: C/backup-auto.page:13
@@ -610,15 +616,16 @@
 "Review your <link xref=\"prefs\">backup settings</link>, to confirm they are "
 "what you want."
 msgstr ""
-"Zobacz swoje <link xref=\"prefs\">ustawienia kopii</link>, żeby potwierdzić, "
-"że są takie, jakie chcesz."
+"Sprawdź <link xref=\"prefs\">ustawienia kopii zapasowej</link>, żeby "
+"potwierdzić ich poprawność."
 
 #. (itstool) path: item/p
 #: C/backup-auto.page:14
 msgid ""
 "Turn on the <gui>Automatic backups</gui> option on the <gui>Overview</gui> "
 "page."
-msgstr "Włącz <gui>Automatyczne kopie</gui> w <gui>poglądzie</gui>"
+msgstr ""
+"Włącz <gui>Automatyczne kopie</gui> w zakładce <gui>Podsumowanie</gui>"
 
 #. (itstool) path: note/p
 #: C/backup-auto.page:16
@@ -627,10 +634,10 @@
 "<gui>Keep backups</gui> option on the <gui>Schedule</gui> page. Otherwise, "
 "they may end up consuming a lot of space while you’re not paying attention."
 msgstr ""
-"Rozważ tylko zapisywanie kopii zapasowych przez pewien okres czasu, używając "
-"opcji <gui>Zachowuj kopie zapasowe</gui> w sekcji <gui>Harmonogram</gui>. W "
-"przeciwnym razie, może skończyć się to dużym zużyciem miejsca, kiedy nie "
-"zwracasz na to uwagi."
+"Rozważ zapisywanie kopii zapasowych tylko przez pewien okres czasu, używając "
+"opcji <gui>Zachowaj</gui> w sekcji <gui>Planowanie</gui>. W przeciwnym "
+"razie, może skończyć się to dużym zużyciem miejsca, kiedy nie zwracasz na to "
+"uwagi."
 
 #. (itstool) path: info/desc
 #: C/backup-first.page:6
@@ -640,7 +647,7 @@
 #. (itstool) path: page/title
 #: C/backup-first.page:9
 msgid "Your First Backup"
-msgstr "Twoja pierwsza kopia"
+msgstr "Twoja pierwsza kopia zapasowa"
 
 #. (itstool) path: item/p
 #: C/backup-first.page:13
@@ -656,9 +663,9 @@
 "a remote server. Just let it run in the background while you do something "
 "else."
 msgstr ""
-"Poczekaj. Tworzenie kopii może zabrać dużo czasu, szczególnie jeśli tworzysz "
-"kopię, a potem przesyłasz ją na zdalny serwer. Po prostu pozwól programie "
-"działać w tle, podczas gdy Ty będziesz robił coś innego."
+"Poczekaj. Tworzenie kopii zapasowej może zająć dużo czasu, szczególnie jeśli "
+"tworzysz kopię zapasową, a potem przesyłasz ją na zdalny serwer. Pozwól by "
+"program dział w tle, podczas gdy Ty będziesz robił coś innego."
 
 #. (itstool) path: info/desc
 #: C/restore-revert.page:8
@@ -778,7 +785,9 @@
 #: C/restore-lost.page:17
 #: C/restore-full.page:28
 msgid "Review your selections and click <gui style=\"button\">Restore</gui>."
-msgstr "Przejrzyj swój wybór i kliknij <gui style=\"button\">Przywróć</gui>."
+msgstr ""
+"Upewnij się że wszystko jest w porządku i kliknij <gui "
+"style=\"button\">Przywróć</gui>."
 
 #. (itstool) path: note/p
 #: C/restore-lost.page:19
@@ -802,7 +811,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:13
 msgid "<gui>Automatic backup</gui>"
-msgstr ""
+msgstr "<gui>Automatyczne wykonanie kopii</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:14
@@ -816,7 +825,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:17
 msgid "<gui>Folders to save</gui>"
-msgstr ""
+msgstr "<gui>Katalogi do zapisania</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:18
@@ -830,7 +839,7 @@
 #. (itstool) path: item/title
 #: C/prefs.page:21
 msgid "<gui>Folders to ignore</gui>"
-msgstr "<gui>Foldery do ignorowania</gui>"
+msgstr "<gui>Katalogi do zignorowania</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:22
@@ -846,13 +855,13 @@
 "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 ""
-"Jakieś twoje dane mogą być duże i nie istotne dla ciebie. W takim wypadku "
-"możesz zaoszczędzić trochę miejsca i nie kopiować ich."
+"Niektóre twoje dane mogą być duże i nieistotne. W takim wypadku możesz "
+"zaoszczędzić trochę miejsca i ich nie kopiować."
 
 #. (itstool) path: note/p
 #: C/prefs.page:25
 msgid "Some locations are always ignored by default:"
-msgstr "Niektóre foldery domyślnie nie są kopiowane:"
+msgstr "Niektóre foldery domyślnie są ignorowane:"
 
 #. (itstool) path: p/span
 #: C/prefs.page:33
@@ -870,6 +879,8 @@
 "Use these options to specify the storage location that <app>Déjà Dup</app> "
 "will use when backing up or restoring:"
 msgstr ""
+"Użyj tych opcji aby wybrać lokalizację składowania którą <app>Déjà Dup</app> "
+"użyje podczas tworzenia lub odtwarzania kopii zapasowych:"
 
 #. (itstool) path: item/title
 #: C/prefs.page:48
@@ -891,6 +902,7 @@
 msgid ""
 "These services cost money. Read their rates carefully before using them."
 msgstr ""
+"Te usługi kosztują. Przeczytaj uważnie cennik zanim z nich skorzystasz."
 
 #. (itstool) path: item/title
 #: C/prefs.page:53
@@ -932,6 +944,9 @@
 "You may also want to choose a local folder as a storage location. Note that "
 "backups can be quite large, so make sure you have enough free disk space."
 msgstr ""
+"Możesz chcieć użyć katalogu lokalnego jako lokalizacji składowania kopii "
+"zapasowych. Pamiętaj że kopie zapasowe potrafią być duże, więc upewnij się "
+"że masz wystarczająco dużo miejsca na dysku."
 
 #. (itstool) path: note/p
 #: C/prefs.page:63
@@ -939,13 +954,13 @@
 "This is not recommended, because if your hardware fails, you will lose both "
 "your original data and your backups."
 msgstr ""
-"Jest to zalecane, ponieważ gdy twój sprzęt nawali, stracisz wszystko: kopię "
-"oraz pliki oryginalne."
+"Jest to nie zalecane, ponieważ gdy twój sprzęt nawali, stracisz wszystko: "
+"kopię oraz pliki oryginalne."
 
 #. (itstool) path: item/title
 #: C/prefs.page:68
 msgid "<gui>Keep</gui>"
-msgstr ""
+msgstr "<gui>Zachowaj</gui>"
 
 #. (itstool) path: item/p
 #: C/prefs.page:69
@@ -955,10 +970,10 @@
 "duration. Due to implementation details, files may be kept a bit longer than "
 "the chosen time. But no files will be deleted early."
 msgstr ""
-"Wybierz minimalną ilość czasu zachowania kopii zapasowych plików. Jeśli "
-"stwierdzisz, że pliki kopii zapasowej zajmują dużo miejsca, możesz "
-"zmniejszyć ten czas. Ze względu na szczegóły wykonania, pliki mogą być "
-"przechowywane dłużej niż wybrany czas. Ale pliki nie zostaną usunięte "
+"Wybierz minimalną ilość czasu przechowania kopii zapasowych plików. Jeśli "
+"stwierdzisz, że pliki kopii zapasowych zajmują za dużo miejsca, możesz "
+"zmniejszyć czas przechowywania. Ze względu na działanie programu, pliki mogą "
+"być przechowywane dłużej niż wskazany czas ale nie zostaną usunięte "
 "wcześniej."
 
 #. (itstool) path: note/p
@@ -967,16 +982,19 @@
 "Backups are kept forever by default, but still may be deleted earlier if the "
 "storage location begins to run out of space."
 msgstr ""
+"Domyślnie kopie zapasowe są utrzymywane w nieskończoność lecz mogą być "
+"usunięte wcześniej jeśli zacznie brakować miejsca w lokalizacji ich "
+"składowania."
 
 #. (itstool) path: info/desc
 #: C/contribute.page:8
 msgid "Help make <app>Déjà Dup</app> better"
-msgstr "Pomóż w tworzeniu <app>Déjà Dup</app> coraz lepszym"
+msgstr "Pomóż by program <app>Déjà Dup</app> stał się jeszcze lepszym"
 
 #. (itstool) path: page/title
 #: C/contribute.page:11
 msgid "Getting Involved"
-msgstr "Początki"
+msgstr "Zaangażuj się"
 
 #. (itstool) path: page/p
 #: C/contribute.page:13
@@ -984,7 +1002,7 @@
 "So you want to help make <app>Déjà Dup</app> even better? Excellent! Here "
 "are some suggestions."
 msgstr ""
-"Więc jednak chcesz pomóc w tworzeniu <app>Déjà Dup</app> coraz lepszym? "
+"Więc chcesz sprawić by program <app>Déjà Dup</app> stał się jeszcze lepszym? "
 "Super! Przeczytaj więc kilka sugestii."
 
 #. (itstool) path: section/title
@@ -999,14 +1017,14 @@
 "href=\"https://bugs.launchpad.net/deja-dup/+filebug\">report it as a "
 "bug</link>. Be patient for a reply."
 msgstr ""
-"Widziałeś błąd? Masz jakiś pomysł? Po prostu <link "
-"href=\"https://bugs.launchpad.net/deja-dup/+filebug\">zgłoś buga</link>. "
+"Znalazłeś błąd? Masz jakiś pomysł na nową funkcjonalność? Wejdź na <link "
+"href=\"https://bugs.launchpad.net/deja-dup/+filebug\">i zgłoś buga</link>. "
 "Czekaj cierpliwie na odpowiedź."
 
 #. (itstool) path: section/p
 #: C/contribute.page:20
 msgid "Note that bug reports should be in English only."
-msgstr "Zgłoszenia buga powinno być napisane w języku angielskim."
+msgstr "Zgłoszenia powinno być napisane w języku angielskim."
 
 #. (itstool) path: section/title
 #: C/contribute.page:24
@@ -1069,9 +1087,9 @@
 "This is another great way for non-English speakers to get involved, as you "
 "can answer questions posted in your language."
 msgstr ""
-"To kolejna świetna droga dla osób nie władających angielskim, żeby się "
-"dowiedzieć jak działa ten program, możesz odpowiadać użytkownikom twojej "
-"narodowości w ich języku."
+"To kolejna świetna droga dla osób nie władających językiem angielskim. By "
+"wspomóc nas możesz odpowiadać użytkownikom twojej narodowości w ich języku "
+"na pytania dotyczące programu."
 
 #. (itstool) path: section/title
 #: C/contribute.page:48
@@ -1085,7 +1103,7 @@
 "talk to us on the mailing list as described above."
 msgstr ""
 "Zawsze znajdą się bugi do naprawienia. Jeśli chcesz się czegoś dowiedzieć, "
-"to napisz na naszą listę mailingować opisaną poniżej."
+"to zapisz się na naszą listę mailingową opisaną powyżej."
 
 #. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
@@ -1103,13 +1121,13 @@
 #: C/index.page:9
 msgctxt "link"
 msgid "Backup Help"
-msgstr ""
+msgstr "Pomoc"
 
 #. (itstool) path: info/title
 #: C/index.page:10
 msgctxt "text"
 msgid "Backup Help"
-msgstr ""
+msgstr "Pomoc"
 
 #. (itstool) path: license/p
 #: C/index.page:16
@@ -1146,7 +1164,7 @@
 #. (itstool) path: page/title
 #: C/restore-full.page:9
 msgid "Full System Restore"
-msgstr "Przywracanie pełnego systemu"
+msgstr "Przywracanie całego systemu"
 
 #. (itstool) path: section/title
 #: C/restore-full.page:11
@@ -1188,7 +1206,8 @@
 "Click on the <gui style=\"button\">Restore…</gui> button on the "
 "<gui>Overview</gui> page."
 msgstr ""
-"Kliknij na <gui style=\"button\">Przywróć...</gui> w <gui>Podgląd</gui>"
+"Kliknij na <gui style=\"button\">Przywróć...</gui> w zakładce "
+"<gui>Podsumowanie</gui>"
 
 #. (itstool) path: item/p
 #: C/restore-full.page:22
@@ -1196,8 +1215,8 @@
 "A <gui>Restore</gui> dialog will appear asking where your backup files are "
 "stored (your <gui>Backup location</gui>)."
 msgstr ""
-"<gui>Przywróć</gui> pojawi się okno z zapytaniem gdzie są przechowywane "
-"pliki kopii zapasowe (Twoja <gui>Lokalizacja kopii</gui>)."
+"Pojawi się okno <gui>Przywróć</gui> z prośbą wskazania miejsca  "
+"przechowywania plików kopii zapasowej (Twoja <gui>Lokalizacja kopii</gui>)."
 
 #. (itstool) path: item/p
 #: C/restore-full.page:23
@@ -1214,9 +1233,9 @@
 "Choose the date you want to restore from. Usually you can just leave this "
 "alone, as the default is the most recent backup."
 msgstr ""
-"Wybierz datę kiedy została wykonana kopia zapasowa aby przywrócić. Zazwyczaj "
-"można po prostu zostawić to w spokoju, domyślnie będzie to najnowsza kopia "
-"zapasowa."
+"Wybierz datę kiedy została wykonania ostatniej kopii zapasowej aby ją "
+"przywrócić. Zazwyczaj można po prostu zostawić tą opcję w spokoju, domyślnie "
+"będzie to najnowsza kopia zapasowa."
 
 #. (itstool) path: item/p
 #: C/restore-full.page:26
@@ -1237,8 +1256,8 @@
 msgid ""
 "Finally, reinstall any programs that you enjoyed in your previous install."
 msgstr ""
-"Wreszcie, teraz należy ponownie zainstalować wszystkie programy, którymi "
-"cieszyłeś się w poprzedniej instalacji."
+"Na koniec należy ponownie zainstalować wszystkie programy, którymi cieszyłeś "
+"się w poprzedniej instalacji."
 
 #. (itstool) path: note/p
 #: C/restore-full.page:32
@@ -1260,43 +1279,67 @@
 "drastic things</link> you can try."
 msgstr ""
 "Jeśli to nadal nie działa, istnieją <link xref=\"restore-worst-case\"> "
-"bardziej drastyczne rzecze </link> które można spróbować."
+"bardziej drastyczne kroki </link> których można spróbować."
 
 #~ msgid "Open your <gui>Backup</gui> settings."
 #~ msgstr "Otwórz twoje ustawienia <gui>kopii</gui>."
 
+#~ msgid "<gui>Automatic backups</gui>"
+#~ msgstr "Automatyczne tworzenie kopii zapasowej"
+
+#~ msgid ""
+#~ "Choose a list of folders to not back up. Press the <gui "
+#~ "style=\"button\">Add</gui> or <gui style=\"button\">Remove</gui> buttons to "
+#~ "modify the list."
+#~ msgstr ""
+#~ "Wybierz listę folderów, które nie będą w kopii zapasowej. Naciśnij przycisk "
+#~ "<gui style=\"button\"> Dodaj </gui> lub <gui style=\"button\"> Usuń </gui> "
+#~ "aby modyfikować listę."
+
 #~ msgid ""
 #~ "Click on the <gui style=\"button\">Back Up Now</gui> button on the "
 #~ "<gui>Overview</gui> page."
 #~ msgstr ""
-#~ "Kliknij <gui style=\"button\">Twórz Kopię Teraz</gui> w <gui>Poglądzie</gui>."
-
-#~ msgid "<gui>Automatic backups</gui>"
-#~ msgstr "Automatyczne tworzenie kopii zapasowej"
+#~ "Kliknij <gui style=\"button\">Utwórz kopię zapasową...</gui> w zakładce "
+#~ "<gui>Podsumowanie</gui>."
 
 #~ msgid "<gui>Backup location</gui>"
-#~ msgstr "<gui>Miejsce kopii zapasowych</gui>"
+#~ msgstr "<gui>Miejsce przechowywania</gui>"
+
+#~ msgid ""
+#~ "The first few backup locations are cloud storage services provided by "
+#~ "various companies. For a small fee, they hold your data for you. A cloud "
+#~ "service like this is recommended 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)."
+#~ msgstr ""
+#~ "Kilka pierwszych pozycji do tworzenia kopii zapasowych to serwisy "
+#~ "pozwalające na przechowywanie plików w chmurze, są to usługi świadczone "
+#~ "przez różne firmy. Za niewielką opłatą mogą przechowywać twoje pliki. "
+#~ "Przechowywanie danych w chmurze jest zalecane, ponieważ masz do nich łatwy "
+#~ "dostęp z każdego miejsca (np. jeśli jesteś poza domem: w przypadku awarii "
+#~ "lub kradzieży twoje dane wciąż pozostają bezpieczne)."
 
 #~ msgid ""
 #~ "Use these options to specify the backup location that <app>Déjà Dup</app> "
 #~ "will use when backing up or restoring:"
 #~ msgstr ""
-#~ "Użyj tych opcji do wskazania miejsca kopii, które <app>Déjà Dup</app> "
-#~ "wykorzysta podczas jej tworzenia:"
+#~ "Użyj tych opcji do wskazania miejsca tworzenia kopii zapasowych w programie "
+#~ "<app>Déjà Dup</app>:"
 
 #~ msgid "<gui>Keep backups</gui>"
-#~ msgstr "<gui>Kontynuuj</gui>"
+#~ msgstr "<gui>Przechowywanie kopii zapasowej</gui>"
 
 #~ 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."
 #~ msgstr ""
-#~ "Możesz także chcieć wybrać folder do tworzenia kopii. Pamiętaj, że pliki "
-#~ "mogą być całkiem sporych rozmiariów, więc upewnij się, że masz odpowiednią "
-#~ "ilośc miejsca na dysku."
+#~ "Możesz także wybrać katalog lokalny do tworzenia kopii zapasowej. Pamiętaj, "
+#~ "że pliki mogą być całkiem sporych rozmiarów, więc upewnij się, że masz "
+#~ "odpowiednią ilość miejsca na dysku."
 
 #~ msgid "<gui>Folders to back up</gui>"
-#~ msgstr "<gui>Foldery do skopiowania</gui>"
+#~ msgstr "Katalogi do skopiowania"
 
 #~ msgid ""
 #~ "Choose a list of folders to back up. Press the <gui "
@@ -1304,7 +1347,7 @@
 #~ "modify the list. If you are only interested in backing up your own data, the "
 #~ "default of <gui>Home</gui> is sufficient."
 #~ msgstr ""
-#~ "Wybirz listę folderów do skopiowania. Wybierz <gui "
+#~ "Wybierz listę katalogów do skopiowania. Wybierz <gui "
 #~ "style=\"button\">Dodaj</gui>, albo <gui style=\"button\">Usuń</gui>, żeby "
 #~ "zmodyfikować listę. Jeśli chcesz kopiować tylko pliki z ~/home, to "
 #~ "powinieneś wybrać <gui>Domowe</gui>."
@@ -1313,27 +1356,5 @@
 #~ "Backups are kept forever by default, but still may be deleted earlier if the "
 #~ "backup location begins to run out of space."
 #~ msgstr ""
-#~ "Kopie zapasowe są zatrzymywane na zawsze, ale zawsze mogą być usunięte "
-#~ "wcześniej jak tylko się okaże, że masz za mało miejsca."
-
-#~ msgid ""
-#~ "Choose a list of folders to not back up. Press the <gui "
-#~ "style=\"button\">Add</gui> or <gui style=\"button\">Remove</gui> buttons to "
-#~ "modify the list."
-#~ msgstr ""
-#~ "Wybierz listę folderów, które nie będą w kopii zapasowej. Naciśnij przycisk "
-#~ "<gui style=\"button\"> Dodaj </gui> lub <gui style=\"button\"> Usuń </gui> "
-#~ "aby modyfikować listę."
-
-#~ msgid ""
-#~ "The first few backup locations are cloud storage services provided by "
-#~ "various companies. For a small fee, they hold your data for you. A cloud "
-#~ "service like this is recommended 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)."
-#~ msgstr ""
-#~ "Pierwszymi lokalizacjami twoich kopii zapasowej są serwisy plików w chmurze, "
-#~ "świadczone przez różne firmy. Za małą opłatą mogą przechowywać twoje pliki. "
-#~ "Przechowywanie danych w chmurze jest zalecane, ponieważ masz dostęp do nich "
-#~ "w łatwy sposób, w każdym miejscu (np. jeśli jesteś poza domem: w przypadku "
-#~ "awarii lub kradzieży twoje dane wciąż pozostają bezpieczne)."
+#~ "Domyślnie kopie zapasowe są przechowywane bezterminowo ale zawsze mogą być "
+#~ "usunięte wcześniej jak tylko okaże się, że masz za mało miejsca."

=== modified file 'deja-dup/help/pt_BR/pt_BR.po'
--- deja-dup/help/pt_BR/pt_BR.po	2014-01-24 16:29:23 +0000
+++ deja-dup/help/pt_BR/pt_BR.po	2014-09-20 15:05:16 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-10 18:30-0500\n"
-"PO-Revision-Date: 2013-10-01 02:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-07-19 02:36+0000\n"
+"Last-Translator: Salomão Carneiro de Brito <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-11 06:39+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-07-20 06:18+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -35,6 +35,7 @@
 "  Michael Terry https://launchpad.net/~mterry\n"
 "  Rafael Neri https://launchpad.net/~rafepel\n"
 "  Rudinei Weschenfelder https://launchpad.net/~rudineiw\n"
+"  Salomão Carneiro de Brito https://launchpad.net/~salomaocar\n"
 "  Tiago Hillebrandt https://launchpad.net/~tiagohillebrandt\n"
 "  gabriell nascimento https://launchpad.net/~gabriellhrn\n"
 "  pm https://launchpad.net/~pmtrbr\n"
@@ -617,6 +618,7 @@
 "  Michael Terry https://launchpad.net/~mterry\n"
 "  Rafael Neri https://launchpad.net/~rafepel\n"
 "  Rudinei Weschenfelder https://launchpad.net/~rudineiw\n"
+"  Salomão Carneiro de Brito https://launchpad.net/~salomaocar\n"
 "  Tiago Hillebrandt https://launchpad.net/~tiagohillebrandt\n"
 "  gabriell nascimento https://launchpad.net/~gabriellhrn\n"
 "  pm https://launchpad.net/~pmtrbr\n"
@@ -907,7 +909,7 @@
 #. (itstool) path: p/span
 #: C/prefs.page:33
 msgid "(which by default also ignores <_:file-1/>)"
-msgstr ""
+msgstr "(por padrão também ignora <_:file-1/>)"
 
 #. (itstool) path: item/title
 #: C/prefs.page:44

=== modified file 'deja-dup/monitor/monitor.vala'
--- deja-dup/monitor/monitor.vala	2013-10-10 05:55:33 +0000
+++ deja-dup/monitor/monitor.vala	2014-09-20 15:05:16 +0000
@@ -143,7 +143,9 @@
     return;
   }
 
-  if (!reactive_check) {
+  bool was_reactive = reactive_check;
+
+  if (!was_reactive) {
     // Now we secretly schedule another kickoff tomorrow, in case something
     // goes wrong with this run (or user chooses to ignore for now)
     // If this run is successful, it will change 'last-run' key and this will
@@ -155,7 +157,7 @@
   bool ready = yield is_ready(out when);
   if (!ready) {
     debug("Postponing the backup.");
-    if (!reactive_check && when != null)
+    if (!was_reactive && when != null)
       notify_delay(_("Scheduled backup delayed"), when);
     return;
   }
@@ -233,8 +235,10 @@
 static void prepare_run(TimeSpan wait_time)
 {
   // Stop previous run timeout
-  if (timeout_id != 0)
+  if (timeout_id != 0) {
     Source.remove(timeout_id);
+    timeout_id = 0;
+  }
 
   TimeSpan secs = wait_time / TimeSpan.SECOND + 1;
   if (wait_time > 0 && secs > 0) {

=== modified file 'deja-dup/tests/CMakeLists.txt'
--- deja-dup/tests/CMakeLists.txt	2014-01-24 15:15:33 +0000
+++ deja-dup/tests/CMakeLists.txt	2014-09-20 15:05:16 +0000
@@ -28,9 +28,9 @@
 endif()
 
 add_custom_target(autopilot-deja-dup
-                  COMMAND env HAS_CCPANEL=${HAS_CCPANEL} HAS_UNITY_CCPANEL=${HAS_UNITY_CCPANEL} LANG=C DEJA_DUP_TESTING=1 PYTHONDONTWRITEBYTECODE=1 PYTHONPATH="${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/tests/shell" autopilot-py3 run deja_dup_autopilot)
+                  COMMAND env HAS_CCPANEL=${HAS_CCPANEL} HAS_UNITY_CCPANEL=${HAS_UNITY_CCPANEL} LANG=C DEJA_DUP_TESTING=1 PYTHONDONTWRITEBYTECODE=1 PYTHONPATH="${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/tests/shell" autopilot-sandbox-run deja_dup_autopilot)
 add_dependencies(autopilot autopilot-deja-dup)
 
 add_custom_target(autopilot-system-deja-dup
-                  COMMAND env HAS_CCPANEL=${HAS_CCPANEL} HAS_UNITY_CCPANEL=${HAS_UNITY_CCPANEL} LANG=C DEJA_DUP_TESTING=1 PYTHONDONTWRITEBYTECODE=1 PYTHONPATH="${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/tests/shell-system" autopilot-py3 run deja_dup_autopilot)
+                  COMMAND env HAS_CCPANEL=${HAS_CCPANEL} HAS_UNITY_CCPANEL=${HAS_UNITY_CCPANEL} LANG=C DEJA_DUP_TESTING=1 PYTHONDONTWRITEBYTECODE=1 PYTHONPATH="${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/tests/shell-system" autopilot-sandbox-run deja_dup_autopilot)
 add_dependencies(autopilot-system autopilot-system-deja-dup)

=== modified file 'deja-dup/widgets/CMakeLists.txt'
--- deja-dup/widgets/CMakeLists.txt	2014-04-02 18:29:44 +0000
+++ deja-dup/widgets/CMakeLists.txt	2014-09-20 15:05:16 +0000
@@ -31,6 +31,7 @@
                        ConfigLocationDAV.vala
                        ConfigLocationFile.vala
                        ConfigLocationFTP.vala
+                       ConfigLocationGDrive.vala
                        ConfigLocationRackspace.vala
                        ConfigLocationS3.vala
                        ConfigLocationSSH.vala

=== modified file 'deja-dup/widgets/ConfigLabelLocation.vala'
--- deja-dup/widgets/ConfigLabelLocation.vala	2014-04-02 14:51:45 +0000
+++ deja-dup/widgets/ConfigLabelLocation.vala	2014-09-20 15:05:16 +0000
@@ -25,6 +25,7 @@
 {
   Gtk.Image img;
   FilteredSettings file_root;
+  FilteredSettings gdrive_root;
   FilteredSettings s3_root;
   FilteredSettings rackspace_root;
 
@@ -38,6 +39,7 @@
     fill_box();
     watch_key(BACKEND_KEY);
     watch_key(null, (file_root = DejaDup.get_settings(FILE_ROOT)));
+    watch_key(null, (gdrive_root = DejaDup.get_settings(GDRIVE_ROOT)));
     watch_key(null, (s3_root = DejaDup.get_settings(S3_ROOT)));
     watch_key(null, (rackspace_root = DejaDup.get_settings(RACKSPACE_ROOT)));
     set_from_config.begin();

=== modified file 'deja-dup/widgets/ConfigLocation.vala'
--- deja-dup/widgets/ConfigLocation.vala	2014-04-02 18:29:44 +0000
+++ deja-dup/widgets/ConfigLocation.vala	2014-09-20 15:05:16 +0000
@@ -61,6 +61,7 @@
   int index_ftp;
   int index_dav;
   int index_s3 = -2;
+  int index_gdrive = -2;
   int index_rackspace = -2;
   int index_u1 = -2;
   int index_cloud_sep = -2;
@@ -111,6 +112,7 @@
     // Insert cloud providers
     insert_u1();
     insert_s3();
+    insert_gdrive();
     insert_rackspace();
 
     // Now insert remote servers
@@ -178,6 +180,14 @@
                               ref index_s3, insert_s3);
   }
 
+  void insert_gdrive() {
+    insert_cloud_if_available("gdrive", BackendGDrive.get_checker(),
+                              new ThemedIcon("deja-dup-cloud"),
+                              _("Google Drive"),
+                              new ConfigLocationGDrive(label_sizes),
+                              ref index_gdrive, insert_gdrive);
+  }
+
   void insert_u1() {
     // No longer functional.
     // Only shown if user already had it configured, for migration purposes.
@@ -414,6 +424,8 @@
     var backend = Backend.get_default_type();
     if (backend == "s3")
       index = index_s3;
+    else if (backend == "gdrive")
+      index = index_gdrive;
     else if (backend == "rackspace")
       index = index_rackspace;
     else if (backend == "u1")
@@ -504,6 +516,8 @@
 
     if (index == index_s3)
       settings.set_string(BACKEND_KEY, "s3");
+    else if (index == index_gdrive)
+      settings.set_string(BACKEND_KEY, "gdrive");
     else if (index == index_rackspace)
       settings.set_string(BACKEND_KEY, "rackspace");
     else if (index == index_u1)

=== added file 'deja-dup/widgets/ConfigLocationGDrive.vala'
--- deja-dup/widgets/ConfigLocationGDrive.vala	1970-01-01 00:00:00 +0000
+++ deja-dup/widgets/ConfigLocationGDrive.vala	2014-09-20 15:05:16 +0000
@@ -0,0 +1,39 @@
+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
+/*
+    This file is part of Déjà Dup.
+    For copyright information, see AUTHORS.
+
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Déjà Dup 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.
+
+    You should have received a copy of the GNU General Public License
+    along with Déjà Dup.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using GLib;
+
+namespace DejaDup {
+
+public class ConfigLocationGDrive : ConfigLocationTable
+{
+  public ConfigLocationGDrive(Gtk.SizeGroup sg) {
+    Object(label_sizes: sg);
+  }
+
+  construct {
+    add_widget(_("_Email address"),
+               new ConfigEntry(DejaDup.GDRIVE_EMAIL, DejaDup.GDRIVE_ROOT));
+    add_widget(_("_Folder"),
+               new ConfigFolder(DejaDup.GDRIVE_FOLDER, DejaDup.GDRIVE_ROOT));
+  }
+}
+
+}
+

=== modified file 'libdeja/Backend.vala'
--- libdeja/Backend.vala	2014-04-02 18:29:44 +0000
+++ libdeja/Backend.vala	2014-09-20 15:05:16 +0000
@@ -57,6 +57,7 @@
 
     if (backend != "auto" &&
         backend != "s3" &&
+        backend != "gdrive" &&
         backend != "rackspace" &&
         backend != "u1" &&
         backend != "file")
@@ -70,6 +71,8 @@
     var backend_name = get_default_type();
     if (backend_name == "s3")
       return new BackendS3();
+    else if (backend_name == "gdrive")
+      return new BackendGDrive();
     else if (backend_name == "u1")
       return new BackendU1();
     else if (backend_name == "rackspace")

=== modified file 'libdeja/BackendAuto.vala'
--- libdeja/BackendAuto.vala	2014-04-02 18:29:44 +0000
+++ libdeja/BackendAuto.vala	2014-09-20 15:05:16 +0000
@@ -50,6 +50,7 @@
 
   static bool started = false;
   static bool done = false;
+  Checker gdrive_checker;
   Checker s3checker;
   construct {
     if (!started) {
@@ -58,7 +59,10 @@
       started = true;
       ref(); // Give us time to finish
 
-      // List is (in order): s3, file
+      // List is (in order): gdrive, s3, file
+      gdrive_checker = BackendGDrive.get_checker();
+      gdrive_checker.notify["complete"].connect(examine_checkers);
+
       s3checker = BackendS3.get_checker();
       s3checker.notify["complete"].connect(examine_checkers);
 
@@ -71,11 +75,15 @@
     if (done)
       return;
 
-    if (s3checker.complete) {
-      if (s3checker.available)
-        finish("s3");
-      else
-        finish("file");
+    if (gdrive_checker.complete) {
+      if (gdrive_checker.available)
+        finish("gdrive");
+      else if (s3checker.complete) {
+        if (s3checker.available)
+          finish("s3");
+        else
+          finish("file");
+      }
     }
   }
 

=== modified file 'libdeja/BackendFile.vala'
--- libdeja/BackendFile.vala	2012-10-28 22:35:44 +0000
+++ libdeja/BackendFile.vala	2014-09-20 15:05:16 +0000
@@ -476,7 +476,7 @@
           var free_list = free_str.split(";");
           space = uint64.parse(free_list[0]);
           if (free_list[1] != null)
-            Environment.set_variable("DEJA_DUP_TEST_SPACE_FREE", string.joinv(";", free_list[1:-1]), true);
+            Environment.set_variable("DEJA_DUP_TEST_SPACE_FREE", string.joinv(";", free_list[1:free_list.length]), true);
       }
       if (space == INFINITE_SPACE)
         return space - 1; // avoid accidentally reporting infinite

=== added file 'libdeja/BackendGDrive.vala'
--- libdeja/BackendGDrive.vala	1970-01-01 00:00:00 +0000
+++ libdeja/BackendGDrive.vala	2014-09-20 15:05:16 +0000
@@ -0,0 +1,179 @@
+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
+/*
+    This file is part of Déjà Dup.
+    For copyright information, see AUTHORS.
+
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Déjà Dup 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.
+
+    You should have received a copy of the GNU General Public License
+    along with Déjà Dup.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using GLib;
+
+namespace DejaDup {
+
+public const string GDRIVE_ROOT = "GDrive";
+public const string GDRIVE_EMAIL = "email";
+public const string GDRIVE_FOLDER = "folder";
+
+const string GDRIVE_HOST = "drive.google.com";
+
+public class BackendGDrive : Backend
+
+{
+  public static Checker get_checker() {
+    //return PythonChecker.get_checker("gdata");
+    return new Checker.with_available(false); // disable until duplicity's gdrive backend improves
+  }
+
+  public override Backend clone() {
+    return new BackendGDrive();
+  }
+
+  public override bool is_native() {
+    return false;
+  }
+
+  public override Icon? get_icon() {
+    return new ThemedIcon("deja-dup-cloud");
+  }
+
+  public override async bool is_ready(out string when) {
+    when = _("Backup will begin when a network connection becomes available.");
+    return yield Network.get().can_reach ("https://%s/".printf(GDRIVE_HOST));
+  }
+
+  /**
+   * duplicity syntax:
+   * gdocs://user[:password]@host/folder
+   */
+  public override string get_location(ref bool as_root)
+  {
+    var settings = get_settings(GDRIVE_ROOT);
+    string folder = settings.get_string(GDRIVE_FOLDER);
+    // TODO duplicity: gdocsbackend does not handle folder nice
+    folder = folder.strip();
+    folder = folder.replace("//", "/");
+    while (folder.has_prefix ("/")) {
+      folder = folder.substring(1, folder.length-1);
+    }
+    while (folder.has_suffix ("/")) {
+      folder = folder.substring(0, folder.length-1);
+    }
+    string email = settings.get_string(GDRIVE_EMAIL);
+    if (!email.contains("@"))
+      email += "@gmail.com";
+    string location = "gdocs://%s/%s".printf(email, folder);
+    return location;
+  }
+
+  public override string get_location_pretty()
+  {
+    var settings = get_settings(GDRIVE_ROOT);
+    // Translators: %s is a folder.
+    return _("%s at Google Drive").printf(settings.get_string(GDRIVE_FOLDER));
+  }
+
+  string settings_id;
+  string id;
+  string secret_key;
+  public override async void get_envp() throws Error
+  {
+    var settings = get_settings(GDRIVE_ROOT);
+    settings_id = settings.get_string(GDRIVE_EMAIL);
+    id = settings_id == null ? "" : settings_id;
+
+    if (id != "" && secret_key != null) {
+      // We've already been run before and got the key
+      got_secret_key();
+      return;
+    }
+
+    if (id != "") {
+      // First, try user's keyring
+      try {
+        secret_key = yield Secret.password_lookup(Secret.SCHEMA_COMPAT_NETWORK,
+                                                  null, 
+                                                  "user", id,
+                                                  "server", GDRIVE_HOST,
+                                                  "protocol", "https");
+        if (secret_key != null) {
+          got_secret_key();
+          return;
+        }
+      }
+      catch (Error e) {
+        // fall through to ask_password below
+      }
+    }
+
+    // Didn't find it, so ask user
+    ask_password();
+  }
+
+  async void got_password_reply(MountOperation mount_op, MountOperationResult result)
+  {
+    if (result != MountOperationResult.HANDLED) {
+      envp_ready(false, new List<string>(), _("Permission denied"));
+      return;
+    }
+
+    id = mount_op.username;
+    secret_key = mount_op.password;
+
+    // Save it
+    var remember = mount_op.password_save;
+    if (remember != PasswordSave.NEVER) {
+      string where = (remember == PasswordSave.FOR_SESSION) ?
+                     Secret.COLLECTION_SESSION : Secret.COLLECTION_DEFAULT;
+      try {
+        yield Secret.password_store(Secret.SCHEMA_COMPAT_NETWORK,
+                                    where,
+                                    "%s@%s".printf(id, GDRIVE_HOST),
+                                    secret_key,
+                                    null,
+                                    "user", id,
+                                    "server", GDRIVE_HOST,
+                                    "protocol", "https");
+      }
+      catch (Error e) {
+        warning("%s\n", e.message);
+      }
+    }
+    
+    got_secret_key();
+  }
+
+  void ask_password() {
+    mount_op.set("label_help", _("You can sign up for a Google account <a href=\"%s\">online</a>.").printf("https://accounts.google.com/SignUp"));
+    mount_op.set("label_title", _("Connect to Google Drive"));
+    mount_op.set("label_username", _("_Email"));
+    mount_op.set("label_password", _("_Password"));
+    mount_op.reply.connect(got_password_reply);
+    mount_op.ask_password("", id, "",
+                          AskPasswordFlags.NEED_PASSWORD |
+                          AskPasswordFlags.NEED_USERNAME |
+                          AskPasswordFlags.SAVING_SUPPORTED);
+  }
+
+  void got_secret_key() {
+    var settings = get_settings(GDRIVE_ROOT);
+    if (id != settings_id)
+      settings.set_string(GDRIVE_EMAIL, id);
+
+    List<string> envp = new List<string>();
+    envp.append("FTP_PASSWORD=%s".printf(secret_key));
+    envp_ready(true, envp);
+  }
+}
+
+} // end namespace

=== modified file 'libdeja/CMakeLists.txt'
--- libdeja/CMakeLists.txt	2014-04-02 18:29:44 +0000
+++ libdeja/CMakeLists.txt	2014-09-20 15:05:16 +0000
@@ -20,6 +20,7 @@
                        Backend.vala
                        BackendAuto.vala
                        BackendFile.vala
+                       BackendGDrive.vala
                        BackendRackspace.vala
                        BackendS3.vala
                        BackendU1.vala

=== modified file 'libdeja/Checker.vala'
--- libdeja/Checker.vala	2011-06-28 15:48:17 +0000
+++ libdeja/Checker.vala	2014-09-20 15:05:16 +0000
@@ -29,6 +29,16 @@
   // Guaranteed to only switch from false to true, never back again
   public bool available {get; protected set; default = false;}
   public bool complete {get; protected set; default = false;}
+
+  public Checker()
+  {
+    Object();
+  }
+
+  public Checker.with_available(bool available)
+  {
+    Object(available: available, complete: true);
+  }
 }
 
 } // end namespace

=== modified file 'libdeja/FilteredSettings.vala'
--- libdeja/FilteredSettings.vala	2013-01-27 21:50:59 +0000
+++ libdeja/FilteredSettings.vala	2014-09-20 15:05:16 +0000
@@ -37,7 +37,7 @@
 
   public FilteredSettings(string schema, bool ro)
   {
-    Object(schema: schema, read_only: ro);
+    Object(schema_id: schema, read_only: ro);
   }
 
   public new void apply() {if (!read_only) base.apply();}

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-10-27 16:41:23 +0000
+++ po/POTFILES.in	2014-09-20 15:05:16 +0000
@@ -38,6 +38,7 @@
 deja-dup/widgets/ConfigLocationDAV.vala
 deja-dup/widgets/ConfigLocationFTP.vala
 deja-dup/widgets/ConfigLocationFile.vala
+deja-dup/widgets/ConfigLocationGDrive.vala
 deja-dup/widgets/ConfigLocationRackspace.vala
 deja-dup/widgets/ConfigLocationS3.vala
 deja-dup/widgets/ConfigLocationSMB.vala
@@ -54,6 +55,7 @@
 libdeja/AsyncCommand.vala
 libdeja/BackendAuto.vala
 libdeja/BackendFile.vala
+libdeja/BackendGDrive.vala
 libdeja/BackendRackspace.vala
 libdeja/BackendS3.vala
 libdeja/BackendU1.vala

=== added file 'po/az.po'
--- po/az.po	1970-01-01 00:00:00 +0000
+++ po/az.po	2014-09-20 15:05:16 +0000
@@ -0,0 +1,1483 @@
+# Azerbaijani translation for deja-dup
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the deja-dup package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: deja-dup\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-10 18:29-0500\n"
+"PO-Revision-Date: 2014-07-11 10:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Azerbaijani <[e-mail]>\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: 2014-07-12 06:59+0000\n"
+"X-Generator: Launchpad (build 17111)\n"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:1
+#: ../deja-dup/preferences/Preferences.vala:191
+msgid "Folders to save"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:2
+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."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:3
+#: ../deja-dup/preferences/Preferences.vala:202
+msgid "Folders to ignore"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:4
+msgid ""
+"This list of directories will not 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 ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:5
+msgid "Whether to request the root password"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:6
+msgid ""
+"Whether to request the root password when backing up from or restoring to "
+"system folders."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:7
+msgid "The last time Déjà Dup was run"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:8
+msgid ""
+"The last time Déjà Dup was successfully run. This time should be in ISO 8601 "
+"format."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:9
+msgid "The last time Déjà Dup backed up"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:10
+msgid ""
+"The last time Déjà Dup successfully completed a backup. This time should be "
+"in ISO 8601 format."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:11
+msgid "The last time Déjà Dup restored"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:12
+msgid ""
+"The last time Déjà Dup successfully completed a restore. This time should be "
+"in ISO 8601 format."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:13
+msgid "Whether to periodically back up"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:14
+msgid "Whether to automatically back up on a regular schedule."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:15
+msgid "How often to periodically back up"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:16
+msgid "The number of days between backups."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:17
+msgid ""
+"The last time Déjà Dup checked whether it should prompt about backing up"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:18
+msgid ""
+"When a user logs in, the Déjà Dup monitor checks whether it should prompt "
+"about backing up. This is used to increase discoverability for users that "
+"don’t know about backups. This time should be either ‘disabled’ to turn off "
+"this check or in ISO 8601 format."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:19
+msgid ""
+"The last time Déjà Dup checked whether it should prompt about your password"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:20
+msgid ""
+"In order to prevent you from forgetting your passwords, Déjà Dup will "
+"occasionally notify you to confirm the password. This time should be either "
+"‘disabled’ to turn off this check or in ISO 8601 format."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:21
+msgid "How long to keep backup files"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:22
+msgid ""
+"The number of days to keep backup files on the backup location. A value of 0 "
+"means forever. This is a minimum number of days; the files may be kept "
+"longer."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:23
+msgid "How long to wait between full backups"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:24
+msgid ""
+"Déjà Dup needs to occasionally make fresh full backups. This is the number "
+"of days to wait between full backups."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:25
+msgid "Type of location to store backup"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:26
+msgid ""
+"The type of backup location. If ‘auto’, a default will be chosen based on "
+"what is available."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:27
+msgid "Amazon S3 Access Key ID"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:28
+msgid "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:29
+msgid "The Amazon S3 bucket name to use"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:30
+msgid ""
+"Which Amazon S3 bucket to store files in. This does not need to exist "
+"already. Only legal hostname strings are valid."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:31
+msgid "The Amazon S3 folder"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:32
+msgid ""
+"An optional folder name to store files in. This folder will be created in "
+"the chosen bucket."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:33
+msgid "The Rackspace Cloud Files container"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:34
+msgid ""
+"Which Rackspace Cloud Files container to store files in. This does not need "
+"to exist already. Only legal hostname strings are valid."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:35
+msgid "Your Rackspace username"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:36
+msgid "This is your username for the Rackspace Cloud Files service."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
+msgid "The Ubuntu One folder"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
+msgid ""
+"The folder name to store files in. If ‘$HOSTNAME’, it will default to a "
+"folder based on the name of the computer."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:37
+#: ../deja-dup/AssistantRestore.vala:221
+msgid "Backup location"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
+msgid "Location in which to hold the backup files."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
+msgid "Folder type"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:40
+msgid ""
+"Whether the backup location is a mounted external volume or a normal folder."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:41
+msgid "Relative path under the external volume"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:42
+msgid ""
+"If the backup location is on an external volume, this is the path of the "
+"folder on that volume."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:43
+msgid "Unique ID of the external volume"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:44
+msgid ""
+"If the backup location is on an external volume, this is its unique "
+"filesystem identifier."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:45
+msgid "Full name of the external volume"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:46
+msgid ""
+"If the backup location is on an external volume, this is the volume’s longer "
+"descriptive name."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:47
+msgid "Short name of the external volume"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:48
+msgid ""
+"If the backup location is on an external volume, this is the volume’s "
+"shorter name."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:49
+msgid "Icon of the external volume"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:50
+msgid ""
+"If the backup location is on an external volume, this is the volume’s icon."
+msgstr ""
+
+#. Translators: The name is a play on the French phrase "déjà vu" meaning
+#. "already seen", but with the "vu" replaced with "dup".  "Dup" in this
+#. context is itself a reference to both the underlying command line tool
+#. "duplicity" and the act of duplicating data for backup.  As a whole, the
+#. phrase "Déjà Dup" may not be very translatable.
+#: ../deja-dup/deja-dup.appdata.xml.in.h:1 ../deja-dup/deja-dup.desktop.in.h:2
+#: ../deja-dup/main.vala:78 ../libdeja/CommonUtils.vala:133
+msgid "Déjà Dup Backup Tool"
+msgstr ""
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:2
+msgid ""
+"Déjà Dup is a simple backup tool. It hides the complexity of backing up the "
+"Right Way (encrypted, off-site, and regular) and uses duplicity as the "
+"backend."
+msgstr ""
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:3
+msgid ""
+"Support for local, remote, or cloud backup locations, such as Amazon S3, "
+"Rackspace Cloud Files, and Ubuntu One"
+msgstr ""
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:4
+msgid "Securely encrypts and compresses your data"
+msgstr ""
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:5
+msgid ""
+"Incrementally backs up, letting you restore from any particular backup"
+msgstr ""
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:6
+msgid "Schedules regular backups"
+msgstr ""
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:7
+msgid "Integrates well into your GNOME desktop"
+msgstr ""
+
+#. Translators: "Backups" is a noun
+#: ../deja-dup/deja-dup.desktop.in.h:1
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:1
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:1
+#: ../deja-dup/Prompt.vala:93 ../deja-dup/Prompt.vala:128
+#: ../deja-dup/StatusIcon.vala:133 ../deja-dup/StatusIcon.vala:232
+#: ../deja-dup/monitor/monitor.vala:115
+#: ../deja-dup/preferences/preferences-main.vala:43
+#: ../deja-dup/preferences/preferences-main.vala:123
+msgid "Backups"
+msgstr ""
+
+#. Translators: Monitor in this sense means something akin to 'watcher', not
+#. a computer screen.  This program acts like a daemon that kicks off
+#. backups at scheduled times.
+#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:1
+#: ../deja-dup/monitor/monitor.vala:328
+msgid "Backup Monitor"
+msgstr ""
+
+#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:2
+msgid "Schedules backups at regular intervals"
+msgstr ""
+
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:2
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:2
+msgid "Change your backup settings"
+msgstr ""
+
+#. These keywords are used when searching for applications in dashes, etc.
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:4
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:4
+msgid "déjà;deja;dup;"
+msgstr ""
+
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:5
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:5
+msgid "Back Up"
+msgstr ""
+
+#: ../deja-dup/ui/restore-missing.ui.h:1
+msgid "Folder"
+msgstr ""
+
+#: ../deja-dup/ui/restore-missing.ui.h:2
+#: ../deja-dup/AssistantOperation.vala:177
+msgid "Scanning…"
+msgstr ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:173
+msgid "Restore Missing Files…"
+msgstr ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:174
+msgid "Restore deleted files from backup"
+msgstr ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:216
+msgid "Revert to Previous Version…"
+msgid_plural "Revert to Previous Versions…"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:220
+msgid "Restore file from backup"
+msgid_plural "Restore files from backup"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/AssistantBackup.vala:31
+msgctxt "back up is verb"
+msgid "Back Up"
+msgstr ""
+
+#: ../deja-dup/AssistantBackup.vala:32
+msgctxt "back up is verb"
+msgid "_Back Up"
+msgstr ""
+
+#: ../deja-dup/AssistantBackup.vala:49
+msgid "Creating the first backup.  This may take a while."
+msgstr ""
+
+#: ../deja-dup/AssistantBackup.vala:50
+msgid ""
+"Creating a fresh backup to protect against backup corruption.  This will "
+"take longer than normal."
+msgstr ""
+
+#. Translators:  This is the phrase 'Backing up' in the larger phrase
+#. "Backing up '%s'".  %s is a filename.
+#: ../deja-dup/AssistantBackup.vala:80
+msgid "Backing up:"
+msgstr ""
+
+#: ../deja-dup/AssistantBackup.vala:89
+msgid "Backup Failed"
+msgstr ""
+
+#: ../deja-dup/AssistantBackup.vala:92
+msgid "Backup Finished"
+msgstr ""
+
+#. Also leave ourselves up if we just finished a restore test.
+#: ../deja-dup/AssistantBackup.vala:96
+msgid "Your files were successfully backed up and tested."
+msgstr ""
+
+#: ../deja-dup/AssistantBackup.vala:103
+msgid "Backing Up…"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:176
+msgid "Scanning:"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:258
+msgid "_Details"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:306
+msgid "_Allow restoring without a password"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:312
+msgid "_Password-protect your backup"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:324
+msgid ""
+"You will need your password to restore your files. You might want to write "
+"it down."
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:339
+#: ../deja-dup/AssistantOperation.vala:408
+msgid "E_ncryption password"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:356
+msgid "Confir_m password"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:369
+#: ../deja-dup/AssistantOperation.vala:417
+msgid "_Show password"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:376
+#: ../deja-dup/MountOperationAssistant.vala:40
+msgid "_Remember password"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:395
+msgid ""
+"In order to check that you will be able to retrieve your files in the case "
+"of an emergency, please enter your encryption password again to perform a "
+"brief restore test."
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:422
+msgid "Test every two _months"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:496
+msgid "Summary"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:518
+msgid "Restore Test"
+msgstr ""
+
+#. For most, don't do anything special.  Show generic 'unknown error'
+#. message, but provide the exception text for better bug reports.
+#. Plus, sometimes it may clue the user in to what's wrong.
+#. But first, try to restart without a cache, since that seems to quite
+#. frequently fix odd metadata errors with duplicity.  If we hit an error
+#. a second time, we'll show the unknown error message.
+#: ../deja-dup/AssistantOperation.vala:594
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:696
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1075
+msgid "Failed with an unknown error."
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:791
+msgid "Require Password?"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:793
+msgid "Encryption Password Needed"
+msgstr ""
+
+#: ../deja-dup/AssistantOperation.vala:865
+msgid "Backup encryption password"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:68
+msgid "Restore"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:69
+msgid "_Restore"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:91
+msgid "_Backup location"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:124
+msgid "Restore From Where?"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:146
+msgid "_Date"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:169
+msgid "Restore files to _original locations"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:174
+msgid "Restore to _specific folder"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:184
+msgid "Choose destination for restored files"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:188
+msgid "Restore _folder"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:229
+msgid "Restore date"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:237
+msgid "Restore folder"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:263
+msgid "Checking for Backups…"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:271
+msgid "Restore From When?"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:279
+msgid "Restore to Where?"
+msgstr ""
+
+#. Translators:  This is the word 'Restoring' in the phrase
+#. "Restoring '%s'".  %s is a filename.
+#: ../deja-dup/AssistantRestore.vala:306
+msgid "Restoring:"
+msgstr ""
+
+#. 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.
+#: ../deja-dup/AssistantRestore.vala:348
+#, c-format
+msgid "%x %X"
+msgstr ""
+
+#. If we didn't see any dates...  Must not be any backups on the backend
+#: ../deja-dup/AssistantRestore.vala:361
+msgid "No backups to restore"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:437
+msgid "Original location"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:448
+msgid "File to restore"
+msgid_plural "Files to restore"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/AssistantRestore.vala:469
+msgid "Restore Failed"
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:471
+msgid "Restore Finished"
+msgstr ""
+
+#. if it *is* visible, a header will be set already
+#: ../deja-dup/AssistantRestore.vala:474
+msgid "Your files were successfully restored."
+msgstr ""
+
+#: ../deja-dup/AssistantRestore.vala:477
+msgid "Your file was successfully restored."
+msgid_plural "Your files were successfully restored."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/AssistantRestore.vala:484 ../libdeja/Operation.vala:63
+msgid "Restoring…"
+msgstr ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:199
+msgid "File"
+msgstr ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:200
+msgid "Last seen"
+msgstr ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:215
+msgid "Restore which Files?"
+msgstr ""
+
+#. Hours
+#: ../deja-dup/AssistantRestoreMissing.vala:346
+msgid "Scanning for files from up to a day ago…"
+msgstr ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:349
+msgid "Scanning for files from up to a week ago…"
+msgstr ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:352
+msgid "Scanning for files from up to a month ago…"
+msgstr ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:357
+#, c-format
+msgid "Scanning for files from about a month ago…"
+msgid_plural "Scanning for files from about %d months ago…"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:364
+#, c-format
+msgid "Scanning for files from about a year ago…"
+msgid_plural "Scanning for files from about %d years ago…"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/AssistantRestoreMissing.vala:454
+msgid "Scanning finished"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:38
+#: ../deja-dup/widgets/ConfigLocationFile.vala:54
+msgid "_OK"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:299
+msgid "_Forward"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:317
+msgid "Co_ntinue"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:323
+msgctxt "verb"
+msgid "_Test"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:352 ../deja-dup/widgets/ConfigList.vala:255
+#: ../deja-dup/widgets/ConfigLocationFile.vala:53
+msgid "_Cancel"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:354
+msgid "_Close"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:358
+msgid "_Back"
+msgstr ""
+
+#: ../deja-dup/Assistant.vala:360 ../deja-dup/StatusIcon.vala:93
+msgid "_Resume Later"
+msgstr ""
+
+#: ../deja-dup/main.vala:34 ../deja-dup/monitor/monitor.vala:36
+#: ../deja-dup/preferences/preferences-main.vala:87
+msgid "Show version"
+msgstr ""
+
+#: ../deja-dup/main.vala:35
+msgid "Restore given files"
+msgstr ""
+
+#: ../deja-dup/main.vala:36
+msgid "Immediately start a backup"
+msgstr ""
+
+#: ../deja-dup/main.vala:38
+msgid "Restore deleted files"
+msgstr ""
+
+#: ../deja-dup/main.vala:55
+msgid "No directory provided"
+msgstr ""
+
+#: ../deja-dup/main.vala:60
+msgid "Only one directory can be shown at once"
+msgstr ""
+
+#: ../deja-dup/main.vala:81
+msgid "[FILES…]"
+msgstr ""
+
+#: ../deja-dup/main.vala:82
+msgid "DIRECTORY"
+msgstr ""
+
+#. Translators: Wrap this to 80 characters per line if you can, as I have for English
+#: ../deja-dup/main.vala:86
+msgid ""
+"Déjà Dup is a simple backup tool.  It hides the complexity of backing up\n"
+"the Right Way (encrypted, off-site, and regular) and uses duplicity as\n"
+"the backend."
+msgstr ""
+
+#: ../deja-dup/main.vala:137
+msgid "Directory does not exists"
+msgstr ""
+
+#: ../deja-dup/main.vala:141
+msgid "You must provide a directory, not a file"
+msgstr ""
+
+#: ../deja-dup/main.vala:153
+msgid "You must specify a mode"
+msgstr ""
+
+#: ../deja-dup/MountOperationAssistant.vala:36
+msgid "Connect to Server"
+msgstr ""
+
+#: ../deja-dup/MountOperationAssistant.vala:37
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:49
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:45
+#: ../deja-dup/widgets/ConfigLocationRackspace.vala:31
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:37
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:40
+msgid "_Username"
+msgstr ""
+
+#: ../deja-dup/MountOperationAssistant.vala:38
+msgid "_Password"
+msgstr ""
+
+#: ../deja-dup/MountOperationAssistant.vala:39
+msgid "S_how password"
+msgstr ""
+
+#: ../deja-dup/MountOperationAssistant.vala:80
+msgid "Location not available"
+msgstr ""
+
+#: ../deja-dup/MountOperationAssistant.vala:166
+msgid "Connect _anonymously"
+msgstr ""
+
+#: ../deja-dup/MountOperationAssistant.vala:170
+msgid "Connect as u_ser"
+msgstr ""
+
+#. Translators: this is a Windows networking domain
+#: ../deja-dup/MountOperationAssistant.vala:213
+msgid "_Domain"
+msgstr ""
+
+#: ../deja-dup/Prompt.vala:37
+msgid "Keep your files safe by backing up regularly"
+msgstr ""
+
+#: ../deja-dup/Prompt.vala:42
+msgid ""
+"Important documents, data, and settings can be protected by storing them in "
+"a backup. In the case of a disaster, you would be able to recover them from "
+"that backup."
+msgstr ""
+
+#: ../deja-dup/Prompt.vala:48
+msgid "_Don't Show Again"
+msgstr ""
+
+#: ../deja-dup/Prompt.vala:50
+msgid "Don't Show Again"
+msgstr ""
+
+#: ../deja-dup/Prompt.vala:56
+msgid "_Open Backup Settings"
+msgstr ""
+
+#: ../deja-dup/Prompt.vala:58
+msgid "Open Backup Settings"
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:94
+msgid "_Skip Backup"
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:125
+msgid "Backup completed"
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:129
+msgid "Backup finished"
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:130
+msgid ""
+"Not all files were successfully backed up.  See dialog for more details."
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:233
+msgid "Starting scheduled backup"
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:236
+msgid "Show Progress"
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:274
+#, c-format
+msgid "%.1f%% complete"
+msgstr ""
+
+#: ../deja-dup/StatusIcon.vala:287
+msgid "Show _Progress"
+msgstr ""
+
+#: ../deja-dup/monitor/monitor.vala:159
+msgid "Scheduled backup delayed"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:77
+msgid "Categories"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:129
+msgid "_Restore…"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:161
+msgid "_Back Up Now…"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:180
+msgid "Overview"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:213
+msgid "_Storage location"
+msgstr ""
+
+#. Translators: storage as in "where to store the backup"
+#: ../deja-dup/preferences/Preferences.vala:230
+msgid "Storage location"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:255
+msgid "_Automatic backup"
+msgstr ""
+
+#. translators: as in "Every day"
+#: ../deja-dup/preferences/Preferences.vala:267
+msgid "_Every"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:277
+msgctxt "verb"
+msgid "_Keep"
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:284
+msgid ""
+"Old backups will be deleted earlier if the storage location is low on space."
+msgstr ""
+
+#: ../deja-dup/preferences/Preferences.vala:294
+msgid "Scheduling"
+msgstr ""
+
+#: ../deja-dup/preferences/preferences-main.vala:73
+msgid "_Help"
+msgstr ""
+
+#: ../deja-dup/preferences/preferences-main.vala:75
+msgid "_Quit"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigDelete.vala:40
+msgid "At least six months"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigDelete.vala:41
+msgid "At least a year"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigDelete.vala:42
+msgid "Forever"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigDelete.vala:89
+#, c-format
+msgid "At least %d day"
+msgid_plural "At least %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Check for some really simple/common friendly names
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:66
+msgid "Next backup is today."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:68
+msgid "Next backup is tomorrow."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:76
+#, c-format
+msgid "Next backup is %d day from now."
+msgid_plural "Next backup is %d days from now."
+msgstr[0] ""
+msgstr[1] ""
+
+#. Check for some really simple/common friendly names
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:93
+msgid "Last backup was today."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:95
+msgid "Last backup was yesterday."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:103
+#, c-format
+msgid "Last backup was %d day ago."
+msgid_plural "Last backup was %d days ago."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:113
+msgid "No recent backups."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelBackupDate.vala:122
+msgid "No backup scheduled."
+msgstr ""
+
+#. This here encodes a lot of outside GUI information in this widget,
+#. but it's a very special case thing.
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:59
+msgid "Restore…"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:61
+#, c-format
+msgid "You may use the %s button to browse for existing backups."
+msgstr ""
+
+#. Translators: Files is the user-visible name of nautilus in your language
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:64
+#, c-format
+msgid ""
+"You can restore the entire backup with the %s button or use Files to either "
+"revert individual files or restore missing ones."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:72
+msgid "Back Up Now…"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:73
+#, c-format
+msgid ""
+"You should <a href=''>enable</a> automatic backups or use the %s button to "
+"start one now."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:79
+msgid "A backup automatically starts every day."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:81
+msgid "A backup automatically starts every week."
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLabelDescription.vala:84
+#, c-format
+msgid "A backup automatically starts every %d day."
+msgid_plural "A backup automatically starts every %d days."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/widgets/ConfigList.vala:178
+#: ../deja-dup/widgets/ConfigList.vala:256
+msgid "_Add"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigList.vala:179
+msgid "Add"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigList.vala:187
+msgid "_Remove"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigList.vala:188
+msgid "Remove"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigList.vala:252
+msgid "Choose folders"
+msgstr ""
+
+#. Now insert remote servers
+#: ../deja-dup/widgets/ConfigLocation.vala:118
+msgid "SSH"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocation.vala:120
+msgid "Windows Share"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocation.vala:122
+msgid "FTP"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocation.vala:124
+msgid "WebDAV"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocation.vala:127
+msgid "Custom Location"
+msgstr ""
+
+#. And a local folder option
+#: ../deja-dup/widgets/ConfigLocation.vala:133
+msgid "Local Folder"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocation.vala:176 ../libdeja/BackendS3.vala:122
+msgid "Amazon S3"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocation.vala:188 ../libdeja/BackendU1.vala:45
+msgid "Ubuntu One"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocation.vala:196
+#: ../libdeja/BackendRackspace.vala:69
+msgid "Rackspace Cloud Files"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationCustom.vala:34
+msgid "_URI"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:31
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:32
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:31
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:31
+msgid "_Server"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:38
+msgid "Use secure connection (_HTTPS)"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:43
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:35
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:34
+msgid "_Port"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:46
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:38
+#: ../deja-dup/widgets/ConfigLocationFile.vala:45
+#: ../deja-dup/widgets/ConfigLocationS3.vala:33
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:34
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:37
+#: ../deja-dup/widgets/ConfigLocationVolume.vala:33
+msgid "_Folder"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationFile.vala:39
+msgid "_Choose Folder…"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationFile.vala:50
+msgid "Choose Folder"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationRackspace.vala:33
+msgid "_Container"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationS3.vala:31
+msgid "S3 Access Key I_D"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:40
+msgid "_Domain Name"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigPeriod.vala:36
+msgid "Day"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigPeriod.vala:37
+msgid "Week"
+msgstr ""
+
+#: ../deja-dup/widgets/ConfigPeriod.vala:82
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/widgets/WidgetUtils.vala:33
+#, c-format
+msgid "Could not display %s"
+msgstr ""
+
+#. Translators: %2$s is the name of a removable drive, %1$s is a folder
+#. on that removable drive.
+#: ../libdeja/BackendFile.vala:135 ../libdeja/CommonUtils.vala:513
+#, c-format
+msgid "%1$s on %2$s"
+msgstr ""
+
+#: ../libdeja/BackendFile.vala:168
+#, c-format
+msgid "Backup will begin when %s becomes connected."
+msgstr ""
+
+#: ../libdeja/BackendFile.vala:175 ../libdeja/BackendRackspace.vala:49
+#: ../libdeja/BackendS3.vala:59
+msgid "Backup will begin when a network connection becomes available."
+msgstr ""
+
+#: ../libdeja/BackendFile.vala:384 ../libdeja/BackendFile.vala:448
+msgid "Backup location not available"
+msgstr ""
+
+#: ../libdeja/BackendFile.vala:385
+msgid "Waiting for a network connection…"
+msgstr ""
+
+#: ../libdeja/BackendFile.vala:448
+#, c-format
+msgid "Waiting for ‘%s’ to become connected…"
+msgstr ""
+
+#. Translators: %s is a folder.
+#: ../libdeja/BackendRackspace.vala:72
+#, c-format
+msgid "%s on Rackspace Cloud Files"
+msgstr ""
+
+#: ../libdeja/BackendRackspace.vala:115 ../libdeja/BackendS3.vala:168
+msgid "Permission denied"
+msgstr ""
+
+#: ../libdeja/BackendRackspace.vala:146
+#, c-format
+msgid ""
+"You can sign up for a Rackspace Cloud Files account <a "
+"href=\"%s\">online</a>."
+msgstr ""
+
+#: ../libdeja/BackendRackspace.vala:147
+msgid "Connect to Rackspace Cloud Files"
+msgstr ""
+
+#: ../libdeja/BackendRackspace.vala:148
+msgid "_API access key"
+msgstr ""
+
+#: ../libdeja/BackendRackspace.vala:149
+msgid "S_how API access key"
+msgstr ""
+
+#: ../libdeja/BackendRackspace.vala:150
+msgid "_Remember API access key"
+msgstr ""
+
+#. Translators: %s is a folder.
+#: ../libdeja/BackendS3.vala:125
+#, c-format
+msgid "%s on Amazon S3"
+msgstr ""
+
+#: ../libdeja/BackendS3.vala:199
+#, c-format
+msgid "You can sign up for an Amazon S3 account <a href=\"%s\">online</a>."
+msgstr ""
+
+#: ../libdeja/BackendS3.vala:200
+msgid "Connect to Amazon S3"
+msgstr ""
+
+#: ../libdeja/BackendS3.vala:201
+msgid "_Access key ID"
+msgstr ""
+
+#: ../libdeja/BackendS3.vala:202
+msgid "_Secret access key"
+msgstr ""
+
+#: ../libdeja/BackendS3.vala:203
+msgid "S_how secret access key"
+msgstr ""
+
+#: ../libdeja/BackendS3.vala:204
+msgid "_Remember secret access key"
+msgstr ""
+
+#. Translators: %s is a folder.
+#: ../common/BackendU1.vala:173
+#, c-format
+msgid "%s on Ubuntu One"
+msgstr ""
+
+#: ../common/BackendU1.vala:259
+msgid "Connect to Ubuntu One"
+msgstr ""
+
+#: ../common/BackendU1.vala:260
+msgid "Sign into Ubuntu One…"
+msgstr ""
+
+#: ../libdeja/CommonUtils.vala:432
+#, c-format
+msgid "Could not find backup tool in %s.  Your installation is incomplete."
+msgstr ""
+
+#: ../libdeja/CommonUtils.vala:434
+msgid "Could not load backup tool.  Your installation is incomplete."
+msgstr ""
+
+#: ../libdeja/CommonUtils.vala:440
+msgid "Backup tool is broken.  Your installation is incomplete."
+msgstr ""
+
+#: ../libdeja/CommonUtils.vala:462
+msgid "Could not start backup tool"
+msgstr ""
+
+#. Translators: this is the home folder and %s is the user's username
+#: ../libdeja/CommonUtils.vala:564
+#, c-format
+msgid "Home (%s)"
+msgstr ""
+
+#. Translators: this is the home folder
+#: ../libdeja/CommonUtils.vala:569
+msgid "Home"
+msgstr ""
+
+#. Translators: this is the trash folder
+#: ../libdeja/CommonUtils.vala:574
+msgid "Trash"
+msgstr ""
+
+#: ../libdeja/OperationBackup.vala:42 ../libdeja/OperationVerify.vala:56
+msgid "Verifying backup…"
+msgstr ""
+
+#: ../libdeja/OperationRestore.vala:51
+msgid "Restoring files…"
+msgstr ""
+
+#: ../libdeja/OperationVerify.vala:94
+msgid ""
+"Your backup appears to be corrupted.  You should delete the backup and try "
+"again."
+msgstr ""
+
+#: ../libdeja/Operation.vala:61
+msgid "Backing up…"
+msgstr ""
+
+#: ../libdeja/Operation.vala:65
+msgid "Checking for backups…"
+msgstr ""
+
+#: ../libdeja/Operation.vala:67
+msgid "Listing files…"
+msgstr ""
+
+#: ../libdeja/Operation.vala:69 ../libdeja/Operation.vala:103
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:385
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:392
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:411
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:416
+msgid "Preparing…"
+msgstr ""
+
+#: ../libdeja/Operation.vala:296
+msgid "Another backup operation is already running"
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:89
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:172
+msgid "Paused (no network)"
+msgstr ""
+
+#. Was not even a file path (maybe something goofy like computer://)
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:443
+#, c-format
+msgid "Could not restore ‘%s’: Not a valid file location"
+msgstr ""
+
+#. Tiny backup location.  Suggest they get a larger one.
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:510
+msgid "Backup location is too small.  Try using one with more space."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:533
+msgid "Backup location does not have enough free space."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:553
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:567
+msgid "Cleaning up…"
+msgstr ""
+
+#. OK, we succeeded yay!  But some files didn't make it into the backup
+#. because we couldn't read them.  So tell the user so they don't think
+#. everything is hunky dory.
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:663
+msgid ""
+"Could not back up the following files.  Please make sure you are able to "
+"open them."
+msgstr ""
+
+#. OK, we succeeded yay!  But some files didn't actually restore
+#. because we couldn't write to them.  So tell the user so they
+#. don't think everything is hunky dory.
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:679
+msgid ""
+"Could not restore the following files.  Please make sure you are able to "
+"write to them."
+msgstr ""
+
+#. make text a little nicer than duplicity gives
+#. duplicity gives something like "home/blah/blah not found in archive,
+#. no files restored".
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:923
+#, c-format
+msgid "Could not restore ‘%s’: File not found in backup"
+msgstr ""
+
+#. notify upper layers, if they want to do anything
+#. Duplicity tried to ask the user what the encryption password is.
+#. notify upper layers, if they want to do anything
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:929
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1027
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1031
+msgid "Bad encryption password."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:934
+msgid "Computer name changed"
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:934
+#, c-format
+msgid ""
+"The existing backup is of a computer named %s, but the current computer’s "
+"name is %s.  If this is unexpected, you should back up to a different "
+"location."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:969
+#, c-format
+msgid "Permission denied when trying to create ‘%s’."
+msgstr ""
+
+#. assume error is on backend side
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:973
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:977
+#, c-format
+msgid "Permission denied when trying to read ‘%s’."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:981
+#, c-format
+msgid "Permission denied when trying to delete ‘%s’."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:988
+#, c-format
+msgid "Backup location ‘%s’ does not exist."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:994
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1046
+msgid "No space left."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1008
+msgid "Invalid ID."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1010
+msgid "Invalid secret key."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1012
+msgid "Your Amazon Web Services account is not signed up for the S3 service."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1021
+msgid "S3 bucket name is not available."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1035
+#, c-format
+msgid "Error reading file ‘%s’."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1037
+#, c-format
+msgid "Error writing file ‘%s’."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1048
+#, c-format
+msgid "No space left in ‘%s’."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1056
+msgid "No backup files found"
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1106
+msgid "Uploading…"
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityPlugin.vala:41
+msgid "Could not understand duplicity version."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityPlugin.vala:47
+#, c-format
+msgid "Could not understand duplicity version ‘%s’."
+msgstr ""
+
+#: ../libdeja/tools/duplicity/DuplicityPlugin.vala:50
+#, c-format
+msgid ""
+"Déjà Dup Backup Tool requires at least version %d.%d.%.2d of duplicity, but "
+"only found version %d.%d.%.2d"
+msgstr ""

=== modified file 'po/fr.po'
--- po/fr.po	2014-01-24 16:29:23 +0000
+++ po/fr.po	2014-09-20 15:05:16 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-10 18:29-0500\n"
-"PO-Revision-Date: 2014-01-05 18:05+0000\n"
-"Last-Translator: Jean Marc <[e-mail]>\n"
+"PO-Revision-Date: 2014-03-28 20:12+0000\n"
+"Last-Translator: Olivier Febwin <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\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: 2014-01-11 06:39+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-03-29 07:34+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #: ../data/org.gnome.DejaDup.gschema.xml.in.h:1
 #: ../deja-dup/preferences/Preferences.vala:191
@@ -37,7 +37,7 @@
 "personnel de l'utilisateur."
 
 #: ../data/org.gnome.DejaDup.gschema.xml.in.h:3
-#: ../deja-dup/preferences/Preferences.vala:202
+#: ../preferences/Preferences.vala:168
 msgid "Folders to ignore"
 msgstr "Dossiers à ignorer"
 
@@ -54,11 +54,11 @@
 "l'utilisateur. Les chemins relatifs fonctionnent par rapport au dossier "
 "personnel de l'utilisateur."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:5
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:6
 msgid "Whether to request the root password"
 msgstr "Si le mot de passe d'administrateur doit être requis"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:6
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:7
 msgid ""
 "Whether to request the root password when backing up from or restoring to "
 "system folders."
@@ -66,11 +66,11 @@
 "Si le mot de passe d'administrateur doit être requis lors de la sauvegarde "
 "ou de la restauration vers des dossiers système."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:7
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:8
 msgid "The last time Déjà Dup was run"
 msgstr "La dernière fois que Déjà Dup a été exécuté"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:8
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:9
 msgid ""
 "The last time Déjà Dup was successfully run. This time should be in ISO 8601 "
 "format."
@@ -78,11 +78,11 @@
 "La dernière fois que Déjà Dup a été exécuté avec succès. Cette date doit "
 "être au format ISO 8601."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:9
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:10
 msgid "The last time Déjà Dup backed up"
 msgstr "La dernière fois que Déjà Dup a sauvegardé"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:10
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:11
 msgid ""
 "The last time Déjà Dup successfully completed a backup. This time should be "
 "in ISO 8601 format."
@@ -90,11 +90,11 @@
 "La dernière fois que Déjà Dup a mené à bien une sauvegarde. Cette date doit "
 "être au format ISO 8601."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:11
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:12
 msgid "The last time Déjà Dup restored"
 msgstr "La dernière fois que Déjà Dup a restauré"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:12
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:13
 msgid ""
 "The last time Déjà Dup successfully completed a restore. This time should be "
 "in ISO 8601 format."
@@ -102,30 +102,30 @@
 "La dernière fois que Déjà Dup a mené à bien une restauration. Cette date "
 "doit être au format ISO 8601."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:13
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:14
 msgid "Whether to periodically back up"
 msgstr "Si une sauvegarde à intervalle régulier doit avoir lieu"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:14
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:15
 msgid "Whether to automatically back up on a regular schedule."
 msgstr "Si une sauvegarde automatique à intervalle régulier doit avoir lieu."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:15
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:16
 msgid "How often to periodically back up"
 msgstr "À quelle fréquence effectuer des sauvegardes régulières"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:16
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:17
 msgid "The number of days between backups."
 msgstr "Le nombre de jours entre les sauvegardes."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:17
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:18
 msgid ""
 "The last time Déjà Dup checked whether it should prompt about backing up"
 msgstr ""
 "La dernière fois que Déjà Dup a vérifié s'il devait vous proposer de faire "
 "une sauvegarde"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:18
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:19
 msgid ""
 "When a user logs in, the Déjà Dup monitor checks whether it should prompt "
 "about backing up. This is used to increase discoverability for users that "
@@ -138,14 +138,14 @@
 "soit « disabled » pour arrêter cette vérification, soit une date au format "
 "ISO 8601."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:19
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:20
 msgid ""
 "The last time Déjà Dup checked whether it should prompt about your password"
 msgstr ""
 "La dernière fois que Déjà Dup a vérifié s'il devait vous demander de saisir "
 "votre mot de passe"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:20
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:21
 msgid ""
 "In order to prevent you from forgetting your passwords, Déjà Dup will "
 "occasionally notify you to confirm the password. This time should be either "
@@ -156,11 +156,11 @@
 "« disabled » pour arrêter cette vérification, soit une date au format "
 "ISO 8601."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:21
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:20
 msgid "How long to keep backup files"
 msgstr "Durée de conservation des fichiers de sauvegarde"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:22
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:21
 msgid ""
 "The number of days to keep backup files on the backup location. A value of 0 "
 "means forever. This is a minimum number of days; the files may be kept "
@@ -170,11 +170,11 @@
 "l'emplacement de sauvegarde. Une valeur de 0 implique toujours. C'est un "
 "nombre minimum de jours ; les fichiers peuvent être conservés plus longtemps."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:23
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:24
 msgid "How long to wait between full backups"
 msgstr "Intervalle entre deux sauvegardes complètes"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:24
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:25
 msgid ""
 "Déjà Dup needs to occasionally make fresh full backups. This is the number "
 "of days to wait between full backups."
@@ -182,11 +182,11 @@
 "Déjà Dup doit faire de temps en temps des sauvegardes complètes fraîches. "
 "C'est le nombre de jours à attendre entre deux sauvegardes complètes."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:25
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:22
 msgid "Type of location to store backup"
 msgstr "Type d'emplacement pour enregistrer la sauvegarde"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:26
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:23
 msgid ""
 "The type of backup location. If ‘auto’, a default will be chosen based on "
 "what is available."
@@ -194,21 +194,21 @@
 "Le type d'emplacement de sauvegarde. Si « auto », un choix par défaut sera "
 "fait en fonction de ce qui est disponible."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:27
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:24
 msgid "Amazon S3 Access Key ID"
 msgstr "Access Key ID d'Amazon S3"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:28
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:25
 msgid "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
 msgstr ""
 "Votre identifiant Access Key d'Amazon S3. Il fait office de nom "
 "d'utilisateur S3."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:29
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:26
 msgid "The Amazon S3 bucket name to use"
 msgstr "Le nom du bucket d'Amazon S3 à utiliser"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:30
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:27
 msgid ""
 "Which Amazon S3 bucket to store files in. This does not need to exist "
 "already. Only legal hostname strings are valid."
@@ -216,11 +216,12 @@
 "Quel bucket d'Amazon S3 pour enregistrer les fichiers. Il ne doit pas "
 "nécessairement déjà exister. Seuls les noms d'hôtes appropriés sont valides."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:31
+#. Left this way for historical reasons, should be '$HOSTNAME'.  See convert_s3_folder_to_hostname()
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:29
 msgid "The Amazon S3 folder"
 msgstr "Le dossier Amazon S3"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:32
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:30
 msgid ""
 "An optional folder name to store files in. This folder will be created in "
 "the chosen bucket."
@@ -228,11 +229,11 @@
 "Un nom de dossier facultatif où enregistrer les fichiers. Ce dossier sera "
 "créé à l'emplacement choisi."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:33
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:31
 msgid "The Rackspace Cloud Files container"
 msgstr "Le conteneur du service de sauvegarde de fichiers Rackspace"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:34
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:32
 msgid ""
 "Which Rackspace Cloud Files container to store files in. This does not need "
 "to exist already. Only legal hostname strings are valid."
@@ -241,21 +242,21 @@
 "sauvegarder les fichiers. Il ne doit pas nécessairement déjà exister. Seuls "
 "les noms d'hôtes appropriés sont valides."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:35
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:33
 msgid "Your Rackspace username"
 msgstr "Votre identifiant Rackspace"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:36
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:34
 msgid "This is your username for the Rackspace Cloud Files service."
 msgstr ""
 "Ceci est votre identifiant pour le service de stockage de fichiers Rackspace "
 "Cloud"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:37
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:35
 msgid "The Ubuntu One folder"
 msgstr "Le dossier Ubuntu One"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:36
 msgid ""
 "The folder name to store files in. If ‘$HOSTNAME’, it will default to a "
 "folder based on the name of the computer."
@@ -263,31 +264,31 @@
 "Le nom du dossier dans lequel stocker les fichiers. Si « $HOSTNAME », un "
 "dossier nommé d'après le nom de l'ordinateur sera utilisé."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
-#: ../deja-dup/AssistantRestore.vala:221
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:37
+#: ../deja-dup/AssistantRestore.vala:221 ../preferences/Preferences.vala:151
 msgid "Backup location"
 msgstr "Emplacement de sauvegarde"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:40
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
 msgid "Location in which to hold the backup files."
 msgstr "Emplacement où stocker les fichiers de sauvegarde."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:41
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
 msgid "Folder type"
 msgstr "Type de dossier"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:42
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:40
 msgid ""
 "Whether the backup location is a mounted external volume or a normal folder."
 msgstr ""
 "Si l'emplacement de sauvegarde est un volume externe monté ou un dossier "
 "classique."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:43
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:41
 msgid "Relative path under the external volume"
 msgstr "Chemin relatif sur le disque externe"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:44
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:42
 msgid ""
 "If the backup location is on an external volume, this is the path of the "
 "folder on that volume."
@@ -295,11 +296,11 @@
 "Si la sauvegarde se situe sur un disque externe, ceci est le chemin du "
 "dossier sur le disque."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:45
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:43
 msgid "Unique ID of the external volume"
 msgstr "Identifiant unique du disque externe"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:46
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:44
 msgid ""
 "If the backup location is on an external volume, this is its unique "
 "filesystem identifier."
@@ -307,11 +308,11 @@
 "Si la sauvegarde se situe sur un disque externe, ceci est l'identifiant "
 "unique de son système de fichiers."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:47
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:45
 msgid "Full name of the external volume"
 msgstr "Nom complet du disque externe"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:48
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:46
 msgid ""
 "If the backup location is on an external volume, this is the volume’s longer "
 "descriptive name."
@@ -319,11 +320,11 @@
 "Si la sauvegarde se situe sur un disque externe, ceci est le nom complet de "
 "ce disque."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:49
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:47
 msgid "Short name of the external volume"
 msgstr "Nom court du disque externe"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:50
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:48
 msgid ""
 "If the backup location is on an external volume, this is the volume’s "
 "shorter name."
@@ -331,11 +332,11 @@
 "Si la sauvegarde se situe sur un disque externe, ceci est le nom de ce "
 "disque."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:51
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:49
 msgid "Icon of the external volume"
 msgstr "Icône du disque externe"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:52
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:50
 msgid ""
 "If the backup location is on an external volume, this is the volume’s icon."
 msgstr ""
@@ -346,8 +347,9 @@
 #. context is itself a reference to both the underlying command line tool
 #. "duplicity" and the act of duplicating data for backup.  As a whole, the
 #. phrase "Déjà Dup" may not be very translatable.
-#: ../deja-dup/deja-dup.appdata.xml.in.h:1 ../deja-dup/deja-dup.desktop.in.h:2
-#: ../deja-dup/main.vala:78 ../libdeja/CommonUtils.vala:133
+#: ../data/deja-dup.desktop.in.h:2 ../common/CommonUtils.vala:91
+#: ../deja-dup/main.vala:78 ../preferences/Preferences.vala:88
+#, c-format
 msgid "Déjà Dup Backup Tool"
 msgstr "Outil de sauvegarde Déjà Dup"
 
@@ -377,6 +379,8 @@
 msgid ""
 "Incrementally backs up, letting you restore from any particular backup"
 msgstr ""
+"Sauvegarde par incrémentation, vous laissant la possibilité de restaurer à "
+"partir d'une sauvegarde donnée."
 
 #: ../deja-dup/deja-dup.appdata.xml.in.h:6
 msgid "Schedules regular backups"
@@ -401,23 +405,22 @@
 #. Translators: Monitor in this sense means something akin to 'watcher', not
 #. a computer screen.  This program acts like a daemon that kicks off
 #. backups at scheduled times.
-#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:1
-#: ../deja-dup/monitor/monitor.vala:328
+#: ../data/deja-dup-monitor.desktop.in.in.h:1 ../monitor/monitor.vala:304
 msgid "Backup Monitor"
 msgstr "Moniteur de sauvegarde"
 
-#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:2
+#: ../data/deja-dup-monitor.desktop.in.in.h:2
 msgid "Schedules backups at regular intervals"
 msgstr "Planifie les sauvegardes à intervalle régulier"
 
-#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:2
-#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:2
+#: ../data/deja-dup-ccpanel.desktop.in.h:2
+#: ../data/deja-dup-preferences.desktop.in.in.h:2
 msgid "Change your backup settings"
 msgstr "Modifiez votre configuration de sauvegarde"
 
 #. These keywords are used when searching for applications in dashes, etc.
-#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:4
-#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:4
+#: ../data/deja-dup-ccpanel.desktop.in.h:4
+#: ../data/deja-dup-preferences.desktop.in.in.h:4
 msgid "déjà;deja;dup;"
 msgstr "déjà;deja;dup;"
 
@@ -426,30 +429,29 @@
 msgid "Back Up"
 msgstr "Sauvegarder"
 
-#: ../deja-dup/ui/restore-missing.ui.h:1
+#: ../data/ui/restore-missing.ui.h:1
 msgid "Folder"
 msgstr "Dossier"
 
-#: ../deja-dup/ui/restore-missing.ui.h:2
-#: ../deja-dup/AssistantOperation.vala:177
+#: ../data/ui/restore-missing.ui.h:2 ../deja-dup/AssistantOperation.vala:175
 msgid "Scanning…"
 msgstr "Analyse en cours…"
 
-#: ../deja-dup/nautilus/NautilusExtension.c:173
+#: ../nautilus/NautilusExtension.c:176
 msgid "Restore Missing Files…"
 msgstr "Restauration des fichiers manquants…"
 
-#: ../deja-dup/nautilus/NautilusExtension.c:174
+#: ../nautilus/NautilusExtension.c:177
 msgid "Restore deleted files from backup"
 msgstr "Restaure les fichiers effacés depuis une sauvegarde"
 
-#: ../deja-dup/nautilus/NautilusExtension.c:216
+#: ../nautilus/NautilusExtension.c:219
 msgid "Revert to Previous Version…"
 msgid_plural "Revert to Previous Versions…"
 msgstr[0] "Revenir à la version précédente…"
 msgstr[1] "Revenir aux versions précédentes…"
 
-#: ../deja-dup/nautilus/NautilusExtension.c:220
+#: ../nautilus/NautilusExtension.c:223
 msgid "Restore file from backup"
 msgid_plural "Restore files from backup"
 msgstr[0] "Restaurer le fichier de la sauvegarde"
@@ -465,12 +467,12 @@
 msgid "_Back Up"
 msgstr "_Sauvegarder"
 
-#: ../deja-dup/AssistantBackup.vala:49
+#: ../deja-dup/AssistantBackup.vala:50
 msgid "Creating the first backup.  This may take a while."
 msgstr ""
 "Création de la première sauvegarde. Cette opération peut prendre du temps."
 
-#: ../deja-dup/AssistantBackup.vala:50
+#: ../deja-dup/AssistantBackup.vala:51
 msgid ""
 "Creating a fresh backup to protect against backup corruption.  This will "
 "take longer than normal."
@@ -481,44 +483,44 @@
 
 #. Translators:  This is the phrase 'Backing up' in the larger phrase
 #. "Backing up '%s'".  %s is a filename.
-#: ../deja-dup/AssistantBackup.vala:80
+#: ../deja-dup/AssistantBackup.vala:81
 msgid "Backing up:"
-msgstr "Sauvegarde :"
+msgstr "Sauvegarde en cours :"
 
-#: ../deja-dup/AssistantBackup.vala:89
+#: ../deja-dup/AssistantBackup.vala:90
 msgid "Backup Failed"
 msgstr "La sauvegarde a échoué"
 
-#: ../deja-dup/AssistantBackup.vala:92
+#: ../deja-dup/AssistantBackup.vala:93
 msgid "Backup Finished"
 msgstr "La sauvegarde est finie"
 
-#. Also leave ourselves up if we just finished a restore test.
 #: ../deja-dup/AssistantBackup.vala:96
 msgid "Your files were successfully backed up and tested."
 msgstr "Vos fichiers ont été sauvegardés et testés avec succès."
 
-#: ../deja-dup/AssistantBackup.vala:103
+#: ../deja-dup/AssistantBackup.vala:101
 msgid "Backing Up…"
 msgstr "Sauvegarde en cours…"
 
-#: ../deja-dup/AssistantOperation.vala:176
+#: ../deja-dup/AssistantOperation.vala:174
 msgid "Scanning:"
 msgstr "Analyse :"
 
-#: ../deja-dup/AssistantOperation.vala:258
+#: ../deja-dup/AssistantOperation.vala:264
 msgid "_Details"
 msgstr "_Détails"
 
-#: ../deja-dup/AssistantOperation.vala:306
+#: ../deja-dup/AssistantOperation.vala:312
 msgid "_Allow restoring without a password"
 msgstr "_Autoriser la récupération des fichiers sans mot de passe"
 
-#: ../deja-dup/AssistantOperation.vala:312
+#: ../deja-dup/AssistantOperation.vala:318
 msgid "_Password-protect your backup"
 msgstr "_Protégez votre sauvegarde par un mot de passe"
 
-#: ../deja-dup/AssistantOperation.vala:324
+#: ../deja-dup/AssistantOperation.vala:332
+#, c-format
 msgid ""
 "You will need your password to restore your files. You might want to write "
 "it down."
@@ -526,26 +528,24 @@
 "Vous aurez besoin de votre mot de passe pour récupérer vos fichiers. Vous "
 "devriez peut-être le noter quelque part."
 
-#: ../deja-dup/AssistantOperation.vala:339
-#: ../deja-dup/AssistantOperation.vala:408
+#: ../deja-dup/AssistantOperation.vala:347
 msgid "E_ncryption password"
 msgstr "_Mot de passe de chiffrement"
 
-#: ../deja-dup/AssistantOperation.vala:356
+#: ../deja-dup/AssistantOperation.vala:364
 msgid "Confir_m password"
 msgstr "Confir_mer le mot de passe"
 
-#: ../deja-dup/AssistantOperation.vala:369
-#: ../deja-dup/AssistantOperation.vala:417
+#: ../deja-dup/AssistantOperation.vala:377
 msgid "_Show password"
 msgstr "_Afficher le mot de passe"
 
-#: ../deja-dup/AssistantOperation.vala:376
+#: ../deja-dup/AssistantOperation.vala:386
 #: ../deja-dup/MountOperationAssistant.vala:40
 msgid "_Remember password"
 msgstr "_Se souvenir du mot de passe"
 
-#: ../deja-dup/AssistantOperation.vala:395
+#: ../deja-dup/AssistantOperation.vala:400
 msgid ""
 "In order to check that you will be able to retrieve your files in the case "
 "of an emergency, please enter your encryption password again to perform a "
@@ -555,39 +555,32 @@
 "veuillez saisir de nouveau votre mot de passe de chiffrement pour effectuer "
 "un rapide test de restauration."
 
-#: ../deja-dup/AssistantOperation.vala:422
+#: ../deja-dup/AssistantOperation.vala:429
 msgid "Test every two _months"
 msgstr "Tester tous les deux _mois"
 
-#: ../deja-dup/AssistantOperation.vala:496
+#: ../deja-dup/AssistantOperation.vala:455
 msgid "Summary"
 msgstr "Résumé"
 
-#: ../deja-dup/AssistantOperation.vala:518
+#: ../deja-dup/AssistantOperation.vala:525
 msgid "Restore Test"
 msgstr "Test de restauration"
 
-#. For most, don't do anything special.  Show generic 'unknown error'
-#. message, but provide the exception text for better bug reports.
-#. Plus, sometimes it may clue the user in to what's wrong.
-#. But first, try to restart without a cache, since that seems to quite
-#. frequently fix odd metadata errors with duplicity.  If we hit an error
-#. a second time, we'll show the unknown error message.
-#: ../deja-dup/AssistantOperation.vala:594
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:696
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1075
+#: ../common/Duplicity.vala:710 ../common/Duplicity.vala:1092
+#: ../deja-dup/AssistantOperation.vala:545
 msgid "Failed with an unknown error."
 msgstr "Échec dû à une erreur inconnue."
 
-#: ../deja-dup/AssistantOperation.vala:791
+#: ../deja-dup/AssistantOperation.vala:738
 msgid "Require Password?"
 msgstr "Demander un mot de passe ?"
 
-#: ../deja-dup/AssistantOperation.vala:793
+#: ../deja-dup/AssistantOperation.vala:740
 msgid "Encryption Password Needed"
 msgstr "Mot de passe de chiffrement nécessaire"
 
-#: ../deja-dup/AssistantOperation.vala:865
+#: ../deja-dup/AssistantOperation.vala:786
 msgid "Backup encryption password"
 msgstr "Mot de passe de chiffrement des sauvegardes"
 
@@ -599,7 +592,7 @@
 msgid "_Restore"
 msgstr "_Restaurer"
 
-#: ../deja-dup/AssistantRestore.vala:91
+#: ../deja-dup/AssistantRestore.vala:91 ../preferences/Preferences.vala:262
 msgid "_Backup location"
 msgstr "_Emplacement de la sauvegarde"
 
@@ -649,7 +642,7 @@
 
 #. Translators:  This is the word 'Restoring' in the phrase
 #. "Restoring '%s'".  %s is a filename.
-#: ../deja-dup/AssistantRestore.vala:306
+#: ../deja-dup/AssistantRestore.vala:307
 msgid "Restoring:"
 msgstr "Restauration de :"
 
@@ -657,46 +650,44 @@
 #. 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.
-#: ../deja-dup/AssistantRestore.vala:348
+#: ../deja-dup/AssistantRestore.vala:349
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#. If we didn't see any dates...  Must not be any backups on the backend
-#: ../deja-dup/AssistantRestore.vala:361
+#: ../deja-dup/AssistantRestore.vala:362
 msgid "No backups to restore"
 msgstr "Aucune sauvegarde disponible pour la restauration"
 
-#: ../deja-dup/AssistantRestore.vala:437
+#: ../deja-dup/AssistantRestore.vala:439
 msgid "Original location"
 msgstr "Emplacement d'origine"
 
-#: ../deja-dup/AssistantRestore.vala:448
+#: ../deja-dup/AssistantRestore.vala:450
 msgid "File to restore"
 msgid_plural "Files to restore"
 msgstr[0] "Fichier à restaurer"
 msgstr[1] "Fichiers à restaurer"
 
-#: ../deja-dup/AssistantRestore.vala:469
+#: ../deja-dup/AssistantRestore.vala:471
 msgid "Restore Failed"
 msgstr "La restauration a échoué"
 
-#: ../deja-dup/AssistantRestore.vala:471
+#: ../deja-dup/AssistantRestore.vala:473
 msgid "Restore Finished"
 msgstr "La restauration est terminée"
 
-#. if it *is* visible, a header will be set already
-#: ../deja-dup/AssistantRestore.vala:474
+#: ../deja-dup/AssistantRestore.vala:476
 msgid "Your files were successfully restored."
 msgstr "Vos fichiers ont été restaurés avec succès."
 
-#: ../deja-dup/AssistantRestore.vala:477
+#: ../deja-dup/AssistantRestore.vala:479
 msgid "Your file was successfully restored."
 msgid_plural "Your files were successfully restored."
 msgstr[0] "Votre fichier a été restauré avec succès."
 msgstr[1] "Vos fichiers ont été restaurés avec succès."
 
-#: ../deja-dup/AssistantRestore.vala:484 ../libdeja/Operation.vala:63
+#: ../common/Operation.vala:73 ../deja-dup/AssistantRestore.vala:486
 msgid "Restoring…"
 msgstr "Restauration en cours…"
 
@@ -712,7 +703,6 @@
 msgid "Restore which Files?"
 msgstr "Restaurer quels fichiers ?"
 
-#. Hours
 #: ../deja-dup/AssistantRestoreMissing.vala:346
 msgid "Scanning for files from up to a day ago…"
 msgstr "Recherche de fichiers jusqu'à une journée en arrière…"
@@ -739,7 +729,7 @@
 msgstr[0] "Recherche de fichiers datant d'environ un an…"
 msgstr[1] "Recherche de fichiers datant d'environ %d ans…"
 
-#: ../deja-dup/AssistantRestoreMissing.vala:454
+#: ../deja-dup/AssistantRestoreMissing.vala:455
 msgid "Scanning finished"
 msgstr "Recherche terminée"
 
@@ -752,11 +742,11 @@
 msgid "_Forward"
 msgstr "_Suivant"
 
-#: ../deja-dup/Assistant.vala:317
+#: ../deja-dup/Assistant.vala:309
 msgid "Co_ntinue"
 msgstr "Co_ntinuer"
 
-#: ../deja-dup/Assistant.vala:323
+#: ../deja-dup/Assistant.vala:322
 msgctxt "verb"
 msgid "_Test"
 msgstr "_Tester"
@@ -774,12 +764,12 @@
 msgid "_Back"
 msgstr "_Précédent"
 
-#: ../deja-dup/Assistant.vala:360 ../deja-dup/StatusIcon.vala:93
+#: ../deja-dup/Assistant.vala:347 ../deja-dup/StatusIcon.vala:93
 msgid "_Resume Later"
 msgstr "_Reprendre plus tard"
 
-#: ../deja-dup/main.vala:34 ../deja-dup/monitor/monitor.vala:36
-#: ../deja-dup/preferences/preferences-main.vala:87
+#: ../deja-dup/main.vala:34 ../monitor/monitor.vala:36
+#: ../preferences/preferences-main.vala:26
 msgid "Show version"
 msgstr "Afficher la version"
 
@@ -839,11 +829,9 @@
 msgstr "Se connecter à un serveur"
 
 #: ../deja-dup/MountOperationAssistant.vala:37
-#: ../deja-dup/widgets/ConfigLocationDAV.vala:49
-#: ../deja-dup/widgets/ConfigLocationFTP.vala:45
-#: ../deja-dup/widgets/ConfigLocationRackspace.vala:31
-#: ../deja-dup/widgets/ConfigLocationSMB.vala:37
-#: ../deja-dup/widgets/ConfigLocationSSH.vala:40
+#: ../widgets/ConfigLocationDAV.vala:49 ../widgets/ConfigLocationFTP.vala:45
+#: ../widgets/ConfigLocationRackspace.vala:31
+#: ../widgets/ConfigLocationSMB.vala:37 ../widgets/ConfigLocationSSH.vala:40
 msgid "_Username"
 msgstr "Nom d'_utilisateur"
 
@@ -855,20 +843,20 @@
 msgid "S_how password"
 msgstr "_Montrer le mot de passe"
 
-#: ../deja-dup/MountOperationAssistant.vala:80
+#: ../deja-dup/MountOperationAssistant.vala:82
 msgid "Location not available"
 msgstr "Emplacement non disponible"
 
-#: ../deja-dup/MountOperationAssistant.vala:166
+#: ../deja-dup/MountOperationAssistant.vala:168
 msgid "Connect _anonymously"
 msgstr "Se connecter _anonymement"
 
-#: ../deja-dup/MountOperationAssistant.vala:170
+#: ../deja-dup/MountOperationAssistant.vala:172
 msgid "Connect as u_ser"
 msgstr "Se connecter en tant qu'_utilisateur"
 
 #. Translators: this is a Windows networking domain
-#: ../deja-dup/MountOperationAssistant.vala:213
+#: ../deja-dup/MountOperationAssistant.vala:215
 msgid "_Domain"
 msgstr "_Domaine"
 
@@ -921,32 +909,32 @@
 "Tous les fichiers n'ont pas été correctement sauvegardés. Veuillez consulter "
 "la boîte de dialogue pour plus de détails."
 
-#: ../deja-dup/StatusIcon.vala:233
+#: ../deja-dup/StatusIcon.vala:232
 msgid "Starting scheduled backup"
 msgstr "Démarrage de la sauvegarde programmée"
 
-#: ../deja-dup/StatusIcon.vala:236
+#: ../deja-dup/StatusIcon.vala:234
 msgid "Show Progress"
 msgstr "Afficher la progression"
 
-#: ../deja-dup/StatusIcon.vala:274
+#: ../deja-dup/StatusIcon.vala:272
 #, c-format
 msgid "%.1f%% complete"
 msgstr "%.1f%% accompli"
 
-#: ../deja-dup/StatusIcon.vala:287
+#: ../deja-dup/StatusIcon.vala:285
 msgid "Show _Progress"
 msgstr "Afficher la _progression"
 
-#: ../deja-dup/monitor/monitor.vala:159
+#: ../monitor/monitor.vala:156
 msgid "Scheduled backup delayed"
 msgstr "Sauvegarde automatique planifiée retardée"
 
-#: ../deja-dup/preferences/Preferences.vala:77
+#: ../preferences/Preferences.vala:365
 msgid "Categories"
 msgstr "Catégories"
 
-#: ../deja-dup/preferences/Preferences.vala:129
+#: ../preferences/Preferences.vala:224
 msgid "_Restore…"
 msgstr "_Restaurer…"
 
@@ -954,13 +942,13 @@
 msgid "_Back Up Now…"
 msgstr "_Démarrer la sauvegarde…"
 
-#: ../deja-dup/preferences/Preferences.vala:180
+#: ../preferences/Preferences.vala:252
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
 #: ../deja-dup/preferences/Preferences.vala:213
 msgid "_Storage location"
-msgstr ""
+msgstr "_Emplacement de stockage"
 
 #. Translators: storage as in "where to store the backup"
 #: ../deja-dup/preferences/Preferences.vala:230
@@ -985,6 +973,8 @@
 msgid ""
 "Old backups will be deleted earlier if the storage location is low on space."
 msgstr ""
+"Les anciennes sauvegardes seront supprimées plus tôt si l'emplacement de "
+"stockage manque d'espace."
 
 #: ../deja-dup/preferences/Preferences.vala:294
 msgid "Scheduling"
@@ -998,19 +988,19 @@
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../deja-dup/widgets/ConfigDelete.vala:40
+#: ../widgets/ConfigDelete.vala:46
 msgid "At least six months"
 msgstr "Au moins six mois"
 
-#: ../deja-dup/widgets/ConfigDelete.vala:41
+#: ../widgets/ConfigDelete.vala:47
 msgid "At least a year"
 msgstr "Au moins un an"
 
-#: ../deja-dup/widgets/ConfigDelete.vala:42
+#: ../widgets/ConfigDelete.vala:48
 msgid "Forever"
 msgstr "Indéfiniment"
 
-#: ../deja-dup/widgets/ConfigDelete.vala:89
+#: ../widgets/ConfigDelete.vala:95
 #, c-format
 msgid "At least %d day"
 msgid_plural "At least %d days"
@@ -1109,115 +1099,105 @@
 msgstr[0] "Une sauvegarde démarre automatiquement tous les jours."
 msgstr[1] "Une sauvegarde démarre automatiquement tous les %d jours."
 
-#: ../deja-dup/widgets/ConfigList.vala:178
-#: ../deja-dup/widgets/ConfigList.vala:256
+#: ../widgets/ConfigList.vala:179
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../deja-dup/widgets/ConfigList.vala:179
+#: ../widgets/ConfigList.vala:180
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../deja-dup/widgets/ConfigList.vala:187
+#: ../widgets/ConfigList.vala:188
 msgid "_Remove"
 msgstr "_Retirer"
 
-#: ../deja-dup/widgets/ConfigList.vala:188
+#: ../widgets/ConfigList.vala:189
 msgid "Remove"
 msgstr "Retirer"
 
-#: ../deja-dup/widgets/ConfigList.vala:252
+#: ../widgets/ConfigList.vala:275
 msgid "Choose folders"
 msgstr "Choisissez les dossiers"
 
-#. Now insert remote servers
-#: ../deja-dup/widgets/ConfigLocation.vala:118
+#: ../widgets/ConfigLocation.vala:118
 msgid "SSH"
 msgstr "SSH"
 
-#: ../deja-dup/widgets/ConfigLocation.vala:120
+#: ../widgets/ConfigLocation.vala:120
 msgid "Windows Share"
 msgstr "Partage Windows"
 
-#: ../deja-dup/widgets/ConfigLocation.vala:122
+#: ../widgets/ConfigLocation.vala:122
 msgid "FTP"
 msgstr "FTP"
 
-#: ../deja-dup/widgets/ConfigLocation.vala:124
+#: ../widgets/ConfigLocation.vala:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../deja-dup/widgets/ConfigLocation.vala:127
+#: ../widgets/ConfigLocation.vala:127
 msgid "Custom Location"
 msgstr "Emplacement personnalisé"
 
 #. And a local folder option
-#: ../deja-dup/widgets/ConfigLocation.vala:133
+#: ../widgets/ConfigLocation.vala:133
 msgid "Local Folder"
 msgstr "Dossier local"
 
-#: ../deja-dup/widgets/ConfigLocation.vala:176 ../libdeja/BackendS3.vala:122
+#: ../common/BackendS3.vala:122 ../widgets/ConfigLocation.vala:176
 msgid "Amazon S3"
 msgstr "Amazon S3"
 
-#: ../deja-dup/widgets/ConfigLocation.vala:186 ../libdeja/BackendU1.vala:170
+#: ../common/BackendU1.vala:166 ../widgets/ConfigLocation.vala:186
 msgid "Ubuntu One"
 msgstr "Ubuntu One"
 
-#: ../deja-dup/widgets/ConfigLocation.vala:194
-#: ../libdeja/BackendRackspace.vala:69
+#: ../common/BackendRackspace.vala:69 ../widgets/ConfigLocation.vala:194
 msgid "Rackspace Cloud Files"
 msgstr "Service de stockage de fichiers Rackspace"
 
-#: ../deja-dup/widgets/ConfigLocationCustom.vala:34
+#: ../widgets/ConfigLocationCustom.vala:33
 msgid "_URI"
 msgstr "_URI"
 
-#: ../deja-dup/widgets/ConfigLocationDAV.vala:31
-#: ../deja-dup/widgets/ConfigLocationFTP.vala:32
-#: ../deja-dup/widgets/ConfigLocationSMB.vala:31
-#: ../deja-dup/widgets/ConfigLocationSSH.vala:31
+#: ../widgets/ConfigLocationDAV.vala:31 ../widgets/ConfigLocationFTP.vala:32
+#: ../widgets/ConfigLocationSMB.vala:31 ../widgets/ConfigLocationSSH.vala:31
 msgid "_Server"
 msgstr "_Serveur"
 
-#: ../deja-dup/widgets/ConfigLocationDAV.vala:38
+#: ../widgets/ConfigLocationDAV.vala:38
 msgid "Use secure connection (_HTTPS)"
 msgstr "Utiliser une connexion sécurisée (_HTTPS)"
 
-#: ../deja-dup/widgets/ConfigLocationDAV.vala:43
-#: ../deja-dup/widgets/ConfigLocationFTP.vala:35
-#: ../deja-dup/widgets/ConfigLocationSSH.vala:34
+#: ../widgets/ConfigLocationDAV.vala:43 ../widgets/ConfigLocationFTP.vala:35
+#: ../widgets/ConfigLocationSSH.vala:34
 msgid "_Port"
 msgstr "_Port"
 
-#: ../deja-dup/widgets/ConfigLocationDAV.vala:46
-#: ../deja-dup/widgets/ConfigLocationFTP.vala:38
-#: ../deja-dup/widgets/ConfigLocationFile.vala:45
-#: ../deja-dup/widgets/ConfigLocationS3.vala:33
-#: ../deja-dup/widgets/ConfigLocationSMB.vala:34
-#: ../deja-dup/widgets/ConfigLocationSSH.vala:37
-#: ../deja-dup/widgets/ConfigLocationU1.vala:33
-#: ../deja-dup/widgets/ConfigLocationVolume.vala:33
+#: ../widgets/ConfigLocationDAV.vala:46 ../widgets/ConfigLocationFTP.vala:38
+#: ../widgets/ConfigLocationFile.vala:45 ../widgets/ConfigLocationS3.vala:33
+#: ../widgets/ConfigLocationSMB.vala:34 ../widgets/ConfigLocationSSH.vala:37
+#: ../widgets/ConfigLocationU1.vala:33 ../widgets/ConfigLocationVolume.vala:33
 msgid "_Folder"
 msgstr "_Dossier"
 
-#: ../deja-dup/widgets/ConfigLocationFile.vala:39
+#: ../widgets/ConfigLocationFile.vala:39
 msgid "_Choose Folder…"
 msgstr "_Choisir un dossier…"
 
-#: ../deja-dup/widgets/ConfigLocationFile.vala:50
+#: ../widgets/ConfigLocationFile.vala:50
 msgid "Choose Folder"
 msgstr "Choisir un dossier"
 
-#: ../deja-dup/widgets/ConfigLocationRackspace.vala:33
+#: ../widgets/ConfigLocationRackspace.vala:33
 msgid "_Container"
 msgstr "_Conteneur"
 
-#: ../deja-dup/widgets/ConfigLocationS3.vala:31
+#: ../widgets/ConfigLocationS3.vala:31
 msgid "S3 Access Key I_D"
 msgstr "L'Access Key I_D de S3"
 
-#: ../deja-dup/widgets/ConfigLocationSMB.vala:40
+#: ../widgets/ConfigLocationSMB.vala:40
 msgid "_Domain Name"
 msgstr "Nom de _domaine"
 
@@ -1236,53 +1216,53 @@
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: ../deja-dup/widgets/WidgetUtils.vala:33
+#: ../widgets/WidgetUtils.vala:30
 #, c-format
 msgid "Could not display %s"
 msgstr "Impossible d'afficher %s"
 
 #. Translators: %2$s is the name of a removable drive, %1$s is a folder
 #. on that removable drive.
-#: ../libdeja/BackendFile.vala:135 ../libdeja/CommonUtils.vala:513
+#: ../common/BackendFile.vala:135 ../common/CommonUtils.vala:494
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s dans %2$s"
 
-#: ../libdeja/BackendFile.vala:168
+#: ../common/BackendFile.vala:168
 #, c-format
 msgid "Backup will begin when %s becomes connected."
 msgstr "La sauvegarde commencera lorsque %s sera connecté."
 
-#: ../libdeja/BackendFile.vala:175 ../libdeja/BackendRackspace.vala:49
-#: ../libdeja/BackendS3.vala:59 ../libdeja/BackendU1.vala:150
+#: ../common/BackendFile.vala:175 ../common/BackendRackspace.vala:49
+#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:150
 msgid "Backup will begin when a network connection becomes available."
 msgstr ""
 "La sauvegarde commencera lorsqu'une connexion réseau sera disponible."
 
-#: ../libdeja/BackendFile.vala:384 ../libdeja/BackendFile.vala:448
+#: ../common/BackendFile.vala:384 ../common/BackendFile.vala:448
 msgid "Backup location not available"
 msgstr "Destination de sauvegarde indisponible"
 
-#: ../libdeja/BackendFile.vala:385
+#: ../common/BackendFile.vala:385
 msgid "Waiting for a network connection…"
 msgstr "En attente d'une connexion réseau…"
 
-#: ../libdeja/BackendFile.vala:448
+#: ../common/BackendFile.vala:448
 #, c-format
 msgid "Waiting for ‘%s’ to become connected…"
 msgstr "En attente que « %s » soit connecté…"
 
 #. Translators: %s is a folder.
-#: ../libdeja/BackendRackspace.vala:72
+#: ../common/BackendRackspace.vala:72
 #, c-format
 msgid "%s on Rackspace Cloud Files"
 msgstr "%s sur le service de stockage de fichiers Rackspace"
 
-#: ../libdeja/BackendRackspace.vala:115 ../libdeja/BackendS3.vala:168
+#: ../common/BackendRackspace.vala:119 ../common/BackendS3.vala:172
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: ../libdeja/BackendRackspace.vala:146
+#: ../common/BackendRackspace.vala:140
 #, c-format
 msgid ""
 "You can sign up for a Rackspace Cloud Files account <a "
@@ -1291,178 +1271,174 @@
 "Vous pouvez créer un compte sur le service de stockage de fichiers Rackspace "
 "<a href=\"%s\">en ligne</a>."
 
-#: ../libdeja/BackendRackspace.vala:147
+#: ../common/BackendRackspace.vala:141
 msgid "Connect to Rackspace Cloud Files"
 msgstr "Connexion à Rackspace Cloud Files"
 
-#: ../libdeja/BackendRackspace.vala:148
+#: ../common/BackendRackspace.vala:142
 msgid "_API access key"
 msgstr "Clé d'accès _API"
 
-#: ../libdeja/BackendRackspace.vala:149
+#: ../common/BackendRackspace.vala:143
 msgid "S_how API access key"
 msgstr "_Afficher la clé d'accès de l'API"
 
-#: ../libdeja/BackendRackspace.vala:150
+#: ../common/BackendRackspace.vala:144
 msgid "_Remember API access key"
 msgstr "Se _souvenir de la clé d'accès de l'API"
 
 #. Translators: %s is a folder.
-#: ../libdeja/BackendS3.vala:125
+#: ../common/BackendS3.vala:125
 #, c-format
 msgid "%s on Amazon S3"
 msgstr "%s sur Amazon S3"
 
-#: ../libdeja/BackendS3.vala:199
+#: ../common/BackendS3.vala:193
 #, c-format
 msgid "You can sign up for an Amazon S3 account <a href=\"%s\">online</a>."
 msgstr ""
 "Vous pouvez vous créer un compte Amazon S3 <a href=\"%s\">en ligne</a>."
 
-#: ../libdeja/BackendS3.vala:200
+#: ../common/BackendS3.vala:194
 msgid "Connect to Amazon S3"
 msgstr "Connexion à Amazon S3"
 
-#: ../libdeja/BackendS3.vala:201
+#: ../common/BackendS3.vala:195
 msgid "_Access key ID"
 msgstr "ID de la clé d'_accès"
 
-#: ../libdeja/BackendS3.vala:202
+#: ../common/BackendS3.vala:196
 msgid "_Secret access key"
 msgstr "Clé d'accès _secrète"
 
-#: ../libdeja/BackendS3.vala:203
+#: ../common/BackendS3.vala:197
 msgid "S_how secret access key"
 msgstr "M_ontrer la clé d'accès secrète"
 
-#: ../libdeja/BackendS3.vala:204
+#: ../common/BackendS3.vala:198
 msgid "_Remember secret access key"
 msgstr "_Retenir la clé d'accès secrète"
 
 #. Translators: %s is a folder.
-#: ../libdeja/BackendU1.vala:173
+#: ../common/BackendU1.vala:169
 #, c-format
 msgid "%s on Ubuntu One"
 msgstr "%s sur Ubuntu One"
 
-#: ../libdeja/BackendU1.vala:259
+#: ../common/BackendU1.vala:236
 msgid "Connect to Ubuntu One"
 msgstr "Connexion à Ubuntu One"
 
-#: ../libdeja/BackendU1.vala:260
+#: ../common/BackendU1.vala:237
 msgid "Sign into Ubuntu One…"
 msgstr "Se connecter à Ubuntu One…"
 
-#: ../libdeja/CommonUtils.vala:432
+#: ../common/CommonUtils.vala:435
 #, c-format
 msgid "Could not find backup tool in %s.  Your installation is incomplete."
 msgstr ""
 "Impossible de trouver l'outil de sauvegarde dans %s.  Votre installation est "
 "incomplète."
 
-#: ../libdeja/CommonUtils.vala:434
+#: ../common/CommonUtils.vala:437
 msgid "Could not load backup tool.  Your installation is incomplete."
 msgstr ""
 "Impossible de charger l'outil de sauvegarde. Votre installation est "
 "incomplète."
 
-#: ../libdeja/CommonUtils.vala:440
+#: ../common/CommonUtils.vala:443
 msgid "Backup tool is broken.  Your installation is incomplete."
 msgstr ""
 "L'outil de sauvegarde est endommagé. Votre installation est incomplète."
 
-#: ../libdeja/CommonUtils.vala:462
+#: ../common/CommonUtils.vala:465
 msgid "Could not start backup tool"
 msgstr "Impossible de démarrer l'outil de sauvegarde"
 
 #. Translators: this is the home folder and %s is the user's username
-#: ../libdeja/CommonUtils.vala:564
+#: ../common/CommonUtils.vala:545
 #, c-format
 msgid "Home (%s)"
 msgstr "Dossier personnel (%s)"
 
 #. Translators: this is the home folder
-#: ../libdeja/CommonUtils.vala:569
+#: ../common/CommonUtils.vala:550
 msgid "Home"
 msgstr "Dossier personnel"
 
 #. Translators: this is the trash folder
-#: ../libdeja/CommonUtils.vala:574
+#: ../common/CommonUtils.vala:555
 msgid "Trash"
 msgstr "Corbeille"
 
-#: ../libdeja/OperationBackup.vala:42 ../libdeja/OperationVerify.vala:56
+#: ../common/OperationBackup.vala:42 ../common/OperationVerify.vala:56
 msgid "Verifying backup…"
 msgstr "Vérification de la sauvegarde…"
 
-#: ../libdeja/OperationRestore.vala:51
+#: ../common/OperationRestore.vala:52
 msgid "Restoring files…"
 msgstr "Restauration des fichiers…"
 
-#: ../libdeja/OperationVerify.vala:94
+#: ../common/OperationVerify.vala:94
 msgid ""
 "Your backup appears to be corrupted.  You should delete the backup and try "
 "again."
 msgstr ""
 "Votre sauvegarde semble corrompue. Vous devriez la supprimer et réessayer."
 
-#: ../libdeja/Operation.vala:61
+#: ../common/Operation.vala:71
 msgid "Backing up…"
 msgstr "Sauvegarde en cours…"
 
-#: ../libdeja/Operation.vala:65
+#: ../common/Operation.vala:75
 msgid "Checking for backups…"
 msgstr "Recherche de sauvegardes…"
 
-#: ../libdeja/Operation.vala:67
+#: ../common/Operation.vala:77
 msgid "Listing files…"
 msgstr "Listage des fichiers…"
 
-#: ../libdeja/Operation.vala:69 ../libdeja/Operation.vala:103
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:385
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:392
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:411
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:416
+#: ../common/Duplicity.vala:402 ../common/Duplicity.vala:409
+#: ../common/Duplicity.vala:428 ../common/Duplicity.vala:433
+#: ../common/Operation.vala:79 ../common/Operation.vala:111
 msgid "Preparing…"
 msgstr "Préparation…"
 
-#: ../libdeja/Operation.vala:296
+#: ../common/Operation.vala:281
 msgid "Another backup operation is already running"
 msgstr "Une autre opération de sauvegarde est déjà en cours"
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:89
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:172
+#: ../common/Duplicity.vala:134 ../common/Duplicity.vala:189
 msgid "Paused (no network)"
 msgstr "En pause (pas de connexion)"
 
 #. Was not even a file path (maybe something goofy like computer://)
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:443
+#: ../common/Duplicity.vala:460
 #, c-format
 msgid "Could not restore ‘%s’: Not a valid file location"
 msgstr "Impossible de restaurer « %s » : emplacement de fichier non valide"
 
 #. Tiny backup location.  Suggest they get a larger one.
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:510
+#: ../common/Duplicity.vala:526
 msgid "Backup location is too small.  Try using one with more space."
 msgstr ""
 "L'emplacement où stocker la sauvegarde n'est pas assez grand. Veuillez "
 "utiliser un emplacement ayant davantage d'espace disponible."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:533
+#: ../common/Duplicity.vala:548
 msgid "Backup location does not have enough free space."
 msgstr ""
 "L'emplacement où stocker la sauvegarde n'a pas suffisamment d'espace libre "
 "disponible."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:553
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:567
+#: ../common/Duplicity.vala:567 ../common/Duplicity.vala:581
 msgid "Cleaning up…"
 msgstr "Nettoyage…"
 
 #. OK, we succeeded yay!  But some files didn't make it into the backup
 #. because we couldn't read them.  So tell the user so they don't think
 #. everything is hunky dory.
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:663
+#: ../common/Duplicity.vala:677
 msgid ""
 "Could not back up the following files.  Please make sure you are able to "
 "open them."
@@ -1473,7 +1449,7 @@
 #. OK, we succeeded yay!  But some files didn't actually restore
 #. because we couldn't write to them.  So tell the user so they
 #. don't think everything is hunky dory.
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:679
+#: ../common/Duplicity.vala:693
 msgid ""
 "Could not restore the following files.  Please make sure you are able to "
 "write to them."
@@ -1481,10 +1457,7 @@
 "Les fichiers suivants n'ont pas pu être restaurés. Assurez-vous qu'ils ne "
 "sont pas en lecture seule."
 
-#. make text a little nicer than duplicity gives
-#. duplicity gives something like "home/blah/blah not found in archive,
-#. no files restored".
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:923
+#: ../common/Duplicity.vala:940
 #, c-format
 msgid "Could not restore ‘%s’: File not found in backup"
 msgstr ""
@@ -1493,17 +1466,16 @@
 #. notify upper layers, if they want to do anything
 #. Duplicity tried to ask the user what the encryption password is.
 #. notify upper layers, if they want to do anything
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:929
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1027
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1031
+#: ../common/Duplicity.vala:946 ../common/Duplicity.vala:1044
+#: ../common/Duplicity.vala:1048
 msgid "Bad encryption password."
 msgstr "Mauvais mot de passe de chiffrement."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:934
+#: ../common/Duplicity.vala:951
 msgid "Computer name changed"
 msgstr "Nom de l'ordinateur modifié"
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:934
+#: ../common/Duplicity.vala:951
 #, c-format
 msgid ""
 "The existing backup is of a computer named %s, but the current computer’s "
@@ -1514,83 +1486,81 @@
 "nom de l'ordinateur actuel est « %s ». Si cela vous paraît inattendu, vous "
 "devriez alors enregistrer les sauvegardes ailleurs."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:969
+#: ../common/Duplicity.vala:986
 #, c-format
 msgid "Permission denied when trying to create ‘%s’."
 msgstr "Permission refusée lors de la tentative de création de  « %s »."
 
 #. assume error is on backend side
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:973
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:977
+#: ../common/Duplicity.vala:990 ../common/Duplicity.vala:994
 #, c-format
 msgid "Permission denied when trying to read ‘%s’."
 msgstr "Permission refusée lors de la tentative de lecture de « %s »."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:981
+#: ../common/Duplicity.vala:998
 #, c-format
 msgid "Permission denied when trying to delete ‘%s’."
 msgstr "Permission refusée lors de la tentative de suppression de « %s »."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:988
+#: ../common/Duplicity.vala:1005
 #, c-format
 msgid "Backup location ‘%s’ does not exist."
 msgstr "L'emplacement « %s » de la sauvegarde n'existe pas."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:994
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1046
+#: ../common/Duplicity.vala:1011 ../common/Duplicity.vala:1063
 msgid "No space left."
 msgstr "Plus d'espace libre."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1008
+#: ../common/Duplicity.vala:1025
 msgid "Invalid ID."
 msgstr "Identifiant non valide."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1010
+#: ../common/Duplicity.vala:1027
 msgid "Invalid secret key."
 msgstr "Clé secrète non valide."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1012
+#: ../common/Duplicity.vala:1029
 msgid "Your Amazon Web Services account is not signed up for the S3 service."
 msgstr ""
 "Votre compte Amazon Web Services n'est pas enregistré pour le service S3."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1021
+#: ../common/Duplicity.vala:1038
 msgid "S3 bucket name is not available."
 msgstr "Le nom du bucket S3 n'est pas disponible."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1035
+#: ../common/Duplicity.vala:1052
 #, c-format
 msgid "Error reading file ‘%s’."
 msgstr "Erreur lors de la lecture du fichier « %s »."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1037
+#: ../common/Duplicity.vala:1054
 #, c-format
 msgid "Error writing file ‘%s’."
 msgstr "Erreur lors de l'écriture du fichier « %s »."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1048
+#: ../common/Duplicity.vala:1065
 #, c-format
 msgid "No space left in ‘%s’."
 msgstr "Plus d'espace libre dans « %s »."
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1056
+#: ../common/Duplicity.vala:1073
 msgid "No backup files found"
 msgstr "Aucun fichier de sauvegarde n'a été trouvé"
 
-#: ../libdeja/tools/duplicity/DuplicityJob.vala:1106
+#: ../common/Duplicity.vala:1123
 msgid "Uploading…"
 msgstr "Envoi en cours…"
 
-#: ../libdeja/tools/duplicity/DuplicityPlugin.vala:41
+#: ../tools/duplicity/DuplicityPlugin.vala:41
 msgid "Could not understand duplicity version."
 msgstr "Impossible de comprendre la version de duplicity."
 
-#: ../libdeja/tools/duplicity/DuplicityPlugin.vala:47
+#: ../tools/duplicity/DuplicityPlugin.vala:47
 #, c-format
 msgid "Could not understand duplicity version ‘%s’."
 msgstr "Impossible de comprendre la version « %s » de duplicity."
 
-#: ../libdeja/tools/duplicity/DuplicityPlugin.vala:50
+#: ../common/DuplicityInfo.vala:123
 #, c-format
 msgid ""
 "Déjà Dup Backup Tool requires at least version %d.%d.%.2d of duplicity, but "

=== added file 'po/fr_CA.po'
--- po/fr_CA.po	1970-01-01 00:00:00 +0000
+++ po/fr_CA.po	2014-09-20 15:05:16 +0000
@@ -0,0 +1,1549 @@
+# French (Canada) translation for deja-dup
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the deja-dup package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: deja-dup\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-10 18:29-0500\n"
+"PO-Revision-Date: 2014-07-21 21:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Canada) <[e-mail]>\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: 2014-07-22 07:18+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:1
+#: ../deja-dup/preferences/Preferences.vala:191
+msgid "Folders to save"
+msgstr "Dossiers à enregistrer"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:2
+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."
+msgstr ""
+"Cette liste de répertoires sera sauvegardée. Les valeurs réservées $HOME, "
+"$DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
+"$TEMPLATES, $TRASH et $VIDEO sont reconnues comme étant les répertoires "
+"spéciaux de l'utilisateur. Les entrées relatives le sont par rapport au "
+"répertoire personnel de l'utilisateur."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:3
+#: ../deja-dup/preferences/Preferences.vala:202
+msgid "Folders to ignore"
+msgstr "Dossiers à ignorer"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:4
+msgid ""
+"This list of directories will not 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 ""
+"Cette liste de répertoires ne sera pas sauvegardée. Les valeurs réservées "
+"$HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, "
+"$TEMPLATES, $TRASH et $VIDEO sont reconnues comme étant les répertoires "
+"spéciaux de l'utilisateur. Les entrées relatives le sont par rapport au "
+"répertoire personnel de l'utilisateur."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:5
+msgid "Whether to request the root password"
+msgstr "Le mot de passe de root doit-il être demandé"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:6
+msgid ""
+"Whether to request the root password when backing up from or restoring to "
+"system folders."
+msgstr ""
+"Le mot de passe de root doit-il être demandé lors de la sauvegarde ou la "
+"restauration des dossiers système."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:7
+msgid "The last time Déjà Dup was run"
+msgstr "La dernière fois que Déjà Dup a été exécuté"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:8
+msgid ""
+"The last time Déjà Dup was successfully run. This time should be in ISO 8601 "
+"format."
+msgstr ""
+"La dernière fois que Déjà Dup a été exécuté avec succès. Devrait être au "
+"format ISO 8601."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:9
+msgid "The last time Déjà Dup backed up"
+msgstr "La dernière fois que Déjà Dup a sauvegardé"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:10
+msgid ""
+"The last time Déjà Dup successfully completed a backup. This time should be "
+"in ISO 8601 format."
+msgstr ""
+"La dernière fois que Déjà Dup a terminé une sauvegarde avec succès. Devrait "
+"être au format ISO 8601."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:11
+msgid "The last time Déjà Dup restored"
+msgstr "La dernière fois que Déjà Dup a restauré"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:12
+msgid ""
+"The last time Déjà Dup successfully completed a restore. This time should be "
+"in ISO 8601 format."
+msgstr ""
+"La dernière fois que Déjà Dup a terminé une restauration avec succès. "
+"Devrait être au format ISO 8601."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:13
+msgid "Whether to periodically back up"
+msgstr "Faut-il sauvegarder périodiquement"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:14
+msgid "Whether to automatically back up on a regular schedule."
+msgstr ""
+"Faut-il sauvegarder automatiquement suivant une planification régulière."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:15
+msgid "How often to periodically back up"
+msgstr "Fréquence des sauvegardes périodiques"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:16
+msgid "The number of days between backups."
+msgstr "Le nombre de jours entre les sauvegardes."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:17
+msgid ""
+"The last time Déjà Dup checked whether it should prompt about backing up"
+msgstr ""
+"La dernière fois que Déjà Dup a vérifié s'il devait vous inviter à faire une "
+"sauvegarde"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:18
+msgid ""
+"When a user logs in, the Déjà Dup monitor checks whether it should prompt "
+"about backing up. This is used to increase discoverability for users that "
+"don’t know about backups. This time should be either ‘disabled’ to turn off "
+"this check or in ISO 8601 format."
+msgstr ""
+"Quand un utilisateur se connecte, Déjà Dup vérifie s'il devrait vous inviter "
+"à sauvegarder. Ceci est utilisé pour le faire découvrir aux utilisateurs qui "
+"ne connaissent pas les sauvegardes. Ceci devrait être soit « désactivé » "
+"pour arrêter cette vérification, soit au format ISO 8601."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:19
+msgid ""
+"The last time Déjà Dup checked whether it should prompt about your password"
+msgstr ""
+"La dernière fois que Déjà Dup a vérifié s'il devait vous demander votre mot "
+"de passe"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:20
+msgid ""
+"In order to prevent you from forgetting your passwords, Déjà Dup will "
+"occasionally notify you to confirm the password. This time should be either "
+"‘disabled’ to turn off this check or in ISO 8601 format."
+msgstr ""
+"Afin de vous éviter d'oublier vos mots de passe, Déjà Dup vous avisera "
+"occasionnellement de confirmer le mot de passe. Ceci devrait être soit "
+"« désactivé » pour arrêter cette vérification, soit au format ISO 8601."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:21
+msgid "How long to keep backup files"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:22
+msgid ""
+"The number of days to keep backup files on the backup location. A value of 0 "
+"means forever. This is a minimum number of days; the files may be kept "
+"longer."
+msgstr ""
+"Le nombre de jours de conservation des fichiers de sauvegarde dans "
+"l'emplacement de sauvegarde. Une valeur de 0 signifie pour toujours. C'est "
+"un nombre minimum de jours; les fichiers pourraient être conservés plus "
+"longtemps."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:23
+msgid "How long to wait between full backups"
+msgstr "Durée entre deux sauvegardes complètes"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:24
+msgid ""
+"Déjà Dup needs to occasionally make fresh full backups. This is the number "
+"of days to wait between full backups."
+msgstr ""
+"Déjà Dup doit occasionnellement faire des sauvegardes complètes fraîches. "
+"C'est le nombre de jours d'attente entre deux sauvegardes complètes."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:25
+msgid "Type of location to store backup"
+msgstr "Type d'emplacement pour stocker la sauvegarde"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:26
+msgid ""
+"The type of backup location. If ‘auto’, a default will be chosen based on "
+"what is available."
+msgstr ""
+"Le type d'emplacement de sauvegarde. « auto », choisira par défaut en "
+"fonction de ce qui est disponible."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:27
+msgid "Amazon S3 Access Key ID"
+msgstr "ID de clef d'accès d'Amazon S3"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:28
+msgid "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
+msgstr ""
+"Votre identifiant de clef d'accès d'Amazon S3. Il agit comme votre nom "
+"d'utilisateur S3."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:29
+msgid "The Amazon S3 bucket name to use"
+msgstr "Le nom du compartiment d'Amazon S3 à utiliser"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:30
+msgid ""
+"Which Amazon S3 bucket to store files in. This does not need to exist "
+"already. Only legal hostname strings are valid."
+msgstr ""
+"Dans quel compartiment d'Amazon S3 enregistrer les fichiers. Il n'a pas à "
+"déjà exister. Seules les chaînes de noms d'hôtes légales sont valides."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:31
+msgid "The Amazon S3 folder"
+msgstr "Le dossier Amazon S3"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:32
+msgid ""
+"An optional folder name to store files in. This folder will be created in "
+"the chosen bucket."
+msgstr ""
+"Un nom de dossier optionnel où enregistrer les fichiers. Ce dossier sera "
+"créé dans le compartiment choisi."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:33
+msgid "The Rackspace Cloud Files container"
+msgstr "Le conteneur nuagique de fichiers Rackspace"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:34
+msgid ""
+"Which Rackspace Cloud Files container to store files in. This does not need "
+"to exist already. Only legal hostname strings are valid."
+msgstr ""
+"Dans quel conteneur nuagique de fichiers Rackspace stocker les fichiers. "
+"Ceci ne doit pas nécessairement déjà exister. Seules les chaînes de noms "
+"d'hôtes légales sont valides."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:35
+msgid "Your Rackspace username"
+msgstr "Votre nom d'utilisateur Rackspace"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:36
+msgid "This is your username for the Rackspace Cloud Files service."
+msgstr ""
+"Ceci est votre nom d'utilisateur pour le service nuagique de fichiers "
+"Rackspace"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
+msgid "The Ubuntu One folder"
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
+msgid ""
+"The folder name to store files in. If ‘$HOSTNAME’, it will default to a "
+"folder based on the name of the computer."
+msgstr ""
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:37
+#: ../deja-dup/AssistantRestore.vala:221
+msgid "Backup location"
+msgstr "Emplacement de sauvegarde"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
+msgid "Location in which to hold the backup files."
+msgstr "Emplacement où garder les fichiers de sauvegarde."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
+msgid "Folder type"
+msgstr "Type de dossier"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:40
+msgid ""
+"Whether the backup location is a mounted external volume or a normal folder."
+msgstr ""
+"L'emplacement de sauvegarde est-il un volume externe monté ou un dossier "
+"normal."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:41
+msgid "Relative path under the external volume"
+msgstr "Chemin relatif sous le volume externe"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:42
+msgid ""
+"If the backup location is on an external volume, this is the path of the "
+"folder on that volume."
+msgstr ""
+"Si l'emplacement de sauvegarde est sur un volume externe, ceci est le chemin "
+"du dossier sur ce volume."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:43
+msgid "Unique ID of the external volume"
+msgstr "ID unique du volume externe"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:44
+msgid ""
+"If the backup location is on an external volume, this is its unique "
+"filesystem identifier."
+msgstr ""
+"Si l'emplacement de sauvegarde est sur un volume externe, ceci est son "
+"identifiant unique de système de fichiers."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:45
+msgid "Full name of the external volume"
+msgstr "Nom complet du volume externe"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:46
+msgid ""
+"If the backup location is on an external volume, this is the volume’s longer "
+"descriptive name."
+msgstr ""
+"Si l'emplacement de sauvegarde est sur un volume externe, ceci est le nom "
+"descriptif de ce volume."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:47
+msgid "Short name of the external volume"
+msgstr "Nom court du volume externe"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:48
+msgid ""
+"If the backup location is on an external volume, this is the volume’s "
+"shorter name."
+msgstr ""
+"Si l'emplacement de sauvegarde est sur un volume externe, ceci est le nom "
+"court de ce volume."
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:49
+msgid "Icon of the external volume"
+msgstr "Icône du volume externe"
+
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:50
+msgid ""
+"If the backup location is on an external volume, this is the volume’s icon."
+msgstr ""
+"Si l'emplacement de sauvegarde est sur un volume externe, ceci est l'icône "
+"du volume."
+
+#. Translators: The name is a play on the French phrase "déjà vu" meaning
+#. "already seen", but with the "vu" replaced with "dup".  "Dup" in this
+#. context is itself a reference to both the underlying command line tool
+#. "duplicity" and the act of duplicating data for backup.  As a whole, the
+#. phrase "Déjà Dup" may not be very translatable.
+#: ../deja-dup/deja-dup.appdata.xml.in.h:1 ../deja-dup/deja-dup.desktop.in.h:2
+#: ../deja-dup/main.vala:78 ../libdeja/CommonUtils.vala:133
+msgid "Déjà Dup Backup Tool"
+msgstr "Outil de sauvegarde Déjà Dup"
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:2
+msgid ""
+"Déjà Dup is a simple backup tool. It hides the complexity of backing up the "
+"Right Way (encrypted, off-site, and regular) and uses duplicity as the "
+"backend."
+msgstr ""
+"Déjà Dup est un outil de sauvegarde simple. Il cache la complexité de "
+"sauvegarder de la bonne manière (chiffrée, hors site et régulièrement) et "
+"utilise duplicity comme dorsale."
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:3
+msgid ""
+"Support for local, remote, or cloud backup locations, such as Amazon S3, "
+"Rackspace Cloud Files, and Ubuntu One"
+msgstr ""
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:4
+msgid "Securely encrypts and compresses your data"
+msgstr "Chiffre et compresse vos données en toute sécurité"
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:5
+msgid ""
+"Incrementally backs up, letting you restore from any particular backup"
+msgstr ""
+"Sauvegardes incrémentales vous permettant de restaurer à partir de n'importe "
+"quelle sauvegarde"
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:6
+msgid "Schedules regular backups"
+msgstr "Planifie des sauvegardes régulières"
+
+#: ../deja-dup/deja-dup.appdata.xml.in.h:7
+msgid "Integrates well into your GNOME desktop"
+msgstr "S'intégre bien avec votre bureau GNOME"
+
+#. Translators: "Backups" is a noun
+#: ../deja-dup/deja-dup.desktop.in.h:1
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:1
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:1
+#: ../deja-dup/Prompt.vala:93 ../deja-dup/Prompt.vala:128
+#: ../deja-dup/StatusIcon.vala:133 ../deja-dup/StatusIcon.vala:232
+#: ../deja-dup/monitor/monitor.vala:115
+#: ../deja-dup/preferences/preferences-main.vala:43
+#: ../deja-dup/preferences/preferences-main.vala:123
+msgid "Backups"
+msgstr "Sauvegardes"
+
+#. Translators: Monitor in this sense means something akin to 'watcher', not
+#. a computer screen.  This program acts like a daemon that kicks off
+#. backups at scheduled times.
+#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:1
+#: ../deja-dup/monitor/monitor.vala:328
+msgid "Backup Monitor"
+msgstr "Planificateur de sauvegarde"
+
+#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:2
+msgid "Schedules backups at regular intervals"
+msgstr "Planifie les sauvegardes à intervalles réguliers"
+
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:2
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:2
+msgid "Change your backup settings"
+msgstr ""
+
+#. These keywords are used when searching for applications in dashes, etc.
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:4
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:4
+msgid "déjà;deja;dup;"
+msgstr ""
+
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:5
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:5
+msgid "Back Up"
+msgstr ""
+
+#: ../deja-dup/ui/restore-missing.ui.h:1
+msgid "Folder"
+msgstr ""
+
+#: ../deja-dup/ui/restore-missing.ui.h:2
+#: ../deja-dup/AssistantOperation.vala:177
+msgid "Scanning…"
+msgstr ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:173
+msgid "Restore Missing Files…"
+msgstr ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:174
+msgid "Restore deleted files from backup"
+msgstr ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:216
+msgid "Revert to Previous Version…"
+msgid_plural "Revert to Previous Versions…"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/nautilus/NautilusExtension.c:220
+msgid "Restore file from backup"
+msgid_plural "Restore files from backup"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../deja-dup/AssistantBackup.vala:31
+msgctxt "back up is verb"
+msgid "Back Up"
+msgstr ""
+
+#: ../deja-dup/AssistantBackup.vala:32
+msgctxt "back up is verb"