Merge pull request #595 from wallabag/dev

wallabag 1.6.0

.gitignore

@@ -3,4 +3,5 @@ cache/*
 vendor
 composer.phar
 db/poche.sqlite
-inc/poche/config.inc.php
+inc/poche/config.inc.php
+inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/

TRANSLATION.md

@@ -0,0 +1,67 @@
+# How to manage translations of wallabag
+
+This guide will describe procedure of translation management of wallabag web application.
+
+All translation are made using [gettext](http://en.wikipedia.org/wiki/Gettext) system and tools. 
+
+You will need [Poedit](http://www.poedit.net/download.php) editor to update, edit and create your translation files comfortably. In general, you can handle translations also without it: all can be done using gettext tools and your favorite plain text editor only. This guide, however, describes editing with Poedit. If you want to use gettext only, pls refer to xgettext manual page to update po files from sources (see also how it is used by Poedit below) and use msgunfmt tool to compile .mo files manually.  
+
+You need to know, that translation phrases are stored in **".po"** files (for example: `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po`), which are then complied in **".mo"** files using **msgfmt** gettext tool or by Poedit, which will run msgfmt for you in background. 
+
+**It's assumed, that you have wallabag installed locally on your computer or on the server you have access to.**
+
+## To change existing translation you will need to do:
+
+### 1. Clear cache
+You can do this using **http://your-wallabag-host.com/?empty-cache** link (replace http://your-wallabag-host.com/ with real url of your wallabag application)
+
+OR
+
+from command line:
+go to root of your installation of wallabag project and run next command:
+
+`rm -rf ./cache/*`
+
+(this may require root privileges if you run, for example Apatche web server with mod_php)
+
+### 2. Generate php files from all twig templates
+Do this using next command:
+
+`php ./locale/tools/fillCache.php`
+
+OR
+
+from your browser: **http://your-wallabag-host.com/locale/tools/fillCache.php** (this may require removal of .htacces file in locale/ directory).
+
+### 3. Configure your Poedit
+Open Poedit editor, open Edit->Preferences. Go to "Parsers" tab, click on PHP and press "Edit" button. Make sure your "Parser command:" looks like
+
+`xgettext --no-location --force-po -o %o %C %K %F`
+
+Usualy it is required to add "--no-location" to default value. 
+
+### 4. Open .po file you want to edit in Poedit and change it's settings
+Open, for example `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po` file in your Poedit.
+
+Go to "Catalog"->"Settings..." menu. Go to "Path" tab and add path to wallabag installaion in your local file system. This step can't be ommited as you will not be able to update phrases otherwise.
+
+You can also check "project into" tab to be sure, that "Language" is set correctly (this will allow you to spell check your translation).
+
+### 5. Update opened .po file from sources
+Once you have set your path correctly, you are able to update phrases from sources. Press "Update catalog - synchronize it with sources" button or go to "Catalog"->"Update from sources" menu.
+
+As a result you will see confirmation popup with two tabs: "New strings" and "Obsolete strings". Pls review and accept changes (or press "Undo" if you see too many obsolete strings, as Poedit will remove them all - in this case please make sure all previous steps are performed w/o errors).
+
+### 6. Translate and save your .po file
+If you have any dificulties on this step, please consult with Poedit manual.
+Every time you save your .po file, Poedit will also comple appropriate .mo file by default (of course, if not disabled in preferences).
+
+So, you are almost done.
+
+### 7. Clear cache again
+This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi).
+
+
+##To create new translation 
+Please simple create appropriate directories in locale folder and perform all steps, described above. Instead of opening an existing file just create new one.
+

check_setup.php

@@ -13,16 +13,6 @@ if (version_compare(PHP_VERSION, '5.4.0', '<')) {
     }
 }
 
-// Check PDO Sqlite
-if (! extension_loaded('pdo_sqlite')) {
-    die('PHP extension required: pdo_sqlite');
-}
-
-// Check ZIP
-if (! extension_loaded('zip')) {
-    die('PHP extension required: zip');
-}
-
 // Check if /cache is writeable
 if (! is_writable('cache')) {
     die('The directory "cache" must be writeable by your web server user');

inc/3rdparty/Session.class.php

@@ -31,9 +31,9 @@ class Session
     public static $sessionName = '';
     // If the user does not access any page within this time,
     // his/her session is considered expired (3600 sec. = 1 hour)
-    public static $inactivityTimeout = 86400;
+    public static $inactivityTimeout = 3600;
     // Extra timeout for long sessions (if enabled) (82800 sec. = 23 hours)
-    public static $longSessionTimeout = 31536000;
+    public static $longSessionTimeout = 7776000; // 7776000 = 90 days
     // If you get disconnected often or if your IP address changes often.
     // Let you disable session cookie hijacking protection
     public static $disableSessionProtection = false;
@@ -48,8 +48,13 @@ class Session
     /**
      * Initialize session
      */
-    public static function init()
+    public static function init($longlastingsession = false)
     {
+        //check if session name is correct
+        if ( (session_id() && !empty(self::$sessionName) && session_name()!=self::$sessionName) || $longlastingsession ) {
+            session_destroy();
+        }
+
         // Force cookie path (but do not change lifetime)
         $cookie = session_get_cookie_params();
         // Default cookie expiration and path.
@@ -61,12 +66,22 @@ class Session
         if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
             $ssl = true;
         }
-        session_set_cookie_params($cookie['lifetime'], $cookiedir, $_SERVER['HTTP_HOST'], $ssl);
+
+        if ( $longlastingsession ) {
+            session_set_cookie_params(self::$longSessionTimeout, $cookiedir, null, $ssl, true);
+        }
+        else {
+            session_set_cookie_params(0, $cookiedir, null, $ssl, true);
+        }
+        //set server side valid session timeout
+        //WARNING! this may not work in shared session environment. See http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime about min value: it can be set in any application
+        ini_set('session.gc_maxlifetime', self::$longSessionTimeout);
+
         // Use cookies to store session.
         ini_set('session.use_cookies', 1);
         // Force cookies for session  (phpsessionID forbidden in URL)
         ini_set('session.use_only_cookies', 1);
-        if (!session_id()) {
+        if ( !session_id() ) {
             // Prevent php to use sessionID in URL if cookies are disabled.
             ini_set('session.use_trans_sid', false);
             if (!empty(self::$sessionName)) {
@@ -115,6 +130,9 @@ class Session
         if (self::banCanLogin()) {
             if ($login === $loginTest && $password === $passwordTest) {
                 self::banLoginOk();
+
+                self::init($longlastingsession);
+
                 // Generate unique random number to sign forms (HMAC)
                 $_SESSION['uid'] = sha1(uniqid('', true).'_'.mt_rand());
                 $_SESSION['ip'] = self::_allIPs();
@@ -135,6 +153,7 @@ class Session
             self::banLoginFailed();
         }
 
+        self::init();
         return false;
     }
 
@@ -143,7 +162,14 @@ class Session
      */
     public static function logout()
     {
-        unset($_SESSION['uid'],$_SESSION['ip'],$_SESSION['expires_on'],$_SESSION['tokens'], $_SESSION['login'], $_SESSION['pass'], $_SESSION['longlastingsession'], $_SESSION['poche_user']);
+        // unset($_SESSION['uid'],$_SESSION['ip'],$_SESSION['expires_on'],$_SESSION['tokens'], $_SESSION['login'], $_SESSION['pass'], $_SESSION['longlastingsession'], $_SESSION['poche_user']);
+        
+        // Destruction du cookie (le code peut paraître complexe mais c'est pour être certain de reprendre les mêmes paramètres)
+        $args = array_merge(array(session_name(), ''), array_values(session_get_cookie_params()));
+        $args[2] = time() - 3600;
+        call_user_func_array('setcookie', $args);
+        // Suppression physique de la session
+        session_destroy();
     }
 
     /**
@@ -157,7 +183,7 @@ class Session
             || (self::$disableSessionProtection === false
                 && $_SESSION['ip'] !== self::_allIPs())
             || time() >= $_SESSION['expires_on']) {
-            self::logout();
+            //self::logout();
 
             return false;
         }

inc/3rdparty/class.messages.php

@@ -59,6 +59,7 @@ class Messages {
 		$this->msgId = md5(uniqid());
 		
 		// Create the session array if it doesnt already exist
+		settype($_SESSION, 'array');
 		if( !array_key_exists('flash_messages', $_SESSION) ) $_SESSION['flash_messages'] = array();
 		
 	}
@@ -228,4 +229,4 @@ class Messages {
 
 
 } // end class
-?>
+?>

inc/3rdparty/libraries/feedwriter/FeedItem.php

@@ -156,6 +156,7 @@
 		if($this->version == RSS2 || $this->version == RSS1)
 		{
 			$this->setElement('link', $link);
+			$this->setElement('guid', $link);
 		}
 		else
 		{

inc/3rdparty/libraries/feedwriter/FeedWriter.php

@@ -9,9 +9,9 @@ define('JSONP', 3, true);
  * Genarate RSS2 or JSON (original: RSS 1.0, RSS2.0 and ATOM Feed)
  *
  * Modified for FiveFilters.org's Full-Text RSS project
- * to allow for inclusion of hubs, JSON output. 
+ * to allow for inclusion of hubs, JSON output.
  * Stripped RSS1 and ATOM support.
- *                             
+ *
  * @package     UnivarselFeedWriter
  * @author      Anis uddin Ahmad <anisniit@gmail.com>
  * @link        http://www.ajaxray.com/projects/rss
@@ -26,32 +26,32 @@ define('JSONP', 3, true);
 	 private $CDATAEncoding = array();  // The tag names which have to encoded as CDATA
 	 private $xsl			= null;		// stylesheet to render RSS (used by Chrome)
 	 private $json			= null;		// JSON object
-	 
+
-	 private $version   = null; 
+	 private $version   = null;
-	
+
 	/**
 	* Constructor
-	* 
+	*
-	* @param    constant    the version constant (RSS2 or JSON).       
+	* @param    constant    the version constant (RSS2 or JSON).
-	*/ 
+	*/
 	function __construct($version = RSS2)
-	{	
+	{
 		$this->version = $version;
-			
+
 		// Setting default value for assential channel elements
 		$this->channels['title']        = $version . ' Feed';
 		$this->channels['link']         = 'http://www.ajaxray.com/blog';
-				
+
 		//Tag names to encode in CDATA
 		$this->CDATAEncoding = array('description', 'content:encoded', 'content', 'subtitle', 'summary');
 	}
-	
+
 	public function setFormat($format) {
 		$this->version = $format;
 	}
 
 	// Start # public functions ---------------------------------------------
-	
+
 	/**
 	* Set a channel element
 	* @access   public
@@ -63,11 +63,11 @@ define('JSONP', 3, true);
 	{
 		$this->channels[$elementName] = $content ;
 	}
-	
+
 	/**
-	* Set multiple channel elements from an array. Array elements 
+	* Set multiple channel elements from an array. Array elements
 	* should be 'channelName' => 'channelContent' format.
-	* 
+	*
 	* @access   public
 	* @param    array   array of channels
 	* @return   void
@@ -75,30 +75,30 @@ define('JSONP', 3, true);
 	public function setChannelElementsFromArray($elementArray)
 	{
 		if(! is_array($elementArray)) return;
-		foreach ($elementArray as $elementName => $content) 
+		foreach ($elementArray as $elementName => $content)
 		{
 			$this->setChannelElement($elementName, $content);
 		}
 	}
-	
+
 	/**
 	* Genarate the actual RSS/JSON file
-	* 
+	*
 	* @access   public
 	* @return   void
-	*/ 
+	*/
 	public function genarateFeed()
 	{
 		if ($this->version == RSS2) {
-			header('Content-type: text/xml; charset=UTF-8');
+// 			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');
+// 			header('X-content-type-options: nosniff');
 		} elseif ($this->version == JSON) {
-			header('Content-type: application/json; charset=UTF-8');
+// 			header('Content-type: application/json; charset=UTF-8');
 			$this->json = new stdClass();
 		} elseif ($this->version == JSONP) {
-			header('Content-type: application/javascript; charset=UTF-8');
+// 			header('Content-type: application/javascript; charset=UTF-8');
 			$this->json = new stdClass();
 		}
 		$this->printHead();
@@ -109,10 +109,10 @@ define('JSONP', 3, true);
 			echo json_encode($this->json);
 		}
 	}
-	
+
 	/**
 	* Create a new FeedItem.
-	* 
+	*
 	* @access   public
 	* @return   object  instance of FeedItem class
 	*/
@@ -121,24 +121,24 @@ define('JSONP', 3, true);
 		$Item = new FeedItem($this->version);
 		return $Item;
 	}
-	
+
 	/**
 	* Add a FeedItem to the main class
-	* 
+	*
 	* @access   public
 	* @param    object  instance of FeedItem class
 	* @return   void
 	*/
 	public function addItem($feedItem)
 	{
-		$this->items[] = $feedItem;    
+		$this->items[] = $feedItem;
 	}
-	
+
 	// Wrapper functions -------------------------------------------------------------------
-	
+
 	/**
 	* Set the 'title' channel element
-	* 
+	*
 	* @access   public
 	* @param    srting  value of 'title' channel tag
 	* @return   void
@@ -147,59 +147,59 @@ define('JSONP', 3, true);
 	{
 		$this->setChannelElement('title', $title);
 	}
-	
+
 	/**
 	* Add a hub to the channel element
-	* 
+	*
 	* @access   public
 	* @param    string URL
 	* @return   void
 	*/
 	public function addHub($hub)
 	{
-		$this->hubs[] = $hub;    
+		$this->hubs[] = $hub;
 	}
-	
+
 	/**
 	* Set XSL URL
-	* 
+	*
 	* @access   public
 	* @param    string URL
 	* @return   void
 	*/
 	public function setXsl($xsl)
 	{
-		$this->xsl = $xsl;    
+		$this->xsl = $xsl;
-	}	
+	}
-	
+
 	/**
 	* Set self URL
-	* 
+	*
 	* @access   public
 	* @param    string URL
 	* @return   void
 	*/
 	public function setSelf($self)
 	{
-		$this->self = $self;    
+		$this->self = $self;
-	}	
+	}
-	
+
 	/**
 	* Set the 'description' channel element
-	* 
+	*
 	* @access   public
 	* @param    srting  value of 'description' channel tag
 	* @return   void
 	*/
 	public function setDescription($desciption)
 	{
-		$tag = ($this->version == ATOM)? 'subtitle' : 'description'; 
+		$tag = ($this->version == ATOM)? 'subtitle' : 'description';
 		$this->setChannelElement($tag, $desciption);
 	}
-	
+
 	/**
 	* Set the 'link' channel element
-	* 
+	*
 	* @access   public
 	* @param    srting  value of 'link' channel tag
 	* @return   void
@@ -208,10 +208,10 @@ define('JSONP', 3, true);
 	{
 		$this->setChannelElement('link', $link);
 	}
-	
+
 	/**
 	* Set the 'image' channel element
-	* 
+	*
 	* @access   public
 	* @param    srting  title of image
 	* @param    srting  link url of the imahe
@@ -222,14 +222,14 @@ define('JSONP', 3, true);
 	{
 		$this->setChannelElement('image', array('title'=>$title, 'link'=>$link, 'url'=>$url));
 	}
-	
+
 	// End # public functions ----------------------------------------------
-	
+
 	// Start # private functions ----------------------------------------------
-	
+
 	/**
 	* Prints the xml and rss namespace
-	* 
+	*
 	* @access   private
 	* @return   void
 	*/
@@ -247,10 +247,10 @@ define('JSONP', 3, true);
 			$this->json->rss = array('@attributes' => array('version' => '2.0'));
 		}
 	}
-	
+
 	/**
 	* Closes the open tags at the end of file
-	* 
+	*
 	* @access   private
 	* @return   void
 	*/
@@ -258,14 +258,14 @@ define('JSONP', 3, true);
 	{
 		if ($this->version == RSS2)
 		{
-			echo '</channel>',PHP_EOL,'</rss>'; 
+			echo '</channel>',PHP_EOL,'</rss>';
-		}    
+		}
 		// do nothing for JSON
 	}
 
 	/**
 	* Creates a single node as xml format
-	* 
+	*
 	* @access   private
 	* @param    string  name of the tag
 	* @param    mixed   tag value as string or array of nested tags in 'tagName' => 'tagValue' format
@@ -273,22 +273,22 @@ define('JSONP', 3, true);
 	* @return   string  formatted xml tag
 	*/
 	private function makeNode($tagName, $tagContent, $attributes = null)
-	{        
+	{
 		if ($this->version == RSS2)
 		{
 			$nodeText = '';
 			$attrText = '';
 			if (is_array($attributes))
 			{
-				foreach ($attributes as $key => $value) 
+				foreach ($attributes as $key => $value)
 				{
 					$attrText .= " $key=\"$value\" ";
 				}
 			}
 			$nodeText .= "<{$tagName}{$attrText}>";
 			if (is_array($tagContent))
-			{ 
+			{
-				foreach ($tagContent as $key => $value) 
+				foreach ($tagContent as $key => $value)
 				{
 					$nodeText .= $this->makeNode($key, $value);
 				}
@@ -297,7 +297,7 @@ define('JSONP', 3, true);
 			{
 				//$nodeText .= (in_array($tagName, $this->CDATAEncoding))? $tagContent : htmlentities($tagContent);
 				$nodeText .= htmlspecialchars($tagContent);
-			}           
+			}
 			//$nodeText .= (in_array($tagName, $this->CDATAEncoding))? "]]></$tagName>" : "</$tagName>";
 			$nodeText .= "</$tagName>";
 			return $nodeText . PHP_EOL;
@@ -321,7 +321,7 @@ define('JSONP', 3, true);
 		}
 		return ''; // should not get here
 	}
-	
+
 	private function json_keys(array $array) {
 		$new = array();
 		foreach ($array as $key => $val) {
@@ -334,7 +334,7 @@ define('JSONP', 3, true);
 		}
 		return $new;
 	}
-	
+
 	/**
 	* @desc     Print channels
 	* @access   private
@@ -344,7 +344,7 @@ define('JSONP', 3, true);
 	{
 		//Start channel tag
 		if ($this->version == RSS2) {
-			echo '<channel>' . PHP_EOL;    
+			echo '<channel>' . PHP_EOL;
 			// add hubs
 			foreach ($this->hubs as $hub) {
 				//echo $this->makeNode('link', '', array('rel'=>'hub', 'href'=>$hub, 'xmlns'=>'http://www.w3.org/2005/Atom'));
@@ -356,7 +356,7 @@ define('JSONP', 3, true);
 				echo '<link rel="self" href="'.htmlspecialchars($this->self).'" xmlns="http://www.w3.org/2005/Atom" />' . PHP_EOL;
 			}
 			//Print Items of channel
-			foreach ($this->channels as $key => $value) 
+			foreach ($this->channels as $key => $value)
 			{
 				echo $this->makeNode($key, $value);
 			}
@@ -364,26 +364,26 @@ define('JSONP', 3, true);
 			$this->json->rss['channel'] = (object)$this->json_keys($this->channels);
 		}
 	}
-	
+
 	/**
 	* Prints formatted feed items
-	* 
+	*
 	* @access   private
 	* @return   void
 	*/
 	private function printItems()
-	{    
+	{
 		foreach ($this->items as $item) {
 			$itemElements = $item->getElements();
-			
+
 			echo $this->startItem();
-			
+
 			if ($this->version == JSON || $this->version == JSONP) {
 				$json_item = array();
 			}
-			
+
 			foreach ($itemElements as $thisElement) {
-				foreach ($thisElement as $instance) {			
+				foreach ($thisElement as $instance) {
 					if ($this->version == RSS2) {
 						echo $this->makeNode($instance['name'], $instance['content'], $instance['attributes']);
 					} elseif ($this->version == JSON || $this->version == JSONP) {
@@ -406,10 +406,10 @@ define('JSONP', 3, true);
 			}
 		}
 	}
-	
+
 	/**
 	* Make the starting tag of channels
-	* 
+	*
 	* @access   private
 	* @return   void
 	*/
@@ -417,14 +417,14 @@ define('JSONP', 3, true);
 	{
 		if ($this->version == RSS2)
 		{
-			echo '<item>' . PHP_EOL; 
+			echo '<item>' . PHP_EOL;
-		}    
+		}
 		// nothing for JSON
 	}
-	
+
 	/**
 	* Closes feed item tag
-	* 
+	*
 	* @access   private
 	* @return   void
 	*/
@@ -432,10 +432,10 @@ define('JSONP', 3, true);
 	{
 		if ($this->version == RSS2)
 		{
-			echo '</item>' . PHP_EOL; 
+			echo '</item>' . PHP_EOL;
-		}    
+		}
 		// nothing for JSON
 	}
-	
+
 	// End # private functions ----------------------------------------------
  }

inc/3rdparty/makefulltextfeed.php

@@ -55,42 +55,8 @@ if (get_magic_quotes_gpc()) {
 
 // set include path
 set_include_path(realpath(dirname(__FILE__).'/libraries').PATH_SEPARATOR.get_include_path());
-// Autoloading of classes allows us to include files only when they're
+
-// needed. If we've got a cached copy, for example, only Zend_Cache is loaded.
+require_once dirname(__FILE__).'/makefulltextfeedHelpers.php';
-function autoload($class_name) {
-	static $dir = null;
-	if ($dir === null) $dir = dirname(__FILE__).'/libraries/';
-	static $mapping = array(
-		// Include FeedCreator for RSS/Atom creation
-		'FeedWriter' => 'feedwriter/FeedWriter.php',
-		'FeedItem' => 'feedwriter/FeedItem.php',
-		// Include ContentExtractor and Readability for identifying and extracting content from URLs
-		'ContentExtractor' => 'content-extractor/ContentExtractor.php',
-		'SiteConfig' => 'content-extractor/SiteConfig.php',
-		'Readability' => 'readability/Readability.php',
-		// Include Humble HTTP Agent to allow parallel requests and response caching
-		'HumbleHttpAgent' => 'humble-http-agent/HumbleHttpAgent.php',
-		'SimplePie_HumbleHttpAgent' => 'humble-http-agent/SimplePie_HumbleHttpAgent.php',
-		'CookieJar' => 'humble-http-agent/CookieJar.php',
-		// Include Zend Cache to improve performance (cache results)
-		'Zend_Cache' => 'Zend/Cache.php',
-		// Language detect
-		'Text_LanguageDetect' => 'language-detect/LanguageDetect.php',
-		// HTML5 Lib
-		'HTML5_Parser' => 'html5/Parser.php',
-		// htmLawed - used if XSS filter is enabled (xss_filter)
-		'htmLawed' => 'htmLawed/htmLawed.php'
-	);
-	if (isset($mapping[$class_name])) {
-		debug("** Loading class $class_name ({$mapping[$class_name]})");
-		require $dir.$mapping[$class_name];
-		return true;
-	} else {
-		return false;
-	}
-}
-spl_autoload_register('autoload');
-require dirname(__FILE__).'/libraries/simplepie/autoloader.php';
 
 ////////////////////////////////
 // Load config file
@@ -415,6 +381,7 @@ if (!$debug_mode) {
 //////////////////////////////////
 // Set up HTTP agent
 //////////////////////////////////
+global $http;
 $http = new HumbleHttpAgent();
 $http->debug = $debug_mode;
 $http->userAgentMap = $options->user_agents;
@@ -478,29 +445,6 @@ if ($html_only || !$result) {
 	$isDummyFeed = true;
 	unset($feed, $result);
 	// create single item dummy feed object
-	class DummySingleItemFeed {
-		public $item;
-		function __construct($url) { $this->item = new DummySingleItem($url); }
-		public function get_title() { return ''; }
-		public function get_description() { return 'Content extracted from '.$this->item->url; }
-		public function get_link() { return $this->item->url; }
-		public function get_language() { return false; }
-		public function get_image_url() { return false; }
-		public function get_items($start=0, $max=1) { return array(0=>$this->item); }
-	}
-	class DummySingleItem {
-		public $url;
-		function __construct($url) { $this->url = $url; }
-		public function get_permalink() { return $this->url; }
-		public function get_title() { return null; }
-		public function get_date($format='') { return false; }
-		public function get_author($key=0) { return null; }
-		public function get_authors() { return null; }
-		public function get_description() { return ''; }
-		public function get_enclosure($key=0, $prefer=null) { return null; }
-		public function get_enclosures() { return null; }
-		public function get_categories() { return null; }
-	}
 	$feed = new DummySingleItemFeed($url);
 }
 
@@ -903,294 +847,3 @@ if (!$debug_mode) {
 	if ($callback) echo ');';
 }
 
-///////////////////////////////
-// HELPER FUNCTIONS
-///////////////////////////////
-
-function url_allowed($url) {
-	global $options;
-	if (!empty($options->allowed_urls)) {
-		$allowed = false;
-		foreach ($options->allowed_urls as $allowurl) {
-			if (stristr($url, $allowurl) !== false) {
-				$allowed = true;
-				break;
-			}
-		}
-		if (!$allowed) return false;
-	} else {
-		foreach ($options->blocked_urls as $blockurl) {
-			if (stristr($url, $blockurl) !== false) {
-				return false;
-			}
-		}
-	}
-	return true;
-}
-
-//////////////////////////////////////////////
-// Convert $html to UTF8
-// (uses HTTP headers and HTML to find encoding)
-// adapted from http://stackoverflow.com/questions/910793/php-detect-encoding-and-make-everything-utf-8
-//////////////////////////////////////////////
-function convert_to_utf8($html, $header=null)
-{
-	$encoding = null;
-	if ($html || $header) {
-		if (is_array($header)) $header = implode("\n", $header);
-		if (!$header || !preg_match_all('/^Content-Type:\s+([^;]+)(?:;\s*charset=["\']?([^;"\'\n]*))?/im', $header, $match, PREG_SET_ORDER)) {
-			// error parsing the response
-			debug('Could not find Content-Type header in HTTP response');
-		} else {
-			$match = end($match); // get last matched element (in case of redirects)
-			if (isset($match[2])) $encoding = trim($match[2], "\"' \r\n\0\x0B\t");
-		}
-		// TODO: check to see if encoding is supported (can we convert it?)
-		// If it's not, result will be empty string.
-		// For now we'll check for invalid encoding types returned by some sites, e.g. 'none'
-		// Problem URL: http://facta.co.jp/blog/archives/20111026001026.html
-		if (!$encoding || $encoding == 'none') {
-			// search for encoding in HTML - only look at the first 50000 characters
-			// Why 50000? See, for example, http://www.lemonde.fr/festival-de-cannes/article/2012/05/23/deux-cretes-en-goguette-sur-la-croisette_1705732_766360.html
-			// TODO: improve this so it looks at smaller chunks first
-			$html_head = substr($html, 0, 50000);
-			if (preg_match('/^<\?xml\s+version=(?:"[^"]*"|\'[^\']*\')\s+encoding=("[^"]*"|\'[^\']*\')/s', $html_head, $match)) {
-				$encoding = trim($match[1], '"\'');
-			} elseif (preg_match('/<meta\s+http-equiv=["\']?Content-Type["\']? content=["\'][^;]+;\s*charset=["\']?([^;"\'>]+)/i', $html_head, $match)) {
-				$encoding = trim($match[1]);
-			} elseif (preg_match_all('/<meta\s+([^>]+)>/i', $html_head, $match)) {
-				foreach ($match[1] as $_test) {
-					if (preg_match('/charset=["\']?([^"\']+)/i', $_test, $_m)) {
-						$encoding = trim($_m[1]);
-						break;
-					}
-				}
-			}
-		}
-		if (isset($encoding)) $encoding = trim($encoding);
-		// trim is important here!
-		if (!$encoding || (strtolower($encoding) == 'iso-8859-1')) {
-			// replace MS Word smart qutoes
-			$trans = array();
-			$trans[chr(130)] = '&sbquo;';    // Single Low-9 Quotation Mark
-			$trans[chr(131)] = '&fnof;';    // Latin Small Letter F With Hook
-			$trans[chr(132)] = '&bdquo;';    // Double Low-9 Quotation Mark
-			$trans[chr(133)] = '&hellip;';    // Horizontal Ellipsis
-			$trans[chr(134)] = '&dagger;';    // Dagger
-			$trans[chr(135)] = '&Dagger;';    // Double Dagger
-			$trans[chr(136)] = '&circ;';    // Modifier Letter Circumflex Accent
-			$trans[chr(137)] = '&permil;';    // Per Mille Sign
-			$trans[chr(138)] = '&Scaron;';    // Latin Capital Letter S With Caron
-			$trans[chr(139)] = '&lsaquo;';    // Single Left-Pointing Angle Quotation Mark
-			$trans[chr(140)] = '&OElig;';    // Latin Capital Ligature OE
-			$trans[chr(145)] = '&lsquo;';    // Left Single Quotation Mark
-			$trans[chr(146)] = '&rsquo;';    // Right Single Quotation Mark
-			$trans[chr(147)] = '&ldquo;';    // Left Double Quotation Mark
-			$trans[chr(148)] = '&rdquo;';    // Right Double Quotation Mark
-			$trans[chr(149)] = '&bull;';    // Bullet
-			$trans[chr(150)] = '&ndash;';    // En Dash
-			$trans[chr(151)] = '&mdash;';    // Em Dash
-			$trans[chr(152)] = '&tilde;';    // Small Tilde
-			$trans[chr(153)] = '&trade;';    // Trade Mark Sign
-			$trans[chr(154)] = '&scaron;';    // Latin Small Letter S With Caron
-			$trans[chr(155)] = '&rsaquo;';    // Single Right-Pointing Angle Quotation Mark
-			$trans[chr(156)] = '&oelig;';    // Latin Small Ligature OE
-			$trans[chr(159)] = '&Yuml;';    // Latin Capital Letter Y With Diaeresis
-			$html = strtr($html, $trans);
-		}
-		if (!$encoding) {
-			debug('No character encoding found, so treating as UTF-8');
-			$encoding = 'utf-8';
-		} else {
-			debug('Character encoding: '.$encoding);
-			if (strtolower($encoding) != 'utf-8') {
-				debug('Converting to UTF-8');
-				$html = SimplePie_Misc::change_encoding($html, $encoding, 'utf-8');
-				/*
-				if (function_exists('iconv')) {
-					// iconv appears to handle certain character encodings better than mb_convert_encoding
-					$html = iconv($encoding, 'utf-8', $html);
-				} else {
-					$html = mb_convert_encoding($html, 'utf-8', $encoding);
-				}
-				*/
-			}
-		}
-	}
-	return $html;
-}
-
-function makeAbsolute($base, $elem) {
-	$base = new SimplePie_IRI($base);
-	// remove '//' in URL path (used to prevent URLs from resolving properly)
-	// TODO: check if this is still the case
-	if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path);
-	foreach(array('a'=>'href', 'img'=>'src') as $tag => $attr) {
-		$elems = $elem->getElementsByTagName($tag);
-		for ($i = $elems->length-1; $i >= 0; $i--) {
-			$e = $elems->item($i);
-			//$e->parentNode->replaceChild($articleContent->ownerDocument->createTextNode($e->textContent), $e);
-			makeAbsoluteAttr($base, $e, $attr);
-		}
-		if (strtolower($elem->tagName) == $tag) makeAbsoluteAttr($base, $elem, $attr);
-	}
-}
-function makeAbsoluteAttr($base, $e, $attr) {
-	if ($e->hasAttribute($attr)) {
-		// Trim leading and trailing white space. I don't really like this but 
-		// unfortunately it does appear on some sites. e.g.  <img src=" /path/to/image.jpg" />
-		$url = trim(str_replace('%20', ' ', $e->getAttribute($attr)));
-		$url = str_replace(' ', '%20', $url);
-		if (!preg_match('!https?://!i', $url)) {
-			if ($absolute = SimplePie_IRI::absolutize($base, $url)) {
-				$e->setAttribute($attr, $absolute);
-			}
-		}
-	}
-}
-function makeAbsoluteStr($base, $url) {
-	$base = new SimplePie_IRI($base);
-	// remove '//' in URL path (causes URLs not to resolve properly)
-	if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path);
-	if (preg_match('!^https?://!i', $url)) {
-		// already absolute
-		return $url;
-	} else {
-		if ($absolute = SimplePie_IRI::absolutize($base, $url)) {
-			return $absolute;
-		}
-		return false;
-	}
-}
-// returns single page response, or false if not found
-function getSinglePage($item, $html, $url) {
-	global $http, $extractor;
-	debug('Looking for site config files to see if single page link exists');
-	$site_config = $extractor->buildSiteConfig($url, $html);
-	$splink = null;
-	if (!empty($site_config->single_page_link)) {
-		$splink = $site_config->single_page_link;
-	} elseif (!empty($site_config->single_page_link_in_feed)) {
-		// single page link xpath is targeted at feed
-		$splink = $site_config->single_page_link_in_feed;
-		// so let's replace HTML with feed item description
-		$html = $item->get_description();
-	}
-	if (isset($splink)) {
-		// Build DOM tree from HTML
-		$readability = new Readability($html, $url);
-		$xpath = new DOMXPath($readability->dom);
-		// Loop through single_page_link xpath expressions
-		$single_page_url = null;
-		foreach ($splink as $pattern) {
-			$elems = @$xpath->evaluate($pattern, $readability->dom);
-			if (is_string($elems)) {
-				$single_page_url = trim($elems);
-				break;
-			} elseif ($elems instanceof DOMNodeList && $elems->length > 0) {
-				foreach ($elems as $item) {
-					if ($item instanceof DOMElement && $item->hasAttribute('href')) {
-						$single_page_url = $item->getAttribute('href');
-						break 2;
-					} elseif ($item instanceof DOMAttr && $item->value) {
-						$single_page_url = $item->value;
-						break 2;
-					}
-				}
-			}
-		}
-		// If we've got URL, resolve against $url
-		if (isset($single_page_url) && ($single_page_url = makeAbsoluteStr($url, $single_page_url))) {
-			// check it's not what we have already!
-			if ($single_page_url != $url) {
-				// it's not, so let's try to fetch it...
-				$_prev_ref = $http->referer;
-				$http->referer = $single_page_url;
-				if (($response = $http->get($single_page_url, true)) && $response['status_code'] < 300) {
-					$http->referer = $_prev_ref;
-					return $response;
-				}
-				$http->referer = $_prev_ref;
-			}
-		}
-	}
-	return false;
-}
-
-// based on content-type http header, decide what to do
-// param: HTTP headers string
-// return: array with keys: 'mime', 'type', 'subtype', 'action', 'name'
-// e.g. array('mime'=>'image/jpeg', 'type'=>'image', 'subtype'=>'jpeg', 'action'=>'link', 'name'=>'Image')
-function get_mime_action_info($headers) {
-	global $options;
-	// check if action defined for returned Content-Type
-	$info = array();
-	if (preg_match('!^Content-Type:\s*(([-\w]+)/([-\w\+]+))!im', $headers, $match)) {
-		// look for full mime type (e.g. image/jpeg) or just type (e.g. image)
-		// match[1] = full mime type, e.g. image/jpeg
-		// match[2] = first part, e.g. image
-		// match[3] = last part, e.g. jpeg
-		$info['mime'] = strtolower(trim($match[1]));
-		$info['type'] = strtolower(trim($match[2]));
-		$info['subtype'] = strtolower(trim($match[3]));
-		foreach (array($info['mime'], $info['type']) as $_mime) {
-			if (isset($options->content_type_exc[$_mime])) {
-				$info['action'] = $options->content_type_exc[$_mime]['action'];
-				$info['name'] = $options->content_type_exc[$_mime]['name'];
-				break;
-			}
-		}
-	}
-	return $info;
-}
-
-function remove_url_cruft($url) {
-	// remove google analytics for the time being
-	// regex adapted from http://navitronic.co.uk/2010/12/removing-google-analytics-cruft-from-urls/
-	// https://gist.github.com/758177
-	return preg_replace('/(\?|\&)utm_[a-z]+=[^\&]+/', '', $url);
-}
-
-function make_substitutions($string) {
-	if ($string == '') return $string;
-	global $item, $effective_url;
-	$string = str_replace('{url}', htmlspecialchars($item->get_permalink()), $string);
-	$string = str_replace('{effective-url}', htmlspecialchars($effective_url), $string);
-	return $string;
-}
-
-function get_cache() {
-	global $options, $valid_key;
-	static $cache = null;
-	if ($cache === null) {
-		$frontendOptions = array(
-			'lifetime' => 10*60, // cache lifetime of 10 minutes
-			'automatic_serialization' => false,
-			'write_control' => false,
-			'automatic_cleaning_factor' => $options->cache_cleanup,
-			'ignore_user_abort' => false
-		);
-		$backendOptions = array(
-			'cache_dir' => ($valid_key) ? $options->cache_dir.'/rss-with-key/' : $options->cache_dir.'/rss/', // directory where to put the cache files
-			'file_locking' => false,
-			'read_control' => true,
-			'read_control_type' => 'strlen',
-			'hashed_directory_level' => $options->cache_directory_level,
-			'hashed_directory_perm' => 0777,
-			'cache_file_perm' => 0664,
-			'file_name_prefix' => 'ff'
-		);
-		// getting a Zend_Cache_Core object
-		$cache = Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions);
-	}
-	return $cache;
-}
-
-function debug($msg) {
-	global $debug_mode;
-	if ($debug_mode) {
-		echo '* ',$msg,"\n";
-		ob_flush();
-		flush();
-	}
-}

inc/3rdparty/makefulltextfeedHelpers.php

@@ -0,0 +1,355 @@
+<?php
+
+// Autoloading of classes allows us to include files only when they're
+// needed. If we've got a cached copy, for example, only Zend_Cache is loaded.
+function autoload($class_name) {
+	static $dir = null;
+	if ($dir === null) $dir = dirname(__FILE__).'/libraries/';
+	static $mapping = array(
+		// Include FeedCreator for RSS/Atom creation
+		'FeedWriter' => 'feedwriter/FeedWriter.php',
+		'FeedItem' => 'feedwriter/FeedItem.php',
+		// Include ContentExtractor and Readability for identifying and extracting content from URLs
+		'ContentExtractor' => 'content-extractor/ContentExtractor.php',
+		'SiteConfig' => 'content-extractor/SiteConfig.php',
+		'Readability' => 'readability/Readability.php',
+		// Include Humble HTTP Agent to allow parallel requests and response caching
+		'HumbleHttpAgent' => 'humble-http-agent/HumbleHttpAgent.php',
+		'SimplePie_HumbleHttpAgent' => 'humble-http-agent/SimplePie_HumbleHttpAgent.php',
+		'CookieJar' => 'humble-http-agent/CookieJar.php',
+		// Include Zend Cache to improve performance (cache results)
+		'Zend_Cache' => 'Zend/Cache.php',
+		// Language detect
+		'Text_LanguageDetect' => 'language-detect/LanguageDetect.php',
+		// HTML5 Lib
+		'HTML5_Parser' => 'html5/Parser.php',
+		// htmLawed - used if XSS filter is enabled (xss_filter)
+		'htmLawed' => 'htmLawed/htmLawed.php'
+	);
+	if (isset($mapping[$class_name])) {
+		debug("** Loading class $class_name ({$mapping[$class_name]})");
+		require $dir.$mapping[$class_name];
+		return true;
+	} else {
+		return false;
+	}
+}
+spl_autoload_register('autoload');
+require dirname(__FILE__).'/libraries/simplepie/autoloader.php';
+
+
+class DummySingleItemFeed {
+	public $item;
+	function __construct($url) { $this->item = new DummySingleItem($url); }
+	public function get_title() { return ''; }
+	public function get_description() { return 'Content extracted from '.$this->item->url; }
+	public function get_link() { return $this->item->url; }
+	public function get_language() { return false; }
+	public function get_image_url() { return false; }
+	public function get_items($start=0, $max=1) { return array(0=>$this->item); }
+}
+class DummySingleItem {
+	public $url;
+	function __construct($url) { $this->url = $url; }
+	public function get_permalink() { return $this->url; }
+	public function get_title() { return null; }
+	public function get_date($format='') { return false; }
+	public function get_author($key=0) { return null; }
+	public function get_authors() { return null; }
+	public function get_description() { return ''; }
+	public function get_enclosure($key=0, $prefer=null) { return null; }
+	public function get_enclosures() { return null; }
+	public function get_categories() { return null; }
+}
+
+///////////////////////////////
+// HELPER FUNCTIONS
+///////////////////////////////
+
+function url_allowed($url) {
+	global $options;
+	if (!empty($options->allowed_urls)) {
+		$allowed = false;
+		foreach ($options->allowed_urls as $allowurl) {
+			if (stristr($url, $allowurl) !== false) {
+				$allowed = true;
+				break;
+			}
+		}
+		if (!$allowed) return false;
+	} else {
+		foreach ($options->blocked_urls as $blockurl) {
+			if (stristr($url, $blockurl) !== false) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+//////////////////////////////////////////////
+// Convert $html to UTF8
+// (uses HTTP headers and HTML to find encoding)
+// adapted from http://stackoverflow.com/questions/910793/php-detect-encoding-and-make-everything-utf-8
+//////////////////////////////////////////////
+function convert_to_utf8($html, $header=null)
+{
+	$encoding = null;
+	if ($html || $header) {
+		if (is_array($header)) $header = implode("\n", $header);
+		if (!$header || !preg_match_all('/^Content-Type:\s+([^;]+)(?:;\s*charset=["\']?([^;"\'\n]*))?/im', $header, $match, PREG_SET_ORDER)) {
+			// error parsing the response
+			debug('Could not find Content-Type header in HTTP response');
+		} else {
+			$match = end($match); // get last matched element (in case of redirects)
+			if (isset($match[2])) $encoding = trim($match[2], "\"' \r\n\0\x0B\t");
+		}
+		// TODO: check to see if encoding is supported (can we convert it?)
+		// If it's not, result will be empty string.
+		// For now we'll check for invalid encoding types returned by some sites, e.g. 'none'
+		// Problem URL: http://facta.co.jp/blog/archives/20111026001026.html
+		if (!$encoding || $encoding == 'none') {
+			// search for encoding in HTML - only look at the first 50000 characters
+			// Why 50000? See, for example, http://www.lemonde.fr/festival-de-cannes/article/2012/05/23/deux-cretes-en-goguette-sur-la-croisette_1705732_766360.html
+			// TODO: improve this so it looks at smaller chunks first
+			$html_head = substr($html, 0, 50000);
+			if (preg_match('/^<\?xml\s+version=(?:"[^"]*"|\'[^\']*\')\s+encoding=("[^"]*"|\'[^\']*\')/s', $html_head, $match)) {
+				$encoding = trim($match[1], '"\'');
+			} elseif (preg_match('/<meta\s+http-equiv=["\']?Content-Type["\']? content=["\'][^;]+;\s*charset=["\']?([^;"\'>]+)/i', $html_head, $match)) {
+				$encoding = trim($match[1]);
+			} elseif (preg_match_all('/<meta\s+([^>]+)>/i', $html_head, $match)) {
+				foreach ($match[1] as $_test) {
+					if (preg_match('/charset=["\']?([^"\']+)/i', $_test, $_m)) {
+						$encoding = trim($_m[1]);
+						break;
+					}
+				}
+			}
+		}
+		if (isset($encoding)) $encoding = trim($encoding);
+		// trim is important here!
+		if (!$encoding || (strtolower($encoding) == 'iso-8859-1')) {
+			// replace MS Word smart qutoes
+			$trans = array();
+			$trans[chr(130)] = '&sbquo;';    // Single Low-9 Quotation Mark
+			$trans[chr(131)] = '&fnof;';    // Latin Small Letter F With Hook
+			$trans[chr(132)] = '&bdquo;';    // Double Low-9 Quotation Mark
+			$trans[chr(133)] = '&hellip;';    // Horizontal Ellipsis
+			$trans[chr(134)] = '&dagger;';    // Dagger
+			$trans[chr(135)] = '&Dagger;';    // Double Dagger
+			$trans[chr(136)] = '&circ;';    // Modifier Letter Circumflex Accent
+			$trans[chr(137)] = '&permil;';    // Per Mille Sign
+			$trans[chr(138)] = '&Scaron;';    // Latin Capital Letter S With Caron
+			$trans[chr(139)] = '&lsaquo;';    // Single Left-Pointing Angle Quotation Mark
+			$trans[chr(140)] = '&OElig;';    // Latin Capital Ligature OE
+			$trans[chr(145)] = '&lsquo;';    // Left Single Quotation Mark
+			$trans[chr(146)] = '&rsquo;';    // Right Single Quotation Mark
+			$trans[chr(147)] = '&ldquo;';    // Left Double Quotation Mark
+			$trans[chr(148)] = '&rdquo;';    // Right Double Quotation Mark
+			$trans[chr(149)] = '&bull;';    // Bullet
+			$trans[chr(150)] = '&ndash;';    // En Dash
+			$trans[chr(151)] = '&mdash;';    // Em Dash
+			$trans[chr(152)] = '&tilde;';    // Small Tilde
+			$trans[chr(153)] = '&trade;';    // Trade Mark Sign
+			$trans[chr(154)] = '&scaron;';    // Latin Small Letter S With Caron
+			$trans[chr(155)] = '&rsaquo;';    // Single Right-Pointing Angle Quotation Mark
+			$trans[chr(156)] = '&oelig;';    // Latin Small Ligature OE
+			$trans[chr(159)] = '&Yuml;';    // Latin Capital Letter Y With Diaeresis
+			$html = strtr($html, $trans);
+		}
+		if (!$encoding) {
+			debug('No character encoding found, so treating as UTF-8');
+			$encoding = 'utf-8';
+		} else {
+			debug('Character encoding: '.$encoding);
+			if (strtolower($encoding) != 'utf-8') {
+				debug('Converting to UTF-8');
+				$html = SimplePie_Misc::change_encoding($html, $encoding, 'utf-8');
+				/*
+				if (function_exists('iconv')) {
+					// iconv appears to handle certain character encodings better than mb_convert_encoding
+					$html = iconv($encoding, 'utf-8', $html);
+				} else {
+					$html = mb_convert_encoding($html, 'utf-8', $encoding);
+				}
+				*/
+			}
+		}
+	}
+	return $html;
+}
+
+function makeAbsolute($base, $elem) {
+	$base = new SimplePie_IRI($base);
+	// remove '//' in URL path (used to prevent URLs from resolving properly)
+	// TODO: check if this is still the case
+	if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path);
+	foreach(array('a'=>'href', 'img'=>'src') as $tag => $attr) {
+		$elems = $elem->getElementsByTagName($tag);
+		for ($i = $elems->length-1; $i >= 0; $i--) {
+			$e = $elems->item($i);
+			//$e->parentNode->replaceChild($articleContent->ownerDocument->createTextNode($e->textContent), $e);
+			makeAbsoluteAttr($base, $e, $attr);
+		}
+		if (strtolower($elem->tagName) == $tag) makeAbsoluteAttr($base, $elem, $attr);
+	}
+}
+function makeAbsoluteAttr($base, $e, $attr) {
+	if ($e->hasAttribute($attr)) {
+		// Trim leading and trailing white space. I don't really like this but 
+		// unfortunately it does appear on some sites. e.g.  <img src=" /path/to/image.jpg" />
+		$url = trim(str_replace('%20', ' ', $e->getAttribute($attr)));
+		$url = str_replace(' ', '%20', $url);
+		if (!preg_match('!https?://!i', $url)) {
+			if ($absolute = SimplePie_IRI::absolutize($base, $url)) {
+				$e->setAttribute($attr, $absolute);
+			}
+		}
+	}
+}
+function makeAbsoluteStr($base, $url) {
+	$base = new SimplePie_IRI($base);
+	// remove '//' in URL path (causes URLs not to resolve properly)
+	if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path);
+	if (preg_match('!^https?://!i', $url)) {
+		// already absolute
+		return $url;
+	} else {
+		if ($absolute = SimplePie_IRI::absolutize($base, $url)) {
+			return $absolute;
+		}
+		return false;
+	}
+}
+// returns single page response, or false if not found
+function getSinglePage($item, $html, $url) {
+	global $http, $extractor;
+	debug('Looking for site config files to see if single page link exists');
+	$site_config = $extractor->buildSiteConfig($url, $html);
+	$splink = null;
+	if (!empty($site_config->single_page_link)) {
+		$splink = $site_config->single_page_link;
+	} elseif (!empty($site_config->single_page_link_in_feed)) {
+		// single page link xpath is targeted at feed
+		$splink = $site_config->single_page_link_in_feed;
+		// so let's replace HTML with feed item description
+		$html = $item->get_description();
+	}
+	if (isset($splink)) {
+		// Build DOM tree from HTML
+		$readability = new Readability($html, $url);
+		$xpath = new DOMXPath($readability->dom);
+		// Loop through single_page_link xpath expressions
+		$single_page_url = null;
+		foreach ($splink as $pattern) {
+			$elems = @$xpath->evaluate($pattern, $readability->dom);
+			if (is_string($elems)) {
+				$single_page_url = trim($elems);
+				break;
+			} elseif ($elems instanceof DOMNodeList && $elems->length > 0) {
+				foreach ($elems as $item) {
+					if ($item instanceof DOMElement && $item->hasAttribute('href')) {
+						$single_page_url = $item->getAttribute('href');
+						break 2;
+					} elseif ($item instanceof DOMAttr && $item->value) {
+						$single_page_url = $item->value;
+						break 2;
+					}
+				}
+			}
+		}
+		// If we've got URL, resolve against $url
+		if (isset($single_page_url) && ($single_page_url = makeAbsoluteStr($url, $single_page_url))) {
+			// check it's not what we have already!
+			if ($single_page_url != $url) {
+				// it's not, so let's try to fetch it...
+				$_prev_ref = $http->referer;
+				$http->referer = $single_page_url;
+				if (($response = $http->get($single_page_url, true)) && $response['status_code'] < 300) {
+					$http->referer = $_prev_ref;
+					return $response;
+				}
+				$http->referer = $_prev_ref;
+			}
+		}
+	}
+	return false;
+}
+
+// based on content-type http header, decide what to do
+// param: HTTP headers string
+// return: array with keys: 'mime', 'type', 'subtype', 'action', 'name'
+// e.g. array('mime'=>'image/jpeg', 'type'=>'image', 'subtype'=>'jpeg', 'action'=>'link', 'name'=>'Image')
+function get_mime_action_info($headers) {
+	global $options;
+	// check if action defined for returned Content-Type
+	$info = array();
+	if (preg_match('!^Content-Type:\s*(([-\w]+)/([-\w\+]+))!im', $headers, $match)) {
+		// look for full mime type (e.g. image/jpeg) or just type (e.g. image)
+		// match[1] = full mime type, e.g. image/jpeg
+		// match[2] = first part, e.g. image
+		// match[3] = last part, e.g. jpeg
+		$info['mime'] = strtolower(trim($match[1]));
+		$info['type'] = strtolower(trim($match[2]));
+		$info['subtype'] = strtolower(trim($match[3]));
+		foreach (array($info['mime'], $info['type']) as $_mime) {
+			if (isset($options->content_type_exc[$_mime])) {
+				$info['action'] = $options->content_type_exc[$_mime]['action'];
+				$info['name'] = $options->content_type_exc[$_mime]['name'];
+				break;
+			}
+		}
+	}
+	return $info;
+}
+
+function remove_url_cruft($url) {
+	// remove google analytics for the time being
+	// regex adapted from http://navitronic.co.uk/2010/12/removing-google-analytics-cruft-from-urls/
+	// https://gist.github.com/758177
+	return preg_replace('/(\?|\&)utm_[a-z]+=[^\&]+/', '', $url);
+}
+
+function make_substitutions($string) {
+	if ($string == '') return $string;
+	global $item, $effective_url;
+	$string = str_replace('{url}', htmlspecialchars($item->get_permalink()), $string);
+	$string = str_replace('{effective-url}', htmlspecialchars($effective_url), $string);
+	return $string;
+}
+
+function get_cache() {
+	global $options, $valid_key;
+	static $cache = null;
+	if ($cache === null) {
+		$frontendOptions = array(
+			'lifetime' => 10*60, // cache lifetime of 10 minutes
+			'automatic_serialization' => false,
+			'write_control' => false,
+			'automatic_cleaning_factor' => $options->cache_cleanup,
+			'ignore_user_abort' => false
+		);
+		$backendOptions = array(
+			'cache_dir' => ($valid_key) ? $options->cache_dir.'/rss-with-key/' : $options->cache_dir.'/rss/', // directory where to put the cache files
+			'file_locking' => false,
+			'read_control' => true,
+			'read_control_type' => 'strlen',
+			'hashed_directory_level' => $options->cache_directory_level,
+			'hashed_directory_perm' => 0777,
+			'cache_file_perm' => 0664,
+			'file_name_prefix' => 'ff'
+		);
+		// getting a Zend_Cache_Core object
+		$cache = Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions);
+	}
+	return $cache;
+}
+
+function debug($msg) {
+	global $debug_mode;
+	if ($debug_mode) {
+		echo '* ',$msg,"\n";
+		ob_flush();
+		flush();
+	}
+}

inc/poche/Database.class.php

@@ -18,7 +18,7 @@ class Database {
       'default' => 'ORDER BY entries.id'
     );
 
-    function __construct() 
+    function __construct()
     {
         switch (STORAGE) {
             case 'sqlite':
@@ -27,11 +27,11 @@ class Database {
                 break;
             case 'mysql':
                 $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB;
-                $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD); 
+                $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD);
                 break;
             case 'postgres':
                 $db_path = 'pgsql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB;
-                $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD); 
+                $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD);
                 break;
         }
 
@@ -51,7 +51,7 @@ class Database {
         }
         $hasAdmin = count($query->fetchAll());
 
-        if ($hasAdmin == 0) 
+        if ($hasAdmin == 0)
             return false;
 
         return true;
@@ -140,7 +140,7 @@ class Database {
         $sql = 'INSERT INTO users_config ( user_id, name, value ) VALUES (?, ?, ?)';
         $params = array($id_user, 'language', LANG);
         $query = $this->executeQuery($sql, $params);
-        
+
         $sql = 'INSERT INTO users_config ( user_id, name, value ) VALUES (?, ?, ?)';
         $params = array($id_user, 'theme', DEFAULT_THEME);
         $query = $this->executeQuery($sql, $params);
@@ -153,7 +153,7 @@ class Database {
         $query = $this->executeQuery($sql, array($id));
         $result = $query->fetchAll();
         $user_config = array();
-        
+
         foreach ($result as $key => $value) {
             $user_config[$value['name']] = $value['value'];
         }
@@ -201,10 +201,10 @@ class Database {
         $params_update = array($password, $userId);
         $query = $this->executeQuery($sql_update, $params_update);
     }
-    
+
     public function updateUserConfig($userId, $key, $value) {
         $config = $this->getConfigUser($userId);
-        
+
         if (! isset($config[$key])) {
             $sql = "INSERT INTO users_config (value, user_id, name) VALUES (?, ?, ?)";
         }
@@ -230,6 +230,36 @@ class Database {
         }
     }
 
+    public function updateContentAndTitle($id, $title, $body, $user_id) {
+        $sql_action = 'UPDATE entries SET content = ?, title = ? WHERE id=? AND user_id=?';
+        $params_action = array($body, $title, $id, $user_id);
+        $query = $this->executeQuery($sql_action, $params_action);
+
+        return $query;
+    }
+
+    public function retrieveUnfetchedEntries($user_id, $limit) {
+
+        $sql_limit = "LIMIT 0,".$limit;
+        if (STORAGE == 'postgres') {
+            $sql_limit = "LIMIT ".$limit." OFFSET 0";
+        }
+
+        $sql        = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND user_id=? ORDER BY id " . $sql_limit;
+        $query      = $this->executeQuery($sql, array($user_id));
+        $entries    = $query->fetchAll();
+
+        return $entries;
+    }
+
+    public function retrieveUnfetchedEntriesCount($user_id) {
+      $sql        = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND user_id=?";
+      $query      = $this->executeQuery($sql, array($user_id));
+      list($count) = $query->fetch();
+
+      return $count;
+    }
+
     public function retrieveAll($user_id) {
         $sql        = "SELECT * FROM entries WHERE user_id=? ORDER BY id";
         $query      = $this->executeQuery($sql, array($user_id));
@@ -294,24 +324,24 @@ class Database {
                 return $entries;
         }
 
-    public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {
+    public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {
-        switch ($view) {
+        switch ($view) {
             case 'archive':
-                    $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
+                    $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
                 $params = array($user_id, 1);
                 break;
             case 'fav' :
-                    $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_fav=? ";
+                    $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_fav=? ";
                 $params = array($user_id, 1);
                 break;
-            case 'tag' :
+            case 'tag' :
-                $sql    = "SELECT count(*) FROM entries
+                $sql    = "SELECT count(*) FROM entries
-                    LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
+                    LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
-                    WHERE entries.user_id=? AND tags_entries.tag_id = ? ";
+                    WHERE entries.user_id=? AND tags_entries.tag_id = ? ";
-                $params = array($user_id, $tag_id);
+                $params = array($user_id, $tag_id);
-                break;
+                break;
             default:
-                $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
+                $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";
                 $params = array($user_id, 0);
                 break;
         }
@@ -319,7 +349,7 @@ class Database {
         $query = $this->executeQuery($sql, $params);
         list($count) = $query->fetch();
 
-        return $count;
+        return $count;
     }
 
     public function updateContent($id, $content, $user_id) {
@@ -329,11 +359,24 @@ class Database {
         return $query;
     }
 
-    public function add($url, $title, $content, $user_id) {
+    /**
-        $sql_action = 'INSERT INTO entries ( url, title, content, user_id ) VALUES (?, ?, ?, ?)';
+     *
-        $params_action = array($url, $title, $content, $user_id);
+     * @param string $url
-        $query = $this->executeQuery($sql_action, $params_action);
+     * @param string $title
-        return $query;
+     * @param string $content
+     * @param integer $user_id
+     * @return integer $id of inserted record
+     */
+    public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) {
+        $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)';
+        $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead);
+        if ( !$this->executeQuery($sql_action, $params_action) ) {
+          $id = null;
+        }
+        else {
+          $id = intval($this->getLastId( (STORAGE == 'postgres') ? 'users_id_seq' : '' ));
+        }
+        return $id;
     }
 
     public function deleteById($id, $user_id) {
@@ -364,13 +407,25 @@ class Database {
     public function getLastId($column = '') {
         return $this->getHandle()->lastInsertId($column);
     }
+	
+    public function search($term, $user_id, $limit = '') {
+        $search = '%'.$term.'%';
+        $sql_action = "SELECT * FROM entries WHERE user_id=? AND (content LIKE ? OR title LIKE ? OR url LIKE ?) "; //searches in content, title and URL
+        $sql_action .= $this->getEntriesOrder().' ' . $limit;
+        $params_action = array($user_id, $search, $search, $search);
+        $query = $this->executeQuery($sql_action, $params_action);
+        return $query->fetchAll();
+  	}
 
-    public function retrieveAllTags($user_id) {
+    public function retrieveAllTags($user_id, $term = null) {
-        $sql = "SELECT DISTINCT tags.* FROM tags
+        $sql = "SELECT DISTINCT tags.*, count(entries.id) AS entriescount FROM tags
           LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
           LEFT JOIN entries ON tags_entries.entry_id=entries.id
-          WHERE entries.user_id=?";
+          WHERE entries.user_id=?
-        $query = $this->executeQuery($sql, array($user_id));
+            ". (($term) ? "AND lower(tags.value) LIKE ?" : '') ."
+          GROUP BY tags.id, tags.value
+          ORDER BY tags.value";
+        $query = $this->executeQuery($sql, (($term)? array($user_id, strtolower('%'.$term.'%')) : array($user_id) ));
         $tags = $query->fetchAll();
 
         return $tags;
@@ -390,7 +445,7 @@ class Database {
     }
 
     public function retrieveEntriesByTag($tag_id, $user_id) {
-        $sql = 
+        $sql =
             "SELECT entries.* FROM entries
             LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
             WHERE tags_entries.tag_id = ? AND entries.user_id=?";
@@ -401,7 +456,7 @@ class Database {
     }
 
     public function retrieveTagsByEntry($entry_id) {
-        $sql = 
+        $sql =
             "SELECT tags.* FROM tags
             LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
             WHERE tags_entries.entry_id = ?";

inc/poche/Tools.class.php

@@ -7,7 +7,7 @@
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
  */
- 
+
 class Tools
 {
     public static function initPhp()
@@ -42,7 +42,7 @@ class Tools
                     && (strtolower($_SERVER['HTTPS']) == 'on'))
             || (isset($_SERVER["SERVER_PORT"])
                     && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection.
-            || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection 
+            || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection
                     && $_SERVER["SERVER_PORT"] == SSL_PORT)
              || (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
                     && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
@@ -148,7 +148,7 @@ class Tools
             );
 
             # only download page lesser than 4MB
-            $data = @file_get_contents($url, false, $context, -1, 4000000); 
+            $data = @file_get_contents($url, false, $context, -1, 4000000);
 
             if (isset($http_response_header) and isset($http_response_header[0])) {
                 $httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== FALSE) or (strpos($http_response_header[0], '301 Moved Permanently') !== FALSE));
@@ -193,14 +193,14 @@ class Tools
 
     public static function logm($message)
     {
-        if (DEBUG_POCHE) {
+        if (DEBUG_POCHE && php_sapi_name() != 'cli') {
             $t = strval(date('Y/m/d_H:i:s')) . ' - ' . $_SERVER["REMOTE_ADDR"] . ' - ' . strval($message) . "\n";
             file_put_contents(CACHE . '/log.txt', $t, FILE_APPEND);
             error_log('DEBUG POCHE : ' . $message);
         }
     }
 
-    public static function encodeString($string) 
+    public static function encodeString($string)
     {
         return sha1($string . SALT);
     }
@@ -241,7 +241,6 @@ class Tools
         }
     }
 
-
     public static function download_db() {
         header('Content-Disposition: attachment; filename="poche.sqlite.gz"');
         self::status(200);
@@ -252,4 +251,74 @@ class Tools
 
         exit;
     }
+
+    public static function getPageContent(Url $url)
+    {
+        // Saving and clearing context
+        $REAL = array();
+        foreach( $GLOBALS as $key => $value ) {
+            if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
+                $GLOBALS[$key] = array();
+                $REAL[$key] = $value;
+            }
+        }
+        // Saving and clearing session
+        if ( isset($_SESSION) ) {
+            $REAL_SESSION = array();
+            foreach( $_SESSION as $key => $value ) {
+                $REAL_SESSION[$key] = $value;
+                unset($_SESSION[$key]);
+            }
+        }
+
+        // Running code in different context
+        $scope = function() {
+            extract( func_get_arg(1) );
+            $_GET = $_REQUEST = array(
+                        "url" => $url->getUrl(),
+                        "max" => 5,
+                        "links" => "preserve",
+                        "exc" => "",
+                        "format" => "json",
+                        "submit" => "Create Feed"
+            );
+            ob_start();
+            require func_get_arg(0);
+            $json = ob_get_contents();
+            ob_end_clean();
+            return $json;
+        };
+        $json = $scope( "inc/3rdparty/makefulltextfeed.php", array("url" => $url) );
+
+        // Clearing and restoring context
+        foreach( $GLOBALS as $key => $value ) {
+            if( $key != "GLOBALS" && $key != "_SESSION" ) {
+                unset($GLOBALS[$key]);
+            }
+        }
+        foreach( $REAL as $key => $value ) {
+            $GLOBALS[$key] = $value;
+        }
+        // Clearing and restoring session
+        if ( isset($REAL_SESSION) ) {
+            foreach( $_SESSION as $key => $value ) {
+                unset($_SESSION[$key]);
+            }
+            foreach( $REAL_SESSION as $key => $value ) {
+                $_SESSION[$key] = $value;
+            }
+        }
+
+        return json_decode($json, true);
+    }
+
+    /**
+     * Returns whether we handle an AJAX (XMLHttpRequest) request.
+     * @return boolean whether we handle an AJAX (XMLHttpRequest) request.
+     */
+    public static function isAjaxRequest()
+    {
+      return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']==='XMLHttpRequest';
+    }
+
 }

inc/poche/config.inc.php.new

@@ -52,12 +52,8 @@ define ('CACHE', ROOT . '/cache');
 
 define ('PAGINATION', '10');
 
-define ('POCKET_FILE', '/ril_export.html');
+//limit for download of articles during import
-define ('READABILITY_FILE', '/readability');
+define ('IMPORT_LIMIT', 5);
-define ('INSTAPAPER_FILE', '/instapaper-export.html');
+//delay between downloads (in sec)
-define ('POCHE_FILE', '/poche-export');
+define ('IMPORT_DELAY', 5);
 
-define ('IMPORT_POCKET_FILE', ROOT . POCKET_FILE);
-define ('IMPORT_READABILITY_FILE', ROOT . READABILITY_FILE);
-define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE);
-define ('IMPORT_POCHE_FILE', ROOT . POCHE_FILE);

inc/poche/global.inc.php

@@ -38,7 +38,7 @@ if (! file_exists(ROOT . '/vendor/autoload.php')) {
     require_once ROOT . '/vendor/autoload.php';
 }
 
-# system configuration; database credentials et cetera
+# system configuration; database credentials et caetera
 if (! file_exists(INCLUDES . '/poche/config.inc.php')) {
     Poche::$configFileAvailable = false;
 } else {

index.php

@@ -8,10 +8,13 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.5.2');
+define ('POCHE', '1.6.0');
 require 'check_setup.php';
 require_once 'inc/poche/global.inc.php';
-session_start(); 
+
+# Start session
+Session::$sessionName = 'poche';
+Session::init();
 
 # Start Poche
 $poche = new Poche();
@@ -30,14 +33,14 @@ $tpl_vars = array(
     'referer' => $referer,
     'view' => $view,
     'poche_url' => Tools::getPocheUrl(),
-    'title' => _('poche, a read it later open source system'),
+    'title' => _('wallabag, a read it later open source system'),
     'token' => Session::getToken(),
     'theme' => $poche->getTheme()
 );
 
 if (! empty($notInstalledMessage)) {
     if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) {
-        # We cannot use Twig to display the error message 
+        # We cannot use Twig to display the error message
         echo '<h1>Errors</h1><ol>';
         foreach ($notInstalledMessage as $message) {
             echo '<li>' . $message . '</li>';
@@ -64,7 +67,8 @@ if (isset($_GET['login'])) {
     # Update password
     $poche->updatePassword();
 } elseif (isset($_GET['import'])) {
-    $import = $poche->import($_GET['from']);
+    $import = $poche->import();
+    $tpl_vars = array_merge($tpl_vars, $import);
 } elseif (isset($_GET['download'])) {
     Tools::download_db();
 } elseif (isset($_GET['empty-cache'])) {
@@ -75,6 +79,8 @@ if (isset($_GET['login'])) {
     $poche->updateTheme();
 } elseif (isset($_GET['updatelanguage'])) {
     $poche->updateLanguage();
+} elseif (isset($_GET['uploadfile'])) {
+    $poche->uploadFile();
 } elseif (isset($_GET['feed'])) {
     if (isset($_GET['action']) && $_GET['action'] == 'generate') {
         $poche->generateToken();
@@ -115,6 +121,7 @@ if (Session::isLogged()) {
 } else {
     $tpl_file = Tools::getTplFile('login');
     $tpl_vars['http_auth'] = 0;
+    Session::logout();
 }
 
 # because messages can be added in $poche->action(), we have to add this entry now (we can add it before)

install/index.php

@@ -1,9 +1,30 @@
 <?php
 $errors = array();
 $successes = array();
-if ($_POST['download']) {
+
+/* Function taken from at http://php.net/manual/en/function.rmdir.php#110489
+ * Idea : nbari at dalmp dot com
+ * Rights unknown
+ * Here in case of .gitignore files
+ */
+function delTree($dir) {
+    $files = array_diff(scandir($dir), array('.','..'));
+    foreach ($files as $file) {
+      (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
+    }
+    return rmdir($dir);
+  }
+
+if (isset($_GET['clean'])) {
+    if (is_dir('install')){
+    delTree('install');
+    header('Location: index.php');      
+    }
+}
+
+if (isset($_POST['download'])) {
     if (!file_put_contents("cache/vendor.zip", fopen("http://static.wallabag.org/files/vendor.zip", 'r'))) {
-        $errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it manually<∕a> and unzip it in your wallabag folder.';
+        $errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it manually</a> and unzip it in your wallabag folder.';
     }
     else {
         if (extension_loaded('zip')) {
@@ -25,7 +46,7 @@ if ($_POST['download']) {
         }
     }
 }
-else if ($_POST['install']) {
+else if (isset($_POST['install'])) {
     if (!is_dir('vendor')) {
         $errors[] = 'You must install twig before.';
     }
@@ -64,6 +85,7 @@ else if ($_POST['install']) {
                 else {
                     $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite';
                     $handle = new PDO($db_path);
+                    $sql_structure = "";
                 }
             }
             else {
@@ -129,7 +151,7 @@ else if ($_POST['install']) {
                 $params = array($id_user, 'language', 'en_EN.UTF8');
                 $query = executeQuery($handle, $sql, $params);
 
-                $successes[] = 'wallabag is now installed. Don\'t forget to delete install folder. Then, <a href="index.php">reload this page</a>.';
+                $successes[] = 'wallabag is now installed. You can now <a href="index.php?clean=0">access it !</a>';
             }
         }
     }
@@ -143,7 +165,7 @@ else if ($_POST['install']) {
         <!--[if IE]>
         <meta http-equiv="X-UA-Compatible" content="IE=10">
         <![endif]-->
-        <title>wallabag — installation</title>
+        <title>wallabag - installation</title>
         <link rel="shortcut icon" type="image/x-icon" href="themes/baggy/img/favicon.ico" />
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="themes/baggy/img/apple-touch-icon-144x144-precomposed.png">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="themes/baggy/img/apple-touch-icon-72x72-precomposed.png">
@@ -154,7 +176,7 @@ else if ($_POST['install']) {
         <link rel="stylesheet" href="themes/baggy/css/main.css" media="all">
         <link rel="stylesheet" href="themes/baggy/css/messages.css" media="all">
         <link rel="stylesheet" href="themes/baggy/css/print.css" media="print">
-        <script src="themes/baggy/js/jquery-2.0.3.min.js"></script>
+        <script src="themes/default/js/jquery-2.0.3.min.js"></script>
         <script src="themes/baggy/js/init.js"></script>
     </head>
     <body>
@@ -198,18 +220,18 @@ else if ($_POST['install']) {
                 <?php if (file_exists('inc/poche/config.inc.php') && is_dir('vendor')) : ?>
                 <div class='messages success install'>
                     <p>
-                        wallabag seems already installed. If you want to update it, you only have to delete install folder.
+                        wallabag seems already installed. If you want to update it, you only have to delete install folder, then <a href="index.php">reload this page</a>.
                     </p>
                 </div>
                 <?php endif; ?>    
             <?php endif; ?>
             <p>To install wallabag, you just have to fill the following fields. That's all.</p>
-            <p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php">here</a>.</p>
+            <p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php?from=install">here</a>.</p>
             <form method="post">
                 <fieldset>
                     <legend><strong>Technical settings</strong></legend>
                     <?php if (!is_dir('vendor')) : ?>
-                        <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it: 
+                        <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:<br />
                         <ul>
                             <li>automatically download and extract vendor.zip into your wallabag folder. 
                             <p><input type="submit" name="download" value="Download vendor.zip" /></p>
@@ -225,7 +247,11 @@ php composer.phar install</code></pre></li>
                     <p>
                         Database engine:
                         <ul>
-                            <li><label for="sqlite">SQLite</label> <input name="db_engine" type="radio" checked="" id="sqlite" value="sqlite" /></li>
+                            <li><label for="sqlite">SQLite</label> <input name="db_engine" type="radio" checked="" id="sqlite" value="sqlite" />
+                            <div id="pdo_sqlite" class='messages error install'>
+                                <p>You have to enable <a href="http://php.net/manual/ref.pdo-sqlite.php">pdo_sqlite extension</a>.</p>
+                            </div>
+                            </li>
                             <li>
                                 <label for="mysql">MySQL</label> <input name="db_engine" type="radio" id="mysql" value="mysql" />
                                 <ul id="mysql_infos">
@@ -241,7 +267,7 @@ php composer.phar install</code></pre></li>
                                     <li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li>
                                     <li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li>
                                     <li><label for="pg_user">User</label> <input type="text" placeholder="user" id="pg_user" name="pg_user" /></li>
-                                  id  <li><label for="pg_password">Password</label> <input type="text" placeholder="p4ssw0rd" id="pg_password" name="pg_password" /></li>
+                                    <li><label for="pg_password">Password</label> <input type="text" placeholder="p4ssw0rd" id="pg_password" name="pg_password" /></li>
                                 </ul>
                             </li>
                         </ul>
@@ -263,26 +289,49 @@ php composer.phar install</code></pre></li>
                     </p>
                 </fieldset>
 
-                <input type="submit" value="Install wallabag" name="install" />
+                <input type="submit" id="install_button" value="Install wallabag" name="install" />
             </form>
         </div>
         <script>
             $("#mysql_infos").hide();
             $("#pg_infos").hide();
+
+            <?php
+            if (!extension_loaded('pdo_sqlite')) : ?>
+            $("#install_button").hide();
+            <?php
+            else :
+            ?>
+            $("#pdo_sqlite").hide();
+            <?php
+            endif;
+            ?>
+
             $("input[name=db_engine]").click(function() 
                 {
                     if ( $("#mysql").prop('checked')) {
                         $("#mysql_infos").show();
                         $("#pg_infos").hide();
+                        $("#pdo_sqlite").hide();
+                        $("#install_button").show();
                     }
                     else {
                         if ( $("#postgresql").prop('checked')) {
                             $("#mysql_infos").hide();
                             $("#pg_infos").show();
+                            $("#pdo_sqlite").hide();
+                            $("#install_button").show();
                         }
                         else {
                             $("#mysql_infos").hide();
                             $("#pg_infos").hide();
+                            <?php
+                            if (!extension_loaded('pdo_sqlite')) : ?>
+                            $("#pdo_sqlite").show();
+                            $("#install_button").hide();
+                            <?php
+                            endif;
+                            ?>
                         }
                     }
                 });

locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po

@@ -4,54 +4,137 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: poche\n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-10-08 13:25+0100\n"
+"POT-Creation-Date: 2014-02-25 15:28+0300\n"
-"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
+"PO-Revision-Date: 2014-02-25 15:29+0300\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/poche/language/"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
-"cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/poche/language/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Language: Czech\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr ""
+
+msgid "login failed: user doesn't exist"
+msgstr ""
+
+msgid "return home"
+msgstr ""
 
 msgid "config"
 msgstr "nastavení"
 
-msgid "Poching a link"
+msgid "Saving articles"
-msgstr "Odkaz se ukládá"
+msgstr ""
+
+msgid "There are several ways to save an article:"
+msgstr ""
 
 msgid "read the documentation"
 msgstr "číst dokumentaci"
 
-msgid "by filling this field"
+msgid "download the extension"
+msgstr ""
+
+msgid "via F-Droid"
+msgstr ""
+
+msgid " or "
+msgstr ""
+
+msgid "via Google Play"
+msgstr ""
+
+msgid "download the application"
+msgstr ""
+
+#, fuzzy
+msgid "By filling this field"
 msgstr "vyplněním tohoto pole"
 
-msgid "poche it!"
+msgid "bag it!"
-msgstr "uložit!"
+msgstr ""
 
-msgid "Updating poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Poche se aktualizuje"
+msgstr ""
 
-msgid "your version"
+msgid "Upgrading wallabag"
-msgstr "vaše verze"
+msgstr ""
 
-msgid "latest stable version"
+#, fuzzy
+msgid "Installed version"
 msgstr "poslední stabilní verze"
 
-msgid "a more recent stable version is available."
+#, fuzzy
+msgid "Latest stable version"
+msgstr "poslední stabilní verze"
+
+#, fuzzy
+msgid "A more recent stable version is available."
 msgstr "je k dispozici novější stabilní verze."
 
-msgid "you are up to date."
+#, fuzzy
+msgid "You are up to date."
 msgstr "je aktuální"
 
-msgid "latest dev version"
+#, fuzzy
+msgid "Latest dev version"
 msgstr "poslední vývojová verze"
 
-msgid "a more recent development version is available."
+#, fuzzy
+msgid "A more recent development version is available."
 msgstr "je k dispozici novější vývojová verze."
 
+msgid "Feeds"
+msgstr ""
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+
+msgid "Unread feed"
+msgstr ""
+
+#, fuzzy
+msgid "Favorites feed"
+msgstr "oblíbené"
+
+#, fuzzy
+msgid "Archive feed"
+msgstr "archív"
+
+msgid "Your token:"
+msgstr ""
+
+msgid "Your user id:"
+msgstr ""
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr ""
+
+#, fuzzy
+msgid "Change your theme"
+msgstr "Změnit heslo"
+
+msgid "Theme:"
+msgstr ""
+
+msgid "Update"
+msgstr "Aktualizovat"
+
+#, fuzzy
+msgid "Change your language"
+msgstr "Změnit heslo"
+
+msgid "Language:"
+msgstr ""
+
 msgid "Change your password"
 msgstr "Změnit heslo"
 
@@ -64,65 +147,68 @@ msgstr "Heslo"
 msgid "Repeat your new password:"
 msgstr "Znovu nové heslo:"
 
-msgid "Update"
-msgstr "Aktualizovat"
-
 msgid "Import"
 msgstr "Importovat"
 
-msgid "Please execute the import script locally, it can take a very long time."
+#, fuzzy
+msgid "Please execute the import script locally as it can take a very long time."
 msgstr "Spusťte importní skript lokálně, může to dlouho trvat."
 
-msgid "More info in the official doc:"
+#, fuzzy
+msgid "More info in the official documentation:"
 msgstr "Více informací v oficiální dokumentaci:"
 
-msgid "import from Pocket"
+#, fuzzy
+msgid "Import from Pocket"
 msgstr "importovat z Pocket"
 
-msgid "import from Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr ""
+
+#, fuzzy
+msgid "Import from Readability"
 msgstr "importovat z Readability"
 
-msgid "import from Instapaper"
+#, fuzzy
+msgid "Import from Instapaper"
 msgstr "importovat z Instapaper"
 
-msgid "Export your poche data"
+#, fuzzy
+msgid "Import from wallabag"
+msgstr "importovat z Readability"
+
+#, fuzzy
+msgid "Export your wallabag data"
 msgstr "Export dat"
 
 msgid "Click here"
 msgstr "Klikněte zde"
 
-msgid "to export your poche data."
+msgid "to download your database."
+msgstr ""
+
+#, fuzzy
+msgid "to export your wallabag data."
 msgstr "pro export vašich dat."
 
-msgid "back to home"
+msgid "Cache"
-msgstr "zpět na úvod"
-
-msgid "installation"
-msgstr "instalace"
-
-msgid "install your poche"
-msgstr "instalovat"
-
-msgid ""
-"poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
 msgstr ""
-"poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. "
-"Nezapomeňte <a href='http://doc.inthepoche.com'>si přečíst dokumentaci</a> "
-"na stránkách programu."
 
-msgid "Login"
+msgid "to delete cache."
-msgstr "Jméno"
+msgstr ""
 
-msgid "Repeat your password"
+msgid "You can enter multiple tags, separated by commas."
-msgstr "Zopakujte heslo"
+msgstr ""
 
-msgid "Install"
+msgid "return to article"
-msgstr "Instalovat"
+msgstr ""
 
-msgid "back to top"
+msgid "plop"
-msgstr "zpět na začátek"
+msgstr ""
+
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr ""
 
 msgid "favoris"
 msgstr "oblíbené"
@@ -151,10 +237,14 @@ msgstr "podle nadpisu"
 msgid "by title desc"
 msgstr "podle nadpisu sestupně"
 
-msgid "No link available here!"
+msgid "Tag"
-msgstr "Není k dispozici žádný odkaz!"
+msgstr ""
 
-msgid "toggle mark as read"
+msgid "No articles found."
+msgstr ""
+
+#, fuzzy
+msgid "Toggle mark as read"
 msgstr "označit jako přečtené"
 
 msgid "toggle favorite"
@@ -166,13 +256,95 @@ msgstr "smazat"
 msgid "original"
 msgstr "originál"
 
+msgid "estimated reading time:"
+msgstr ""
+
+msgid "mark all the entries as read"
+msgstr ""
+
 msgid "results"
 msgstr "výsledky"
 
-msgid "tweet"
+msgid "installation"
+msgstr "instalace"
+
+#, fuzzy
+msgid "install your wallabag"
+msgstr "instalovat"
+
+#, fuzzy
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. Nezapomeňte <a href='http://doc.inthepoche.com'>si přečíst dokumentaci</a> na stránkách programu."
+
+msgid "Login"
+msgstr "Jméno"
+
+msgid "Repeat your password"
+msgstr "Zopakujte heslo"
+
+msgid "Install"
+msgstr "Instalovat"
+
+#, fuzzy
+msgid "login to your wallabag"
+msgstr "přihlásit se k poche"
+
+msgid "Login to wallabag"
+msgstr ""
+
+msgid "you are in demo mode, some features may be disabled."
+msgstr "používáte ukázkový mód, některé funkce jsou zakázány."
+
+msgid "Username"
+msgstr ""
+
+msgid "Stay signed in"
+msgstr "Zůstat přihlášen(a)"
+
+msgid "(Do not check on public computers)"
+msgstr "(Nezaškrtávejte na veřejně dostupných počítačích)"
+
+msgid "Sign in"
+msgstr "Přihlásit se"
+
+msgid "favorites"
+msgstr "oblíbené"
+
+msgid "estimated reading time :"
+msgstr ""
+
+msgid "Mark all the entries as read"
+msgstr ""
+
+msgid "Return home"
+msgstr ""
+
+#, fuzzy
+msgid "Back to top"
+msgstr "zpět na začátek"
+
+#, fuzzy
+msgid "Mark as read"
+msgstr "označit jako přečtené"
+
+#, fuzzy
+msgid "Favorite"
+msgstr "oblíbené"
+
+#, fuzzy
+msgid "Toggle favorite"
+msgstr "označit jako oblíbené"
+
+#, fuzzy
+msgid "Delete"
+msgstr "smazat"
+
+#, fuzzy
+msgid "Tweet"
 msgstr "tweetnout"
 
-msgid "email"
+#, fuzzy
+msgid "Email"
 msgstr "email"
 
 msgid "shaarli"
@@ -181,26 +353,24 @@ msgstr "shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
+#, fuzzy
+msgid "Does this article appear wrong?"
 msgstr "vypadá tento článek špatně?"
 
-msgid "create an issue"
+msgid "tags:"
-msgstr "odeslat požadavek"
+msgstr ""
 
-msgid "or"
+msgid "Edit tags"
-msgstr "nebo"
+msgstr ""
 
-msgid "contact us by mail"
+msgid "save link!"
-msgstr "kontaktovat e-mailem"
-
-msgid "plop"
 msgstr ""
 
 msgid "home"
 msgstr "domů"
 
-msgid "favorites"
+msgid "tags"
-msgstr "oblíbené"
+msgstr ""
 
 msgid "logout"
 msgstr "odhlásit se"
@@ -211,23 +381,187 @@ msgstr "běží na"
 msgid "debug mode is on so cache is off."
 msgstr "je zapnut ladicí mód, proto je keš vypnuta."
 
-msgid "your poche version:"
+#, fuzzy
-msgstr "verze:"
+msgid "your wallabag version:"
+msgstr "vaše verze"
 
 msgid "storage:"
 msgstr "úložiště:"
 
-msgid "login to your poche"
+msgid "save a link"
-msgstr "přihlásit se k poche"
+msgstr ""
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "back to home"
-msgstr "používáte ukázkový mód, některé funkce jsou zakázány."
+msgstr "zpět na úvod"
 
-msgid "Stay signed in"
+msgid "toggle mark as read"
-msgstr "Zůstat přihlášen(a)"
+msgstr "označit jako přečtené"
 
-msgid "(Do not check on public computers)"
+msgid "tweet"
-msgstr "(Nezaškrtávejte na veřejně dostupných počítačích)"
+msgstr "tweetnout"
 
-msgid "Sign in"
+msgid "email"
-msgstr "Přihlásit se"
+msgstr "email"
+
+msgid "this article appears wrong?"
+msgstr "vypadá tento článek špatně?"
+
+msgid "No link available here!"
+msgstr "Není k dispozici žádný odkaz!"
+
+msgid "Poching a link"
+msgstr "Odkaz se ukládá"
+
+msgid "by filling this field"
+msgstr "vyplněním tohoto pole"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
+
+msgid "your version"
+msgstr "vaše verze"
+
+msgid "latest stable version"
+msgstr "poslední stabilní verze"
+
+msgid "a more recent stable version is available."
+msgstr "je k dispozici novější stabilní verze."
+
+msgid "you are up to date."
+msgstr "je aktuální"
+
+msgid "latest dev version"
+msgstr "poslední vývojová verze"
+
+msgid "a more recent development version is available."
+msgstr "je k dispozici novější vývojová verze."
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "Spusťte importní skript lokálně, může to dlouho trvat."
+
+#, fuzzy
+msgid "More infos in the official doc:"
+msgstr "Více informací v oficiální dokumentaci:"
+
+msgid "import from Pocket"
+msgstr "importovat z Pocket"
+
+msgid "import from Readability"
+msgstr "importovat z Readability"
+
+msgid "import from Instapaper"
+msgstr "importovat z Instapaper"
+
+msgid "Tags"
+msgstr ""
+
+#, fuzzy
+msgid "Untitled"
+msgstr "podle nadpisu"
+
+msgid "the link has been added successfully"
+msgstr ""
+
+msgid "error during insertion : the link wasn't added"
+msgstr ""
+
+msgid "the link has been deleted successfully"
+msgstr ""
+
+msgid "the link wasn't deleted"
+msgstr ""
+
+msgid "Article not found!"
+msgstr ""
+
+msgid "previous"
+msgstr ""
+
+msgid "next"
+msgstr ""
+
+msgid "in demo mode, you can't update your password"
+msgstr ""
+
+msgid "your password has been updated"
+msgstr ""
+
+msgid "the two fields have to be filled & the password must be the same in the two fields"
+msgstr ""
+
+msgid "still using the \""
+msgstr ""
+
+msgid "that theme does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your theme preferences"
+msgstr ""
+
+msgid "that language does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your language preferences"
+msgstr ""
+
+msgid "login failed: you have to fill all fields"
+msgstr ""
+
+msgid "welcome to your wallabag"
+msgstr ""
+
+msgid "login failed: bad login or password"
+msgstr ""
+
+#, fuzzy
+msgid "import from instapaper completed"
+msgstr "importovat z Instapaper"
+
+#, fuzzy
+msgid "import from pocket completed"
+msgstr "importovat z Pocket"
+
+#, fuzzy
+msgid "import from Readability completed. "
+msgstr "importovat z Readability"
+
+#, fuzzy
+msgid "import from Poche completed. "
+msgstr "importovat z Pocket"
+
+msgid "Unknown import provider."
+msgstr ""
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr ""
+
+msgid "Could not find required \""
+msgstr ""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr ""
+
+#, fuzzy
+msgid "Cache deleted."
+msgstr "smazat"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr ""
+
+#~ msgid "poche it!"
+#~ msgstr "uložit!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Poche se aktualizuje"
+
+#~ msgid "create an issue"
+#~ msgstr "odeslat požadavek"
+
+#~ msgid "or"
+#~ msgstr "nebo"
+
+#~ msgid "contact us by mail"
+#~ msgstr "kontaktovat e-mailem"
+
+#~ msgid "your poche version:"
+#~ msgstr "verze:"

locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po

@@ -1,51 +1,130 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: Wallabag\n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-27 13:41+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Square252\n"
+"Last-Translator: Kevin Meyer <wallabag@kevin-meyer.de>\n"
 "Language-Team: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /Users/kevinmeyer/Dropbox/dev_web/wallabag-dev\n"
 
 msgid "config"
 msgstr "Konfiguration"
 
-msgid "Poching a link"
+msgid "Saving articles"
-msgstr "Poche einen Link"
+msgstr "Artikel speichern"
+
+msgid "There are several ways to save an article:"
+msgstr "Es gibt viele Methoden um Artikel zu speichern:"
 
 msgid "read the documentation"
 msgstr "Die Dokumentation lesen"
 
-msgid "by filling this field"
+msgid "download the extension"
-msgstr "durch das ausfüllen dieses Feldes:"
+msgstr "installiere die Erweiterung"
 
-msgid "poche it!"
+msgid "via F-Droid"
-msgstr "Poche es!"
+msgstr "via F-Droid"
 
-msgid "Updating poche"
+msgid " or "
-msgstr "Poche aktualisieren"
+msgstr " oder "
 
-msgid "your version"
+msgid "via Google Play"
-msgstr "Deine Version"
+msgstr "via Google Play"
 
-msgid "latest stable version"
+msgid "download the application"
+msgstr "lade die App"
+
+msgid "By filling this field"
+msgstr "Durch Ausfüllen dieses Feldes"
+
+msgid "bag it!"
+msgstr "bag it!"
+
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Bookmarklet: Ziehe diesen Link in deine Lesezeichen-Leiste"
+
+msgid "Upgrading wallabag"
+msgstr "wallabag aktualisieren"
+
+msgid "Installed version"
+msgstr "Installierte Version"
+
+msgid "Latest stable version"
 msgstr "Neuste stabile Version"
 
-msgid "a more recent stable version is available."
+msgid "A more recent stable version is available."
 msgstr "Eine neuere stabile Version ist verfügbar."
 
-msgid "you are up to date."
+msgid "You are up to date."
 msgstr "Du bist auf den neuesten Stand."
 
-msgid "latest dev version"
+msgid "Last check:"
+msgstr "Zuletzt geprüft:"
+
+msgid "Latest dev version"
 msgstr "Neuste Entwicklungsversion"
 
-msgid "a more recent development version is available."
+msgid "A more recent development version is available."
 msgstr "Eine neuere Entwicklungsversion ist verfügbar."
 
+msgid "You can clear cache to check the latest release."
+msgstr "Leere den Cache um die neueste Version zu prüfen."
+
+msgid "Feeds"
+msgstr "Feeds"
+
+msgid ""
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+"Dein Feed Token ist noch nicht vorhanden und muss zunächst generiert werden, "
+"um deine Feeds zu aktivieren. Klicke <a href='?feed&amp;"
+"action=generate'>hier um ihn zu generieren</a>."
+
+msgid "Unread feed"
+msgstr "Ungelesen Feed"
+
+msgid "Favorites feed"
+msgstr "Favoriten Feed"
+
+msgid "Archive feed"
+msgstr "Archiv Feed"
+
+msgid "Your token:"
+msgstr "Dein Token:"
+
+msgid "Your user id:"
+msgstr "Deine User ID:"
+
+msgid ""
+"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
+"</a>."
+msgstr ""
+"Hier kannst du dein Token erzeugen: <a href='?feed&amp;"
+"action=generate'>Generieren!</a>."
+
+msgid "Change your theme"
+msgstr "Theme ändern"
+
+msgid "Theme:"
+msgstr "Theme:"
+
+msgid "Update"
+msgstr "Aktualisieren"
+
+msgid "Change your language"
+msgstr "Sprache ändern"
+
+msgid "Language:"
+msgstr "Sprache:"
+
 msgid "Change your password"
 msgstr "Passwort ändern"
 
@@ -58,75 +137,86 @@ msgstr "Passwort"
 msgid "Repeat your new password:"
 msgstr "Neues Passwort wiederholen:"
 
-msgid "Update"
-msgstr "Aktualisieren"
-
 msgid "Import"
 msgstr "Import"
 
-msgid "Please execute the import script locally, it can take a very long time."
+msgid ""
-msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
+"Importing from other services can be quite long, and webservers default "
+"configuration often prevents long scripts execution time, so it must be done "
+"in multiple parts."
+msgstr ""
+"Der Import von anderen Diensten kann sehr lange dauern. Deswegen bricht der "
+"Webserver diesen in vielen Konfigurationen ab. Daher muss der Import in "
+"mehrere Teile aufgeteilt werden."
 
-msgid "More info in the official doc:"
+msgid "First, select the export file on your computer and upload it."
-msgstr "Mehr Informationen in der offiziellen Dokumentation:"
+msgstr "Wähle eine Datei von deinem Computer aus und lade sie hoch."
 
-msgid "import from Pocket"
+msgid "File:"
+msgstr "Datei:"
+
+msgid "Upload"
+msgstr "Hochladen"
+
+msgid "Then, click on the right link below."
+msgstr "Klicke dann unten auf den entsprechenden Link."
+
+msgid "Import from Pocket"
 msgstr "Import aus Pocket"
 
-msgid "import from Readability"
+#, php-format
+msgid "(after uploaded %s file)"
+msgstr "(nach Upload der Datei %s)"
+
+msgid "Import from Readability"
 msgstr "Import aus Readability"
 
-msgid "import from Instapaper"
+msgid "Import from Instapaper"
 msgstr "Import aus Instapaper"
 
-msgid "Export your poche data"
+msgid "Import from wallabag"
-msgstr "Exportieren Sie Ihre Poche Daten."
+msgstr "Import aus Readability"
+
+msgid ""
+"3. Your feed token is currently empty and must first be generated to fetch "
+"content. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+"3. Dein Feed Token ist noch nicht vorhanden und muss zunächst generiert "
+"werden, um Inhalt abrufen zu können. Klicke <a href='?feed&amp;"
+"action=generate'>hier um ihn zu generieren</a>."
+
+msgid "Finally, you have to fetch content for imported items."
+msgstr "Jetzt musst du den Inhalt der importierten Artikel abrufen."
 
 msgid "Click here"
 msgstr "Klicke hier"
 
-msgid "to export your poche data."
+msgid "to fetch content for 10 articles"
-msgstr "um deine Daten aus Poche zu exportieren."
+msgstr "um den Inhalt von 10 Artikeln abzurufen"
-
-msgid "back to home"
-msgstr "züruck zur Hauptseite"
-
-msgid "installation"
-msgstr "Installieren"
-
-msgid "install your poche"
-msgstr "Installiere dein Poche"
 
 msgid ""
-"poche is still not installed. Please fill the below form to install it. "
+"If you have console access to your server, you can also create a cron task:"
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
 msgstr ""
-"Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die "
+"Wenn du Konsolenzugang zu deinem Server hast kannst du auch einen cron "
-"Installation durchzuführen. Zögere nicht, <a href='http://inthepoche.com/"
+"erstellen:"
-"doc'>die Dokumentation auf der Website von Poche zu lesen falls du Probleme "
-"haben solltest."
 
-msgid "Login"
+msgid "Export your wallabag data"
-msgstr "Benutzername"
+msgstr "Exportieren deine wallabag Daten"
 
-msgid "Repeat your password"
+msgid "to download your database."
-msgstr "Wiederhole dein Passwort"
+msgstr "um deine Datenbank herunterzuladen"
 
-msgid "Install"
+msgid "to export your wallabag data."
-msgstr "Installieren"
+msgstr "um deine Daten aus wallabag zu exportieren."
 
-msgid "back to top"
+msgid "Cache"
-msgstr "Nach Oben"
+msgstr "Cache"
 
-msgid "favoris"
+msgid "to delete cache."
-msgstr ""
+msgstr "um den Cache zu löschen."
 
-msgid "archive"
+msgid "Tags"
-msgstr "Archiv"
+msgstr "Tags"
-
-msgid "unread"
-msgstr "ungelesen"
 
 msgid "by date asc"
 msgstr "nach Datum aufsteigend"
@@ -146,10 +236,72 @@ msgstr "nach Titel"
 msgid "by title desc"
 msgstr "nach Titel absteigend"
 
-msgid "No link available here!"
+#, fuzzy
-msgstr "Kein Link verfügbar!"
+msgid "toggle view mode"
+msgstr "Favorit"
 
-msgid "toggle mark as read"
+msgid "home"
+msgstr "Start"
+
+msgid "favorites"
+msgstr "Favoriten"
+
+msgid "archive"
+msgstr "Archiv"
+
+msgid "tags"
+msgstr "Tags"
+
+msgid "save a link"
+msgstr "Speichere einen Link"
+
+msgid "search"
+msgstr "Suche"
+
+msgid "logout"
+msgstr "Logout"
+
+msgid "return home"
+msgstr "Zurück zum Start"
+
+#, fuzzy
+msgid "Search"
+msgstr "Archiv"
+
+msgid "powered by"
+msgstr "bereitgestellt von"
+
+msgid "debug mode is on so cache is off."
+msgstr "Debug Modus ist aktiviert, das Caching ist somit deaktiviert"
+
+msgid "your wallabag version:"
+msgstr "Deine wallabag Version"
+
+msgid "storage:"
+msgstr "Speicher:"
+
+msgid "Save a link"
+msgstr "Speichere einen Link"
+
+msgid "save link!"
+msgstr "Link speichern!"
+
+msgid "unread"
+msgstr "ungelesen"
+
+msgid "Tag"
+msgstr "Tag"
+
+msgid "No articles found."
+msgstr "Keine Artikel gefunden."
+
+msgid "estimated reading time:"
+msgstr "geschätzte Lesezeit:"
+
+msgid "estimated reading time :"
+msgstr "geschätzte Lesezeit:"
+
+msgid "Toggle mark as read"
 msgstr "Als gelesen markieren"
 
 msgid "toggle favorite"
@@ -161,69 +313,346 @@ msgstr "Löschen"
 msgid "original"
 msgstr "Original"
 
+msgid "Mark all the entries as read"
+msgstr "Markiere alle als gelesen"
+
 msgid "results"
 msgstr "Ergebnisse"
 
-msgid "tweet"
+msgid "Uh, there is a problem with the cron."
-msgstr "Twittern"
+msgstr "Oh, es gab ein Problem mit dem cron."
 
-msgid "email"
+msgid "Untitled"
-msgstr "senden per E-Mail"
+msgstr "Ohne Titel"
 
-msgid "shaarli"
+msgid "the link has been added successfully"
-msgstr "Shaarli"
+msgstr "Speichern des Links erfolgreich"
 
-msgid "flattr"
+msgid "error during insertion : the link wasn't added"
-msgstr "flattr"
+msgstr "Fehler beim Einfügen: Der Link wurde nicht hinzugefügt"
 
-msgid "this article appears wrong?"
+msgid "the link has been deleted successfully"
-msgstr "dieser Artikel erscheint falsch?"
+msgstr "Löschen des Links erfolgreich"
 
-msgid "create an issue"
+msgid "the link wasn't deleted"
-msgstr "ein Ticket erstellen"
+msgstr "Der Link wurde nicht entfernt"
 
-msgid "or"
+msgid "Article not found!"
-msgstr "oder"
+msgstr "Artikel nicht gefunden!"
 
-msgid "contact us by mail"
+msgid "previous"
-msgstr "kontaktieren Sie uns per E-Mail"
+msgstr "vorherige"
 
-msgid "plop"
+msgid "next"
-msgstr "plop"
+msgstr "nächste"
 
-msgid "home"
+msgid "in demo mode, you can't update your password"
-msgstr "Start"
+msgstr "im Demo-Modus kann das Passwort nicht geändert werden"
 
-msgid "favorites"
+msgid "your password has been updated"
-msgstr "Favoriten"
+msgstr "Dein Passwort wurde geändert"
 
-msgid "logout"
+msgid ""
-msgstr "Logout"
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
+msgstr "Beide Felder müssen mit selbem Inhalt ausgefüllt sein"
 
-msgid "powered by"
+msgid "still using the \""
-msgstr "bereitgestellt von"
+msgstr "nutze immernoch die \""
 
-msgid "debug mode is on so cache is off."
+msgid "that theme does not seem to be installed"
-msgstr "Debug Modus ist aktiviert, das Caching ist somit deaktiviert"
+msgstr "dieses Theme scheint nicht installiert zu sein"
 
-msgid "your poche version:"
+msgid "you have changed your theme preferences"
-msgstr "Deine Poche Version"
+msgstr "Du hast deine Theme Einstellungen geändert"
 
-msgid "storage:"
+msgid "that language does not seem to be installed"
-msgstr "Speicher:"
+msgstr "Diese Sprache scheint nicht installiert zu sein"
 
-msgid "login to your poche"
+msgid "you have changed your language preferences"
-msgstr "Bei Poche anmelden"
+msgstr "Du hast deine Spracheinstellungen geändert"
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "login failed: you have to fill all fields"
+msgstr "Anmeldung fehlgeschlagen: Alle Felder müssen ausgefüllt werden"
+
+msgid "welcome to your wallabag"
+msgstr "Willkommen bei deiner wallabag"
+
+msgid "login failed: bad login or password"
+msgstr "Anmeldung fehlgeschlagen: Falscher Benutzername oder Passwort"
+
+msgid ""
+"import from instapaper completed. You have to execute the cron to fetch "
+"content."
 msgstr ""
-"Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein."
+"Import aus Instapaper vollständig. Führe den cronjob aus um den Inhalt "
+"abzurufen."
 
-msgid "Stay signed in"
+msgid ""
-msgstr "Angemeldet bleiben"
+"import from pocket completed. You have to execute the cron to fetch content."
+msgstr ""
+"Import aus Pocket vollständig. Führe den cronjob aus um den Inhalt abzurufen."
 
-msgid "(Do not check on public computers)"
+msgid ""
-msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+"import from Readability completed. You have to execute the cron to fetch "
+"content."
+msgstr ""
+"Import aus Readability vollständig. Führe den cronjob aus um den Inhalt "
+"abzurufen."
 
-msgid "Sign in"
+msgid ""
-msgstr "Einloggen"
+"import from Poche completed. You have to execute the cron to fetch content."
+msgstr ""
+"Import aus Poche vollständig. Führe den cronjob aus um den Inhalt abzurufen."
+
+msgid "Unknown import provider."
+msgstr "Unbekannter Import Anbieter."
+
+msgid "Could not find required \""
+msgstr "Nicht gefunden: \""
+
+msgid "File uploaded. You can now execute import."
+msgstr "Datei hochgeladen. Du kannst nun importieren."
+
+msgid "Error while importing file. Do you have access to upload it?"
+msgstr "Fehler beim Importieren. Hast du das Recht zum Hochladen?"
+
+msgid "User with this id ("
+msgstr "Nutzer mit dieser id ("
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr "Oh, es gab ein Problem beim Erstellen des Feeds."
+
+msgid "Cache deleted."
+msgstr "Cache gelöscht"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr "Oops, es scheint als würde PHP 5 fehlen."
+
+msgid "wallabag, a read it later open source system"
+msgstr "wallabag, ein Später-Lesen Open Source System"
+
+msgid "login failed: user doesn't exist"
+msgstr "Anmeldung fehlgeschlagen: Benutzer existiert nicht"
+
+#~ msgid "You can enter multiple tags, separated by commas."
+#~ msgstr "Du kannst mehrere Tags, durch Kommata getrennt, eingeben."
+
+#~ msgid "return to article"
+#~ msgstr "zurück zum Artikel"
+
+#, fuzzy
+#~ msgid "favoris"
+#~ msgstr "Favoriten"
+
+#~ msgid "mark all the entries as read"
+#~ msgstr "Markiere alle als gelesen"
+
+#~ msgid "Back to top"
+#~ msgstr "Nach Oben"
+
+#~ msgid "Mark as read"
+#~ msgstr "Als gelesen markieren"
+
+#~ msgid "Favorite"
+#~ msgstr "Favoriten"
+
+#~ msgid "Toggle favorite"
+#~ msgstr "Favorit"
+
+#~ msgid "Delete"
+#~ msgstr "Löschen"
+
+#~ msgid "Tweet"
+#~ msgstr "Twittern"
+
+#~ msgid "Email"
+#~ msgstr "per E-Mail senden"
+
+#~ msgid "shaarli"
+#~ msgstr "Shaarli"
+
+#~ msgid "flattr"
+#~ msgstr "flattr"
+
+#~ msgid "Does this article appear wrong?"
+#~ msgstr "Erscheint dieser Artikel falsch?"
+
+#~ msgid "Edit tags"
+#~ msgstr "Tags bearbeiten"
+
+#~ msgid "Start typing for auto complete."
+#~ msgstr "Beginne zu tippen für die Autovervollständigung."
+
+#~ msgid "Return home"
+#~ msgstr "Zurück zum Start"
+
+#~ msgid "tags:"
+#~ msgstr "Tags:"
+
+#~ msgid "login to your wallabag"
+#~ msgstr "Bei wallabag anmelden"
+
+#~ msgid "you are in demo mode, some features may be disabled."
+#~ msgstr ""
+#~ "Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert "
+#~ "sein."
+
+#~ msgid "Login"
+#~ msgstr "Benutzername"
+
+#~ msgid "Stay signed in"
+#~ msgstr "Angemeldet bleiben"
+
+#~ msgid "(Do not check on public computers)"
+#~ msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+
+#~ msgid "plop"
+#~ msgstr "plop"
+
+#~ msgid "Login to wallabag"
+#~ msgstr "Bei wallabag anmelden"
+
+#~ msgid "Username"
+#~ msgstr "Benutzername"
+
+#~ msgid "Sign in"
+#~ msgstr "Einloggen"
+
+#~ msgid "Enter your search here"
+#~ msgstr "Gib hier deine Suchanfrage ein"
+
+#~ msgid "installation"
+#~ msgstr "Installieren"
+
+#~ msgid "install your wallabag"
+#~ msgstr "Installiere deine wallabag"
+
+#~ msgid ""
+#~ "wallabag is still not installed. Please fill the below form to install "
+#~ "it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the "
+#~ "documentation on wallabag website</a>."
+#~ msgstr ""
+#~ "wallabag ist noch nicht installiert. Bitte fülle die Felder unten aus, um "
+#~ "die Installation durchzuführen. Zögere nicht, <a href='http://doc."
+#~ "wallabag.org/'>die Dokumentation auf der Website von wallabag zu lesen, "
+#~ "falls du Probleme haben solltest."
+
+#~ msgid "Repeat your password"
+#~ msgstr "Wiederhole dein Passwort"
+
+#~ msgid "Install"
+#~ msgstr "Installieren"
+
+#~ msgid "No link available here!"
+#~ msgstr "Kein Link verfügbar!"
+
+#~ msgid "toggle mark as read"
+#~ msgstr "Als gelesen markieren"
+
+#~ msgid ""
+#~ "You can <a href='wallabag_compatibility_test.php'>check your "
+#~ "configuration here</a>."
+#~ msgstr ""
+#~ "Du kannst deine Konfiguration <a href='wallabag_compatibility_test."
+#~ "php'>hier testen</a>."
+
+#~ msgid "back to home"
+#~ msgstr "züruck zur Hauptseite"
+
+#~ msgid "tweet"
+#~ msgstr "Twittern"
+
+#~ msgid "email"
+#~ msgstr "senden per E-Mail"
+
+#~ msgid "this article appears wrong?"
+#~ msgstr "dieser Artikel erscheint falsch?"
+
+#~ msgid "Poching a link"
+#~ msgstr "Poche einen Link"
+
+#~ msgid "by filling this field"
+#~ msgstr "durch das ausfüllen dieses Feldes:"
+
+#~ msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+#~ msgstr "Bookmarklet: Ziehe diesen Link in deine Lesezeichen-Leiste"
+
+#~ msgid "your version"
+#~ msgstr "Deine Version"
+
+#~ msgid "latest stable version"
+#~ msgstr "Neuste stabile Version"
+
+#~ msgid "a more recent stable version is available."
+#~ msgstr "Eine neuere stabile Version ist verfügbar."
+
+#~ msgid "you are up to date."
+#~ msgstr "Du bist auf den neuesten Stand."
+
+#~ msgid "latest dev version"
+#~ msgstr "Neuste Entwicklungsversion"
+
+#~ msgid "a more recent development version is available."
+#~ msgstr "Eine neuere Entwicklungsversion ist verfügbar."
+
+#~ msgid ""
+#~ "Please execute the import script locally, it can take a very long time."
+#~ msgstr ""
+#~ "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
+
+#~ msgid "More infos in the official doc:"
+#~ msgstr "Mehr Informationen in der offiziellen Dokumentation:"
+
+#~ msgid "import from Pocket"
+#~ msgstr "Import aus Pocket"
+
+#~ msgid "(you must have a %s file on your server)"
+#~ msgstr "(du brauchst eine %s Datei auf deinem Server)"
+
+#~ msgid "import from Readability"
+#~ msgstr "Import aus Readability"
+
+#~ msgid "import from Instapaper"
+#~ msgstr "Import aus Instapaper"
+
+#~ msgid "You can also create a cron task:"
+#~ msgstr "Du kannst auch einen cronjob anlegen:"
+
+#~ msgid ""
+#~ "Please execute the import script locally as it can take a very long time."
+#~ msgstr ""
+#~ "Bitte führe das Import Script lokal aus, da dies eine Weile dauern kann."
+
+#~ msgid "More info in the official documentation:"
+#~ msgstr "Mehr Informationen in der offiziellen Dokumentation:"
+
+#~ msgid "import from instapaper completed"
+#~ msgstr "Import aus Instapaper erfolgreich"
+
+#~ msgid "import from pocket completed"
+#~ msgstr "Import aus Pocket erfolgreich"
+
+#~ msgid "import from Poche completed. "
+#~ msgstr "Import aus Poche erfolgreich"
+
+#~ msgid "Incomplete inc/poche/define.inc.php file, please define \""
+#~ msgstr "Unvollständige inc/poche/define.inc.php Datei, bitte setze \""
+
+#~ msgid "poche it!"
+#~ msgstr "Poche es!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Poche aktualisieren"
+
+#~ msgid "create an issue"
+#~ msgstr "ein Ticket erstellen"
+
+#~ msgid "or"
+#~ msgstr "oder"
+
+#~ msgid "contact us by mail"
+#~ msgstr "kontaktieren Sie uns per E-Mail"
+
+#~ msgid "your poche version:"
+#~ msgstr "Deine Poche Version"

locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po

@@ -1,50 +1,124 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 15:17+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
+"Language: \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-Language: English\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\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 "Poching a link"
+msgid "Saving articles"
-msgstr "Poching a link"
+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 "by filling this field"
+msgid "download the extension"
-msgstr "by filling this field"
+msgstr "download the extension"
 
-msgid "poche it!"
+msgid "via F-Droid"
-msgstr "poche it!"
+msgstr "via F-Droid"
 
-msgid "Updating poche"
+msgid " or "
-msgstr "Updating poche"
+msgstr " or "
 
-msgid "your version"
+msgid "via Google Play"
-msgstr "your version"
+msgstr "via Google Play"
 
-msgid "latest stable version"
+msgid "download the application"
-msgstr "latest stable version"
+msgstr "download the application"
 
-msgid "a more recent stable version is available."
+msgid "By filling this field"
-msgstr "a more recent stable version is available."
+msgstr "By filling this field"
 
-msgid "you are up to date."
+msgid "bag it!"
-msgstr "you are up to date."
+msgstr "bag it!"
 
-msgid "latest dev version"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "latest dev version"
+msgstr "Bookmarklet: drag & drop this link to your bookmarks bar"
 
-msgid "a more recent development version is available."
+msgid "Upgrading wallabag"
-msgstr "a more recent development version is available."
+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 "Feeds"
+msgstr "Feeds"
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+
+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: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+
+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"
@@ -58,66 +132,60 @@ msgstr "Password"
 msgid "Repeat your new password:"
 msgstr "Repeat your new password:"
 
-msgid "Update"
-msgstr "Update"
-
 msgid "Import"
 msgstr "Import"
 
-msgid "Please execute the import script locally, it can take a very long time."
+msgid "Please execute the import script locally as it can take a very long time."
-msgstr ""
+msgstr "Please execute the import script locally as it can take a very long time."
-"Please execute the import script locally, it can take a very long time."
 
-msgid "More info in the official doc:"
+msgid "More info in the official documentation:"
-msgstr "More info in the official doc:"
+msgstr "More info in the official documentation:"
 
-msgid "import from Pocket"
+msgid "Import from Pocket"
-msgstr "import from Pocket"
+msgstr "Import from Pocket"
 
-msgid "import from Readability"
+#, php-format
-msgstr "import from Readability"
+msgid "(you must have a %s file on your server)"
+msgstr "(you must have a %s file on your server)"
 
-msgid "import from Instapaper"
+msgid "Import from Readability"
-msgstr "import from Instapaper"
+msgstr "Import from Readability"
 
-msgid "Export your poche data"
+msgid "Import from Instapaper"
-msgstr "Export your poche data"
+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 export your poche data."
+msgid "to download your database."
-msgstr "to export your poche data."
+msgstr "to download your database."
 
-msgid "back to home"
+msgid "to export your wallabag data."
-msgstr "back to home"
+msgstr "to export your wallabag data."
 
-msgid "installation"
+msgid "Cache"
-msgstr "installation"
+msgstr "Cache"
 
-msgid "install your poche"
+msgid "to delete cache."
-msgstr "install your poche"
+msgstr "to delete cache."
 
-msgid ""
+msgid "You can enter multiple tags, separated by commas."
-"poche is still not installed. Please fill the below form to install it. "
+msgstr "You can enter multiple tags, separated by commas."
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
-msgstr ""
-"poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
 
-msgid "Login"
+msgid "return to article"
-msgstr "Login"
+msgstr "return to article"
 
-msgid "Repeat your password"
+msgid "plop"
-msgstr "Repeat your password"
+msgstr "plop"
 
-msgid "Install"
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
-msgstr "Install"
+msgstr "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
-
-msgid "back to top"
-msgstr "back to top"
 
 msgid "favoris"
 msgstr "favoris"
@@ -146,11 +214,14 @@ msgstr "by title"
 msgid "by title desc"
 msgstr "by title desc"
 
-msgid "No link available here!"
+msgid "Tag"
-msgstr "No link available here!"
+msgstr "Tag"
 
-msgid "toggle mark as read"
+msgid "No articles found."
-msgstr "toggle mark as read"
+msgstr "No articles found."
+
+msgid "Toggle mark as read"
+msgstr "Toggle mark as read"
 
 msgid "toggle favorite"
 msgstr "toggle favorite"
@@ -161,14 +232,86 @@ 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 "tweet"
+msgid "installation"
-msgstr "tweet"
+msgstr "installation"
 
-msgid "email"
+msgid "install your wallabag"
-msgstr "email"
+msgstr "install your wallabag"
+
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+
+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"
@@ -176,26 +319,23 @@ msgstr "shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
+msgid "Does this article appear wrong?"
-msgstr "this article appears wrong?"
+msgstr "Does this article appear wrong?"
 
-msgid "create an issue"
+msgid "tags:"
-msgstr "create an issue"
+msgstr "tags:"
 
-msgid "or"
+msgid "Edit tags"
-msgstr "or"
+msgstr "Edit tags"
 
-msgid "contact us by mail"
+msgid "save link!"
-msgstr "contact us by mail"
+msgstr "save link!"
-
-msgid "plop"
-msgstr "plop"
 
 msgid "home"
 msgstr "home"
 
-msgid "favorites"
+msgid "tags"
-msgstr "favorites"
+msgstr "tags"
 
 msgid "logout"
 msgstr "logout"
@@ -206,23 +346,179 @@ msgstr "powered by"
 msgid "debug mode is on so cache is off."
 msgstr "debug mode is on so cache is off."
 
-msgid "your poche version:"
+msgid "your wallabag version:"
-msgstr "your poche version:"
+msgstr "your wallabag version:"
 
 msgid "storage:"
 msgstr "storage:"
 
-msgid "login to your poche"
+msgid "save a link"
-msgstr "login to your poche"
+msgstr "save a link"
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "back to home"
-msgstr "you are in demo mode, some features may be disabled."
+msgstr "back to home"
 
-msgid "Stay signed in"
+msgid "toggle mark as read"
-msgstr "Stay signed in"
+msgstr "toggle mark as read"
 
-msgid "(Do not check on public computers)"
+msgid "tweet"
-msgstr "(Do not check on public computers)"
+msgstr "tweet"
 
-msgid "Sign in"
+msgid "email"
-msgstr "Sign in"
+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 "Poching 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 "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 infos 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 have to be filled & the password must be the same in the two 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 "Uh, there is a problem while 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 "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:"

locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po

@@ -1,51 +1,136 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 15:16+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
+"Language: \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-Language: Spanish\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr ""
+
+msgid "login failed: user doesn't exist"
+msgstr ""
+
+msgid "return home"
+msgstr ""
 
 msgid "config"
 msgstr "configuración"
 
-msgid "Poching a link"
+msgid "Saving articles"
-msgstr "Pochear un enlace"
+msgstr ""
+
+msgid "There are several ways to save an article:"
+msgstr ""
 
 msgid "read the documentation"
 msgstr "leer la documentación"
 
-msgid "by filling this field"
+msgid "download the extension"
+msgstr ""
+
+msgid "via F-Droid"
+msgstr ""
+
+msgid " or "
+msgstr ""
+
+msgid "via Google Play"
+msgstr ""
+
+msgid "download the application"
+msgstr ""
+
+#, fuzzy
+msgid "By filling this field"
 msgstr "rellenando este campo"
 
-msgid "poche it!"
+msgid "bag it!"
-msgstr "pochéalo!"
+msgstr ""
 
-msgid "Updating poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Actualizar"
+msgstr ""
 
-msgid "your version"
+msgid "Upgrading wallabag"
-msgstr "su versión"
+msgstr ""
 
-msgid "latest stable version"
+#, fuzzy
+msgid "Installed version"
 msgstr "ultima versión estable"
 
-msgid "a more recent stable version is available."
+#, fuzzy
+msgid "Latest stable version"
+msgstr "ultima versión estable"
+
+#, fuzzy
+msgid "A more recent stable version is available."
 msgstr "una versión estable más reciente está disponible."
 
-msgid "you are up to date."
+#, fuzzy
+msgid "You are up to date."
 msgstr "estás actualizado."
 
-msgid "latest dev version"
+#, fuzzy
+msgid "Latest dev version"
 msgstr "ultima versión de desarollo"
 
-msgid "a more recent development version is available."
+#, fuzzy
+msgid "A more recent development version is available."
 msgstr "una versión de desarollo más reciente está disponible."
 
+msgid "Feeds"
+msgstr ""
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+
+msgid "Unread feed"
+msgstr ""
+
+#, fuzzy
+msgid "Favorites feed"
+msgstr "preferidos"
+
+#, fuzzy
+msgid "Archive feed"
+msgstr "archivos"
+
+msgid "Your token:"
+msgstr ""
+
+msgid "Your user id:"
+msgstr ""
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr ""
+
+#, fuzzy
+msgid "Change your theme"
+msgstr "Modificar tu contraseña"
+
+msgid "Theme:"
+msgstr ""
+
+msgid "Update"
+msgstr "Actualizar"
+
+#, fuzzy
+msgid "Change your language"
+msgstr "Modificar tu contraseña"
+
+msgid "Language:"
+msgstr ""
+
 msgid "Change your password"
 msgstr "Modificar tu contraseña"
 
@@ -58,66 +143,68 @@ msgstr "Contraseña"
 msgid "Repeat your new password:"
 msgstr "Repetir la nueva contraseña :"
 
-msgid "Update"
-msgstr "Actualizar"
-
 msgid "Import"
 msgstr "Importar"
 
-msgid "Please execute the import script locally, it can take a very long time."
+#, fuzzy
-msgstr ""
+msgid "Please execute the import script locally as it can take a very long time."
-"Por favor, ejecute la importación en local, esto puede demorar un tiempo."
+msgstr "Por favor, ejecute la importación en local, esto puede demorar un tiempo."
 
-msgid "More info in the official doc:"
+#, fuzzy
+msgid "More info in the official documentation:"
 msgstr "Más información en la documentación oficial :"
 
-msgid "import from Pocket"
+#, fuzzy
+msgid "Import from Pocket"
 msgstr "importación desde Pocket"
 
-msgid "import from Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr ""
+
+#, fuzzy
+msgid "Import from Readability"
 msgstr "importación desde Readability"
 
-msgid "import from Instapaper"
+#, fuzzy
+msgid "Import from Instapaper"
 msgstr "importación desde Instapaper"
 
-msgid "Export your poche data"
+#, fuzzy
+msgid "Import from wallabag"
+msgstr "importación desde Readability"
+
+#, fuzzy
+msgid "Export your wallabag data"
 msgstr "Exportar sus datos de poche"
 
 msgid "Click here"
 msgstr "Haga clic aquí"
 
-msgid "to export your poche data."
+msgid "to download your database."
+msgstr ""
+
+#, fuzzy
+msgid "to export your wallabag data."
 msgstr "para exportar sus datos de poche."
 
-msgid "back to home"
+msgid "Cache"
-msgstr "volver a la página de inicio"
-
-msgid "installation"
-msgstr "instalación"
-
-msgid "install your poche"
-msgstr "instala tu Poche"
-
-msgid ""
-"Poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
 msgstr ""
-"Poche todavia no està instalado. Por favor, completa los campos siguientes "
-"para instalarlo. No dudes de <a href='http://doc.inthepoche.com'>leer la "
-"documentación en el sitio de Poche</a>."
 
-msgid "Login"
+msgid "to delete cache."
-msgstr "Nombre de usuario"
+msgstr ""
 
-msgid "Repeat your password"
+msgid "You can enter multiple tags, separated by commas."
-msgstr "Repita su contraseña"
+msgstr ""
 
-msgid "Install"
+msgid "return to article"
-msgstr "Instalar"
+msgstr ""
 
-msgid "back to top"
+msgid "plop"
-msgstr "volver arriba"
+msgstr "plop"
+
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr ""
 
 msgid "favoris"
 msgstr "preferidos"
@@ -146,10 +233,14 @@ msgstr "por título"
 msgid "by title desc"
 msgstr "por título descendiente"
 
-msgid "No link available here!"
+msgid "Tag"
-msgstr "¡No hay ningún enlace disponible por aquí!"
+msgstr ""
 
-msgid "toggle mark as read"
+msgid "No articles found."
+msgstr ""
+
+#, fuzzy
+msgid "Toggle mark as read"
 msgstr "marcar como leído"
 
 msgid "toggle favorite"
@@ -161,13 +252,95 @@ msgstr "eliminar"
 msgid "original"
 msgstr "original"
 
+msgid "estimated reading time:"
+msgstr ""
+
+msgid "mark all the entries as read"
+msgstr ""
+
 msgid "results"
 msgstr "resultados"
 
-msgid "tweet"
+msgid "installation"
+msgstr "instalación"
+
+#, fuzzy
+msgid "install your wallabag"
+msgstr "instala tu Poche"
+
+#, fuzzy
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "Poche todavia no està instalado. Por favor, completa los campos siguientes para instalarlo. No dudes de <a href='http://doc.inthepoche.com'>leer la documentación en el sitio de Poche</a>."
+
+msgid "Login"
+msgstr "Nombre de usuario"
+
+msgid "Repeat your password"
+msgstr "Repita su contraseña"
+
+msgid "Install"
+msgstr "Instalar"
+
+#, fuzzy
+msgid "login to your wallabag"
+msgstr "conectarse a tu Poche"
+
+msgid "Login to wallabag"
+msgstr ""
+
+msgid "you are in demo mode, some features may be disabled."
+msgstr "este es el modo de demostración, algunas funcionalidades pueden estar desactivadas."
+
+msgid "Username"
+msgstr ""
+
+msgid "Stay signed in"
+msgstr "Seguir conectado"
+
+msgid "(Do not check on public computers)"
+msgstr "(no marcar en un ordenador público)"
+
+msgid "Sign in"
+msgstr "Iniciar sesión"
+
+msgid "favorites"
+msgstr "preferidos"
+
+msgid "estimated reading time :"
+msgstr ""
+
+msgid "Mark all the entries as read"
+msgstr ""
+
+msgid "Return home"
+msgstr ""
+
+#, fuzzy
+msgid "Back to top"
+msgstr "volver arriba"
+
+#, fuzzy
+msgid "Mark as read"
+msgstr "marcar como leído"
+
+#, fuzzy
+msgid "Favorite"
+msgstr "preferidos"
+
+#, fuzzy
+msgid "Toggle favorite"
+msgstr "preferido"
+
+#, fuzzy
+msgid "Delete"
+msgstr "eliminar"
+
+#, fuzzy
+msgid "Tweet"
 msgstr "tweetear"
 
-msgid "email"
+#, fuzzy
+msgid "Email"
 msgstr "enviar por mail"
 
 msgid "shaarli"
@@ -176,26 +349,24 @@ msgstr "shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
+#, fuzzy
+msgid "Does this article appear wrong?"
 msgstr "este articulo no se ve bien?"
 
-msgid "create an issue"
+msgid "tags:"
-msgstr "crear un ticket"
+msgstr ""
 
-msgid "or"
+msgid "Edit tags"
-msgstr "o"
+msgstr ""
 
-msgid "contact us by mail"
+msgid "save link!"
-msgstr "contactarnos por mail"
+msgstr ""
-
-msgid "plop"
-msgstr "plop"
 
 msgid "home"
 msgstr "inicio"
 
-msgid "favorites"
+msgid "tags"
-msgstr "preferidos"
+msgstr ""
 
 msgid "logout"
 msgstr "cerrar sesión"
@@ -206,25 +377,187 @@ msgstr "hecho con"
 msgid "debug mode is on so cache is off."
 msgstr "el modo de depuración está activado, así que la cache está desactivada."
 
-msgid "your poche version:"
+#, fuzzy
-msgstr "tu versión de Poche:"
+msgid "your wallabag version:"
+msgstr "su versión"
 
 msgid "storage:"
 msgstr "almacenamiento:"
 
-msgid "login to your poche"
+msgid "save a link"
-msgstr "conectarse a tu Poche"
-
-msgid "you are in demo mode, some features may be disabled."
 msgstr ""
-"este es el modo de demostración, algunas funcionalidades pueden estar "
-"desactivadas."
 
-msgid "Stay signed in"
+msgid "back to home"
-msgstr "Seguir conectado"
+msgstr "volver a la página de inicio"
 
-msgid "(Do not check on public computers)"
+msgid "toggle mark as read"
-msgstr "(no marcar en un ordenador público)"
+msgstr "marcar como leído"
 
-msgid "Sign in"
+msgid "tweet"
-msgstr "Iniciar sesión"
+msgstr "tweetear"
+
+msgid "email"
+msgstr "enviar por mail"
+
+msgid "this article appears wrong?"
+msgstr "este articulo no se ve bien?"
+
+msgid "No link available here!"
+msgstr "¡No hay ningún enlace disponible por aquí!"
+
+msgid "Poching a link"
+msgstr "Pochear un enlace"
+
+msgid "by filling this field"
+msgstr "rellenando este campo"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
+
+msgid "your version"
+msgstr "su versión"
+
+msgid "latest stable version"
+msgstr "ultima versión estable"
+
+msgid "a more recent stable version is available."
+msgstr "una versión estable más reciente está disponible."
+
+msgid "you are up to date."
+msgstr "estás actualizado."
+
+msgid "latest dev version"
+msgstr "ultima versión de desarollo"
+
+msgid "a more recent development version is available."
+msgstr "una versión de desarollo más reciente está disponible."
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "Por favor, ejecute la importación en local, esto puede demorar un tiempo."
+
+#, fuzzy
+msgid "More infos in the official doc:"
+msgstr "Más información en la documentación oficial :"
+
+msgid "import from Pocket"
+msgstr "importación desde Pocket"
+
+msgid "import from Readability"
+msgstr "importación desde Readability"
+
+msgid "import from Instapaper"
+msgstr "importación desde Instapaper"
+
+msgid "Tags"
+msgstr ""
+
+#, fuzzy
+msgid "Untitled"
+msgstr "por título"
+
+msgid "the link has been added successfully"
+msgstr ""
+
+msgid "error during insertion : the link wasn't added"
+msgstr ""
+
+msgid "the link has been deleted successfully"
+msgstr ""
+
+msgid "the link wasn't deleted"
+msgstr ""
+
+msgid "Article not found!"
+msgstr ""
+
+msgid "previous"
+msgstr ""
+
+msgid "next"
+msgstr ""
+
+msgid "in demo mode, you can't update your password"
+msgstr ""
+
+msgid "your password has been updated"
+msgstr ""
+
+msgid "the two fields have to be filled & the password must be the same in the two fields"
+msgstr ""
+
+msgid "still using the \""
+msgstr ""
+
+msgid "that theme does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your theme preferences"
+msgstr ""
+
+msgid "that language does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your language preferences"
+msgstr ""
+
+msgid "login failed: you have to fill all fields"
+msgstr ""
+
+msgid "welcome to your wallabag"
+msgstr ""
+
+msgid "login failed: bad login or password"
+msgstr ""
+
+#, fuzzy
+msgid "import from instapaper completed"
+msgstr "importación desde Instapaper"
+
+#, fuzzy
+msgid "import from pocket completed"
+msgstr "importación desde Pocket"
+
+#, fuzzy
+msgid "import from Readability completed. "
+msgstr "importación desde Readability"
+
+#, fuzzy
+msgid "import from Poche completed. "
+msgstr "importación desde Pocket"
+
+msgid "Unknown import provider."
+msgstr ""
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr ""
+
+msgid "Could not find required \""
+msgstr ""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr ""
+
+#, fuzzy
+msgid "Cache deleted."
+msgstr "eliminar"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr ""
+
+#~ msgid "poche it!"
+#~ msgstr "pochéalo!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Actualizar"
+
+#~ msgid "create an issue"
+#~ msgstr "crear un ticket"
+
+#~ msgid "or"
+#~ msgstr "o"
+
+#~ msgid "contact us by mail"
+#~ msgstr "contactarnos por mail"
+
+#~ msgid "your poche version:"
+#~ msgstr "tu versión de Poche:"

locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po

@@ -1,51 +1,136 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 15:15+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
+"Language: \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-Language: Persian\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr ""
+
+msgid "login failed: user doesn't exist"
+msgstr ""
+
+msgid "return home"
+msgstr ""
 
 msgid "config"
 msgstr "تنظیمات"
 
-msgid "Poching a link"
+msgid "Saving articles"
-msgstr "پیوندی را poche کنید"
+msgstr ""
+
+msgid "There are several ways to save an article:"
+msgstr ""
 
 msgid "read the documentation"
 msgstr "راهنما را بخوانید"
 
-msgid "by filling this field"
+msgid "download the extension"
+msgstr ""
+
+msgid "via F-Droid"
+msgstr ""
+
+msgid " or "
+msgstr ""
+
+msgid "via Google Play"
+msgstr ""
+
+msgid "download the application"
+msgstr ""
+
+#, fuzzy
+msgid "By filling this field"
 msgstr "با پرکردن این بخش"
 
-msgid "poche it!"
+msgid "bag it!"
-msgstr "poche کنید!"
+msgstr ""
 
-msgid "Updating poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "به‌روزرسانی poche"
+msgstr ""
 
-msgid "your version"
+msgid "Upgrading wallabag"
-msgstr "نسخهٔ شما"
+msgstr ""
 
-msgid "latest stable version"
+#, fuzzy
+msgid "Installed version"
 msgstr "آخرین نسخهٔ پایدار"
 
-msgid "a more recent stable version is available."
+#, fuzzy
+msgid "Latest stable version"
+msgstr "آخرین نسخهٔ پایدار"
+
+#, fuzzy
+msgid "A more recent stable version is available."
 msgstr "نسخهٔ پایدار تازه‌ای منتشر شده است."
 
-msgid "you are up to date."
+#, fuzzy
+msgid "You are up to date."
 msgstr "شما به‌روز هستید."
 
-msgid "latest dev version"
+#, fuzzy
+msgid "Latest dev version"
 msgstr "آخرین نسخهٔ آزمایشی"
 
-msgid "a more recent development version is available."
+#, fuzzy
+msgid "A more recent development version is available."
 msgstr "نسخهٔ آزمایشی تازه‌ای منتشر شده است."
 
+msgid "Feeds"
+msgstr ""
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+
+msgid "Unread feed"
+msgstr ""
+
+#, fuzzy
+msgid "Favorites feed"
+msgstr "بهترین‌ها"
+
+#, fuzzy
+msgid "Archive feed"
+msgstr "بایگانی"
+
+msgid "Your token:"
+msgstr ""
+
+msgid "Your user id:"
+msgstr ""
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr ""
+
+#, fuzzy
+msgid "Change your theme"
+msgstr "گذرواژهٔ خود را تغییر دهید"
+
+msgid "Theme:"
+msgstr ""
+
+msgid "Update"
+msgstr "به‌روزرسانی"
+
+#, fuzzy
+msgid "Change your language"
+msgstr "گذرواژهٔ خود را تغییر دهید"
+
+msgid "Language:"
+msgstr ""
+
 msgid "Change your password"
 msgstr "گذرواژهٔ خود را تغییر دهید"
 
@@ -58,64 +143,68 @@ msgstr "گذرواژه"
 msgid "Repeat your new password:"
 msgstr "گذرواژهٔ تازه را دوباره وارد کنید"
 
-msgid "Update"
-msgstr "به‌روزرسانی"
-
 msgid "Import"
 msgstr "درون‌ریزی"
 
-msgid "Please execute the import script locally, it can take a very long time."
+#, fuzzy
+msgid "Please execute the import script locally as it can take a very long time."
 msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد."
 
-msgid "More info in the official doc:"
+#, fuzzy
+msgid "More info in the official documentation:"
 msgstr "اطلاعات بیشتر در راهنمای رسمی:"
 
-msgid "import from Pocket"
+#, fuzzy
+msgid "Import from Pocket"
 msgstr "درون‌ریزی از Pocket"
 
-msgid "import from Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr ""
+
+#, fuzzy
+msgid "Import from Readability"
 msgstr "درون‌ریزی از Readability"
 
-msgid "import from Instapaper"
+#, fuzzy
+msgid "Import from Instapaper"
 msgstr "درون‌ریزی از Instapaper"
 
-msgid "Export your poche data"
+#, fuzzy
+msgid "Import from wallabag"
+msgstr "درون‌ریزی از Readability"
+
+#, fuzzy
+msgid "Export your wallabag data"
 msgstr "داده‌های poche خود را برون‌بری کنید"
 
 msgid "Click here"
 msgstr "اینجا را کلیک کنید"
 
-msgid "to export your poche data."
+msgid "to download your database."
+msgstr ""
+
+#, fuzzy
+msgid "to export your wallabag data."
 msgstr "برای برون‌بری داده‌های poche شما"
 
-msgid "back to home"
+msgid "Cache"
-msgstr "بازگشت به خانه"
-
-msgid "installation"
-msgstr "نصب"
-
-msgid "install your poche"
-msgstr "poche خود را نصب کنید"
-
-msgid ""
-"poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
 msgstr ""
-"poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن <a "
-"href='http://doc.inthepoche.com'>راهنما در وبگاه poche</a> را از یاد نبرید."
 
-msgid "Login"
+msgid "to delete cache."
-msgstr "ورود"
+msgstr ""
 
-msgid "Repeat your password"
+msgid "You can enter multiple tags, separated by commas."
-msgstr "گذرواژه را دوباره وارد کنید"
+msgstr ""
 
-msgid "Install"
+msgid "return to article"
-msgstr "نصب"
+msgstr ""
 
-msgid "back to top"
+msgid "plop"
-msgstr "بازگشت به بالای صفحه"
+msgstr "plop"
+
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr ""
 
 msgid "favoris"
 msgstr "بهترین‌ها"
@@ -144,10 +233,14 @@ msgstr "با عنوان"
 msgid "by title desc"
 msgstr "با عنوان (الفبایی معکوس)"
 
-msgid "No link available here!"
+msgid "Tag"
-msgstr "اینجا پیوندی موجود نیست!"
+msgstr ""
 
-msgid "toggle mark as read"
+msgid "No articles found."
+msgstr ""
+
+#, fuzzy
+msgid "Toggle mark as read"
 msgstr "خوانده‌شده/خوانده‌نشده"
 
 msgid "toggle favorite"
@@ -159,13 +252,95 @@ msgstr "پاک‌کردن"
 msgid "original"
 msgstr "اصلی"
 
+msgid "estimated reading time:"
+msgstr ""
+
+msgid "mark all the entries as read"
+msgstr ""
+
 msgid "results"
 msgstr "نتایج"
 
-msgid "tweet"
+msgid "installation"
+msgstr "نصب"
+
+#, fuzzy
+msgid "install your wallabag"
+msgstr "poche خود را نصب کنید"
+
+#, fuzzy
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن <a href='http://doc.inthepoche.com'>راهنما در وبگاه poche</a> را از یاد نبرید."
+
+msgid "Login"
+msgstr "ورود"
+
+msgid "Repeat your password"
+msgstr "گذرواژه را دوباره وارد کنید"
+
+msgid "Install"
+msgstr "نصب"
+
+#, fuzzy
+msgid "login to your wallabag"
+msgstr "به poche خود وارد شوید"
+
+msgid "Login to wallabag"
+msgstr ""
+
+msgid "you are in demo mode, some features may be disabled."
+msgstr "این تنها نسخهٔ نمایشی است، برخی از ویژگی‌ها کار نمی‌کنند."
+
+msgid "Username"
+msgstr ""
+
+msgid "Stay signed in"
+msgstr "مرا به خاطر بسپار"
+
+msgid "(Do not check on public computers)"
+msgstr "(روی رایانه‌های عمومی این کار را نکنید)"
+
+msgid "Sign in"
+msgstr "ورود"
+
+msgid "favorites"
+msgstr "بهترین‌ها"
+
+msgid "estimated reading time :"
+msgstr ""
+
+msgid "Mark all the entries as read"
+msgstr ""
+
+msgid "Return home"
+msgstr ""
+
+#, fuzzy
+msgid "Back to top"
+msgstr "بازگشت به بالای صفحه"
+
+#, fuzzy
+msgid "Mark as read"
+msgstr "خوانده‌شده/خوانده‌نشده"
+
+#, fuzzy
+msgid "Favorite"
+msgstr "بهترین‌ها"
+
+#, fuzzy
+msgid "Toggle favorite"
+msgstr "جزء بهترین‌ها هست/نیست"
+
+#, fuzzy
+msgid "Delete"
+msgstr "پاک‌کردن"
+
+#, fuzzy
+msgid "Tweet"
 msgstr "توییت"
 
-msgid "email"
+#, fuzzy
+msgid "Email"
 msgstr "ایمیل"
 
 msgid "shaarli"
@@ -174,26 +349,24 @@ msgstr "shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
+#, fuzzy
+msgid "Does this article appear wrong?"
 msgstr "این مطلب اشتباه نمایش داده شده؟"
 
-msgid "create an issue"
+msgid "tags:"
-msgstr "یک درخواست رفع‌مشکل بنویسید"
+msgstr ""
 
-msgid "or"
+msgid "Edit tags"
-msgstr "یا"
+msgstr ""
 
-msgid "contact us by mail"
+msgid "save link!"
-msgstr "به ما ایمیل بزنید"
+msgstr ""
-
-msgid "plop"
-msgstr "plop"
 
 msgid "home"
 msgstr "خانه"
 
-msgid "favorites"
+msgid "tags"
-msgstr "بهترین‌ها"
+msgstr ""
 
 msgid "logout"
 msgstr "بیرون رفتن"
@@ -204,23 +377,187 @@ msgstr "نیروگرفته از"
 msgid "debug mode is on so cache is off."
 msgstr "حالت عیب‌یابی فعال است، پس کاشه خاموش است."
 
-msgid "your poche version:"
+#, fuzzy
-msgstr "نسخهٔ poche شما:"
+msgid "your wallabag version:"
+msgstr "نسخهٔ شما"
 
 msgid "storage:"
 msgstr "ذخیره‌سازی:"
 
-msgid "login to your poche"
+msgid "save a link"
-msgstr "به poche خود وارد شوید"
+msgstr ""
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "back to home"
-msgstr "این تنها نسخهٔ نمایشی است، برخی از ویژگی‌ها کار نمی‌کنند."
+msgstr "بازگشت به خانه"
 
-msgid "Stay signed in"
+msgid "toggle mark as read"
-msgstr "مرا به خاطر بسپار"
+msgstr "خوانده‌شده/خوانده‌نشده"
 
-msgid "(Do not check on public computers)"
+msgid "tweet"
-msgstr "(روی رایانه‌های عمومی این کار را نکنید)"
+msgstr "توییت"
 
-msgid "Sign in"
+msgid "email"
-msgstr "ورود"
+msgstr "ایمیل"
+
+msgid "this article appears wrong?"
+msgstr "این مطلب اشتباه نمایش داده شده؟"
+
+msgid "No link available here!"
+msgstr "اینجا پیوندی موجود نیست!"
+
+msgid "Poching a link"
+msgstr "پیوندی را poche کنید"
+
+msgid "by filling this field"
+msgstr "با پرکردن این بخش"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
+
+msgid "your version"
+msgstr "نسخهٔ شما"
+
+msgid "latest stable version"
+msgstr "آخرین نسخهٔ پایدار"
+
+msgid "a more recent stable version is available."
+msgstr "نسخهٔ پایدار تازه‌ای منتشر شده است."
+
+msgid "you are up to date."
+msgstr "شما به‌روز هستید."
+
+msgid "latest dev version"
+msgstr "آخرین نسخهٔ آزمایشی"
+
+msgid "a more recent development version is available."
+msgstr "نسخهٔ آزمایشی تازه‌ای منتشر شده است."
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد."
+
+#, fuzzy
+msgid "More infos in the official doc:"
+msgstr "اطلاعات بیشتر در راهنمای رسمی:"
+
+msgid "import from Pocket"
+msgstr "درون‌ریزی از Pocket"
+
+msgid "import from Readability"
+msgstr "درون‌ریزی از Readability"
+
+msgid "import from Instapaper"
+msgstr "درون‌ریزی از Instapaper"
+
+msgid "Tags"
+msgstr ""
+
+#, fuzzy
+msgid "Untitled"
+msgstr "با عنوان"
+
+msgid "the link has been added successfully"
+msgstr ""
+
+msgid "error during insertion : the link wasn't added"
+msgstr ""
+
+msgid "the link has been deleted successfully"
+msgstr ""
+
+msgid "the link wasn't deleted"
+msgstr ""
+
+msgid "Article not found!"
+msgstr ""
+
+msgid "previous"
+msgstr ""
+
+msgid "next"
+msgstr ""
+
+msgid "in demo mode, you can't update your password"
+msgstr ""
+
+msgid "your password has been updated"
+msgstr ""
+
+msgid "the two fields have to be filled & the password must be the same in the two fields"
+msgstr ""
+
+msgid "still using the \""
+msgstr ""
+
+msgid "that theme does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your theme preferences"
+msgstr ""
+
+msgid "that language does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your language preferences"
+msgstr ""
+
+msgid "login failed: you have to fill all fields"
+msgstr ""
+
+msgid "welcome to your wallabag"
+msgstr ""
+
+msgid "login failed: bad login or password"
+msgstr ""
+
+#, fuzzy
+msgid "import from instapaper completed"
+msgstr "درون‌ریزی از Instapaper"
+
+#, fuzzy
+msgid "import from pocket completed"
+msgstr "درون‌ریزی از Pocket"
+
+#, fuzzy
+msgid "import from Readability completed. "
+msgstr "درون‌ریزی از Readability"
+
+#, fuzzy
+msgid "import from Poche completed. "
+msgstr "درون‌ریزی از Pocket"
+
+msgid "Unknown import provider."
+msgstr ""
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr ""
+
+msgid "Could not find required \""
+msgstr ""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr ""
+
+#, fuzzy
+msgid "Cache deleted."
+msgstr "پاک‌کردن"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr ""
+
+#~ msgid "poche it!"
+#~ msgstr "poche کنید!"
+
+#~ msgid "Updating poche"
+#~ msgstr "به‌روزرسانی poche"
+
+#~ msgid "create an issue"
+#~ msgstr "یک درخواست رفع‌مشکل بنویسید"
+
+#~ msgid "or"
+#~ msgstr "یا"
+
+#~ msgid "contact us by mail"
+#~ msgstr "به ما ایمیل بزنید"
+
+#~ msgid "your poche version:"
+#~ msgstr "نسخهٔ poche شما:"

locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po

@@ -1,50 +1,125 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 18:33+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
+"Language: \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-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.7\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr "wallabag, un système open source de lecture différé"
+
+msgid "login failed: user doesn't exist"
+msgstr "identification échouée : l'utilisateur n'existe pas"
+
+msgid "return home"
+msgstr "retour à l'accueil"
 
 msgid "config"
 msgstr "configuration"
 
-msgid "Poching a link"
+msgid "Saving articles"
-msgstr "Pocher un lien"
+msgstr "Sauvegarde des articles"
+
+msgid "There are several ways to save an article:"
+msgstr "Il y a plusieurs façons de sauver un article :"
 
 msgid "read the documentation"
 msgstr "lisez la documentation"
 
-msgid "by filling this field"
+msgid "download the extension"
-msgstr "en remplissant ce champ"
+msgstr "télécharger l'extension"
 
-msgid "poche it!"
+msgid "via F-Droid"
-msgstr "pochez-le !"
+msgstr "via F-Droid"
 
-msgid "Updating poche"
+msgid " or "
-msgstr "Mettre à jour poche"
+msgstr "ou"
 
-msgid "your version"
+msgid "via Google Play"
-msgstr "votre version"
+msgstr "via Google PlayStore"
 
-msgid "latest stable version"
+msgid "download the application"
-msgstr "dernière version stable"
+msgstr "télécharger l'application"
 
-msgid "a more recent stable version is available."
+msgid "By filling this field"
-msgstr "une version stable plus récente est disponible."
+msgstr "En remplissant ce champ"
 
-msgid "you are up to date."
+msgid "bag it!"
-msgstr "vous êtes à jour."
+msgstr "bag it !"
 
-msgid "latest dev version"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "dernière version de développement"
+msgstr "Bookmarklet : glissez-déposez ce lien dans votre barre de favoris"
 
-msgid "a more recent development version is available."
+msgid "Upgrading wallabag"
-msgstr "une version de développement plus récente est disponible."
+msgstr "Mise à jour de wallabag"
+
+msgid "Installed version"
+msgstr "Version installée"
+
+msgid "Latest stable version"
+msgstr "Dernière version stable"
+
+msgid "A more recent stable version is available."
+msgstr "Une version stable plus récente est disponible."
+
+msgid "You are up to date."
+msgstr "Vous êtes à jour."
+
+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 "Feeds"
+msgstr "Flux"
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr "Votre jeton de flux est actuellement vide doit d'abord être généré pour activer les flux. Cliquez <a href='?feed&amp;action=generate'>ici</a> pour le générer."
+
+msgid "Unread feed"
+msgstr "Flux des non lus"
+
+msgid "Favorites feed"
+msgstr "Flux des favoris"
+
+msgid "Archive feed"
+msgstr "Flux des archives"
+
+msgid "Your token:"
+msgstr "Votre jeton :"
+
+msgid "Your user id:"
+msgstr "Votre ID utilisateur :"
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr "Vous pouvez regénérer votre jeton : <a href='?feed&amp;action=generate'>génération !</a>."
+
+msgid "Change your theme"
+msgstr "Changer votre thème"
+
+msgid "Theme:"
+msgstr "Thème :"
+
+msgid "Update"
+msgstr "Mettre à jour"
+
+msgid "Change your language"
+msgstr "Changer votre langue"
+
+msgid "Language:"
+msgstr "Langue :"
 
 msgid "Change your password"
 msgstr "Modifier votre mot de passe"
@@ -58,65 +133,60 @@ msgstr "Mot de passe"
 msgid "Repeat your new password:"
 msgstr "Répétez votre nouveau mot de passe :"
 
-msgid "Update"
-msgstr "Mettre à jour"
-
 msgid "Import"
 msgstr "Importer"
 
-msgid "Please execute the import script locally, it can take a very long time."
+msgid "Please execute the import script locally as it can take a very long time."
-msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps."
+msgstr "Merci d'exécuter l'import en local car cela peut prendre du temps."
 
-msgid "More info in the official doc:"
+msgid "More info in the official documentation:"
-msgstr "Plus d'infos sur la documentation officielle"
+msgstr "Plus d'infos dans la documentation officielle :"
 
-msgid "import from Pocket"
+msgid "Import from Pocket"
-msgstr "import depuis Pocket"
+msgstr "Import depuis Pocket"
 
-msgid "import from Readability"
+#, php-format
-msgstr "import depuis Readability"
+msgid "(you must have a %s file on your server)"
+msgstr "(le fichier %s doit être présent sur le serveur)"
 
-msgid "import from Instapaper"
+msgid "Import from Readability"
-msgstr "import depuis Instapaper"
+msgstr "Import depuis Readability"
 
-msgid "Export your poche data"
+msgid "Import from Instapaper"
-msgstr "Exporter vos données de poche"
+msgstr "Import depuis Instapaper"
+
+msgid "Import from wallabag"
+msgstr "Import depuis wallabag"
+
+msgid "Export your wallabag data"
+msgstr "Exporter vos données de wallabag"
 
 msgid "Click here"
-msgstr "Cliquez-ici"
+msgstr "Cliquez ici"
 
-msgid "to export your poche data."
+msgid "to download your database."
-msgstr "pour exporter vos données de poche."
+msgstr "pour télécharger votre base de données."
 
-msgid "back to home"
+msgid "to export your wallabag data."
-msgstr "retour à l'accueil"
+msgstr "pour exporter vos données de wallabag."
 
-msgid "installation"
+msgid "Cache"
-msgstr "installation"
+msgstr "Cache"
 
-msgid "install your poche"
+msgid "to delete cache."
-msgstr "installez votre poche"
+msgstr "pour effacer le cache."
 
-msgid ""
+msgid "You can enter multiple tags, separated by commas."
-"poche is still not installed. Please fill the below form to install it. "
+msgstr "Vous pouvez entrer plusieurs tags, séparés par des virgules."
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
-msgstr ""
-"poche n'est pas encore installé. Merci de remplir le formulaire suivant pour "
-"l'installer. N'hésitez pas à <a href='http://doc.inthepoche.com'>lire la "
-"documentation sur le site de poche</a>."
 
-msgid "Login"
+msgid "return to article"
-msgstr "Nom d'utilisateur"
+msgstr "retourner à l'article"
 
-msgid "Repeat your password"
+msgid "plop"
-msgstr "Répétez votre mot de passe"
+msgstr "plop"
 
-msgid "Install"
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
-msgstr "Installer"
+msgstr "Vous pouvez vérifier votre configuration <a href='wallabag_compatibility_test.php'>ici</a>."
-
-msgid "back to top"
-msgstr "retour en haut de page"
 
 msgid "favoris"
 msgstr "favoris"
@@ -145,14 +215,17 @@ msgstr "par titre"
 msgid "by title desc"
 msgstr "par titre desc"
 
-msgid "No link available here!"
+msgid "Tag"
-msgstr "Aucun lien n'est disponible ici !"
+msgstr "Tag"
 
-msgid "toggle mark as read"
+msgid "No articles found."
-msgstr "marquer comme lu / non lu"
+msgstr "Aucun article trouvé."
+
+msgid "Toggle mark as read"
+msgstr "Marquer comme lu / non lu"
 
 msgid "toggle favorite"
-msgstr "marquer comme favori"
+msgstr "marquer / enlever comme favori"
 
 msgid "delete"
 msgstr "supprimer"
@@ -160,44 +233,95 @@ 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 "tweet"
+msgid "installation"
-msgstr "tweet"
+msgstr "installation"
 
-msgid "email"
+msgid "install your wallabag"
-msgstr "email"
+msgstr "installez votre wallabag"
+
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "wallabag n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à <a href='http://doc.wallabag.org'>lire la documentation sur le site de wallabag</a>."
+
+msgid "Login"
+msgstr "Nom d'utilisateur"
+
+msgid "Repeat your password"
+msgstr "Répétez votre mot de passe"
+
+msgid "Install"
+msgstr "Installer"
+
+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 "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 "Return home"
+msgstr "Retour accueil"
+
+msgid "Back to top"
+msgstr "Haut de page"
+
+msgid "Mark as read"
+msgstr "Marquer comme lu / non lu"
+
+msgid "Favorite"
+msgstr "Favoris"
+
+msgid "Toggle favorite"
+msgstr "Marquer / enlever comme favori"
+
+msgid "Delete"
+msgstr "Effacer"
+
+msgid "Tweet"
+msgstr "Tweet"
+
+msgid "Email"
+msgstr "E-mail"
 
 msgid "shaarli"
-msgstr "shaarli"
+msgstr "Shaarli"
 
 msgid "flattr"
-msgstr "flattr"
+msgstr "Flattr"
 
-msgid "this article appears wrong?"
+msgid "Does this article appear wrong?"
-msgstr "cet article s'affiche mal ?"
+msgstr "Cet article s'affiche mal ?"
 
-msgid "create an issue"
+msgid "tags:"
-msgstr "créez un ticket"
+msgstr "tags :"
 
-msgid "or"
+msgid "Edit tags"
-msgstr "ou"
+msgstr "Editer les tags"
 
-msgid "contact us by mail"
+msgid "save link!"
-msgstr "contactez-nous par email"
+msgstr "sauver le lien !"
-
-msgid "plop"
-msgstr "plop"
-
-msgid "home"
-msgstr "accueil"
-
-msgid "favorites"
-msgstr "favoris"
-
-msgid "logout"
-msgstr "déconnexion"
 
 msgid "powered by"
 msgstr "propulsé par"
@@ -205,24 +329,205 @@ 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 poche version:"
+msgid "your wallabag version:"
-msgstr "votre version de poche :"
+msgstr "votre version de wallabag :"
 
 msgid "storage:"
 msgstr "stockage :"
 
-msgid "login to your poche"
+msgid "home"
-msgstr "se connecter à votre poche"
+msgstr "accueil"
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "favorites"
-msgstr ""
+msgstr "favoris"
-"vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées."
 
-msgid "Stay signed in"
+msgid "tags"
-msgstr "Rester connecté"
+msgstr "tags"
 
-msgid "(Do not check on public computers)"
+msgid "save a link"
-msgstr "(ne pas cocher sur un ordinateur public)"
+msgstr "sauver un lien"
 
-msgid "Sign in"
+msgid "logout"
-msgstr "Se connecter"
+msgstr "déconnexion"
+
+msgid "back to home"
+msgstr "retour à l'accueil"
+
+msgid "toggle mark as read"
+msgstr "marquer comme lu / non lu"
+
+msgid "tweet"
+msgstr "tweet"
+
+msgid "email"
+msgstr "ee-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 "Sauver un lien"
+
+msgid "by filling this field"
+msgstr "en remplissant ce champ"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "bookmarklet : glissez-déposez ce lien dans votre barre de favoris"
+
+msgid "your version"
+msgstr "votre version"
+
+msgid "latest stable version"
+msgstr "dernière version stable"
+
+msgid "a more recent stable version is available."
+msgstr "une version stable plus récente est disponible."
+
+msgid "you are up to date."
+msgstr "vous êtes à jour."
+
+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 "Please execute the import script locally, it can take a very long time."
+msgstr "Merci d'exécuter l'import en local car cela peut prendre du temps."
+
+msgid "More infos in the official doc:"
+msgstr "Plus d'infos dans la documentation officielle :"
+
+msgid "import from Pocket"
+msgstr "import depuis Pocket"
+
+msgid "import from Readability"
+msgstr "import depuis Readability"
+
+msgid "import from Instapaper"
+msgstr "import depuis Instapaper"
+
+msgid "estimated reading time :"
+msgstr "temps de lecture estimé :"
+
+msgid "Mark all the entries as read"
+msgstr "Marquer tous les articles comme lus"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Untitled"
+msgstr "Sans titre"
+
+msgid "the link has been added successfully"
+msgstr "le lien a été ajouté avec succès"
+
+msgid "error during insertion : the link wasn't added"
+msgstr "erreur pendant l'insertion : le lien n'a pas été ajouté"
+
+msgid "the link has been deleted successfully"
+msgstr "le lien a été effacé avec succès"
+
+msgid "the link wasn't deleted"
+msgstr "le lien n'a pas été effacé"
+
+msgid "Article not found!"
+msgstr "Article non trouvé !"
+
+msgid "previous"
+msgstr "précédent"
+
+msgid "next"
+msgstr "suivant"
+
+msgid "in demo mode, you can't update your password"
+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 "still using the \""
+msgstr "utilise encore \""
+
+msgid "that theme does not seem to be installed"
+msgstr "ce thème ne semble pas installé"
+
+msgid "you have changed your theme preferences"
+msgstr "vous avez changez vos préférences de thème"
+
+msgid "that language does not seem to be installed"
+msgstr "cette langue ne semble pas être installée"
+
+msgid "you have changed your language preferences"
+msgstr "vous avez changé vos préférences de langue"
+
+msgid "login failed: you have to fill all fields"
+msgstr "identification échouée : vous devez remplir tous les champs"
+
+msgid "welcome to your wallabag"
+msgstr "bienvenue dans votre wallabag"
+
+msgid "login failed: bad login or password"
+msgstr "identification échouée : mauvais identifiant ou mot de passe"
+
+msgid "import from instapaper completed"
+msgstr "Import depuis Instapaper complété"
+
+msgid "import from pocket completed"
+msgstr "Import depuis Pocket complété"
+
+msgid "import from Readability completed. "
+msgstr "Import depuis Readability complété"
+
+msgid "import from Poche completed. "
+msgstr "Import depuis Pocket complété"
+
+msgid "Unknown import provider."
+msgstr "Fournisseur d'import 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 "Ne peut pas trouver \""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr "Ih, il y a un problème lors de la génération des flux."
+
+msgid "Cache deleted."
+msgstr "Cache effacé."
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr "Oups, vous ne semblez pas avoir PHP 5."
+
+#~ msgid "poche it!"
+#~ msgstr "pochez-le !"
+
+#~ msgid "Updating poche"
+#~ msgstr "Mettre à jour poche"
+
+#, fuzzy
+#~ msgid "Export your poche datas"
+#~ msgstr "Exporter vos données de poche"
+
+#, fuzzy
+#~ msgid "to export your poche datas."
+#~ msgstr "pour exporter vos données de poche."
+
+#~ msgid "create an issue"
+#~ msgstr "créez un ticket"
+
+#~ msgid "or"
+#~ msgstr "ou"
+
+#~ msgid "contact us by mail"
+#~ msgstr "contactez-nous par email"
+
+#~ msgid "your poche version:"
+#~ msgstr "votre version de poche :"

locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po

@@ -4,54 +4,138 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: poche\n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-11-25 09:47+0100\n"
+"POT-Creation-Date: 2014-02-25 15:13+0300\n"
-"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
+"PO-Revision-Date: 2014-02-25 15:13+0300\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
-"it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr ""
+
+msgid "login failed: user doesn't exist"
+msgstr ""
+
+msgid "return home"
+msgstr ""
 
 msgid "config"
 msgstr "configurazione"
 
-msgid "Poching a link"
+msgid "Saving articles"
-msgstr "Pochare un link"
+msgstr ""
+
+msgid "There are several ways to save an article:"
+msgstr ""
 
 msgid "read the documentation"
 msgstr "leggi la documentazione"
 
-msgid "by filling this field"
+msgid "download the extension"
+msgstr ""
+
+msgid "via F-Droid"
+msgstr ""
+
+msgid " or "
+msgstr ""
+
+msgid "via Google Play"
+msgstr ""
+
+msgid "download the application"
+msgstr ""
+
+#, fuzzy
+msgid "By filling this field"
 msgstr "compilando questo campo"
 
-msgid "poche it!"
+msgid "bag it!"
-msgstr "pochalo!"
+msgstr ""
 
-msgid "Updating poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Aggiornamento poche"
+msgstr ""
 
-msgid "your version"
+msgid "Upgrading wallabag"
-msgstr "la tua versione"
+msgstr ""
 
-msgid "latest stable version"
+#, fuzzy
+msgid "Installed version"
 msgstr "ultima versione stabile"
 
-msgid "a more recent stable version is available."
+#, fuzzy
+msgid "Latest stable version"
+msgstr "ultima versione stabile"
+
+#, fuzzy
+msgid "A more recent stable version is available."
 msgstr "è disponibile una versione stabile più recente."
 
-msgid "you are up to date."
+#, fuzzy
+msgid "You are up to date."
 msgstr "sei aggiornato."
 
-msgid "latest dev version"
+#, fuzzy
+msgid "Latest dev version"
 msgstr "ultima versione di sviluppo"
 
-msgid "a more recent development version is available."
+#, fuzzy
+msgid "A more recent development version is available."
 msgstr "è disponibile una versione di sviluppo più recente."
 
+msgid "Feeds"
+msgstr ""
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+
+msgid "Unread feed"
+msgstr ""
+
+#, fuzzy
+msgid "Favorites feed"
+msgstr "preferiti"
+
+#, fuzzy
+msgid "Archive feed"
+msgstr "archivio"
+
+msgid "Your token:"
+msgstr ""
+
+msgid "Your user id:"
+msgstr ""
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr ""
+
+#, fuzzy
+msgid "Change your theme"
+msgstr "Cambia la tua password"
+
+msgid "Theme:"
+msgstr ""
+
+msgid "Update"
+msgstr "Aggiorna"
+
+#, fuzzy
+msgid "Change your language"
+msgstr "Cambia la tua password"
+
+msgid "Language:"
+msgstr ""
+
 msgid "Change your password"
 msgstr "Cambia la tua password"
 
@@ -64,67 +148,68 @@ msgstr "Password"
 msgid "Repeat your new password:"
 msgstr "Ripeti la nuova password:"
 
-msgid "Update"
-msgstr "Aggiorna"
-
 msgid "Import"
 msgstr "Importa"
 
-msgid "Please execute the import script locally, it can take a very long time."
+#, fuzzy
-msgstr ""
+msgid "Please execute the import script locally as it can take a very long time."
-"Si prega di eseguire lo script di importazione a livello locale, può "
+msgstr "Si prega di eseguire lo script di importazione a livello locale, può richiedere un tempo molto lungo."
-"richiedere un tempo molto lungo."
 
-msgid "More info in the official doc:"
+#, fuzzy
+msgid "More info in the official documentation:"
 msgstr "Maggiori info nella documentazione ufficiale"
 
-msgid "import from Pocket"
+#, fuzzy
+msgid "Import from Pocket"
 msgstr "Importa da Pocket"
 
-msgid "import from Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr ""
+
+#, fuzzy
+msgid "Import from Readability"
 msgstr "Importa da Readability"
 
-msgid "import from Instapaper"
+#, fuzzy
+msgid "Import from Instapaper"
 msgstr "Importa da Instapaper"
 
-msgid "Export your poche data"
+#, fuzzy
+msgid "Import from wallabag"
+msgstr "Importa da Readability"
+
+#, fuzzy
+msgid "Export your wallabag data"
 msgstr "Esporta i tuoi dati di poche"
 
 msgid "Click here"
 msgstr "Fai clic qui"
 
-msgid "to export your poche data."
+msgid "to download your database."
+msgstr ""
+
+#, fuzzy
+msgid "to export your wallabag data."
 msgstr "per esportare i tuoi dati di poche."
 
-msgid "back to home"
+msgid "Cache"
-msgstr "torna alla home"
-
-msgid "installation"
-msgstr "installazione"
-
-msgid "install your poche"
-msgstr "installa il tuo poche"
-
-msgid ""
-"poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
 msgstr ""
-"poche non è ancora installato. Si prega di riempire il modulo sottostante "
-"per completare l'installazione. <a href='http://doc.inthepoche.com'>Leggere "
-"la documentazione sul sito di poche</a>."
 
-msgid "Login"
+msgid "to delete cache."
-msgstr "Nome utente"
+msgstr ""
 
-msgid "Repeat your password"
+msgid "You can enter multiple tags, separated by commas."
-msgstr "Ripeti la tua password"
+msgstr ""
 
-msgid "Install"
+msgid "return to article"
-msgstr "Installa"
+msgstr ""
 
-msgid "back to top"
+msgid "plop"
-msgstr "torna a inizio pagina"
+msgstr "plop"
+
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr ""
 
 msgid "favoris"
 msgstr "preferiti"
@@ -153,10 +238,14 @@ msgstr "per titolo"
 msgid "by title desc"
 msgstr "per titolo decr"
 
-msgid "No link available here!"
+msgid "Tag"
-msgstr "Nessun link disponibile!"
+msgstr ""
 
-msgid "toggle mark as read"
+msgid "No articles found."
+msgstr ""
+
+#, fuzzy
+msgid "Toggle mark as read"
 msgstr "segna come letto / non letto"
 
 msgid "toggle favorite"
@@ -168,13 +257,95 @@ msgstr "elimina"
 msgid "original"
 msgstr "originale"
 
+msgid "estimated reading time:"
+msgstr ""
+
+msgid "mark all the entries as read"
+msgstr ""
+
 msgid "results"
 msgstr "risultati"
 
-msgid "tweet"
+msgid "installation"
+msgstr "installazione"
+
+#, fuzzy
+msgid "install your wallabag"
+msgstr "installa il tuo poche"
+
+#, fuzzy
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "poche non è ancora installato. Si prega di riempire il modulo sottostante per completare l'installazione. <a href='http://doc.inthepoche.com'>Leggere la documentazione sul sito di poche</a>."
+
+msgid "Login"
+msgstr "Nome utente"
+
+msgid "Repeat your password"
+msgstr "Ripeti la tua password"
+
+msgid "Install"
+msgstr "Installa"
+
+#, fuzzy
+msgid "login to your wallabag"
+msgstr "accedi al tuo poche"
+
+msgid "Login to wallabag"
+msgstr ""
+
+msgid "you are in demo mode, some features may be disabled."
+msgstr "sei in modalità dimostrazione, alcune funzionalità potrebbero essere disattivate."
+
+msgid "Username"
+msgstr ""
+
+msgid "Stay signed in"
+msgstr "Resta connesso"
+
+msgid "(Do not check on public computers)"
+msgstr "(non selezionare su computer pubblici)"
+
+msgid "Sign in"
+msgstr "Accedi"
+
+msgid "favorites"
+msgstr "preferiti"
+
+msgid "estimated reading time :"
+msgstr ""
+
+msgid "Mark all the entries as read"
+msgstr ""
+
+msgid "Return home"
+msgstr ""
+
+#, fuzzy
+msgid "Back to top"
+msgstr "torna a inizio pagina"
+
+#, fuzzy
+msgid "Mark as read"
+msgstr "segna come letto / non letto"
+
+#, fuzzy
+msgid "Favorite"
+msgstr "preferiti"
+
+#, fuzzy
+msgid "Toggle favorite"
+msgstr "segna come preferito"
+
+#, fuzzy
+msgid "Delete"
+msgstr "elimina"
+
+#, fuzzy
+msgid "Tweet"
 msgstr "twitta"
 
-msgid "email"
+#, fuzzy
+msgid "Email"
 msgstr "email"
 
 msgid "shaarli"
@@ -183,26 +354,24 @@ msgstr "shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
+#, fuzzy
+msgid "Does this article appear wrong?"
 msgstr "articolo non visualizzato correttamente?"
 
-msgid "create an issue"
+msgid "tags:"
-msgstr "crea una segnalazione"
+msgstr ""
 
-msgid "or"
+msgid "Edit tags"
-msgstr "oppure"
+msgstr ""
 
-msgid "contact us by mail"
+msgid "save link!"
-msgstr "contattaci via email"
+msgstr ""
-
-msgid "plop"
-msgstr "plop"
 
 msgid "home"
 msgstr "home"
 
-msgid "favorites"
+msgid "tags"
-msgstr "preferiti"
+msgstr ""
 
 msgid "logout"
 msgstr "esci"
@@ -213,25 +382,187 @@ msgstr "realizzato con"
 msgid "debug mode is on so cache is off."
 msgstr "modalità di debug attiva, cache disattivata."
 
-msgid "your poche version:"
+#, fuzzy
-msgstr "la tua versione di poche:"
+msgid "your wallabag version:"
+msgstr "la tua versione"
 
 msgid "storage:"
 msgstr "memoria:"
 
-msgid "login to your poche"
+msgid "save a link"
-msgstr "accedi al tuo poche"
-
-msgid "you are in demo mode, some features may be disabled."
 msgstr ""
-"sei in modalità dimostrazione, alcune funzionalità potrebbero essere "
-"disattivate."
 
-msgid "Stay signed in"
+msgid "back to home"
-msgstr "Resta connesso"
+msgstr "torna alla home"
 
-msgid "(Do not check on public computers)"
+msgid "toggle mark as read"
-msgstr "(non selezionare su computer pubblici)"
+msgstr "segna come letto / non letto"
 
-msgid "Sign in"
+msgid "tweet"
-msgstr "Accedi"
+msgstr "twitta"
+
+msgid "email"
+msgstr "email"
+
+msgid "this article appears wrong?"
+msgstr "articolo non visualizzato correttamente?"
+
+msgid "No link available here!"
+msgstr "Nessun link disponibile!"
+
+msgid "Poching a link"
+msgstr "Pochare un link"
+
+msgid "by filling this field"
+msgstr "compilando questo campo"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
+
+msgid "your version"
+msgstr "la tua versione"
+
+msgid "latest stable version"
+msgstr "ultima versione stabile"
+
+msgid "a more recent stable version is available."
+msgstr "è disponibile una versione stabile più recente."
+
+msgid "you are up to date."
+msgstr "sei aggiornato."
+
+msgid "latest dev version"
+msgstr "ultima versione di sviluppo"
+
+msgid "a more recent development version is available."
+msgstr "è disponibile una versione di sviluppo più recente."
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "Si prega di eseguire lo script di importazione a livello locale, può richiedere un tempo molto lungo."
+
+#, fuzzy
+msgid "More infos in the official doc:"
+msgstr "Maggiori info nella documentazione ufficiale"
+
+msgid "import from Pocket"
+msgstr "Importa da Pocket"
+
+msgid "import from Readability"
+msgstr "Importa da Readability"
+
+msgid "import from Instapaper"
+msgstr "Importa da Instapaper"
+
+msgid "Tags"
+msgstr ""
+
+#, fuzzy
+msgid "Untitled"
+msgstr "per titolo"
+
+msgid "the link has been added successfully"
+msgstr ""
+
+msgid "error during insertion : the link wasn't added"
+msgstr ""
+
+msgid "the link has been deleted successfully"
+msgstr ""
+
+msgid "the link wasn't deleted"
+msgstr ""
+
+msgid "Article not found!"
+msgstr ""
+
+msgid "previous"
+msgstr ""
+
+msgid "next"
+msgstr ""
+
+msgid "in demo mode, you can't update your password"
+msgstr ""
+
+msgid "your password has been updated"
+msgstr ""
+
+msgid "the two fields have to be filled & the password must be the same in the two fields"
+msgstr ""
+
+msgid "still using the \""
+msgstr ""
+
+msgid "that theme does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your theme preferences"
+msgstr ""
+
+msgid "that language does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your language preferences"
+msgstr ""
+
+msgid "login failed: you have to fill all fields"
+msgstr ""
+
+msgid "welcome to your wallabag"
+msgstr ""
+
+msgid "login failed: bad login or password"
+msgstr ""
+
+#, fuzzy
+msgid "import from instapaper completed"
+msgstr "Importa da Instapaper"
+
+#, fuzzy
+msgid "import from pocket completed"
+msgstr "Importa da Pocket"
+
+#, fuzzy
+msgid "import from Readability completed. "
+msgstr "Importa da Readability"
+
+#, fuzzy
+msgid "import from Poche completed. "
+msgstr "Importa da Pocket"
+
+msgid "Unknown import provider."
+msgstr ""
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr ""
+
+msgid "Could not find required \""
+msgstr ""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr ""
+
+#, fuzzy
+msgid "Cache deleted."
+msgstr "elimina"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr ""
+
+#~ msgid "poche it!"
+#~ msgstr "pochalo!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Aggiornamento poche"
+
+#~ msgid "create an issue"
+#~ msgstr "crea una segnalazione"
+
+#~ msgid "or"
+#~ msgstr "oppure"
+
+#~ msgid "contact us by mail"
+#~ msgstr "contattaci via email"
+
+#~ msgid "your poche version:"
+#~ msgstr "la tua versione di poche:"

locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wballabag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-07 17:38+0300\n"
+"POT-Creation-Date: 2014-02-24 15:19+0300\n"
-"PO-Revision-Date: 2014-02-07 17:43+0300\n"
+"PO-Revision-Date: 2014-02-24 15:29+0300\n"
 "Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -15,7 +15,7 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
 
 msgid "poche, a read it later open source system"
 msgstr "poche, serwis odrocznego czytania open source"
@@ -23,114 +23,15 @@ msgstr "poche, serwis odrocznego czytania open source"
 msgid "login failed: user doesn't exist"
 msgstr "logowanie nie udało się: użytkownik nie istnieje"
 
-msgid "Return home"
+msgid "home"
-msgstr "Wrocic do głównej"
+msgstr "strona domowa"
 
-msgid "Back to top"
+msgid "favorites"
-msgstr "Wrócić na górę"
-
-msgid "original"
-msgstr "oryginal"
-
-msgid "Mark as read"
-msgstr "Zaznacz jako przeczytane"
-
-msgid "Toggle mark as read"
-msgstr "Przełącz jako przeczytane"
-
-msgid "Favorite"
-msgstr "Ulubiony"
-
-msgid "Toggle favorite"
-msgstr "Zaznacz jako ulubione"
-
-msgid "Delete"
-msgstr "Usuń"
-
-msgid "Tweet"
-msgstr "Tweet"
-
-msgid "Email"
-msgstr "Wyslij email"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "flattr"
-
-msgid "Does this article appear wrong?"
-msgstr "Czy ten artykuł wygląda nieprawidłowo?"
-
-msgid "tags:"
-msgstr "tegi:"
-
-msgid "Edit tags"
-msgstr "Redagowac tegi"
-
-msgid "return home"
-msgstr "wrócić do głównej"
-
-msgid "powered by"
-msgstr "zasilany przez"
-
-msgid "debug mode is on so cache is off."
-msgstr "tryb debugowania jest włączony, więc cash jest wyłączony."
-
-msgid "your poche version:"
-msgstr "twoja wersja poche:"
-
-msgid "storage:"
-msgstr "magazyn:"
-
-msgid "favoris"
 msgstr "ulubione"
 
 msgid "archive"
 msgstr "archiwum"
 
-msgid "unread"
-msgstr "nieprzeczytane"
-
-msgid "by date asc"
-msgstr "według daty rosnąco"
-
-msgid "by date"
-msgstr "wg daty"
-
-msgid "by date desc"
-msgstr "według daty spadająco"
-
-msgid "by title asc"
-msgstr "według tytułu rosnąco"
-
-msgid "by title"
-msgstr "wg tytułu"
-
-msgid "by title desc"
-msgstr "według tytułu malejąco"
-
-msgid "No articles found."
-msgstr "Nie znaleziono artykułów."
-
-msgid "toggle favorite"
-msgstr "przełączyc ulubione"
-
-msgid "delete"
-msgstr "usunąć"
-
-msgid "estimated reading time:"
-msgstr "szacowany czas odczytu:"
-
-msgid "results"
-msgstr "wyniki"
-
-msgid "home"
-msgstr "główna"
-
-msgid "favorites"
-msgstr "ulubione"
-
 msgid "tags"
 msgstr "tagi"
 
@@ -140,89 +41,64 @@ msgstr "ustawienia"
 msgid "logout"
 msgstr "wyloguj"
 
-msgid "Poching links"
+msgid "back to home"
+msgstr "wróć do strony domowej"
+
+msgid "Tags"
+msgstr "Tagi"
+
+#, fuzzy
+msgid "Poching a link"
 msgstr "Zapisywanie linków"
 
-msgid "There are several ways to poche a link:"
+msgid "You can poche a link by several methods:"
 msgstr "Istnieje kilka sposobów aby zapisać link:"
 
 msgid "read the documentation"
-msgstr "zapoznać się z dokumentacją"
+msgstr "przeczytaj dokumentację"
 
 msgid "download the extension"
-msgstr "pobrać rozszerzenie"
+msgstr "pobierz rozszerzenie"
-
-msgid "via F-Droid"
-msgstr "przez F-Droid"
-
-msgid " or "
-msgstr "albo"
-
-msgid "via Google Play"
-msgstr "przez Google Play"
 
 msgid "download the application"
-msgstr "pobrać aplikację"
+msgstr "pobierz aplikację"
 
-msgid "By filling this field"
+#, fuzzy
+msgid "by filling this field"
 msgstr "Poprzez wypełnienie tego pola"
 
 msgid "poche it!"
-msgstr "zapisać!"
+msgstr "zapisz!"
 
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+#, fuzzy
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
 msgstr "Bookmarklet: przeciągnij i upucs ten link na pasek zakladek"
 
 msgid "Updating poche"
 msgstr "Aktualizacja poche"
 
-msgid "Installed version"
+msgid "your version"
-msgstr "Zainstalowana wersja "
+msgstr "twoja wersja"
 
-msgid "Latest stable version"
+#, fuzzy
+msgid "latest stable version"
 msgstr "Najnowsza stabilna wersja"
 
-msgid "A more recent stable version is available."
+#, fuzzy
+msgid "a more recent stable version is available."
 msgstr "Nowsza stabilna wersja jest dostępna."
 
-msgid "You are up to date."
+msgid "you are up to date."
-msgstr "Masz wszystko najnowsze."
+msgstr "brak nowych aktualizacji."
 
 msgid "latest dev version"
-msgstr "najnowsza wersja dev"
+msgstr "najnowsza wersja rozwojowa"
 
 msgid "a more recent development version is available."
 msgstr "Nowsza wersja rozwojowa jest dostępna."
 
-msgid "you are up to date."
-msgstr "masz wszystko najnowsze."
-
-msgid "Feeds"
-msgstr "Kanały (feeds)"
-
-msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
-msgstr "Twój znak kanału jest pusty i musi najpierw zostac wygenerowany. Kliknij <a href='?feed&action=generate'>tu dla jego generacji</a>."
-
-msgid "Unread feed"
-msgstr "Kanał nieprzeczytanego"
-
-msgid "Favorites feed"
-msgstr "Kanał ulubionego"
-
-msgid "Archive feed"
-msgstr "Kanał archiwum"
-
-msgid "Your token:"
-msgstr "Twój znak (token): "
-
-msgid "Your user id:"
-msgstr "Twój id użytkownika (user id):"
-
-msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
-msgstr "Mozna zgenerowac nowy znak: kliknij <a href='?feed&amp;action=generate'>zgenerowac!</a>."
-
 msgid "Change your theme"
-msgstr "Zmienic motyw"
+msgstr "Zmień motyw"
 
 msgid "Theme:"
 msgstr "Motyw:"
@@ -230,12 +106,6 @@ msgstr "Motyw:"
 msgid "Update"
 msgstr "Aktualizacja"
 
-msgid "Change your language"
-msgstr "Zmienić język"
-
-msgid "Language:"
-msgstr "Język:"
-
 msgid "Change your password"
 msgstr "Zmień hasło"
 
@@ -251,69 +121,47 @@ msgstr "Powtórz hasło jeszcze raz:"
 msgid "Import"
 msgstr "Import"
 
-msgid "Please execute the import script locally as it can take a very long time."
+msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Proszę wykonać skrypt import lokalnie, gdyż moze to trwać bardzo długo."
+msgstr "Proszę wykonać skrypt importu lokalnie, ponieważ moze to trwać bardzo długo."
 
-msgid "More info in the official docs:"
+msgid "More infos in the official doc:"
-msgstr "Więcej informacji w oficjalnej dokumentacji:"
+msgstr "Więcej informacji znajduje się w oficjalnej dokumentacji:"
 
-msgid "Import from Pocket"
+msgid "import from Pocket"
-msgstr "Іmport z Pocket'a"
+msgstr "Importuj z Pocket'a"
 
 #, php-format
 msgid "(you must have a %s file on your server)"
 msgstr "(musisz mieć plik %s na serwerze)"
 
-msgid "Import from Readability"
+msgid "import from Readability"
-msgstr "Import z Readability"
+msgstr "Importuj z Readability"
 
-msgid "Import from Instapaper"
+msgid "import from Instapaper"
-msgstr "Import z Instapaper"
+msgstr "Importuj z Instapaper"
 
-msgid "Import from poche"
+#, fuzzy
-msgstr "Import z poche"
+msgid "Export your poche datas"
-
+msgstr "Exportuj dane poche"
-msgid "Export your poche data"
-msgstr "Eksportowac dane poche"
 
 msgid "Click here"
 msgstr "Kliknij tu"
 
-msgid "to download your database."
+#, fuzzy
-msgstr "aby pobrac bazę danych."
+msgid "to export your poche datas."
-
+msgstr "aby wyeksportować dane poche."
-msgid "to export your poche data."
-msgstr "aby eksportować dane poche."
-
-msgid "Tag"
-msgstr "Teg"
-
-msgid "No link available here!"
-msgstr "Brak dostępnych linków!"
-
-msgid "toggle mark as read"
-msgstr "przełączyć znak jako przeczytane"
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr "Mozna wprowadzić wiele tagów rozdzielajac je przecinkami."
-
-msgid "return to article"
-msgstr "wrócić do artykułu"
 
 msgid "plop"
 msgstr "plop"
 
-msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
-msgstr "Można <a href='wallabag_compatibility_test.php'>sprawdzić swoją konfigurację tu</a>."
-
 msgid "installation"
 msgstr "instalacja"
 
 msgid "install your wallabag"
-msgstr "zainstalować wallabag"
+msgstr "zainstaluj wallabag"
 
 msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
-msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalowac. Nie wahaj się <a href='http://doc.wallabag.org/'>zapoznac się z dokumentacja na stronie wallabag</a>."
+msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalować. Nie wahaj się <a href='http://doc.wallabag.org/'>zapoznać się z dokumentacją na stronie wallabag</a>."
 
 msgid "Login"
 msgstr "Login"
@@ -322,34 +170,291 @@ msgid "Repeat your password"
 msgstr "Powtórz hasło"
 
 msgid "Install"
-msgstr "Instalowac"
+msgstr "Instaluj"
+
+msgid "favoris"
+msgstr "ulubione"
+
+msgid "unread"
+msgstr "nieprzeczytane"
+
+msgid "by date asc"
+msgstr "według daty rosnąco"
+
+msgid "by date"
+msgstr "wg daty"
+
+msgid "by date desc"
+msgstr "według daty malejąco"
+
+msgid "by title asc"
+msgstr "według tytułu rosnąco"
+
+msgid "by title"
+msgstr "wg tytułu"
+
+msgid "by title desc"
+msgstr "według tytułu malejąco"
+
+msgid "No link available here!"
+msgstr "Brak dostępnych linków!"
+
+msgid "toggle mark as read"
+msgstr "przełącz jako przeczytane"
+
+msgid "toggle favorite"
+msgstr "przełącz ulubione"
+
+msgid "delete"
+msgstr "usuń"
+
+msgid "original"
+msgstr "oryginał"
+
+msgid "estimated reading time:"
+msgstr "szacowany czas odczytu:"
+
+msgid "results"
+msgstr "wyniki"
 
 msgid "login to your wallabag"
-msgstr "zalogować się do swojego wallabag"
+msgstr "zaloguj się do swojego wallabag"
-
-msgid "Login to wallabag"
-msgstr "Zalogować się do wallabag"
 
 msgid "you are in demo mode, some features may be disabled."
-msgstr "jesteś w trybie demo, niektóre funkcje mogą być niedostępne."
+msgstr "jesteś w trybie demo, niektóre funkcje mogą być wyłączone."
-
-msgid "Username"
-msgstr "Imię użytkownika"
 
 msgid "Stay signed in"
 msgstr "Pozostań zalogowany"
 
 msgid "(Do not check on public computers)"
-msgstr "(Nie sprawdzaj na publicznych komputerach"
+msgstr "(Nie sprawdzaj na publicznych komputerach)"
+
+msgid "Saving articles"
+msgstr "Zapisywanie artykułów"
+
+msgid "There are several ways to save an article:"
+msgstr "Istnieje kilka sposobów aby zapisać artykuł:"
+
+msgid "via F-Droid"
+msgstr "przez F-Droid"
+
+msgid " or "
+msgstr "albo"
+
+msgid "via Google Play"
+msgstr "przez Google Play"
+
+msgid "By filling this field"
+msgstr "Poprzez wypełnienie tego pola"
+
+msgid "bag it!"
+msgstr "zapisz!"
+
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Bookmarklet: przeciągnij i upuść ten link na pasek zakladek"
+
+msgid "Upgrading wallabag"
+msgstr "Aktualizacja wallabag"
+
+msgid "Installed version"
+msgstr "Zainstalowana wersja "
+
+msgid "Latest stable version"
+msgstr "Najnowsza stabilna wersja"
+
+msgid "A more recent stable version is available."
+msgstr "Nowsza stabilna wersja jest dostępna."
+
+msgid "You are up to date."
+msgstr "Brak nowych aktualizacji."
+
+msgid "Latest dev version"
+msgstr "Najnowsza wersja rozwojowa"
+
+#, fuzzy
+msgid "A more recent development version is available."
+msgstr "Nowsza wersja rozwojowa jest dostępna."
+
+msgid "Feeds"
+msgstr "Kanały (feeds)"
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr "Twój token kanału jest pusty i musi najpierw zostać wygenerowany. Kliknij <a href='?feed&action=generate'>tu aby go wygenerować</a>."
+
+msgid "Unread feed"
+msgstr "Kanał nieprzeczytanych"
+
+msgid "Favorites feed"
+msgstr "Kanał ulubionych"
+
+msgid "Archive feed"
+msgstr "Kanał archiwum"
+
+msgid "Your token:"
+msgstr "Twój token: "
+
+msgid "Your user id:"
+msgstr "Twój identyfikator użytkownika:"
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr "Możesz wygenerować token ponownie: kliknij <a href='?feed&amp;action=generate'>generuj!</a>."
+
+msgid "Change your language"
+msgstr "Zmień język"
+
+msgid "Language:"
+msgstr "Język:"
+
+msgid "Please execute the import script locally as it can take a very long time."
+msgstr "Proszę wykonać skrypt importu lokalnie, gdyż moze to trwać bardzo długo."
+
+#, fuzzy
+msgid "More info in the official documentation:"
+msgstr "Więcej informacji znajduje się w oficjalnej dokumentacji:"
+
+msgid "Import from Pocket"
+msgstr "Іmport z Pocket'a"
+
+msgid "Import from Readability"
+msgstr "Import z Readability"
+
+msgid "Import from Instapaper"
+msgstr "Import z Instapaper"
+
+msgid "Import from wallabag"
+msgstr "Import z wallabag"
+
+msgid "Export your wallabag data"
+msgstr "Eksportowac dane wallabag"
+
+msgid "to download your database."
+msgstr "aby pobrac bazę danych."
+
+msgid "to export your wallabag data."
+msgstr "aby eksportować dane wallabag."
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "to delete cache."
+msgstr "aby wyczyścić cache."
+
+msgid "tweet"
+msgstr "tweet"
+
+#, fuzzy
+msgid "email"
+msgstr "Wyślij email"
+
+msgid "shaarli"
+msgstr "shaarli"
+
+msgid "flattr"
+msgstr "flattr"
+
+msgid "this article appears wrong?"
+msgstr "Czy ten artykuł wyświetla się nieprawidłowo?"
+
+msgid "You can enter multiple tags, separated by commas."
+msgstr "Możesz wprowadzić wiele tagów, rozdzielając je przecinkami."
+
+msgid "return to article"
+msgstr "wróć do artykułu"
+
+#, fuzzy
+msgid "powered by"
+msgstr "zasilany przez"
+
+msgid "debug mode is on so cache is off."
+msgstr "tryb debugowania jest włączony, więc cashe jest wyłączony."
+
+msgid "your wallabag version:"
+msgstr "twoja wersja wallabag:"
+
+msgid "storage:"
+msgstr "magazyn:"
+
+msgid "save a link"
+msgstr "zapisz link"
+
+msgid "return home"
+msgstr "wróć do strony domowej"
+
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr "Możesz <a href='wallabag_compatibility_test.php'>sprawdzić swoją konfigurację tu</a>."
+
+msgid "Tag"
+msgstr "Tag"
+
+msgid "No articles found."
+msgstr "Nie znaleziono artykułów."
+
+msgid "Toggle mark as read"
+msgstr "Przełącz jako przeczytane"
+
+msgid "mark all the entries as read"
+msgstr "zaznacz wszystko jako przeczytane"
+
+msgid "Login to wallabag"
+msgstr "Zaloguj się do wallabag"
+
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+msgid "Sign in"
+msgstr "Login"
+
+msgid "Return home"
+msgstr "Wróć do strony domowej"
+
+msgid "Back to top"
+msgstr "Wróć na górę"
+
+msgid "Mark as read"
+msgstr "Zaznacz jako przeczytane"
+
+msgid "Favorite"
+msgstr "Ulubione"
+
+msgid "Toggle favorite"
+msgstr "Zaznacz jako ulubione"
+
+msgid "Delete"
+msgstr "Usuń"
+
+msgid "Tweet"
+msgstr "Tweet"
+
+msgid "Email"
+msgstr "Wyślij email"
+
+msgid "Does this article appear wrong?"
+msgstr "Czy ten artykuł wyświetla się nieprawidłowo?"
+
+msgid "tags:"
+msgstr "tegi:"
+
+msgid "Edit tags"
+msgstr "Edytuj tagi"
+
+msgid "save link!"
+msgstr "zapisz link!"
+
+#, fuzzy
+msgid "estimated reading time :"
+msgstr "szacowany czas odczytu:"
+
+msgid "Mark all the entries as read"
+msgstr "Oznacz wszystko jako przeczytane"
 
 msgid "Untitled"
 msgstr "Bez nazwy"
 
 msgid "the link has been added successfully"
-msgstr "link pozostał pomyślnie dodany"
+msgstr "link został pomyślnie dodany"
 
 msgid "error during insertion : the link wasn't added"
-msgstr "błąd podczas wprowadzania: link nie zostal dodany"
+msgstr "błąd podczas wprowadzania: link nie został dodany"
 
 msgid "the link has been deleted successfully"
 msgstr "link zostal pomyślnie usunięty"
@@ -357,6 +462,9 @@ msgstr "link zostal pomyślnie usunięty"
 msgid "the link wasn't deleted"
 msgstr "link nie został usunięty"
 
+msgid "Article not found!"
+msgstr "Nie znaleziono artykułu."
+
 msgid "previous"
 msgstr "poprzednia"
 
@@ -367,7 +475,7 @@ msgid "in demo mode, you can't update your password"
 msgstr "w trybie demo, nie można zmieniać hasła"
 
 msgid "your password has been updated"
-msgstr "twoje hasło zmienione"
+msgstr "twoje hasło zostało zmienione"
 
 msgid "the two fields have to be filled & the password must be the same in the two fields"
 msgstr "oba pola muszą być wypełnione i hasła muszę być takie same w obu polach"
@@ -376,31 +484,28 @@ msgid "still using the \""
 msgstr "nadal w użyciu  \""
 
 msgid "that theme does not seem to be installed"
-msgstr "wydaje się że motyw nie był zainstalowany"
+msgstr "wydaje się że ten motyw nie jest zainstalowany"
 
 msgid "you have changed your theme preferences"
-msgstr "ustawienia motywu zostałe zmienione"
+msgstr "ustawienia motywu zostały zmienione"
 
 msgid "that language does not seem to be installed"
-msgstr "wydaje się że język nie był zainstalowany"
+msgstr "wydaje się że ten język nie jest zainstalowany"
 
 msgid "you have changed your language preferences"
-msgstr "ustawienia języka zostałe zmienione"
+msgstr "ustawienia języka zostały zmienione"
 
 msgid "login failed: you have to fill all fields"
 msgstr "logowanie nie powiodlo się: musisz wypełnić wszystkie pola"
 
-msgid "welcome to your poche"
+msgid "welcome to your wallabag"
-msgstr "witamy w poche"
+msgstr "Witamy w wallabag"
 
 msgid "login failed: bad login or password"
-msgstr "logowanie nie powiodlo się: zly login lub hasło"
+msgstr "logowanie nie powiodlo się: niepoprawny login lub hasło"
-
-msgid "see you soon!"
-msgstr "do zobaczenia wkrótce!"
 
 msgid "import from instapaper completed"
-msgstr "import з instapaper'a zakończony"
+msgstr "import z instapaper'a zakończony"
 
 msgid "import from pocket completed"
 msgstr "import z pocket'a zakończony"
@@ -415,14 +520,25 @@ msgid "Unknown import provider."
 msgstr "Nieznany dostawca importu."
 
 msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr "Niekompletny plik inc/poche/define.inc.php, proszę definiować \""
+msgstr "Niekompletny plik inc/poche/define.inc.php, proszę zdefiniować \""
 
 msgid "Could not find required \""
 msgstr "Nie znaleziono potrzebnego \""
 
 msgid "Uh, there is a problem while generating feeds."
-msgstr "Uh, jest problem podczas generowania kanałów (feeds)."
+msgstr "Uh, jest problem podczas generowania kanałów."
+
+msgid "Cache deleted."
+msgstr "Cache wyczyszczony."
 
 msgid "Oops, it seems you don't have PHP 5."
-msgstr "Oops, wygląda ze u was niema PHP 5."
+msgstr "Oops, wygląda ze nie masz PHP 5."
 
+#~ msgid "Import from poche"
+#~ msgstr "Import z poche"
+
+#~ msgid "welcome to your poche"
+#~ msgstr "witamy w poche"
+
+#~ msgid "see you soon!"
+#~ msgstr "do zobaczenia wkrótce!"

locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po

@@ -0,0 +1,549 @@
+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: @iancamporez <ian@camporez.com>\n"
+"Language-Team: @iancamporez <ian@camporez.com>\n"
+"Language: pt_BR\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-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/ian/Projetos/wallabag/locale/en_EN.utf8/"
+"LC_MESSAGES\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr "wallabag, um \"read it later\" de código aberto"
+
+msgid "login failed: user doesn't exist"
+msgstr "falha ao entrar: o usuário não existe"
+
+msgid "return home"
+msgstr "retornar à página inicial"
+
+msgid "config"
+msgstr "configurar"
+
+msgid "Saving articles"
+msgstr "Salvando artigos"
+
+msgid "There are several ways to save an article:"
+msgstr "Existem várias maneiras de salvar um artigo:"
+
+msgid "read the documentation"
+msgstr "ler a documentação"
+
+msgid "download the extension"
+msgstr "baixar a extensão"
+
+msgid "via F-Droid"
+msgstr "via F-Droid"
+
+msgid " or "
+msgstr "ou "
+
+msgid "via Google Play"
+msgstr "via Google Play"
+
+msgid "download the application"
+msgstr "baixar o aplicativo"
+
+msgid "By filling this field"
+msgstr "Preenchendo esse campo"
+
+msgid "bag it!"
+msgstr "adicionar ao wallabag"
+
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Bookmarklet: arraste esse link para sua barra de favoritos"
+
+msgid "Upgrading wallabag"
+msgstr "Atualizando o wallabag"
+
+msgid "Installed version"
+msgstr "Versão instalada"
+
+msgid "Latest stable version"
+msgstr "Última versão estável"
+
+msgid "A more recent stable version is available."
+msgstr "Uma versão estável mais nova está disponível"
+
+msgid "You are up to date."
+msgstr "Você está atualizado."
+
+msgid "Latest dev version"
+msgstr "Última versão em desenvolvimento"
+
+msgid "A more recent development version is available."
+msgstr "Uma versão em desenvolvimento mais recente está disponível"
+
+msgid "Feeds"
+msgstr "Feeds"
+
+msgid ""
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+"Seu token do feed e precisa ser gerado para ativar os feeds. Clique <a "
+"href='?feed&amp;action=generate'>aqui para gerar um token</a>."
+
+msgid "Unread feed"
+msgstr "Feed de artigos não lidos"
+
+msgid "Favorites feed"
+msgstr "Feed dos favoritos"
+
+msgid "Archive feed"
+msgstr "Feed de arquivados"
+
+msgid "Your token:"
+msgstr "Seu token:"
+
+msgid "Your user id:"
+msgstr "Seu código de usuário:"
+
+msgid ""
+"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
+"</a>."
+msgstr ""
+"Você pode regerar seu token: <a href='?feed&amp;action=generate'>gerar!</a>."
+
+msgid "Change your theme"
+msgstr "Mudar seu tema"
+
+msgid "Theme:"
+msgstr "Tema:"
+
+msgid "Update"
+msgstr "Atualizar"
+
+msgid "Change your language"
+msgstr "Alterar seu idioma"
+
+msgid "Language:"
+msgstr "Idioma:"
+
+msgid "Change your password"
+msgstr "Alterar sua senha"
+
+msgid "New password:"
+msgstr "Nova senha:"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid "Repeat your new password:"
+msgstr "Repetir sua nova senha:"
+
+msgid "Import"
+msgstr "Importar"
+
+msgid ""
+"Please execute the import script locally as it can take a very long time."
+msgstr ""
+"Por favor, execute o script de importação localmente, pois pode demorar "
+"muito tempo."
+
+msgid "More info in the official documentation:"
+msgstr "Mais informações na documentação oficial:"
+
+msgid "Import from Pocket"
+msgstr "Importar do Pocket"
+
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr "(você deve ter um arquivo %s no seu servidor)"
+
+msgid "Import from Readability"
+msgstr "Importar do Readability"
+
+msgid "Import from Instapaper"
+msgstr "Importar do Instapaper"
+
+msgid "Import from wallabag"
+msgstr "Importar do wallabag"
+
+msgid "Export your wallabag data"
+msgstr "Exportar seus dados do wallabag"
+
+msgid "Click here"
+msgstr "Clique aqui"
+
+msgid "to download your database."
+msgstr "para baixar seu banco de dados."
+
+msgid "to export your wallabag data."
+msgstr "para exportar seus dados do wallabag."
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "to delete cache."
+msgstr "para apagar o cache."
+
+msgid "You can enter multiple tags, separated by commas."
+msgstr "Você pode inserir várias tags, separadas por vírgulas."
+
+msgid "return to article"
+msgstr "retornar ao artigo"
+
+msgid "plop"
+msgstr "plop"
+
+msgid ""
+"You can <a href='wallabag_compatibility_test.php'>check your configuration "
+"here</a>."
+msgstr ""
+"Você pode <a href='wallabag_compatibility_test.php'>checar suas "
+"configurações aqui</a>."
+
+msgid "favoris"
+msgstr "favoritos"
+
+msgid "archive"
+msgstr "arquivo"
+
+msgid "unread"
+msgstr "não lidos"
+
+msgid "by date asc"
+msgstr "por data (cresc.)"
+
+msgid "by date"
+msgstr "por data"
+
+msgid "by date desc"
+msgstr "por data (decr.)"
+
+msgid "by title asc"
+msgstr "por título (cresc.)"
+
+msgid "by title"
+msgstr "por título"
+
+msgid "by title desc"
+msgstr "por título (decr.)"
+
+msgid "Tag"
+msgstr "Tag"
+
+msgid "No articles found."
+msgstr "Nenhum artigo encontrado."
+
+msgid "Toggle mark as read"
+msgstr "Alterar \"marcar como lido\""
+
+msgid "toggle favorite"
+msgstr "alterar \"favorito\""
+
+msgid "delete"
+msgstr "deletar"
+
+msgid "original"
+msgstr "original"
+
+msgid "estimated reading time:"
+msgstr "tempo estimado de leitura:"
+
+msgid "mark all the entries as read"
+msgstr "marcar todas as entradas como lidas"
+
+msgid "results"
+msgstr "resultados"
+
+msgid "installation"
+msgstr "instalação"
+
+msgid "install your wallabag"
+msgstr "instalar seu wallabag"
+
+msgid ""
+"wallabag is still not installed. Please fill the below form to install it. "
+"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
+"on wallabag website</a>."
+msgstr ""
+"O wallabag ainda não está instalado. Preencha o formulário abaixo para "
+"instalá-lo. Não hesite em <a href='http://doc.wallabag.org/'>ler a "
+"documentação no site do wallabag</a>."
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Repeat your password"
+msgstr "Repetir sua senha"
+
+msgid "Install"
+msgstr "Instalar"
+
+msgid "login to your wallabag"
+msgstr "entrar no seu wallabag"
+
+msgid "Login to wallabag"
+msgstr "Entrar no wallabag"
+
+msgid "you are in demo mode, some features may be disabled."
+msgstr "você está no modo demo, alguns recursos podem estar desativados."
+
+msgid "Username"
+msgstr "Nome de usuário"
+
+msgid "Stay signed in"
+msgstr "Continuar conectado"
+
+msgid "(Do not check on public computers)"
+msgstr "(Não marque em computadores públicos)"
+
+msgid "Sign in"
+msgstr "Entrar"
+
+msgid "favorites"
+msgstr "favoritos"
+
+msgid "estimated reading time :"
+msgstr "tempo estimado de leitura :"
+
+msgid "Mark all the entries as read"
+msgstr "Marcar todas as entradas como lidas"
+
+msgid "Return home"
+msgstr "Retornar à página inicial"
+
+msgid "Back to top"
+msgstr "Voltar ao topo"
+
+msgid "Mark as read"
+msgstr "Marcar como lido"
+
+msgid "Favorite"
+msgstr "Favoritar"
+
+msgid "Toggle favorite"
+msgstr "Alterar \"favorito\""
+
+msgid "Delete"
+msgstr "Deletar"
+
+msgid "Tweet"
+msgstr "Tweetar"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "shaarli"
+msgstr "shaarli"
+
+msgid "flattr"
+msgstr "flattr"
+
+msgid "Does this article appear wrong?"
+msgstr "Esse artigo está sendo exibido incorretamente?"
+
+msgid "tags:"
+msgstr "tags:"
+
+msgid "Edit tags"
+msgstr "Editar tags"
+
+msgid "save link!"
+msgstr "salvar link!"
+
+msgid "home"
+msgstr "início"
+
+msgid "tags"
+msgstr "tags"
+
+msgid "logout"
+msgstr "sair"
+
+msgid "powered by"
+msgstr "powered by"
+
+msgid "debug mode is on so cache is off."
+msgstr "o modo debug está ativo, então o cache foi desativado."
+
+msgid "your wallabag version:"
+msgstr "sua versão do wallabag:"
+
+msgid "storage:"
+msgstr "armazenamento:"
+
+msgid "save a link"
+msgstr "salvar link"
+
+msgid "back to home"
+msgstr "voltar à página inicial"
+
+msgid "toggle mark as read"
+msgstr "alterar \"marcar como lido\""
+
+msgid "tweet"
+msgstr "tweetar"
+
+msgid "email"
+msgstr "email"
+
+msgid "this article appears wrong?"
+msgstr "esse artigo está sendo mostrado incorretamente?"
+
+msgid "No link available here!"
+msgstr "Nenhum link disponível aqui!"
+
+msgid "Poching a link"
+msgstr "Pocheando um link"
+
+msgid "by filling this field"
+msgstr "preenchendo esse campo"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "bookmarklet: arraste esse link para a sua barra de favoritos"
+
+msgid "your version"
+msgstr "sua versão"
+
+msgid "latest stable version"
+msgstr "última versão estável"
+
+msgid "a more recent stable version is available."
+msgstr "uma versão estável mais nova está disponível"
+
+msgid "you are up to date."
+msgstr "você está atualizado."
+
+msgid "latest dev version"
+msgstr "última versão em desenvolvimento"
+
+msgid "a more recent development version is available."
+msgstr "uma versão em desenvolvimento mais nova está disponível"
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr ""
+"Por favor, execute o script de importação localmente, pois pode demorar "
+"muito tempo."
+
+msgid "More infos in the official doc:"
+msgstr "Mais informações na documentação oficial:"
+
+msgid "import from Pocket"
+msgstr "importar do Pocket"
+
+msgid "import from Readability"
+msgstr "importar do Readability"
+
+msgid "import from Instapaper"
+msgstr "importar do Instapaper"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Untitled"
+msgstr "Sem título"
+
+msgid "the link has been added successfully"
+msgstr "o link foi adicionado com sucesso"
+
+msgid "error during insertion : the link wasn't added"
+msgstr "erro durante a inserção: o link não foi adicionado"
+
+msgid "the link has been deleted successfully"
+msgstr "o link foi deletado com sucesso"
+
+msgid "the link wasn't deleted"
+msgstr "o link não foi deletado"
+
+msgid "Article not found!"
+msgstr "Artigo não encontrado!"
+
+msgid "previous"
+msgstr "anterior"
+
+msgid "next"
+msgstr "próximo"
+
+msgid "in demo mode, you can't update your password"
+msgstr "você não pode alterar a senha no modo demo"
+
+msgid "your password has been updated"
+msgstr "sua senha foi atualizada"
+
+msgid ""
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
+msgstr ""
+"os dois campos devem estar preenchidos e as senhas devem ser iguais em ambos"
+
+msgid "still using the \""
+msgstr "ainda usando o \""
+
+msgid "that theme does not seem to be installed"
+msgstr "esse tema aparentemente não está instalado"
+
+msgid "you have changed your theme preferences"
+msgstr "você alterou suas preferências de tema"
+
+msgid "that language does not seem to be installed"
+msgstr "esse idioma aparentemente não está instalado"
+
+msgid "you have changed your language preferences"
+msgstr "você alterou suas preferências de idioma"
+
+msgid "login failed: you have to fill all fields"
+msgstr "falha ao entrar: você deve preencher todos os campos"
+
+msgid "welcome to your wallabag"
+msgstr "bem-vindo ao seu wallabag"
+
+msgid "login failed: bad login or password"
+msgstr "falha ao entrar: login ou senha incorretos"
+
+msgid "import from instapaper completed"
+msgstr "importação do instapaper completa"
+
+msgid "import from pocket completed"
+msgstr "importação do pocket completa"
+
+msgid "import from Readability completed. "
+msgstr "importação do Readability completa. "
+
+msgid "import from Poche completed. "
+msgstr "importação do Poche completa. "
+
+msgid "Unknown import provider."
+msgstr "Serviço de importação desconhecido."
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr "Arquivo inc/poche/define.inc.php incompleto, por favor defina \""
+
+msgid "Could not find required \""
+msgstr "Não foi possível encontrar o requerido \""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr "Uh, houve um problema ao gerar os feeds."
+
+msgid "Cache deleted."
+msgstr "Cache deletado."
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr "Oops, parece que você não tem o PHP 5."
+
+#~ 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:"

locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-07 12:40+0300\n"
+"POT-Creation-Date: 2014-02-25 15:09+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
@@ -14,135 +14,25 @@ msgstr ""
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
 
-msgid "poche, a read it later open source system"
+msgid "wallabag, a read it later open source system"
-msgstr "poche, сервис отложенного чтения с открытым исходным кодом"
+msgstr "wallabag, сервис отложенного чтения с открытым исходным кодом"
 
 msgid "login failed: user doesn't exist"
 msgstr "войти не удалось: пользователь не существует"
 
-msgid "Return home"
-msgstr "На главную"
-
-msgid "Back to top"
-msgstr "Наверх"
-
-msgid "original"
-msgstr "источник"
-
-msgid "Mark as read"
-msgstr "Отметить как прочитанное"
-
-msgid "Toggle mark as read"
-msgstr "Изменить отметку 'прочитано'"
-
-msgid "Favorite"
-msgstr "Избранное"
-
-msgid "Toggle favorite"
-msgstr "Изменить метку избранного"
-
-msgid "Delete"
-msgstr "Удалить"
-
-msgid "Tweet"
-msgstr "Твитнуть"
-
-msgid "Email"
-msgstr "Отправить по почте"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "проспонсировать"
-
-msgid "Does this article appear wrong?"
-msgstr "Статья выглядит криво?"
-
-msgid "tags:"
-msgstr "теги:"
-
-msgid "Edit tags"
-msgstr "Редактировать теги"
-
 msgid "return home"
 msgstr "на главную"
 
-msgid "powered by"
-msgstr "при поддержке"
-
-msgid "debug mode is on so cache is off."
-msgstr "включён режим отладки - кеш выключен."
-
-msgid "your poche version:"
-msgstr "ваша версия poche:"
-
-msgid "storage:"
-msgstr "хранилище:"
-
-msgid "favoris"
-msgstr "избранное"
-
-msgid "archive"
-msgstr "архив"
-
-msgid "unread"
-msgstr "непрочитанное"
-
-msgid "by date asc"
-msgstr "по дате, сперва старые"
-
-msgid "by date"
-msgstr "по дате"
-
-msgid "by date desc"
-msgstr "по дате, сперва новые"
-
-msgid "by title asc"
-msgstr "по заголовку (прямой)"
-
-msgid "by title"
-msgstr "по заголовку"
-
-msgid "by title desc"
-msgstr "по заголовку (обратный)"
-
-msgid "No articles found."
-msgstr "Статей не найдено."
-
-msgid "toggle favorite"
-msgstr "изменить метку избранного"
-
-msgid "delete"
-msgstr "удалить"
-
-msgid "estimated reading time:"
-msgstr "ориентировочное время чтения:"
-
-msgid "results"
-msgstr "найдено"
-
-msgid "home"
-msgstr "главная"
-
-msgid "favorites"
-msgstr "избранное"
-
-msgid "tags"
-msgstr "теги"
-
 msgid "config"
 msgstr "настройки"
 
-msgid "logout"
+msgid "Saving articles"
-msgstr "выход"
+msgstr "Сохранение статей"
 
-msgid "Poching links"
+#, fuzzy
-msgstr "Сохранение ссылок"
+msgid "There are several ways to save an article:"
-
-msgid "There are several ways to poche a link:"
 msgstr "Существует несколько способов сохранить ссылку:"
 
 msgid "read the documentation"
@@ -166,14 +56,14 @@ msgstr "скачать приложение"
 msgid "By filling this field"
 msgstr "Заполнением этого поля"
 
-msgid "poche it!"
+msgid "bag it!"
 msgstr "прикарманить!"
 
 msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
 msgstr "Закладка: перетащите и опустите ссылку на панель закладок"
 
-msgid "Updating poche"
+msgid "Upgrading wallabag"
-msgstr "Обновления poche"
+msgstr "Обновление wallabag"
 
 msgid "Installed version"
 msgstr "Установленная версия"
@@ -187,15 +77,14 @@ msgstr "Доступна новая стабильная версия."
 msgid "You are up to date."
 msgstr "У вас всё самое новое."
 
-msgid "latest dev version"
+#, fuzzy
+msgid "Latest dev version"
 msgstr "последняя версия в разработке"
 
-msgid "a more recent development version is available."
+#, fuzzy
+msgid "A more recent development version is available."
 msgstr "есть более свежая версия в разработке."
 
-msgid "you are up to date."
-msgstr "у вас всё самое новое."
-
 msgid "Feeds"
 msgstr "Ленты (feeds)"
 
@@ -253,7 +142,8 @@ msgstr "Импортировать"
 msgid "Please execute the import script locally as it can take a very long time."
 msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени."
 
-msgid "More info in the official docs:"
+#, fuzzy
+msgid "More info in the official documentation:"
 msgstr "Больше сведений в официальной документации:"
 
 msgid "Import from Pocket"
@@ -269,11 +159,11 @@ msgstr "Импортировать из Readability"
 msgid "Import from Instapaper"
 msgstr "Импортировать из Instapaper"
 
-msgid "Import from poche"
+msgid "Import from wallabag"
-msgstr "Импортировать из poche"
+msgstr "Импортировать из wallabag"
 
-msgid "Export your poche data"
+msgid "Export your wallabag data"
-msgstr "Экспортировать данные poche"
+msgstr "Экспортировать данные wallabag"
 
 msgid "Click here"
 msgstr "Кликните здесь"
@@ -281,17 +171,14 @@ msgstr "Кликните здесь"
 msgid "to download your database."
 msgstr "чтобы скачать вашу базу данных"
 
-msgid "to export your poche data."
+msgid "to export your wallabag data."
-msgstr "чтобы экспортировать свои записи из poche."
+msgstr "чтобы экспортировать свои записи из wallabag."
 
-msgid "Tag"
+msgid "Cache"
-msgstr "Тег"
+msgstr "Кэш"
 
-msgid "No link available here!"
+msgid "to delete cache."
-msgstr "Здесь нет ссылки!"
+msgstr "чтобы сбросить кэш."
-
-msgid "toggle mark as read"
-msgstr "изменить отметку 'прочитано'"
 
 msgid "You can enter multiple tags, separated by commas."
 msgstr "Вы можете ввести несколько тегов, разделяя их запятой."
@@ -305,6 +192,60 @@ msgstr "plop"
 msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
 msgstr "Вы можете <a href='wallabag_compatibility_test.php'>проверить конфигурацию здесь</a>."
 
+msgid "favoris"
+msgstr "избранное"
+
+msgid "archive"
+msgstr "архив"
+
+msgid "unread"
+msgstr "непрочитанное"
+
+msgid "by date asc"
+msgstr "по дате, сперва старые"
+
+msgid "by date"
+msgstr "по дате"
+
+msgid "by date desc"
+msgstr "по дате, сперва новые"
+
+msgid "by title asc"
+msgstr "по заголовку (прямой)"
+
+msgid "by title"
+msgstr "по заголовку"
+
+msgid "by title desc"
+msgstr "по заголовку (обратный)"
+
+msgid "Tag"
+msgstr "Тег"
+
+msgid "No articles found."
+msgstr "Статей не найдено."
+
+msgid "Toggle mark as read"
+msgstr "Изменить отметку 'прочитано'"
+
+msgid "toggle favorite"
+msgstr "изменить метку избранного"
+
+msgid "delete"
+msgstr "удалить"
+
+msgid "original"
+msgstr "источник"
+
+msgid "estimated reading time:"
+msgstr "ориентировочное время чтения:"
+
+msgid "mark all the entries as read"
+msgstr "отметить все статьи как прочитанные "
+
+msgid "results"
+msgstr "найдено"
+
 msgid "installation"
 msgstr "установка"
 
@@ -341,6 +282,159 @@ msgstr "Запомнить меня"
 msgid "(Do not check on public computers)"
 msgstr "(Не отмечайте на чужих компьютерах)"
 
+msgid "Sign in"
+msgstr "Зарегистрироваться"
+
+msgid "favorites"
+msgstr "избранное"
+
+#, fuzzy
+msgid "estimated reading time :"
+msgstr "ориентировочное время чтения:"
+
+msgid "Mark all the entries as read"
+msgstr "Отметить все как прочитанное"
+
+msgid "Return home"
+msgstr "На главную"
+
+msgid "Back to top"
+msgstr "Наверх"
+
+msgid "Mark as read"
+msgstr "Отметить как прочитанное"
+
+msgid "Favorite"
+msgstr "Избранное"
+
+msgid "Toggle favorite"
+msgstr "Изменить метку избранного"
+
+msgid "Delete"
+msgstr "Удалить"
+
+msgid "Tweet"
+msgstr "Твитнуть"
+
+msgid "Email"
+msgstr "Отправить по почте"
+
+msgid "shaarli"
+msgstr "shaarli"
+
+msgid "flattr"
+msgstr "проспонсировать"
+
+msgid "Does this article appear wrong?"
+msgstr "Статья выглядит криво?"
+
+msgid "tags:"
+msgstr "теги:"
+
+msgid "Edit tags"
+msgstr "Редактировать теги"
+
+msgid "save link!"
+msgstr "сохранить ссылку!"
+
+msgid "home"
+msgstr "главная"
+
+msgid "tags"
+msgstr "теги"
+
+msgid "logout"
+msgstr "выход"
+
+msgid "powered by"
+msgstr "при поддержке"
+
+msgid "debug mode is on so cache is off."
+msgstr "включён режим отладки - кеш выключен."
+
+msgid "your wallabag version:"
+msgstr "Ваша версия wallabag:"
+
+msgid "storage:"
+msgstr "хранилище:"
+
+msgid "save a link"
+msgstr "сохранить ссылку"
+
+msgid "back to home"
+msgstr "домой"
+
+msgid "toggle mark as read"
+msgstr "изменить отметку 'прочитано'"
+
+msgid "tweet"
+msgstr "твитнуть"
+
+msgid "email"
+msgstr "email"
+
+#, fuzzy
+msgid "this article appears wrong?"
+msgstr "Статья выглядит криво?"
+
+msgid "No link available here!"
+msgstr "Здесь нет ссылки!"
+
+#, fuzzy
+msgid "Poching a link"
+msgstr "Сохранение ссылок"
+
+#, fuzzy
+msgid "by filling this field"
+msgstr "Заполнением этого поля"
+
+#, fuzzy
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Закладка: перетащите и опустите ссылку на панель закладок"
+
+msgid "your version"
+msgstr "Ваша версия"
+
+#, fuzzy
+msgid "latest stable version"
+msgstr "Последняя стабильная версия"
+
+#, fuzzy
+msgid "a more recent stable version is available."
+msgstr "Доступна новая стабильная версия."
+
+msgid "you are up to date."
+msgstr "у вас всё самое новое."
+
+msgid "latest dev version"
+msgstr "последняя версия в разработке"
+
+msgid "a more recent development version is available."
+msgstr "есть более свежая версия в разработке."
+
+#, fuzzy
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени."
+
+#, fuzzy
+msgid "More infos in the official doc:"
+msgstr "Больше сведений в официальной документации:"
+
+#, fuzzy
+msgid "import from Pocket"
+msgstr "Импортировать из Pocket"
+
+#, fuzzy
+msgid "import from Readability"
+msgstr "Импортировать из Readability"
+
+#, fuzzy
+msgid "import from Instapaper"
+msgstr "Импортировать из Instapaper"
+
+msgid "Tags"
+msgstr "Теги"
+
 msgid "Untitled"
 msgstr "Без названия"
 
@@ -356,6 +450,9 @@ msgstr "ссылка успешно удалена"
 msgid "the link wasn't deleted"
 msgstr "ссылка не удалена"
 
+msgid "Article not found!"
+msgstr "Статью не найдено."
+
 msgid "previous"
 msgstr "предыдущая"
 
@@ -389,15 +486,12 @@ msgstr "вы изменили свои настройки языка"
 msgid "login failed: you have to fill all fields"
 msgstr "войти не удалось: вы должны заполнить все поля"
 
-msgid "welcome to your poche"
+msgid "welcome to your wallabag"
-msgstr "добро пожаловать в ваш poche"
+msgstr "добро пожаловать в wallabag"
 
 msgid "login failed: bad login or password"
 msgstr "войти не удалось: неправильное имя пользователя или пароль"
 
-msgid "see you soon!"
-msgstr "увидимся!"
-
 msgid "import from instapaper completed"
 msgstr "импорт из instapaper завершен"
 
@@ -422,14 +516,40 @@ msgstr "Не удалось найти требуемый \""
 msgid "Uh, there is a problem while generating feeds."
 msgstr "Ох, возникла проблема при создании ленты."
 
+msgid "Cache deleted."
+msgstr "Кэш очищен. "
+
 msgid "Oops, it seems you don't have PHP 5."
 msgstr "Упс, кажется у вас не установлен PHP 5."
 
-#~ msgid "your version"
+#~ msgid "You can poche a link by several methods:"
-#~ msgstr "Ваша версия"
+#~ msgstr "Вы можете сохранить ссылку несколькими путями:"
 
-#~ msgid "back to home"
+#~ msgid "poche it!"
-#~ msgstr "домой"
+#~ msgstr "прикарманить!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Обновления poche"
+
+#, fuzzy
+#~ msgid "Export your poche datas"
+#~ msgstr "Экспортировать данные poche"
+
+#, fuzzy
+#~ msgid "to export your poche datas."
+#~ msgstr "чтобы экспортировать свои записи из poche."
+
+#~ msgid "your poche version:"
+#~ msgstr "ваша версия poche:"
+
+#~ msgid "Import from poche"
+#~ msgstr "Импортировать из poche"
+
+#~ msgid "welcome to your poche"
+#~ msgstr "добро пожаловать в ваш poche"
+
+#~ msgid "see you soon!"
+#~ msgstr "увидимся!"
 
 #~ msgid "create an issue"
 #~ msgstr "оповестить об ошибке"
@@ -439,6 +559,3 @@ msgstr "Упс, кажется у вас не установлен PHP 5."
 
 #~ msgid "contact us by mail"
 #~ msgstr "связаться по почте"
-
-#~ msgid "Sign in"
-#~ msgstr "Зарегистрироваться"

locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po

@@ -4,55 +4,138 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wallabag\n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-02-21 15:09+0100\n"
+"POT-Creation-Date: 2014-02-25 15:12+0300\n"
-"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
+"PO-Revision-Date: 2014-02-25 15:12+0300\n"
-"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
-"wallabag/language/sl_SI/)\n"
+"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/wallabag/language/sl_SI/)\n"
+"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
 "X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr ""
+
+msgid "login failed: user doesn't exist"
+msgstr ""
+
+msgid "return home"
+msgstr ""
 
 msgid "config"
 msgstr "nastavitve"
 
-msgid "Poching a link"
+msgid "Saving articles"
-msgstr "Shrani povezavo"
+msgstr ""
+
+msgid "There are several ways to save an article:"
+msgstr ""
 
 msgid "read the documentation"
 msgstr "preberite dokumentacijo"
 
-msgid "by filling this field"
+msgid "download the extension"
+msgstr ""
+
+msgid "via F-Droid"
+msgstr ""
+
+msgid " or "
+msgstr ""
+
+msgid "via Google Play"
+msgstr ""
+
+msgid "download the application"
+msgstr ""
+
+#, fuzzy
+msgid "By filling this field"
 msgstr "z vnosom v to polje"
 
-msgid "poche it!"
+msgid "bag it!"
-msgstr "shrani!"
+msgstr ""
 
-msgid "Updating poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Posodabljam Poche"
+msgstr ""
 
-msgid "your version"
+msgid "Upgrading wallabag"
-msgstr "vaša različica"
+msgstr ""
 
-msgid "latest stable version"
+#, fuzzy
+msgid "Installed version"
 msgstr "zadnja stabilna različica"
 
-msgid "a more recent stable version is available."
+#, fuzzy
+msgid "Latest stable version"
+msgstr "zadnja stabilna različica"
+
+#, fuzzy
+msgid "A more recent stable version is available."
 msgstr "na voljo je nova stabilna različica."
 
-msgid "you are up to date."
+#, fuzzy
+msgid "You are up to date."
 msgstr "imate najnovejšo različico."
 
-msgid "latest dev version"
+#, fuzzy
+msgid "Latest dev version"
 msgstr "zadnja razvojna različica"
 
-msgid "a more recent development version is available."
+#, fuzzy
+msgid "A more recent development version is available."
 msgstr "na voljo je nova razvojna različica."
 
+msgid "Feeds"
+msgstr ""
+
+msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+
+msgid "Unread feed"
+msgstr ""
+
+#, fuzzy
+msgid "Favorites feed"
+msgstr "priljubljeni"
+
+#, fuzzy
+msgid "Archive feed"
+msgstr "arhiv"
+
+msgid "Your token:"
+msgstr ""
+
+msgid "Your user id:"
+msgstr ""
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr ""
+
+#, fuzzy
+msgid "Change your theme"
+msgstr "Zamenjava gesla"
+
+msgid "Theme:"
+msgstr ""
+
+msgid "Update"
+msgstr "Posodobi"
+
+#, fuzzy
+msgid "Change your language"
+msgstr "Zamenjava gesla"
+
+msgid "Language:"
+msgstr ""
+
 msgid "Change your password"
 msgstr "Zamenjava gesla"
 
@@ -65,67 +148,69 @@ msgstr "Geslo"
 msgid "Repeat your new password:"
 msgstr "Ponovite novo geslo:"
 
-msgid "Update"
-msgstr "Posodobi"
-
 msgid "Import"
 msgstr "Uvozi"
 
-msgid "Please execute the import script locally, it can take a very long time."
+#, fuzzy
-msgstr ""
+msgid "Please execute the import script locally as it can take a very long time."
-"Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej "
+msgstr "Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej časa."
-"časa."
 
-msgid "More infos in the official doc:"
+#, fuzzy
+msgid "More info in the official documentation:"
 msgstr "Več informacij v uradni dokumentaciji:"
 
-msgid "import from Pocket"
+#, fuzzy
+msgid "Import from Pocket"
 msgstr "Uvoz iz aplikacije Pocket"
 
-msgid "import from Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr ""
+
+#, fuzzy
+msgid "Import from Readability"
 msgstr "Uvoz iz aplikacije Readability"
 
-msgid "import from Instapaper"
+#, fuzzy
+msgid "Import from Instapaper"
 msgstr "Uvoz iz aplikacije Instapaper"
 
-msgid "Export your poche datas"
+#, fuzzy
+msgid "Import from wallabag"
+msgstr "Uvoz iz aplikacije Readability"
+
+#, fuzzy
+msgid "Export your wallabag data"
 msgstr "Izvoz vsebine"
 
 msgid "Click here"
 msgstr "Kliknite tukaj"
 
-msgid "to export your poche datas."
+#, fuzzy
+msgid "to download your database."
 msgstr "za izvoz vsebine aplikacije Poche."
 
-msgid "back to home"
+#, fuzzy
-msgstr "Nazaj domov"
+msgid "to export your wallabag data."
+msgstr "za izvoz vsebine aplikacije Poche."
 
-msgid "installation"
+msgid "Cache"
-msgstr "Namestitev"
-
-msgid "install your poche"
-msgstr "Namestitev aplikacije Poche"
-
-msgid ""
-"poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
-"on poche website</a>."
 msgstr ""
-"Poche še vedno ni nameščen. Za namestitev izpolnite spodnji obrazec. Za več "
-"informacij <a href='http://inthepoche.com/doc'>preberite dokumentacijo na "
-"spletni strani</a>."
 
-msgid "Login"
+msgid "to delete cache."
-msgstr "Prijava"
+msgstr ""
 
-msgid "Repeat your password"
+msgid "You can enter multiple tags, separated by commas."
-msgstr "Ponovite geslo"
+msgstr ""
 
-msgid "Install"
+msgid "return to article"
-msgstr "Namesti"
+msgstr ""
 
-msgid "back to top"
+msgid "plop"
-msgstr "nazaj na vrh"
+msgstr "štrbunk"
+
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr ""
 
 msgid "favoris"
 msgstr "priljubljeni"
@@ -154,10 +239,14 @@ msgstr "po naslovu"
 msgid "by title desc"
 msgstr "po naslovu - padajoče"
 
-msgid "No link available here!"
+msgid "Tag"
-msgstr "Povezava ni na voljo!"
+msgstr ""
 
-msgid "toggle mark as read"
+msgid "No articles found."
+msgstr ""
+
+#, fuzzy
+msgid "Toggle mark as read"
 msgstr "označi kot prebrano"
 
 msgid "toggle favorite"
@@ -169,65 +258,47 @@ msgstr "zavrzi"
 msgid "original"
 msgstr "izvirnik"
 
+msgid "estimated reading time:"
+msgstr ""
+
+msgid "mark all the entries as read"
+msgstr ""
+
 msgid "results"
 msgstr "rezultati"
 
-msgid "tweet"
+msgid "installation"
-msgstr "tvitni"
+msgstr "Namestitev"
 
-msgid "email"
+#, fuzzy
-msgstr "pošlji po e-pošti"
+msgid "install your wallabag"
+msgstr "Namestitev aplikacije Poche"
 
-msgid "shaarli"
+#, fuzzy
-msgstr "shaarli"
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "Poche še vedno ni nameščen. Za namestitev izpolnite spodnji obrazec. Za več informacij <a href='http://inthepoche.com/doc'>preberite dokumentacijo na spletni strani</a>."
 
-msgid "flattr"
+msgid "Login"
-msgstr "flattr"
+msgstr "Prijava"
 
-msgid "this article appears wrong?"
+msgid "Repeat your password"
-msgstr "napaka?"
+msgstr "Ponovite geslo"
 
-msgid "create an issue"
+msgid "Install"
-msgstr "prijavi napako"
+msgstr "Namesti"
 
-msgid "or"
+#, fuzzy
-msgstr "ali"
+msgid "login to your wallabag"
-
-msgid "contact us by mail"
-msgstr "pošlji e-pošto razvijalcem"
-
-msgid "plop"
-msgstr "štrbunk"
-
-msgid "home"
-msgstr "domov"
-
-msgid "favorites"
-msgstr "priljubljeni"
-
-msgid "logout"
-msgstr "odjava"
-
-msgid "powered by"
-msgstr "stran poganja"
-
-msgid "debug mode is on so cache is off."
-msgstr ""
-"vklopljen je način odpravljanja napak, zato je predpomnilnik izključen."
-
-msgid "your poche version:"
-msgstr "vaša verzija Poche:"
-
-msgid "storage:"
-msgstr "pomnilnik:"
-
-msgid "login to your poche"
 msgstr "prijavite se v svoj Poche"
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "Login to wallabag"
+msgstr ""
+
+msgid "you are in demo mode, some features may be disabled."
+msgstr "uporabljate vzorčno različico programa, zato so lahko nekatere funkcije izklopljene."
+
+msgid "Username"
 msgstr ""
-"uporabljate vzorčno različico programa, zato so lahko nekatere funkcije "
-"izklopljene."
 
 msgid "Stay signed in"
 msgstr "Ostani prijavljen"
@@ -237,3 +308,261 @@ msgstr "(Ne označi na javnih napravah)"
 
 msgid "Sign in"
 msgstr "Prijava"
+
+msgid "favorites"
+msgstr "priljubljeni"
+
+msgid "estimated reading time :"
+msgstr ""
+
+msgid "Mark all the entries as read"
+msgstr ""
+
+msgid "Return home"
+msgstr ""
+
+#, fuzzy
+msgid "Back to top"
+msgstr "nazaj na vrh"
+
+#, fuzzy
+msgid "Mark as read"
+msgstr "označi kot prebrano"
+
+#, fuzzy
+msgid "Favorite"
+msgstr "priljubljeni"
+
+#, fuzzy
+msgid "Toggle favorite"
+msgstr "označi kot priljubljeno"
+
+#, fuzzy
+msgid "Delete"
+msgstr "zavrzi"
+
+#, fuzzy
+msgid "Tweet"
+msgstr "tvitni"
+
+#, fuzzy
+msgid "Email"
+msgstr "pošlji po e-pošti"
+
+msgid "shaarli"
+msgstr "shaarli"
+
+msgid "flattr"
+msgstr "flattr"
+
+#, fuzzy
+msgid "Does this article appear wrong?"
+msgstr "napaka?"
+
+msgid "tags:"
+msgstr ""
+
+msgid "Edit tags"
+msgstr ""
+
+msgid "save link!"
+msgstr ""
+
+msgid "home"
+msgstr "domov"
+
+msgid "tags"
+msgstr ""
+
+msgid "logout"
+msgstr "odjava"
+
+msgid "powered by"
+msgstr "stran poganja"
+
+msgid "debug mode is on so cache is off."
+msgstr "vklopljen je način odpravljanja napak, zato je predpomnilnik izključen."
+
+#, fuzzy
+msgid "your wallabag version:"
+msgstr "vaša različica"
+
+msgid "storage:"
+msgstr "pomnilnik:"
+
+msgid "save a link"
+msgstr ""
+
+msgid "back to home"
+msgstr "Nazaj domov"
+
+msgid "toggle mark as read"
+msgstr "označi kot prebrano"
+
+msgid "tweet"
+msgstr "tvitni"
+
+msgid "email"
+msgstr "pošlji po e-pošti"
+
+msgid "this article appears wrong?"
+msgstr "napaka?"
+
+msgid "No link available here!"
+msgstr "Povezava ni na voljo!"
+
+msgid "Poching a link"
+msgstr "Shrani povezavo"
+
+msgid "by filling this field"
+msgstr "z vnosom v to polje"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
+
+msgid "your version"
+msgstr "vaša različica"
+
+msgid "latest stable version"
+msgstr "zadnja stabilna različica"
+
+msgid "a more recent stable version is available."
+msgstr "na voljo je nova stabilna različica."
+
+msgid "you are up to date."
+msgstr "imate najnovejšo različico."
+
+msgid "latest dev version"
+msgstr "zadnja razvojna različica"
+
+msgid "a more recent development version is available."
+msgstr "na voljo je nova razvojna različica."
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej časa."
+
+msgid "More infos in the official doc:"
+msgstr "Več informacij v uradni dokumentaciji:"
+
+msgid "import from Pocket"
+msgstr "Uvoz iz aplikacije Pocket"
+
+msgid "import from Readability"
+msgstr "Uvoz iz aplikacije Readability"
+
+msgid "import from Instapaper"
+msgstr "Uvoz iz aplikacije Instapaper"
+
+msgid "Tags"
+msgstr ""
+
+#, fuzzy
+msgid "Untitled"
+msgstr "po naslovu"
+
+msgid "the link has been added successfully"
+msgstr ""
+
+msgid "error during insertion : the link wasn't added"
+msgstr ""
+
+msgid "the link has been deleted successfully"
+msgstr ""
+
+msgid "the link wasn't deleted"
+msgstr ""
+
+msgid "Article not found!"
+msgstr ""
+
+msgid "previous"
+msgstr ""
+
+msgid "next"
+msgstr ""
+
+msgid "in demo mode, you can't update your password"
+msgstr ""
+
+msgid "your password has been updated"
+msgstr ""
+
+msgid "the two fields have to be filled & the password must be the same in the two fields"
+msgstr ""
+
+msgid "still using the \""
+msgstr ""
+
+msgid "that theme does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your theme preferences"
+msgstr ""
+
+msgid "that language does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your language preferences"
+msgstr ""
+
+msgid "login failed: you have to fill all fields"
+msgstr ""
+
+msgid "welcome to your wallabag"
+msgstr ""
+
+msgid "login failed: bad login or password"
+msgstr ""
+
+#, fuzzy
+msgid "import from instapaper completed"
+msgstr "Uvoz iz aplikacije Instapaper"
+
+#, fuzzy
+msgid "import from pocket completed"
+msgstr "Uvoz iz aplikacije Pocket"
+
+#, fuzzy
+msgid "import from Readability completed. "
+msgstr "Uvoz iz aplikacije Readability"
+
+#, fuzzy
+msgid "import from Poche completed. "
+msgstr "Uvoz iz aplikacije Pocket"
+
+msgid "Unknown import provider."
+msgstr ""
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr ""
+
+msgid "Could not find required \""
+msgstr ""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr ""
+
+#, fuzzy
+msgid "Cache deleted."
+msgstr "zavrzi"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr ""
+
+#~ msgid "poche it!"
+#~ msgstr "shrani!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Posodabljam Poche"
+
+#~ msgid "create an issue"
+#~ msgstr "prijavi napako"
+
+#~ msgid "or"
+#~ msgstr "ali"
+
+#~ msgid "contact us by mail"
+#~ msgstr "pošlji e-pošto razvijalcem"
+
+#~ msgid "your poche version:"
+#~ msgstr "vaša verzija Poche:"

locale/tools/fillCache.php

@@ -0,0 +1,59 @@
+<?php
+
+// this script compile all twig templates and put it in cahce to get Poedit (or xgettext) to extract phrases fron chached templates.
+
+// gettext command line tools:
+// msgunfmt - get po from mo
+// msgfmt - get mo from po
+// xgettext - extract phrases from files
+
+
+		$siteRoot = dirname(__FILE__) . '/../..';
+
+		require_once  $siteRoot . '/vendor/twig/twig/lib/Twig/Autoloader.php';
+		Twig_Autoloader::register();
+
+		require_once  $siteRoot . '/vendor/twig/extensions/lib/Twig/Extensions/Autoloader.php';
+		Twig_Extensions_Autoloader::register();
+
+		//$tplDir = $siteRoot.'/themes/default';
+		$tplDirRoot = $siteRoot.'/themes/';
+		$tmpDir =  $siteRoot. '/cache/';
+
+		foreach (new IteratorIterator(new DirectoryIterator($tplDirRoot)) as $tplDir) {
+
+			if ($tplDir->isDir() and $tplDir!='.' and $tplDir!='..') {
+				echo "\n$tplDir\n";
+
+				$loader = new Twig_Loader_Filesystem($tplDirRoot.$tplDir);
+
+				// force auto-reload to always have the latest version of the template
+				$twig = new Twig_Environment($loader, array(
+						'cache' => $tmpDir,
+						'auto_reload' => true
+				));
+
+				$twig->addExtension(new Twig_Extensions_Extension_I18n());
+
+				$filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
+				$twig->addFilter($filter);
+
+				$filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
+				$twig->addFilter($filter);
+
+				$filter = new Twig_SimpleFilter('getPrettyFilename', function($string) { return str_replace($siteRoot, '', $string); });
+				$twig->addFilter($filter);
+
+// 				// iterate over all your templates
+				foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($tplDirRoot.$tplDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
+						// force compilation
+					if ($file->isFile() and pathinfo($file, PATHINFO_EXTENSION)=='twig') {
+							echo "\t$file\n";
+							$twig->loadTemplate(str_replace($tplDirRoot.$tplDir.'/', '', $file));
+					}
+				}
+
+			}
+
+		}
+

locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wballabag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-06 19:23+0300\n"
+"POT-Creation-Date: 2014-02-25 15:06+0300\n"
-"PO-Revision-Date: 2014-02-06 19:24+0300\n"
+"PO-Revision-Date: 2014-02-25 15:08+0300\n"
 "Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -15,52 +15,25 @@ msgstr ""
 "X-Poedit-Language: Ukrainian\n"
 "X-Poedit-Country: UKRAINE\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
 
-msgid "poche, a read it later open source system"
+msgid "wallabag, a read it later open source system"
-msgstr "poche, сервіс відкладеного читання з відкритим кодом"
+msgstr "wallabag, сервіс відкладеного читання з відкритим кодом"
 
 msgid "login failed: user doesn't exist"
 msgstr "увійти не вдалося: користувач не існує"
 
-msgid "powered by"
+msgid "return home"
-msgstr "за підтримки"
+msgstr "повернутися на головну"
-
-msgid "debug mode is on so cache is off."
-msgstr "режим відладки включено, отже кеш виключено."
-
-msgid "your poche version:"
-msgstr "версія вашої poche:"
-
-msgid "storage:"
-msgstr "сховище:"
-
-msgid "home"
-msgstr "головна"
-
-msgid "favorites"
-msgstr "вибране"
-
-msgid "archive"
-msgstr "архів"
-
-msgid "tags"
-msgstr "теги"
 
 msgid "config"
 msgstr "налаштування"
 
-msgid "logout"
+msgid "Saving articles"
-msgstr "вихід"
-
-msgid "return home"
-msgstr "повернутися на головну"
-
-msgid "Poching links"
 msgstr "Зберігання посилань"
 
-msgid "There are several ways to poche a link:"
+msgid "There are several ways to save an article:"
-msgstr "Є кілька способів зберегти посилання:"
+msgstr "Є кілька способів зберегти статтю:"
 
 msgid "read the documentation"
 msgstr "читати документацію"
@@ -83,14 +56,14 @@ msgstr "завантажити додаток"
 msgid "By filling this field"
 msgstr "Заповнивши це поле"
 
-msgid "poche it!"
+msgid "bag it!"
 msgstr "зберегти!"
 
 msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
 msgstr "З допомогою закладки: перетягніть і відпустіть посилання на панель закладок"
 
-msgid "Updating poche"
+msgid "Upgrading wallabag"
-msgstr "Оновлення poche"
+msgstr "Оновлення wallabag"
 
 msgid "Installed version"
 msgstr "Встановлено ​​версію"
@@ -104,14 +77,11 @@ msgstr "Є новіша стабільна версія."
 msgid "You are up to date."
 msgstr "У вас остання версія."
 
-msgid "latest dev version"
+msgid "Latest dev version"
-msgstr "остання версія в розробці"
+msgstr "Остання версія в розробці"
 
-msgid "a more recent development version is available."
+msgid "A more recent development version is available."
-msgstr "доступна новіша версія в розробці."
+msgstr "Доступна новіша версія в розробці."
-
-msgid "you are up to date."
-msgstr "у вас остання версія."
 
 msgid "Feeds"
 msgstr "Завантаження (feeds)"
@@ -170,8 +140,8 @@ msgstr "Імпортування"
 msgid "Please execute the import script locally as it can take a very long time."
 msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго."
 
-msgid "More info in the official docs:"
+msgid "More info in the official documentation:"
-msgstr "Більш детальна інформація в офіційній документації:"
+msgstr "Більше інформації в офіційній документації:"
 
 msgid "Import from Pocket"
 msgstr "Імпорт з Pocket-а"
@@ -186,11 +156,11 @@ msgstr "Імпорт з Readability"
 msgid "Import from Instapaper"
 msgstr "Імпорт з Instapaper"
 
-msgid "Import from poche"
+msgid "Import from wallabag"
-msgstr "Імпорт з poche"
+msgstr "Імпорт з wallabag"
 
-msgid "Export your poche data"
+msgid "Export your wallabag data"
-msgstr "Експортувати ваші дані з poche"
+msgstr "Експортувати ваші дані з wallabag"
 
 msgid "Click here"
 msgstr "Клікніть тут"
@@ -198,32 +168,14 @@ msgstr "Клікніть тут"
 msgid "to download your database."
 msgstr "щоб завантажити вашу базу даних."
 
-msgid "to export your poche data."
+msgid "to export your wallabag data."
-msgstr "щоб експортувати ваші дані poche."
+msgstr "щоб експортувати ваші дані wallabag."
 
-msgid "Tag"
+msgid "Cache"
-msgstr "Тег"
+msgstr "Кеш"
 
-msgid "No link available here!"
+msgid "to delete cache."
-msgstr "Немає доступних посилань!"
+msgstr "щоб очистити кеш."
-
-msgid "toggle mark as read"
-msgstr "змінити мітку на прочитано"
-
-msgid "toggle favorite"
-msgstr "змінити мітку вибраного"
-
-msgid "delete"
-msgstr "видалити"
-
-msgid "original"
-msgstr "оригінал"
-
-msgid "estimated reading time:"
-msgstr "приблизний час читання:"
-
-msgid "results"
-msgstr "результат(ів)"
 
 msgid "You can enter multiple tags, separated by commas."
 msgstr "Ви можете ввести декілька тегів, розділених комами."
@@ -240,6 +192,9 @@ msgstr "Ви можете <a href='wallabag_compatibility_test.php'>переві
 msgid "favoris"
 msgstr "вибране"
 
+msgid "archive"
+msgstr "архів"
+
 msgid "unread"
 msgstr "непрочитане"
 
@@ -261,12 +216,33 @@ msgstr "за назвою"
 msgid "by title desc"
 msgstr "за назвою по спаданню"
 
+msgid "Tag"
+msgstr "Тег"
+
 msgid "No articles found."
 msgstr "Статей не знайдено."
 
 msgid "Toggle mark as read"
 msgstr "змінити мітку прочитаного"
 
+msgid "toggle favorite"
+msgstr "змінити мітку вибраного"
+
+msgid "delete"
+msgstr "видалити"
+
+msgid "original"
+msgstr "оригінал"
+
+msgid "estimated reading time:"
+msgstr "приблизний час читання:"
+
+msgid "mark all the entries as read"
+msgstr "відмітити всі статті як прочитані"
+
+msgid "results"
+msgstr "результат(ів)"
+
 msgid "installation"
 msgstr "інсталяція"
 
@@ -303,6 +279,18 @@ msgstr "Запам'ятати мене"
 msgid "(Do not check on public computers)"
 msgstr "(Не відмічайте на загальнодоступних комп'ютерах)"
 
+msgid "Sign in"
+msgstr "Увійти"
+
+msgid "favorites"
+msgstr "вибране"
+
+msgid "estimated reading time :"
+msgstr "приблизний час читання:"
+
+msgid "Mark all the entries as read"
+msgstr "Відмітити все як прочитане"
+
 msgid "Return home"
 msgstr "Повернутися на головну"
 
@@ -342,11 +330,95 @@ msgstr "теги:"
 msgid "Edit tags"
 msgstr "Редагувати теги"
 
-msgid "previous"
+msgid "save link!"
-msgstr "попередня"
+msgstr "зберегти лінк!"
 
-msgid "next"
+msgid "home"
-msgstr "наступна"
+msgstr "головна"
+
+msgid "tags"
+msgstr "теги"
+
+msgid "logout"
+msgstr "вихід"
+
+msgid "powered by"
+msgstr "за підтримки"
+
+msgid "debug mode is on so cache is off."
+msgstr "режим відладки включено, отже кеш виключено."
+
+msgid "your wallabag version:"
+msgstr "версія вашого wallabag:"
+
+msgid "storage:"
+msgstr "сховище:"
+
+msgid "save a link"
+msgstr "зберегти лінк"
+
+msgid "back to home"
+msgstr "назад на головну"
+
+msgid "toggle mark as read"
+msgstr "змінити мітку на прочитано"
+
+msgid "tweet"
+msgstr "твітнути"
+
+msgid "email"
+msgstr "email"
+
+msgid "this article appears wrong?"
+msgstr "ця стаття виглядає не так, як треба?"
+
+msgid "No link available here!"
+msgstr "Немає доступних посилань!"
+
+msgid "Poching a link"
+msgstr "Зберігання посилання"
+
+msgid "by filling this field"
+msgstr "заповнивши це поле"
+
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "з допомогою закладки: перетягніть і відпустіть посилання на панель закладок"
+
+msgid "your version"
+msgstr "ваша версія:"
+
+msgid "latest stable version"
+msgstr "остання стабільна версія"
+
+msgid "a more recent stable version is available."
+msgstr "є новіша стабільна версія."
+
+msgid "you are up to date."
+msgstr "у вас остання версія."
+
+msgid "latest dev version"
+msgstr "остання версія в розробці"
+
+msgid "a more recent development version is available."
+msgstr "доступна новіша версія в розробці."
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго."
+
+msgid "More infos in the official doc:"
+msgstr "Більше інформації в офіційній документації:"
+
+msgid "import from Pocket"
+msgstr "імпорт з Pocket-а"
+
+msgid "import from Readability"
+msgstr "імпорт з Readability"
+
+msgid "import from Instapaper"
+msgstr "імпорт з Instapaper"
+
+msgid "Tags"
+msgstr "Теги"
 
 msgid "Untitled"
 msgstr "Без назви"
@@ -363,6 +435,15 @@ msgstr "посилання успішно видалено"
 msgid "the link wasn't deleted"
 msgstr "посилання не було видалено"
 
+msgid "Article not found!"
+msgstr "Статтю не знайдено!"
+
+msgid "previous"
+msgstr "попередня"
+
+msgid "next"
+msgstr "наступна"
+
 msgid "in demo mode, you can't update your password"
 msgstr "в демонстраційному режимі ви не можете змінювати свій пароль"
 
@@ -390,15 +471,12 @@ msgstr "ви змінили свої налаштування мови"
 msgid "login failed: you have to fill all fields"
 msgstr "увійти не вдалося: ви повинні заповнити всі поля"
 
-msgid "welcome to your poche"
+msgid "welcome to your wallabag"
-msgstr "ласкаво просимо до вашого poche"
+msgstr "ласкаво просимо до вашого wallabag"
 
 msgid "login failed: bad login or password"
 msgstr "увійти не вдалося: не вірний логін або пароль"
 
-msgid "see you soon!"
-msgstr "бувайте, ще побачимось!"
-
 msgid "import from instapaper completed"
 msgstr "імпорт з instapaper-а завершено"
 
@@ -423,6 +501,34 @@ msgstr "Не вдалося знайти потрібний \""
 msgid "Uh, there is a problem while generating feeds."
 msgstr "Ох, є проблема при створенні завантажень (feeds)."
 
+msgid "Cache deleted."
+msgstr "Кеш очищено."
+
 msgid "Oops, it seems you don't have PHP 5."
 msgstr "Упс, здається, у вас немає PHP 5."
 
+#~ msgid "You can poche a link by several methods:"
+#~ msgstr "Ви можете зберегти посилання кількома способами:"
+
+#~ msgid "poche it!"
+#~ msgstr "зберегти!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Оновлення poche"
+
+#, fuzzy
+#~ msgid "Export your poche datas"
+#~ msgstr "Експортувати ваші дані з poche"
+
+#, fuzzy
+#~ msgid "to export your poche datas."
+#~ msgstr "щоб експортувати ваші дані poche."
+
+#~ msgid "Import from poche"
+#~ msgstr "Імпорт з poche"
+
+#~ msgid "welcome to your poche"
+#~ msgstr "ласкаво просимо до вашого poche"
+
+#~ msgid "see you soon!"
+#~ msgstr "бувайте, ще побачимось!"

themes/baggy/_display-mode.twig

@@ -0,0 +1,5 @@
+<div id="display-mode">
+  <a href="javascript: void(null);" id="listmode" class="listmode">
+    <img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/blank.png" alt="{% trans "toggle view mode" %}" title="{% trans "toggle view mode" %}" width="16" height="16">
+  </a>
+</div>

themes/baggy/_head.twig

@@ -1,12 +1,15 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/{{theme}}/img/favicon.ico" />
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-precomposed.png">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/ratatouille.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/main.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/messages.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print">
-        <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script>
-        <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
+        <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
+        <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script>
+        <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script>
+        <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
+        <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>

themes/baggy/_menu.twig

@@ -4,9 +4,13 @@
                 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
                 <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
-                <li><a href="javascript: void(null);" id="pocheit">{% trans "save a link" %}</a></li>
+                <li style="position: relative;"><a href="javascript: void(null);" id="bagit">{% trans "save a link" %}</a>
+                    {% include '_pocheit-form.twig' %}
+                </li>
+				<li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans "search" %}</a>
+                    {% include '_search-form.twig' %}
+                </li>
                 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                 <li><a class="icon icon-power" href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
             </ul>
 
-            {% include '_pocheit-form.twig' %}

themes/baggy/_pocheit-form.twig

@@ -0,0 +1,10 @@
+<div id="bagit-form" class="messages info">
+    <form method="get" action="index.php" target="_blank" id="bagit-form-form">
+        <h2><a href="javascript: void(null);" id="bagit-form-close">X</a>
+        {% trans "Save a link" %}</h2>
+        <input type="hidden" name="autoclose" value="1" />
+        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <input type="submit" value="{% trans "save link!" %}" />
+        <div id="add-link-result"></div>
+    </form>
+</div>

themes/baggy/_search-form.twig

@@ -0,0 +1,21 @@
+<div id="search-form" class="messages info">			
+<form method="get" action="index.php">
+		<input type="hidden" name="view" value="search"></input>
+        <label><a href="javascript: void(null);" id="search-form-close">X</a>{% trans "Search" %}</label> : <input type="text" name="search" />
+		<input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
+</form>
+</div>
+<script type="text/javascript">
+    $(document).ready(function() {
+
+        $("#search-form").hide();
+
+        $("#search").click(function(){
+            $("#search-form").toggle();
+            $("#search").toggleClass("current");
+            $("#search-arrow").toggleClass("arrow-down");
+        });
+
+
+    });
+</script>

themes/baggy/_top.twig

@@ -1,6 +1,6 @@
         <header class="w600p center mbm">
             <h1 class="logo">
-                {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}/themes/{{theme}}/img/logo-w.png" alt="logo poche" />{% endblock %}
+                {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}themes/{{theme}}/img/logo-w.png" alt="wallabag logo" />{% endblock %}
                 {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a>
                 {% endif %}
             </h1>

themes/baggy/config.twig

@@ -8,10 +8,11 @@
             <h2>{% trans "Saving articles" %}</h2>
             <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
-                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
                 <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
-                <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
+                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
                 <li>
                     <form method="get" action="index.php">
                         <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
@@ -25,9 +26,10 @@
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
                 <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
-                <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>
+                <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
-                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>{% endif %}
+                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>
+            <p>{% trans "You can clear cache to check the latest release." %}</p>
 
             <h2>{% trans "Feeds" %}</h2>
             {% if token == '' %}
@@ -42,7 +44,7 @@
             <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p>
             <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
             {% endif %}
-            
+
             <h2>{% trans "Change your theme" %}</h2>
             <form method="post" action="?updatetheme" name="changethemeform">
                 <fieldset class="w500p inline">
@@ -103,15 +105,21 @@
             {% endif %}
 
             <h2>{% trans "Import" %}</h2>
-            <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
+            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
-            <p>{% trans "More info in the official documentation:" %} <a href="http://doc.wallabag.org/doku.php?id=users:migrate">wallabag.org</a></p>
+            <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>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)." %}</p>
-            <ul>
+            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
-                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
+                <fieldset class="w500p">
-                <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
+                    <div class="row">
-                <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
+                        <label class="col w150p" for="file">{% trans "File:" %}</label>
-                <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCHE_FILE')) }}</li>
+                        <input class="col" type="file" id="file" name="file" tabindex="4">
-            </ul>
+                    </div>
-
+                    <div class="row mts txtcenter">
+                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
+                    </div>
+                </fieldset>
+            </form>
+            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
+            
             <h2>{% trans "Export your wallabag data" %}</h2>
             {% if constant('STORAGE') == 'sqlite' %}
             <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}

themes/baggy/css/main.css

@@ -173,21 +173,22 @@ h2:after {
 #links {
   position: fixed;
   top: 0;
-  width: 9em;
+  width: 10em;
   left: 0;
   text-align: right;
   background: #333;
-  padding-top: 9em;
+  padding-top: 9.5em;
   height: 100%;
   box-shadow:inset -4px 0 20px rgba(0,0,0,0.6);
   z-index: 10;
 }
 
 #main {
-  margin-left: 12em;
+  margin-left: 13em;
   position: relative;
   z-index: 10;
   padding-right: 5%;
+  padding-bottom: 1em;
 }
 
   #links a {
@@ -227,7 +228,7 @@ h2:after {
   #links li:last-child {
     position: fixed;
     bottom: 1em;
-    width: 10%;
+    width: 10em;
   }
 
   #links li:last-child a:before {
@@ -237,6 +238,61 @@ h2:after {
   }
 
 
+#sort {
+    padding: 0;
+    list-style-type: none;
+    opacity: 0.5;
+    display: inline-block;
+}
+
+#sort li {
+    display: inline;
+    font-size: 0.9em;
+}
+
+#sort li + li {
+    margin-left: 10px;
+}
+
+#sort a {
+    padding: 2px 2px 0;
+    vertical-align: middle;
+}
+
+#sort img {
+    vertical-align: baseline;
+}
+#sort img:hover {
+    cursor: pointer;
+}
+
+#display-mode {
+  float: right;
+  vertical-align: middle;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  opacity: 0.5;
+}
+#listmode {
+  width: 16px;
+  display: inline-block;
+  text-decoration: none;
+}
+#listmode a:hover {
+  opacity: 1;
+}
+.tablemode {
+  background-image: url("../img/baggy/table.png");
+  background-repeat: no-repeat;
+  background-position: bottom;
+}
+.listmode {
+  background-image: url("../img/baggy/list.png");
+  background-repeat: no-repeat;
+  background-position: bottom;
+}
+
+
 /* ==========================================================================
    2 = Layout
    ========================================================================== */
@@ -248,7 +304,7 @@ h2:after {
 
 footer {
   text-align: right;
-  position: fixed;
+  position: relative;
   bottom: 0;
   right: 5em;
   color: #999;
@@ -266,6 +322,15 @@ footer a {
   letter-spacing:-5px;
 }
 
+.listmode .entrie {
+  width: 100%!important;
+  margin-left: 0!important;
+}
+
+.listmode .entrie p {
+  display: none;
+}
+
 .list-entries + .results {
   margin-bottom: 2em;
 }
@@ -287,10 +352,10 @@ footer a {
   letter-spacing:normal;
   box-shadow: 0 3px 7px rgba(0,0,0,0.3);
   display: inline-block;
-  width: 32%;
+  width: 32%!important;
   margin-bottom: 1.5em;
   vertical-align: top;
-  margin-left: 1.5%;
+  margin-left: 1.5%!important;
   position: relative;
   overflow: hidden;
   padding: 1.5em 1.5em 3em 1.5em;
@@ -359,6 +424,7 @@ footer a {
     content: none;
   }
 
+
 .entrie h2 a {
   display: block;
   text-decoration: none;
@@ -370,7 +436,7 @@ footer a {
        -o-transition: all 0.5s ease;
           transition: all 0.5s ease;
 }
-
+/*
 .entrie h2 a:after {
   content: "";
   position: absolute;
@@ -379,6 +445,7 @@ footer a {
   height: 100%;
   left: 0;
 }
+*/
 
 .entrie p {
   color: #666;
@@ -425,7 +492,7 @@ footer a {
   }
 
 .entrie:nth-child(3n+1) {
-  margin-left: 0;
+  margin-left: 0!important;
 }
 
 .results {
@@ -442,6 +509,7 @@ footer a {
 
 .pagination {
   text-align: right;
+  margin-bottom:50px;
 }
 
 .nb-results {
@@ -468,6 +536,134 @@ footer a {
   display: none;
 }
 
+/* ==========================================================================
+  2.1 = "save a link" popup div related styles
+  ========================================================================== */
+
+#bagit-form {
+  background: rgba(0,0,0,0.5);
+  position: absolute;
+  top: 0;
+  left: 10em;
+  z-index: 20;
+  height: 100%;
+  width: 100%;
+  margin: 0;
+  margin-top: -30%;
+  padding: 2em;
+  display: none;
+  border-left: 1px #EEE solid;
+}
+
+#bagit-form form {
+  background: #FFF;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 20;
+  border: 10px solid #000;
+  width: 400px;
+  height: 200px;
+  /* margin: -150px 0 0 -300px; */
+  padding: 2em;
+}
+
+a#bagit-form-close {
+  background: #000;
+  color: #FFF;
+  padding: 0.2em 0.5em;
+  text-decoration: none;
+  display: inline-block;
+  float: right;
+  font-size: 0.6em;
+}
+a#bagit-form-close:hover {
+  background: #999;
+  color: #000;
+}
+
+.active-current {
+  background-color: #999;
+}
+
+.active-current:after {
+  content: "";
+  width: 0;
+  height: 0;
+  position: absolute;
+  border-style: solid;
+  border-width: 10px;
+  border-color:  transparent #EEE transparent transparent;
+  right: 0;
+  top: 50%;
+  margin-top: -10px;
+}
+
+.opacity03 {
+  opacity: 0.3;
+}
+
+.add-to-wallabag-link-after {
+  background-color: #000;
+  color: #fff;
+  padding: 0 3px 2px 3px;
+}
+
+#add-link-result {
+  font-weight: bold;
+  margin-top: 10px;
+}
+
+/* ==========================================================================
+  2.2 = "search for articles" popup div related styles
+  ========================================================================== */
+#search-form {
+  background: rgba(0,0,0,0.5);
+  position: absolute;
+  top: 0;
+  left: 10em;
+  z-index: 20;
+  height: 100%;
+  width: 100%;
+  margin: 0;
+  margin-top: -30%;
+  padding: 2em;
+  display: none;
+  border-left: 1px #EEE solid;
+}
+
+#search-form form {
+  background: #FFF;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 20;
+  border: 10px solid #000;
+  width: 400px;
+  height: 200px;
+  /* margin: -150px 0 0 -300px; */
+  padding: 2em;
+}
+
+a#search-form-close {
+  background: #000;
+  color: #FFF;
+  padding: 0.2em 0.5em;
+  text-decoration: none;
+  display: inline-block;
+  float: right;
+  font-size: 1.2em;
+}
+a#search-form-close:hover {
+  background: #999;
+  color: #000;
+}
+
+#submit-search{
+margin-left: 4em;
+margin-top:1em;
+}
+
 /* ==========================================================================
    3 = Pictos
    ========================================================================== */
@@ -583,7 +779,7 @@ footer a {
   }
 
 .warning {
-  font-size: 3em;
+  /* font-size: 3em;
   color: #999;
   font-style: italic;
   position: absolute;
@@ -592,7 +788,10 @@ footer a {
   width: 100%;
   text-align: center;
   padding-right: 5%;
-  margin-top: -2em;
+  margin-top: -2em;*/
+  font-weight: bold;
+  display: block;
+  width: 100%;
 }
 
 /* ==========================================================================
@@ -602,6 +801,7 @@ footer a {
 #article {
   width: 70%;
   margin-bottom: 3em;
+  text-align: justify;
 }
 
 #article .tags {
@@ -731,6 +931,9 @@ blockquote {
     width: 100%;
     margin-left: 0;
   }
+  #display-mode {
+    display: none;
+  }
 }
 
 @media screen and (max-width: 500px) {
@@ -820,4 +1023,12 @@ blockquote {
   #article_toolbar a {
     padding: 0.3em 0.4em 0.2em;
   }
+  
+  #display-mode {
+    display: none;
+  }
+
+  #bagit-form {
+    left: 0;
+  }
 }

themes/baggy/edit-tags.twig

@@ -4,6 +4,11 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
+
+<script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script>
+<script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script>
+<link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all">
+
 <div id="article">
   <h2>{{ entry.title|raw }}</21>
 </div>
@@ -17,7 +22,8 @@
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />
     <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
     <input type="submit" value="Tag" />
-    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
+    <p>{% trans "Start typing for auto complete." %}<br>
+    {% trans "You can enter multiple tags, separated by commas." %}</p>
 </form>
 <a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
 {% endblock %}

themes/baggy/home.twig

@@ -18,17 +18,27 @@
             {% if entries is empty %}
             <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
             {% else %}
+                 <div>
+                     {% include '_display-mode.twig' %}
+                     {% include '_sorting.twig' %}
+                 </div>
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
                         {{ page_links | raw }}
                 </div>
+                    {% elseif nb_results == 1 %}
+                        {% if search_term is defined %}
+                     <div class="results">
+                        <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
+                     </div>
+                        {% endif %}
                     {% endif %}
                 {% endblock %}
-            <div class="list-entries">
+            <div id="list-entries" class="list-entries">
                     {% for entry in entries %}
-                <div id="entry-{{ entry.id|e }}" class="entrie">
+                <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
                     <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                     {% if entry.content| getReadingTime > 0 %}
                         <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>

themes/baggy/js/autoClose.js

@@ -1,6 +0,0 @@
-$(document).ready(function() {
-	current_url = window.location.href
-	if (current_url.match("&closewin=true")) {
-		window.close();
-	}
-});

themes/baggy/js/init.js

@@ -1,12 +1,48 @@
-document.addEventListener('DOMContentLoaded', function() {
+$.fn.ready(function() {
-  var menu = document.getElementById('menu');
 
-  menu.addEventListener('click', function(){
+  var $listmode = $('#listmode'),
-    if(this.nextElementSibling.style.display === "block") {
+      $listentries = $("#list-entries");
-      this.nextElementSibling.style.display = "none";
+
-    }else {
+  /* ==========================================================================
-      this.nextElementSibling.style.display = "block";  
+     Menu
-    }
+     ========================================================================== */
-    
+
+  $("#menu").click(function(){
+    $("#links").toggle();
   });
-});
+
+  /* ==========================================================================
+     List mode or Table Mode
+     ========================================================================== */
+
+  $listmode.click(function(){
+    if ( $.cookie("listmode") == 1 ) {
+      // Cookie
+      $.removeCookie("listmode");
+
+      $listentries.removeClass("listmode");
+      $listmode.removeClass("tablemode");
+      $listmode.addClass("listmode");
+    }
+    else {
+      // Cookie
+      $.cookie("listmode", 1, {expires: 365});
+
+      $listentries.addClass("listmode");
+      $listmode.removeClass("listmode");
+      $listmode.addClass("tablemode");
+    }
+
+  });
+
+  /* ==========================================================================
+     Cookie listmode
+     ========================================================================== */
+
+  if ( $.cookie("listmode") == 1 ) {
+    $listentries.addClass("listmode");
+    $listmode.removeClass("listmode");
+    $listmode.addClass("tablemode");
+  }
+
+});

themes/baggy/js/jquery.cookie.js

@@ -0,0 +1,117 @@
+/*!
+ * jQuery Cookie Plugin v1.4.0
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2013 Klaus Hartl
+ * Released under the MIT license
+ */
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD. Register as anonymous module.
+		define(['jquery'], factory);
+	} else {
+		// Browser globals.
+		factory(jQuery);
+	}
+}(function ($) {
+
+	var pluses = /\+/g;
+
+	function encode(s) {
+		return config.raw ? s : encodeURIComponent(s);
+	}
+
+	function decode(s) {
+		return config.raw ? s : decodeURIComponent(s);
+	}
+
+	function stringifyCookieValue(value) {
+		return encode(config.json ? JSON.stringify(value) : String(value));
+	}
+
+	function parseCookieValue(s) {
+		if (s.indexOf('"') === 0) {
+			// This is a quoted cookie as according to RFC2068, unescape...
+			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+		}
+
+		try {
+			// Replace server-side written pluses with spaces.
+			// If we can't decode the cookie, ignore it, it's unusable.
+			s = decodeURIComponent(s.replace(pluses, ' '));
+		} catch(e) {
+			return;
+		}
+
+		try {
+			// If we can't parse the cookie, ignore it, it's unusable.
+			return config.json ? JSON.parse(s) : s;
+		} catch(e) {}
+	}
+
+	function read(s, converter) {
+		var value = config.raw ? s : parseCookieValue(s);
+		return $.isFunction(converter) ? converter(value) : value;
+	}
+
+	var config = $.cookie = function (key, value, options) {
+
+		// Write
+		if (value !== undefined && !$.isFunction(value)) {
+			options = $.extend({}, config.defaults, options);
+
+			if (typeof options.expires === 'number') {
+				var days = options.expires, t = options.expires = new Date();
+				t.setDate(t.getDate() + days);
+			}
+
+			return (document.cookie = [
+				encode(key), '=', stringifyCookieValue(value),
+				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+				options.path    ? '; path=' + options.path : '',
+				options.domain  ? '; domain=' + options.domain : '',
+				options.secure  ? '; secure' : ''
+			].join(''));
+		}
+
+		// Read
+
+		var result = key ? undefined : {};
+
+		// To prevent the for loop in the first place assign an empty array
+		// in case there are no cookies at all. Also prevents odd result when
+		// calling $.cookie().
+		var cookies = document.cookie ? document.cookie.split('; ') : [];
+
+		for (var i = 0, l = cookies.length; i < l; i++) {
+			var parts = cookies[i].split('=');
+			var name = decode(parts.shift());
+			var cookie = parts.join('=');
+
+			if (key && key === name) {
+				// If second argument (value) is a function it's a converter...
+				result = read(cookie, value);
+				break;
+			}
+
+			// Prevent storing a cookie that we couldn't decode.
+			if (!key && (cookie = read(cookie)) !== undefined) {
+				result[name] = cookie;
+			}
+		}
+
+		return result;
+	};
+
+	config.defaults = {};
+
+	$.removeCookie = function (key, options) {
+		if ($.cookie(key) !== undefined) {
+			// Must not alter options, thus extending a fresh object...
+			$.cookie(key, '', $.extend({}, options, { expires: -1 }));
+			return true;
+		}
+		return false;
+	};
+
+}));

themes/baggy/layout.twig

@@ -21,6 +21,9 @@
             {% block precontent %}{% endblock %}
             {% block messages %}
             {% include '_messages.twig' %}
+            {% if includeImport %}
+								{% include '_import.twig' %}
+						{% endif %}
             {% endblock %}
             <div id="content" class="w600p center">
             {% block content %}{% endblock %}

themes/baggy/tags.twig

@@ -6,7 +6,7 @@
 {% block content %}
 <h2>{% trans "Tags" %}</h2>
 <ul class="list-tags">
-{% for tag in tags %}<li>{% if token != '' %}<a class="icon icon-rss" href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><span>rss</span></a>{% endif %} <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> 
+{% for tag in tags %}<li>{% if token != '' %}<a class="icon icon-rss" href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><span>rss</span></a>{% endif %} <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> ({{ tag.entriescount }})
 </li>
 {% endfor %}
 </ul>

themes/baggy/view.twig

@@ -14,7 +14,7 @@
                 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
-                {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numflattrs }})</a></li>{% endif %}{% endif %}
+                {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numflattrs }})</a></li>{% endif %}{% endif %}
                 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display icon icon-delete"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
             </ul>
         </div>
@@ -29,4 +29,23 @@
                 {{ content | raw }}
             </article>
         </div>
+        <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
+        <script type="text/javascript">
+        $(document).ready(function() {
+
+            $(window).scroll(function(e){
+                var scrollTop = $(window).scrollTop();
+                var docHeight = $(document).height();
+                var scrollPercent = (scrollTop) / (docHeight);
+                var scrollPercentRounded = Math.round(scrollPercent*100)/100;
+                savePercent({{ entry.id|e }}, scrollPercentRounded);
+            });
+
+            retrievePercent({{ entry.id|e }});
+
+            $(window).resize(function(){
+                retrievePercent({{ entry.id|e }});
+            });
+        });
+        </script>
 {% endblock %}

themes/courgette/_head.twig

@@ -1,11 +1,11 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/{{theme}}/img/favicon.ico" />
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-precomposed.png">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/style.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/style.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/messages.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print">
         <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
         <script src="//codeorigin.jquery.com/jquery-2.0.3.min.js"></script>
-        <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
+        <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script>

themes/courgette/_top.twig

@@ -1,6 +1,6 @@
         <header>
             <h1>
-                {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/logo.svg" alt="logo poche" />{% endblock %}
+                {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}themes/{{theme}}/img/logo.svg" alt="wallabag logo" />{% endblock %}
                 {% elseif view == 'fav' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Favoris</span></a>
                 {% elseif view == 'archive' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Archive</span></a>
                 {% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a>

themes/courgette/_view.twig

@@ -23,7 +23,7 @@
                 {{ content | raw }}
             </article>
         </div>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script>
+        <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
         <script type="text/javascript">
         $(document).ready(function() {
 

themes/courgette/config.twig

@@ -7,7 +7,7 @@
 {% block content %}
         <div id="config">
             <h2>{% trans "Poching a link" %}</h2>
-            <p>{% trans "You can poche a link by several methods:" %} (<a class="special" href="http://doc.wallabag.org" title="{% trans "read the documentation" %}">?</a>)</p>
+            <p>{% trans "There are several ways to save an article:" %} (<a class="special" href="http://doc.wallabag.org" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
                 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li>
                 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">{% trans "download the extension" %}</a></li>
@@ -16,13 +16,13 @@
                     <form method="get" action="index.php">
                         <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
                         <input required placeholder="Ex:mywebsite.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
-                        <input type="submit" value="{% trans "poche it!" %}" />
+                        <input type="submit" value="{% trans "bag it!" %}" />
                     </form>
                 </li>
-                <li>{% trans "bookmarklet: drag & drop this link to your bookmarks bar" %} <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li>
+                <li>{% trans "bookmarklet: drag & drop this link to your bookmarks bar" %} <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a></li>
             </ul>
 
-            <h2>{% trans "Updating poche" %}</h2>
+            <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
                 <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
                 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
@@ -76,7 +76,7 @@
             <li><a href="./?import&amp;from=instapaper">{% trans "import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
             </ul>
 
-            <h2>{% trans "Export your poche datas" %}</h2>
+            <h2>{% trans "Export your wallabag data" %}</h2>
-            <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
+            <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
         </div>
 {% endblock %}

themes/courgette/home.twig

@@ -14,8 +14,8 @@
 {% block precontent %}
             {% if entries|length > 1 %}
             <ul id="sort">
-                <li><a href="./?sort=ia&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
+                <li><a href="./?sort=ia&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-                <li><a href="./?sort=ta&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
+                <li><a href="./?sort=ta&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
             </ul>
             {% endif %}
 {% endblock %}
@@ -26,9 +26,15 @@
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
                         {{ page_links | raw }}
                 </div>
+                    {% elseif nb_results == 1 %}
+                        {% if search_term is defined %}
+                     <div class="results">
+                        <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
+                     </div>
+                        {% endif %}
                     {% endif %}
                 {% endblock %}
                 {% for entry in entries %}

themes/courgette/tags.twig

@@ -4,5 +4,5 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-{% for tag in tags %}<a class="tag" href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %}
+{% for tag in tags %}<a class="tag" href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %}
 {% endblock %}

themes/default/_bookmarklet.twig

@@ -1,3 +1,3 @@
         <script type="text/javascript">
-          top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>poche it !</title>"+'<link rel="icon" href="{{poche_url}}tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
+          top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="{{poche_url}}tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
         </script>

themes/default/_head.twig

@@ -1,12 +1,13 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/default/img/favicon.ico" />
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/default/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/default/img/apple-touch-icon-144x144-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/default/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/default/img/apple-touch-icon-72x72-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/default/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/default/img/apple-touch-icon-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/default/img/apple-touch-icon-precomposed.png">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/knacss.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/knacss.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/style.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/style.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
+        <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/messages.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/print.css" media="print">
+        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/print.css" media="print">
-        <script src="{{ poche_url }}/themes/default/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script>
-        <script src="{{ poche_url }}/themes/default/js/autoClose.js"></script>
+        <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
-        <script src="{{ poche_url }}/themes/default/js/closeMessage.js"></script>
+        <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script>
+        <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>

themes/default/_import.twig

@@ -0,0 +1,15 @@
+<script type="text/javascript">
+<!--
+  $(document).ready(function() {
+  	$("body").css("cursor", "wait");
+  	
+    setTimeout(function(){
+      window.location = './?import';
+    }, {{ import.delay }} );
+  });
+//-->
+</script>
+<div class="messages warning">
+  <p>{% trans "Download required for " %} {{ import.recordsDownloadRequired }} {% trans "records" %}.</p>
+  <p>{% trans "Downloading next " %} {{ import.recordsUnderDownload }} {% trans "articles, please wait" %}...</p>
+</div>

themes/default/_menu.twig

@@ -3,9 +3,11 @@
                 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
                 <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
-                <li><a href="javascript: void(null);" id="pocheit">{% trans "save a link" %}</a><span id="pocheit-arrow"></span></li>
+                <li><a href="javascript: void(null);" id="bagit">{% trans "save a link" %}</a><span id="bagit-arrow"></span></li>
+                <li><a href="javascript: void(null);" id="search">{% trans "search" %}</a><span id="search-arrow"></span></li>
                 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                 <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
             </ul>
             {% include '_pocheit-form.twig' %}
+            {% include '_search-form.twig' %}
 

themes/default/_pocheit-form.twig

@@ -1,22 +1,8 @@
-<div id="pocheit-form" class="messages info">
+<div id="bagit-form" class="messages info">
-    <center>
+    <a href="javascript: void(null);" id="bagit-form-close">&nbsp;</a>
-    <form method="get" action="index.php">
+    <form method="get" action="index.php" id="bagit-form-form">
-        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+      <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
-        <input type="submit" value="{% trans "save link!" %}" />
+      <input type="submit" value="{% trans "save link!" %}" />
+      <div id="add-link-result"></div>
     </form>
-    </center>
 </div>
-<script type="text/javascript">
-    $(document).ready(function() {
-
-        $("#pocheit-form").hide();
-
-        $("#pocheit").click(function(){
-            $("#pocheit-form").toggle();
-            $("#pocheit").toggleClass("current");
-            $("#pocheit-arrow").toggleClass("arrow-down");
-        });
-
-
-    });
-</script>

themes/default/_search-form.twig

@@ -0,0 +1,23 @@
+<div id="search-form" class="messages info">			
+<form method="get" action="index.php">
+    <p>
+		<input type="hidden" name="view" value="search"></input>
+        <label>{% trans "Search" %}</label> : <input type="text" placeholder="{% trans "Enter your search here" %}" name="search" />
+		<input type="submit" value="{% trans "Search" %} !"></input>
+    </p>
+</form>
+</div>
+<script type="text/javascript">
+    $(document).ready(function() {
+
+        $("#search-form").hide();
+
+        $("#search").click(function(){
+            $("#search-form").toggle();
+            $("#search").toggleClass("current");
+            $("#search-arrow").toggleClass("arrow-down");
+        });
+
+
+    });
+</script>

themes/default/_sorting.twig

@@ -0,0 +1,6 @@
+{% if entries|length > 1 %}
+  <ul id="sort">
+      <li><a href="./?sort=ia&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
+      <li><a href="./?sort=ta&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
+  </ul>
+{% endif %}

themes/default/_top.twig

@@ -1,6 +1,6 @@
         <header class="w600p center mbm">
             <h1>
-                {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/logo.svg" alt="logo poche" />{% endblock %}
+                {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}themes/baggy/img/logo-other_themes.png" alt="wallabag logo" />{% endblock %}
                 {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a>
                 {% endif %}
             </h1>

themes/default/config.twig

@@ -8,10 +8,11 @@
             <h2>{% trans "Saving articles" %}</h2>
             <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
-                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
                 <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
-                <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
+                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
                 <li>
                     <form method="get" action="index.php">
                         <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
@@ -103,14 +104,20 @@
             {% endif %}
 
             <h2>{% trans "Import" %}</h2>
-            <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
+            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
-            <p>{% trans "More info in the official documentation:" %} <a href="http://doc.wallabag.org/doku.php?id=users:migrate">wallabag.org</a></p>
+            <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>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)." %}</p>
-            <ul>
+            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
-                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
+                <fieldset class="w500p">
-                <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
+                    <div class="row">
-                <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
+                        <label class="col w150p" for="file">{% trans "File:" %}</label>
-                <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCHE_FILE')) }}</li>
+                        <input class="col" type="file" id="file" name="file" tabindex="4">
-            </ul>
+                    </div>
+                    <div class="row mts txtcenter">
+                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
+                    </div>
+                </fieldset>
+            </form>
+            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
 
             <h2>{% trans "Export your wallabag data" %}</h2>
             {% if constant('STORAGE') == 'sqlite' %}

themes/default/css/jquery-ui-1.10.4.custom.css

@@ -0,0 +1,560 @@
+/*! jQuery UI - v1.10.4 - 2014-03-09
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.autocomplete.css, jquery.ui.menu.css, jquery.ui.theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-clearfix {
+	min-height: 0; /* support: IE7 */
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0);
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+}
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-menu {
+	list-style: none;
+	padding: 2px;
+	margin: 0;
+	display: block;
+	outline: none;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	/* support: IE10, see #8844 */
+	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px -2px 5px -2px;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration: none;
+	display: block;
+	padding: 2px .4em;
+	line-height: 1.5;
+	min-height: 0; /* support: IE7 */
+	font-weight: normal;
+}
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+
+.ui-menu .ui-state-disabled {
+	font-weight: normal;
+	margin: .4em 0 .2em;
+	line-height: 1.5;
+}
+.ui-menu .ui-state-disabled a {
+	cursor: default;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item a {
+	position: relative;
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: .2em;
+	left: .2em;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	position: static;
+	float: right;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget-content {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+	color: #222222;
+}
+.ui-widget-content a {
+	color: #222222;
+}
+.ui-widget-header {
+	border: 1px solid #aaaaaa;
+	background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
+	color: #222222;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	border: 1px solid #d3d3d3;
+	background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #555555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+	color: #555555;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+	border: 1px solid #999999;
+	background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited,
+.ui-state-focus a,
+.ui-state-focus a:hover,
+.ui-state-focus a:link,
+.ui-state-focus a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
+	color: #363636;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
+	color: #cd0a0a;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #cd0a0a;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #cd0a0a;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70);
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35);
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-state-default .ui-icon {
+	background-image: url(images/ui-icons_888888_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+	background-image: url(images/ui-icons_454545_256x240.png);
+}
+.ui-state-active .ui-icon {
+	background-image: url(images/ui-icons_454545_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+	background-image: url(images/ui-icons_2e83ff_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url(images/ui-icons_cd0a0a_256x240.png);
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+}
+.ui-widget-shadow {
+	margin: -8px 0 0 -8px;
+	padding: 8px;
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+	border-radius: 8px;
+}

themes/default/css/style.css

@@ -347,3 +347,58 @@ a.reading-time span {
     margin-left: -30px;
 }
 
+.two-column {
+  display: block;
+  width: 50%;
+  paddig-right: 20px;
+  float: left;
+  vertical-align: top;
+}
+
+
+/* ==========================================================================
+	"save a link" popup div related styles
+	========================================================================== */
+
+#bagit-form {
+  display: none;
+  padding-left: 30px;
+  width: 450px;
+
+}
+
+a#bagit-form-close {
+  color: #FFF;
+  display: inline-block;
+  float: right;
+  background: url("../img/messages/close.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+  height: 16px;
+  margin: -14px -8px 0 0;
+  width: 16px;
+  text-decoration: none;
+}
+
+
+.add-to-wallabag-link-after {
+  background-color: #000;
+  color: #fff;
+  padding: 0 4px 1px 3px;
+  font-weight: bold;
+  font-size: 0.7em;
+  border-radius: 4px;
+}
+.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
+  color: #fff;
+}
+.add-to-wallabag-link-after:visited {
+  color: #999;
+}
+
+#add-link-result {
+  display: inline;
+  padding-left: 10px;
+}
+
+.opacity03 {
+  /*opacity: 0.3;*/
+}

themes/default/edit-tags.twig

@@ -5,6 +5,10 @@
 {% endblock %}
 {% block content %}
 
+<script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script>
+<script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script>
+<link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all">
+
 <div id="article">
   <header class="mbm">
       <h1>{{ entry.title|raw }}</h1>
@@ -17,13 +21,15 @@ no tags
 <ul>
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
-<form method="post" action="./?action=add_tag">
+<form method="post" action="./?action=add_tag" id="editTags">
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />
     <label for="value">Add tags: </label>
     <input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
     <input type="submit" value="Tag" />
-    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
+    <p>{% trans "Start typing for auto complete." %}<br>
+    {% trans "You can enter multiple tags, separated by commas." %}</p>
 
 </form>
+<br>
 <a href="./?view=view&id={{ entry_id }}">&laquo; {% trans "return to article" %}</a>
 {% endblock %}

themes/default/home.twig

@@ -12,14 +12,15 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block precontent %}
-            {% if entries|length > 1 %}
+
-            <ul id="sort">
+{% include '_sorting.twig' %}
-                <li><a href="./?sort=ia&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-                <li><a href="./?sort=ta&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}&amp;id={{ id }}"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
-            </ul>
-            {% endif %}
 {% endblock %}
 {% block content %}
+
+						{% if includeImport %}
+								{% include '_import.twig' %}
+						{% endif %}
+
             {% if tag %}
                 <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
             {% endif %}
@@ -30,9 +31,15 @@
                 {% block pager %}
                     {% if nb_results > 1 %}
                 <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
                         {{ page_links | raw }}
                 </div>
+                    {% elseif nb_results == 1 %}
+                        {% if search_term is defined %}
+                     <div class="results">
+                        <div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div>
+                     </div>
+                        {% endif %}
                     {% endif %}
                 {% endblock %}
                 {% for entry in entries %}

themes/default/js/autoCompleteTags.js

@@ -0,0 +1,47 @@
+jQuery(function($) {
+
+  function split( val ) {
+    return val.split( /,\s*/ );
+  }
+  function extractLast( term ) {
+    return split( term ).pop();
+  }
+
+
+  $("#value").bind("keydown", function(event) {
+    if (event.keyCode === $.ui.keyCode.TAB && $(this).data("ui-autocomplete").menu.active) {
+      event.preventDefault();
+    }
+  }).autocomplete({
+    source : function(request, response) {
+      $.getJSON("./?view=tags", {
+        term : extractLast(request.term),
+        //id: $(':hidden#entry_id').val()
+      }, response);
+    },
+    search : function() {
+      // custom minLength
+      var term = extractLast(this.value);
+      if (term.length < 1) {
+        return false;
+      }
+    },
+    focus : function() {
+      // prevent value inserted on focus
+      return false;
+    },
+    select : function(event, ui) {
+      var terms = split(this.value);
+      // remove the current input
+      terms.pop();
+      // add the selected item
+      terms.push(ui.item.value);
+      // add placeholder to get the comma-and-space at the end
+      terms.push("");
+      this.value = terms.join(", ");
+      return false;
+    }
+  });
+
+
+});

themes/default/js/saveLink.js

@@ -0,0 +1,101 @@
+$.fn.ready(function() {
+
+  var $bagit = $('#bagit'),
+      $bagitForm = $('#bagit-form'),
+      $bagitFormForm = $('#bagit-form-form');
+
+  /* ==========================================================================
+   bag it link and close button
+   ========================================================================== */
+
+  function toggleSaveLinkForm(url, event) {
+    $("#add-link-result").empty();
+
+    $bagit.toggleClass("active-current");
+
+    //only if bagiti link is not presented on page
+    if ( $bagit.length === 0 ) {
+      if ( event !== 'undefined' && event ) {
+        $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200});
+      }
+      else {
+        $bagitForm.css( {position:"relative", top:"auto", left:"auto"});
+      }
+    }
+
+    $bagitForm.toggle();
+    $('#content').toggleClass("opacity03");
+    if (url !== 'undefined' && url) {
+      $('#plainurl').val(url);
+    }
+    $('#plainurl').focus();
+  }
+
+
+  $bagit.click(function(){
+    $bagit.toggleClass("current");
+    $("#bagit-arrow").toggleClass("arrow-down");
+    toggleSaveLinkForm();
+  });
+
+  $("#bagit-form-close").click(function(){
+    $bagit.removeClass("current");
+    $("#bagit-arrow").removeClass("arrow-down");
+    toggleSaveLinkForm();
+  });
+
+
+  //send "bag it link" form request via ajax
+  $bagitFormForm.submit( function(event) {
+    $("body").css("cursor", "wait");
+    $("#add-link-result").empty();
+
+    $.ajax({
+      type: $bagitFormForm.attr('method'),
+      url: $bagitFormForm.attr('action'),
+      data: $bagitFormForm.serialize(),
+      success: function(data) {
+        $('#add-link-result').html("Done!");
+        $('#plainurl').val('');
+        $('#plainurl').blur('');
+        $("body").css("cursor", "auto");
+        //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay
+      },
+      error: function(data) {
+        $('#add-link-result').html("Failed!");
+        $("body").css("cursor", "auto");
+      }
+    });
+
+    event.preventDefault();
+  });
+
+  /* ==========================================================================
+   Keyboard gestion
+   ========================================================================== */
+
+  $(window).keydown(function(e){
+    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || e.keyCode == 27 ) {
+      $bagit.removeClass("current");
+      $("#bagit-arrow").removeClass("arrow-down");
+      toggleSaveLinkForm();
+      return false;
+    }
+  });
+
+  /* ==========================================================================
+   Process all links inside an article
+   ========================================================================== */
+
+  $("article a[href^='http']").after(function() {
+    return " <a href=\"" + $(this).attr('href') + "\" class=\"add-to-wallabag-link-after\" alt=\"add to wallabag\" title=\"add to wallabag\">w</a> ";
+  });
+
+  $(".add-to-wallabag-link-after").click(function(event){
+    toggleSaveLinkForm($(this).attr('href'), event);
+    event.preventDefault();
+  });
+
+});
+
+

themes/default/tags.twig

@@ -4,5 +4,15 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-{% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %}
+  <div class="two-column">
+    {% for tag in tags %}
+      <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a>  ({{ tag.entriescount }}) {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %}
+      <br>
+
+      {% if loop.index  == '%d'|format(loop.length/2 + 0.5)  %}
+        </div><div class="two-column">
+      {% endif %}
+
+    {% endfor %}
+  </div>
 {% endblock %}

themes/default/view.twig

@@ -1,6 +1,7 @@
 {% extends "layout.twig" %}
 {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
 {% block content %}
+        {% include '_pocheit-form.twig' %}
         <div id="article_toolbar">
             <ul>
                 <li><a href="./" title="{% trans "Return home" %}" class="tool back"><span>{% trans "Return home" %}</span></a></li>
@@ -30,7 +31,7 @@
             </article>
             {{ block('tags') }}
         </div>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script>
+        <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
         <script type="text/javascript">
         $(document).ready(function() {
 
@@ -55,3 +56,4 @@
         });
         </script>
 {% endblock %}
+

wallabag_compatibility_test.php

@@ -1,5 +1,5 @@
 <?php
-$app_name = 'wallabag 1';
+$app_name = 'wallabag';
 
 $php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>='));
 $pcre_ok = extension_loaded('pcre');
@@ -11,6 +11,7 @@ $curl_ok = function_exists('curl_exec');
 $parallel_ok = ((extension_loaded('http') && class_exists('HttpRequestPool')) || ($curl_ok && function_exists('curl_multi_init')));
 $allow_url_fopen_ok = (bool)ini_get('allow_url_fopen');
 $filter_ok = extension_loaded('filter');
+$gettext_ok = function_exists("gettext");
 
 if (extension_loaded('xmlreader')) {
 	$xml_ok = true;
@@ -130,8 +131,6 @@ table#chart tr.enabled td {
 
 table#chart tr.disabled td, 
 table#chart tr.disabled td a {
-	color:#999;
-	font-style:italic;
 }
 
 table#chart tr.disabled td a {
@@ -154,12 +153,31 @@ div.chunk {
 	background-color:transparent;
 	font-style:italic;
 }
+
+.good{
+background-color:#52CC5B;
+}
+.bad{
+background-color:#F74343;
+font-style:italic;
+font-weight: bold;
+}
+.pass{
+background-color:#FF9500;
+}
+
 </style>
 
 </head>
 
 <body>
-
+<?php
+$frominstall = false;
+if (isset($_GET['from'])){
+	if ($_GET['from'] == 'install'){
+		$frominstall = true;
+		}}
+?>
 <div id="site">
 	<div id="content">
 
@@ -177,58 +195,63 @@ div.chunk {
 					<tr class="<?php echo ($php_ok) ? 'enabled' : 'disabled'; ?>">
 						<td>PHP</td>
 						<td>5.3.3 or higher</td>
-						<td><?php echo phpversion(); ?></td>
+						<td class="<?php echo ($php_ok) ? 'good' : 'disabled'; ?>"><?php echo phpversion(); ?></td>
 					</tr>
-					<tr class="<?php echo ($xml_ok) ? 'enabled, and sane' : 'disabled, or broken'; ?>">
+					<tr class="<?php echo ($xml_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://php.net/xml">XML</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($xml_ok) ? 'Enabled, and sane' : 'Disabled, or broken'; ?></td>
+						<?php echo ($xml_ok) ? '<td class="good">Enabled, and sane</span>' : '<td class="bad">Disabled, or broken'; ?></td>
 					</tr>
 					<tr class="<?php echo ($pcre_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://php.net/pcre">PCRE</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($pcre_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($pcre_ok) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td>
 					</tr>
 <!-- 					<tr class="<?php echo ($zlib_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://php.net/zlib">Zlib</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($zlib_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($zlib_ok) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td>
 					</tr> -->
 <!-- 					<tr class="<?php echo ($mbstring_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://php.net/mbstring">mbstring</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($mbstring_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($mbstring_ok) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td>
 					</tr> -->
 <!-- 					<tr class="<?php echo ($iconv_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://php.net/iconv">iconv</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($iconv_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($iconv_ok) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td>
 					</tr> -->
 					<tr class="<?php echo ($filter_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://uk.php.net/manual/en/book.filter.php">Data filtering</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($filter_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($filter_ok) ? '<td class="good">Enabled' : '<td class="pass">Disabled'; ?></td>
 					</tr>					
 					<tr class="<?php echo ($tidy_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://php.net/tidy">Tidy</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($tidy_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($tidy_ok) ? '<td class="good">Enabled' : '<td class="pass">Disabled'; ?></td>
 					</tr>
 					<tr class="<?php echo ($curl_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://php.net/curl">cURL</a></td>
 						<td>Enabled</td>
-						<td><?php echo (extension_loaded('curl')) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo (extension_loaded('curl')) ? '<td class="good">Enabled' : '<td class="pass">Disabled'; ?></td>
 					</tr>
 					<tr class="<?php echo ($parallel_ok) ? 'enabled' : 'disabled'; ?>">
 						<td>Parallel URL fetching</td>
 						<td>Enabled</td>
-						<td><?php echo ($parallel_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($parallel_ok) ? '<td class="good">Enabled' : '<td class="pass">Disabled'; ?></td>
 					</tr>
 					<tr class="<?php echo ($allow_url_fopen_ok) ? 'enabled' : 'disabled'; ?>">
 						<td><a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></td>
 						<td>Enabled</td>
-						<td><?php echo ($allow_url_fopen_ok) ? 'Enabled' : 'Disabled'; ?></td>
+						<?php echo ($allow_url_fopen_ok) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td>
-					</tr>						
+					</tr>
+					<tr class="<?php echo ($gettext_ok) ? 'enabled' : 'disabled'; ?>">
+						<td><a href="http://php.net/manual/en/book.gettext.php">gettext</a></td>
+						<td>Enabled</td>
+						<?php echo ($gettext_ok) ? '<td class="good">Enabled' : '<td class="bad">Disabled'; ?></td>
+					</tr>
 				</tbody>
 			</table>
 		</div>
@@ -237,7 +260,7 @@ div.chunk {
 			<h3>What does this mean?</h3>
 			<ol>
 				<?php //if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $iconv_ok && $filter_ok && $zlib_ok && $tidy_ok && $curl_ok && $parallel_ok && $allow_url_fopen_ok): ?>
-				<?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $tidy_ok && $curl_ok && $parallel_ok && $allow_url_fopen_ok): ?>
+				<?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $tidy_ok && $curl_ok && $parallel_ok && $allow_url_fopen_ok && $gettext_ok): ?>
 				<li><em>You have everything you need to run <?php echo $app_name; ?> properly!  Congratulations!</em></li>
 				<?php else: ?>
 					<?php if ($php_ok): ?>
@@ -250,59 +273,66 @@ div.chunk {
 								<?php if ($allow_url_fopen_ok): ?>
 									<li><strong>allow_url_fopen:</strong> You have allow_url_fopen enabled. <em>No problems here.</em></li>
 									
-									<?php if ($filter_ok): ?>
+									<?php if ($gettext_ok): ?>
-										<li><strong>Data filtering:</strong> You have the PHP filter extension enabled. <em>No problems here.</em></li>
+										<li><strong>Gettext:</strong> You have <code>gettext</code> enabled. <em>No problems here.</em></li>
+									
+										<?php if ($filter_ok): ?>
+											<li><strong>Data filtering:</strong> You have the PHP filter extension enabled. <em>No problems here.</em></li>
 	
-										<?php if ($zlib_ok): ?>
+											<?php if ($zlib_ok): ?>
-											<li><strong>Zlib:</strong> You have <code>Zlib</code> enabled.  This allows SimplePie to support GZIP-encoded feeds.  <em>No problems here.</em></li>
+												<li><strong>Zlib:</strong> You have <code>Zlib</code> enabled.  This allows SimplePie to support GZIP-encoded feeds.  <em>No problems here.</em></li>
-										<?php else: ?>
+											<?php else: ?>
-											<li><strong>Zlib:</strong> The <code>Zlib</code> extension is not available.  SimplePie will ignore any GZIP-encoding, and instead handle feeds as uncompressed text.</li>
+												<li><strong>Zlib:</strong> The <code>Zlib</code> extension is not available.  SimplePie will ignore any GZIP-encoding, and instead handle feeds as uncompressed text.</li>
-										<?php endif; ?>
+											<?php endif; ?>
-			
+											
-										<?php if ($mbstring_ok && $iconv_ok): ?>
+											<?php if ($mbstring_ok && $iconv_ok): ?>
-											<li><strong>mbstring and iconv:</strong> You have both <code>mbstring</code> and <code>iconv</code> installed!  This will allow <?php echo $app_name; ?> to handle the greatest number of languages. <em>No problems here.</em></li>
+												<li><strong>mbstring and iconv:</strong> You have both <code>mbstring</code> and <code>iconv</code> installed!  This will allow <?php echo $app_name; ?> to handle the greatest number of languages. <em>No problems here.</em></li>
-										<?php elseif ($mbstring_ok): ?>
+											<?php elseif ($mbstring_ok): ?>
-											<li><strong>mbstring:</strong> <code>mbstring</code> is installed, but <code>iconv</code> is not.</li>
+												<li><strong>mbstring:</strong> <code>mbstring</code> is installed, but <code>iconv</code> is not.</li>
-										<?php elseif ($iconv_ok): ?>
+											<?php elseif ($iconv_ok): ?>
-											<li><strong>iconv:</strong> <code>iconv</code> is installed, but <code>mbstring</code> is not.</li>
+												<li><strong>iconv:</strong> <code>iconv</code> is installed, but <code>mbstring</code> is not.</li>
-										<?php else: ?>
+											<?php else: ?>
-											<li><strong>mbstring and iconv:</strong> <em>You do not have either of the extensions installed.</em> This will significantly impair your ability to read non-English feeds, as well as even some English ones.</li>
+												<li><strong>mbstring and iconv:</strong> <em>You do not have either of the extensions installed.</em> This will significantly impair your ability to read non-English feeds, as well as even some English ones.</li>
-										<?php endif; ?>
+											<?php endif; ?>
+
+											<?php if ($tidy_ok): ?>
+												<li><strong>Tidy:</strong> You have <code>Tidy</code> support installed.  <em>No problems here.</em></li>
+											<?php else: ?>
+												<li><strong>Tidy:</strong> The <code>Tidy</code> extension is not available.  <?php echo $app_name; ?> should still work with most feeds, but you may experience problems with some.</li>
+											<?php endif; ?>
+										
+											<?php if ($curl_ok): ?>
+												<li><strong>cURL:</strong> You have <code>cURL</code> support installed.  <em>No problems here.</em></li>
+											<?php else: ?>
+												<li><strong>cURL:</strong> The <code>cURL</code> extension is not available.  SimplePie will use <code>fsockopen()</code> instead.</li>
+											<?php endif; ?>
+			
+											<?php if ($parallel_ok): ?>
+												<li><strong>Parallel URL fetching:</strong> You have <code>HttpRequestPool</code> or <code>curl_multi</code> support installed.  <em>No problems here.</em></li>
+											<?php else: ?>
+												<li><strong>Parallel URL fetching:</strong> <code>HttpRequestPool</code> or <code>curl_multi</code> support is not available.  <?php echo $app_name; ?> will use <code>file_get_contents()</code> instead to fetch URLs sequentially rather than in parallel.</li>
+											<?php endif; ?>
 
-										<?php if ($tidy_ok): ?>
-											<li><strong>Tidy:</strong> You have <code>Tidy</code> support installed.  <em>No problems here.</em></li>
 										<?php else: ?>
-											<li><strong>Tidy:</strong> The <code>Tidy</code> extension is not available.  <?php echo $app_name; ?> should still work with most feeds, but you may experience problems with some.</li>
+											<li><strong>Data filtering:</strong> Your PHP configuration has the filter extension disabled.  <strong><?php echo $app_name; ?> will not work here.</strong></li>
 										<?php endif; ?>
 										
-										<?php if ($curl_ok): ?>
-											<li><strong>cURL:</strong> You have <code>cURL</code> support installed.  <em>No problems here.</em></li>
-										<?php else: ?>
-											<li><strong>cURL:</strong> The <code>cURL</code> extension is not available.  SimplePie will use <code>fsockopen()</code> instead.</li>
-										<?php endif; ?>
-			
-										<?php if ($parallel_ok): ?>
-											<li><strong>Parallel URL fetching:</strong> You have <code>HttpRequestPool</code> or <code>curl_multi</code> support installed.  <em>No problems here.</em></li>
-										<?php else: ?>
-											<li><strong>Parallel URL fetching:</strong> <code>HttpRequestPool</code> or <code>curl_multi</code> support is not available.  <?php echo $app_name; ?> will use <code>file_get_contents()</code> instead to fetch URLs sequentially rather than in parallel.</li>
-										<?php endif; ?>
-
 									<?php else: ?>
-										<li><strong>Data filtering:</strong> Your PHP configuration has the filter extension disabled.  <em><?php echo $app_name; ?> will not work here.</em></li>
+										<li><strong>GetText:</strong> The <code>gettext</code> extension is not available. The system we use to display wallabag in various languages is not available. <strong><?php echo $app_name; ?> will not work here.</strong></li>
-									<?php endif; ?>										
+									<?php endif; ?>
 										
 								<?php else: ?>
-									<li><strong>allow_url_fopen:</strong> Your PHP configuration has allow_url_fopen disabled.  <em><?php echo $app_name; ?> will not work here.</em></li>
+									<li><strong>allow_url_fopen:</strong> Your PHP configuration has allow_url_fopen disabled.  <strong><?php echo $app_name; ?> will not work here.</strong></li>
 								<?php endif; ?>
 									
 							<?php else: ?>
-								<li><strong>PCRE:</strong> Your PHP installation doesn't support Perl-Compatible Regular Expressions.  <em><?php echo $app_name; ?> will not work here.</em></li>
+								<li><strong>PCRE:</strong> Your PHP installation doesn't support Perl-Compatible Regular Expressions.  <strong><?php echo $app_name; ?> will not work here.</strong></li>
 							<?php endif; ?>
 						<?php else: ?>
-							<li><strong>XML:</strong> Your PHP installation doesn't support XML parsing.  <em><?php echo $app_name; ?> will not work here.</em></li>
+							<li><strong>XML:</strong> Your PHP installation doesn't support XML parsing.  <strong><?php echo $app_name; ?> will not work here.</strong></li>
 						<?php endif; ?>
 					<?php else: ?>
-						<li><strong>PHP:</strong> You are running an unsupported version of PHP.  <em><?php echo $app_name; ?> will not work here.</em></li>
+						<li><strong>PHP:</strong> You are running an unsupported version of PHP.  <strong><?php echo $app_name; ?> will not work here.</strong></li>
 					<?php endif; ?>
 				<?php endif; ?>
 			</ol>
@@ -310,16 +340,26 @@ div.chunk {
 
 		<div class="chunk">
 			<?php //if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $iconv_ok && $filter_ok && $allow_url_fopen_ok) { ?>
-			<?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok) { ?>
+			<?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok && $gettext_ok) { ?>
 				<h3>Bottom Line: Yes, you can!</h3>
 				<p><em>Your webhost has its act together!</em></p>
+				<?php if (!$frominstall) { ?>
 				<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
+				<p>If you already have done that, you should access <a href="index.php">the index.php file</a> of your installation to configure and/or start using wallabag</p>
+				<?php } else { ?>
+				<p>You can now <a href="index.php">return to the installation section</a>.</p>
+				<?php } ?>
 				<p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p>
 			<?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?>
-			<?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok) { ?>
+			<?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok && $gettext_ok) { ?>
 				<h3>Bottom Line: Yes, you can!</h3>
 				<p><em>For most feeds, it'll run with no problems.</em> There are certain languages that you might have a hard time with though.</p>
+				<?php if (!$frominstall) { ?>
 				<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
+				<p>If you already have done that, you should access <a href="index.php">the index.php file</a> of your installation to configure and/or start using wallabag</p>
+				<?php } else { ?>
+				<p>You can now <a href="index.php">return to the installation section</a>.</p>
+				<?php } ?>
 				<p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p>
 			<?php } else { ?>
 				<h3>Bottom Line: We're sorry…</h3>