From: Thomas Citharel Date: Sat, 13 Dec 2014 23:16:22 +0000 (+0100) Subject: merge epub with all the dev evolutions X-Git-Tag: 1.9beta~45^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=dc69d3e8d895c87f9d26c2d1309e40d6090d4c8d;hp=-c;p=github%2Fwallabag%2Fwallabag.git merge epub with all the dev evolutions --- dc69d3e8d895c87f9d26c2d1309e40d6090d4c8d diff --combined inc/poche/Routing.class.php index 6ae93d21,44b0e168..5acd08ba --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@@ -120,7 -120,16 +120,16 @@@ class Routin $this->wallabag->deleteUser($_POST['password4deletinguser']); } elseif (isset($_GET['epub'])) { $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']); - $epub->run(); + $epub->prepareData(); + $epub->produceEpub(); + } elseif (isset($_GET['mobi'])) { + $mobi = new WallabagMobi($this->wallabag, $_GET['method'], $_GET['value']); + $mobi->prepareData(); + $mobi->produceMobi(); + } elseif (isset($_GET['pdf'])) { + $pdf = new WallabagPDF($this->wallabag, $_GET['method'], $_GET['value']); + $pdf->prepareData(); + $pdf->producePDF(); } elseif (isset($_GET['import'])) { $import = $this->wallabag->import(); $tplVars = array_merge($this->vars, $import); @@@ -148,4 -157,4 +157,4 @@@ { echo $this->wallabag->tpl->render($file, $vars); } --} ++} diff --combined inc/poche/WallabagEBooks.class.php index 00000000,2ddece61..bc40990b mode 000000,100644..100644 --- a/inc/poche/WallabagEBooks.class.php +++ b/inc/poche/WallabagEBooks.class.php @@@ -1,0 -1,246 +1,246 @@@ + + * @copyright 2013 + * @license http://opensource.org/licenses/MIT see COPYING file + */ + + class WallabagEBooks + { + protected $wallabag; + protected $method; + protected $value; + protected $entries; + protected $bookTitle; + protected $bookFileName; + protected $author = 'wallabag'; + + public function __construct(Poche $wallabag, $method, $value) + { + $this->wallabag = $wallabag; + $this->method = $method; + $this->value = $value; + } + + public function prepareData() + { + switch ($this->method) { + case 'id': + $entryID = filter_var($this->value, FILTER_SANITIZE_NUMBER_INT); + $entry = $this->wallabag->store->retrieveOneById($entryID, $this->wallabag->user->getId()); + $this->entries = array($entry); + $this->bookTitle = $entry['title']; + $this->bookFileName = substr($this->bookTitle, 0, 200); + $this->author = preg_replace('#^w{3}.#', '', Tools::getdomain($entry["url"])); # if only one article, set author to domain name (we strip the eventual www part) + Tools::logm('Producing ebook from article ' . $this->bookTitle); + break; + case 'all': + $this->entries = $this->wallabag->store->retrieveAll($this->wallabag->user->getId()); + $this->bookTitle = sprintf(_('All my articles on %s'), date(_('d.m.y'))); #translatable because each country has it's own date format system + $this->bookFileName = _('Allarticles') . date(_('dmY')); + Tools::logm('Producing ebook from all articles'); + break; + case 'tag': + $tag = filter_var($this->value, FILTER_SANITIZE_STRING); + $tags_id = $this->wallabag->store->retrieveAllTags($this->wallabag->user->getId(), $tag); + $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround. + $this->entries = $this->wallabag->store->retrieveEntriesByTag($tag_id, $this->wallabag->user->getId()); + $this->bookTitle = sprintf(_('Articles tagged %s'), $tag); + $this->bookFileName = substr(sprintf(_('Tag %s'), $tag), 0, 200); + Tools::logm('Producing ebook from tag ' . $tag); + break; + case 'category': + $category = filter_var($this->value, FILTER_SANITIZE_STRING); + $this->entries = $this->wallabag->store->getEntriesByView($category, $this->wallabag->user->getId()); + $this->bookTitle = sprintf(_('Articles in category %s'), $category); + $this->bookFileName = substr(sprintf(_('Category %s'), $category), 0, 200); + Tools::logm('Producing ebook from category ' . $category); + break; + case 'search': + $search = filter_var($this->value, FILTER_SANITIZE_STRING); + Tools::logm($search); + $this->entries = $this->wallabag->store->search($search, $this->wallabag->user->getId()); + $this->bookTitle = sprintf(_('Articles for search %s'), $search); + $this->bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200); + Tools::logm('Producing ebook from search ' . $search); + break; + case 'default': + die(_('Uh, there is a problem while generating eBook.')); + } + } + } + + class WallabagEpub extends WallabagEBooks + { + /** + * handle ePub + */ + public function produceEpub() + { + Tools::logm('Starting to produce ePub 3 file'); + $content_start = + "\n" + . "\n" + . "" + . "\n" + . "" . _("wallabag articles book") . "\n" + . "\n" + . "\n"; + + $bookEnd = "\n\n"; + + $log = new Logger("wallabag", TRUE); + $fileDir = CACHE; + + $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE); + $log->logLine("new EPub()"); + $log->logLine("EPub class version: " . EPub::VERSION); + $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION); + $log->logLine("Zip version: " . Zip::VERSION); + $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL()); + $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL()); + + Tools::logm('Filling metadata for ePub...'); + + $book->setTitle($this->bookTitle); + $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID. + //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc. + $book->setDescription(_("Some articles saved on my wallabag")); + $book->setAuthor($this->author,$this->author); + $book->setPublisher("wallabag", "wallabag"); // I hope this is a non existant address :) + $book->setDate(time()); // Strictly not needed as the book date defaults to time(). + //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book. + $book->setSourceURL("http://$_SERVER[HTTP_HOST]"); + + $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP"); + $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag"); + + $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n"; + + $log->logLine("Add Cover"); + + $fullTitle = "

" . $this->bookTitle . "

\n"; + - $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle); ++ $book->setCoverImage("Cover.png", file_get_contents("themes/_global/img/appicon/apple-touch-icon-152.png"), "image/png", $fullTitle); + + $cover = $content_start . '

' . _('Produced by wallabag with PHPePub') . '

'. _('Please open an issue if you have trouble with the display of this E-Book on your device.') . '

' . $bookEnd; + + //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE); + $book->addChapter("Notices", "Cover2.html", $cover); + + $book->buildTOC(); + + Tools::logm('Adding actual content...'); + + foreach ($this->entries as $entry) { //set tags as subjects + $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']); + foreach ($tags as $tag) { + $book->setSubject($tag['value']); + } + + $log->logLine("Set up parameters"); + + $chapter = $content_start . $entry['content'] . $bookEnd; + $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD); + $log->logLine("Added chapter " . $entry['title']); + } + + if (DEBUG_POCHE) { + $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n" . $bookEnd); // log generation + Tools::logm('Production log available in produced file'); + } + $book->finalize(); + $zipData = $book->sendBook($this->bookFileName); + Tools::logm('Ebook produced'); + } + } + + class WallabagMobi extends WallabagEBooks + { + /** + * MOBI Class + * @author Sander Kromwijk + */ + + public function produceMobi() + { + + Tools::logm('Starting to produce Mobi file'); + $mobi = new MOBI(); + $content = new MOBIFile(); + + $messages = new Messages(); // for later + + Tools::logm('Filling metadata for Mobi...'); + + $content->set("title", $this->bookTitle); + $content->set("author", $this->author); + $content->set("subject", $this->bookTitle); + + # introduction + $content->appendParagraph('

' . _('Produced by wallabag with PHPMobi') . '

'. _('Please open an issue if you have trouble with the display of this E-Book on your device.') . '

'); - $content->appendImage(imagecreatefrompng("themes/baggy/img/apple-touch-icon-152.png")); ++ $content->appendImage(imagecreatefrompng("themes/_global/img/appicon/apple-touch-icon-152.png")); + $content->appendPageBreak(); + + Tools::logm('Adding actual content...'); + + foreach ($this->entries as $item) { + $content->appendChapterTitle($item['title']); + $content->appendParagraph($item['content']); + $content->appendPageBreak(); + } + $mobi->setContentProvider($content); + + // we offer file to download + $mobi->download($this->bookFileName.'.mobi'); + Tools::logm('Mobi file produced'); + } + } + + class WallabagPDF extends WallabagEbooks + { + public function producePDF() + { + + Tools::logm('Starting to produce PDF file'); + + $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); + + Tools::logm('Filling metadata for PDF...'); + $pdf->SetCreator(PDF_CREATOR); + $pdf->SetAuthor(''); + $pdf->SetTitle($this->bookTitle); + $pdf->SetSubject('TCPDF Tutorial'); + $pdf->SetKeywords('TCPDF, PDF, example, test, guide'); + + Tools::logm('Adding introduction...'); + $pdf->AddPage(); + $intro = '

' . $this->bookTitle . '

+

' . _('Produced by wallabag with tcpdf') . '

+

'. _('Please open an issue if you have trouble with the display of this E-Book on your device.') . '

-
'; ++ '; + + + $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true); + + $i = 1; + Tools::logm('Adding actual content...'); + foreach ($this->entries as $item) { + $pdf->AddPage(); + $html = '

' . $item['title'] . '

'; + $html .= $item['content']; + $pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true); + $i = $i+1; + } + + // set image scale factor + $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); + + + $pdf->Output($this->bookFileName . '.pdf', 'FD'); + + } -} ++} diff --combined locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 12fef6c8,ff09d676..c9105ee6 Binary files differ diff --combined locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index 98c6a3e8,9761d6c8..81f87342 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@@ -1,29 -1,28 +1,29 @@@ msgid "" msgstr "" -"Project-Id-Version: wallabag 1.7.2\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: tcit \n" -"Last-Translator: tcit \n" ++"Last-Translator: Thomas Citharel \n" "Language-Team: \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.6.4\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" msgid "login failed: user doesn't exist" -msgstr "login failed: user doesn't exist" +msgstr "Login failed: user doesn't exist" msgid "return home" -msgstr "return home" +msgstr "Return Home" msgid "config" -msgstr "config" +msgstr "Config" msgid "Saving articles" msgstr "Saving articles" @@@ -32,16 -31,10 +32,16 @@@ msgid "There are several ways to save a msgstr "There are several ways to save an article:" msgid "read the documentation" -msgstr "read the documentation" +msgstr "Read the documentation" msgid "download the extension" -msgstr "download the extension" +msgstr "Download the extension" + +msgid "Firefox Add-On" +msgstr "Firefox Add-On" + +msgid "Chrome Extension" +msgstr "Chrome Extension" msgid "via F-Droid" msgstr "via F-Droid" @@@ -53,7 -46,7 +53,7 @@@ msgid "via Google Play msgstr "via Google Play" msgid "download the application" -msgstr "download the application" +msgstr "Download the application" msgid "By filling this field" msgstr "By filling this field" @@@ -62,7 -55,7 +62,7 @@@ 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" +msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" msgid "Upgrading wallabag" msgstr "Upgrading wallabag" @@@ -108,16 -101,17 +108,15 @@@ msgid "Your token: msgstr "Your token:" msgid "Your user id:" -msgstr "Your user id:" +msgstr "Your user ID:" msgid "" "You can regenerate your token: generate!" "." --msgstr "" - "Regenerate Token" -"You can regenerate your token: generate!" -"." ++msgstr "Regenerate Token" msgid "Change your theme" -msgstr "Change your theme" +msgstr "Change Your Theme" msgid "Theme:" msgstr "Theme:" @@@ -126,13 -120,13 +125,13 @@@ msgid "Update msgstr "Update" msgid "Change your language" -msgstr "Change your language" +msgstr "Change Your Language" msgid "Language:" msgstr "Language:" msgid "Change your password" -msgstr "Change your password" +msgstr "Change Your Password" msgid "New password:" msgstr "New password:" @@@ -146,26 -140,14 +145,41 @@@ 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 “Import” 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 “Import” " ++"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 "(?)" - msgstr "(?)" ++msgid "" ++"(?)" ++msgstr "" ++"(?)" + msgid "Import from Pocket" msgstr "Import from Pocket" @@@ -194,41 -176,17 +208,41 @@@ msgstr "to download your database. msgid "to export your wallabag data." msgstr "to export your wallabag data." +msgid "Export JSON" +msgstr "Export JSON" + msgid "Cache" msgstr "Cache" msgid "to delete cache." msgstr "to delete cache." +msgid "Delete Cache" +msgstr "Delete Cache" + msgid "You can enter multiple tags, separated by commas." msgstr "You can enter multiple tags, separated by commas." +msgid "Add tags:" +msgstr "Add tags:" + +msgid "no tags" +msgstr "no tags" + +msgid "The tag has been applied successfully" +msgstr "The tag has been applied successfully" + +msgid "interview" +msgstr "interview" + +msgid "editorial" +msgstr "editorial" + +msgid "video" +msgstr "video" + msgid "return to article" -msgstr "return to article" +msgstr "Return to article" msgid "plop" msgstr "plop" @@@ -241,13 -199,13 +255,13 @@@ msgstr " "here." msgid "favoris" -msgstr "favoris" +msgstr "Favorites" msgid "archive" -msgstr "archive" +msgstr "Archive" msgid "unread" -msgstr "unread" +msgstr "Unread" msgid "by date asc" msgstr "by date asc" @@@ -277,28 -235,28 +291,28 @@@ msgid "Toggle mark as read msgstr "Toggle mark as read" msgid "toggle favorite" -msgstr "toggle favorite" +msgstr "Toggle favorite" msgid "delete" -msgstr "delete" +msgstr "Delete" msgid "original" -msgstr "original" +msgstr "Original" msgid "estimated reading time:" -msgstr "estimated reading time:" +msgstr "Estimated reading time:" msgid "mark all the entries as read" -msgstr "mark all the entries as read" +msgstr "Mark all the entries as read" msgid "results" -msgstr "results" +msgstr "Results" msgid "installation" -msgstr "installation" +msgstr "Installation" msgid "install your wallabag" -msgstr "install your wallabag" +msgstr "Install your wallabag" msgid "" "wallabag is still not installed. Please fill the below form to install it. " @@@ -319,13 -277,13 +333,13 @@@ msgid "Install msgstr "Install" msgid "login to your wallabag" -msgstr "login to your wallabag" +msgstr "Login to your wallabag" msgid "Login to wallabag" msgstr "Login to wallabag" msgid "you are in demo mode, some features may be disabled." -msgstr "you are in demo mode, some features may be disabled." +msgstr "You are in demo mode; some features may be disabled." msgid "Username" msgstr "Username" @@@ -340,10 -298,10 +354,10 @@@ msgid "Sign in msgstr "Sign in" msgid "favorites" -msgstr "favorites" +msgstr "Favorites" msgid "estimated reading time :" -msgstr "estimated reading time :" +msgstr "Estimated reading time:" msgid "Mark all the entries as read" msgstr "Mark all the entries as read" @@@ -385,64 -343,61 +399,64 @@@ msgid "tags: msgstr "tags:" msgid "Edit tags" -msgstr "Edit tags" +msgstr "Edit Tags" msgid "save link!" -msgstr "save link!" +msgstr "Save Link" msgid "home" -msgstr "home" +msgstr "Home" msgid "tags" -msgstr "tags" +msgstr "Tags" msgid "logout" -msgstr "logout" +msgstr "Logout" msgid "powered by" -msgstr "powered by" +msgstr "Powered by" msgid "debug mode is on so cache is off." -msgstr "debug mode is on so cache is off." +msgstr "Debug mode is on, so cache is off." msgid "your wallabag version:" -msgstr "your wallabag version:" +msgstr "Your wallabag version:" msgid "storage:" -msgstr "storage:" +msgstr "Storage:" msgid "save a link" -msgstr "save a link" +msgstr "Save a Link" msgid "back to home" -msgstr "back to home" +msgstr "Back to Home" msgid "toggle mark as read" -msgstr "toggle mark as read" +msgstr "Toggle mark as read" msgid "tweet" -msgstr "tweet" +msgstr "Tweet" msgid "email" -msgstr "email" +msgstr "Email" msgid "this article appears wrong?" -msgstr "this article appears wrong?" +msgstr "This article appears wrong?" msgid "No link available here!" -msgstr "No link available here!" +msgstr "No link available here" msgid "Poching a link" -msgstr "Poching a link" +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" +msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" + +msgid "Drag & drop this link to your bookmarks bar:" +msgstr "Drag & drop this link to your bookmarks bar:" msgid "your version" msgstr "your version" @@@ -451,35 -406,32 +465,37 @@@ msgid "latest stable version msgstr "latest stable version" msgid "a more recent stable version is available." -msgstr "a more recent stable version is available." +msgstr "A more recent stable version is available." msgid "you are up to date." -msgstr "you are up to date." +msgstr "You are up to date." msgid "latest dev version" msgstr "latest dev version" msgid "a more recent development version is available." -msgstr "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 clear the cache to check for the latest release." ++msgstr "" ++"You can clear the cache to check for the latest " ++"release." 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." msgid "More infos in the official doc:" -msgstr "More infos in the official doc:" +msgstr "More information in the official doc:" msgid "import from Pocket" -msgstr "import from Pocket" +msgstr "Import from Pocket" msgid "import from Readability" -msgstr "import from Readability" +msgstr "Import from Readability" msgid "import from Instapaper" -msgstr "import from Instapaper" +msgstr "Import from Instapaper" msgid "Tags" msgstr "Tags" @@@ -488,74 -440,74 +504,74 @@@ msgid "Untitled msgstr "Untitled" msgid "the link has been added successfully" -msgstr "the link has been added successfully" +msgstr "The link has been added successfully." msgid "error during insertion : the link wasn't added" -msgstr "error during insertion : the link wasn't added" +msgstr "Error during insertion: the link wasn't added." msgid "the link has been deleted successfully" -msgstr "the link has been deleted successfully" +msgstr "The link has been deleted successfully." msgid "the link wasn't deleted" -msgstr "the link wasn't deleted" +msgstr "The link wasn't deleted." msgid "Article not found!" -msgstr "Article not found!" +msgstr "Article not found." msgid "previous" -msgstr "previous" +msgstr "Previous" msgid "next" -msgstr "next" +msgstr "Next" msgid "in demo mode, you can't update your password" -msgstr "in demo mode, you can't update your password" +msgstr "In demo mode, you can't update your password." msgid "your password has been updated" -msgstr "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 must be filled, and the password must be the same in both " -"the two fields have to be filled & the password must be the same in the two " --"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 \"" +msgstr "Still using the \"" msgid "that theme does not seem to be installed" -msgstr "that theme does not seem to be installed" +msgstr "That theme does not seem to be installed." msgid "you have changed your theme preferences" -msgstr "you have changed your theme preferences" +msgstr "You have changed your theme preferences." msgid "that language does not seem to be installed" -msgstr "that language does not seem to be installed" +msgstr "That language does not seem to be installed." msgid "you have changed your language preferences" -msgstr "you have changed your language preferences" +msgstr "You have changed your language preferences." msgid "login failed: you have to fill all fields" -msgstr "login failed: you have to fill all fields" +msgstr "Login failed: you have to fill all fields." msgid "welcome to your wallabag" -msgstr "welcome to your wallabag" +msgstr "Welcome to your wallabag." msgid "login failed: bad login or password" -msgstr "login failed: bad login or password" +msgstr "Login failed: bad login or password." msgid "import from instapaper completed" -msgstr "import from instapaper completed" +msgstr "Import from Instapaper completed." msgid "import from pocket completed" -msgstr "import from pocket completed" +msgstr "Import from Pocket completed." msgid "import from Readability completed. " -msgstr "import from Readability completed. " +msgstr "Import from Readability completed." msgid "import from Poche completed. " -msgstr "import from Poche completed. " +msgstr "Import from Poche completed. " msgid "Unknown import provider." msgstr "Unknown import provider." @@@ -567,7 -519,7 +583,7 @@@ msgid "Could not find required \" msgstr "Could not find required \"" msgid "Uh, there is a problem while generating feeds." -msgstr "Uh, there is a problem while generating feeds." +msgstr "There is a problem generating feeds." msgid "Cache deleted." msgstr "Cache deleted." @@@ -575,62 -527,20 +591,67 @@@ msgid "Oops, it seems you don't have PHP 5." msgstr "Oops, it seems you don't have PHP 5." +msgid "Add user" +msgstr "Add User" + +msgid "Add a new user :" +msgstr "Add a new user:" + +msgid "Login for new user" +msgstr "Login for new user:" + +msgid "Password for new user" +msgstr "Password for new user:" + +msgid "Email for new user (not required)" +msgstr "Email for new user (not required):" + +msgid "Send" +msgstr "Send" + +msgid "Delete account" +msgstr "Delete Account" + +msgid "You can delete your account by entering your password and validating." +msgstr "You can delete your account by entering your password and validating." + +msgid "Be careful, data will be erased forever (that is a very long time)." +msgstr "Be careful, data will be erased forever (that is a very long time)." + +msgid "Type here your password" +msgstr "Enter your password" + +msgid "You are the only user, you cannot delete your own account." +msgstr "You are the only user, you cannot delete your own account." + +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 on your web server " +"(and eventual databases)." + +msgid "Enter your search here" +msgstr "Enter your search here" + +msgid "Tag these results as" +msgstr "Tag these results as" + +# ebook msgid "Fancy an E-Book ?" -msgstr "Fancy an E-Book ?" +msgstr "Fancy an E-Book?" - msgid "" - "Click on this " - "link to get all your articles in one ebook (ePub 3 format)." - msgstr "" - "Click on this " - "link 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 take a while and can even fail if you have too many " @@@ -639,14 -549,96 +660,96 @@@ msgstr " "This can take a while and can even fail 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 an issue if you have trouble with the display of this E-Book on your device." + msgstr "" + "Please open an issue 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 --combined locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo index a09b4f37,00000000..77dee070 mode 100644,000000..100644 Binary files differ diff --combined locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po index 25c3aa26,00000000..579d1aca mode 100644,000000..100644 --- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po +++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po @@@ -1,666 -1,0 +1,682 @@@ +msgid "" +msgstr "" +"Project-Id-Version: wallabag\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:17+0300\n" +"PO-Revision-Date: \n" - "Last-Translator: tcit \n" ++"Last-Translator: Thomas Citharel \n" +"Language-Team: \n" +"Language: en_US\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-Basepath: .\n" + +msgid "wallabag, a read it later open source system" +msgstr "wallabag, a read it later open source system" + +msgid "login failed: user doesn't exist" +msgstr "Login failed: user doesn't exist" + +msgid "return home" +msgstr "Return Home" + +msgid "config" +msgstr "Config" + +msgid "Saving articles" +msgstr "Saving articles" + +msgid "There are several ways to save an article:" +msgstr "There are several ways to save an article:" + +msgid "read the documentation" +msgstr "Read the documentation" + +msgid "download the extension" +msgstr "Download the extension" + +msgid "Firefox Add-On" +msgstr "Firefox Add-On" + +msgid "Chrome Extension" +msgstr "Chrome Extension" + +msgid "via F-Droid" +msgstr "via F-Droid" + +msgid " or " +msgstr " or " + +msgid "via Google Play" +msgstr "via Google Play" + +msgid "download the application" +msgstr "Download the application" + +msgid "By filling this field" +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 "Upgrading wallabag" +msgstr "Upgrading wallabag" + +msgid "Installed version" +msgstr "Installed version" + +msgid "Latest stable version" +msgstr "Latest stable version" + +msgid "A more recent stable version is available." +msgstr "A more recent stable version is available." + +msgid "You are up to date." +msgstr "You are up to date." + +msgid "Latest dev version" +msgstr "Latest dev version" + +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 clear the cache to check for the latest release." ++msgstr "" ++"You can clear the cache to check for the latest " ++"release." + +msgid "Feeds" +msgstr "Feeds" + +msgid "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." +msgstr "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." + +msgid "Unread feed" +msgstr "Unread feed" + +msgid "Favorites feed" +msgstr "Favorites feed" + +msgid "Archive feed" +msgstr "Archive feed" + +msgid "Your token:" +msgstr "Your token:" + +msgid "Your user id:" +msgstr "Your user ID:" + +msgid "" +"You can regenerate your token: generate!" +"." - msgstr "" - "Regenerate Token" ++msgstr "Regenerate Token" + +msgid "Change your theme" +msgstr "Change Your Theme" + +msgid "Theme:" +msgstr "Theme:" + +msgid "Update" +msgstr "Update" + +msgid "Change your language" +msgstr "Change Your Language" + +msgid "Language:" +msgstr "Language:" + +msgid "Change your password" +msgstr "Change Your Password" + +msgid "New password:" +msgstr "New password:" + +msgid "Password" +msgstr "Password" + +msgid "Repeat your new password:" +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 “Import” 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 “Import” " ++"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" + +msgid "More info in the official documentation:" +msgstr "More info in the official documentation:" + - msgid "(?)" - msgstr "(?)" ++msgid "" ++"(?)" ++msgstr "" ++"(?)" + +msgid "Import from Pocket" +msgstr "Import from Pocket" + +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(you must have a %s file on your server)" + +msgid "Import from Readability" +msgstr "Import from Readability" + +msgid "Import from Instapaper" +msgstr "Import from Instapaper" + +msgid "Import from wallabag" +msgstr "Import from wallabag" + +msgid "Export your wallabag data" +msgstr "Export your wallabag data" + +msgid "Click here" +msgstr "Click here" + +msgid "to download your database." +msgstr "to download your database." + +msgid "to export your wallabag data." +msgstr "to export your wallabag data." + +msgid "Export JSON" +msgstr "Export JSON" + +msgid "Cache" +msgstr "Cache" + +msgid "to delete cache." +msgstr "to delete cache." + +msgid "Delete Cache" +msgstr "Delete Cache" + +msgid "You can enter multiple tags, separated by commas." +msgstr "You can enter multiple tags, separated by commas." + +msgid "Add tags:" +msgstr "Add tags:" + +msgid "no tags" +msgstr "no tags" + +msgid "The tag has been applied successfully" +msgstr "The tag has been applied successfully" + +msgid "interview" +msgstr "interview" + +msgid "editorial" +msgstr "editorial" + +msgid "video" +msgstr "video" + +msgid "return to article" +msgstr "Return to article" + +msgid "plop" +msgstr "plop" + +msgid "" +"You can check your configuration " +"here." +msgstr "" +"You can check your configuration " +"here." + +msgid "favoris" +msgstr "Favorites" + +msgid "archive" +msgstr "Archive" + +msgid "unread" +msgstr "Unread" + +msgid "by date asc" +msgstr "by date asc" + +msgid "by date" +msgstr "by date" + +msgid "by date desc" +msgstr "by date desc" + +msgid "by title asc" +msgstr "by title asc" + +msgid "by title" +msgstr "by title" + +msgid "by title desc" +msgstr "by title desc" + +msgid "Tag" +msgstr "Tag" + +msgid "No articles found." +msgstr "No articles found." + +msgid "Toggle mark as read" +msgstr "Toggle mark as read" + +msgid "toggle favorite" +msgstr "Toggle favorite" + +msgid "delete" +msgstr "Delete" + +msgid "original" +msgstr "Original" + +msgid "estimated reading time:" +msgstr "Estimated reading time:" + +msgid "mark all the entries as read" +msgstr "Mark all the entries as read" + +msgid "results" +msgstr "Results" + +msgid "installation" +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 read the documentation " +"on wallabag website." +msgstr "" +"wallabag is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on wallabag website." + +msgid "Login" +msgstr "Login" + +msgid "Repeat your password" +msgstr "Repeat your password" + +msgid "Install" +msgstr "Install" + +msgid "login to your wallabag" +msgstr "Login to your wallabag" + +msgid "Login to wallabag" +msgstr "Login to wallabag" + +msgid "you are in demo mode, some features may be disabled." +msgstr "You are in demo mode; some features may be disabled." + +msgid "Username" +msgstr "Username" + +msgid "Stay signed in" +msgstr "Stay signed in" + +msgid "(Do not check on public computers)" +msgstr "(Do not check on public computers)" + +msgid "Sign in" +msgstr "Sign in" + +msgid "favorites" +msgstr "Favorites" + +msgid "estimated reading time :" +msgstr "Estimated reading time:" + +msgid "Mark all the entries as read" +msgstr "Mark all the entries as read" + +msgid "Return home" +msgstr "Return home" + +msgid "Back to top" +msgstr "Back to top" + +msgid "Mark as read" +msgstr "Mark as read" + +msgid "Favorite" +msgstr "Favorite" + +msgid "Toggle favorite" +msgstr "Toggle favorite" + +msgid "Delete" +msgstr "Delete" + +msgid "Tweet" +msgstr "Tweet" + +msgid "Email" +msgstr "Email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "Does this article appear wrong?" +msgstr "Does this article appear wrong?" + +msgid "tags:" +msgstr "tags:" + +msgid "Edit tags" +msgstr "Edit Tags" + +msgid "save link!" +msgstr "Save Link" + +msgid "home" +msgstr "Home" + +msgid "tags" +msgstr "Tags" + +msgid "logout" +msgstr "Logout" + +msgid "powered by" +msgstr "Powered by" + +msgid "debug mode is on so cache is off." +msgstr "Debug mode is on, so cache is off." + +msgid "your wallabag version:" +msgstr "Your wallabag version:" + +msgid "storage:" +msgstr "Storage:" + +msgid "save a link" +msgstr "Save a Link" + +msgid "back to home" +msgstr "Back to Home" + +msgid "toggle mark as read" +msgstr "Toggle mark as read" + +msgid "tweet" +msgstr "Tweet" + +msgid "email" +msgstr "Email" + +msgid "this article appears wrong?" +msgstr "This article appears wrong?" + +msgid "No link available here!" +msgstr "No link available here" + +msgid "Poching a link" +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 & drop this link to your bookmarks bar:" +msgstr "Drag & drop this link to your bookmarks bar:" + +msgid "your version" +msgstr "your version" + +msgid "latest stable version" +msgstr "latest stable version" + +msgid "a more recent stable version is available." +msgstr "A more recent stable version is available." + +msgid "you are up to date." +msgstr "You are up to date." + +msgid "latest dev version" +msgstr "latest dev version" + +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." + +msgid "More infos in the official doc:" +msgstr "More information in the official doc:" + +msgid "import from Pocket" +msgstr "Import from Pocket" + +msgid "import from Readability" +msgstr "Import from Readability" + +msgid "import from Instapaper" +msgstr "Import from Instapaper" + +msgid "Tags" +msgstr "Tags" + +msgid "Untitled" +msgstr "Untitled" + +msgid "the link has been added successfully" +msgstr "The link has been added successfully." + +msgid "error during insertion : the link wasn't added" +msgstr "Error during insertion: the link wasn't added." + +msgid "the link has been deleted successfully" +msgstr "The link has been deleted successfully." + +msgid "the link wasn't deleted" +msgstr "The link wasn't deleted." + +msgid "Article not found!" +msgstr "Article not found." + +msgid "previous" +msgstr "Previous" + +msgid "next" +msgstr "Next" + +msgid "in demo mode, you can't update your password" +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 must be filled, and the password must be the same in both " +"fields" + +msgid "still using the \"" +msgstr "Still using the \"" + +msgid "that theme does not seem to be installed" +msgstr "That theme does not seem to be installed." + +msgid "you have changed your theme preferences" +msgstr "You have changed your theme preferences." + +msgid "that language does not seem to be installed" +msgstr "That language does not seem to be installed." + +msgid "you have changed your language preferences" +msgstr "You have changed your language preferences." + +msgid "login failed: you have to fill all fields" +msgstr "Login failed: you have to fill all fields." + +msgid "welcome to your wallabag" +msgstr "Welcome to your wallabag." + +msgid "login failed: bad login or password" +msgstr "Login failed: bad login or password." + +msgid "import from instapaper completed" +msgstr "Import from Instapaper completed." + +msgid "import from pocket completed" +msgstr "Import from Pocket completed." + +msgid "import from Readability completed. " +msgstr "Import from Readability completed." + +msgid "import from Poche completed. " +msgstr "Import from Poche completed. " + +msgid "Unknown import provider." +msgstr "Unknown import provider." + +msgid "Incomplete inc/poche/define.inc.php file, please define \"" +msgstr "Incomplete inc/poche/define.inc.php file, please define \"" + +msgid "Could not find required \"" +msgstr "Could not find required \"" + +msgid "Uh, there is a problem while generating feeds." +msgstr "There is a problem generating feeds." + +msgid "Cache deleted." +msgstr "Cache deleted." + +msgid "Oops, it seems you don't have PHP 5." +msgstr "Oops, it seems you don't have PHP 5." + +msgid "Add user" +msgstr "Add User" + +msgid "Add a new user :" +msgstr "Add a new user:" + +msgid "Login for new user" +msgstr "Login for new user:" + +msgid "Password for new user" +msgstr "Password for new user:" + +msgid "Email for new user (not required)" +msgstr "Email for new user (not required):" + +msgid "Send" +msgstr "Send" + +msgid "Delete account" +msgstr "Delete Account" + +msgid "You can delete your account by entering your password and validating." +msgstr "You can delete your account by entering your password and validating." + +msgid "Be careful, data will be erased forever (that is a very long time)." +msgstr "Be careful, data will be erased forever (that is a very long time)." + +msgid "Type here your password" +msgstr "Enter your password" + +msgid "You are the only user, you cannot delete your own account." +msgstr "You cannot delete your account because you are the only user." + +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" + +msgid "Tag these results as" +msgstr "Tag these results as" + +# ebook +msgid "Fancy an E-Book ?" +msgstr "Fancy an E-Book?" + +msgid "" +"Click on this " +"link to get all your articles in one ebook (ePub 3 format)." +msgstr "" +"Click on this " +"link to get all your articles in one ebook (EPUB 3 format)." + +msgid "" +"This can take a while and can even fail if you have too many " +"articles, depending on your server configuration." +msgstr "" +"This can take a while and can even fail 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 search in an epub" +msgstr "Download the articles from this search in an EPUB" + +msgid "Download the articles from this category in an epub" +msgstr "Download the articles from this category in an EPUB" + +#~ msgid "poche it!" +#~ msgstr "poche it!" + +#~ msgid "Updating poche" +#~ msgstr "Updating poche" + +#~ msgid "create an issue" +#~ msgstr "create an issue" + +#~ msgid "or" +#~ msgstr "or" + +#~ msgid "contact us by mail" +#~ msgstr "contact us by mail" + +#~ msgid "your poche version:" +#~ msgstr "your poche version:" diff --combined locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index da087516,6dfcdd37..eed260b2 Binary files differ diff --combined locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 3d031967,59dc29d6..4bdb3cd5 --- 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 +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 \n" -"Last-Translator: tcit \n" ++"Last-Translator: Thomas Citharel \n" "Language-Team: \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@@ -12,7 -12,7 +12,7 @@@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Generator: Poedit 1.6.4\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "wallabag, a read it later open source system" @@@ -298,9 -298,6 +298,9 @@@ msgstr "Nom d'utilisateur msgid "Password for new user" msgstr "Mot de passe du nouvel utilisateur" +msgid "Email for new user (not required)" +msgstr "E-mail pour le nouvel utilisateur (facultatif)" + msgid "Send" msgstr "Envoyer" @@@ -323,12 -320,10 +323,12 @@@ msgstr " "Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte." msgid "" -"To completely remove wallabag, delete the wallabag folder on your web server." +"To completely remove wallabag, delete the wallabag folder on your web server " +"(and eventual databases)." msgstr "" "Pour désinstaller complètement wallabag, supprimez le répertoire " -"wallabag de votre serveur Web." +"wallabag de votre serveur Web (ainsi que les bases de données " +"éventuelles)." msgid "Save a link" msgstr "Ajouter un lien" @@@ -372,24 -367,6 +372,24 @@@ msgstr "Cet article s'affiche mal ? msgid "tags:" msgstr "tags :" +msgid "Add tags:" +msgstr "Ajouter des tags :" + +msgid "no tags" +msgstr "pas de tags" + +msgid "The tag has been applied successfully" +msgstr "Le tag a été appliqué avec succès" + +msgid "interview" +msgstr "interview" + +msgid "editorial" +msgstr "éditorial" + +msgid "video" +msgstr "vidéo" + msgid "Edit tags" msgstr "Modifier les tags" @@@ -674,32 -651,118 +674,131 @@@ msgstr "Cache effacé. msgid "Oops, it seems you don't have PHP 5." msgstr "Oups, vous ne semblez pas avoir PHP 5." +msgid "Tag these results as" +msgstr "Appliquer à ces résultats le tag" + +# ebook msgid "Fancy an E-Book ?" msgstr "Envie d'un E-Book ?" - msgid "" - "Click on this " - "link to get all your articles in one ebook (ePub 3 format)." - msgstr "" - "Cliquez sur ce " - "lien 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 take a while and can even fail if you have too many " "articles, depending on your server configuration." msgstr "" -"Ceci peut prendre un moment et peut même échouer si vous avez " -"trop d'articles, selon la configuration de votre serveur." +"Ceci peut prendre un moment et même échouer 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" + +msgid "Download the articles from this search in an epub" +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 an issue if you have trouble with the display of this E-Book on your device." + msgstr "" + "Merci d'ouvrir un " + "ticket 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" diff --combined themes/baggy/config.twig index 2b967cd4,dda05c29..a5a61559 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@@ -6,29 -6,30 +6,29 @@@ {% endblock %} {% block content %}

{% trans "Saving articles" %}

-

{% trans "There are several ways to save an article:" %} (?)

+

{% trans "There are several ways to save an article:" %} {% trans "(?)" %}

+

+

+
+ + +
+

+

Browser Plugins

- -

{% trans "Upgrading wallabag" %}

+

Mobile Apps

-

{% trans "You can clear cache to check the latest release." %}

+

{% trans "Bookmarklet" %}

+

+ {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} +

{% trans "Feeds" %}

{% if token == '' %} @@@ -39,11 -40,9 +39,11 @@@
  • {% trans "Favorites feed" %}
  • {% trans "Archive feed" %}
    • -

    {% trans "Your token:" %} {{token}}

    -

    {% trans "Your user id:" %} {{user_id}}

    -

    {% trans "You can regenerate your token: generate!." %}

    +

    + {% trans "Your token:" %} {{token}}
    + {% trans "Your user id:" %} {{user_id}}
    + {% trans "You can regenerate your token: generate!." %} +

    {% endif %}

    {% trans "Change your theme" %}

    @@@ -84,14 -83,35 +84,14 @@@ - {% if http_auth == 0 %} -

    {% trans "Change your password" %}

    -
    -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - - -
    - {% endif %} - -

    {% trans "Import" %}

    +

    {% trans "Import" %}

    {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}

    -

    {% trans "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.
    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)." %}

    +

    {% trans "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." %}

    - +
    @@@ -99,58 -119,39 +99,64 @@@

    {% trans "You can click here to fetch content for articles with no content." %}

    - +

    {% 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)." %}

    +

    {% trans "Export your wallabag data" %}

    - {% if constant('STORAGE') == 'sqlite' %} -

    {% trans "Click here" %} {% trans "to download your database." %}

    {% endif %} -

    {% trans "Click here" %} {% trans "to export your wallabag data." %}

    - +

    {% trans "Export JSON" %}
    + Data will be exported in a single JSON file.

    +

    {% trans "Fancy an E-Book ?" %}

    -

    Download E-Book
    - {% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    +

    {% trans "Click to get all your articles in one ebook :" %} +

    + -
    {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    ++ {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    -

    {% trans "Cache" %}

    -

    {% trans "Click here" %} {% trans "to delete cache." %}

    +

    {% trans "Cache" %}

    +

    {% trans "Delete Cache" %}
    + Deleting the cache may help with display or other problems.

    + + {% if http_auth == 0 %} +

    {% trans "Change your password" %}

    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + +
    + {% endif %}

    {% trans 'Add user' %}

    -

    {% trans 'Add a new user :' %}

    - +
    - + +
    +
    + +
    - +
    @@@ -164,18 -165,9 +170,18 @@@
    - +
    - {% else %}

    {% trans "You are the only user, you cannot delete your own account." %}
    - {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}

    {% endif %} + {% else %}

    {% trans "You are the only user, you cannot delete your own account." %}

    +

    {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

    {% endif %} + +

    {% trans "Upgrading wallabag" %}

    +
      +
    • {% trans "Installed version" %}: {{ constant('POCHE') }}
      • +
    • {% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}{% trans "A more recent stable version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})
      • + {% if constant('DEBUG_POCHE') == 1 %}
    • {% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}{% trans "A more recent development version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}
      • +
    +

    {% trans "You can clear cache to check the latest release." %}

    + {% endblock %} diff --combined themes/baggy/home.twig index dec848f2,4f415220..426ead1d --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@@ -38,12 -38,12 +38,12 @@@ {% endblock %}
    {% for entry in entries %} -
    +

    {{ entry.title|raw }}

    {% if entry.content| getReadingTime > 0 %} -
    {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
    +
    {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
    {% else %} -
    {% trans "estimated reading time :" %} 1 min
    +
    {% trans "estimated reading time :" %} < 1 min
    {% endif %}
    {{ block('pager') }} - {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} - - {% if search_term is defined %}{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}{% endif %} + {% if view == 'home' %}{% if nb_results > 1 %}

    {% trans "Mark all the entries as read" %}

    {% endif %}{% endif %} - - {% if searchterm is defined %}

    - {% trans "Tag these results as" %} {{ searchterm }}

    {% endif %} - - {% if tag %}

    {% trans "Download the articles from this tag in an epub" %}

    - {% elseif search_term is defined %}

    {% trans "Download the articles from this search in an epub" %}

    - {% else %}

    {% trans "Download the articles from this category in an epub" %}

    {% endif %} ++ {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %}
    + {% if tag %} + {% trans "Download as ePub3" %} + {% trans "Download as Mobi" %} + {% trans "Download as PDF" %} - {% elseif search_term is defined %} - {% trans "Download as ePub3" %} - {% trans "Download as Mobi" %} - {% trans "Download as PDF" %} ++ {% elseif searchterm is defined %} ++ {% trans "Download as ePub3" %} ++ {% trans "Download as Mobi" %} ++ {% trans "Download as PDF" %} + {% else %} + {% trans "Download as ePub3" %} + {% trans "Download as Mobi" %} + {% trans "Download as PDF" %} {% endif %} - - {% endif %} ++{% endif %} {% endblock %} diff --combined themes/baggy/view.twig index 9225d11b,3f151592..dd274327 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@@ -4,7 -4,6 +4,7 @@@ {% endblock %} {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %} + {% include '_highlight.twig' %}
    @@@ -34,7 -33,7 +36,7 @@@ {{ content | raw }}
    - +