diff --git a/CREDITS.md b/CREDITS.md index f1e9d7a..e76c580 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -8,9 +8,10 @@ wallabag is based on : * Twig http://twig.sensiolabs.org * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages * Pagination https://github.com/daveismyname/pagination +* PHPePub https://github.com/Grandt/PHPePub/ wallabag is mainly developed by Nicolas Lœuillet under the MIT License Thank you so much to @tcitworld and @mariroz. -Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file +Contributors : https://github.com/wallabag/wallabag/graphs/contributors diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index f803e3b..7ccfc06 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -342,7 +342,10 @@ final class Tools return $json; }; - $json = $scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url)); + // Silence $scope function to avoid + // issues with FTRSS when error_reporting is to high + // FTRSS generates PHP warnings which break output + $json = @$scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url)); // Clearing and restoring context foreach ($GLOBALS as $key => $value) { 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 eed260b..83f397a 100644 Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ 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 4bdb3cd..fef3120 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -250,7 +250,7 @@ msgid "" "your config file: IMPORT_LIMIT (how many articles are fetched at once) and " "IMPORT_DELAY (delay between fetch of next batch of articles)." msgstr "" -"Sélectionner le fichier à importer sur votre disque dur, et pressez la " +"Sélectionnez le fichier à importer sur votre disque dur, et pressez la " "bouton « Importer » ci-dessous.
wallabag analysera votre fichier, " "ajoutera toutes les URL trouvées et commencera à télécharger les contenus si " "nécessaire.
Le processus de téléchargement est contrôlé par deux "