Updated translations.

4 files changed, 231 insertions, 268 deletions

diff --git a/babel.cfg b/babel.cfg
index 0cc0baca..f0234b32 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -1,3 +1,3 @@
 [python: **.py]
 [jinja2: **/templates/**.html]
-extensions=jinja2.ext.autoescape,jinja2.ext.with_
\ No newline at end of file
+extensions=jinja2.ext.autoescape,jinja2.ext.with_
diff --git a/messages.pot b/messages.pot
index df29efc0..a3febe4d 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-06-12 14:33+0200\n"
+"POT-Creation-Date: 2015-07-06 23:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,7 +88,6 @@ msgid "Passwords aren't the same."
 msgstr ""
 
 #: pyaggr3g470r/forms.py:146 pyaggr3g470r/templates/feeds.html:11
-#: pyaggr3g470r/templates/layout.html:114
 msgid "Title"
 msgstr ""
 
@@ -140,8 +139,7 @@ msgstr ""
 msgid "Invalid email."
 msgstr ""
 
-#: pyaggr3g470r/templates/about.html:5 pyaggr3g470r/templates/layout.html:93
-#: pyaggr3g470r/templates/layout.html:126
+#: pyaggr3g470r/templates/about.html:5
 msgid "About"
 msgstr ""
 
@@ -226,23 +224,22 @@ msgstr ""
 #: pyaggr3g470r/templates/article.html:11
 #: pyaggr3g470r/templates/duplicates.html:22
 #: pyaggr3g470r/templates/duplicates.html:23
-#: pyaggr3g470r/templates/home.html:83
 msgid "Delete this article"
 msgstr ""
 
-#: pyaggr3g470r/templates/article.html:13 pyaggr3g470r/templates/home.html:85
+#: pyaggr3g470r/templates/article.html:13
 msgid "One of your favorites"
 msgstr ""
 
-#: pyaggr3g470r/templates/article.html:15 pyaggr3g470r/templates/home.html:87
+#: pyaggr3g470r/templates/article.html:15
 msgid "Click if you like this article"
 msgstr ""
 
-#: pyaggr3g470r/templates/article.html:18 pyaggr3g470r/templates/home.html:90
+#: pyaggr3g470r/templates/article.html:18
 msgid "Mark this article as unread"
 msgstr ""
 
-#: pyaggr3g470r/templates/article.html:20 pyaggr3g470r/templates/home.html:92
+#: pyaggr3g470r/templates/article.html:20
 msgid "Mark this article as read"
 msgstr ""
 
@@ -268,26 +265,50 @@ msgstr ""
 msgid "Delete all in this column"
 msgstr ""
 
-#: pyaggr3g470r/templates/edit_feed.html:13
-#: pyaggr3g470r/templates/edit_feed.html:16
-#: pyaggr3g470r/templates/layout.html:55 pyaggr3g470r/templates/layout.html:58
+#: pyaggr3g470r/templates/edit_feed.html:19
+#: pyaggr3g470r/templates/edit_feed.html:27
 msgid "Optional"
 msgstr ""
 
-#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:35
-#: pyaggr3g470r/templates/home.html:29 pyaggr3g470r/templates/home.html:46
+#: pyaggr3g470r/templates/edit_feed.html:41
+msgid "Filters"
+msgstr ""
+
+#: pyaggr3g470r/templates/edit_feed.html:52
+msgid "simple match"
+msgstr ""
+
+#: pyaggr3g470r/templates/edit_feed.html:53
+msgid "regex"
+msgstr ""
+
+#: pyaggr3g470r/templates/edit_feed.html:57
+msgid "match"
+msgstr ""
+
+#: pyaggr3g470r/templates/edit_feed.html:58
+msgid "no match"
+msgstr ""
+
+#: pyaggr3g470r/templates/edit_feed.html:61
+msgid "mark as read"
+msgstr ""
+
+#: pyaggr3g470r/templates/edit_feed.html:62
+msgid "mark as favorite"
+msgstr ""
+
+#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:38
 #: pyaggr3g470r/templates/admin/user.html:44
 msgid "Delete this feed"
 msgstr ""
 
-#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:35
-#: pyaggr3g470r/templates/home.html:29 pyaggr3g470r/templates/home.html:46
+#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:38
 #: pyaggr3g470r/templates/admin/user.html:44
 msgid "You are going to delete this feed."
 msgstr ""
 
-#: pyaggr3g470r/templates/feed.html:8 pyaggr3g470r/templates/feeds.html:33
-#: pyaggr3g470r/templates/home.html:28 pyaggr3g470r/templates/home.html:45
+#: pyaggr3g470r/templates/feed.html:8 pyaggr3g470r/templates/feeds.html:36
 #: pyaggr3g470r/templates/admin/user.html:43
 msgid "Edit this feed"
 msgstr ""
@@ -379,7 +400,7 @@ msgstr ""
 msgid "Site"
 msgstr ""
 
-#: pyaggr3g470r/templates/feeds.html:13 pyaggr3g470r/templates/feeds.html:32
+#: pyaggr3g470r/templates/feeds.html:13 pyaggr3g470r/templates/feeds.html:35
 msgid "Articles"
 msgstr ""
 
@@ -397,11 +418,15 @@ msgstr ""
 msgid "Feed disabled"
 msgstr ""
 
-#: pyaggr3g470r/templates/feeds.html:34
+#: pyaggr3g470r/templates/feeds.html:28
+msgid "Feed encountered too much errors."
+msgstr ""
+
+#: pyaggr3g470r/templates/feeds.html:37
 msgid "Duplicate articles"
 msgstr ""
 
-#: pyaggr3g470r/templates/history.html:4 pyaggr3g470r/templates/layout.html:82
+#: pyaggr3g470r/templates/history.html:4
 msgid "History"
 msgstr ""
 
@@ -409,68 +434,6 @@ msgstr ""
 msgid "all years"
 msgstr ""
 
-#: pyaggr3g470r/templates/home.html:5
-msgid "You don't have any feeds."
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:6
-msgid "Add some"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:6 pyaggr3g470r/templates/management.html:13
-msgid "or"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:6
-msgid "upload an OPML file."
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:13
-msgid "All feeds"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:20 pyaggr3g470r/templates/home.html:37
-msgid "error"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:27 pyaggr3g470r/templates/home.html:44
-msgid "Details"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:30 pyaggr3g470r/templates/home.html:47
-msgid "Mark this feed as read"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:31 pyaggr3g470r/templates/home.html:48
-msgid "Mark this feed as unread"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:56 pyaggr3g470r/templates/home.html:64
-#: pyaggr3g470r/templates/layout.html:83
-msgid "All"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:57
-msgid "Read"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:58
-msgid "Unread"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:74 pyaggr3g470r/templates/layout.html:77
-#: pyaggr3g470r/templates/admin/user.html:42
-msgid "Feed"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:75 pyaggr3g470r/views/views.py:413
-msgid "Article"
-msgstr ""
-
-#: pyaggr3g470r/templates/home.html:76
-msgid "Date"
-msgstr ""
-
 #: pyaggr3g470r/templates/inactives.html:6
 msgid "Days of inactivity"
 msgstr ""
@@ -483,55 +446,6 @@ msgstr ""
 msgid "No inactive feeds."
 msgstr ""
 
-#: pyaggr3g470r/templates/layout.html:41 pyaggr3g470r/templates/layout.html:44
-#: pyaggr3g470r/views/feed.py:185
-msgid "Add a feed"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:69
-msgid "Home"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:71 pyaggr3g470r/views/views.py:312
-msgid "Favorites"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:74
-msgid "Fetch"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:79
-msgid "Mark all as read"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:81
-msgid "Inactive"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:91
-msgid "Profile"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:92
-msgid "Your data"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:96
-msgid "Dashboard"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:99
-msgid "Logout"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:117
-msgid "Content"
-msgstr ""
-
-#: pyaggr3g470r/templates/layout.html:119
-msgid "Search"
-msgstr ""
-
 #: pyaggr3g470r/templates/login.html:10 pyaggr3g470r/templates/recover.html:12
 msgid "Your email"
 msgstr ""
@@ -572,6 +486,10 @@ msgstr ""
 msgid "Batch import feeds from OPML"
 msgstr ""
 
+#: pyaggr3g470r/templates/management.html:13
+msgid "or"
+msgstr ""
+
 #: pyaggr3g470r/templates/management.html:17
 msgid "Export feeds to OPML"
 msgstr ""
@@ -652,7 +570,7 @@ msgid "You are going to delete this account."
 msgstr ""
 
 #: pyaggr3g470r/templates/admin/dashboard.html:45
-#: pyaggr3g470r/views/views.py:728
+#: pyaggr3g470r/views/views.py:729
 msgid "Add a new user"
 msgstr ""
 
@@ -677,46 +595,54 @@ msgid "Name"
 msgstr ""
 
 #: pyaggr3g470r/templates/admin/user.html:29
-msgid "Number of articles"
+msgid "(unread) articles"
+msgstr ""
+
+#: pyaggr3g470r/templates/admin/user.html:42
+msgid "Feed"
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:69
+#: pyaggr3g470r/views/feed.py:74
 #, python-format
 msgid "Feed %(feed_title)s successfully deleted."
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:80 pyaggr3g470r/views/feed.py:154
+#: pyaggr3g470r/views/feed.py:85 pyaggr3g470r/views/feed.py:172
 #, python-format
 msgid "Feed %(feed_title)r successfully updated."
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:91
+#: pyaggr3g470r/views/feed.py:96
 msgid "Couldn't add feed: url missing."
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:96 pyaggr3g470r/views/feed.py:143
+#: pyaggr3g470r/views/feed.py:101 pyaggr3g470r/views/feed.py:156
 msgid "Couldn't add feed: feed already exists."
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:102
+#: pyaggr3g470r/views/feed.py:106
 msgid "Feed was successfully created."
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:105 pyaggr3g470r/views/feed.py:171
+#: pyaggr3g470r/views/feed.py:109 pyaggr3g470r/views/feed.py:184
 msgid "Downloading articles for the new feed..."
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:113 pyaggr3g470r/views/feed.py:127
+#: pyaggr3g470r/views/feed.py:122
 msgid "Feed successfully updated."
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:166
-#, python-format
-msgid "Feed %(feed_title)r successfully created."
+#: pyaggr3g470r/views/feed.py:130
+msgid "Add a feed"
 msgstr ""
 
-#: pyaggr3g470r/views/feed.py:181
-msgid "Edit the feed"
+#: pyaggr3g470r/views/feed.py:136
+msgid "Edit feed"
+msgstr ""
+
+#: pyaggr3g470r/views/feed.py:179
+#, python-format
+msgid "Feed %(feed_title)r successfully created."
 msgstr ""
 
 #: pyaggr3g470r/views/views.py:103
@@ -748,132 +674,140 @@ msgstr ""
 msgid "Your account has been created. Check your mail to confirm it."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:320
+#: pyaggr3g470r/views/views.py:313
+msgid "Favorites"
+msgstr ""
+
+#: pyaggr3g470r/views/views.py:321
 msgid "No text to search were provided."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:335
+#: pyaggr3g470r/views/views.py:336
 msgid "Search:"
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:351 pyaggr3g470r/views/views.py:522
+#: pyaggr3g470r/views/views.py:352 pyaggr3g470r/views/views.py:523
 msgid "Downloading articles..."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:353
+#: pyaggr3g470r/views/views.py:354
 msgid ""
 "The manual retrieving of news is only available for administrator, on the"
 " Heroku platform."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:413
+#: pyaggr3g470r/views/views.py:414
+msgid "Article"
+msgstr ""
+
+#: pyaggr3g470r/views/views.py:414
 msgid "deleted."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:416
+#: pyaggr3g470r/views/views.py:417
 msgid "This article do not exist."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:451
+#: pyaggr3g470r/views/views.py:452
 msgid "No duplicates in the feed \"{}\"."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:468 pyaggr3g470r/views/views.py:479
+#: pyaggr3g470r/views/views.py:469 pyaggr3g470r/views/views.py:480
 msgid "Error when exporting articles."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:485
+#: pyaggr3g470r/views/views.py:486
 msgid "Export format not supported."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:514 pyaggr3g470r/views/views.py:530
-#: pyaggr3g470r/views/views.py:539
+#: pyaggr3g470r/views/views.py:515 pyaggr3g470r/views/views.py:531
+#: pyaggr3g470r/views/views.py:540
 msgid "File not allowed."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:520
+#: pyaggr3g470r/views/views.py:521
 msgid "feeds imported."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:524
+#: pyaggr3g470r/views/views.py:525
 msgid "Impossible to import the new feeds."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:534
+#: pyaggr3g470r/views/views.py:535
 msgid "Account imported."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:536
+#: pyaggr3g470r/views/views.py:537
 msgid "Impossible to import the account."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:576 pyaggr3g470r/views/views.py:706
-#: pyaggr3g470r/views/views.py:716 pyaggr3g470r/views/views.py:756
+#: pyaggr3g470r/views/views.py:577 pyaggr3g470r/views/views.py:707
+#: pyaggr3g470r/views/views.py:717 pyaggr3g470r/views/views.py:762
 msgid "User"
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:577 pyaggr3g470r/views/views.py:706
+#: pyaggr3g470r/views/views.py:578 pyaggr3g470r/views/views.py:707
 msgid "successfully updated."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:597
+#: pyaggr3g470r/views/views.py:598
 msgid "Your account has been deleted."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:599 pyaggr3g470r/views/views.py:742
-#: pyaggr3g470r/views/views.py:758 pyaggr3g470r/views/views.py:786
+#: pyaggr3g470r/views/views.py:600 pyaggr3g470r/views/views.py:748
+#: pyaggr3g470r/views/views.py:764 pyaggr3g470r/views/views.py:792
 msgid "This user does not exist."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:616
+#: pyaggr3g470r/views/views.py:617
 msgid "Articles deleted."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:630
+#: pyaggr3g470r/views/views.py:631
 msgid "Your account has been confirmed."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:632
+#: pyaggr3g470r/views/views.py:633
 msgid "Impossible to confirm this account."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:654
+#: pyaggr3g470r/views/views.py:655
 msgid "New password sent to your address."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:656
+#: pyaggr3g470r/views/views.py:657
 msgid "Problem while sending your new password."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:681
+#: pyaggr3g470r/views/views.py:682
 msgid "Problem while sending email"
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:716
+#: pyaggr3g470r/views/views.py:717
 msgid "successfully created."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:725
+#: pyaggr3g470r/views/views.py:726
 msgid "Edit the user"
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:756
+#: pyaggr3g470r/views/views.py:762
 msgid "successfully deleted."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:777 pyaggr3g470r/views/views.py:783
+#: pyaggr3g470r/views/views.py:783 pyaggr3g470r/views/views.py:789
 msgid "Account of the user"
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:777
+#: pyaggr3g470r/views/views.py:783
 msgid "successfully activated."
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:779
+#: pyaggr3g470r/views/views.py:785
 msgid "Problem while sending activation email"
 msgstr ""
 
-#: pyaggr3g470r/views/views.py:783
+#: pyaggr3g470r/views/views.py:789
 msgid "successfully disabled."
 msgstr ""
 
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
index b63c39c0..3801ee4b 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 b5c0b0d7..5002eb29 100644
--- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
+++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-06-12 14:33+0200\n"
-"PO-Revision-Date: 2015-06-12 14:33+0100\n"
-"Last-Translator: Cedric Bonhomme <cedric.bonhomme@list.lu>\n"
+"POT-Creation-Date: 2015-07-06 23:03+0200\n"
+"PO-Revision-Date: 2015-07-06 23:04+0100\n"
+"Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Generated-By: Babel 1.3\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.7.5\n"
 
 #: pyaggr3g470r/forms.py:43 pyaggr3g470r/forms.py:95 pyaggr3g470r/forms.py:118
 #: pyaggr3g470r/templates/admin/dashboard.html:12
@@ -248,23 +248,23 @@ msgstr "de"
 #: pyaggr3g470r/templates/article.html:11
 #: pyaggr3g470r/templates/duplicates.html:22
 #: pyaggr3g470r/templates/duplicates.html:23
-#: pyaggr3g470r/templates/home.html:83
+#: pyaggr3g470r/templates/home.html:95
 msgid "Delete this article"
 msgstr "Supprimer cet article"
 
-#: pyaggr3g470r/templates/article.html:13 pyaggr3g470r/templates/home.html:85
+#: pyaggr3g470r/templates/article.html:13 pyaggr3g470r/templates/home.html:97
 msgid "One of your favorites"
 msgstr "Un de vos favoris"
 
-#: pyaggr3g470r/templates/article.html:15 pyaggr3g470r/templates/home.html:87
+#: pyaggr3g470r/templates/article.html:15 pyaggr3g470r/templates/home.html:99
 msgid "Click if you like this article"
 msgstr "Cliquez si vous aimez cet article"
 
-#: pyaggr3g470r/templates/article.html:18 pyaggr3g470r/templates/home.html:90
+#: pyaggr3g470r/templates/article.html:18 pyaggr3g470r/templates/home.html:102
 msgid "Mark this article as unread"
 msgstr "Marquer cet article comme non lu"
 
-#: pyaggr3g470r/templates/article.html:20 pyaggr3g470r/templates/home.html:92
+#: pyaggr3g470r/templates/article.html:20 pyaggr3g470r/templates/home.html:104
 msgid "Mark this article as read"
 msgstr "Marquer cet article comme lu"
 
@@ -290,26 +290,54 @@ msgstr "Doublons dans le flux"
 msgid "Delete all in this column"
 msgstr "Supprimer tout dans cette colonne"
 
-#: pyaggr3g470r/templates/edit_feed.html:13
-#: pyaggr3g470r/templates/edit_feed.html:16
+#: pyaggr3g470r/templates/edit_feed.html:19
+#: pyaggr3g470r/templates/edit_feed.html:27
 #: pyaggr3g470r/templates/layout.html:55 pyaggr3g470r/templates/layout.html:58
 msgid "Optional"
 msgstr "Facultatif"
 
-#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:35
-#: pyaggr3g470r/templates/home.html:29 pyaggr3g470r/templates/home.html:46
+#: pyaggr3g470r/templates/edit_feed.html:41
+msgid "Filters"
+msgstr "Filtres"
+
+#: pyaggr3g470r/templates/edit_feed.html:52
+msgid "simple match"
+msgstr "correspondance exact"
+
+#: pyaggr3g470r/templates/edit_feed.html:53
+msgid "regex"
+msgstr "expression régulière"
+
+#: pyaggr3g470r/templates/edit_feed.html:57
+msgid "match"
+msgstr "correspond"
+
+#: pyaggr3g470r/templates/edit_feed.html:58
+msgid "no match"
+msgstr "ne correspond pas"
+
+#: pyaggr3g470r/templates/edit_feed.html:61
+msgid "mark as read"
+msgstr "Marquer cet article comme lu"
+
+#: pyaggr3g470r/templates/edit_feed.html:62
+msgid "mark as favorite"
+msgstr "Marquer comme favori"
+
+#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:38
+#: pyaggr3g470r/templates/home.html:31 pyaggr3g470r/templates/home.html:48
 #: 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:29 pyaggr3g470r/templates/home.html:46
+#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:38
+#: pyaggr3g470r/templates/home.html:31 pyaggr3g470r/templates/home.html:48
 #: pyaggr3g470r/templates/admin/user.html:44
 msgid "You are going to delete this feed."
 msgstr "Vous allez supprimer ce flux."
 
-#: pyaggr3g470r/templates/feed.html:8 pyaggr3g470r/templates/feeds.html:33
-#: pyaggr3g470r/templates/home.html:28 pyaggr3g470r/templates/home.html:45
+#: pyaggr3g470r/templates/feed.html:8 pyaggr3g470r/templates/feeds.html:36
+#: pyaggr3g470r/templates/home.html:30 pyaggr3g470r/templates/home.html:47
 #: pyaggr3g470r/templates/admin/user.html:43
 msgid "Edit this feed"
 msgstr "Éditer ce flux"
@@ -411,7 +439,7 @@ msgstr "Statut"
 msgid "Site"
 msgstr "Site"
 
-#: pyaggr3g470r/templates/feeds.html:13 pyaggr3g470r/templates/feeds.html:32
+#: pyaggr3g470r/templates/feeds.html:13 pyaggr3g470r/templates/feeds.html:35
 msgid "Articles"
 msgstr "Articles"
 
@@ -429,7 +457,11 @@ msgstr "Flux activé"
 msgid "Feed disabled"
 msgstr "Flux désactivé"
 
-#: pyaggr3g470r/templates/feeds.html:34
+#: pyaggr3g470r/templates/feeds.html:28
+msgid "Feed encountered too much errors."
+msgstr "Le flux a rencontré trop d'erreurs."
+
+#: pyaggr3g470r/templates/feeds.html:37
 msgid "Duplicate articles"
 msgstr "Articles doublon"
 
@@ -458,49 +490,49 @@ msgstr "ou"
 msgid "upload an OPML file."
 msgstr "téléchargez un fichier OPML."
 
-#: pyaggr3g470r/templates/home.html:13
+#: pyaggr3g470r/templates/home.html:15
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: pyaggr3g470r/templates/home.html:20 pyaggr3g470r/templates/home.html:37
+#: pyaggr3g470r/templates/home.html:22 pyaggr3g470r/templates/home.html:39
 msgid "error"
 msgstr "erreur"
 
-#: pyaggr3g470r/templates/home.html:27 pyaggr3g470r/templates/home.html:44
+#: pyaggr3g470r/templates/home.html:29 pyaggr3g470r/templates/home.html:46
 msgid "Details"
 msgstr "Détails"
 
-#: pyaggr3g470r/templates/home.html:30 pyaggr3g470r/templates/home.html:47
+#: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:49
 msgid "Mark this feed as read"
 msgstr "Marquer ce flux comme lu"
 
-#: pyaggr3g470r/templates/home.html:31 pyaggr3g470r/templates/home.html:48
+#: pyaggr3g470r/templates/home.html:33 pyaggr3g470r/templates/home.html:50
 msgid "Mark this feed as unread"
 msgstr "Marquer ce flux comme non lu"
 
-#: pyaggr3g470r/templates/home.html:56 pyaggr3g470r/templates/home.html:64
+#: pyaggr3g470r/templates/home.html:68 pyaggr3g470r/templates/home.html:76
 #: pyaggr3g470r/templates/layout.html:83
 msgid "All"
 msgstr "Tout"
 
-#: pyaggr3g470r/templates/home.html:57
+#: pyaggr3g470r/templates/home.html:69
 msgid "Read"
 msgstr "Lus"
 
-#: pyaggr3g470r/templates/home.html:58
+#: pyaggr3g470r/templates/home.html:70
 msgid "Unread"
 msgstr "Non lus"
 
-#: pyaggr3g470r/templates/home.html:74 pyaggr3g470r/templates/layout.html:77
+#: pyaggr3g470r/templates/home.html:86 pyaggr3g470r/templates/layout.html:77
 #: pyaggr3g470r/templates/admin/user.html:42
 msgid "Feed"
 msgstr "Flux"
 
-#: pyaggr3g470r/templates/home.html:75 pyaggr3g470r/views/views.py:413
+#: pyaggr3g470r/templates/home.html:87 pyaggr3g470r/views/views.py:414
 msgid "Article"
 msgstr "Article"
 
-#: pyaggr3g470r/templates/home.html:76
+#: pyaggr3g470r/templates/home.html:88
 msgid "Date"
 msgstr "Date"
 
@@ -517,7 +549,7 @@ msgid "No inactive feeds."
 msgstr "Aucun flux inactifs."
 
 #: pyaggr3g470r/templates/layout.html:41 pyaggr3g470r/templates/layout.html:44
-#: pyaggr3g470r/views/feed.py:185
+#: pyaggr3g470r/views/feed.py:130
 msgid "Add a feed"
 msgstr "Ajouter un flux"
 
@@ -525,7 +557,7 @@ msgstr "Ajouter un flux"
 msgid "Home"
 msgstr "Accueil"
 
-#: pyaggr3g470r/templates/layout.html:71 pyaggr3g470r/views/views.py:312
+#: pyaggr3g470r/templates/layout.html:71 pyaggr3g470r/views/views.py:313
 msgid "Favorites"
 msgstr "Favoris"
 
@@ -685,7 +717,7 @@ msgid "You are going to delete this account."
 msgstr "Vous allez supprimer ce compte."
 
 #: pyaggr3g470r/templates/admin/dashboard.html:45
-#: pyaggr3g470r/views/views.py:728
+#: pyaggr3g470r/views/views.py:729
 msgid "Add a new user"
 msgstr "Ajouter un nouvel utilisateur"
 
@@ -710,48 +742,48 @@ msgid "Name"
 msgstr "Nom de famille"
 
 #: pyaggr3g470r/templates/admin/user.html:29
-msgid "Number of articles"
-msgstr "Nombre d'articles"
+msgid "(unread) articles"
+msgstr "(non lus) articles"
 
-#: pyaggr3g470r/views/feed.py:69
+#: pyaggr3g470r/views/feed.py:74
 #, python-format
 msgid "Feed %(feed_title)s successfully deleted."
 msgstr "Flux %(feed_title)s supprimé avec succès."
 
-#: pyaggr3g470r/views/feed.py:80 pyaggr3g470r/views/feed.py:154
+#: pyaggr3g470r/views/feed.py:85 pyaggr3g470r/views/feed.py:172
 #, python-format
 msgid "Feed %(feed_title)r successfully updated."
 msgstr "Flux %(feed_title)r mis à jour avec succès."
 
-#: pyaggr3g470r/views/feed.py:91
+#: pyaggr3g470r/views/feed.py:96
 msgid "Couldn't add feed: url missing."
 msgstr "Impossible d'ajouter le flux: URL manquante."
 
-#: pyaggr3g470r/views/feed.py:96 pyaggr3g470r/views/feed.py:143
+#: pyaggr3g470r/views/feed.py:101 pyaggr3g470r/views/feed.py:156
 msgid "Couldn't add feed: feed already exists."
 msgstr "Impossible d'ajouter le flux: le flux existe déjà."
 
-#: pyaggr3g470r/views/feed.py:102
+#: pyaggr3g470r/views/feed.py:106
 msgid "Feed was successfully created."
 msgstr "Flux créé avec succès."
 
-#: pyaggr3g470r/views/feed.py:105 pyaggr3g470r/views/feed.py:171
+#: pyaggr3g470r/views/feed.py:109 pyaggr3g470r/views/feed.py:184
 msgid "Downloading articles for the new feed..."
 msgstr "Téléchargement des articles du nouveau flux..."
 
-#: pyaggr3g470r/views/feed.py:113 pyaggr3g470r/views/feed.py:127
+#: pyaggr3g470r/views/feed.py:122
 msgid "Feed successfully updated."
 msgstr "Flux mis à jour avec succès."
 
-#: pyaggr3g470r/views/feed.py:166
+#: pyaggr3g470r/views/feed.py:136
+msgid "Edit feed"
+msgstr "Éditez ce flux"
+
+#: pyaggr3g470r/views/feed.py:179
 #, python-format
 msgid "Feed %(feed_title)r successfully created."
 msgstr "Flux %(feed_title)r créé avec succès."
 
-#: pyaggr3g470r/views/feed.py:181
-msgid "Edit the feed"
-msgstr "Éditez ce flux"
-
 #: pyaggr3g470r/views/views.py:103
 msgid "Authentication required."
 msgstr "Authentification requise."
@@ -781,19 +813,19 @@ msgstr "Problème lors de l'envoi d'email d'activation: %(error)s"
 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:320
+#: pyaggr3g470r/views/views.py:321
 msgid "No text to search were provided."
 msgstr "Aucun texte à chercher a été soumis."
 
-#: pyaggr3g470r/views/views.py:335
+#: pyaggr3g470r/views/views.py:336
 msgid "Search:"
 msgstr "Recherche:"
 
-#: pyaggr3g470r/views/views.py:351 pyaggr3g470r/views/views.py:522
+#: pyaggr3g470r/views/views.py:352 pyaggr3g470r/views/views.py:523
 msgid "Downloading articles..."
 msgstr "Téléchargement des articles."
 
-#: pyaggr3g470r/views/views.py:353
+#: pyaggr3g470r/views/views.py:354
 msgid ""
 "The manual retrieving of news is only available for administrator, on the "
 "Heroku platform."
@@ -801,117 +833,120 @@ msgstr ""
 "La récupération manuelle de nouvelles est disponible uniquement pour "
 "l'administrateur, sur la plate-forme Heroku."
 
-#: pyaggr3g470r/views/views.py:413
+#: pyaggr3g470r/views/views.py:414
 msgid "deleted."
 msgstr "supprimé."
 
-#: pyaggr3g470r/views/views.py:416
+#: pyaggr3g470r/views/views.py:417
 msgid "This article do not exist."
 msgstr "Cet article n'existe pas."
 
-#: pyaggr3g470r/views/views.py:451
+#: pyaggr3g470r/views/views.py:452
 msgid "No duplicates in the feed \"{}\"."
 msgstr "Pas de doublon dans le flux \"{}\"."
 
-#: pyaggr3g470r/views/views.py:468 pyaggr3g470r/views/views.py:479
+#: pyaggr3g470r/views/views.py:469 pyaggr3g470r/views/views.py:480
 msgid "Error when exporting articles."
 msgstr "Erreur lors de l'export des articles."
 
-#: pyaggr3g470r/views/views.py:485
+#: pyaggr3g470r/views/views.py:486
 msgid "Export format not supported."
 msgstr "Ce format d'export n'est pas supporté."
 
-#: pyaggr3g470r/views/views.py:514 pyaggr3g470r/views/views.py:530
-#: pyaggr3g470r/views/views.py:539
+#: pyaggr3g470r/views/views.py:515 pyaggr3g470r/views/views.py:531
+#: pyaggr3g470r/views/views.py:540
 msgid "File not allowed."
 msgstr "Fichier non autorisé."
 
-#: pyaggr3g470r/views/views.py:520
+#: pyaggr3g470r/views/views.py:521
 msgid "feeds imported."
 msgstr "flux importés."
 
-#: pyaggr3g470r/views/views.py:524
+#: pyaggr3g470r/views/views.py:525
 msgid "Impossible to import the new feeds."
 msgstr "Impossible d'importer les nouveaux flux."
 
-#: pyaggr3g470r/views/views.py:534
+#: pyaggr3g470r/views/views.py:535
 msgid "Account imported."
 msgstr "Compte importé."
 
-#: pyaggr3g470r/views/views.py:536
+#: pyaggr3g470r/views/views.py:537
 msgid "Impossible to import the account."
 msgstr "Impossible d'importer le compte."
 
-#: pyaggr3g470r/views/views.py:576 pyaggr3g470r/views/views.py:706
-#: pyaggr3g470r/views/views.py:716 pyaggr3g470r/views/views.py:756
+#: pyaggr3g470r/views/views.py:577 pyaggr3g470r/views/views.py:707
+#: pyaggr3g470r/views/views.py:717 pyaggr3g470r/views/views.py:762
 msgid "User"
 msgstr "Utilisateur"
 
-#: pyaggr3g470r/views/views.py:577 pyaggr3g470r/views/views.py:706
+#: pyaggr3g470r/views/views.py:578 pyaggr3g470r/views/views.py:707
 msgid "successfully updated."
 msgstr "mis à jour avec succès."
 
-#: pyaggr3g470r/views/views.py:597
+#: pyaggr3g470r/views/views.py:598
 msgid "Your account has been deleted."
 msgstr "Votre compte a été supprimé."
 
-#: pyaggr3g470r/views/views.py:599 pyaggr3g470r/views/views.py:742
-#: pyaggr3g470r/views/views.py:758 pyaggr3g470r/views/views.py:786
+#: pyaggr3g470r/views/views.py:600 pyaggr3g470r/views/views.py:748
+#: pyaggr3g470r/views/views.py:764 pyaggr3g470r/views/views.py:792
 msgid "This user does not exist."
 msgstr "Cet utilisateur n'existe pas."
 
-#: pyaggr3g470r/views/views.py:616
+#: pyaggr3g470r/views/views.py:617
 msgid "Articles deleted."
 msgstr "Articles supprimés."
 
-#: pyaggr3g470r/views/views.py:630
+#: pyaggr3g470r/views/views.py:631
 msgid "Your account has been confirmed."
 msgstr "Votre compte a été confirmé."
 
-#: pyaggr3g470r/views/views.py:632
+#: pyaggr3g470r/views/views.py:633
 msgid "Impossible to confirm this account."
 msgstr "Impossible de confirmer ce compte."
 
-#: pyaggr3g470r/views/views.py:654
+#: pyaggr3g470r/views/views.py:655
 msgid "New password sent to your address."
 msgstr "Nouveau mot de passe envoyé à votre adresse."
 
-#: pyaggr3g470r/views/views.py:656
+#: pyaggr3g470r/views/views.py:657
 msgid "Problem while sending your new password."
 msgstr "Problème lors de l'envoi de votre nouveau mot de passe."
 
-#: pyaggr3g470r/views/views.py:681
+#: pyaggr3g470r/views/views.py:682
 msgid "Problem while sending email"
 msgstr "Problème lors de l'envoi de l'email"
 
-#: pyaggr3g470r/views/views.py:716
+#: pyaggr3g470r/views/views.py:717
 msgid "successfully created."
 msgstr "créé avec succès."
 
-#: pyaggr3g470r/views/views.py:725
+#: pyaggr3g470r/views/views.py:726
 msgid "Edit the user"
 msgstr "Éditer cet utilisateur"
 
-#: pyaggr3g470r/views/views.py:756
+#: pyaggr3g470r/views/views.py:762
 msgid "successfully deleted."
 msgstr "supprimé avec succès."
 
-#: pyaggr3g470r/views/views.py:777 pyaggr3g470r/views/views.py:783
+#: pyaggr3g470r/views/views.py:783 pyaggr3g470r/views/views.py:789
 msgid "Account of the user"
 msgstr "Compte de l'utilisateur"
 
-#: pyaggr3g470r/views/views.py:777
+#: pyaggr3g470r/views/views.py:783
 msgid "successfully activated."
 msgstr "activé avec succès."
 
-#: pyaggr3g470r/views/views.py:779
+#: pyaggr3g470r/views/views.py:785
 msgid "Problem while sending activation email"
 msgstr "Problème lors de l'envoi d'email d'activation"
 
-#: pyaggr3g470r/views/views.py:783
+#: pyaggr3g470r/views/views.py:789
 msgid "successfully disabled."
 msgstr "désactivé avec succès."
 
+#~ msgid "Number of articles"
+#~ msgstr "Nombre d'articles"
+
 #~ msgid "Logged in successfully."
 #~ msgstr "Connecté avec succès."
 
@@ -930,18 +965,12 @@ msgstr "désactivé avec succès."
 #~ msgid "Full text search is not yet implemented for Heroku."
 #~ msgstr "La recherche rapide n'est pas supporté sur Heroku."
 
-#~ msgid "No favorites"
-#~ msgstr "Aucun favori"
-
 #~ msgid "Favorites articles"
 #~ msgstr "Articles favoris"
 
 #~ msgid "More articles"
 #~ msgstr "Plus d'articles"
 
-#~ msgid "Filter"
-#~ msgstr "Filtrer"
-
 #~ msgid "Management"
 #~ msgstr "Gestion"