diff --git a/po/fr_FR.po b/po/fr_FR.po
index 2c450fdc..12e35764 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SparkleShare\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-25 06:12+0000\n"
+"POT-Creation-Date: 2010-07-29 06:23+0000\n"
 "PO-Revision-Date: 2010-07-13 16:07+0800\n"
 "Last-Translator: Yann Hermans <chezyann@gmail.com>\n"
 "Language-Team: French (France)\n"
@@ -20,240 +20,279 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../SparkleDiff/SparkleDiff.cs:77 ../SparkleShare/SparkleShare.cs:50
+#: ../SparkleDiff/SparkleDiff.cs:77 ../SparkleShare/SparkleShare.cs:49
 msgid "Git wasn't found."
 msgstr "Git n’a pas été détecté."
 
-#: ../SparkleDiff/SparkleDiff.cs:78 ../SparkleShare/SparkleShare.cs:51
+#: ../SparkleDiff/SparkleDiff.cs:78 ../SparkleShare/SparkleShare.cs:50
 msgid "You can get Git from http://git-scm.com/."
 msgstr "Vous pouvez récupérer Git sur http://git-scm.com/."
 
-#: ../SparkleDiff/SparkleDiff.cs:86 ../SparkleShare/SparkleShare.cs:58
+#: ../SparkleDiff/SparkleDiff.cs:86 ../SparkleShare/SparkleShare.cs:57
 msgid "Sorry, you can't run SparkleShare with these permissions."
 msgstr "Désolé, vous ne disposez pas des autorisations nécessaires pour lancer SparkleShare."
 
-#: ../SparkleDiff/SparkleDiff.cs:87 ../SparkleShare/SparkleShare.cs:59
+#: ../SparkleDiff/SparkleDiff.cs:87 ../SparkleShare/SparkleShare.cs:58
 msgid "Things would go utterly wrong."
 msgstr "Les choses pourraient très mal tourner."
 
-#: ../SparkleDiff/SparkleDiff.cs:157
+#: ../SparkleDiff/SparkleDiff.cs:161
 msgid "SparkleDiff Copyright (C) 2010 Hylke Bons"
 msgstr "Copyright (C) SparkleDiff 2010 Hylke Bons"
 
-#: ../SparkleDiff/SparkleDiff.cs:159 ../SparkleShare/SparkleShare.cs:90
+#: ../SparkleDiff/SparkleDiff.cs:163 ../SparkleShare/SparkleShare.cs:89
 msgid "This program comes with ABSOLUTELY NO WARRANTY."
 msgstr "Ce logiciel est diffusé sans AUCUNE GARANTIE."
 
-#: ../SparkleDiff/SparkleDiff.cs:160 ../SparkleShare/SparkleShare.cs:91
+#: ../SparkleDiff/SparkleDiff.cs:164 ../SparkleShare/SparkleShare.cs:90
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Ce logiciel est libre, et vous êtes invité à le re‑distribuer "
 
-#: ../SparkleDiff/SparkleDiff.cs:161 ../SparkleShare/SparkleShare.cs:92
+#: ../SparkleDiff/SparkleDiff.cs:165 ../SparkleShare/SparkleShare.cs:91
 msgid "under certain conditions. Please read the GNU GPLv3 for details."
 msgstr "sous certaines conditions. Merci de lire la licence GNU GPLv3 pour de plus amples informations."
 
-#: ../SparkleDiff/SparkleDiff.cs:163
+#: ../SparkleDiff/SparkleDiff.cs:167
 msgid "SparkleDiff let's you compare revisions of an image file side by side."
 msgstr "SparkleDiff vous permet de comparer les versions d’une image côte à côte."
 
-#: ../SparkleDiff/SparkleDiff.cs:165
+#: ../SparkleDiff/SparkleDiff.cs:169
 msgid "Usage: sparklediff [FILE]"
 msgstr "Utilisation : sparklediff [FICHIER]"
 
-#: ../SparkleDiff/SparkleDiff.cs:166
+#: ../SparkleDiff/SparkleDiff.cs:170
 msgid "Open an image file to show its revisions"
 msgstr "Ouvrir une image pour en afficher les versions"
 
-#: ../SparkleDiff/SparkleDiff.cs:168 ../SparkleShare/SparkleShare.cs:99
+#: ../SparkleDiff/SparkleDiff.cs:172 ../SparkleShare/SparkleShare.cs:98
 msgid "Arguments:"
 msgstr "Paramètres :"
 
-#: ../SparkleDiff/SparkleDiff.cs:169 ../SparkleShare/SparkleShare.cs:101
+#: ../SparkleDiff/SparkleDiff.cs:173 ../SparkleShare/SparkleShare.cs:100
 msgid "\t -h, --help\t\tDisplay this help text."
 msgstr "\t -h, --help\t\tAffiche ce texte d’aide."
 
-#. TRANSLATORS: The parameter is a filename
-#: ../SparkleDiff/SparkleDiffWindow.cs:53
+#: ../SparkleDiff/SparkleDiffWindow.cs:92
 #, csharp-format
-msgid "Comparing Revisions of ‘{0}’"
-msgstr "Compare les versions de « {0} »"
+msgid "{0} at {1}"
+msgstr "{0} sur {1}"
 
-#: ../SparkleDiff/SparkleDiffWindow.cs:81
-msgid "Current Revision"
-msgstr "Version actuelle"
+#: ../SparkleDiff/SparkleDiffWindow.cs:93
+msgid "ddd MMM d, yyyy"
+msgstr "ddd d MMM yyyy"
 
-#. TRANSLATORS: This is a format specifier according to
-#. System.Globalization.DateTimeFormatInfo
-#: ../SparkleDiff/SparkleDiffWindow.cs:85
-msgid "d MMM\tH:mm"
-msgstr "d MMM\tH:mm"
+#: ../SparkleDiff/SparkleDiffWindow.cs:94
+msgid "H:mm"
+msgstr "H:mm"
 
-#: ../SparkleShare/SparkleDialog.cs:50
+#: ../SparkleShare/SparkleDialog.cs:51
 msgid "Address of remote SparkleShare folder:"
 msgstr "Adresse du dossier distant SparkleShare :"
 
-#: ../SparkleShare/SparkleDialog.cs:81
+#: ../SparkleShare/SparkleDialog.cs:82
 msgid "Add Folder"
 msgstr "Ajouter un dossier"
 
-#: ../SparkleShare/SparkleDialog.cs:126
+#: ../SparkleShare/SparkleDialog.cs:127
 #, csharp-format
 msgid "Syncing folder ‘{0}’"
 msgstr "Synchronise le dossier « {0} »"
 
-#: ../SparkleShare/SparkleDialog.cs:127
+#: ../SparkleShare/SparkleDialog.cs:128
 msgid "SparkleShare will notify you when this is done."
 msgstr "SparkleShare vous signalera la fin de l’opération."
 
-#: ../SparkleShare/SparkleDialog.cs:129
+#: ../SparkleShare/SparkleDialog.cs:130
 msgid "Dismiss"
 msgstr "Abandonner"
 
-#: ../SparkleShare/SparkleDialog.cs:157
+#: ../SparkleShare/SparkleDialog.cs:158
 #, csharp-format
 msgid "Something went wrong while syncing ‘{0}’"
 msgstr "Une erreur est survenue lors de la synchronisation de « {0} »"
 
-#: ../SparkleShare/SparkleDialog.cs:167
+#: ../SparkleShare/SparkleDialog.cs:168
 msgid "Try Again…"
 msgstr "Essayer de nouveau…"
 
-#: ../SparkleShare/SparkleDialog.cs:197
+#: ../SparkleShare/SparkleDialog.cs:198
 #, csharp-format
 msgid "Successfully synced folder ‘{0}’"
 msgstr "Le dossier « {0} » a été synchronisé avec succès"
 
-#: ../SparkleShare/SparkleDialog.cs:198
+#: ../SparkleShare/SparkleDialog.cs:199
 msgid "Now make great stuff happen!"
 msgstr "Maintenant, la magie peut opérer !"
 
-#. Add a button to open the folder where the changed file is
-#: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319
-#: ../SparkleShare/SparkleWindow.cs:63
+#: ../SparkleShare/SparkleDialog.cs:201 ../SparkleShare/SparkleWindow.cs:62
 msgid "Open Folder"
 msgstr "Ouvrir le dossier"
 
-#: ../SparkleShare/SparkleHelpers.cs:164
+#: ../SparkleShare/SparkleHelpers.cs:136
 #, csharp-format
 msgid "a second ago"
 msgid_plural "{0} seconds ago"
 msgstr[0] "il y a une seconde"
 msgstr[1] "il y a {0} secondes"
 
-#: ../SparkleShare/SparkleHelpers.cs:170
+#: ../SparkleShare/SparkleHelpers.cs:142
 #, csharp-format
 msgid "a minute ago"
 msgid_plural "about {0} minutes ago"
 msgstr[0] "il y a une minute"
 msgstr[1] "il y a environ {0} minutes"
 
-#: ../SparkleShare/SparkleHelpers.cs:176
+#: ../SparkleShare/SparkleHelpers.cs:148
 #, csharp-format
 msgid "about an hour ago"
 msgid_plural "about {0} hours ago"
 msgstr[0] "il y a environ une heure"
 msgstr[1] "il y a environ {0} heures"
 
-#: ../SparkleShare/SparkleHelpers.cs:182
+#: ../SparkleShare/SparkleHelpers.cs:154
 #, csharp-format
 msgid "yesterday"
 msgid_plural "{0} days ago"
 msgstr[0] "hier"
 msgstr[1] "il y a {0} jours"
 
-#: ../SparkleShare/SparkleHelpers.cs:188
+#: ../SparkleShare/SparkleHelpers.cs:160
 #, csharp-format
 msgid "a month ago"
 msgid_plural "{0} months ago"
 msgstr[0] "il y a un mois"
 msgstr[1] "il y a {0} mois"
 
-#: ../SparkleShare/SparkleHelpers.cs:193
+#: ../SparkleShare/SparkleHelpers.cs:165
 #, csharp-format
 msgid "a year ago"
 msgid_plural "{0} years ago"
 msgstr[0] "il y a un an"
 msgstr[1] "il y a {0} ans"
 
-#: ../SparkleShare/SparkleHelpers.cs:205
-msgid "Hold your ponies!"
-msgstr "Restons calme !"
-
-#: ../SparkleShare/SparkleHelpers.cs:206
-msgid ""
-"SparkleShare is known to be insanely fast with \n"
-"pictures of unicorns. Please make sure your internets\n"
-"are upgraded to the latest version to avoid problems."
-msgstr ""
-"SparkleShare est réputé pour son hallucinante rapidité\n"
-"concernant les images de licornes. Merci de vérifier que\n"
-"votre navigateur est à jour pour éviter tout problème."
-
-#: ../SparkleShare/SparkleShare.cs:88
-msgid "SparkleShare Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) SparkleShare 2010 Hylke Bons"
-
-#: ../SparkleShare/SparkleShare.cs:94
-msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories."
-msgstr "SparkleShare synchronize le dossier ~/SparkleShare avec les dépôts distants."
-
-#: ../SparkleShare/SparkleShare.cs:96
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Utilisation : sparkleshare [start|stop|restart] [OPTION]…"
-
-#: ../SparkleShare/SparkleShare.cs:97
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synchroniser le dossier SparkleShare avec les dépôts distants."
-
-#: ../SparkleShare/SparkleShare.cs:100
-msgid "\t -d, --disable-gui\tDon't show the notification icon."
-msgstr "\t -d, --disable-gui\tMasquer l’icône de notification."
-
-#: ../SparkleShare/SparkleStatusIcon.cs:69
-msgid "Error syncing"
-msgstr "Erreur de synchronisation"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:72
-msgid "Everything is up to date"
-msgstr "Tout est à jour"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:75
-msgid "Syncing…"
-msgstr "Synchronisation en cours…"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:116
-msgid "Add a Remote Folder…"
-msgstr "Ajouter un dossier distant…"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:124
-msgid "Show Notifications"
-msgstr "Montrer les notifications"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:142
-msgid "Visit Website"
-msgstr "Visiter le site web"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:159
-msgid "Quit"
-msgstr "Quitter"
-
-#: ../SparkleShare/SparkleUI.cs:145
+#: ../SparkleShare/SparkleIntro.cs:72
 msgid "Welcome to SparkleShare!"
 msgstr "Bienvenue sur SparkleShare !"
 
-#: ../SparkleShare/SparkleUI.cs:146
-msgid "You don't have any folders set up yet."
-msgstr "Vous n’avez encore configuré aucun dossier."
+#: ../SparkleShare/SparkleIntro.cs:78
+msgid "Before we can create a SparkleShare folder on this computer, we need a few bits of information from you."
+msgstr "Afin de pouvoir créer un dossier SparkleShare sur cet ordinateur, nous avons besoin de quelques informations."
 
-#: ../SparkleShare/SparkleUI.cs:149
-msgid "Add a Folder…"
-msgstr "Ajouter un dossier…"
+#: ../SparkleShare/SparkleIntro.cs:90
+msgid "Full Name:"
+msgstr "Nom et prénom:"
+
+#: ../SparkleShare/SparkleIntro.cs:106
+msgid "Email:"
+msgstr "Email:"
+
+#: ../SparkleShare/SparkleIntro.cs:115
+msgid "Folder Address:"
+msgstr "Adresse du dossier:"
+
+#: ../SparkleShare/SparkleIntro.cs:122
+msgid "I'm already subscribed to a folder on a SparkleServer"
+msgstr "Je suis déjà assigné à un dossier sur le serveur SparkleServer"
+
+#: ../SparkleShare/SparkleIntro.cs:157
+msgid "Next"
+msgstr "Suivant"
+
+#: ../SparkleShare/SparkleIntro.cs:168
+msgid "Configuring…"
+msgstr "Configuration en cours..."
+
+#: ../SparkleShare/SparkleIntro.cs:220
+msgid "SparkleShare is ready to go!"
+msgstr "SparkleShare est opérationnel!"
+
+#: ../SparkleShare/SparkleIntro.cs:226
+msgid "Now you can start accepting invitations from others. Just click on invitations you get by email and we will take care of the rest."
+msgstr ""
+"Vous pouvez désormais accepter des invitations.\r\n"
+"Pour cela, il vous suffira de cliquer sur les invitations que vous aurez reçues par mail et nous nous occuperons du reste."
+
+#: ../SparkleShare/SparkleIntro.cs:237
+msgid "Learn how to host your own SparkleServer"
+msgstr "Apprendre à héberger son propre serveur SparkleServer"
+
+#: ../SparkleShare/SparkleIntro.cs:250
+msgid "Finish"
+msgstr "Terminer"
+
+#: ../SparkleShare/SparkleShare.cs:87
+msgid "SparkleShare Copyright (C) 2010 Hylke Bons"
+msgstr "Copyright (C) SparkleShare 2010 Hylke Bons"
+
+#: ../SparkleShare/SparkleShare.cs:93
+msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories."
+msgstr "SparkleShare synchronize le dossier ~/SparkleShare avec les dépôts distants."
+
+#: ../SparkleShare/SparkleShare.cs:95
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr "Utilisation : sparkleshare [start|stop|restart] [OPTION]…"
+
+#: ../SparkleShare/SparkleShare.cs:96
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr "Synchroniser le dossier SparkleShare avec les dépôts distants."
+
+#: ../SparkleShare/SparkleShare.cs:99
+msgid "\t -d, --disable-gui\tDon't show the notification icon."
+msgstr "\t -d, --disable-gui\tMasquer l’icône de notification."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:130
+msgid "SparkleShare Folder"
+msgstr "Dossier SparkleShare "
+
+#: ../SparkleShare/SparkleStatusIcon.cs:163
+msgid "No Shared Folders Yet"
+msgstr "Encore aucun dossier de partagé"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:171
+msgid "Add Remote Folder…"
+msgstr "Ajouter un dossier distant..."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:184
+msgid "Show Notifications"
+msgstr "Montrer les notifications"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:205
+msgid "About"
+msgstr "A propos"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:222
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:271
+msgid "All up to date"
+msgstr "Tous à jour"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:280
+msgid "Syncing…"
+msgstr "Synchronisation en cours…"
+
+#: ../SparkleShare/SparkleUI.cs:247
+msgid "Ouch! Mid-air collision!"
+msgstr "Outch! Collision en plein ciel!"
+
+#: ../SparkleShare/SparkleUI.cs:248
+msgid "Don't worry, SparkleShare made a copy of each conflicting file."
+msgstr "Ne vous inquiétez pas, SparkleShare à effectué une copie de chacun des fichiers en conflit."
+
+#: ../SparkleShare/SparkleUI.cs:334
+msgid "Hold your ponies!"
+msgstr "Restons calme !"
+
+#: ../SparkleShare/SparkleUI.cs:335
+msgid "SparkleShare is known to be insanely fast with pictures of unicorns. Please make sure your internets are upgraded to the latest version to avoid any problems."
+msgstr "SparkleShare est réputé pour son hallucinante rapidité concernant les images de licornes. Merci de vérifier que votre navigateur est à jour pour éviter tout problème."
 
 #. TRANSLATORS: {0} is a folder name, and {1} is a server address
-#: ../SparkleShare/SparkleWindow.cs:51
+#: ../SparkleShare/SparkleWindow.cs:50
 #, csharp-format
-msgid "‘{0}’ on {1}"
-msgstr "« {0} » sur {1}"
+msgid "Recent Events in ‘{0}’"
+msgstr "Derniers événements dans « {0} »"
 
 #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:108
 msgid "Get Earlier Version"
@@ -266,3 +305,27 @@ msgstr "Créer une copie d'une version antérieure de ce dossier"
 #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:122
 msgid "Select to get a copy of this version"
 msgstr "Sélectionner pour obtenir une copie de cette version"
+
+#~ msgid "Comparing Revisions of ‘{0}’"
+#~ msgstr "Compare les versions de « {0} »"
+
+#~ msgid "Current Revision"
+#~ msgstr "Version actuelle"
+
+#~ msgid "d MMM\tH:mm"
+#~ msgstr "d MMM\tH:mm"
+
+#~ msgid "Error syncing"
+#~ msgstr "Erreur de synchronisation"
+
+#~ msgid "Everything is up to date"
+#~ msgstr "Tout est à jour"
+
+#~ msgid "Visit Website"
+#~ msgstr "Visiter le site web"
+
+#~ msgid "You don't have any folders set up yet."
+#~ msgstr "Vous n’avez encore configuré aucun dossier."
+
+#~ msgid "Add a Folder…"
+#~ msgstr "Ajouter un dossier…"