diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85c09e52c..767084044 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,8 +4,25 @@ Please [open a new issue](https://github.com/wallabag/wallabag/issues/new). To fix the bug quickly, we need some infos: -* your wallabag version (in ./index.php) +* your wallabag version (on top of the ./index.php file, and also on config page) +* your webserver installation : + * type of hosting (shared or dedicaced) + * in case of a dedicaced server, the server and OS used + * the php version used, eventually `phpinfo()` +* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL) +* any problem on the `wallabag_compatibility_test.php` page +* any particular details which could be related + + +If relevant : * the link you want to save and which causes problem +* the file you want to import into wallabag, or just an extract + +If you have the skills : +* enable DEBUG mode and look the output at cache/log.txt +* look for errors into php and server logs + +Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like. ## You want to fix a bug or to add a feature -Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**. \ No newline at end of file +Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**. diff --git a/inc/3rdparty/libraries/feedwriter/FeedItem.php b/inc/3rdparty/libraries/feedwriter/FeedItem.php index 3487423f0..54a56f22d 100644 --- a/inc/3rdparty/libraries/feedwriter/FeedItem.php +++ b/inc/3rdparty/libraries/feedwriter/FeedItem.php @@ -174,7 +174,8 @@ */ public function setSource($link) { - $this->setElement('source', $link); + $attributes = array('url'=>$link); + $this->setElement('source', "wallabag",$attributes); } /** diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php index 79639c0c2..d708e99b0 100755 --- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php +++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php @@ -87,12 +87,25 @@ define('JSONP', 3, true); * @access public * @return void */ - public function genarateFeed() + public function genarateFeed($withHeaders = true) { - header('Content-type: text/xml; charset=UTF-8'); - // this line prevents Chrome 20 from prompting download - // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss - header('X-content-type-options: nosniff'); + if ($withHeaders) { + if ($this->version == RSS2) { + header('Content-type: text/xml; charset=UTF-8'); + // this line prevents Chrome 20 from prompting download + // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss + header('X-content-type-options: nosniff'); + } elseif ($this->version == JSON) { + header('Content-type: application/json; charset=UTF-8'); + } elseif ($this->version == JSONP) { + header('Content-type: application/javascript; charset=UTF-8'); + } + } + + if ($this->version == JSON || $this->version == JSONP) { + $this->json = new stdClass(); + } + $this->printHead(); $this->printChannels(); diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php index 135964f18..4faad6d94 100755 --- a/inc/3rdparty/makefulltextfeed.php +++ b/inc/3rdparty/makefulltextfeed.php @@ -749,7 +749,7 @@ foreach ($items as $key => $item) { // add effective URL (URL after redirects) if (isset($effective_url)) { //TODO: ensure $effective_url is valid witout - sometimes it causes problems, e.g. - //http://www.siasat.pk/forum/showthread.php?108883-Pakistan-Chowk-by-Rana-Mubashir-�-25th-March-2012-Special-Program-from-Liari-(Karachi) + //http://www.siasat.pk/forum/showthread.php?108883-Pakistan-Chowk-by-Rana-Mubashir-�-25th-March-2012-Special-Program-from-Liari-(Karachi) //temporary measure: use utf8_encode() $newitem->addElement('dc:identifier', remove_url_cruft(utf8_encode($effective_url))); } else { @@ -831,7 +831,7 @@ if (!$debug_mode) { } if ($add_to_cache) { ob_start(); - $output->genarateFeed(); + $output->genarateFeed(false); $output = ob_get_contents(); ob_end_clean(); if ($html_only && $item_count == 0) { @@ -842,7 +842,7 @@ if (!$debug_mode) { } echo $output; } else { - $output->genarateFeed(); + $output->genarateFeed(false); } if ($callback) echo ');'; } diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index c59973f3d..85dd38484 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -72,7 +72,7 @@ class Poche # l10n $language = $this->user->getConfigValue('language'); - putenv('LC_ALL=' . $language); + @putenv('LC_ALL=' . $language); setlocale(LC_ALL, $language); bindtextdomain($language, LOCALE); textdomain($language); @@ -241,12 +241,12 @@ class Poche $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); $this->tpl->addFilter($filter); } - + public function createNewUser() { if (isset($_GET['newuser'])){ if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){ $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING); - if (!$this->store->userExists($newusername)){ + if (!$this->store->userExists($newusername)){ if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) { Tools::logm('The new user '.$newusername.' has been installed'); $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'),$newusername)); @@ -265,7 +265,7 @@ class Poche } } } - + public function deleteUser(){ if (isset($_GET['deluser'])){ if ($this->store->listUsers() > 1) { diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 3b08c212f..edc42fc9f 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -8,56 +8,56 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('SALT', ''); # put a strong string here -define ('LANG', 'en_EN.utf8'); +@define ('SALT', ''); # put a strong string here +@define ('LANG', 'en_EN.utf8'); -define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite +@define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite -define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located +@define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located # only for postgres & mysql -define ('STORAGE_SERVER', 'localhost'); -define ('STORAGE_DB', 'poche'); -define ('STORAGE_USER', 'poche'); -define ('STORAGE_PASSWORD', 'poche'); +@define ('STORAGE_SERVER', 'localhost'); +@define ('STORAGE_DB', 'poche'); +@define ('STORAGE_USER', 'poche'); +@define ('STORAGE_PASSWORD', 'poche'); ################################################################################# # Do not trespass unless you know what you are doing ################################################################################# // Change this if not using the standart port for SSL - i.e you server is behind sslh -define ('SSL_PORT', 443); +@define ('SSL_PORT', 443); -define ('MODE_DEMO', FALSE); -define ('DEBUG_POCHE', FALSE); -define ('DOWNLOAD_PICTURES', FALSE); -define ('CONVERT_LINKS_FOOTNOTES', FALSE); -define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE); -define ('SHARE_TWITTER', TRUE); -define ('SHARE_MAIL', TRUE); -define ('SHARE_SHAARLI', FALSE); -define ('SHAARLI_URL', 'http://myshaarliurl.com'); -define ('FLATTR', TRUE); -define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url='); -define ('NOT_FLATTRABLE', '0'); -define ('FLATTRABLE', '1'); -define ('FLATTRED', '2'); -// display or not print link in article view -define ('SHOW_PRINTLINK', '1'); -// display or not percent of read in article view. Affects only default theme. -define ('SHOW_READPERCENT', '1'); -define ('ABS_PATH', 'assets/'); +@define ('MODE_DEMO', FALSE); +@define ('DEBUG_POCHE', FALSE); +@define ('DOWNLOAD_PICTURES', FALSE); +@define ('CONVERT_LINKS_FOOTNOTES', FALSE); +@define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE); +@define ('SHARE_TWITTER', TRUE); +@define ('SHARE_MAIL', TRUE); +@define ('SHARE_SHAARLI', FALSE); +@define ('SHAARLI_URL', 'http://myshaarliurl.com'); +@define ('FLATTR', TRUE); +@define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url='); +@define ('NOT_FLATTRABLE', '0'); +@define ('FLATTRABLE', '1'); +@define ('FLATTRED', '2'); +// display or not print link in article view +@define ('SHOW_PRINTLINK', '1'); +// display or not percent of read in article view. Affects only default theme. +@define ('SHOW_READPERCENT', '1'); +@define ('ABS_PATH', 'assets/'); -define ('DEFAULT_THEME', 'baggy'); +@define ('DEFAULT_THEME', 'baggy'); -define ('THEME', ROOT . '/themes'); -define ('LOCALE', ROOT . '/locale'); -define ('CACHE', ROOT . '/cache'); +@define ('THEME', ROOT . '/themes'); +@define ('LOCALE', ROOT . '/locale'); +@define ('CACHE', ROOT . '/cache'); -define ('PAGINATION', '10'); +@define ('PAGINATION', '10'); //limit for download of articles during import -define ('IMPORT_LIMIT', 5); +@define ('IMPORT_LIMIT', 5); //delay between downloads (in sec) -define ('IMPORT_DELAY', 5); +@define ('IMPORT_DELAY', 5); 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 2015f6158..fd0e23f64 100755 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 904a4178c..0b2a87dc8 100755 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -1,19 +1,19 @@ msgid "" msgstr "" -"Project-Id-Version: wallabag 1.6.0\n" +"Project-Id-Version: wallabag 1.6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-25 18:33+0300\n" +"POT-Creation-Date: 2014-05-10 20:09+0100\n" "PO-Revision-Date: \n" -"Last-Translator: Amaury Carrade \n" +"Last-Translator: Mickaël RAYBAUD-ROIG \n" "Language-Team: \n" +"Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "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" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: fr_FR\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" msgstr "wallabag, un système open source de lecture différé" @@ -21,9 +21,97 @@ msgstr "wallabag, un système open source de lecture différé" msgid "login failed: user doesn't exist" msgstr "échec de l'identification : cet utilisateur n'existe pas" -msgid "return home" +msgid "save link!" +msgstr "enregistrer le lien !" + +msgid "plop" +msgstr "plop" + +msgid "powered by" +msgstr "propulsé par" + +msgid "debug mode is on so cache is off." +msgstr "le mode de debug est actif, le cache est donc désactivé." + +msgid "your wallabag version:" +msgstr "votre version de wallabag :" + +msgid "storage:" +msgstr "stockage :" + +msgid "login to your wallabag" +msgstr "se connecter à votre wallabag" + +msgid "Login to wallabag" +msgstr "Se connecter à wallabag" + +msgid "you are in demo mode, some features may be disabled." +msgstr "" +"vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." + +msgid "Username" +msgstr "Nom d'utilisateur" + +msgid "Password" +msgstr "Mot de passe" + +msgid "Stay signed in" +msgstr "Rester connecté" + +msgid "(Do not check on public computers)" +msgstr "(Ne pas cocher sur un ordinateur public)" + +msgid "Sign in" +msgstr "Se connecter" + +msgid "back to home" msgstr "retour à l'accueil" +msgid "favorites" +msgstr "favoris" + +msgid "archive" +msgstr "archive" + +msgid "unread" +msgstr "non lus" + +msgid "Tag" +msgstr "Tag" + +msgid "No articles found." +msgstr "Aucun article trouvé." + +msgid "estimated reading time:" +msgstr "temps de lecture estimé :" + +msgid "estimated reading time :" +msgstr "temps de lecture estimé :" + +msgid "Toggle mark as read" +msgstr "Marquer comme lu / non lu" + +msgid "toggle favorite" +msgstr "marquer / enlever comme favori" + +msgid "delete" +msgstr "supprimer" + +msgid "original" +msgstr "original" + +msgid "Mark all the entries as read" +msgstr "Marquer tous les articles comme lus" + +msgid "results" +msgstr "résultats" + +msgid " found for « " +msgstr "trouvé pour « " + +msgid "Only one result found for " +msgstr "Seulement un résultat trouvé pour " + msgid "config" msgstr "configuration" @@ -75,17 +163,29 @@ msgstr "Une version stable plus récente est disponible." msgid "You are up to date." msgstr "Vous êtes à jour." +msgid "Last check:" +msgstr "Dernière vérification: " + msgid "Latest dev version" msgstr "Dernière version de développement" msgid "A more recent development version is available." msgstr "Une version de développement plus récente est disponible." +msgid "You can clear cache to check the latest release." +msgstr "" +"Vous pouvez vider le cache pour vérifier que vous avez la dernière version." + msgid "Feeds" msgstr "Flux" -msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "Votre jeton de flux est actuellement vide et doit d'abord être généré pour activer les flux. Cliquez ici pour le générer." +msgid "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." +msgstr "" +"Votre jeton de flux est actuellement vide et doit d'abord être généré pour " +"activer les flux. Cliquez ici pour " +"le générer." msgid "Unread feed" msgstr "Flux des non lus" @@ -102,8 +202,12 @@ msgstr "Votre jeton :" msgid "Your user id:" msgstr "Votre ID utilisateur :" -msgid "You can regenerate your token: generate!." -msgstr "Vous pouvez regénérer votre jeton : génération !." +msgid "" +"You can regenerate your token: generate!" +"." +msgstr "" +"Vous pouvez regénérer votre jeton : génération !." msgid "Change your theme" msgstr "Changer votre thème" @@ -126,36 +230,40 @@ msgstr "Modifier votre mot de passe" msgid "New password:" msgstr "Nouveau mot de passe :" -msgid "Password" -msgstr "Mot de passe" - msgid "Repeat your new password:" msgstr "Répétez votre nouveau mot de passe :" msgid "Import" msgstr "Importer" -msgid "Please execute the import script locally as it can take a very long time." -msgstr "Merci d'exécuter le script d'importation en local car cela peut prendre du temps." +msgid "" +"You can import your Pocket, Readability, Instapaper, Wallabag or any data in " +"appropriate json or html format." +msgstr "" +"Vous pouvez importer depuis Pocket, Readability, Instapaper, Wallabag, ou " +"n'importe quel fichier au format JSON ou HTML approprié." -msgid "More info in the official documentation:" -msgstr "Plus d'infos dans la documentation officielle :" +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.
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)." +msgstr "" +"Sélectionner 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 " +"constantes dans votre fichier de configuration:IMPORT_LIMIT (nombre d'éléments téléchargés à la fois) et IMPORT_DELAY " +"(le délai d'attente entre deux séquences de téléchargement)." -msgid "Import from Pocket" -msgstr "Import depuis Pocket" +msgid "File:" +msgstr "Fichier: " -#, php-format -msgid "(you must have a %s file on your server)" -msgstr "(le fichier %s doit être présent sur le serveur)" - -msgid "Import from Readability" -msgstr "Importer depuis Readability" - -msgid "Import from Instapaper" -msgstr "Importer depuis Instapaper" - -msgid "Import from wallabag" -msgstr "Importer depuis wallabag" +msgid "You can click here to fetch content for articles with no content." +msgstr "" +"Vous pouvez cliquer ici pour télécharger le contenu des articles vides." msgid "Export your wallabag data" msgstr "Exporter vos données de wallabag" @@ -175,110 +283,50 @@ msgstr "Cache" msgid "to delete cache." msgstr "pour effacer le cache." -msgid "You can enter multiple tags, separated by commas." -msgstr "Vous pouvez entrer plusieurs tags, séparés par des virgules." +msgid "Add user" +msgstr "Ajouter un utilisateur" -msgid "return to article" -msgstr "retourner à l'article" +msgid "Add a new user :" +msgstr "Ajouter un nouvel utilisateur: " -msgid "plop" -msgstr "plop" - -msgid "You can check your configuration here." -msgstr "Vous pouvez vérifier votre configuration ici." - -msgid "favoris" -msgstr "favoris" - -msgid "archive" -msgstr "archive" - -msgid "unread" -msgstr "non lus" - -msgid "by date asc" -msgstr "par date asc" - -msgid "by date" -msgstr "par date" - -msgid "by date desc" -msgstr "par date desc" - -msgid "by title asc" -msgstr "par titre asc" - -msgid "by title" -msgstr "par titre" - -msgid "by title desc" -msgstr "par titre desc" - -msgid "Tag" -msgstr "Tag" - -msgid "No articles found." -msgstr "Aucun article trouvé." - -msgid "Toggle mark as read" -msgstr "Marquer comme lu / non lu" - -msgid "toggle favorite" -msgstr "marquer / enlever comme favori" - -msgid "delete" -msgstr "supprimer" - -msgid "original" -msgstr "original" - -msgid "estimated reading time:" -msgstr "temps de lecture estimé :" - -msgid "mark all the entries as read" -msgstr "marquer tous les articles comme lus" - -msgid "results" -msgstr "résultats" - -msgid "installation" -msgstr "installation" - -msgid "install your wallabag" -msgstr "installez votre 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 n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à lire la documentation sur le site de wallabag." +msgid "Login for new user" +msgstr "Identifiant du nouvel utilisateur" msgid "Login" msgstr "Nom d'utilisateur" -msgid "Repeat your password" -msgstr "Répétez votre mot de passe" +msgid "Password for new user" +msgstr "Mot de passe du nouvel utilisateur: " -msgid "Install" -msgstr "Installer" +msgid "Send" +msgstr "Imvoyer" -msgid "login to your wallabag" -msgstr "se connecter à votre wallabag" +msgid "Delete account" +msgstr "Supprimer le compte" -msgid "Login to wallabag" -msgstr "Se connecter à wallabag" +msgid "You can delete your account by entering your password and validating." +msgstr "" +"Vous pouvez supprimer votre compte en entrant votre mot de passe et en " +"validant." -msgid "you are in demo mode, some features may be disabled." -msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." +msgid "Be careful, data will be erased forever (that is a very long time)." +msgstr "Attention, les données seront perdues pour toujours." -msgid "Username" -msgstr "Nom d'utilisateur" +msgid "Type here your password" +msgstr "Entrez votre mot de passe ici" -msgid "Stay signed in" -msgstr "Rester connecté" +msgid "You are the only user, you cannot delete your own account." +msgstr "" +"Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte." -msgid "(Do not check on public computers)" -msgstr "(Ne pas cocher sur un ordinateur public)" +msgid "" +"To completely remove wallabag, delete the wallabag folder on your web server." +msgstr "" +"Pour déinstaller complètement Wallabag, supprimez le répertoire " +"wallabag de votre serveur Web." -msgid "Sign in" -msgstr "Se connecter" +msgid "Save a link" +msgstr "Ajouter un lien" msgid "Return home" msgstr "Retour accueil" @@ -310,6 +358,9 @@ msgstr "Shaarli" msgid "flattr" msgstr "Flattr" +msgid "Print" +msgstr "Imprimer" + msgid "Does this article appear wrong?" msgstr "Cet article s'affiche mal ?" @@ -319,54 +370,18 @@ msgstr "tags :" msgid "Edit tags" msgstr "Modifier les tags" -msgid "save link!" -msgstr "enregistrer le lien !" - -msgid "powered by" -msgstr "propulsé par" - -msgid "debug mode is on so cache is off." -msgstr "le mode de debug est actif, le cache est donc désactivé." - -msgid "your wallabag version:" -msgstr "votre version de wallabag :" - -msgid "storage:" -msgstr "stockage :" - -msgid "home" -msgstr "accueil" - -msgid "favorites" +msgid "favoris" msgstr "favoris" -msgid "tags" -msgstr "tags" +msgid "mark all the entries as read" +msgstr "marquer tous les articles comme lus" -msgid "save a link" -msgstr "sauver un lien" +msgid "toggle view mode" +msgstr "changer de mode de visualisation" -msgid "logout" -msgstr "déconnexion" - -msgid "back to home" +msgid "return home" msgstr "retour à l'accueil" -msgid "toggle mark as read" -msgstr "marquer comme lu / non lu" - -msgid "tweet" -msgstr "tweet" - -msgid "email" -msgstr "e-mail" - -msgid "this article appears wrong?" -msgstr "cet article s'affiche mal ?" - -msgid "No link available here!" -msgstr "Aucun lien n'est disponible ici !" - msgid "Poching a link" msgstr "Enregistrer un lien" @@ -395,7 +410,9 @@ msgid "a more recent development version is available." msgstr "une version de développement plus récente est disponible." msgid "Please execute the import script locally, it can take a very long time." -msgstr "Merci d'exécuter le script d'importation en local car cela peut prendre du temps." +msgstr "" +"Merci d'exécuter le script d'importation en local car cela peut prendre du " +"temps." msgid "More infos in the official doc:" msgstr "Plus d'infos dans la documentation officielle :" @@ -403,21 +420,146 @@ msgstr "Plus d'infos dans la documentation officielle :" msgid "import from Pocket" msgstr "importation depuis Pocket" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(le fichier %s doit être présent sur le serveur)" + msgid "import from Readability" msgstr "importation depuis Readability" msgid "import from Instapaper" msgstr "importation depuis Instapaper" -msgid "estimated reading time :" -msgstr "temps de lecture estimé :" +msgid "Start typing for auto complete." +msgstr "Commencez à taper pour activer l'auto-complétion." -msgid "Mark all the entries as read" -msgstr "Marquer tous les articles comme lus" +msgid "You can enter multiple tags, separated by commas." +msgstr "Vous pouvez entrer plusieurs tags, séparés par des virgules." + +msgid "return to article" +msgstr "retourner à l'article" + +msgid "by date asc" +msgstr "par date asc" + +msgid "by date" +msgstr "par date" + +msgid "by date desc" +msgstr "par date desc" + +msgid "by title asc" +msgstr "par titre asc" + +msgid "by title" +msgstr "par titre" + +msgid "by title desc" +msgstr "par titre desc" + +msgid "home" +msgstr "accueil" + +msgid "tags" +msgstr "tags" + +msgid "save a link" +msgstr "sauver un lien" + +msgid "search" +msgstr "rechercher" + +msgid "logout" +msgstr "déconnexion" + +msgid "installation" +msgstr "installation" + +msgid "install your wallabag" +msgstr "installez votre 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 n'est pas encore installé. Merci de remplir le formulaire suivant " +"pour l'installer. N'hésitez pas à lire la " +"documentation sur le site de wallabag." + +msgid "Repeat your password" +msgstr "Répétez votre mot de passe" + +msgid "Install" +msgstr "Installer" + +msgid "" +"You can check your configuration " +"here." +msgstr "" +"Vous pouvez vérifier votre configuration ici." msgid "Tags" msgstr "Tags" +msgid "No link available here!" +msgstr "Aucun lien n'est disponible ici !" + +msgid "toggle mark as read" +msgstr "marquer comme lu / non lu" + +msgid "tweet" +msgstr "tweet" + +msgid "email" +msgstr "e-mail" + +msgid "this article appears wrong?" +msgstr "cet article s'affiche mal ?" + +msgid "Search" +msgstr "Rechercher" + +msgid "Download required for " +msgstr "Téléchargement requis pour " + +msgid "records" +msgstr " éléments." + +msgid "Downloading next " +msgstr "Téléchargement des " + +msgid "articles, please wait" +msgstr " prochains éléments, veuillez patienter" + +msgid "Enter your search here" +msgstr "Entrez votre recherche ici" + +#, php-format +msgid "" +"The new user %s has been installed. Do you want to logout ?" +msgstr "" +"Le nouvel utilisateur « %s » a été ajouté. Voulez-vous vous déconnecter ?" + +#, php-format +msgid "Error : An user with the name %s already exists !" +msgstr "Erreur: Un utilisateur avec le nom « %s » existe déjà." + +#, php-format +msgid "User %s has been successfully deleted !" +msgstr "L'utilisateur « %s » a bien été supprimé !" + +msgid "Error : The password is wrong !" +msgstr "Erreur: Le mot de passe est incorrect !" + +msgid "Error : You are the only user, you cannot delete your account !" +msgstr "" +"Erreur: Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre " +"compte !" + msgid "Untitled" msgstr "Sans titre" @@ -448,11 +590,15 @@ msgstr "en mode démo, vous ne pouvez pas mettre à jour le mot de passe" msgid "your password has been updated" msgstr "votre mot de passe a été mis à jour" -msgid "the two fields have to be filled & the password must be the same in the two fields" -msgstr "les deux champs doivent être remplis & le mot de passe doit être le même dans les deux" +msgid "" +"the two fields have to be filled & the password must be the same in the two " +"fields" +msgstr "" +"les deux champs doivent être remplis & le mot de passe doit être le même " +"dans les deux" msgid "still using the \"" -msgstr "utilise encore \"" +msgstr "Vous utilisez toujours \"" msgid "that theme does not seem to be installed" msgstr "ce thème ne semble pas installé" @@ -475,26 +621,26 @@ msgstr "bienvenue dans votre wallabag" msgid "login failed: bad login or password" msgstr "échec de l'identification : mauvais identifiant ou mot de passe" -msgid "import from instapaper completed" -msgstr "Importation depuis Instapaper achevée" +msgid "Untitled - Import - " +msgstr "Sans titre - Importer - " -msgid "import from pocket completed" -msgstr "Importation depuis Pocket achevée" +msgid "click to finish import" +msgstr "cliquez pour terminer l'importation" -msgid "import from Readability completed. " -msgstr "Importation depuis Readability achevée" +msgid "Articles inserted: " +msgstr "Articles ajoutés: " -msgid "import from Poche completed. " -msgstr "Importation depuis Pocket achevée" +msgid ". Please note, that some may be marked as \"read\"." +msgstr ". Notez que certains pourraient être marqués comme lus." -msgid "Unknown import provider." -msgstr "Format d'importation inconnu." +msgid "Import finished." +msgstr "Importation terminée." -msgid "Incomplete inc/poche/define.inc.php file, please define \"" -msgstr "Fichier inc/poche/define.inc.php incomplet, merci de définir \"" +msgid "Undefined" +msgstr "Non définit" -msgid "Could not find required \"" -msgstr "Impossible de trouver \"" +msgid "User with this id (" +msgstr "Utilisateur avec cet identifiant (" msgid "Uh, there is a problem while generating feeds." msgstr "Hum, il y a un problème lors de la génération des flux." @@ -505,11 +651,47 @@ msgstr "Cache effacé." msgid "Oops, it seems you don't have PHP 5." msgstr "Oups, vous ne semblez pas avoir PHP 5." -msgid "search" -msgstr "rechercher" +#~ msgid "" +#~ "Please execute the import script locally as it can take a very long time." +#~ msgstr "" +#~ "Merci d'exécuter le script d'importation en local car cela peut prendre " +#~ "du temps." -msgid "Search" -msgstr "Rechercher" +#~ msgid "More info in the official documentation:" +#~ msgstr "Plus d'infos dans la documentation officielle :" + +#~ msgid "Import from Pocket" +#~ msgstr "Import depuis Pocket" + +#~ msgid "Import from Readability" +#~ msgstr "Importer depuis Readability" + +#~ msgid "Import from Instapaper" +#~ msgstr "Importer depuis Instapaper" + +#~ msgid "Import from wallabag" +#~ msgstr "Importer depuis wallabag" + +#~ msgid "import from instapaper completed" +#~ msgstr "Importation depuis Instapaper achevée" + +#~ msgid "import from pocket completed" +#~ msgstr "Importation depuis Pocket achevée" + +#~ msgid "import from Readability completed. " +#~ msgstr "Importation depuis Readability achevée" + +#~ msgid "import from Poche completed. " +#~ msgstr "Importation depuis Pocket achevée" + +#~ msgid "Unknown import provider." +#~ msgstr "Format d'importation inconnu." + +#~ msgid "Incomplete inc/poche/define.inc.php file, please define \"" +#~ msgstr "Fichier inc/poche/define.inc.php incomplet, merci de définir \"" + +#~ msgid "Could not find required \"" +#~ msgstr "Impossible de trouver \"" #~ msgid "poche it!" #~ msgstr "pochez-le !" diff --git a/themes/dark/img/dark/rss.png b/themes/dark/img/dark/rss.png new file mode 100644 index 000000000..21bad1a17 Binary files /dev/null and b/themes/dark/img/dark/rss.png differ diff --git a/themes/solarized-dark/img/solarized-dark/rss.png b/themes/solarized-dark/img/solarized-dark/rss.png new file mode 100644 index 000000000..21bad1a17 Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/rss.png differ diff --git a/themes/solarized/img/solarized/rss.png b/themes/solarized/img/solarized/rss.png new file mode 100644 index 000000000..21bad1a17 Binary files /dev/null and b/themes/solarized/img/solarized/rss.png differ