merge epub with all the dev evolutions

2 files changed, 27 insertions, 11 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 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"