8 files changed, 183 insertions, 33 deletions

diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index bf5f69e7..b3ea3050 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index 119fb060..99867dcc 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -1,19 +1,17 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: wallabag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:17+0300\n"
+"POT-Creation-Date: 2014-07-26 15:17+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
+"Last-Translator: tcit <tcit@tcit.fr>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Language: English\n"
+"X-Generator: Poedit 1.6.4\n"
 "X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
 
 msgid "wallabag, a read it later open source system"
 msgstr "wallabag, a read it later open source system"
@@ -84,8 +82,12 @@ msgstr "A more recent development version is available."
 msgid "Feeds"
 msgstr "Feeds"
 
-msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
-msgstr "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgid ""
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
 
 msgid "Unread feed"
 msgstr "Unread feed"
@@ -102,8 +104,12 @@ msgstr "Your token:"
 msgid "Your user id:"
 msgstr "Your user id:"
 
-msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
-msgstr "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgid ""
+"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
+"</a>."
+msgstr ""
+"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
+"</a>."
 
 msgid "Change your theme"
 msgstr "Change your theme"
@@ -184,8 +190,12 @@ msgstr "return to article"
 msgid "plop"
 msgstr "plop"
 
-msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
-msgstr "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgid ""
+"You can <a href='wallabag_compatibility_test.php'>check your configuration "
+"here</a>."
+msgstr ""
+"You can <a href='wallabag_compatibility_test.php'>check your configuration "
+"here</a>."
 
 msgid "favoris"
 msgstr "favoris"
@@ -247,8 +257,14 @@ msgstr "installation"
 msgid "install your wallabag"
 msgstr "install your wallabag"
 
-msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
-msgstr "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgid ""
+"wallabag is still not installed. Please fill the below form to install it. "
+"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
+"on wallabag website</a>."
+msgstr ""
+"wallabag is still not installed. Please fill the below form to install it. "
+"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
+"on wallabag website</a>."
 
 msgid "Login"
 msgstr "Login"
@@ -401,7 +417,8 @@ msgid "a more recent development version is available."
 msgstr "a more recent development version is available."
 
 msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Please execute the import script locally, it can take a very long time."
+msgstr ""
+"Please execute the import script locally, it can take a very long time."
 
 msgid "More infos in the official doc:"
 msgstr "More infos in the official doc:"
@@ -448,8 +465,12 @@ msgstr "in demo mode, you can't update your password"
 msgid "your password has been updated"
 msgstr "your password has been updated"
 
-msgid "the two fields have to be filled & the password must be the same in the two fields"
-msgstr "the two fields have to be filled & the password must be the same in the two fields"
+msgid ""
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
+msgstr ""
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
 
 msgid "still using the \""
 msgstr "still using the \""
@@ -505,6 +526,64 @@ msgstr "Cache deleted."
 msgid "Oops, it seems you don't have PHP 5."
 msgstr "Oops, it seems you don't have PHP 5."
 
+msgid "Fancy an E-Book ?"
+msgstr "Fancy an E-Book ?"
+
+msgid "Click to get all your articles in one ebook :"
+msgstr "Click to get all your articles in one ebook :"
+
+msgid "Generate ePub file"
+msgstr "Generate ePub file"
+
+msgid "Generate Mobi file"
+msgstr "Generate Mobi file"
+
+msgid "Generate PDF file"
+msgstr "Generate PDF file"
+
+msgid ""
+"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
+"articles, depending on your server configuration."
+msgstr ""
+"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
+"articles, depending on your server configuration."
+
+msgid "Download the articles from this tag in an ePub file"
+msgstr "Download the articles from this tag in an ePub file"
+
+msgid "Download the articles from this tag in an Mobi file"
+msgstr "Download the articles from this tag in an Mobi file"
+
+msgid "Download the articles from this tag in an PDF file"
+msgstr "Download the articles from this tag in an PDF file"
+
+msgid "Download the articles from this search in an ePub"
+msgstr "Download the articles from this search in an ePub"
+
+msgid "Download the articles from this search in a Mobi file"
+msgstr "Download the articles from this search in a Mobi file"
+
+msgid "Download the articles from this search in a PDF file"
+msgstr "Download the articles from this search in a PDF file"
+
+msgid "Download the articles from this category in an ePub"
+msgstr "Download the articles from this category in an ePub"
+
+msgid "Download the articles from this category in a Mobi file"
+msgstr "Download the articles from this category in a Mobi file"
+
+msgid "Download the articles from this category in a PDF file"
+msgstr "Download the articles from this category in a PDF file"
+
+msgid "Download as ePub3"
+msgstr "Download as ePub3"
+
+msgid "Download as Mobi"
+msgstr "Download as Mobi"
+
+msgid "Download as PDF"
+msgstr "Download as PDF"
+
 #~ msgid "poche it!"
 #~ msgstr "poche it!"
 
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 b625e346..866451e1 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 0343bfec..8e9f4abc 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wallabag 1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-10 20:09+0100\n"
+"POT-Creation-Date: 2014-07-26 20:09+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Gilles Wittezaële <gilles.wittezaele@laposte.net>\n"
+"Last-Translator: tcit <tcit@tcit.fr>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "wallabag, a read it later open source system"
@@ -650,3 +650,61 @@ msgstr "Cache effacé."
 
 msgid "Oops, it seems you don't have PHP 5."
 msgstr "Oups, vous ne semblez pas avoir PHP 5."
+
+msgid "Fancy an E-Book ?"
+msgstr "Envie d'un E-Book ?"
+
+msgid "Click to get all your articles in one ebook :"
+msgstr "Cliquez pour obtenir tous vos articles dans un E-Book :"
+
+msgid "Generate ePub file"
+msgstr "Générer fichier ePub"
+
+msgid "Generate Mobi file"
+msgstr "Générer fichier Mobi"
+
+msgid "Generate PDF file"
+msgstr "Générer fichier PDF"
+
+msgid ""
+"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
+"articles, depending on your server configuration."
+msgstr ""
+"Ceci peut <b>prendre un moment</b> et peut <b>même échouer</b> si vous avez "
+"trop d'articles, selon la configuration de votre serveur."
+
+msgid "Download the articles from this tag in an ePub file"
+msgstr "Télécharger les articles de ce tag dans un fichier ePub"
+
+msgid "Download the articles from this tag in an Mobi file"
+msgstr "Télécharger les articles de ce tag dans un fichier Mobi"
+
+msgid "Download the articles from this tag in an PDF file"
+msgstr "Télécharger les articles de ce tag dans un fichier PDF"
+
+msgid "Download the articles from this search in an ePub"
+msgstr "Télécharger les articles de cette recherche dans un fichier ePub"
+
+msgid "Download the articles from this search in a Mobi file"
+msgstr "Télécharger les articles de cette recherche dans un fichier Mobi"
+
+msgid "Download the articles from this search in a PDF file"
+msgstr "Télécharger les articles de cette recherche dans un fichier PDF"
+
+msgid "Download the articles from this category in an ePub"
+msgstr "Télécharger les articles de cette catégorie dans un fichier ePub"
+
+msgid "Download the articles from this category in a Mobi file"
+msgstr "Télécharger les articles de cette catégorie dans un fichier Mobi"
+
+msgid "Download the articles from this category in a PDF file"
+msgstr "Télécharger les articles de cette catégorie dans un fichier PDF"
+
+msgid "Download as ePub3"
+msgstr "Télécharger en ePub3"
+
+msgid "Download as Mobi"
+msgstr "Télécharger en Mobi"
+
+msgid "Download as PDF"
+msgstr "Télécharger en PDF"
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index cd86a4fd..dda05c29 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -128,9 +128,9 @@
             <h2>{% trans "Fancy an E-Book ?" %}</h2>
             <p>{% trans "Click to get all your articles in one ebook :" %}
             <ul>
-            <li><a href="./?epub&amp;method=all" title="Generate ePub file">ePub 3</a></li>
-            <li><a href="./?mobi&amp;method=all" title="Generate Mobi file">Mobi</a></li>
-            <li><a href="./?pdf&amp;method=all" title="Generate PDF file">PDF</a></li>
+            <li><a href="./?epub&amp;method=all" title="{% trans 'Generate ePub file' %}">ePub 3</a></li>
+            <li><a href="./?mobi&amp;method=all" title="{% trans 'Generate Mobi file' %}">Mobi</a></li>
+            <li><a href="./?pdf&amp;method=all" title="{% trans 'Generate PDF file' %}">PDF</a></li>
             </ul>
 
             <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 85e3ddf1..3f151592 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -16,9 +16,9 @@
                 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
                 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numflattrs }})</a></li>{% endif %}{% endif %}
                 {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
-                <li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate epub file">EPUB</a></li>
-                <li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate mobi file">MOBI</a></li>
-                <li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate epub file">PDF</a></li>
+                <li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>
+                <li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>
+                <li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>
                 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display icon icon-delete"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
             </ul>
         </div>
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index 9ab58461..6b0fa308 100755
--- a/themes/courgette/config.twig
+++ b/themes/courgette/config.twig
@@ -82,7 +82,13 @@
             <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
             
             <h2>{% trans "Fancy an E-Book ?" %}</h2>
-            <p>{% trans "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
+            <p>{% trans "Click to get all your articles in one ebook :" %}
+            <ul>
+            <li><a href="./?epub&amp;method=all" title="Generate ePub file">ePub 3</a></li>
+            <li><a href="./?mobi&amp;method=all" title="Generate Mobi file">Mobi</a></li>
+            <li><a href="./?pdf&amp;method=all" title="Generate PDF file">PDF</a></li>
+            </ul>
+
             <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
             
             <h2>{% trans 'Add user' %}</h2>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 160f6046..a65d2b2c 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -124,13 +124,20 @@
             <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
             <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
 
-            <h2>{% trans "Cache" %}</h2>
-            <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
-            
             <h2>{% trans "Fancy an E-Book ?" %}</h2>
-            <p>{% trans "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this link</a> to get all your articles in one ebook (ePub 3 format)." %}
+            <p>{% trans "Click to get all your articles in one ebook :" %}
+            <ul>
+            <li><a href="./?epub&amp;method=all" title="Generate ePub file">ePub 3</a></li>
+            <li><a href="./?mobi&amp;method=all" title="Generate Mobi file">Mobi</a></li>
+            <li><a href="./?pdf&amp;method=all" title="Generate PDF file">PDF</a></li>
+            </ul>
+
             <br>{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</p>
-            
+
+
+            <h2>{% trans "Cache" %}</h2>
+            <p><a href="?empty-cache">{% trans "Click here" %}</a> {% trans "to delete cache." %}</p>
+                       
             <h2>{% trans 'Add user' %}</h2>
             <p>{% trans 'Add a new user :' %}</p>
             <form method="post" action="?newuser">