7 files changed, 80 insertions, 16 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 84144705..1286847c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -1,3 +1,11 @@
+#Login
+Keep me logged in: 'Rester connecté'
+Forgot your password?: 'Mot de passe oublié ?'
+Login: 'Se connecter'
+Back to login: 'Revenir au formulaire de connexion'
+Send: 'Envoyer'
+"Enter your email address below and we'll send you password reset instructions.": "Saisissez votre adresse e-mail ci-dessous, nous vous enverrons les instructions pour réinitialiser votre mot de passe."
+
 # Menu
 unread: 'Non lus'
 starred: 'Favoris'
@@ -7,6 +15,8 @@ tags: 'Tags'
 config: 'Configuration'
 howto: 'Aide'
 logout: 'Déconnexion'
+Filtered: 'Articles filtrés'
+About: 'À propos'
 
 # Header
 Back to unread articles: 'Retour aux articles non lus'
@@ -39,3 +49,58 @@ New password: 'Nouveau mot de passe'
 Repeat new password: 'Confirmez votre nouveau mot de passe'
 Username: "Nom d'utilisateur"
 
+# Entries
+'estimated reading time': 'durée de lecture'
+original: original
+Toggle mark as read: 'Marquer comme lu/non lu'
+Toggle favorite: 'Marquer comme favori'
+Delete: 'Supprimer'
+
+# Filters
+Filters: 'Filtres'
+Status: 'Statut'
+Archived: 'Lu'
+Starred: 'Favori'
+Preview picture: 'Photo'
+Has a preview picture: 'A une photo'
+Reading time in minutes: 'Durée de lecture en minutes'
+from: 'de'
+to: 'à'
+website.com: 'website.com'
+Domain name: 'Nom de domaine'
+Creation date: 'Date de création'
+dd/mm/yyyy: 'dd/mm/aaaa'
+Clear: 'Effacer'
+Filter: 'Filtrer'
+
+# About
+Who is behind wallabag: "L'équipe derrière wallabag"
+Getting help: "Besoin d'aide"
+Helping wallabag: "Aider wallabag"
+Developed by: "Développé par"
+website: "Site web"
+And many others contributors ♥: "Et plein de contributeurs ♥"
+on GitHub: "sur GitHub"
+Project website: "Site web du projet"
+License: "Licence"
+Version: "Version"
+Documentation: "Documentation"
+Bug reports: "Rapport de bugs"
+On our support website: "Sur notre site de support"
+or: "ou"
+"wallabag is free and opensource. You can help us:": "wallabag est gratuit et opensource. Vous pouvez nous aider :"
+"by contributing to the project:": "en contribuant au projet :"
+an issue lists all our needs: "un ticket recense tous nos besoins"
+via Paypal: "via Paypal"
+via Flattr: "via Flattr"
+
+# Howto
+Form: Formulaire
+Thanks to this form: "Grâce à ce formulaire"
+Browser addons: "Extensions de navigateur"
+Mobile apps: "Applications smartphone"
+Bookmarklet: "Bookmarklet"
+Standard Firefox Add-On: "Extension Firefox"
+Chrome Extension: "Extension Chrome"
+download the application: "téléchargez l'application"
+"Drag & drop this link to your bookmarks bar:": "Glissez et déposez ce lien dans votre barre de favoris :"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 156bc05f..0ff21f22 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -169,7 +169,7 @@
 
                             <div class="hidden">{{ form_rest(form.pwd) }}</div>
                             <button class="btn waves-effect waves-light" type="submit" name="action">
-                                {% trans %}Update{% endtrans %}
+                                {% trans %}Save{% endtrans %}
                             </button>
 
                         </form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index ff69e821..a1d4746e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -4,13 +4,13 @@
   {% set currentRoute = app.request.attributes.get('_route') %}
 
   {% if currentRoute == 'starred' %}
-    {% trans %}Starred{% endtrans %}
+    {% trans %}starred{% endtrans %}
   {% elseif currentRoute == 'archive' %}
-    {% trans %}Archive{% endtrans %}
+    {% trans %}archive{% endtrans %}
   {% elseif currentRoute == 'all' %}
     {% trans %}Filtered{% endtrans %}
   {% else %}
-    {% trans %}Unread{% endtrans %}
+    {% trans %}unread{% endtrans %}
   {% endif %}
 
 {% endblock %}
@@ -49,9 +49,9 @@
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw|striptags|slice(0, 42) }}</a></span>
 
                             {% if entry.readingTime > 0 %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} {{ entry.readingTime }} min</span></div>
+                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div>
                             {% else %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur">&lt;</small> 1 min</span></div>
+                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur">&lt;</small> 1 min</span></div>
                             {% endif %}
 
                             {% if entry.previewPicture is null %}
@@ -66,9 +66,9 @@
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span>
 
                             {% if entry.readingTime > 0 %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} {{ entry.readingTime }} min</span></div>
+                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div>
                             {% else %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur">&lt;</small> 1 min</span></div>
+                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur">&lt;</small> 1 min</span></div>
                             {% endif %}
 
                             <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
index 9750f8ba..7d916237 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
@@ -9,12 +9,11 @@
 {% block content %}
     <main class="valign-wrapper">
         <div class="valign row">
-            <h1>{% trans %}Forgot password{% endtrans %}</h1>
             <div class="card sw">
+                <div class="center"><img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
                 <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform">
                     <div class="card-content">
-
-                        <span class="card-title black-text"><p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p></span>
+                        <span class="black-text"><p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p></span>
 
                         {% if form_errors(form) %}
                             <span class="black-text">{{ form_errors(form) }}</span>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
index 5de71d77..ef1fe916 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
@@ -22,7 +22,7 @@
                         <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans %}website{% endtrans %}</a></dd>
                         <dd>Thomas Citharel — <a href="https://tcit.fr">{% trans %}website{% endtrans %}</a></dd>
                         <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{% trans %}website{% endtrans %}</a></dd>
-                        <dt>{% trans %}And many others contributors ♥{% endtrans %} <a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on Github{% endtrans %}</a></dt>
+                        <dt>{% trans %}And many others contributors ♥{% endtrans %} <a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on GitHub{% endtrans %}</a></dt>
                         <dt>{% trans %}Project website{% endtrans %}</dt>
                         <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
                         <dt>{% trans %}License{% endtrans %}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
@@ -37,14 +37,14 @@
                             <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
 
                             <dt>{% trans %}Bug reports{% endtrans %}</dt>
-                            <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on Github{% endtrans %}</a></dd>
+                            <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on GitHub{% endtrans %}</a></dd>
                         </dl>
                     </div>
 
                     <div id="set3" class="col s12">
                         <dl>
                             <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt>
-                            <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd>
+                            <dd>{% trans %}by contributing to the project:{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues/1254">{% trans %}an issue lists all our needs{% endtrans %}</a></dd>
                             <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd>
 
                             <dd><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dd>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
index 6f98ba99..78591172 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Howto{% endtrans %}{% endblock %}
+{% block title %}{% trans %}howto{% endtrans %}{% endblock %}
 
 {% block content %}
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index a4b1d030..2d1d3ded 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -108,7 +108,7 @@
         <div class="footer-copyright">
             <div class="container">
                 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
-                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}about{% endtrans %}</a>
+                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a>
             </div>
         </div>
     </footer>