8 files changed, 237 insertions, 47 deletions

diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 5cc1031c..692bca70 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 1a530491..ad17ffa1 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -1,17 +1,15 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wallabag\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:17+0300\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thomas Citharel <tcit@tcit.fr>\n"
-"Language-Team: \n"
 "Language: en_US\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Basepath: .\n"
 
 msgid "wallabag, a read it later open source system"
 msgstr "wallabag, a read it later open source system"
@@ -25,6 +23,77 @@ msgstr "Return Home"
 msgid "config"
 msgstr "Config"
 
+msgid "about"
+msgstr "about"
+
+msgid "About wallabag"
+msgstr "About wallabag"
+
+msgid ""
+"wallabag is a read-it-later application: you can save a web page by keeping "
+"only content. Elements like ads or menus are deleted."
+msgstr ""
+"wallabag is a read-it-later application: you can save a web page by keeping "
+"only content. Elements like ads or menus are deleted."
+
+msgid "Project website"
+msgstr "Project website"
+
+msgid "Main developer"
+msgstr "Main developer"
+
+msgid "website"
+msgstr "website"
+
+msgid "Contributors:"
+msgstr "Contributors:"
+
+msgid "Bug reports"
+msgstr "Bug reports"
+
+msgid "On our support website"
+msgstr "On our support website"
+
+msgid "on Github"
+msgstr "on Github"
+
+msgid "License"
+msgstr "License"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "Getting help"
+msgstr "Getting help"
+
+msgid "Documentation"
+msgstr "Documentation"
+
+msgid ""
+"<a href=\"docs/\">Offline documentation</a> and <a href=\"https://doc."
+"wallabag.org/\">online documentation</a> (up to date)"
+msgstr ""
+"<a href=\"docs/\">Offline documentation</a> and <a href=\"https://doc."
+"wallabag.org/\">online documentation</a> (up to date)"
+
+msgid "Support"
+msgstr "Support"
+
+msgid "Helping wallabag"
+msgstr "Helping wallabag"
+
+msgid "wallabag is free and opensource. You can help us:"
+msgstr "wallabag is free and opensource. You can help us:"
+
+msgid "via Paypal"
+msgstr "via Paypal"
+
+msgid "via Flattr"
+msgstr "via Flattr2"
+
+msgid "Credits"
+msgstr "Credits"
+
 msgid "Saving articles"
 msgstr "Saving articles"
 
@@ -61,8 +130,14 @@ msgstr "By filling this field"
 msgid "bag it!"
 msgstr "bag it!"
 
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
+msgid "Drag &amp; drop this link to your bookmarks bar:"
+msgstr "Drag &amp; drop this link to your bookmarks bar:"
+
+msgid "Browser Addons"
+msgstr "Browser Addons"
+
+msgid "Mobile Apps"
+msgstr "Mobile Apps"
 
 msgid "Upgrading wallabag"
 msgstr "Upgrading wallabag"
@@ -167,9 +242,18 @@ msgid ""
 "below. Wallabag will parse your file, insert all URLs and start fetching of "
 "articles if required."
 msgstr ""
-"Please select export file on your computer and press &ldquo;Import&rdquo; "
-"button below. wallabag will parse your file, insert all URLs and start "
-"fetching of articles if required."
+"Please select export file on your computer and press \"Import\" button "
+"below. Wallabag will parse your file, insert all URLs and start fetching of "
+"articles if required."
+
+msgid ""
+"Fetching process is controlled by two constants in your config file: "
+"IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay "
+"between fetch of next batch of articles)."
+msgstr ""
+"Fetching process is controlled by two constants in your config file: "
+"IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay "
+"between fetch of next batch of articles)."
 
 msgid "You can click here to fetch content for articles with no content."
 msgstr "Fetch content for articles with no content"
@@ -212,18 +296,21 @@ msgstr "to download your database."
 msgid "to export your wallabag data."
 msgstr "to export your wallabag data."
 
-msgid "Export JSON"
-msgstr "Export JSON"
+msgid "JSON export "
+msgstr "JSON export"
+
+msgid "Data will be exported in a single JSON file."
+msgstr "Data will be exported in a single JSON file."
 
 msgid "Cache"
 msgstr "Cache"
 
-msgid "to delete cache."
-msgstr "to delete cache."
-
 msgid "Delete Cache"
 msgstr "Delete Cache"
 
+msgid "Deleting the cache may help with display or other problems."
+msgstr " Deleting the cache may help with display or other problems."
+
 msgid "You can enter multiple tags, separated by commas."
 msgstr "You can enter multiple tags, separated by commas."
 
@@ -459,12 +546,6 @@ msgstr "bagging a link"
 msgid "by filling this field"
 msgstr "by filling this field"
 
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
-
-msgid "Drag &amp; drop this link to your bookmarks bar:"
-msgstr "Drag &amp; drop this link to your bookmarks bar:"
-
 msgid "your version"
 msgstr "your version"
 
@@ -636,6 +717,9 @@ msgstr ""
 msgid "Enter your search here"
 msgstr "Enter your search here"
 
+msgid "search"
+msgstr "Search"
+
 msgid "Tag these results as"
 msgstr "Tag these results as"
 
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index 2382a303..e325ac85 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index 58c55b22..871511a8 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -118,6 +118,75 @@ msgstr "Seulement un résultat trouvé pour "
 msgid "config"
 msgstr "configuration"
 
+msgid "about"
+msgstr "À propos"
+
+msgid "About wallabag"
+msgstr "À propos de wallabag"
+
+msgid ""
+"wallabag is a read-it-later application: you can save a web page by keeping "
+"only content. Elements like ads or menus are deleted."
+msgstr ""
+"wallabag est une application de lecture différée : vous pouvez sauver une "
+"page web et garder uniquement son contenu. Les élements comme les publicités "
+"ou les menus sont supprimés."
+
+msgid "Project website"
+msgstr "Site web du projet"
+
+msgid "Main developer"
+msgstr "Développeur principal"
+
+msgid "website"
+msgstr "site web"
+
+msgid "Contributors:"
+msgstr "Contributeurs :"
+
+msgid "Bug reports"
+msgstr "Rapports de bugs"
+
+msgid "on Github"
+msgstr "sur Github"
+
+msgid "On our support website"
+msgstr "Sur notre site de support"
+
+msgid "License"
+msgstr "Licence"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "Getting help"
+msgstr "Obtenir de l'aide"
+
+msgid "Documentation"
+msgstr "Documentation"
+
+msgid ""
+"<a href=\"docs/\">Offline documentation</a> and <a href=\"https://doc."
+"wallabag.org/\">online documentation</a> (up to date)"
+msgstr ""
+"<a href=\"docs/\">Documentation hors-ligne</a> et <a href=\"https://doc."
+"wallabag.org/\">documentation en ligne</a> (à jour)"
+
+msgid "Helping wallabag"
+msgstr "Aider wallabag"
+
+msgid "wallabag is free and opensource. You can help us:"
+msgstr "wallabag est libre et opensource. Vous pouver nous aider :"
+
+msgid "via Paypal"
+msgstr "via Paypal"
+
+msgid "via Flattr"
+msgstr "via Flattr"
+
+msgid "Credits"
+msgstr "Crédits"
+
 msgid "Saving articles"
 msgstr "Sauvegarde des articles"
 
@@ -130,6 +199,12 @@ msgstr "lisez la documentation"
 msgid "download the extension"
 msgstr "téléchargez l'extension"
 
+msgid "Firefox Add-On"
+msgstr "Add-On Firefox"
+
+msgid "Chrome Extension"
+msgstr "Extension Chrome"
+
 msgid "via F-Droid"
 msgstr "via F-Droid"
 
@@ -146,10 +221,16 @@ msgid "By filling this field"
 msgstr "En remplissant ce champ"
 
 msgid "bag it!"
-msgstr "bag it !"
+msgstr "Bag!"
+
+msgid "Browser Addons"
+msgstr "Modules pour navigateurs"
 
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Bookmarklet : glissez-déposez ce lien dans votre barre de favoris"
+msgid "Mobile Apps"
+msgstr "Applications pour appareils mobiles"
+
+msgid "Drag &amp; drop this link to your bookmarks bar:"
+msgstr "Glissez-déposez ce lien dans votre barre de favoris : "
 
 msgid "Upgrading wallabag"
 msgstr "Mise à jour de wallabag"
@@ -247,19 +328,24 @@ msgstr ""
 "n'importe quel fichier au format JSON ou HTML approprié."
 
 msgid ""
-"Please select export file on your computer and press \"Import\" button below."
-"<br>Wallabag will parse your file, insert all URLs and start fetching of "
-"articles if required.<br>Fetching process is controlled by two constants in "
-"your config file: IMPORT_LIMIT (how many articles are fetched at once) and "
-"IMPORT_DELAY (delay between fetch of next batch of articles)."
+"Please select export file on your computer and press \"Import\" button "
+"below. Wallabag will parse your file, insert all URLs and start fetching of "
+"articles if required."
+msgstr ""
+"Sélectionnez le fichier à importer sur votre disque dur, et pressez le "
+"bouton « Importer » ci-dessous. wallabag analysera votre fichier, ajoutera "
+"toutes les URL trouvées et commencera à télécharger les contenus si "
+"nécessaire."
+
+msgid ""
+"Fetching process is controlled by two constants in your config file: "
+"IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay "
+"between fetch of next batch of articles)."
 msgstr ""
-"Sélectionnez le fichier à importer sur votre disque dur, et pressez la "
-"bouton « Importer » ci-dessous.<br />wallabag analysera votre fichier, "
-"ajoutera toutes les URL trouvées et commencera à télécharger les contenus si "
-"nécessaire.<br />Le processus de téléchargement est contrôlé par deux "
-"constantes dans votre fichier de configuration:<wbr /><code>IMPORT_LIMIT</"
-"code> (nombre d'éléments téléchargés à la fois) et <code>IMPORT_DELAY</code> "
-"(le délai d'attente entre deux séquences de téléchargement)."
+"Le processus d'import peut être paramétré par deux constantes dans votre "
+"fichier de configuration : IMPORT_LIMIT (combien d'articles sont téléchargés "
+"à la fois) et IMPORT_DELAY (le délai entre le téléchargement du prochain lot "
+"d'articles)."
 
 msgid "File:"
 msgstr "Fichier : "
@@ -280,11 +366,21 @@ msgstr "pour télécharger votre base de données."
 msgid "to export your wallabag data."
 msgstr "pour exporter vos données de wallabag."
 
+msgid "JSON export"
+msgstr "Export JSON"
+
+msgid "Data will be exported in a single JSON file."
+msgstr "Les données seront exportées dans un unique fichier JSON."
+
 msgid "Cache"
 msgstr "Cache"
 
-msgid "to delete cache."
-msgstr "pour effacer le cache."
+msgid "Delete Cache"
+msgstr "Vider le cache"
+
+msgid "Deleting the cache may help with display or other problems."
+msgstr ""
+"Vider le cache peut résoudre des problèmes d'affichage ou d'autres problèmes."
 
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig
index 93c96df2..0fdbe3b8 100755
--- a/themes/baggy/about.twig
+++ b/themes/baggy/about.twig
@@ -33,7 +33,7 @@
     
     <dl>
         <dt>{% trans "Documentation" %}</dt>
-        <dd><a href="docs/">Offline documentation</a> and <a href="https://doc.wallabag.org/">online documentation</a> (up to date)</dd>
+        <dd>{% trans %}<a href="docs/">Offline documentation</a> and <a href="https://doc.wallabag.org/">online documentation</a> (up to date){% endtrans %}</dd>
         
         <dt>{% trans "Support" %}</dt>
         <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd>
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 94257616..b4765602 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -14,12 +14,12 @@
                     <input type="submit" value="{% trans "bag it!" %}" />
                 </form>
             </p>
-            <h3>Browser Plugins</h3>
+            <h3>{% trans "Browser Addons" %}</h3>
             <ul>
                 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
                 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
             </ul>
-            <h3>Mobile Apps</h3>
+            <h3>{% trans "Mobile Apps" %}</h3>
             <ul>
                 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
                 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
@@ -102,8 +102,8 @@
             <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
 
             <h2>{% trans "Export your wallabag data" %}</h2>
-            <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
-            <span class="more-info">Data will be exported in a single JSON file.</span></p>
+            <p><a href="?export" target="_blank">{% trans "JSON export" %}</a><br>
+            <span class="more-info">{% trans "Data will be exported in a single JSON file." %}</span></p>
 
             <h2>{% trans "Fancy an E-Book ?" %}</h2>
             <p>{% trans "Click to get all your articles in one ebook :" %}
@@ -117,7 +117,7 @@
 
             <h2><a name="cache"></a>{% trans "Cache" %}</h2>
             <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
-            <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
+            <span class="more-info">{% trans "Deleting the cache may help with display or other problems." %}</span></p>
 
             {% if http_auth == 0 %}
             <h2>{% trans "Change your password" %}</h2>
diff --git a/themes/default/about.twig b/themes/default/about.twig
index bab9b5eb..e0776d9c 100755
--- a/themes/default/about.twig
+++ b/themes/default/about.twig
@@ -20,7 +20,7 @@
         <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans "on Github" %}</a></dd>
 
         <dt>{% trans "Bug reports" %}</dt>
-        <dd><a href="http://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd>
+        <dd><a href="http://support.wallabag.org">{% trans "On our support website" %}</a>{% trans " or " %}<a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd>
 
         <dt>{% trans "License" %}</dt>
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
@@ -29,6 +29,16 @@
         <dd>{{ constant('POCHE') }}</dd>
     </dl>
 
+    <h2>{% trans "Getting help" %}</h2>
+    
+    <dl>
+        <dt>{% trans "Documentation" %}</dt>
+        <dd>{% trans %}<a href="docs/">Offline documentation</a> and <a href="https://doc.wallabag.org/">online documentation</a> (up to date){% endtrans %}</dd>
+        
+        <dt>{% trans "Support" %}</dt>
+        <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd>
+    </dl>
+
     <h2>{% trans "Helping wallabag" %}</h2>
 
     <p>{% trans "wallabag is free and opensource. You can help us:" %}</p>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 6302a6a3..09e40e75 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -102,7 +102,7 @@
             <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
 
             <h2>{% trans "Export your wallabag data" %}</h2>
-            <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
+            <p><a href="?export" target="_blank">{% trans "JSON export" %}</a><br>
             <span class="more-info">Data will be exported in a single JSON file.</span></p>
 
             <h2>{% trans "Fancy an E-Book ?" %}</h2>