Merge branch 'master' of https://github.com/owncloud/core into last_cron_log

1 files changed, 22 insertions, 31 deletions

diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index a61774b3964..6eae9f9e3d3 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,11 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
@@ -42,19 +46,6 @@ msgstr "Basculé en mode production (non maintenance)"
 msgid "Updated database"
 msgstr "Base de données mise à jour"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Cache de fichier mis à jour"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% effectué ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Aucune image ou fichier fourni"
@@ -277,23 +268,23 @@ msgstr "Erreur de chargement du modèle de fichier existant"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Mot de passe de très faible sécurité"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Mot de passe de faible sécurité"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Mot de passe de sécurité tout juste acceptable"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Mot de passe de sécurité suffisante"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Mot de passe de forte sécurité"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -304,11 +295,11 @@ msgid "Share"
 msgstr "Partager"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erreur"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
@@ -424,19 +415,19 @@ msgstr "Protégé par un mot de passe"
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email envoyé"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Attention"
 
@@ -492,7 +483,7 @@ msgstr "Réinitialisation de votre mot de passe %s"
 msgid ""
 "A problem has occurred whilst sending the email, please contact your "
 "administrator."
-msgstr ""
+msgstr "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur."
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -670,7 +661,7 @@ msgstr "Créer un <strong>compte administrateur</strong>"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Support de stockage & base de données"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -771,7 +762,7 @@ msgstr "Logins alternatifs"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
 "with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Bonjour,<br><br>Juste pour vous informer que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."