From ef17914960191c6008fc70891544ae2182d70582 Mon Sep 17 00:00:00 2001 From: tcit Date: Thu, 24 Apr 2014 09:39:50 +0200 Subject: [PATCH 1/7] Fix for #664 - Missing source url attribute in RSS feeds --- inc/3rdparty/libraries/feedwriter/FeedItem.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } /** From 827f5b42a667a9ac2ab68701c23885ae6e617907 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 24 Apr 2014 11:48:00 +0300 Subject: [PATCH 2/7] fix of rss headers problem --- .../libraries/feedwriter/FeedWriter.php | 23 +++++++++++++++---- inc/3rdparty/makefulltextfeed.php | 6 ++--- 2 files changed, 21 insertions(+), 8 deletions(-) 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 ');'; } From b6413975c36a5f912ed95ee749a5a1bd2d868f40 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 25 Apr 2014 13:25:03 +0300 Subject: [PATCH 3/7] fix of putenv warning under safe mode, issue #646 --- inc/poche/Poche.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 7e3e6afe6..5aa6ea072 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) { From 5b5e47c3aee521497f93ef1e36a71d3824f5a585 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 25 Apr 2014 13:41:42 +0300 Subject: [PATCH 4/7] fix of already defined constant notice, issue #653 --- inc/poche/config.inc.default.php | 70 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) 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); From 07ed2b023108514cd6c613ce1bd7584f70ca55fe Mon Sep 17 00:00:00 2001 From: Nicolas LOEUILLET Date: Fri, 2 May 2014 17:04:08 +0200 Subject: [PATCH 5/7] #568 missing rss.png files --- themes/dark/img/dark/rss.png | Bin 0 -> 288 bytes themes/solarized-dark/img/solarized-dark/rss.png | Bin 0 -> 288 bytes themes/solarized/img/solarized/rss.png | Bin 0 -> 288 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/dark/img/dark/rss.png create mode 100644 themes/solarized-dark/img/solarized-dark/rss.png create mode 100644 themes/solarized/img/solarized/rss.png diff --git a/themes/dark/img/dark/rss.png b/themes/dark/img/dark/rss.png new file mode 100644 index 0000000000000000000000000000000000000000..21bad1a174bf152563552aff0e1a397fee05a82b GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt^vJzX3_ zEPBsgF!XW`6li_u-9N+;K)*BZpl-y?R7O3=4IFw-8+chZalBq4=(BL@)Ega1 zyC$q?{eJL+$D_?g%m)&8-vX5;);}d*q9%;X1w!LziDT>u$o#d_? zI?N{v+PLqCI{Y=7z@xq*iFtVi|Af<_r$4e4^9Zfz^?c>OaX-(77i|7FoYlYN)pZy2 z6-G$>IQehFAMI_^8T$%bWbd?FgvPLDD93k%=O%Ut@)gLY&8pzpy!B6Dq~LS2zij6# iG=H>CRh{}ZJK+9#5j$t+9N+;K)*BZpl-y?R7O3=4IFw-8+chZalBq4=(BL@)Ega1 zyC$q?{eJL+$D_?g%m)&8-vX5;);}d*q9%;X1w!LziDT>u$o#d_? zI?N{v+PLqCI{Y=7z@xq*iFtVi|Af<_r$4e4^9Zfz^?c>OaX-(77i|7FoYlYN)pZy2 z6-G$>IQehFAMI_^8T$%bWbd?FgvPLDD93k%=O%Ut@)gLY&8pzpy!B6Dq~LS2zij6# iG=H>CRh{}ZJK+9#5j$t+9N+;K)*BZpl-y?R7O3=4IFw-8+chZalBq4=(BL@)Ega1 zyC$q?{eJL+$D_?g%m)&8-vX5;);}d*q9%;X1w!LziDT>u$o#d_? zI?N{v+PLqCI{Y=7z@xq*iFtVi|Af<_r$4e4^9Zfz^?c>OaX-(77i|7FoYlYN)pZy2 z6-G$>IQehFAMI_^8T$%bWbd?FgvPLDD93k%=O%Ut@)gLY&8pzpy!B6Dq~LS2zij6# iG=H>CRh{}ZJK+9#5j$t+ Date: Sat, 10 May 2014 20:11:00 +0200 Subject: [PATCH 6/7] Updated the french translation --- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 12863 -> 16403 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 562 +++++++++++++------- 2 files changed, 372 insertions(+), 190 deletions(-) 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 2015f6158a0426d9fef6a951df01f0d99f0bc7c3..fd0e23f6486fbf78b9a4494ea0b740fa3cd11030 100755 GIT binary patch literal 16403 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 TQj&)=vj5Lx;I7JQe98X;)+Gr< delta 4802 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 l{G@yOr`3HFurnK?V=}{ej>l}`UjL68-U{?T(s\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 !" From f034640ca39e8b5a46154a2b93af291c07dbb00c Mon Sep 17 00:00:00 2001 From: tcitworld Date: Sun, 11 May 2014 15:33:44 +0200 Subject: [PATCH 7/7] Added advices to submit a bug Discussion at #662. --- CONTRIBUTING.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) 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**.