Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyaggr3g470r/controllers/feed.py
	pyaggr3g470r/templates/home.html

2 files changed, 332 insertions, 278 deletions

diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
index e3b7f0ff..6ecf87bd 100644
--- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
+++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
index 3bb25cb9..8a0a5ca8 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: 2015-01-09 22:12+0100\n"
-"PO-Revision-Date: 2015-01-09 22:13+0100\n"
+"POT-Creation-Date: 2015-03-28 11:26+0100\n"
+"PO-Revision-Date: 2015-03-28 11:27+0100\n"
 "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
@@ -19,37 +19,37 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: pyaggr3g470r/forms.py:39 pyaggr3g470r/forms.py:99
+#: pyaggr3g470r/forms.py:40 pyaggr3g470r/forms.py:97
 #: pyaggr3g470r/templates/admin/dashboard.html:12
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: pyaggr3g470r/forms.py:39 pyaggr3g470r/forms.py:99
+#: pyaggr3g470r/forms.py:41 pyaggr3g470r/forms.py:98
 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
+#: pyaggr3g470r/forms.py:42 pyaggr3g470r/forms.py:99 pyaggr3g470r/forms.py:133
+#: pyaggr3g470r/templates/admin/dashboard.html:13
 msgid "Email"
 msgstr "Email"
 
-#: pyaggr3g470r/forms.py:40 pyaggr3g470r/forms.py:60 pyaggr3g470r/forms.py:121
+#: pyaggr3g470r/forms.py:45 pyaggr3g470r/forms.py:65 pyaggr3g470r/forms.py:136
 msgid "Please enter your email address."
 msgstr "S'il vous plaît, entrez votre adresse email."
 
-#: pyaggr3g470r/forms.py:41 pyaggr3g470r/forms.py:61 pyaggr3g470r/forms.py:101
+#: pyaggr3g470r/forms.py:46 pyaggr3g470r/forms.py:66 pyaggr3g470r/forms.py:102
 msgid "Password"
 msgstr "Mot de passe"
 
-#: pyaggr3g470r/forms.py:41 pyaggr3g470r/forms.py:61
+#: pyaggr3g470r/forms.py:47 pyaggr3g470r/forms.py:67
 msgid "Please enter a password."
 msgstr "S'il vous plaît entrer un mot de passe."
 
-#: pyaggr3g470r/forms.py:43 pyaggr3g470r/templates/login.html:26
+#: pyaggr3g470r/forms.py:50 pyaggr3g470r/templates/login.html:26
 msgid "Sign up"
 msgstr "S'inscrire"
 
-#: pyaggr3g470r/forms.py:52 pyaggr3g470r/forms.py:111
+#: pyaggr3g470r/forms.py:55 pyaggr3g470r/forms.py:117
 msgid ""
 "This nickname has invalid characters. Please use letters, numbers, dots and "
 "underscores only."
@@ -57,272 +57,88 @@ msgstr ""
 "Ce pseudonyme a des caractères non valides. Utilisez seulement des lettres, "
 "des chiffres, des points et '_'."
 
-#: pyaggr3g470r/forms.py:62 pyaggr3g470r/templates/login.html:5
+#: pyaggr3g470r/forms.py:69 pyaggr3g470r/templates/login.html:5
 msgid "Log In"
 msgstr "Connexion"
 
-#: pyaggr3g470r/forms.py:75
+#: pyaggr3g470r/forms.py:80
 msgid "Account not confirmed"
 msgstr "Compte non confirmé"
 
-#: pyaggr3g470r/forms.py:78
+#: pyaggr3g470r/forms.py:83
 msgid "Invalid email or password"
 msgstr "E-mail ou mot de passe invalide"
 
-#: pyaggr3g470r/forms.py:83 pyaggr3g470r/templates/feeds.html:11
+#: pyaggr3g470r/forms.py:89 pyaggr3g470r/templates/feeds.html:11
 msgid "Title"
 msgstr "Titre"
 
-#: pyaggr3g470r/forms.py:84 pyaggr3g470r/templates/admin/user.html:27
+#: pyaggr3g470r/forms.py:90 pyaggr3g470r/templates/admin/user.html:27
 msgid "Feed link"
 msgstr "Lien du flux"
 
-#: pyaggr3g470r/forms.py:85 pyaggr3g470r/templates/admin/user.html:28
+#: pyaggr3g470r/forms.py:91 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
+#: pyaggr3g470r/forms.py:92
 msgid "Check for updates"
 msgstr "Vérifier les mises à jour"
 
-#: pyaggr3g470r/forms.py:88 pyaggr3g470r/forms.py:102
+#: pyaggr3g470r/forms.py:93 pyaggr3g470r/forms.py:107
 msgid "Save"
 msgstr "Sauver"
 
-#: pyaggr3g470r/forms.py:100
+#: pyaggr3g470r/forms.py:101
 msgid "Please enter your email."
 msgstr "S'il vous plaît, entrez votre email."
 
-#: pyaggr3g470r/forms.py:116
+#: pyaggr3g470r/forms.py:103
+msgid "Password Confirmation"
+msgstr "Confirmation du mot de passe"
+
+#: pyaggr3g470r/forms.py:104
+msgid "Feeds refresh frequency (in minutes)"
+msgstr "Fréquence de rafraîchissement du flux (en minutes)"
+
+#: pyaggr3g470r/forms.py:112
+msgid "Passwords aren't the same."
+msgstr "Les mots de passe ne sont pas identiques."
+
+#: pyaggr3g470r/forms.py:125
 msgid "Subject"
 msgstr "Objet"
 
-#: pyaggr3g470r/forms.py:116
+#: pyaggr3g470r/forms.py:126
 msgid "Please enter a subject."
 msgstr "S'il vous plaît entrer un objet."
 
-#: pyaggr3g470r/forms.py:117
+#: pyaggr3g470r/forms.py:127
 msgid "Message"
 msgstr "Message"
 
-#: pyaggr3g470r/forms.py:117
+#: pyaggr3g470r/forms.py:128
 msgid "Please enter a content."
 msgstr "S'il vous plaît entrer un contenu."
 
-#: pyaggr3g470r/forms.py:118
+#: pyaggr3g470r/forms.py:129
 msgid "Send"
 msgstr "Envoyer"
 
-#: pyaggr3g470r/forms.py:122
+#: pyaggr3g470r/forms.py:137
 msgid "Recover"
 msgstr "Récupérer"
 
-#: pyaggr3g470r/forms.py:135
+#: pyaggr3g470r/forms.py:147
 msgid "Account not confirmed."
 msgstr "Compte non confirmé."
 
-#: pyaggr3g470r/forms.py:138
+#: pyaggr3g470r/forms.py:150
 msgid "Invalid email."
 msgstr "Email invalide."
 
-#: pyaggr3g470r/views.py:99
-msgid "Authentication required."
-msgstr "Authentification requise."
-
-#: pyaggr3g470r/views.py:104
-msgid "Forbidden."
-msgstr "Interdit."
-
-#: pyaggr3g470r/views.py:156
-msgid "Logged in successfully."
-msgstr "Connecté avec succès."
-
-#: pyaggr3g470r/views.py:178
-msgid "Logged out successfully."
-msgstr "Déconnecté avec succès."
-
-#: pyaggr3g470r/views.py:187
-msgid "Self-registration is disabled."
-msgstr "L'auto-enregistrement est désactivé."
-
-#: pyaggr3g470r/views.py:204
-msgid "Email already used."
-msgstr "Email déjà utilisé."
-
-#: pyaggr3g470r/views.py:211 pyaggr3g470r/views.py:921
-msgid "Problem while sending activation email"
-msgstr "Problème lors de l'envoi d'email d'activation"
-
-#: pyaggr3g470r/views.py:214
-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:601
-msgid "Downloading articles..."
-msgstr "Téléchargement des articles."
-
-#: pyaggr3g470r/views.py:343 pyaggr3g470r/views.py:403
-msgid "This article do not exist."
-msgstr "Cet article n'existe pas."
-
-#: pyaggr3g470r/views.py:400 pyaggr3g470r/templates/home.html:75
-msgid "Article"
-msgstr "Article"
-
-#: pyaggr3g470r/views.py:400
-msgid "deleted."
-msgstr "supprimé."
-
-#: pyaggr3g470r/views.py:499
-msgid "Indexing database..."
-msgstr "Indexation la base de données..."
-
-#: pyaggr3g470r/views.py:501 pyaggr3g470r/views.py:570
-msgid "An error occured"
-msgstr "Une erreur est survenue."
-
-#: pyaggr3g470r/views.py:504
-msgid "Option not available on Heroku."
-msgstr "Option non disponible sur Heroku."
-
-#: pyaggr3g470r/views.py:519 pyaggr3g470r/views.py:529
-msgid "Error when exporting articles."
-msgstr "Erreur lors de l'export des articles."
-
-#: pyaggr3g470r/views.py:535
-msgid "Export format not supported."
-msgstr "Ce format d'export n'est pas supporté."
-
-#: pyaggr3g470r/views.py:558
-msgid "Full text search is not yet implemented for Heroku."
-msgstr "La recherche rapide n'est pas supporté sur Heroku."
-
-#: pyaggr3g470r/views.py:595 pyaggr3g470r/views.py:608
-#: pyaggr3g470r/views.py:616
-msgid "File not allowed."
-msgstr "Fichier non autorisé."
-
-#: pyaggr3g470r/views.py:600
-msgid "feeds imported."
-msgstr "flux importés."
-
-#: pyaggr3g470r/views.py:603
-msgid "Impossible to import the new feeds."
-msgstr "Impossible d'importer les nouveaux flux."
-
-#: pyaggr3g470r/views.py:612
-msgid "Account imported."
-msgstr "Compte importé."
-
-#: pyaggr3g470r/views.py:614
-msgid "Impossible to import the account."
-msgstr "Impossible d'importer le compte."
-
-#: pyaggr3g470r/views.py:652
-msgid "Feed successfully updated."
-msgstr "Flux mis à jour avec succès."
-
-#: pyaggr3g470r/views.py:664
-msgid "Feed successfully created."
-msgstr "Flux créé avec succès."
-
-#: pyaggr3g470r/views.py:667
-msgid "Downloading articles for the new feed..."
-msgstr "Téléchargement des articles du nouveau flux..."
-
-#: pyaggr3g470r/views.py:671
-msgid "Feed already in the database."
-msgstr "Flux déjà dans la base de données."
-
-#: pyaggr3g470r/views.py:677
-msgid "Edit the feed"
-msgstr "Éditez ce flux"
-
-#: pyaggr3g470r/views.py:690 pyaggr3g470r/templates/layout.html:109
-msgid "Add a feed"
-msgstr "Ajouter un flux"
-
-#: pyaggr3g470r/views.py:703 pyaggr3g470r/templates/home.html:74
-#: pyaggr3g470r/templates/admin/user.html:42
-msgid "Feed"
-msgstr "Flux"
-
-#: pyaggr3g470r/views.py:703 pyaggr3g470r/views.py:898
-msgid "successfully deleted."
-msgstr "supprimé avec succès."
-
-#: pyaggr3g470r/views.py:721 pyaggr3g470r/views.py:848
-#: pyaggr3g470r/views.py:858 pyaggr3g470r/views.py:898
-msgid "User"
-msgstr "Utilisateur"
-
-#: pyaggr3g470r/views.py:721 pyaggr3g470r/views.py:848
-msgid "successfully updated."
-msgstr "mis à jour avec succès."
-
-#: pyaggr3g470r/views.py:740
-msgid "Your account has been deleted."
-msgstr "Votre compte a été supprimé."
-
-#: pyaggr3g470r/views.py:742 pyaggr3g470r/views.py:884
-#: pyaggr3g470r/views.py:900 pyaggr3g470r/views.py:929
-msgid "This user does not exist."
-msgstr "Cet utilisateur n'existe pas."
-
-#: pyaggr3g470r/views.py:756
-msgid "Articles deleted."
-msgstr "Articles supprimés."
-
-#: pyaggr3g470r/views.py:770
-msgid "Your account has been confirmed."
-msgstr "Votre compte a été confirmé."
-
-#: pyaggr3g470r/views.py:772
-msgid "Impossible to confirm this account."
-msgstr "Impossible de confirmer ce compte."
-
-#: pyaggr3g470r/views.py:796
-msgid "New password sent to your address."
-msgstr "Nouveau mot de passe envoyé à votre adresse."
-
-#: pyaggr3g470r/views.py:798
-msgid "Problem while sending your new password."
-msgstr "Problème lors de l'envoi de votre nouveau mot de passe."
-
-#: pyaggr3g470r/views.py:823
-msgid "Problem while sending email"
-msgstr "Problème lors de l'envoi de l'email"
-
-#: pyaggr3g470r/views.py:858
-msgid "successfully created."
-msgstr "créé avec succès."
-
-#: pyaggr3g470r/views.py:867
-msgid "Edit the user"
-msgstr "Éditer cet utilisateur"
-
-#: pyaggr3g470r/views.py:870 pyaggr3g470r/templates/admin/dashboard.html:45
-msgid "Add a new user"
-msgstr "Ajouter un nouvel utilisateur"
-
-#: pyaggr3g470r/views.py:919 pyaggr3g470r/views.py:926
-msgid "Account of the user"
-msgstr "Compte de l'utilisateur"
-
-#: pyaggr3g470r/views.py:919
-msgid "successfully activated."
-msgstr "activé avec succès."
-
-#: pyaggr3g470r/views.py:926
-msgid "successfully disabled."
-msgstr "désactivé avec succès."
-
-#: pyaggr3g470r/templates/about.html:5 pyaggr3g470r/templates/layout.html:126
-#: pyaggr3g470r/templates/layout.html:143
+#: pyaggr3g470r/templates/about.html:5 pyaggr3g470r/templates/layout.html:117
+#: pyaggr3g470r/templates/layout.html:134
 msgid "About"
 msgstr "À propos"
 
@@ -379,11 +195,11 @@ msgstr ""
 
 #: pyaggr3g470r/templates/about.html:19
 msgid ""
-"The documentation of the RESTful API is <a href=\"https://bitbucket.org/"
-"cedricbonhomme/pyaggr3g470r#rst-header-web-service\">here</a>."
+"The documentation of the RESTful API is <a href=\"https://pyaggr3g470r."
+"readthedocs.org/en/latest/web-services.html\">here</a>."
 msgstr ""
-"La documentation de l'API RESTful est <a href=\"https://bitbucket.org/"
-"cedricbonhomme/pyaggr3g470r#rst-header-web-service\">ici</a>."
+"La documentation de l'API RESTful est <a href=\"https://pyaggr3g470r."
+"readthedocs.org/en/latest/web-services.html\">ici</a>."
 
 #: pyaggr3g470r/templates/about.html:20
 #, python-format
@@ -414,25 +230,25 @@ msgid "from"
 msgstr "de"
 
 #: pyaggr3g470r/templates/article.html:11
-#: pyaggr3g470r/templates/duplicates.html:19
-#: pyaggr3g470r/templates/duplicates.html:20
-#: pyaggr3g470r/templates/home.html:89
+#: pyaggr3g470r/templates/duplicates.html:23
+#: pyaggr3g470r/templates/duplicates.html:24
+#: pyaggr3g470r/templates/home.html:90
 msgid "Delete this article"
 msgstr "Supprimer cet article"
 
-#: pyaggr3g470r/templates/article.html:13 pyaggr3g470r/templates/home.html:91
+#: pyaggr3g470r/templates/article.html:13 pyaggr3g470r/templates/home.html:92
 msgid "One of your favorites"
 msgstr "Un de vos favoris"
 
-#: pyaggr3g470r/templates/article.html:15 pyaggr3g470r/templates/home.html:93
+#: pyaggr3g470r/templates/article.html:15 pyaggr3g470r/templates/home.html:94
 msgid "Click if you like this article"
 msgstr "Cliquez si vous aimez cet article"
 
-#: pyaggr3g470r/templates/article.html:18 pyaggr3g470r/templates/home.html:96
+#: pyaggr3g470r/templates/article.html:18 pyaggr3g470r/templates/home.html:97
 msgid "Mark this article as unread"
 msgstr "Marquer cet article comme non lu"
 
-#: pyaggr3g470r/templates/article.html:20 pyaggr3g470r/templates/home.html:98
+#: pyaggr3g470r/templates/article.html:20 pyaggr3g470r/templates/home.html:99
 msgid "Mark this article as read"
 msgstr "Marquer cet article comme lu"
 
@@ -453,7 +269,12 @@ msgstr "Partager sur"
 msgid "Duplicates in the feed"
 msgstr "Doublons dans le flux"
 
-#: pyaggr3g470r/templates/duplicates.html:27
+#: pyaggr3g470r/templates/duplicates.html:12
+#: pyaggr3g470r/templates/duplicates.html:15
+msgid "Delete all in this column"
+msgstr "Supprimer tout dans cette colonne"
+
+#: pyaggr3g470r/templates/duplicates.html:31
 msgid "No duplicates in the feed"
 msgstr "Pas de doublon dans ce flux"
 
@@ -471,26 +292,26 @@ msgid "More articles"
 msgstr "Plus d'articles"
 
 #: pyaggr3g470r/templates/favorites.html:17
-#: pyaggr3g470r/templates/home.html:29 pyaggr3g470r/templates/home.html:44
+#: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:50
 #: pyaggr3g470r/templates/unread.html:17
 msgid "Details"
 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/feeds.html:33 pyaggr3g470r/templates/home.html:34
+#: pyaggr3g470r/templates/home.html:52 pyaggr3g470r/templates/unread.html:18
 #: pyaggr3g470r/templates/admin/user.html:43
 msgid "Edit this feed"
 msgstr "Éditer ce flux"
 
 #: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:35
-#: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:47
+#: pyaggr3g470r/templates/home.html:35 pyaggr3g470r/templates/home.html:53
 #: pyaggr3g470r/templates/admin/user.html:44
 msgid "Delete this feed"
 msgstr "Supprimer ce flux"
 
 #: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:35
-#: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:47
+#: pyaggr3g470r/templates/home.html:35 pyaggr3g470r/templates/home.html:53
 #: pyaggr3g470r/templates/admin/user.html:44
 msgid "You are going to delete this feed."
 msgstr "Vous allez supprimer ce flux."
@@ -503,35 +324,55 @@ msgstr "Ce flux contient"
 msgid "articles"
 msgstr "articles"
 
-#: pyaggr3g470r/templates/feed.html:14
-msgid "of the database"
-msgstr "de la base de données"
-
-#: pyaggr3g470r/templates/feed.html:17
+#: pyaggr3g470r/templates/feed.html:13
 msgid "Address of the feed"
 msgstr "Adresse du flux"
 
-#: pyaggr3g470r/templates/feed.html:19
+#: pyaggr3g470r/templates/feed.html:15
 msgid "Address of the site"
 msgstr "Adresse du site"
 
-#: pyaggr3g470r/templates/feed.html:23
+#: pyaggr3g470r/templates/feed.html:21
+msgid "Last download:"
+msgstr "Dernier téléchargement:"
+
+#: pyaggr3g470r/templates/feed.html:25
+msgid ""
+"That feed has encountered too much consecutive errors and won't be retrieved "
+"anymore."
+msgstr ""
+"Ce flux a rencontré trop d'erreurs consécutives et ne sera plus récupéré."
+
+#: pyaggr3g470r/templates/feed.html:27
+msgid ""
+"The download of this feed has encountered some problems. However its error "
+"counter will be reinitialized at the next successful retrieving."
+msgstr ""
+"Le téléchargement de ce flux a rencontré quelques problèmes. Cependant, son "
+"compteur d'erreurs sera réinitialisé lors de la prochaine récupération "
+"réussie."
+
+#: pyaggr3g470r/templates/feed.html:31
+msgid "Here's the last error encountered while retrieving this feed:"
+msgstr "Voici la dernière erreur survenue lors de la récupération ce flux:"
+
+#: pyaggr3g470r/templates/feed.html:35
 msgid "The last article was posted"
 msgstr "Le dernier article a été posté il y a"
 
-#: pyaggr3g470r/templates/feed.html:23
+#: pyaggr3g470r/templates/feed.html:35
 msgid "day(s) ago."
 msgstr "jours."
 
-#: pyaggr3g470r/templates/feed.html:24
+#: pyaggr3g470r/templates/feed.html:36
 msgid "Daily average"
 msgstr "Moyenne journalière"
 
-#: pyaggr3g470r/templates/feed.html:24
+#: pyaggr3g470r/templates/feed.html:36
 msgid "between the"
 msgstr "entre le"
 
-#: pyaggr3g470r/templates/feed.html:24
+#: pyaggr3g470r/templates/feed.html:36
 msgid "and the"
 msgstr "et le"
 
@@ -564,8 +405,8 @@ msgid "Site"
 msgstr "Site"
 
 #: pyaggr3g470r/templates/feeds.html:13 pyaggr3g470r/templates/feeds.html:32
-#: pyaggr3g470r/templates/home.html:30 pyaggr3g470r/templates/home.html:45
-#: pyaggr3g470r/templates/layout.html:104
+#: pyaggr3g470r/templates/home.html:33 pyaggr3g470r/templates/home.html:51
+#: pyaggr3g470r/templates/layout.html:95
 msgid "Articles"
 msgstr "Articles"
 
@@ -587,6 +428,15 @@ msgstr "Flux désactivé"
 msgid "Duplicate articles"
 msgstr "Articles doublon"
 
+#: pyaggr3g470r/templates/history.html:4
+#: pyaggr3g470r/templates/layout.html:110
+msgid "History"
+msgstr "Historique"
+
+#: pyaggr3g470r/templates/history.html:9
+msgid "all years"
+msgstr "toutes les années"
+
 #: pyaggr3g470r/templates/home.html:10
 msgid "You don't have any feeds."
 msgstr "Vous n'avez pas de flux."
@@ -604,31 +454,44 @@ msgstr "ou"
 msgid "upload an OPML file."
 msgstr "téléchargez un fichier OPML."
 
-#: pyaggr3g470r/templates/home.html:18 pyaggr3g470r/templates/layout.html:118
+#: pyaggr3g470r/templates/home.html:18 pyaggr3g470r/templates/layout.html:109
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: pyaggr3g470r/templates/home.html:33 pyaggr3g470r/templates/home.html:48
+#: pyaggr3g470r/templates/home.html:25 pyaggr3g470r/templates/home.html:43
+msgid "error"
+msgstr "erreur"
+
+#: pyaggr3g470r/templates/home.html:36 pyaggr3g470r/templates/home.html:54
 msgid "Mark this feed as read"
 msgstr "Marquer ce flux comme lu"
 
-#: pyaggr3g470r/templates/home.html:34 pyaggr3g470r/templates/home.html:49
+#: pyaggr3g470r/templates/home.html:37 pyaggr3g470r/templates/home.html:55
 msgid "Mark this feed as unread"
 msgstr "Marquer ce flux comme non lu"
 
-#: pyaggr3g470r/templates/home.html:57 pyaggr3g470r/templates/home.html:65
+#: pyaggr3g470r/templates/home.html:63 pyaggr3g470r/templates/home.html:71
 msgid "All"
 msgstr "Tout"
 
-#: pyaggr3g470r/templates/home.html:58
+#: pyaggr3g470r/templates/home.html:64
 msgid "Read"
 msgstr "Lus"
 
-#: pyaggr3g470r/templates/home.html:59 pyaggr3g470r/templates/layout.html:115
+#: pyaggr3g470r/templates/home.html:65 pyaggr3g470r/templates/layout.html:106
 msgid "Unread"
 msgstr "Non lus"
 
-#: pyaggr3g470r/templates/home.html:76
+#: pyaggr3g470r/templates/home.html:81
+#: pyaggr3g470r/templates/admin/user.html:42 pyaggr3g470r/views/views.py:630
+msgid "Feed"
+msgstr "Flux"
+
+#: pyaggr3g470r/templates/home.html:82 pyaggr3g470r/views/views.py:336
+msgid "Article"
+msgstr "Article"
+
+#: pyaggr3g470r/templates/home.html:83
 msgid "Date"
 msgstr "Date"
 
@@ -644,39 +507,39 @@ msgstr "jours"
 msgid "No inactive feeds."
 msgstr "Aucun flux inactifs."
 
-#: pyaggr3g470r/templates/layout.html:106
+#: pyaggr3g470r/templates/layout.html:97
 msgid "Fetch"
 msgstr "Télécharger"
 
-#: pyaggr3g470r/templates/layout.html:107
+#: pyaggr3g470r/templates/layout.html:98
 msgid "Mark all as read"
 msgstr "Marquer tout comme lu"
 
-#: pyaggr3g470r/templates/layout.html:113
+#: pyaggr3g470r/templates/layout.html:100 pyaggr3g470r/views/views.py:617
+msgid "Add a feed"
+msgstr "Ajouter un flux"
+
+#: pyaggr3g470r/templates/layout.html:104
 msgid "Filter"
 msgstr "Filtrer"
 
-#: pyaggr3g470r/templates/layout.html:116
+#: pyaggr3g470r/templates/layout.html:107
 msgid "Favorites"
 msgstr "Favoris"
 
-#: pyaggr3g470r/templates/layout.html:117
+#: pyaggr3g470r/templates/layout.html:108
 msgid "Inactive feeds"
 msgstr "Flux inactifs"
 
-#: pyaggr3g470r/templates/layout.html:119
-msgid "History"
-msgstr "Historique"
-
-#: pyaggr3g470r/templates/layout.html:122
+#: pyaggr3g470r/templates/layout.html:113
 msgid "Management"
 msgstr "Gestion"
 
-#: pyaggr3g470r/templates/layout.html:124
+#: pyaggr3g470r/templates/layout.html:115
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
-#: pyaggr3g470r/templates/layout.html:127
+#: pyaggr3g470r/templates/layout.html:118
 msgid "Logout"
 msgstr "Déconnexion"
 
@@ -828,6 +691,11 @@ msgstr "Supprimer cet utilisateur"
 msgid "You are going to delete this account."
 msgstr "Vous allez supprimer ce compte."
 
+#: pyaggr3g470r/templates/admin/dashboard.html:45
+#: pyaggr3g470r/views/views.py:797
+msgid "Add a new user"
+msgstr "Ajouter un nouvel utilisateur"
+
 #: pyaggr3g470r/templates/admin/dashboard.html:46
 msgid "Send notification messages"
 msgstr "Envoyer des messages de notification"
@@ -852,6 +720,195 @@ msgstr "Nom de famille"
 msgid "Number of articles"
 msgstr "Nombre d'articles"
 
+#: pyaggr3g470r/views/views.py:103
+msgid "Authentication required."
+msgstr "Authentification requise."
+
+#: pyaggr3g470r/views/views.py:108
+msgid "Forbidden."
+msgstr "Interdit."
+
+#: pyaggr3g470r/views/views.py:161
+msgid "Logged in successfully."
+msgstr "Connecté avec succès."
+
+#: pyaggr3g470r/views/views.py:184
+msgid "Logged out successfully."
+msgstr "Déconnecté avec succès."
+
+#: pyaggr3g470r/views/views.py:193
+msgid "Self-registration is disabled."
+msgstr "L'auto-enregistrement est désactivé."
+
+#: pyaggr3g470r/views/views.py:210
+msgid "Email already used."
+msgstr "Email déjà utilisé."
+
+#: pyaggr3g470r/views/views.py:217 pyaggr3g470r/views/views.py:848
+msgid "Problem while sending activation email"
+msgstr "Problème lors de l'envoi d'email d'activation"
+
+#: pyaggr3g470r/views/views.py:220
+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/views.py:269 pyaggr3g470r/views/views.py:519
+msgid "Downloading articles..."
+msgstr "Téléchargement des articles."
+
+#: pyaggr3g470r/views/views.py:271
+msgid ""
+"The manual retrieving of news is only available for administrator, on the "
+"Heroku platform."
+msgstr ""
+"La récupération manuelle de nouvelles est disponible uniquement pour "
+"l'administrateur, sur la plate-forme Heroku."
+
+#: pyaggr3g470r/views/views.py:336
+msgid "deleted."
+msgstr "supprimé."
+
+#: pyaggr3g470r/views/views.py:339
+msgid "This article do not exist."
+msgstr "Cet article n'existe pas."
+
+#: pyaggr3g470r/views/views.py:417
+msgid "Indexing database..."
+msgstr "Indexation la base de données..."
+
+#: pyaggr3g470r/views/views.py:419 pyaggr3g470r/views/views.py:488
+msgid "An error occured"
+msgstr "Une erreur est survenue."
+
+#: pyaggr3g470r/views/views.py:422
+msgid "Option not available on Heroku."
+msgstr "Option non disponible sur Heroku."
+
+#: pyaggr3g470r/views/views.py:437 pyaggr3g470r/views/views.py:447
+msgid "Error when exporting articles."
+msgstr "Erreur lors de l'export des articles."
+
+#: pyaggr3g470r/views/views.py:453
+msgid "Export format not supported."
+msgstr "Ce format d'export n'est pas supporté."
+
+#: pyaggr3g470r/views/views.py:476
+msgid "Full text search is not yet implemented for Heroku."
+msgstr "La recherche rapide n'est pas supporté sur Heroku."
+
+#: pyaggr3g470r/views/views.py:513 pyaggr3g470r/views/views.py:526
+#: pyaggr3g470r/views/views.py:534
+msgid "File not allowed."
+msgstr "Fichier non autorisé."
+
+#: pyaggr3g470r/views/views.py:518
+msgid "feeds imported."
+msgstr "flux importés."
+
+#: pyaggr3g470r/views/views.py:521
+msgid "Impossible to import the new feeds."
+msgstr "Impossible d'importer les nouveaux flux."
+
+#: pyaggr3g470r/views/views.py:530
+msgid "Account imported."
+msgstr "Compte importé."
+
+#: pyaggr3g470r/views/views.py:532
+msgid "Impossible to import the account."
+msgstr "Impossible d'importer le compte."
+
+#: pyaggr3g470r/views/views.py:579
+msgid "Feed successfully updated."
+msgstr "Flux mis à jour avec succès."
+
+#: pyaggr3g470r/views/views.py:590
+msgid "Feed successfully created."
+msgstr "Flux créé avec succès."
+
+#: pyaggr3g470r/views/views.py:593
+msgid "Downloading articles for the new feed..."
+msgstr "Téléchargement des articles du nouveau flux..."
+
+#: pyaggr3g470r/views/views.py:597
+msgid "Feed already in the database."
+msgstr "Flux déjà dans la base de données."
+
+#: pyaggr3g470r/views/views.py:604
+msgid "Edit the feed"
+msgstr "Éditez ce flux"
+
+#: pyaggr3g470r/views/views.py:630 pyaggr3g470r/views/views.py:825
+msgid "successfully deleted."
+msgstr "supprimé avec succès."
+
+#: pyaggr3g470r/views/views.py:648 pyaggr3g470r/views/views.py:775
+#: pyaggr3g470r/views/views.py:785 pyaggr3g470r/views/views.py:825
+msgid "User"
+msgstr "Utilisateur"
+
+#: pyaggr3g470r/views/views.py:649 pyaggr3g470r/views/views.py:775
+msgid "successfully updated."
+msgstr "mis à jour avec succès."
+
+#: pyaggr3g470r/views/views.py:669
+msgid "Your account has been deleted."
+msgstr "Votre compte a été supprimé."
+
+#: pyaggr3g470r/views/views.py:671 pyaggr3g470r/views/views.py:811
+#: pyaggr3g470r/views/views.py:827 pyaggr3g470r/views/views.py:855
+msgid "This user does not exist."
+msgstr "Cet utilisateur n'existe pas."
+
+#: pyaggr3g470r/views/views.py:685
+msgid "Articles deleted."
+msgstr "Articles supprimés."
+
+#: pyaggr3g470r/views/views.py:699
+msgid "Your account has been confirmed."
+msgstr "Votre compte a été confirmé."
+
+#: pyaggr3g470r/views/views.py:701
+msgid "Impossible to confirm this account."
+msgstr "Impossible de confirmer ce compte."
+
+#: pyaggr3g470r/views/views.py:723
+msgid "New password sent to your address."
+msgstr "Nouveau mot de passe envoyé à votre adresse."
+
+#: pyaggr3g470r/views/views.py:725
+msgid "Problem while sending your new password."
+msgstr "Problème lors de l'envoi de votre nouveau mot de passe."
+
+#: pyaggr3g470r/views/views.py:750
+msgid "Problem while sending email"
+msgstr "Problème lors de l'envoi de l'email"
+
+#: pyaggr3g470r/views/views.py:785
+msgid "successfully created."
+msgstr "créé avec succès."
+
+#: pyaggr3g470r/views/views.py:794
+msgid "Edit the user"
+msgstr "Éditer cet utilisateur"
+
+#: pyaggr3g470r/views/views.py:846 pyaggr3g470r/views/views.py:852
+msgid "Account of the user"
+msgstr "Compte de l'utilisateur"
+
+#: pyaggr3g470r/views/views.py:846
+msgid "successfully activated."
+msgstr "activé avec succès."
+
+#: pyaggr3g470r/views/views.py:852
+msgid "successfully disabled."
+msgstr "désactivé avec succès."
+
+#~ msgid "of the database"
+#~ msgstr "de la base de données"
+
+#~ msgid "Email notification"
+#~ msgstr "Notification par email"
+
 #~ msgid "Database indexed."
 #~ msgstr "Base de données indexée."
 
@@ -912,9 +969,6 @@ msgstr "Nombre d'articles"
 #~ msgid "First name"
 #~ msgstr "Prénom"
 
-#~ msgid "Last name"
-#~ msgstr "Nom de famille"
-
 #~ msgid "Please enter your last name."
 #~ msgstr "S'il vous plaît, entrez votre nom de famille."