Uppdated translations.

4 files changed, 69 insertions, 63 deletions

diff --git a/pyaggr3g470r/templates/edit_feed.html b/pyaggr3g470r/templates/edit_feed.html
index e9a90960..be63aa53 100644
--- a/pyaggr3g470r/templates/edit_feed.html
+++ b/pyaggr3g470r/templates/edit_feed.html
@@ -10,10 +10,10 @@
             {{ form.link(class_="form-control") }} {% for error in form.link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
 
             {{ form.title.label }}
-            {{ form.title(class_="form-control", placeholder="Optional") }} {% for error in form.title.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+            {{ form.title(class_="form-control", placeholder=_('Optional')) }} {% for error in form.title.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
 
             {{ form.site_link.label }}
-            {{ form.site_link(class_="form-control", placeholder="Optional") }} {% for error in form.site_link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+            {{ form.site_link(class_="form-control", placeholder=_('Optional')) }} {% for error in form.site_link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
 
             {{ form.enabled.label }}
             {{ form.enabled(class_="checkbox") }}
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index 8b735c70..d8a62dbc 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -49,13 +49,13 @@
                                 {{ create_feed_form.hidden_tag() }}
 
                                 {{ create_feed_form.link.label }}
-                                {{ create_feed_form.link(class_="form-control", placeholder="Feed link") }} {% for error in create_feed_form.link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+                                {{ create_feed_form.link(class_="form-control") }} {% for error in create_feed_form.link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
 
                                 {{ create_feed_form.title.label }}
-                                {{ create_feed_form.title(class_="form-control", placeholder="Optional") }} {% for error in create_feed_form.title.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+                                {{ create_feed_form.title(class_="form-control", placeholder=_('Optional')) }} {% for error in create_feed_form.title.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
 
                                 {{ create_feed_form.site_link.label }}
-                                {{ create_feed_form.site_link(class_="form-control", placeholder="Optional") }} {% for error in create_feed_form.site_link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+                                {{ create_feed_form.site_link(class_="form-control", placeholder=_('Optional')) }} {% for error in create_feed_form.site_link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
 
                                 {{ create_feed_form.enabled.label }}
                                 {{ create_feed_form.enabled(class_="checkbox") }}
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
index 37708604..240662df 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 13f5c303..4886fa70 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-04-23 08:24+0200\n"
-"PO-Revision-Date: 2015-04-23 08:24+0100\n"
+"POT-Creation-Date: 2015-05-03 18:19+0200\n"
+"PO-Revision-Date: 2015-05-03 18:20+0100\n"
 "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\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.5.4\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
@@ -236,23 +236,23 @@ msgstr "de"
 #: pyaggr3g470r/templates/article.html:11
 #: pyaggr3g470r/templates/duplicates.html:23
 #: pyaggr3g470r/templates/duplicates.html:24
-#: pyaggr3g470r/templates/home.html:85
+#: pyaggr3g470r/templates/home.html:89
 msgid "Delete this article"
 msgstr "Supprimer cet article"
 
-#: pyaggr3g470r/templates/article.html:13 pyaggr3g470r/templates/home.html:87
+#: pyaggr3g470r/templates/article.html:13 pyaggr3g470r/templates/home.html:91
 msgid "One of your favorites"
 msgstr "Un de vos favoris"
 
-#: pyaggr3g470r/templates/article.html:15 pyaggr3g470r/templates/home.html:89
+#: pyaggr3g470r/templates/article.html:15 pyaggr3g470r/templates/home.html:93
 msgid "Click if you like this article"
 msgstr "Cliquez si vous aimez cet article"
 
-#: pyaggr3g470r/templates/article.html:18 pyaggr3g470r/templates/home.html:92
+#: pyaggr3g470r/templates/article.html:18 pyaggr3g470r/templates/home.html:96
 msgid "Mark this article as unread"
 msgstr "Marquer cet article comme non lu"
 
-#: pyaggr3g470r/templates/article.html:20 pyaggr3g470r/templates/home.html:94
+#: pyaggr3g470r/templates/article.html:20 pyaggr3g470r/templates/home.html:98
 msgid "Mark this article as read"
 msgstr "Marquer cet article comme lu"
 
@@ -282,20 +282,26 @@ msgstr "Supprimer tout dans cette colonne"
 msgid "No duplicates in the feed"
 msgstr "Pas de doublon dans ce flux"
 
+#: pyaggr3g470r/templates/edit_feed.html:13
+#: pyaggr3g470r/templates/edit_feed.html:16
+#: 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:30 pyaggr3g470r/templates/home.html:48
+#: pyaggr3g470r/templates/home.html:34 pyaggr3g470r/templates/home.html:52
 #: 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:30 pyaggr3g470r/templates/home.html:48
+#: pyaggr3g470r/templates/home.html:34 pyaggr3g470r/templates/home.html:52
 #: 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:29 pyaggr3g470r/templates/home.html:47
+#: pyaggr3g470r/templates/home.html:33 pyaggr3g470r/templates/home.html:51
 #: pyaggr3g470r/templates/admin/user.html:43
 msgid "Edit this feed"
 msgstr "Éditer ce flux"
@@ -398,7 +404,7 @@ msgid "Site"
 msgstr "Site"
 
 #: pyaggr3g470r/templates/feeds.html:13 pyaggr3g470r/templates/feeds.html:32
-#: pyaggr3g470r/templates/home.html:28 pyaggr3g470r/templates/home.html:46
+#: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:50
 msgid "Articles"
 msgstr "Articles"
 
@@ -445,49 +451,49 @@ msgstr "ou"
 msgid "upload an OPML file."
 msgstr "téléchargez un fichier OPML."
 
-#: pyaggr3g470r/templates/home.html:13
+#: pyaggr3g470r/templates/home.html:14 pyaggr3g470r/templates/home.html:16
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: pyaggr3g470r/templates/home.html:20 pyaggr3g470r/templates/home.html:38
+#: pyaggr3g470r/templates/home.html:24 pyaggr3g470r/templates/home.html:42
 msgid "error"
 msgstr "erreur"
 
-#: pyaggr3g470r/templates/home.html:27 pyaggr3g470r/templates/home.html:45
+#: pyaggr3g470r/templates/home.html:31 pyaggr3g470r/templates/home.html:49
 msgid "Details"
 msgstr "Détails"
 
-#: pyaggr3g470r/templates/home.html:31 pyaggr3g470r/templates/home.html:49
+#: pyaggr3g470r/templates/home.html:35 pyaggr3g470r/templates/home.html:53
 msgid "Mark this feed as read"
 msgstr "Marquer ce flux comme lu"
 
-#: pyaggr3g470r/templates/home.html:32 pyaggr3g470r/templates/home.html:50
+#: pyaggr3g470r/templates/home.html:36 pyaggr3g470r/templates/home.html:54
 msgid "Mark this feed as unread"
 msgstr "Marquer ce flux comme non lu"
 
-#: pyaggr3g470r/templates/home.html:58 pyaggr3g470r/templates/home.html:66
+#: pyaggr3g470r/templates/home.html:62 pyaggr3g470r/templates/home.html:70
 #: pyaggr3g470r/templates/layout.html:83
 msgid "All"
 msgstr "Tout"
 
-#: pyaggr3g470r/templates/home.html:59
+#: pyaggr3g470r/templates/home.html:63
 msgid "Read"
 msgstr "Lus"
 
-#: pyaggr3g470r/templates/home.html:60
+#: pyaggr3g470r/templates/home.html:64
 msgid "Unread"
 msgstr "Non lus"
 
-#: pyaggr3g470r/templates/home.html:76 pyaggr3g470r/templates/layout.html:77
+#: pyaggr3g470r/templates/home.html:80 pyaggr3g470r/templates/layout.html:77
 #: pyaggr3g470r/templates/admin/user.html:42
 msgid "Feed"
 msgstr "Flux"
 
-#: pyaggr3g470r/templates/home.html:77 pyaggr3g470r/views/views.py:403
+#: pyaggr3g470r/templates/home.html:81 pyaggr3g470r/views/views.py:418
 msgid "Article"
 msgstr "Article"
 
-#: pyaggr3g470r/templates/home.html:78
+#: pyaggr3g470r/templates/home.html:82
 msgid "Date"
 msgstr "Date"
 
@@ -512,7 +518,7 @@ msgstr "Ajouter un flux"
 msgid "Home"
 msgstr "Accueil"
 
-#: pyaggr3g470r/templates/layout.html:71 pyaggr3g470r/views/views.py:305
+#: pyaggr3g470r/templates/layout.html:71 pyaggr3g470r/views/views.py:317
 msgid "Favorites"
 msgstr "Favoris"
 
@@ -672,7 +678,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:710
+#: pyaggr3g470r/views/views.py:725
 msgid "Add a new user"
 msgstr "Ajouter un nouvel utilisateur"
 
@@ -763,7 +769,7 @@ msgstr "L'auto-enregistrement est désactivé."
 msgid "Email already used."
 msgstr "Email déjà utilisé."
 
-#: pyaggr3g470r/views/views.py:228 pyaggr3g470r/views/views.py:761
+#: pyaggr3g470r/views/views.py:228 pyaggr3g470r/views/views.py:776
 msgid "Problem while sending activation email"
 msgstr "Problème lors de l'envoi d'email d'activation"
 
@@ -771,19 +777,19 @@ msgstr "Problème lors de l'envoi d'email d'activation"
 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:313
+#: pyaggr3g470r/views/views.py:325
 msgid "No text to search were provided."
 msgstr "Aucun texte à chercher a été soumis."
 
-#: pyaggr3g470r/views/views.py:325
+#: pyaggr3g470r/views/views.py:340
 msgid "Search:"
 msgstr "Recherche:"
 
-#: pyaggr3g470r/views/views.py:341 pyaggr3g470r/views/views.py:507
+#: pyaggr3g470r/views/views.py:356 pyaggr3g470r/views/views.py:522
 msgid "Downloading articles..."
 msgstr "Téléchargement des articles."
 
-#: pyaggr3g470r/views/views.py:343
+#: pyaggr3g470r/views/views.py:358
 msgid ""
 "The manual retrieving of news is only available for administrator, on the "
 "Heroku platform."
@@ -791,106 +797,106 @@ msgstr ""
 "La récupération manuelle de nouvelles est disponible uniquement pour "
 "l'administrateur, sur la plate-forme Heroku."
 
-#: pyaggr3g470r/views/views.py:403
+#: pyaggr3g470r/views/views.py:418
 msgid "deleted."
 msgstr "supprimé."
 
-#: pyaggr3g470r/views/views.py:406
+#: pyaggr3g470r/views/views.py:421
 msgid "This article do not exist."
 msgstr "Cet article n'existe pas."
 
-#: pyaggr3g470r/views/views.py:453 pyaggr3g470r/views/views.py:464
+#: pyaggr3g470r/views/views.py:468 pyaggr3g470r/views/views.py:479
 msgid "Error when exporting articles."
 msgstr "Erreur lors de l'export des articles."
 
-#: pyaggr3g470r/views/views.py:470
+#: pyaggr3g470r/views/views.py:485
 msgid "Export format not supported."
 msgstr "Ce format d'export n'est pas supporté."
 
-#: pyaggr3g470r/views/views.py:499 pyaggr3g470r/views/views.py:515
-#: pyaggr3g470r/views/views.py:524
+#: pyaggr3g470r/views/views.py:514 pyaggr3g470r/views/views.py:530
+#: pyaggr3g470r/views/views.py:539
 msgid "File not allowed."
 msgstr "Fichier non autorisé."
 
-#: pyaggr3g470r/views/views.py:505
+#: pyaggr3g470r/views/views.py:520
 msgid "feeds imported."
 msgstr "flux importés."
 
-#: pyaggr3g470r/views/views.py:509
+#: pyaggr3g470r/views/views.py:524
 msgid "Impossible to import the new feeds."
 msgstr "Impossible d'importer les nouveaux flux."
 
-#: pyaggr3g470r/views/views.py:519
+#: pyaggr3g470r/views/views.py:534
 msgid "Account imported."
 msgstr "Compte importé."
 
-#: pyaggr3g470r/views/views.py:521
+#: pyaggr3g470r/views/views.py:536
 msgid "Impossible to import the account."
 msgstr "Impossible d'importer le compte."
 
-#: pyaggr3g470r/views/views.py:561 pyaggr3g470r/views/views.py:688
-#: pyaggr3g470r/views/views.py:698 pyaggr3g470r/views/views.py:738
+#: pyaggr3g470r/views/views.py:576 pyaggr3g470r/views/views.py:703
+#: pyaggr3g470r/views/views.py:713 pyaggr3g470r/views/views.py:753
 msgid "User"
 msgstr "Utilisateur"
 
-#: pyaggr3g470r/views/views.py:562 pyaggr3g470r/views/views.py:688
+#: pyaggr3g470r/views/views.py:577 pyaggr3g470r/views/views.py:703
 msgid "successfully updated."
 msgstr "mis à jour avec succès."
 
-#: pyaggr3g470r/views/views.py:582
+#: pyaggr3g470r/views/views.py:597
 msgid "Your account has been deleted."
 msgstr "Votre compte a été supprimé."
 
-#: pyaggr3g470r/views/views.py:584 pyaggr3g470r/views/views.py:724
-#: pyaggr3g470r/views/views.py:740 pyaggr3g470r/views/views.py:768
+#: pyaggr3g470r/views/views.py:599 pyaggr3g470r/views/views.py:739
+#: pyaggr3g470r/views/views.py:755 pyaggr3g470r/views/views.py:783
 msgid "This user does not exist."
 msgstr "Cet utilisateur n'existe pas."
 
-#: pyaggr3g470r/views/views.py:598
+#: pyaggr3g470r/views/views.py:613
 msgid "Articles deleted."
 msgstr "Articles supprimés."
 
-#: pyaggr3g470r/views/views.py:612
+#: pyaggr3g470r/views/views.py:627
 msgid "Your account has been confirmed."
 msgstr "Votre compte a été confirmé."
 
-#: pyaggr3g470r/views/views.py:614
+#: pyaggr3g470r/views/views.py:629
 msgid "Impossible to confirm this account."
 msgstr "Impossible de confirmer ce compte."
 
-#: pyaggr3g470r/views/views.py:636
+#: pyaggr3g470r/views/views.py:651
 msgid "New password sent to your address."
 msgstr "Nouveau mot de passe envoyé à votre adresse."
 
-#: pyaggr3g470r/views/views.py:638
+#: pyaggr3g470r/views/views.py:653
 msgid "Problem while sending your new password."
 msgstr "Problème lors de l'envoi de votre nouveau mot de passe."
 
-#: pyaggr3g470r/views/views.py:663
+#: pyaggr3g470r/views/views.py:678
 msgid "Problem while sending email"
 msgstr "Problème lors de l'envoi de l'email"
 
-#: pyaggr3g470r/views/views.py:698
+#: pyaggr3g470r/views/views.py:713
 msgid "successfully created."
 msgstr "créé avec succès."
 
-#: pyaggr3g470r/views/views.py:707
+#: pyaggr3g470r/views/views.py:722
 msgid "Edit the user"
 msgstr "Éditer cet utilisateur"
 
-#: pyaggr3g470r/views/views.py:738
+#: pyaggr3g470r/views/views.py:753
 msgid "successfully deleted."
 msgstr "supprimé avec succès."
 
-#: pyaggr3g470r/views/views.py:759 pyaggr3g470r/views/views.py:765
+#: pyaggr3g470r/views/views.py:774 pyaggr3g470r/views/views.py:780
 msgid "Account of the user"
 msgstr "Compte de l'utilisateur"
 
-#: pyaggr3g470r/views/views.py:759
+#: pyaggr3g470r/views/views.py:774
 msgid "successfully activated."
 msgstr "activé avec succès."
 
-#: pyaggr3g470r/views/views.py:765
+#: pyaggr3g470r/views/views.py:780
 msgid "successfully disabled."
 msgstr "désactivé avec succès."