merge epub with all the dev evolutions

6 files changed, 267 insertions, 49 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 12fef6c8..c9105ee6 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 98c6a3e8..81f87342 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "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: tcit <tcit@openmailbox.org>\n"
+"Last-Translator: Thomas Citharel <tcit@openmailbox.org>\n"
 "Language-Team: \n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -113,8 +113,7 @@ msgstr "Your user ID:"
 msgid ""
 "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
 "</a>."
-msgstr ""
-"<a href='?feed&amp;action=generate'>Regenerate Token</a>"
+msgstr "<a href='?feed&amp;action=generate'>Regenerate Token</a>"
 
 msgid "Change your theme"
 msgstr "Change Your Theme"
@@ -146,25 +145,40 @@ msgstr "Repeat your new password:"
 msgid "Import"
 msgstr "Import"
 
-msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
-msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any fil in appropriate JSON or HTML format."
-
 msgid ""
-"Please execute the import script locally as it can take a very long time."
+"You can import your Pocket, Readability, Instapaper, Wallabag or any data in "
+"appropriate json or html format."
 msgstr ""
+"You can import your Pocket, Readability, Instapaper, wallabag or any fil in "
+"appropriate JSON or HTML format."
 
-msgid "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 "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 execute the import script locally as it can take a very long time."
+msgid ""
+"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 ""
+"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 execute the import script locally as "
+"it can take a very long time."
 
 msgid "You can click here to fetch content for articles with no content."
 msgstr "Fetch content for articles with no content"
 
+msgid ""
+"Please execute the import script locally as it can take a very long time."
+msgstr ""
+"Please execute the import script locally as it can take a very long time."
+
 msgid "More info in the official documentation:"
 msgstr "More info in the official documentation:"
 
-msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
-msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgid ""
+"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
+"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr ""
+"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
+"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
 
 msgid "Import from Pocket"
 msgstr "Import from Pocket"
@@ -463,7 +477,9 @@ msgid "a more recent development version is available."
 msgstr "A more recent development version is available."
 
 msgid "You can clear cache to check the latest release."
-msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."
+msgstr ""
+"You can <a href=\"#cache\">clear the cache</a> to check for the latest "
+"release."
 
 msgid "Please execute the import script locally, it can take a very long time."
 msgstr ""
@@ -518,8 +534,8 @@ msgid ""
 "the two fields have to be filled & the password must be the same in the two "
 "fields"
 msgstr ""
-"The two fields must be filled, and the password must be the same in both "
-"fields"
+"les deux champs doivent être remplis et le mot de passe doit être le même "
+"pour les deux champs"
 
 msgid "still using the \""
 msgstr "Still using the \""
@@ -625,12 +641,17 @@ msgstr "Tag these results as"
 msgid "Fancy an E-Book ?"
 msgstr "Fancy an E-Book?"
 
-msgid ""
-"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)."
-msgstr ""
-"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)."
+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 "
@@ -639,14 +660,96 @@ 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"
-msgstr "Download the articles from this tag in an EPUB"
+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 "All my articles on %s"
+msgstr "All my articles on %s"
+
+msgid "Allarticles"
+msgstr "Allarticles"
+
+msgid "Articles tagged %s"
+msgstr "Articles tagged %s"
+
+msgid "Tag %s"
+msgstr "Tag %s"
+
+msgid "Articles in category %s"
+msgstr "All articles in category %s"
+
+msgid "Category %s"
+msgstr "Category %s"
+
+msgid "Articles for search %s"
+msgstr "All articles for search %s"
+
+msgid "Search %s"
+msgstr "Search %s"
+
+msgid "wallabag articles book"
+msgstr "wallabag articles book"
+
+msgid "Some articles saved on my wallabag"
+msgstr "Some articles saved on my wallabag"
+
+msgid "Produced by wallabag with PHPePub"
+msgstr "Produced by wallabag with PHPePub"
+
+msgid ""
+"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
+"a> if you have trouble with the display of this E-Book on your device."
+msgstr ""
+"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
+"a> if you have trouble with the display of this E-Book on your device."
+
+msgid "Produced by wallabag with PHPMobi"
+msgstr "Produced by wallabag with PHPMobi"
+
+msgid "Mail function is disabled. You can't send emails from your server"
+msgstr "Mail function is disabled. You can't send emails from your server"
+
+msgid "You didn't set your kindle's email adress !"
+msgstr "You didn't set your kindle's email adress !"
 
-msgid "Download the articles from this search in an epub"
-msgstr "Download the articles from this search in an EPUB"
+msgid "The email has been sent to your kindle !"
+msgstr "The email has been sent to your kindle !"
 
-msgid "Download the articles from this category in an epub"
-msgstr "Download the articles from this category in an EPUB"
+msgid "Produced by wallabag with mPDF"
+msgstr "Produced by wallabag with mPDF"
 
 #~ msgid "poche it!"
 #~ msgstr "poche it!"
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 a09b4f37..77dee070 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 25c3aa26..579d1aca 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -4,7 +4,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-25 15:17+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: tcit <tcit@openmailbox.org>\n"
+"Last-Translator: Thomas Citharel <tcit@openmailbox.org>\n"
 "Language-Team: \n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,9 @@ msgid "A more recent development version is available."
 msgstr "A more recent development version is available."
 
 msgid "You can clear cache to check the latest release."
-msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."
+msgstr ""
+"You can <a href=\"#cache\">clear the cache</a> to check for the latest "
+"release."
 
 msgid "Feeds"
 msgstr "Feeds"
@@ -116,8 +118,7 @@ msgstr "Your user ID:"
 msgid ""
 "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
 "</a>."
-msgstr ""
-"<a href='?feed&amp;action=generate'>Regenerate Token</a>"
+msgstr "<a href='?feed&amp;action=generate'>Regenerate Token</a>"
 
 msgid "Change your theme"
 msgstr "Change Your Theme"
@@ -149,16 +150,26 @@ msgstr "Repeat your new password:"
 msgid "Import"
 msgstr "Import"
 
-msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
-msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any file in appropriate JSON or HTML format."
+msgid ""
+"You can import your Pocket, Readability, Instapaper, Wallabag or any data in "
+"appropriate json or html format."
+msgstr ""
+"You can import your Pocket, Readability, Instapaper, wallabag or any file in "
+"appropriate JSON or HTML format."
 
 msgid ""
 "Please execute the import script locally as it can take a very long time."
 msgstr ""
 "Please execute the import script locally as it can take a very long time."
 
-msgid "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 "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."
+msgid ""
+"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 ""
+"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."
 
 msgid "You can click here to fetch content for articles with no content."
 msgstr "Fetch content for articles with no content"
@@ -166,8 +177,12 @@ msgstr "Fetch content for articles with no content"
 msgid "More info in the official documentation:"
 msgstr "More info in the official documentation:"
 
-msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
-msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgid ""
+"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
+"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr ""
+"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
+"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
 
 msgid "Import from Pocket"
 msgstr "Import from Pocket"
@@ -612,7 +627,8 @@ msgid ""
 "To completely remove wallabag, delete the wallabag folder on your web server "
 "(and eventual databases)."
 msgstr ""
-"To completely remove wallabag, delete the wallabag folder and database(s) from your web server."
+"To completely remove wallabag, delete the wallabag folder and database(s) "
+"from your web server."
 
 msgid "Enter your search here"
 msgstr "Enter your search here"
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 da087516..eed260b2 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 3d031967..4bdb3cd5 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wallabag 1.7\n"
+"Project-Id-Version: wallabag 1.7.2\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: tcit <tcit@openmailbox.org>\n"
+"Last-Translator: Thomas Citharel <tcit@openmailbox.org>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
@@ -681,19 +681,24 @@ msgstr "Appliquer à ces résultats le tag"
 msgid "Fancy an E-Book ?"
 msgstr "Envie d'un E-Book ?"
 
-msgid ""
-"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)."
-msgstr ""
-"Cliquez sur <a href=\"./?epub&amp;method=all\" title=\"Générer ePub\">ce "
-"lien</a> pour obtenir tous vos articles (format ePub 3)."
+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 même <b>échouer</b> si vous avez trop "
-"d'articles, selon la configuration de votre serveur."
+"d'articles, selon la configuration matérielle de votre serveur."
 
 msgid "Download the articles from this tag in an epub"
 msgstr "Télécharger les articles de ce tag dans un epub"
@@ -703,3 +708,97 @@ msgstr "Télécharger les articles de cette recherche dans un epub"
 
 msgid "Download the articles from this category in an epub"
 msgstr "Télécharger les articles de cette catégorie dans un epub"
+
+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"
+
+msgid "All my articles on %s"
+msgstr "Tous mes articles le %s"
+
+msgid "Allarticles"
+msgstr "TousArticles"
+
+msgid "Articles tagged %s"
+msgstr "Articles avec le tag %s"
+
+msgid "Tag %s"
+msgstr "Tag %s"
+
+msgid "Articles in category %s"
+msgstr "Articles de la catégorie %s"
+
+msgid "Category %s"
+msgstr "Catégorie %s"
+
+msgid "Articles for search %s"
+msgstr "Articles pour la recherche %s"
+
+msgid "Search %s"
+msgstr "Recherche %s"
+
+msgid "wallabag articles book"
+msgstr "Livre d'articles issus de wallabag"
+
+msgid "Some articles saved on my wallabag"
+msgstr "Des articles sauvegardés sur wallabag"
+
+msgid "Produced by wallabag with PHPePub"
+msgstr "Produit par wallabag avec PHPePub"
+
+msgid ""
+"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
+"a> if you have trouble with the display of this E-Book on your device."
+msgstr ""
+"Merci d'ouvrir <a href='https://github.com/wallabag/wallabag/issues'>un "
+"ticket</a> si vous avez des problèmes d'affichage de cet E-Book sur votre "
+"appareil."
+
+msgid "Produced by wallabag with PHPMobi"
+msgstr "Produit par wallabag avec PHPMobi"
+
+msgid "Mail function is disabled. You can't send emails from your server"
+msgstr ""
+"La fonction mail est désactivée. Vous ne pouvez pas envoyer d'E-mails depuis "
+"votre serveur"
+
+msgid "You didn't set your kindle's email adress !"
+msgstr "Vous n'avez pas renseigné l'adresse E-mail de votre Kindle !"
+
+msgid "The email has been sent to your kindle !"
+msgstr "L'E-mail a été envoyé à votre Kindle !"
+
+msgid "Produced by wallabag with mPDF"
+msgstr "Produit par wallabag avec mPDF"