Merge branch 'master' of bitbucket.org:cedricbonhomme/pyaggr3g470r

1 files changed, 181 insertions, 160 deletions

diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
index 780ebbb3..c022b79c 100644
--- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
+++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-06 11:47+0200\n"
-"PO-Revision-Date: 2014-09-06 11:49+0100\n"
+"POT-Creation-Date: 2014-09-27 22:55+0200\n"
+"PO-Revision-Date: 2014-09-27 22:57+0100\n"
 "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
@@ -19,195 +19,305 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: pyaggr3g470r/views.py:99
+#: pyaggr3g470r/forms.py:39 pyaggr3g470r/forms.py:99
+#: pyaggr3g470r/templates/admin/dashboard.html:12
+msgid "Nickname"
+msgstr "Pseudonyme"
+
+#: pyaggr3g470r/forms.py:39 pyaggr3g470r/forms.py:99
+msgid "Please enter your nickname."
+msgstr "S'il vous plaît, entrez votre pseudonyme."
+
+#: pyaggr3g470r/forms.py:40 pyaggr3g470r/forms.py:100
+#: pyaggr3g470r/forms.py:121 pyaggr3g470r/templates/admin/dashboard.html:13
+msgid "Email"
+msgstr "Email"
+
+#: pyaggr3g470r/forms.py:40 pyaggr3g470r/forms.py:100
+msgid "Please enter your email."
+msgstr "S'il vous plaît, entrez votre email."
+
+#: pyaggr3g470r/forms.py:41 pyaggr3g470r/forms.py:61 pyaggr3g470r/forms.py:101
+msgid "Password"
+msgstr "Mot de passe"
+
+#: pyaggr3g470r/forms.py:41 pyaggr3g470r/forms.py:61
+msgid "Please enter a password."
+msgstr "S'il vous plaît entrer un mot de passe."
+
+#: pyaggr3g470r/forms.py:43 pyaggr3g470r/templates/login.html:29
+msgid "Sign up"
+msgstr "S'inscrire"
+
+#: pyaggr3g470r/forms.py:52 pyaggr3g470r/forms.py:111
+msgid ""
+"This nickname has invalid characters. Please use letters, numbers, dots and "
+"underscores only."
+msgstr ""
+"Ce pseudonyme a des caractères non valides. Utilisez seulement des lettres, "
+"des chiffres, des points et '_'."
+
+#: pyaggr3g470r/forms.py:60 pyaggr3g470r/forms.py:121
+msgid "Please enter your email address."
+msgstr "S'il vous plaît, entrez votre adresse email."
+
+#: pyaggr3g470r/forms.py:62 pyaggr3g470r/templates/login.html:5
+msgid "Log In"
+msgstr "Connexion"
+
+#: pyaggr3g470r/forms.py:75
+msgid "Account not confirmed"
+msgstr "Compte non confirmé"
+
+#: pyaggr3g470r/forms.py:78
+msgid "Invalid email or password"
+msgstr "E-mail ou mot de passe invalide"
+
+#: pyaggr3g470r/forms.py:83 pyaggr3g470r/templates/feeds.html:11
+msgid "Title"
+msgstr "Titre"
+
+#: pyaggr3g470r/forms.py:84 pyaggr3g470r/templates/admin/user.html:27
+msgid "Feed link"
+msgstr "Lien du flux"
+
+#: pyaggr3g470r/forms.py:85 pyaggr3g470r/templates/admin/user.html:28
+msgid "Site link"
+msgstr "Lien du site"
+
+#: pyaggr3g470r/forms.py:86
+msgid "Email notification"
+msgstr "Notification par email"
+
+#: pyaggr3g470r/forms.py:87
+msgid "Check for updates"
+msgstr "Vérifier les mises à jour"
+
+#: pyaggr3g470r/forms.py:88 pyaggr3g470r/forms.py:102
+msgid "Save"
+msgstr "Sauver"
+
+#: pyaggr3g470r/forms.py:116
+msgid "Subject"
+msgstr "Objet"
+
+#: pyaggr3g470r/forms.py:116
+msgid "Please enter a subject."
+msgstr "S'il vous plaît entrer un objet."
+
+#: pyaggr3g470r/forms.py:117
+msgid "Message"
+msgstr "Message"
+
+#: pyaggr3g470r/forms.py:117
+msgid "Please enter a content."
+msgstr "S'il vous plaît entrer un contenu."
+
+#: pyaggr3g470r/forms.py:118
+msgid "Send"
+msgstr "Envoyer"
+
+#: pyaggr3g470r/forms.py:122
+msgid "Recover"
+msgstr "Récupérer"
+
+#: pyaggr3g470r/forms.py:135
+msgid "Account not confirmed."
+msgstr "Compte non confirmé."
+
+#: pyaggr3g470r/forms.py:138
+msgid "Invalid email."
+msgstr "Email invalide."
+
+#: pyaggr3g470r/views.py:100
 msgid "Authentication required."
 msgstr "Authentification requise."
 
-#: pyaggr3g470r/views.py:104
+#: pyaggr3g470r/views.py:105
 msgid "Forbidden."
 msgstr "Interdit."
 
-#: pyaggr3g470r/views.py:156
+#: pyaggr3g470r/views.py:157
 msgid "Logged in successfully."
 msgstr "Connecté avec succès."
 
-#: pyaggr3g470r/views.py:178
+#: pyaggr3g470r/views.py:179
 msgid "Logged out successfully."
 msgstr "Déconnecté avec succès."
 
-#: pyaggr3g470r/views.py:187
+#: pyaggr3g470r/views.py:188
 msgid "Self-registration is disabled."
 msgstr "L'auto-enregistrement est désactivé."
 
-#: pyaggr3g470r/views.py:204
+#: pyaggr3g470r/views.py:205
 msgid "Email already used."
 msgstr "Email déjà utilisé."
 
-#: pyaggr3g470r/views.py:211 pyaggr3g470r/views.py:924
+#: pyaggr3g470r/views.py:212 pyaggr3g470r/views.py:914
 msgid "Problem while sending activation email"
 msgstr "Problème lors de l'envoi d'email d'activation"
 
-#: pyaggr3g470r/views.py:214
+#: pyaggr3g470r/views.py:215
 msgid "Your account has been created. Check your mail to confirm it."
 msgstr "Votre compte a été créé. Vérifiez votre courrier pour le confirmer."
 
-#: pyaggr3g470r/views.py:271 pyaggr3g470r/views.py:604
+#: pyaggr3g470r/views.py:272 pyaggr3g470r/views.py:594
 msgid "Downloading articles..."
 msgstr "Téléchargement des articles."
 
-#: pyaggr3g470r/views.py:343 pyaggr3g470r/views.py:403
+#: pyaggr3g470r/views.py:344 pyaggr3g470r/views.py:404
 msgid "This article do not exist."
 msgstr "Cet article n'existe pas."
 
-#: pyaggr3g470r/views.py:400 pyaggr3g470r/templates/home.html:91
+#: pyaggr3g470r/views.py:401 pyaggr3g470r/templates/home.html:91
 msgid "Article"
 msgstr "Article"
 
-#: pyaggr3g470r/views.py:400
+#: pyaggr3g470r/views.py:401
 msgid "deleted."
 msgstr "supprimé."
 
-#: pyaggr3g470r/views.py:500
+#: pyaggr3g470r/views.py:490
 msgid "Database indexed."
 msgstr "Base de données indexée."
 
-#: pyaggr3g470r/views.py:502 pyaggr3g470r/views.py:571
+#: pyaggr3g470r/views.py:492 pyaggr3g470r/views.py:561
 msgid "An error occured"
 msgstr "Une erreur est survenue."
 
-#: pyaggr3g470r/views.py:505
+#: pyaggr3g470r/views.py:495
 msgid "Option not available on Heroku."
 msgstr "Option non disponible sur Heroku."
 
-#: pyaggr3g470r/views.py:520 pyaggr3g470r/views.py:530
+#: pyaggr3g470r/views.py:510 pyaggr3g470r/views.py:520
 msgid "Error when exporting articles."
 msgstr "Erreur lors de l'export des articles."
 
-#: pyaggr3g470r/views.py:536
+#: pyaggr3g470r/views.py:526
 msgid "Export format not supported."
 msgstr "Ce format d'export n'est pas supporté."
 
-#: pyaggr3g470r/views.py:559
+#: pyaggr3g470r/views.py:549
 msgid "Full text search is not yet implemented for Heroku."
 msgstr "La recherche rapide n'est pas supporté sur Heroku."
 
-#: pyaggr3g470r/views.py:598 pyaggr3g470r/views.py:611
-#: pyaggr3g470r/views.py:619
+#: pyaggr3g470r/views.py:588 pyaggr3g470r/views.py:601
+#: pyaggr3g470r/views.py:609
 msgid "File not allowed."
 msgstr "Fichier non autorisé."
 
-#: pyaggr3g470r/views.py:603
+#: pyaggr3g470r/views.py:593
 msgid "feeds imported."
 msgstr "flux importés."
 
-#: pyaggr3g470r/views.py:606
+#: pyaggr3g470r/views.py:596
 msgid "Impossible to import the new feeds."
 msgstr "Impossible d'importer les nouveaux flux."
 
-#: pyaggr3g470r/views.py:615
+#: pyaggr3g470r/views.py:605
 msgid "Account imported."
 msgstr "Compte importé."
 
-#: pyaggr3g470r/views.py:617
+#: pyaggr3g470r/views.py:607
 msgid "Impossible to import the account."
 msgstr "Impossible d'importer le compte."
 
-#: pyaggr3g470r/views.py:655
+#: pyaggr3g470r/views.py:645
 msgid "Feed successfully updated."
 msgstr "Flux mis à jour avec succès."
 
-#: pyaggr3g470r/views.py:667
+#: pyaggr3g470r/views.py:657
 msgid "Feed successfully created."
 msgstr "Flux créé avec succès."
 
-#: pyaggr3g470r/views.py:670
+#: pyaggr3g470r/views.py:660
 msgid "Downloading articles for the new feed..."
 msgstr "Téléchargement des articles du nouveau flux..."
 
-#: pyaggr3g470r/views.py:674
+#: pyaggr3g470r/views.py:664
 msgid "Feed already in the database."
 msgstr "Flux déjà dans la base de données."
 
-#: pyaggr3g470r/views.py:680
+#: pyaggr3g470r/views.py:670
 msgid "Edit the feed"
 msgstr "Éditez ce flux"
 
-#: pyaggr3g470r/views.py:693 pyaggr3g470r/templates/layout.html:109
+#: pyaggr3g470r/views.py:683 pyaggr3g470r/templates/layout.html:109
 msgid "Add a feed"
 msgstr "Ajouter un flux"
 
-#: pyaggr3g470r/views.py:706 pyaggr3g470r/templates/home.html:90
-#: pyaggr3g470r/templates/admin/user.html:45
+#: pyaggr3g470r/views.py:696 pyaggr3g470r/templates/home.html:90
+#: pyaggr3g470r/templates/admin/user.html:42
 msgid "Feed"
 msgstr "Flux"
 
-#: pyaggr3g470r/views.py:706 pyaggr3g470r/views.py:901
+#: pyaggr3g470r/views.py:696 pyaggr3g470r/views.py:891
 msgid "successfully deleted."
 msgstr "supprimé avec succès."
 
-#: pyaggr3g470r/views.py:724 pyaggr3g470r/views.py:851
-#: pyaggr3g470r/views.py:861 pyaggr3g470r/views.py:901
+#: pyaggr3g470r/views.py:714 pyaggr3g470r/views.py:841
+#: pyaggr3g470r/views.py:851 pyaggr3g470r/views.py:891
 msgid "User"
 msgstr "Utilisateur"
 
-#: pyaggr3g470r/views.py:724 pyaggr3g470r/views.py:851
+#: pyaggr3g470r/views.py:714 pyaggr3g470r/views.py:841
 msgid "successfully updated."
 msgstr "mis à jour avec succès."
 
-#: pyaggr3g470r/views.py:743
+#: pyaggr3g470r/views.py:733
 msgid "Your account has been deleted."
 msgstr "Votre compte a été supprimé."
 
-#: pyaggr3g470r/views.py:745 pyaggr3g470r/views.py:887
-#: pyaggr3g470r/views.py:903 pyaggr3g470r/views.py:933
+#: pyaggr3g470r/views.py:735 pyaggr3g470r/views.py:877
+#: pyaggr3g470r/views.py:893 pyaggr3g470r/views.py:923
 msgid "This user does not exist."
 msgstr "Cet utilisateur n'existe pas."
 
-#: pyaggr3g470r/views.py:759
+#: pyaggr3g470r/views.py:749
 msgid "Articles deleted."
 msgstr "Articles supprimés."
 
-#: pyaggr3g470r/views.py:773
+#: pyaggr3g470r/views.py:763
 msgid "Your account has been confirmed."
 msgstr "Votre compte a été confirmé."
 
-#: pyaggr3g470r/views.py:775
+#: pyaggr3g470r/views.py:765
 msgid "Impossible to confirm this account."
 msgstr "Impossible de confirmer ce compte."
 
-#: pyaggr3g470r/views.py:799
+#: pyaggr3g470r/views.py:789
 msgid "New password sent to your address."
 msgstr "Nouveau mot de passe envoyé à votre adresse."
 
-#: pyaggr3g470r/views.py:801
+#: pyaggr3g470r/views.py:791
 msgid "Problem while sending your new password."
 msgstr "Problème lors de l'envoi de votre nouveau mot de passe."
 
-#: pyaggr3g470r/views.py:826
+#: pyaggr3g470r/views.py:816
 msgid "Problem while sending email"
 msgstr "Problème lors de l'envoi de l'email"
 
-#: pyaggr3g470r/views.py:861
+#: pyaggr3g470r/views.py:851
 msgid "successfully created."
 msgstr "créé avec succès."
 
-#: pyaggr3g470r/views.py:870
+#: pyaggr3g470r/views.py:860
 msgid "Edit the user"
 msgstr "Éditer cet utilisateur"
 
-#: pyaggr3g470r/views.py:873 pyaggr3g470r/templates/admin/dashboard.html:45
+#: pyaggr3g470r/views.py:863 pyaggr3g470r/templates/admin/dashboard.html:45
 msgid "Add a new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: pyaggr3g470r/views.py:922 pyaggr3g470r/views.py:930
+#: pyaggr3g470r/views.py:912 pyaggr3g470r/views.py:920
 msgid "Account of the user"
 msgstr "Compte de l'utilisateur"
 
-#: pyaggr3g470r/views.py:922
+#: pyaggr3g470r/views.py:912
 msgid "successfully activated."
 msgstr "activé avec succès."
 
-#: pyaggr3g470r/views.py:930
+#: pyaggr3g470r/views.py:920
 msgid "successfully disabled."
 msgstr "désactivé avec succès."
 
@@ -346,19 +456,19 @@ msgstr "Détails"
 #: pyaggr3g470r/templates/favorites.html:18 pyaggr3g470r/templates/feed.html:8
 #: pyaggr3g470r/templates/feeds.html:33 pyaggr3g470r/templates/home.html:31
 #: pyaggr3g470r/templates/home.html:46 pyaggr3g470r/templates/unread.html:18
-#: pyaggr3g470r/templates/admin/user.html:46
+#: pyaggr3g470r/templates/admin/user.html:43
 msgid "Edit this feed"
 msgstr "Éditer ce flux"
 
 #: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:34
 #: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:47
-#: pyaggr3g470r/templates/admin/user.html:47
+#: pyaggr3g470r/templates/admin/user.html:44
 msgid "Delete this feed"
 msgstr "Supprimer ce flux"
 
 #: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:34
 #: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:47
-#: pyaggr3g470r/templates/admin/user.html:47
+#: pyaggr3g470r/templates/admin/user.html:44
 msgid "You are going to delete this feed."
 msgstr "Vous allez supprimer ce flux."
 
@@ -426,10 +536,6 @@ msgstr "flux"
 msgid "Status"
 msgstr "Statut"
 
-#: pyaggr3g470r/templates/feeds.html:11
-msgid "Title"
-msgstr "Titre"
-
 #: pyaggr3g470r/templates/feeds.html:12
 msgid "Site"
 msgstr "Site"
@@ -442,7 +548,7 @@ msgstr "Articles"
 
 #: pyaggr3g470r/templates/feeds.html:14
 #: pyaggr3g470r/templates/admin/dashboard.html:15
-#: pyaggr3g470r/templates/admin/user.html:33
+#: pyaggr3g470r/templates/admin/user.html:30
 msgid "Actions"
 msgstr "Actions"
 
@@ -463,7 +569,7 @@ msgid "Add some"
 msgstr "Ajoutez en"
 
 #: pyaggr3g470r/templates/home.html:11
-#: pyaggr3g470r/templates/management.html:34
+#: pyaggr3g470r/templates/management.html:31
 msgid "or"
 msgstr "ou"
 
@@ -547,10 +653,6 @@ msgstr "Tableau de bord"
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: pyaggr3g470r/templates/login.html:5
-msgid "Log In"
-msgstr "Connexion"
-
 #: pyaggr3g470r/templates/login.html:19 pyaggr3g470r/templates/recover.html:15
 msgid "Your email"
 msgstr "Votre email"
@@ -559,10 +661,6 @@ msgstr "Votre email"
 msgid "Your Password"
 msgstr "Votre mot de passe"
 
-#: pyaggr3g470r/templates/login.html:29
-msgid "Sign up"
-msgstr "S'inscrire"
-
 #: pyaggr3g470r/templates/login.html:31
 msgid "Forgot password"
 msgstr "Mot de passe oublié"
@@ -610,39 +708,39 @@ msgstr "Membre depuis le"
 msgid "Last seen:"
 msgstr "Vue la dernière fois le"
 
-#: pyaggr3g470r/templates/management.html:27
+#: pyaggr3g470r/templates/management.html:24
 msgid "You are going to delete your account."
 msgstr "Vous allez supprimer votre compte."
 
-#: pyaggr3g470r/templates/management.html:27
+#: pyaggr3g470r/templates/management.html:24
 msgid "Delete your account"
 msgstr "Supprimer votre compte"
 
-#: pyaggr3g470r/templates/management.html:32
+#: pyaggr3g470r/templates/management.html:29
 msgid "OPML import/export"
 msgstr "Import/export OPML"
 
-#: pyaggr3g470r/templates/management.html:34
+#: pyaggr3g470r/templates/management.html:31
 msgid "Batch import feeds from OPML"
 msgstr "Import en lot via un fichier OPML"
 
-#: pyaggr3g470r/templates/management.html:38
+#: pyaggr3g470r/templates/management.html:35
 msgid "Export feeds to OPML"
 msgstr "Exporter les flux au format OPML"
 
-#: pyaggr3g470r/templates/management.html:39
+#: pyaggr3g470r/templates/management.html:36
 msgid "Data liberation"
 msgstr "Libération des données"
 
-#: pyaggr3g470r/templates/management.html:41
+#: pyaggr3g470r/templates/management.html:38
 msgid "Import account"
 msgstr "Importer un compte"
 
-#: pyaggr3g470r/templates/management.html:45
+#: pyaggr3g470r/templates/management.html:42
 msgid "Export account to JSON"
 msgstr "Exporter le compte au format JSON"
 
-#: pyaggr3g470r/templates/management.html:48
+#: pyaggr3g470r/templates/management.html:45
 msgid "Export articles"
 msgstr "Exporter les articles"
 
@@ -678,14 +776,6 @@ msgstr "Marquer tout comme non lu"
 msgid "Registered users"
 msgstr "Utilisateurs enregistrés"
 
-#: pyaggr3g470r/templates/admin/dashboard.html:12
-msgid "Nickname"
-msgstr "Pseudonyme"
-
-#: pyaggr3g470r/templates/admin/dashboard.html:13
-msgid "Email"
-msgstr "Email"
-
 #: pyaggr3g470r/templates/admin/dashboard.html:14
 msgid "Last seen"
 msgstr "Vue la dernière fois le"
@@ -715,27 +805,19 @@ msgstr "Envoyer des messages de notification"
 msgid "Membership"
 msgstr "Adhésion"
 
-#: pyaggr3g470r/templates/admin/user.html:22
+#: pyaggr3g470r/templates/admin/user.html:19
 msgid "This user is not subscribed to any feed."
 msgstr "Cet utilisateur n'est pas encore abonné à des flux."
 
-#: pyaggr3g470r/templates/admin/user.html:24
+#: pyaggr3g470r/templates/admin/user.html:21
 msgid "Feeds"
 msgstr "Flux"
 
-#: pyaggr3g470r/templates/admin/user.html:29
+#: pyaggr3g470r/templates/admin/user.html:26
 msgid "Name"
 msgstr "Nom de famille"
 
-#: pyaggr3g470r/templates/admin/user.html:30
-msgid "Feed link"
-msgstr "Lien du flux"
-
-#: pyaggr3g470r/templates/admin/user.html:31
-msgid "Site link"
-msgstr "Lien du site"
-
-#: pyaggr3g470r/templates/admin/user.html:32
+#: pyaggr3g470r/templates/admin/user.html:29
 msgid "Number of articles"
 msgstr "Nombre d'articles"
 
@@ -757,67 +839,6 @@ msgstr "Nombre d'articles"
 #~ msgid "You read all articles."
 #~ msgstr "Tu as lu tous les articles."
 
-#~ msgid "Please enter your nickname."
-#~ msgstr "S'il vous plaît, entrez votre pseudonyme."
-
-#~ msgid "Please enter your email."
-#~ msgstr "S'il vous plaît, entrez votre email."
-
-#~ msgid "Password"
-#~ msgstr "Mot de passe"
-
-#~ msgid "Please enter a password."
-#~ msgstr "S'il vous plaît entrer un mot de passe."
-
-#~ msgid ""
-#~ "This nickname has invalid characters. Please use letters, numbers, dots "
-#~ "and underscores only."
-#~ msgstr ""
-#~ "Ce pseudonyme a des caractères non valides. S'il vous plaît utiliser "
-#~ "seulement des lettres, des chiffres, des points et '_'."
-
-#~ msgid "Please enter your email address."
-#~ msgstr "S'il vous plaît, entrez votre adresse email."
-
-#~ msgid "Account not confirmed"
-#~ msgstr "Compte non confirmé"
-
-#~ msgid "Invalid email or password"
-#~ msgstr "E-mail ou mot de passe invalide"
-
-#~ msgid "Email notification"
-#~ msgstr "Notification par email"
-
-#~ msgid "Check for updates"
-#~ msgstr "Vérifier les mises à jour"
-
-#~ msgid "Save"
-#~ msgstr "Sauver"
-
-#~ msgid "Subject"
-#~ msgstr "Objet"
-
-#~ msgid "Please enter a subject."
-#~ msgstr "S'il vous plaît entrer un objet."
-
-#~ msgid "Message"
-#~ msgstr "Message"
-
-#~ msgid "Please enter a content."
-#~ msgstr "S'il vous plaît entrer un contenu."
-
-#~ msgid "Send"
-#~ msgstr "Envoyer"
-
-#~ msgid "Recover"
-#~ msgstr "Récupérer"
-
-#~ msgid "Account not confirmed."
-#~ msgstr "Compte non confirmé."
-
-#~ msgid "Invalid email."
-#~ msgstr "Email invalide."
-
 #~ msgid "Your articles"
 #~ msgstr "Vos articles"