[tx-robot] updated from transifex

7 files changed, 228 insertions, 196 deletions

diff --git a/l10n/fr/bookmarks.po b/l10n/fr/bookmarks.po
index ba57cdc64fc..f3f172409f2 100644
--- a/l10n/fr/bookmarks.po
+++ b/l10n/fr/bookmarks.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00:26+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +21,42 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Favoris"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "sans titre"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Lire plus tard"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titre"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Étiquettes"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Sauvegarder le favori"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "Vous n'avez aucun favori"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Gestionnaire de favoris <br />"
diff --git a/l10n/fr/calendar.po b/l10n/fr/calendar.po
index ee964a08fb6..00c24da8a97 100644
--- a/l10n/fr/calendar.po
+++ b/l10n/fr/calendar.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:15+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-30 13:48+0000\n"
 "Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -84,19 +84,19 @@ msgstr "Calendrier"
 
 #: js/calendar.js:828
 msgid "ddd"
-msgstr "jjj"
+msgstr "ddd"
 
 #: js/calendar.js:829
 msgid "ddd M/d"
-msgstr "jjj M/j"
+msgstr "ddd d/M"
 
 #: js/calendar.js:830
 msgid "dddd M/d"
-msgstr "jjjj M/j"
+msgstr "dddd d/M"
 
 #: js/calendar.js:833
 msgid "MMMM yyyy"
-msgstr "MMMM aaaa"
+msgstr "MMMM yyyy"
 
 #: js/calendar.js:835
 msgid "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
@@ -104,7 +104,7 @@ msgstr "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"
 
 #: js/calendar.js:837
 msgid "dddd, MMM d, yyyy"
-msgstr "jjjj, MMM j, aaaa"
+msgstr "dddd, d MMM, yyyy"
 
 #: lib/app.php:121
 msgid "Birthday"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index 64b3e82ca19..9d6d8f6ccd5 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-27 02:02+0200\n"
-"PO-Revision-Date: 2012-07-26 09:26+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,20 +91,20 @@ msgstr "ID manquant"
 msgid "Error parsing VCard for ID: \""
 msgstr "Erreur lors de l'analyse du VCard pour l'ID: \""
 
-#: ajax/currentphoto.php:30 ajax/oc_photo.php:28 ajax/uploadphoto.php:36
-#: ajax/uploadphoto.php:68
+#: ajax/currentphoto.php:28 ajax/oc_photo.php:28 ajax/uploadphoto.php:34
+#: ajax/uploadphoto.php:66
 msgid "No contact ID was submitted."
 msgstr "Aucun ID de contact envoyé"
 
-#: ajax/currentphoto.php:36
+#: ajax/currentphoto.php:34
 msgid "Error reading contact photo."
 msgstr "Erreur de lecture de la photo du contact."
 
-#: ajax/currentphoto.php:48
+#: ajax/currentphoto.php:46
 msgid "Error saving temporary file."
 msgstr "Erreur de sauvegarde du fichier temporaire."
 
-#: ajax/currentphoto.php:51
+#: ajax/currentphoto.php:49
 msgid "The loading photo is not valid."
 msgstr "La photo chargée est invalide."
 
@@ -132,31 +132,31 @@ msgstr "Fichier inexistant:"
 msgid "Error loading image."
 msgstr "Erreur lors du chargement de l'image."
 
-#: ajax/savecrop.php:67
+#: ajax/savecrop.php:64
 msgid "Error getting contact object."
 msgstr "Erreur lors de l'obtention de l'objet contact"
 
-#: ajax/savecrop.php:76
+#: ajax/savecrop.php:73
 msgid "Error getting PHOTO property."
 msgstr "Erreur lors de l'obtention des propriétés de la photo"
 
-#: ajax/savecrop.php:93
+#: ajax/savecrop.php:90
 msgid "Error saving contact."
 msgstr "Erreur de sauvegarde du contact"
 
-#: ajax/savecrop.php:103
+#: ajax/savecrop.php:100
 msgid "Error resizing image"
 msgstr "Erreur de redimensionnement de l'image"
 
-#: ajax/savecrop.php:106
+#: ajax/savecrop.php:103
 msgid "Error cropping image"
 msgstr "Erreur lors du rognage de l'image"
 
-#: ajax/savecrop.php:109
+#: ajax/savecrop.php:106
 msgid "Error creating temporary image"
 msgstr "Erreur de création de l'image temporaire"
 
-#: ajax/savecrop.php:112
+#: ajax/savecrop.php:109
 msgid "Error finding image: "
 msgstr "Erreur pour trouver l'image :"
 
@@ -188,110 +188,110 @@ msgstr "Erreur lors de la mise à jour du carnet d'adresses."
 msgid "Error uploading contacts to storage."
 msgstr "Erreur lors de l'envoi des contacts vers le stockage."
 
-#: ajax/uploadimport.php:61 ajax/uploadphoto.php:77
+#: ajax/uploadimport.php:61 ajax/uploadphoto.php:75
 msgid "There is no error, the file uploaded with success"
 msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
 
-#: ajax/uploadimport.php:62 ajax/uploadphoto.php:78
+#: ajax/uploadimport.php:62 ajax/uploadphoto.php:76
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini"
 
-#: ajax/uploadimport.php:63 ajax/uploadphoto.php:79
+#: ajax/uploadimport.php:63 ajax/uploadphoto.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/uploadimport.php:64 ajax/uploadphoto.php:80
+#: ajax/uploadimport.php:64 ajax/uploadphoto.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier envoyé n'a été que partiellement envoyé."
 
-#: ajax/uploadimport.php:65 ajax/uploadphoto.php:81
+#: ajax/uploadimport.php:65 ajax/uploadphoto.php:79
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/uploadimport.php:66 ajax/uploadphoto.php:82
+#: ajax/uploadimport.php:66 ajax/uploadphoto.php:80
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
+#: ajax/uploadphoto.php:57 ajax/uploadphoto.php:107
 msgid "Couldn't save temporary image: "
 msgstr "Impossible de sauvegarder l'image temporaire :"
 
-#: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
+#: ajax/uploadphoto.php:60 ajax/uploadphoto.php:110
 msgid "Couldn't load temporary image: "
 msgstr "Impossible de charger l'image temporaire :"
 
-#: ajax/uploadphoto.php:71
+#: ajax/uploadphoto.php:69
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
 
-#: appinfo/app.php:19 templates/settings.php:3
+#: appinfo/app.php:19
 msgid "Contacts"
 msgstr "Contacts"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Sorry, this functionality has not been implemented yet"
 msgstr "Désolé cette fonctionnalité n'a pas encore été implementée"
 
-#: js/contacts.js:53
+#: js/contacts.js:64
 msgid "Not implemented"
 msgstr "Pas encore implémenté"
 
-#: js/contacts.js:58
+#: js/contacts.js:69
 msgid "Couldn't get a valid address."
 msgstr "Impossible de trouver une adresse valide."
 
-#: js/contacts.js:58 js/contacts.js:347 js/contacts.js:363 js/contacts.js:376
-#: js/contacts.js:651 js/contacts.js:691 js/contacts.js:717 js/contacts.js:754
-#: js/contacts.js:826 js/contacts.js:832 js/contacts.js:844 js/contacts.js:878
-#: js/contacts.js:1141 js/contacts.js:1149 js/contacts.js:1158
-#: js/contacts.js:1193 js/contacts.js:1225 js/contacts.js:1237
-#: js/contacts.js:1260 js/contacts.js:1522
+#: js/contacts.js:69 js/contacts.js:358 js/contacts.js:374 js/contacts.js:387
+#: js/contacts.js:675 js/contacts.js:715 js/contacts.js:741 js/contacts.js:778
+#: js/contacts.js:850 js/contacts.js:856 js/contacts.js:868 js/contacts.js:902
+#: js/contacts.js:1165 js/contacts.js:1173 js/contacts.js:1182
+#: js/contacts.js:1217 js/contacts.js:1249 js/contacts.js:1261
+#: js/contacts.js:1284 js/contacts.js:1570
 msgid "Error"
 msgstr "Erreur"
 
-#: js/contacts.js:389 lib/search.php:15
+#: js/contacts.js:400 lib/search.php:15
 msgid "Contact"
 msgstr "Contact"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New"
 msgstr "Nouveau"
 
-#: js/contacts.js:389
+#: js/contacts.js:400
 msgid "New Contact"
 msgstr "Nouveau Contact"
 
-#: js/contacts.js:691
+#: js/contacts.js:715
 msgid "This property has to be non-empty."
 msgstr "Cette valeur ne doit pas être vide"
 
-#: js/contacts.js:717
+#: js/contacts.js:741
 msgid "Couldn't serialize elements."
 msgstr "Impossible de sérialiser les éléments"
 
-#: js/contacts.js:826 js/contacts.js:844
+#: js/contacts.js:850 js/contacts.js:868
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
 msgstr "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org"
 
-#: js/contacts.js:860
+#: js/contacts.js:884
 msgid "Edit name"
 msgstr "Éditer le nom"
 
-#: js/contacts.js:1141
+#: js/contacts.js:1165
 msgid "No files selected for upload."
 msgstr "Aucun fichiers choisis pour être chargés"
 
-#: js/contacts.js:1149
+#: js/contacts.js:1173
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur."
 
-#: js/contacts.js:1314 js/contacts.js:1348
+#: js/contacts.js:1338 js/contacts.js:1372
 msgid "Select type"
 msgstr "Sélectionner un type"
 
@@ -307,129 +307,129 @@ msgstr "importé,"
 msgid " failed."
 msgstr "échoué."
 
-#: lib/app.php:29
+#: lib/app.php:34
 msgid "Addressbook not found."
 msgstr "Carnet d'adresses introuvable."
 
-#: lib/app.php:33
+#: lib/app.php:46
 msgid "This is not your addressbook."
 msgstr "Ce n'est pas votre carnet d'adresses."
 
-#: lib/app.php:44
+#: lib/app.php:65
 msgid "Contact could not be found."
 msgstr "Ce contact n'a pu être trouvé."
 
-#: lib/app.php:100 templates/part.contact.php:116
+#: lib/app.php:109 templates/part.contact.php:116
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/app.php:101
+#: lib/app.php:110
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: lib/app.php:102 templates/part.contact.php:115
+#: lib/app.php:111 templates/part.contact.php:115
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/app.php:103 templates/part.contact.php:38 templates/part.contact.php:39
+#: lib/app.php:112 templates/part.contact.php:38 templates/part.contact.php:39
 #: templates/part.contact.php:111
 msgid "Organization"
 msgstr "Société"
 
-#: lib/app.php:115 lib/app.php:122 lib/app.php:132 lib/app.php:183
+#: lib/app.php:124 lib/app.php:131 lib/app.php:141 lib/app.php:194
 msgid "Work"
 msgstr "Travail"
 
-#: lib/app.php:116 lib/app.php:120 lib/app.php:133
+#: lib/app.php:125 lib/app.php:129 lib/app.php:142
 msgid "Home"
 msgstr "Maison"
 
-#: lib/app.php:121
+#: lib/app.php:130
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/app.php:123
+#: lib/app.php:132
 msgid "Text"
 msgstr "Texte"
 
-#: lib/app.php:124
+#: lib/app.php:133
 msgid "Voice"
 msgstr "Voix"
 
-#: lib/app.php:125
+#: lib/app.php:134
 msgid "Message"
 msgstr "Message"
 
-#: lib/app.php:126
+#: lib/app.php:135
 msgid "Fax"
 msgstr "Fax"
 
-#: lib/app.php:127
+#: lib/app.php:136
 msgid "Video"
 msgstr "Vidéo"
 
-#: lib/app.php:128
+#: lib/app.php:137
 msgid "Pager"
 msgstr "Bipeur"
 
-#: lib/app.php:134
+#: lib/app.php:143
 msgid "Internet"
 msgstr "Internet"
 
-#: lib/app.php:169 templates/part.contact.php:44
+#: lib/app.php:180 templates/part.contact.php:44
 #: templates/part.contact.php:113
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: lib/app.php:170
+#: lib/app.php:181
 msgid "Business"
 msgstr "Business"
 
-#: lib/app.php:171
+#: lib/app.php:182
 msgid "Call"
 msgstr "Appel"
 
-#: lib/app.php:172
+#: lib/app.php:183
 msgid "Clients"
 msgstr "Clients"
 
-#: lib/app.php:173
+#: lib/app.php:184
 msgid "Deliverer"
 msgstr "Livreur"
 
-#: lib/app.php:174
+#: lib/app.php:185
 msgid "Holidays"
 msgstr "Vacances"
 
-#: lib/app.php:175
+#: lib/app.php:186
 msgid "Ideas"
 msgstr "Idées"
 
-#: lib/app.php:176
+#: lib/app.php:187
 msgid "Journey"
 msgstr "Trajet"
 
-#: lib/app.php:177
+#: lib/app.php:188
 msgid "Jubilee"
 msgstr "Jubilé"
 
-#: lib/app.php:178
+#: lib/app.php:189
 msgid "Meeting"
 msgstr "Rendez-vous"
 
-#: lib/app.php:179
+#: lib/app.php:190
 msgid "Other"
 msgstr "Autre"
 
-#: lib/app.php:180
+#: lib/app.php:191
 msgid "Personal"
 msgstr "Personnel"
 
-#: lib/app.php:181
+#: lib/app.php:192
 msgid "Projects"
 msgstr "Projets"
 
-#: lib/app.php:182
+#: lib/app.php:193
 msgid "Questions"
 msgstr "Questions"
 
@@ -437,63 +437,67 @@ msgstr "Questions"
 msgid "{name}'s Birthday"
 msgstr "Anniversaire de {name}"
 
-#: templates/index.php:15
+#: templates/index.php:14
 msgid "Add Contact"
 msgstr "Ajouter un Contact"
 
-#: templates/index.php:16 templates/index.php:18 templates/part.import.php:17
+#: templates/index.php:15 templates/index.php:16 templates/part.import.php:17
 msgid "Import"
 msgstr "Importer"
 
-#: templates/index.php:20
+#: templates/index.php:18
+msgid "Settings"
+msgstr ""
+
+#: templates/index.php:18
 msgid "Addressbooks"
 msgstr "Carnets d'adresses"
 
-#: templates/index.php:37 templates/part.import.php:24
+#: templates/index.php:38 templates/part.import.php:24
 msgid "Close"
 msgstr "Fermer"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: templates/index.php:41
+#: templates/index.php:42
 msgid "Navigation"
 msgstr "Navigation"
 
-#: templates/index.php:44
+#: templates/index.php:45
 msgid "Next contact in list"
 msgstr "Contact suivant dans la liste"
 
-#: templates/index.php:46
+#: templates/index.php:47
 msgid "Previous contact in list"
 msgstr "Contact précédent dans la liste"
 
-#: templates/index.php:48
+#: templates/index.php:49
 msgid "Expand/collapse current addressbook"
 msgstr "Dé/Replier le carnet d'adresses courant"
 
-#: templates/index.php:50
+#: templates/index.php:51
 msgid "Next/previous addressbook"
 msgstr "Passer au carnet d'adresses suivant/précédent"
 
-#: templates/index.php:54
+#: templates/index.php:55
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Refresh contacts list"
 msgstr "Actualiser la liste des contacts"
 
-#: templates/index.php:59
+#: templates/index.php:60
 msgid "Add new contact"
 msgstr "Ajouter un nouveau contact"
 
-#: templates/index.php:61
+#: templates/index.php:62
 msgid "Add new addressbook"
 msgstr "Ajouter un nouveau carnet d'adresses"
 
-#: templates/index.php:63
+#: templates/index.php:64
 msgid "Delete current contact"
 msgstr "Effacer le contact sélectionné"
 
@@ -860,22 +864,22 @@ msgstr "Saisissez le nom"
 msgid "Enter description"
 msgstr "Saisissez une description"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "CardDAV syncing addresses"
 msgstr "Synchronisation des contacts CardDAV"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "more info"
 msgstr "Plus d'infos"
 
-#: templates/settings.php:6
+#: templates/settings.php:5
 msgid "Primary address (Kontact et al)"
 msgstr "Adresse principale"
 
-#: templates/settings.php:8
+#: templates/settings.php:7
 msgid "iOS/OS X"
 msgstr "iOS/OS X"
 
-#: templates/settings.php:10
+#: templates/settings.php:9
 msgid "Read only vCard directory link(s)"
 msgstr "Lien(s) vers le répertoire de vCards en lecture seule"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index b2609663eaf..79d3b618b1f 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,15 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+#   <nathaplop@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-06-06 00:12+0200\n"
-"PO-Revision-Date: 2012-06-05 22:14+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/owncloud/language/fr/)\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:53+0000\n"
+"Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,85 +35,89 @@ msgstr "Cette catégorie existe déjà : "
 
 #: js/jquery-ui-1.8.16.custom.min.js:511
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
+
+#: js/js.js:185 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr "Paramètres"
+
+#: js/js.js:203
+msgid "Error loading script for the settings"
 msgstr ""
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "February"
-msgstr ""
+msgstr "Février"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: js/js.js:520
+#: js/js.js:573
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "August"
-msgstr ""
+msgstr "Août"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
-#: js/js.js:521
+#: js/js.js:574
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Annulé"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Aucune catégorie sélectionnée pour suppression"
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #: lostpassword/index.php:26
-msgid "Owncloud password reset"
-msgstr "Réinitialisation de votre mot de passe Owncloud"
-
-#: lostpassword/index.php:27
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
@@ -218,7 +225,7 @@ msgstr "sera utilisé"
 
 #: templates/installation.php:82
 msgid "Database user"
-msgstr "Utilisateur de la base de données"
+msgstr "Utilisateur pour la base de données"
 
 #: templates/installation.php:86
 msgid "Database password"
@@ -240,14 +247,10 @@ msgstr "Terminer l'installation"
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:41
+#: templates/layout.user.php:49
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/layout.user.php:53 templates/layout.user.php:54
-msgid "Settings"
-msgstr "Paramètres"
-
 #: templates/login.php:6
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 13258b290ff..23e5b17852b 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-30 02:02+0200\n"
-"PO-Revision-Date: 2012-07-30 00:03+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 20:54+0000\n"
 "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -63,14 +64,34 @@ msgstr "Ne plus partager"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/filelist.js:186
-msgid "deleted"
+#: js/filelist.js:141
+msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:186
-msgid "undo"
+#: js/filelist.js:141
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:141
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:195
+msgid "replaced"
 msgstr ""
 
+#: js/filelist.js:195
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:195 js/filelist.js:256
+msgid "undo"
+msgstr "annuler"
+
+#: js/filelist.js:256
+msgid "deleted"
+msgstr "supprimé"
+
 #: js/files.js:170
 msgid "generating ZIP-file, it may take some time."
 msgstr "Générer un fichier ZIP, cela peut prendre du temps"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 90c10f690ed..42c784ce915 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00:22+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,94 +21,94 @@ msgstr ""
 
 #: app.php:287
 msgid "Help"
-msgstr ""
+msgstr "Aide"
 
 #: app.php:294
 msgid "Personal"
-msgstr ""
+msgstr "Personnel"
 
 #: app.php:299
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
 #: app.php:304
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #: app.php:311
 msgid "Apps"
-msgstr ""
+msgstr "Applications"
 
 #: app.php:313
 msgid "Admin"
-msgstr ""
+msgstr "Administration"
 
 #: files.php:245
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Téléchargement ZIP désactivé."
 
 #: files.php:246
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Les fichiers nécessitent d'être téléchargés un par un."
 
 #: files.php:246 files.php:271
 msgid "Back to Files"
-msgstr ""
+msgstr "Retour aux Fichiers"
 
 #: files.php:270
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "L'application n'est pas activée"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Erreur d'authentification"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "La session a expiré. Veuillez recharger la page."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "à l'instant"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "il y a 1 minute"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "il y a %d minutes"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "aujourd'hui"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "hier"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "il y a %d jours"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "le mois dernier"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "il y a plusieurs mois"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "l'année dernière"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "il y a plusieurs années"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index a519d0f7b9c..ea9e3f885e9 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-07-28 02:02+0200\n"
-"PO-Revision-Date: 2012-07-27 10:05+0000\n"
+"POT-Creation-Date: 2012-07-31 22:53+0200\n"
+"PO-Revision-Date: 2012-07-31 00:49+0000\n"
 "Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -50,11 +50,11 @@ msgstr "Langue changée"
 
 #: js/apps.js:31 js/apps.js:67
 msgid "Disable"
-msgstr "Désactivé"
+msgstr "Désactiver"
 
 #: js/apps.js:31 js/apps.js:54
 msgid "Enable"
-msgstr "Activé"
+msgstr "Activer"
 
 #: js/personal.js:69
 msgid "Saving..."
@@ -126,7 +126,7 @@ msgstr "Vous utilisez"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "d'espace de stockage sur un total de"
+msgstr "de votre espace de stockage d'une taille totale de"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"