82 files changed, 9167 insertions, 1713 deletions

diff --git a/.gitignore b/.gitignore
index 2abed7ed..aec2e3ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ cache/*
 vendor
 composer.phar
 db/poche.sqlite
-inc/poche/config.inc.php
\ No newline at end of file
+inc/poche/config.inc.php
+inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/
\ No newline at end of file
diff --git a/README.md b/README.md
index fe6a06b6..ac08beb4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # what is wallabag ?
+teste
 wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
 
 More informations on our website: [wallabag.org](http://wallabag.org)
diff --git a/TRANSLATION.md b/TRANSLATION.md
new file mode 100755
index 00000000..2e38d5cc
--- /dev/null
+++ b/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.
+
diff --git a/check_setup.php b/check_setup.php
index 96dd0f7d..2b84a744 100644
--- a/check_setup.php
+++ b/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');
diff --git a/cron.php b/cron.php
new file mode 100644
index 00000000..8fbf421a
--- /dev/null
+++ b/cron.php
@@ -0,0 +1,53 @@
+<?php
+error_reporting(E_ALL);
+include_once 'inc/poche/global.inc.php';
+include_once 'inc/poche/config.inc.php';
+
+if (php_sapi_name() === 'cli') {
+    $options_cli = getopt('', array(
+        'limit::',
+        'user-id::',
+        'token::',
+    ));
+}
+else {
+    $options_cli = $_GET;
+}
+
+$limit = ! empty($options_cli['limit']) && ctype_digit($options_cli['limit']) ? (int) $options_cli['limit'] : 10;
+$user_id = ! empty($options_cli['user-id']) && ctype_digit($options_cli['user-id']) ? (int) $options_cli['user-id'] : null;
+$token = ! empty($options_cli['token']) ? $options_cli['token'] : null;
+
+if (is_null($user_id)) {
+    die('You must give a user id');
+}
+
+if (is_null($token)) {
+    die('You must give a token');
+}
+
+$store = new Database();
+$config = $store->getConfigUser($user_id);
+
+if ($token != $config['token']) {
+    die(_('Uh, there is a problem with the cron.'));
+}
+
+$items = $store->retrieveUnfetchedEntries($user_id, $limit);
+
+foreach ($items as $item) {
+    $url = new Url(base64_encode($item['url']));
+    $content = Tools::getPageContent($url);
+
+    $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
+    $body = $content['rss']['channel']['item']['description'];
+
+    // // clean content from prevent xss attack
+    $config = HTMLPurifier_Config::createDefault();
+    $purifier = new HTMLPurifier($config);
+    $title = $purifier->purify($title);
+    $body = $purifier->purify($body);
+
+
+    $store->updateContentAndTitle($item['id'], $title, $body, $user_id);
+}
\ No newline at end of file
diff --git a/inc/3rdparty/Session.class.php b/inc/3rdparty/Session.class.php
index b30a31f3..599b68cd 100644
--- a/inc/3rdparty/Session.class.php
+++ b/inc/3rdparty/Session.class.php
@@ -33,7 +33,7 @@ class Session
     // his/her session is considered expired (3600 sec. = 1 hour)
     public static $inactivityTimeout = 86400;
     // Extra timeout for long sessions (if enabled) (82800 sec. = 23 hours)
-    public static $longSessionTimeout = 31536000;
+    public static $longSessionTimeout = 604800; // 604800 = a week
     // If you get disconnected often or if your IP address changes often.
     // Let you disable session cookie hijacking protection
     public static $disableSessionProtection = false;
@@ -61,7 +61,7 @@ class Session
         if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
             $ssl = true;
         }
-        session_set_cookie_params($cookie['lifetime'], $cookiedir, $_SERVER['HTTP_HOST'], $ssl);
+        session_set_cookie_params(self::$longSessionTimeout, $cookiedir, $_SERVER['HTTP_HOST'], $ssl);
         // Use cookies to store session.
         ini_set('session.use_cookies', 1);
         // Force cookies for session  (phpsessionID forbidden in URL)
@@ -143,7 +143,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();
     }
 
     /**
diff --git a/inc/3rdparty/libraries/feedwriter/FeedItem.php b/inc/3rdparty/libraries/feedwriter/FeedItem.php
index 9373deeb..0eae5e08 100644
--- a/inc/3rdparty/libraries/feedwriter/FeedItem.php
+++ b/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

                 {

diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php
index 2852c4c2..135964f1 100755
--- a/inc/3rdparty/makefulltextfeed.php
+++ b/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.

-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';

+

+require_once dirname(__FILE__).'/makefulltextfeedHelpers.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();

-        }

-}
\ No newline at end of file
diff --git a/inc/3rdparty/makefulltextfeedHelpers.php b/inc/3rdparty/makefulltextfeedHelpers.php
new file mode 100755
index 00000000..1c11b8f6
--- /dev/null
+++ b/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();
+        }
+}
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index c998fe14..5b51b507 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -230,8 +230,30 @@ 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 retrieveAll($user_id) {
-        $sql        = "SELECT * FROM entries WHERE user_id=? ORDER BY id";
+        $sql        = "SELECT * FROM entries WHERE content <> '' AND user_id=? ORDER BY id";
         $query      = $this->executeQuery($sql, array($user_id));
         $entries    = $query->fetchAll();
 
@@ -250,7 +272,7 @@ class Database {
 
     public function retrieveOneByURL($url, $user_id) {
         $entry  = NULL;
-        $sql    = "SELECT * FROM entries WHERE url=? AND user_id=?";
+        $sql    = "SELECT * FROM entries WHERE content <> '' AND url=? AND user_id=?";
         $params = array($url, $user_id);
         $query  = $this->executeQuery($sql, $params);
         $entry  = $query->fetchAll();
@@ -267,21 +289,22 @@ class Database {
     public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0) {
         switch ($view) {
             case 'archive':
-                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
+                $sql    = "SELECT * FROM entries WHERE content <> '' AND user_id=? AND is_read=? ";
                 $params = array($user_id, 1);
                 break;
             case 'fav' :
-                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_fav=? ";
+                $sql    = "SELECT * FROM entries WHERE content <> '' AND user_id=? AND is_fav=? ";
                 $params = array($user_id, 1);
                 break;
             case 'tag' :
                 $sql    = "SELECT entries.* FROM entries
                 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
-                WHERE entries.user_id=? AND tags_entries.tag_id = ? ";
+                WHERE entries.content <> '' AND
+                entries.user_id=? AND tags_entries.tag_id = ? ";
                 $params = array($user_id, $tag_id);
                 break;
             default:
-                $sql    = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
+                $sql    = "SELECT * FROM entries WHERE content <> '' AND user_id=? AND is_read=? ";
                 $params = array($user_id, 0);
                 break;
         }
@@ -294,24 +317,25 @@ class Database {
                 return $entries;
         }
 
-    public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {

-        switch ($view) {

+    public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {
+        switch ($view) {
             case 'archive':
-                    $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";

+                    $sql    = "SELECT count(*) FROM entries WHERE content <> '' AND 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 content <> '' AND user_id=? AND is_fav=? ";
                 $params = array($user_id, 1);
                 break;
-            case 'tag' :

-                $sql    = "SELECT count(*) FROM entries

-                    LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id

-                    WHERE entries.user_id=? AND tags_entries.tag_id = ? ";

-                $params = array($user_id, $tag_id);

-                break;

+            case 'tag' :
+                $sql    = "SELECT count(*) FROM entries
+                    LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
+                    WHERE entries.content <> '' AND
+                    entries.user_id=? AND tags_entries.tag_id = ? ";
+                $params = array($user_id, $tag_id);
+                break;
             default:
-                $sql    = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";

+                $sql    = "SELECT count(*) FROM entries WHERE content <> '' AND user_id=? AND is_read=? ";
                 $params = array($user_id, 0);
                 break;
         }
@@ -319,7 +343,7 @@ class Database {
         $query = $this->executeQuery($sql, $params);
         list($count) = $query->fetch();
 
-        return $count;

+        return $count;
     }
 
     public function updateContent($id, $content, $user_id) {
@@ -365,12 +389,15 @@ class Database {
         return $this->getHandle()->lastInsertId($column);
     }
 
-    public function retrieveAllTags($user_id) {
-        $sql = "SELECT DISTINCT tags.* FROM tags
+    public function retrieveAllTags($user_id, $term = null) {
+        $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=?";
-        $query = $this->executeQuery($sql, array($user_id));
+          WHERE entries.content <> '' AND entries.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;
@@ -381,7 +408,7 @@ class Database {
         $sql    = "SELECT DISTINCT tags.* FROM tags
           LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
           LEFT JOIN entries ON tags_entries.entry_id=entries.id
-          WHERE tags.id=? AND entries.user_id=?";
+          WHERE entries.content <> '' AND tags.id=? AND entries.user_id=?";
         $params = array(intval($id), $user_id);
         $query  = $this->executeQuery($sql, $params);
         $tag  = $query->fetchAll();
@@ -393,7 +420,8 @@ class Database {
         $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=?";
+            WHERE entries.content <> '' AND
+            tags_entries.tag_id = ? AND entries.user_id=?";
         $query = $this->executeQuery($sql, array($tag_id, $user_id));
         $entries = $query->fetchAll();
 
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 34f2ff5a..7bf33308 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -34,7 +34,8 @@ class Poche
       'pl_PL.utf8' => 'Polski',
       'ru_RU.utf8' => 'Pу��кий',
       'sl_SI.utf8' => 'Slovenš�ina',
-      'uk_UA.utf8' => 'Україн�ький',
+      'uk_UA.utf8' => 'Україн�ька',
+      'pt_BR.utf8' => 'Brasileiro',
     );
     public function __construct()
     {
@@ -336,7 +337,7 @@ class Poche
         while (($language = readdir($handle)) !== false) {
             # Languages are stored in a directory, so all directory names are languages
             # @todo move language installation data to database
-            if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.'))) {
+            if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
                 continue;
             }
             
@@ -346,7 +347,7 @@ class Poche
                 $current = true;
             }
             
-            $languages[] = array('name' => $this->language_names[$language], 'value' => $language, 'current' => $current);
+            $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current);
         }
         
         return $languages;
@@ -361,60 +362,6 @@ class Poche
         );
     }
 
-    protected function getPageContent(Url $url)
-    {
-        // Saving and clearing context
-        $REAL = array();
-        foreach( $GLOBALS as $key => $value ) {
-            if( $key != "GLOBALS" && $key != "_SESSION" ) {
-                $GLOBALS[$key] = array();
-                $REAL[$key] = $value;
-            }
-        }
-        // Saving and clearing 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_flush();
-            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
-        foreach( $_SESSION as $key => $value ) {
-            unset($_SESSION[$key]);
-        }
-        foreach( $REAL_SESSION as $key => $value ) {
-            $_SESSION[$key] = $value;
-        }
-        return json_decode($json, true);
-    }
-
     /**
      * Call action (mark as fav, archive, delete, etc.)
      */
@@ -423,17 +370,25 @@ class Poche
         switch ($action)
         {
             case 'add':
-                $content = $this->getPageContent($url);
-                $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
-                $body = $content['rss']['channel']['item']['description'];
-
-                // clean content from prevent xss attack
-                $config = HTMLPurifier_Config::createDefault();
-                $purifier = new HTMLPurifier($config);
-                $title = $purifier->purify($title);
-                $body = $purifier->purify($body);
+                if (!$import) {
+                    $content = Tools::getPageContent($url);
+                    $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
+                    $body = $content['rss']['channel']['item']['description'];
+
+                    // clean content from prevent xss attack
+                    $config = HTMLPurifier_Config::createDefault();
+                    $config->set('Cache.SerializerPath', CACHE);
+                    $purifier = new HTMLPurifier($config);
+                    $title = $purifier->purify($title);
+                    $body = $purifier->purify($body);
+                }
+                else {
+                    $title = '';
+                    $body = '';
+                }
 
                 //search for possible duplicate if not in import mode
+                $duplicate = NULL;
                 if (!$import) {
                     $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
                 }
@@ -534,25 +489,33 @@ class Poche
                     Tools::logm('error : article not found');
                     Tools::redirect();
                 }
+                //get all already set tags to preven duplicates
+                $already_set_tags = array();
+                $entry_tags = $this->store->retrieveTagsByEntry($entry_id);
+                foreach ($entry_tags as $tag) {
+                  $already_set_tags[] = $tag['value'];
+                }
                 foreach($tags as $key => $tag_value) {
                     $value = trim($tag_value);
-                    $tag = $this->store->retrieveTagByValue($value);
-
-                    if (is_null($tag)) {
-                        # we create the tag
-                        $tag = $this->store->createTag($value);
-                        $sequence = '';
-                        if (STORAGE == 'postgres') {
-                            $sequence = 'tags_id_seq';
-                        }
-                        $tag_id = $this->store->getLastId($sequence);
+                    if ($value && !in_array($value, $already_set_tags)) {
+                      $tag = $this->store->retrieveTagByValue($value);
+
+                      if (is_null($tag)) {
+                          # we create the tag
+                          $tag = $this->store->createTag($value);
+                          $sequence = '';
+                          if (STORAGE == 'postgres') {
+                              $sequence = 'tags_id_seq';
+                          }
+                          $tag_id = $this->store->getLastId($sequence);
+                      }
+                      else {
+                          $tag_id = $tag['id'];
+                      }
+
+                      # we assign the tag to the article
+                      $this->store->setTagToEntry($tag_id, $entry_id);
                     }
-                    else {
-                        $tag_id = $tag['id'];
-                    }
-
-                    # we assign the tag to the article
-                    $this->store->setTagToEntry($tag_id, $entry_id);
                 }
                 if(!$import) {
                     Tools::redirect();
@@ -581,8 +544,12 @@ class Poche
         switch ($view)
         {
             case 'config':
-                $dev = trim($this->getPocheVersion('dev'));
-                $prod = trim($this->getPocheVersion('prod'));
+                $dev_infos = $this->getPocheVersion('dev');
+                $dev = trim($dev_infos[0]);
+                $check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
+                $prod_infos = $this->getPocheVersion('prod');
+                $prod = trim($prod_infos[0]);
+                $check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
                 $compare_dev = version_compare(POCHE, $dev);
                 $compare_prod = version_compare(POCHE, $prod);
                 $themes = $this->getInstalledThemes();
@@ -594,6 +561,8 @@ class Poche
                     'languages' => $languages,
                     'dev' => $dev,
                     'prod' => $prod,
+                    'check_time_dev' => $check_time_dev,
+                    'check_time_prod' => $check_time_prod,
                     'compare_dev' => $compare_dev,
                     'compare_prod' => $compare_prod,
                     'token' => $token,
@@ -619,7 +588,17 @@ class Poche
                 break;
             case 'tags':
                 $token = $this->user->getConfigValue('token');
-                $tags = $this->store->retrieveAllTags($this->user->getId());
+                //if term is set - search tags for this term
+                $term = Tools::checkVar('term');
+                $tags = $this->store->retrieveAllTags($this->user->getId(), $term);
+                if (Tools::isAjaxRequest()) {
+                  $result = array();
+                  foreach ($tags as $tag) {
+                    $result[] = $tag['value'];
+                  }
+                  echo json_encode($result);
+                  exit;
+                }
                 $tpl_vars = array(
                     'token' => $token,
                     'user_id' => $this->user->getId(),
@@ -660,6 +639,7 @@ class Poche
                     'entries' => '',
                     'page_links' => '',
                     'nb_results' => '',
+                    'listmode' => (isset($_COOKIE['listmode']) ? true : false),
                 );
                 
                 //if id is given - we retrive entries by tag: id is tag id
@@ -750,6 +730,8 @@ class Poche
         $currentConfig['theme'] = $_POST['theme'];
         
         $_SESSION['poche_user']->setConfig($currentConfig);
+
+        $this->emptyCache();
         
         Tools::redirect('?view=config');
     }
@@ -788,6 +770,8 @@ class Poche
         $currentConfig['language'] = $_POST['language'];
         
         $_SESSION['poche_user']->setConfig($currentConfig);
+
+        $this->emptyCache();
         
         Tools::redirect('?view=config');
     }
@@ -891,7 +875,9 @@ class Poche
             # the second <ol> is for read links
             $read = 1;
         }
-        $this->messages->add('s', _('import from instapaper completed'));
+
+        $unlink = unlink($targetFile);
+        $this->messages->add('s', _('import from instapaper completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from instapaper completed');
         Tools::redirect();
     }
@@ -935,7 +921,9 @@ class Poche
             # the second <ul> is for read links
             $read = 1;
         }
-        $this->messages->add('s', _('import from pocket completed'));
+
+        $unlink = unlink($targetFile);
+        $this->messages->add('s', _('import from pocket completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from pocket completed');
         Tools::redirect();
     }
@@ -991,7 +979,9 @@ class Poche
                 }
             }
         }
-        $this->messages->add('s', _('import from Readability completed. ' . $count . ' new links.'));
+
+        unlink($targetFile);
+        $this->messages->add('s', _('import from Readability completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from Readability completed');
         Tools::redirect();
     }
@@ -1037,7 +1027,9 @@ class Poche
             }
             
         }
-        $this->messages->add('s', _('import from Poche completed. ' . $count . ' new links.'));
+
+        unlink($targetFile);
+        $this->messages->add('s', _('import from Poche completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from Poche completed');
         Tools::redirect();
     }
@@ -1062,13 +1054,7 @@ class Poche
             Tools::redirect();
         }
         
-        $targetDefinition = 'IMPORT_' . strtoupper($from) . '_FILE';
-        $targetFile = constant($targetDefinition);
-        
-        if (! defined($targetDefinition)) {
-            $this->messages->add('e', _('Incomplete inc/poche/define.inc.php file, please define "' . $targetDefinition . '".'));
-            Tools::redirect();
-        }
+        $targetFile = CACHE . '/' . constant(strtoupper($from) . '_FILE');
         
         if (! file_exists($targetFile)) {
             $this->messages->add('e', _('Could not find required "' . $targetFile . '" import file.'));
@@ -1078,6 +1064,22 @@ class Poche
         $this->$providers[$from]($targetFile);
     }
 
+    public function uploadFile() {
+        if(isset($_FILES['file']))
+        { 
+            $dir = CACHE . '/';
+            $file = basename($_FILES['file']['name']);
+            if(move_uploaded_file($_FILES['file']['tmp_name'], $dir . $file)) {
+                $this->messages->add('s', _('File uploaded. You can now execute import.'));
+            }
+            else {
+                $this->messages->add('e', _('Error while importing file. Do you have access to upload it?'));
+            }
+        }
+        
+        Tools::redirect('?view=config');
+    }
+
     /**
      * export poche entries in json
      * @return json all poche entries
@@ -1099,15 +1101,17 @@ class Poche
     private function getPocheVersion($which = 'prod')
     {
         $cache_file = CACHE . '/' . $which;
+        $check_time = time();
 
         # checks if the cached version file exists
         if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
            $version = file_get_contents($cache_file);
+           $check_time = filemtime($cache_file);
         } else {
            $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
            file_put_contents($cache_file, $version, LOCK_EX);
         }
-        return $version;
+        return array($version, $check_time);
     }
 
     public function generateToken()
@@ -1124,6 +1128,7 @@ class Poche
         $currentConfig = $_SESSION['poche_user']->config;
         $currentConfig['token'] = $token;
         $_SESSION['poche_user']->setConfig($currentConfig);
+        Tools::redirect();
     }
 
     public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
@@ -1131,6 +1136,10 @@ class Poche
         $allowed_types = array('home', 'fav', 'archive', 'tag');
         $config = $this->store->getConfigUser($user_id);
 
+        if ($config == null) {
+            die(_('User with this id (' . $user_id . ') does not exist.'));
+        }
+
         if (!in_array($type, $allowed_types) ||
             $token != $config['token']) {
             die(_('Uh, there is a problem while generating feeds.'));
@@ -1140,8 +1149,9 @@ class Poche
         $feed = new FeedWriter(RSS2);
         $feed->setTitle('wallabag — ' . $type . ' feed');
         $feed->setLink(Tools::getPocheUrl());
-        $feed->setChannelElement('updated', date(DATE_RSS , time()));
-        $feed->setChannelElement('author', 'wallabag');
+        $feed->setChannelElement('pubDate', date(DATE_RSS , time()));
+        $feed->setChannelElement('generator', 'wallabag');
+        $feed->setDescription('wallabag ' . $type . ' elements');
 
         if ($type == 'tag') {
             $entries = $this->store->retrieveEntriesByTag($tag_id, $user_id);
@@ -1154,7 +1164,7 @@ class Poche
             foreach ($entries as $entry) {
                 $newItem = $feed->createNewItem();
                 $newItem->setTitle($entry['title']);
-                $newItem->setLink(Tools::getPocheUrl() . '?view=view&amp;id=' . $entry['id']);
+                $newItem->setLink($entry['url']);
                 $newItem->setDate(time());
                 $newItem->setDescription($entry['content']);
                 $feed->addItem($newItem);
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 4ed28ed1..ad451fc6 100644..100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -193,7 +193,7 @@ 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);
@@ -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';
+    }
+
 }
diff --git a/index.php b/index.php
index a26c42e1..5ca8bef5 100644
--- a/index.php
+++ b/index.php
@@ -8,10 +8,9 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.5.2');
+define ('POCHE', '1.5.3');
 require 'check_setup.php';
 require_once 'inc/poche/global.inc.php';
-session_start(); 
 
 # Start Poche
 $poche = new Poche();
@@ -30,7 +29,7 @@ $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()
 );
@@ -75,6 +74,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();
diff --git a/install/index.php b/install/index.php
index 975b997f..b21cec52 100644
--- a/install/index.php
+++ b/install/index.php
@@ -225,7 +225,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">
@@ -263,26 +267,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;
+                            ?>
                         }
                     }
                 });
diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
index 8209a9cd..cf727432 100644
--- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
+++ b/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"
-"PO-Revision-Date: 2013-10-08 13:25+0100\n"
-"Last-Translator: Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/poche/language/"
-"cs/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 15:28+0300\n"
+"PO-Revision-Date: 2014-02-25 15:29+0300\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\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"
-msgstr "Odkaz se ukládá"
+msgid "Saving articles"
+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!"
-msgstr "uložit!"
+msgid "bag it!"
+msgstr ""
 
-msgid "Updating poche"
-msgstr "Poche se aktualizuje"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
 
-msgid "your version"
-msgstr "vaše verze"
+msgid "Upgrading wallabag"
+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."
-msgstr "pro export vašich dat."
-
-msgid "back to home"
-msgstr "zpět na úvod"
+msgid "to download your database."
+msgstr ""
 
-msgid "installation"
-msgstr "instalace"
+#, fuzzy
+msgid "to export your wallabag data."
+msgstr "pro export vašich dat."
 
-msgid "install your poche"
-msgstr "instalovat"
+msgid "Cache"
+msgstr ""
 
-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>."
+msgid "to delete cache."
 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 "You can enter multiple tags, separated by commas."
+msgstr ""
 
-msgid "Repeat your password"
-msgstr "Zopakujte heslo"
+msgid "return to article"
+msgstr ""
 
-msgid "Install"
-msgstr "Instalovat"
+msgid "plop"
+msgstr ""
 
-msgid "back to top"
-msgstr "zpět na za�átek"
+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!"
-msgstr "Není k dispozici žádný odkaz!"
+msgid "Tag"
+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"
-msgstr "odeslat požadavek"
-
-msgid "or"
-msgstr "nebo"
+msgid "tags:"
+msgstr ""
 
-msgid "contact us by mail"
-msgstr "kontaktovat e-mailem"
+msgid "Edit tags"
+msgstr ""
 
-msgid "plop"
+msgid "save link!"
 msgstr ""
 
 msgid "home"
 msgstr "domů"
 
-msgid "favorites"
-msgstr "oblíbené"
+msgid "tags"
+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:"
-msgstr "verze:"
+#, fuzzy
+msgid "your wallabag version:"
+msgstr "vaše verze"
 
 msgid "storage:"
 msgstr "úložiště:"
 
-msgid "login to your poche"
-msgstr "přihlásit se k poche"
+msgid "save a link"
+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 "back to home"
+msgstr "zpět na úvod"
 
-msgid "Stay signed in"
-msgstr "Zůstat přihlášen(a)"
+msgid "toggle mark as read"
+msgstr "ozna�it jako pře�tené"
 
-msgid "(Do not check on public computers)"
-msgstr "(Nezaškrtávejte na veřejně dostupných po�íta�ích)"
+msgid "tweet"
+msgstr "tweetnout"
 
-msgid "Sign in"
-msgstr "Přihlásit se"
+msgid "email"
+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:"
diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
index 375e923f..3f704d11 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
index 5b30d3d7..4b1d0dee 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
@@ -1,51 +1,130 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Project-Id-Version: Wallabag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-04 11:48+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"
-msgstr "Poche einen Link"
+msgid "Saving articles"
+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"
-msgstr "durch das ausfüllen dieses Feldes:"
+msgid "download the extension"
+msgstr "installiere die Erweiterung"
+
+msgid "via F-Droid"
+msgstr "via F-Droid"
+
+msgid " or "
+msgstr " oder "
+
+msgid "via Google Play"
+msgstr "via Google Play"
+
+msgid "download the application"
+msgstr "lade die App"
+
+msgid "By filling this field"
+msgstr "Durch Ausfüllen dieses Feldes"
 
-msgid "poche it!"
-msgstr "Poche es!"
+msgid "bag it!"
+msgstr "bag it!"
 
-msgid "Updating poche"
-msgstr "Poche aktualisieren"
+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 "Upgrading wallabag"
+msgstr "Upgrade wallabag"
 
-msgid "latest stable version"
+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,50 @@ 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."
-msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
+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 doc:"
+msgid "More info in the official documentation:"
 msgstr "Mehr Informationen in der offiziellen Dokumentation:"
 
-msgid "import from Pocket"
+msgid "Import from Pocket"
 msgstr "Import aus Pocket"
 
-msgid "import from Readability"
+#, php-format
+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"
+msgid "Import from Instapaper"
 msgstr "Import aus Instapaper"
 
-msgid "Export your poche data"
-msgstr "Exportieren Sie Ihre Poche Daten."
+msgid "Import from wallabag"
+msgstr "Import aus Readability"
+
+msgid "Export your wallabag data"
+msgstr "Exportieren Sie Ihre wallabag Daten."
 
 msgid "Click here"
 msgstr "Klicke hier"
 
-msgid "to export your poche data."
-msgstr "um deine Daten aus Poche zu exportieren."
+msgid "to download your database."
+msgstr "um deine Datenbank herunterzuladen"
 
-msgid "back to home"
-msgstr "züruck zur Hauptseite"
+msgid "to export your wallabag data."
+msgstr "um deine Daten aus wallabag zu exportieren."
 
-msgid "installation"
-msgstr "Installieren"
+msgid "Cache"
+msgstr "Cache"
 
-msgid "install your poche"
-msgstr "Installiere dein 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 ist noch nicht installiert. Bitte fülle die Felder unten aus, um die "
-"Installation durchzuführen. Zögere nicht, <a href='http://inthepoche.com/"
-"doc'>die Dokumentation auf der Website von Poche zu lesen falls du Probleme "
-"haben solltest."
-
-msgid "Login"
-msgstr "Benutzername"
-
-msgid "Repeat your password"
-msgstr "Wiederhole dein Passwort"
-
-msgid "Install"
-msgstr "Installieren"
-
-msgid "back to top"
-msgstr "Nach Oben"
-
-msgid "favoris"
-msgstr ""
-
-msgid "archive"
-msgstr "Archiv"
-
-msgid "unread"
-msgstr "ungelesen"
+msgid "to delete cache."
+msgstr "um den Cache zu löschen."
 
 msgid "by date asc"
 msgstr "nach Datum aufsteigend"
@@ -146,29 +200,78 @@ msgstr "nach Titel"
 msgid "by title desc"
 msgstr "nach Titel absteigend"
 
-msgid "No link available here!"
-msgstr "Kein Link verfügbar!"
+#, fuzzy
+msgid "toggle view mode"
+msgstr "Favorit"
 
-msgid "toggle mark as read"
-msgstr "Als gelesen markieren"
+msgid "home"
+msgstr "Start"
 
-msgid "toggle favorite"
-msgstr "Favorit"
+msgid "favorites"
+msgstr "Favoriten"
 
-msgid "delete"
-msgstr "Löschen"
+msgid "archive"
+msgstr "Archiv"
+
+msgid "tags"
+msgstr "Tags"
+
+msgid "save a link"
+msgstr "Speichere einen Link"
+
+msgid "logout"
+msgstr "Logout"
+
+msgid "return home"
+msgstr "Zurück zum Start"
+
+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"
+
+msgid "save link!"
+msgstr "Link speichern!"
+
+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 "Back to top"
+msgstr "Nach Oben"
 
 msgid "original"
 msgstr "Original"
 
-msgid "results"
-msgstr "Ergebnisse"
+msgid "Mark as read"
+msgstr "Als gelesen markieren"
+
+msgid "Toggle mark as read"
+msgstr "Als gelesen markieren"
+
+msgid "Favorite"
+msgstr "Favoriten"
+
+msgid "Toggle favorite"
+msgstr "Favorit"
+
+msgid "Delete"
+msgstr "Löschen"
 
-msgid "tweet"
+msgid "Tweet"
 msgstr "Twittern"
 
-msgid "email"
-msgstr "senden per E-Mail"
+msgid "Email"
+msgstr "per E-Mail senden"
 
 msgid "shaarli"
 msgstr "Shaarli"
@@ -176,54 +279,285 @@ msgstr "Shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
-msgstr "dieser Artikel erscheint falsch?"
+msgid "Does this article appear wrong?"
+msgstr "Erscheint dieser Artikel falsch?"
 
-msgid "create an issue"
-msgstr "ein Ticket erstellen"
+msgid "Edit tags"
+msgstr "Tags bearbeiten"
 
-msgid "or"
-msgstr "oder"
+msgid "unread"
+msgstr "ungelesen"
 
-msgid "contact us by mail"
-msgstr "kontaktieren Sie uns per E-Mail"
+msgid "Tag"
+msgstr "Tag"
 
-msgid "plop"
-msgstr "plop"
+msgid "No articles found."
+msgstr "Keine Artikel gefunden."
 
-msgid "home"
-msgstr "Start"
+msgid "estimated reading time:"
+msgstr "geschätzte Lesezeit:"
 
-msgid "favorites"
-msgstr "Favoriten"
+msgid "estimated reading time :"
+msgstr "geschätzte Lesezeit:"
 
-msgid "logout"
-msgstr "Logout"
+msgid "toggle favorite"
+msgstr "Favorit"
 
-msgid "powered by"
-msgstr "bereitgestellt von"
+msgid "delete"
+msgstr "Löschen"
 
-msgid "debug mode is on so cache is off."
-msgstr "Debug Modus ist aktiviert, das Caching ist somit deaktiviert"
+msgid "Mark all the entries as read"
+msgstr "Markiere alle als gelesen"
+
+msgid "results"
+msgstr "Ergebnisse"
 
-msgid "your poche version:"
-msgstr "Deine Poche Version"
+#, fuzzy
+msgid "Untitled"
+msgstr "nach Titel"
 
-msgid "storage:"
-msgstr "Speicher:"
+msgid "the link has been added successfully"
+msgstr "Speichern des Links erfolgreich"
 
-msgid "login to your poche"
-msgstr "Bei Poche anmelden"
+msgid "error during insertion : the link wasn't added"
+msgstr "Fehler beim Einfügen: Der Link wurde nicht hinzugefügt"
 
-msgid "you are in demo mode, some features may be disabled."
-msgstr ""
-"Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein."
+msgid "the link has been deleted successfully"
+msgstr "Löschen des Links erfolgreich"
+
+msgid "the link wasn't deleted"
+msgstr "Der Link wurde nicht entfernt"
+
+msgid "Article not found!"
+msgstr "Artikel nicht gefunden!"
+
+msgid "previous"
+msgstr "vorherige"
+
+msgid "next"
+msgstr "nächste"
+
+msgid "in demo mode, you can't update your password"
+msgstr "im Demo-Modus kann das Passwort nicht geändert werden"
+
+msgid "your password has been updated"
+msgstr "Dein Passwort wurde geändert"
+
+msgid ""
+"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 "still using the \""
+msgstr "nutze immernoch die \""
+
+msgid "that theme does not seem to be installed"
+msgstr "dieses Theme scheint nicht installiert zu sein"
+
+msgid "you have changed your theme preferences"
+msgstr "Du hast deine Theme Einstellungen geändert"
+
+msgid "that language does not seem to be installed"
+msgstr "Diese Sprache scheint nicht installiert zu sein"
+
+msgid "you have changed your language preferences"
+msgstr "Du hast deine Spracheinstellungen geändert"
+
+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"
+msgstr "Import aus Instapaper erfolgreich"
+
+msgid "import from pocket completed"
+msgstr "Import aus Pocket erfolgreich"
+
+msgid "import from Readability completed. "
+msgstr "Import aus Readability erfolgreich"
+
+msgid "import from Poche completed. "
+msgstr "Import aus Poche erfolgreich"
+
+msgid "Unknown import provider."
+msgstr "Unbekannter Import Anbieter."
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr "Unvollständige inc/poche/define.inc.php Datei, bitte setze \""
+
+msgid "Could not find required \""
+msgstr "Nicht gefunden: \""
+
+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"
+
+#, fuzzy
+#~ msgid "favoris"
+#~ msgstr "Favoriten"
+
+#~ msgid "mark all the entries as read"
+#~ msgstr "Markiere alle als gelesen"
+
+#~ 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 "Tags"
+#~ msgstr "Tags"
+
+#~ msgid "Login to wallabag"
+#~ msgstr "Bei wallabag anmelden"
+
+#~ msgid "Username"
+#~ msgstr "Benutzername"
+
+#~ msgid "Sign in"
+#~ msgstr "Einloggen"
+
+#~ 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 "import from Readability"
+#~ msgstr "Import aus Readability"
+
+#~ msgid "import from Instapaper"
+#~ msgstr "Import aus Instapaper"
+
+#~ msgid "poche it!"
+#~ msgstr "Poche es!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Poche aktualisieren"
+
+#~ msgid "create an issue"
+#~ msgstr "ein Ticket erstellen"
 
-msgid "Stay signed in"
-msgstr "Angemeldet bleiben"
+#~ msgid "or"
+#~ msgstr "oder"
 
-msgid "(Do not check on public computers)"
-msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+#~ msgid "contact us by mail"
+#~ msgstr "kontaktieren Sie uns per E-Mail"
 
-msgid "Sign in"
-msgstr "Einloggen"
+#~ msgid "your poche version:"
+#~ msgstr "Deine Poche Version"
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index 83d0a85f..bf5f69e7 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index b78759f5..119fb060 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/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"
-msgstr "Poching a link"
+msgid "Saving articles"
+msgstr "Saving articles"
+
+msgid "There are several ways to save an article:"
+msgstr "There are several ways to save an article:"
 
 msgid "read the documentation"
 msgstr "read the documentation"
 
-msgid "by filling this field"
-msgstr "by filling this field"
+msgid "download the extension"
+msgstr "download the extension"
 
-msgid "poche it!"
-msgstr "poche it!"
+msgid "via F-Droid"
+msgstr "via F-Droid"
 
-msgid "Updating poche"
-msgstr "Updating poche"
+msgid " or "
+msgstr " or "
 
-msgid "your version"
-msgstr "your version"
+msgid "via Google Play"
+msgstr "via Google Play"
 
-msgid "latest stable version"
-msgstr "latest stable version"
+msgid "download the application"
+msgstr "download the application"
 
-msgid "a more recent stable version is available."
-msgstr "a more recent stable version is available."
+msgid "By filling this field"
+msgstr "By filling this field"
 
-msgid "you are up to date."
-msgstr "you are up to date."
+msgid "bag it!"
+msgstr "bag it!"
 
-msgid "latest dev version"
-msgstr "latest dev version"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Bookmarklet: drag & drop this link to your bookmarks bar"
 
-msgid "a more recent development version is available."
-msgstr "a more recent development version is available."
+msgid "Upgrading wallabag"
+msgstr "Upgrading wallabag"
+
+msgid "Installed version"
+msgstr "Installed version"
+
+msgid "Latest stable version"
+msgstr "Latest stable version"
+
+msgid "A more recent stable version is available."
+msgstr "A more recent stable version is available."
+
+msgid "You are up to date."
+msgstr "You are up to date."
+
+msgid "Latest dev version"
+msgstr "Latest dev version"
+
+msgid "A more recent development version is available."
+msgstr "A more recent development version is available."
+
+msgid "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."
-msgstr ""
-"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 "Please execute the import script locally as it can take a very long time."
 
-msgid "More info in the official doc:"
-msgstr "More info in the official doc:"
+msgid "More info in the official documentation:"
+msgstr "More info in the official documentation:"
 
-msgid "import from Pocket"
-msgstr "import from Pocket"
+msgid "Import from Pocket"
+msgstr "Import from Pocket"
 
-msgid "import from Readability"
-msgstr "import from Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr "(you must have a %s file on your server)"
 
-msgid "import from Instapaper"
-msgstr "import from Instapaper"
+msgid "Import from Readability"
+msgstr "Import from Readability"
+
+msgid "Import from Instapaper"
+msgstr "Import from Instapaper"
 
-msgid "Export your poche data"
-msgstr "Export your poche data"
+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."
-msgstr "to export your poche data."
+msgid "to download your database."
+msgstr "to download your database."
 
-msgid "back to home"
-msgstr "back to home"
+msgid "to export your wallabag data."
+msgstr "to export your wallabag data."
 
-msgid "installation"
-msgstr "installation"
+msgid "Cache"
+msgstr "Cache"
 
-msgid "install your poche"
-msgstr "install your poche"
+msgid "to delete cache."
+msgstr "to delete cache."
 
-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 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"
-msgstr "Login"
+msgid "You can enter multiple tags, separated by commas."
+msgstr "You can enter multiple tags, separated by commas."
 
-msgid "Repeat your password"
-msgstr "Repeat your password"
+msgid "return to article"
+msgstr "return to article"
 
-msgid "Install"
-msgstr "Install"
+msgid "plop"
+msgstr "plop"
 
-msgid "back to top"
-msgstr "back to top"
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
 
 msgid "favoris"
 msgstr "favoris"
@@ -146,11 +214,14 @@ msgstr "by title"
 msgid "by title desc"
 msgstr "by title desc"
 
-msgid "No link available here!"
-msgstr "No link available here!"
+msgid "Tag"
+msgstr "Tag"
 
-msgid "toggle mark as read"
-msgstr "toggle mark as read"
+msgid "No articles found."
+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"
-msgstr "tweet"
+msgid "installation"
+msgstr "installation"
 
-msgid "email"
-msgstr "email"
+msgid "install your wallabag"
+msgstr "install your wallabag"
+
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <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?"
-msgstr "this article appears wrong?"
+msgid "Does this article appear wrong?"
+msgstr "Does this article appear wrong?"
 
-msgid "create an issue"
-msgstr "create an issue"
+msgid "tags:"
+msgstr "tags:"
 
-msgid "or"
-msgstr "or"
+msgid "Edit tags"
+msgstr "Edit tags"
 
-msgid "contact us by mail"
-msgstr "contact us by mail"
-
-msgid "plop"
-msgstr "plop"
+msgid "save link!"
+msgstr "save link!"
 
 msgid "home"
 msgstr "home"
 
-msgid "favorites"
-msgstr "favorites"
+msgid "tags"
+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:"
-msgstr "your poche version:"
+msgid "your wallabag version:"
+msgstr "your wallabag version:"
 
 msgid "storage:"
 msgstr "storage:"
 
-msgid "login to your poche"
-msgstr "login to your poche"
+msgid "save a link"
+msgstr "save a link"
 
-msgid "you are in demo mode, some features may be disabled."
-msgstr "you are in demo mode, some features may be disabled."
+msgid "back to home"
+msgstr "back to home"
 
-msgid "Stay signed in"
-msgstr "Stay signed in"
+msgid "toggle mark as read"
+msgstr "toggle mark as read"
 
-msgid "(Do not check on public computers)"
-msgstr "(Do not check on public computers)"
+msgid "tweet"
+msgstr "tweet"
 
-msgid "Sign in"
-msgstr "Sign in"
+msgid "email"
+msgstr "email"
+
+msgid "this article appears wrong?"
+msgstr "this article appears wrong?"
+
+msgid "No link available here!"
+msgstr "No link available here!"
+
+msgid "Poching a link"
+msgstr "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:"
diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
index afe0595d..c08decfe 100644
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
+++ b/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"
-msgstr "Pochear un enlace"
+msgid "Saving articles"
+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!"
-msgstr "pochéalo!"
+msgid "bag it!"
+msgstr ""
 
-msgid "Updating poche"
-msgstr "Actualizar"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
 
-msgid "your version"
-msgstr "su versión"
+msgid "Upgrading wallabag"
+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."
-msgstr ""
-"Por favor, ejecute la importación en local, esto puede demorar un tiempo."
+#, fuzzy
+msgid "Please execute the import script locally as it can take a very long time."
+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."
-msgstr "para exportar sus datos de poche."
-
-msgid "back to home"
-msgstr "volver a la página de inicio"
+msgid "to download your database."
+msgstr ""
 
-msgid "installation"
-msgstr "instalación"
+#, fuzzy
+msgid "to export your wallabag data."
+msgstr "para exportar sus datos de poche."
 
-msgid "install your poche"
-msgstr "instala tu Poche"
+msgid "Cache"
+msgstr ""
 
-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>."
+msgid "to delete cache."
 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 "You can enter multiple tags, separated by commas."
+msgstr ""
 
-msgid "Repeat your password"
-msgstr "Repita su contraseña"
+msgid "return to article"
+msgstr ""
 
-msgid "Install"
-msgstr "Instalar"
+msgid "plop"
+msgstr "plop"
 
-msgid "back to top"
-msgstr "volver arriba"
+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!"
-msgstr "¡No hay ningún enlace disponible por aquí!"
+msgid "Tag"
+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"
-msgstr "crear un ticket"
-
-msgid "or"
-msgstr "o"
+msgid "tags:"
+msgstr ""
 
-msgid "contact us by mail"
-msgstr "contactarnos por mail"
+msgid "Edit tags"
+msgstr ""
 
-msgid "plop"
-msgstr "plop"
+msgid "save link!"
+msgstr ""
 
 msgid "home"
 msgstr "inicio"
 
-msgid "favorites"
-msgstr "preferidos"
+msgid "tags"
+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:"
-msgstr "tu versión de Poche:"
+#, fuzzy
+msgid "your wallabag version:"
+msgstr "su versión"
 
 msgid "storage:"
 msgstr "almacenamiento:"
 
-msgid "login to your poche"
-msgstr "conectarse a tu Poche"
+msgid "save a link"
+msgstr ""
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "back to home"
+msgstr "volver a la página de inicio"
+
+msgid "toggle mark as read"
+msgstr "marcar como leído"
+
+msgid "tweet"
+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 ""
-"este es el modo de demostración, algunas funcionalidades pueden estar "
-"desactivadas."
 
-msgid "Stay signed in"
-msgstr "Seguir conectado"
+msgid "your version"
+msgstr "su versión"
 
-msgid "(Do not check on public computers)"
-msgstr "(no marcar en un ordenador público)"
+msgid "latest stable version"
+msgstr "ultima versión estable"
 
-msgid "Sign in"
-msgstr "Iniciar sesión"
+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:"
diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
index 74a763c6..f24814d5 100644
--- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
+++ b/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"
-msgstr "پیوندی را poche کنید"
+msgid "Saving articles"
+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!"
-msgstr "poche کنید!"
+msgid "bag it!"
+msgstr ""
 
-msgid "Updating poche"
-msgstr "به‌روزرسانی poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
 
-msgid "your version"
-msgstr "نسخهٔ شما"
+msgid "Upgrading wallabag"
+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."
-msgstr "برای برون‌بری داده‌های poche شما"
-
-msgid "back to home"
-msgstr "بازگشت به خانه"
+msgid "to download your database."
+msgstr ""
 
-msgid "installation"
-msgstr "نصب"
+#, fuzzy
+msgid "to export your wallabag data."
+msgstr "برای برون‌بری داده‌های poche شما"
 
-msgid "install your poche"
-msgstr "poche خود را نصب کنید"
+msgid "Cache"
+msgstr ""
 
-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>."
+msgid "to delete cache."
 msgstr ""
-"poche هنوز نصب نیست. برای نصب لط�اً �رم زیر را پر کنید. خواندن <a "
-"href='http://doc.inthepoche.com'>راهنما در وبگاه poche</a> را از یاد نبرید."
 
-msgid "Login"
-msgstr "ورود"
+msgid "You can enter multiple tags, separated by commas."
+msgstr ""
 
-msgid "Repeat your password"
-msgstr "گذرواژه را دوباره وارد کنید"
+msgid "return to article"
+msgstr ""
 
-msgid "Install"
-msgstr "نصب"
+msgid "plop"
+msgstr "plop"
 
-msgid "back to top"
-msgstr "بازگشت به بالای ص�حه"
+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!"
-msgstr "اینجا پیوندی موجود نیست!"
+msgid "Tag"
+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"
-msgstr "یک درخواست ر�ع‌مشکل بنویسید"
-
-msgid "or"
-msgstr "یا"
+msgid "tags:"
+msgstr ""
 
-msgid "contact us by mail"
-msgstr "به ما ایمیل بزنید"
+msgid "Edit tags"
+msgstr ""
 
-msgid "plop"
-msgstr "plop"
+msgid "save link!"
+msgstr ""
 
 msgid "home"
 msgstr "خانه"
 
-msgid "favorites"
-msgstr "بهترین‌ها"
+msgid "tags"
+msgstr ""
 
 msgid "logout"
 msgstr "بیرون ر�تن"
@@ -204,23 +377,187 @@ msgstr "نیروگر�ته از"
 msgid "debug mode is on so cache is off."
 msgstr "حالت عیب‌یابی �عال است، پس کاشه خاموش است."
 
-msgid "your poche version:"
-msgstr "نسخهٔ poche شما:"
+#, fuzzy
+msgid "your wallabag version:"
+msgstr "نسخهٔ شما"
 
 msgid "storage:"
 msgstr "ذخیره‌سازی:"
 
-msgid "login to your poche"
-msgstr "به poche خود وارد شوید"
+msgid "save a link"
+msgstr ""
 
-msgid "you are in demo mode, some features may be disabled."
-msgstr "این تنها نسخهٔ نمایشی است، برخی از ویژگی‌ها کار نمی‌کنند."
+msgid "back to home"
+msgstr "بازگشت به خانه"
 
-msgid "Stay signed in"
-msgstr "مرا به خاطر بسپار"
+msgid "toggle mark as read"
+msgstr "خوانده‌شده/خوانده‌نشده"
 
-msgid "(Do not check on public computers)"
-msgstr "(روی رایانه‌های عمومی این کار را نکنید)"
+msgid "tweet"
+msgstr "توییت"
 
-msgid "Sign in"
-msgstr "ورود"
+msgid "email"
+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 شما:"
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index 76872b5a..600b3281 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index f105d180..5053e9e3 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/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"
-msgstr "Pocher un lien"
+msgid "Saving articles"
+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"
-msgstr "en remplissant ce champ"
+msgid "download the extension"
+msgstr "télécharger l'extension"
 
-msgid "poche it!"
-msgstr "pochez-le !"
+msgid "via F-Droid"
+msgstr "via F-Droid"
 
-msgid "Updating poche"
-msgstr "Mettre à jour poche"
+msgid " or "
+msgstr "ou"
 
-msgid "your version"
-msgstr "votre version"
+msgid "via Google Play"
+msgstr "via Google PlayStore"
 
-msgid "latest stable version"
-msgstr "dernière version stable"
+msgid "download the application"
+msgstr "télécharger l'application"
 
-msgid "a more recent stable version is available."
-msgstr "une version stable plus récente est disponible."
+msgid "By filling this field"
+msgstr "En remplissant ce champ"
 
-msgid "you are up to date."
-msgstr "vous êtes à jour."
+msgid "bag it!"
+msgstr "bag it !"
 
-msgid "latest dev version"
-msgstr "dernière version de développement"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Bookmarklet : glissez-déposez ce lien dans votre barre de favoris"
 
-msgid "a more recent development version is available."
-msgstr "une version de développement plus récente est disponible."
+msgid "Upgrading wallabag"
+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."
-msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps."
+msgid "Please execute the import script locally as it can take a very long time."
+msgstr "Merci d'exécuter l'import en local car cela peut prendre du temps."
 
-msgid "More info in the official doc:"
-msgstr "Plus d'infos sur la documentation officielle"
+msgid "More info in the official documentation:"
+msgstr "Plus d'infos dans la documentation officielle :"
 
-msgid "import from Pocket"
-msgstr "import depuis Pocket"
+msgid "Import from Pocket"
+msgstr "Import depuis Pocket"
 
-msgid "import from Readability"
-msgstr "import depuis Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr "(le fichier %s doit être présent sur le serveur)"
 
-msgid "import from Instapaper"
-msgstr "import depuis Instapaper"
+msgid "Import from Readability"
+msgstr "Import depuis Readability"
 
-msgid "Export your poche data"
-msgstr "Exporter vos données de poche"
+msgid "Import from Instapaper"
+msgstr "Import depuis Instapaper"
 
-msgid "Click here"
-msgstr "Cliquez-ici"
+msgid "Import from wallabag"
+msgstr "Import depuis wallabag"
 
-msgid "to export your poche data."
-msgstr "pour exporter vos données de poche."
+msgid "Export your wallabag data"
+msgstr "Exporter vos données de wallabag"
 
-msgid "back to home"
-msgstr "retour à l'accueil"
+msgid "Click here"
+msgstr "Cliquez ici"
 
-msgid "installation"
-msgstr "installation"
+msgid "to download your database."
+msgstr "pour télécharger votre base de données."
 
-msgid "install your poche"
-msgstr "installez votre poche"
+msgid "to export your wallabag data."
+msgstr "pour exporter vos données de wallabag."
 
-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 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 "Cache"
+msgstr "Cache"
 
-msgid "Login"
-msgstr "Nom d'utilisateur"
+msgid "to delete cache."
+msgstr "pour effacer le cache."
 
-msgid "Repeat your password"
-msgstr "Répétez votre mot de passe"
+msgid "You can enter multiple tags, separated by commas."
+msgstr "Vous pouvez entrer plusieurs tags, séparés par des virgules."
 
-msgid "Install"
-msgstr "Installer"
+msgid "return to article"
+msgstr "retourner à l'article"
 
-msgid "back to top"
-msgstr "retour en haut de page"
+msgid "plop"
+msgstr "plop"
+
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr "Vous pouvez vérifier votre configuration <a href='wallabag_compatibility_test.php'>ici</a>."
 
 msgid "favoris"
 msgstr "favoris"
@@ -145,14 +215,17 @@ msgstr "par titre"
 msgid "by title desc"
 msgstr "par titre desc"
 
-msgid "No link available here!"
-msgstr "Aucun lien n'est disponible ici !"
+msgid "Tag"
+msgstr "Tag"
 
-msgid "toggle mark as read"
-msgstr "marquer comme lu / non lu"
+msgid "No articles found."
+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,35 +233,107 @@ 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"
-msgstr "tweet"
+msgid "installation"
+msgstr "installation"
 
-msgid "email"
-msgstr "email"
+msgid "install your wallabag"
+msgstr "installez votre wallabag"
+
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <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?"
-msgstr "cet article s'affiche mal ?"
+msgid "Does this article appear wrong?"
+msgstr "Cet article s'affiche mal ?"
 
-msgid "create an issue"
-msgstr "créez un ticket"
+msgid "tags:"
+msgstr "tags :"
 
-msgid "or"
-msgstr "ou"
+msgid "Edit tags"
+msgstr "Editer les tags"
 
-msgid "contact us by mail"
-msgstr "contactez-nous par email"
+msgid "save link!"
+msgstr "sauver le lien !"
 
-msgid "plop"
-msgstr "plop"
+msgid "powered by"
+msgstr "propulsé par"
+
+msgid "debug mode is on so cache is off."
+msgstr "le mode de debug est actif, le cache est donc désactivé."
+
+msgid "your wallabag version:"
+msgstr "votre version de wallabag :"
+
+msgid "storage:"
+msgstr "stockage :"
 
 msgid "home"
 msgstr "accueil"
@@ -196,33 +341,193 @@ msgstr "accueil"
 msgid "favorites"
 msgstr "favoris"
 
+msgid "tags"
+msgstr "tags"
+
+msgid "save a link"
+msgstr "sauver un lien"
+
 msgid "logout"
 msgstr "déconnexion"
 
-msgid "powered by"
-msgstr "propulsé par"
+msgid "back to home"
+msgstr "retour à l'accueil"
 
-msgid "debug mode is on so cache is off."
-msgstr "le mode de debug est actif, le cache est donc désactivé."
+msgid "toggle mark as read"
+msgstr "marquer comme lu / non lu"
 
-msgid "your poche version:"
-msgstr "votre version de poche :"
+msgid "tweet"
+msgstr "tweet"
 
-msgid "storage:"
-msgstr "stockage :"
+msgid "email"
+msgstr "ee-mail"
 
-msgid "login to your poche"
-msgstr "se connecter à votre poche"
+msgid "this article appears wrong?"
+msgstr "cet article s'affiche mal ?"
 
-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 "No link available here!"
+msgstr "Aucun lien n'est disponible ici !"
 
-msgid "Stay signed in"
-msgstr "Rester connecté"
+msgid "Poching a link"
+msgstr "Sauver un lien"
 
-msgid "(Do not check on public computers)"
-msgstr "(ne pas cocher sur un ordinateur public)"
+msgid "by filling this field"
+msgstr "en remplissant ce champ"
 
-msgid "Sign in"
-msgstr "Se connecter"
+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 :"
diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
index 429d5d55..41cc01e0 100644
--- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
+++ b/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"
-"PO-Revision-Date: 2013-11-25 09:47+0100\n"
-"Last-Translator: Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/"
-"it/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 15:13+0300\n"
+"PO-Revision-Date: 2014-02-25 15:13+0300\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\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"
-msgstr "Pochare un link"
+msgid "Saving articles"
+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!"
-msgstr "pochalo!"
+msgid "bag it!"
+msgstr ""
 
-msgid "Updating poche"
-msgstr "Aggiornamento poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
 
-msgid "your version"
-msgstr "la tua versione"
+msgid "Upgrading wallabag"
+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."
-msgstr ""
-"Si prega di eseguire lo script di importazione a livello locale, può "
-"richiedere un tempo molto lungo."
+#, fuzzy
+msgid "Please execute the import script locally as 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."
 
-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."
-msgstr "per esportare i tuoi dati di poche."
-
-msgid "back to home"
-msgstr "torna alla home"
+msgid "to download your database."
+msgstr ""
 
-msgid "installation"
-msgstr "installazione"
+#, fuzzy
+msgid "to export your wallabag data."
+msgstr "per esportare i tuoi dati di poche."
 
-msgid "install your poche"
-msgstr "installa il tuo poche"
+msgid "Cache"
+msgstr ""
 
-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>."
+msgid "to delete cache."
 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 "You can enter multiple tags, separated by commas."
+msgstr ""
 
-msgid "Repeat your password"
-msgstr "Ripeti la tua password"
+msgid "return to article"
+msgstr ""
 
-msgid "Install"
-msgstr "Installa"
+msgid "plop"
+msgstr "plop"
 
-msgid "back to top"
-msgstr "torna a inizio pagina"
+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!"
-msgstr "Nessun link disponibile!"
+msgid "Tag"
+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"
-msgstr "crea una segnalazione"
-
-msgid "or"
-msgstr "oppure"
+msgid "tags:"
+msgstr ""
 
-msgid "contact us by mail"
-msgstr "contattaci via email"
+msgid "Edit tags"
+msgstr ""
 
-msgid "plop"
-msgstr "plop"
+msgid "save link!"
+msgstr ""
 
 msgid "home"
 msgstr "home"
 
-msgid "favorites"
-msgstr "preferiti"
+msgid "tags"
+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:"
-msgstr "la tua versione di poche:"
+#, fuzzy
+msgid "your wallabag version:"
+msgstr "la tua versione"
 
 msgid "storage:"
 msgstr "memoria:"
 
-msgid "login to your poche"
-msgstr "accedi al tuo poche"
+msgid "save a link"
+msgstr ""
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "back to home"
+msgstr "torna alla home"
+
+msgid "toggle mark as read"
+msgstr "segna come letto / non letto"
+
+msgid "tweet"
+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 ""
-"sei in modalità dimostrazione, alcune funzionalità potrebbero essere "
-"disattivate."
 
-msgid "Stay signed in"
-msgstr "Resta connesso"
+msgid "your version"
+msgstr "la tua versione"
 
-msgid "(Do not check on public computers)"
-msgstr "(non selezionare su computer pubblici)"
+msgid "latest stable version"
+msgstr "ultima versione stabile"
 
-msgid "Sign in"
-msgstr "Accedi"
+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:"
diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
index 3e8b132f..b363385a 100755
--- a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
+++ b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
index 0e7cbcf8..1764bd61 100755
--- a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
+++ b/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"
-"PO-Revision-Date: 2014-02-07 17:43+0300\n"
+"POT-Creation-Date: 2014-02-24 15:19+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,72 +23,158 @@ 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"
-msgstr "Wrocic do głównej"
+msgid "home"
+msgstr "strona domowa"
 
-msgid "Back to top"
-msgstr "Wrócić na górę"
+msgid "favorites"
+msgstr "ulubione"
 
-msgid "original"
-msgstr "oryginal"
+msgid "archive"
+msgstr "archiwum"
 
-msgid "Mark as read"
-msgstr "Zaznacz jako przeczytane"
+msgid "tags"
+msgstr "tagi"
 
-msgid "Toggle mark as read"
-msgstr "Przełącz jako przeczytane"
+msgid "config"
+msgstr "ustawienia"
 
-msgid "Favorite"
-msgstr "Ulubiony"
+msgid "logout"
+msgstr "wyloguj"
 
-msgid "Toggle favorite"
-msgstr "Zaznacz jako ulubione"
+msgid "back to home"
+msgstr "wróć do strony domowej"
 
-msgid "Delete"
-msgstr "Usuń"
+msgid "Tags"
+msgstr "Tagi"
 
-msgid "Tweet"
-msgstr "Tweet"
+#, fuzzy
+msgid "Poching a link"
+msgstr "Zapisywanie linków"
 
-msgid "Email"
-msgstr "Wyslij email"
+msgid "You can poche a link by several methods:"
+msgstr "Istnieje kilka sposobów aby zapisać link:"
 
-msgid "shaarli"
-msgstr "shaarli"
+msgid "read the documentation"
+msgstr "przeczytaj dokumentacjÄ™"
 
-msgid "flattr"
-msgstr "flattr"
+msgid "download the extension"
+msgstr "pobierz rozszerzenie"
 
-msgid "Does this article appear wrong?"
-msgstr "Czy ten artykuł wygląda nieprawidłowo?"
+msgid "download the application"
+msgstr "pobierz aplikacjÄ™"
 
-msgid "tags:"
-msgstr "tegi:"
+#, fuzzy
+msgid "by filling this field"
+msgstr "Poprzez wypełnienie tego pola"
 
-msgid "Edit tags"
-msgstr "Redagowac tegi"
+msgid "poche it!"
+msgstr "zapisz!"
 
-msgid "return home"
-msgstr "wrócić do głównej"
+#, fuzzy
+msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Bookmarklet: przeciÄ…gnij i upucs ten link na pasek zakladek"
 
-msgid "powered by"
-msgstr "zasilany przez"
+msgid "Updating poche"
+msgstr "Aktualizacja poche"
 
-msgid "debug mode is on so cache is off."
-msgstr "tryb debugowania jest włączony, więc cash jest wyłączony."
+msgid "your version"
+msgstr "twoja wersja"
 
-msgid "your poche version:"
-msgstr "twoja wersja poche:"
+#, fuzzy
+msgid "latest stable version"
+msgstr "Najnowsza stabilna wersja"
 
-msgid "storage:"
-msgstr "magazyn:"
+#, fuzzy
+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"
+
+msgid "a more recent development version is available."
+msgstr "Nowsza wersja rozwojowa jest dostępna."
+
+msgid "Change your theme"
+msgstr "Zmień motyw"
+
+msgid "Theme:"
+msgstr "Motyw:"
+
+msgid "Update"
+msgstr "Aktualizacja"
+
+msgid "Change your password"
+msgstr "Zmień hasło"
+
+msgid "New password:"
+msgstr "Nowe hasło:"
+
+msgid "Password"
+msgstr "Hasło"
+
+msgid "Repeat your new password:"
+msgstr "Powtórz hasło jeszcze raz:"
+
+msgid "Import"
+msgstr "Import"
+
+msgid "Please execute the import script locally, it can take a very long time."
+msgstr "Proszę wykonać skrypt importu lokalnie, ponieważ moze to trwać bardzo długo."
+
+msgid "More infos in the official doc:"
+msgstr "Więcej informacji znajduje się w oficjalnej dokumentacji:"
+
+msgid "import from Pocket"
+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"
+msgstr "Importuj z Readability"
+
+msgid "import from Instapaper"
+msgstr "Importuj z Instapaper"
+
+#, fuzzy
+msgid "Export your poche datas"
+msgstr "Exportuj dane poche"
+
+msgid "Click here"
+msgstr "Kliknij tu"
+
+#, fuzzy
+msgid "to export your poche datas."
+msgstr "aby wyeksportować dane poche."
+
+msgid "plop"
+msgstr "plop"
+
+msgid "installation"
+msgstr "instalacja"
+
+msgid "install your 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 zainstalować. Nie wahaj się <a href='http://doc.wallabag.org/'>zapoznać się z dokumentacją na stronie wallabag</a>."
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Repeat your password"
+msgstr "Powtórz hasło"
+
+msgid "Install"
+msgstr "Instaluj"
 
 msgid "favoris"
 msgstr "ulubione"
 
-msgid "archive"
-msgstr "archiwum"
-
 msgid "unread"
 msgstr "nieprzeczytane"
 
@@ -99,7 +185,7 @@ msgid "by date"
 msgstr "wg daty"
 
 msgid "by date desc"
-msgstr "według daty spadająco"
+msgstr "według daty malejąco"
 
 msgid "by title asc"
 msgstr "według tytułu rosnąco"
@@ -110,14 +196,20 @@ 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 "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łączyc ulubione"
+msgstr "przełącz ulubione"
 
 msgid "delete"
-msgstr "usunąć"
+msgstr "usuń"
+
+msgid "original"
+msgstr "oryginał"
 
 msgid "estimated reading time:"
 msgstr "szacowany czas odczytu:"
@@ -125,32 +217,23 @@ msgstr "szacowany czas odczytu:"
 msgid "results"
 msgstr "wyniki"
 
-msgid "home"
-msgstr "główna"
-
-msgid "favorites"
-msgstr "ulubione"
-
-msgid "tags"
-msgstr "tagi"
-
-msgid "config"
-msgstr "ustawienia"
+msgid "login to your wallabag"
+msgstr "zaloguj siÄ™ do swojego wallabag"
 
-msgid "logout"
-msgstr "wyloguj"
+msgid "you are in demo mode, some features may be disabled."
+msgstr "jesteś w trybie demo, niektóre funkcje mogą być wyłączone."
 
-msgid "Poching links"
-msgstr "Zapisywanie linków"
+msgid "Stay signed in"
+msgstr "Pozostań zalogowany"
 
-msgid "There are several ways to poche a link:"
-msgstr "Istnieje kilka sposobów aby zapisać link:"
+msgid "(Do not check on public computers)"
+msgstr "(Nie sprawdzaj na publicznych komputerach)"
 
-msgid "read the documentation"
-msgstr "zapoznać się z dokumentacją"
+msgid "Saving articles"
+msgstr "Zapisywanie artykułów"
 
-msgid "download the extension"
-msgstr "pobrać rozszerzenie"
+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"
@@ -161,20 +244,17 @@ msgstr "albo"
 msgid "via Google Play"
 msgstr "przez Google Play"
 
-msgid "download the application"
-msgstr "pobrać aplikację"
-
 msgid "By filling this field"
 msgstr "Poprzez wypełnienie tego pola"
 
-msgid "poche it!"
-msgstr "zapisać!"
+msgid "bag it!"
+msgstr "zapisz!"
 
 msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Bookmarklet: przeciÄ…gnij i upucs ten link na pasek zakladek"
+msgstr "Bookmarklet: przeciągnij i upuść ten link na pasek zakladek"
 
-msgid "Updating poche"
-msgstr "Aktualizacja poche"
+msgid "Upgrading wallabag"
+msgstr "Aktualizacja wallabag"
 
 msgid "Installed version"
 msgstr "Zainstalowana wersja "
@@ -186,170 +266,195 @@ msgid "A more recent stable version is available."
 msgstr "Nowsza stabilna wersja jest dostępna."
 
 msgid "You are up to date."
-msgstr "Masz wszystko najnowsze."
+msgstr "Brak nowych aktualizacji."
 
-msgid "latest dev version"
-msgstr "najnowsza wersja dev"
+msgid "Latest dev version"
+msgstr "Najnowsza wersja rozwojowa"
 
-msgid "a more recent development version is available."
+#, fuzzy
+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>."
+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ł nieprzeczytanego"
+msgstr "Kanał nieprzeczytanych"
 
 msgid "Favorites feed"
-msgstr "Kanał ulubionego"
+msgstr "Kanał ulubionych"
 
 msgid "Archive feed"
 msgstr "Kanał archiwum"
 
 msgid "Your token:"
-msgstr "Twój znak (token): "
+msgstr "Twój token: "
 
 msgid "Your user id:"
-msgstr "Twój id użytkownika (user id):"
+msgstr "Twój identyfikator użytkownika:"
 
 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"
-
-msgid "Theme:"
-msgstr "Motyw:"
-
-msgid "Update"
-msgstr "Aktualizacja"
+msgstr "Możesz wygenerować token ponownie: kliknij <a href='?feed&amp;action=generate'>generuj!</a>."
 
 msgid "Change your language"
-msgstr "Zmienić język"
+msgstr "Zmień język"
 
 msgid "Language:"
 msgstr "Język:"
 
-msgid "Change your password"
-msgstr "Zmień hasło"
-
-msgid "New password:"
-msgstr "Nowe hasło:"
-
-msgid "Password"
-msgstr "Hasło"
-
-msgid "Repeat your new password:"
-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."
-msgstr "Proszę wykonać skrypt import lokalnie, gdyż moze to trwać bardzo długo."
+msgstr "Proszę wykonać skrypt importu lokalnie, gdyż moze to trwać bardzo długo."
 
-msgid "More info in the official docs:"
-msgstr "Więcej informacji w oficjalnej dokumentacji:"
+#, 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"
 
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr "(musisz mieć plik %s na serwerze)"
-
 msgid "Import from Readability"
 msgstr "Import z Readability"
 
 msgid "Import from Instapaper"
 msgstr "Import z Instapaper"
 
-msgid "Import from poche"
-msgstr "Import z poche"
-
-msgid "Export your poche data"
-msgstr "Eksportowac dane poche"
+msgid "Import from wallabag"
+msgstr "Import z wallabag"
 
-msgid "Click here"
-msgstr "Kliknij tu"
+msgid "Export your wallabag data"
+msgstr "Eksportowac dane wallabag"
 
 msgid "to download your database."
 msgstr "aby pobrac bazÄ™ danych."
 
-msgid "to export your poche data."
-msgstr "aby eksportować dane poche."
+msgid "to export your wallabag data."
+msgstr "aby eksportować dane wallabag."
 
-msgid "Tag"
-msgstr "Teg"
+msgid "Cache"
+msgstr "Cache"
 
-msgid "No link available here!"
-msgstr "Brak dostępnych linków!"
+msgid "to delete cache."
+msgstr "aby wyczyścić cache."
 
-msgid "toggle mark as read"
-msgstr "przełączyć znak jako przeczytane"
+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 "Mozna wprowadzić wiele tagów rozdzielajac je przecinkami."
+msgstr "Możesz wprowadzić wiele tagów, rozdzielając je przecinkami."
 
 msgid "return to article"
-msgstr "wrócić do artykułu"
+msgstr "wróć do artykułu"
 
-msgid "plop"
-msgstr "plop"
+#, 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żna <a href='wallabag_compatibility_test.php'>sprawdzić swoją konfigurację tu</a>."
+msgstr "Możesz <a href='wallabag_compatibility_test.php'>sprawdzić swoją konfigurację tu</a>."
 
-msgid "installation"
-msgstr "instalacja"
+msgid "Tag"
+msgstr "Tag"
 
-msgid "install your wallabag"
-msgstr "zainstalować wallabag"
+msgid "No articles found."
+msgstr "Nie znaleziono artykułów."
 
-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>."
+msgid "Toggle mark as read"
+msgstr "Przełącz jako przeczytane"
 
-msgid "Login"
+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 "Repeat your password"
-msgstr "Powtórz hasło"
+msgid "Return home"
+msgstr "Wróć do strony domowej"
 
-msgid "Install"
-msgstr "Instalowac"
+msgid "Back to top"
+msgstr "Wróć na górę"
 
-msgid "login to your wallabag"
-msgstr "zalogować się do swojego wallabag"
+msgid "Mark as read"
+msgstr "Zaznacz jako przeczytane"
 
-msgid "Login to wallabag"
-msgstr "Zalogować się do wallabag"
+msgid "Favorite"
+msgstr "Ulubione"
 
-msgid "you are in demo mode, some features may be disabled."
-msgstr "jesteś w trybie demo, niektóre funkcje mogą być niedostępne."
+msgid "Toggle favorite"
+msgstr "Zaznacz jako ulubione"
 
-msgid "Username"
-msgstr "Imię użytkownika"
+msgid "Delete"
+msgstr "Usuń"
 
-msgid "Stay signed in"
-msgstr "Pozostań zalogowany"
+msgid "Tweet"
+msgstr "Tweet"
 
-msgid "(Do not check on public computers)"
-msgstr "(Nie sprawdzaj na publicznych komputerach"
+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"
-msgstr "witamy w poche"
+msgid "welcome to your wallabag"
+msgstr "Witamy w wallabag"
 
 msgid "login failed: bad login or password"
-msgstr "logowanie nie powiodlo się: zly login lub hasło"
-
-msgid "see you soon!"
-msgstr "do zobaczenia wkrótce!"
+msgstr "logowanie nie powiodlo się: niepoprawny login lub hasło"
 
 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!"
diff --git a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo
new file mode 100644
index 00000000..ab0a459c
--- /dev/null
+++ b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo
diff --git a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po
new file mode 100644
index 00000000..2b95c30f
--- /dev/null
+++ b/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: Maryana <mariroz@mr.lviv.ua>\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/mariroz/_DEV/web/wallabag/wallabag-master-"
+"testing\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 "configurações"
+
+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 "página inicial"
+
+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 um 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:"
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
index c9cf1a55..5cbfad16 100755
--- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
+++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
index aa1769cf..08f12b7c 100755
--- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
+++ b/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"
-msgstr "poche, �ерви� отложенного чтени� � открытым и�ходным кодом"
+msgid "wallabag, a read it later open source system"
+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"
-msgstr "выход"
-
-msgid "Poching links"
-msgstr "Сохранение ��ылок"
+msgid "Saving articles"
+msgstr "Сохранение �татей"
 
-msgid "There are several ways to poche a link:"
+#, fuzzy
+msgid "There are several ways to save an article:"
 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"
-msgstr "Обновлени� poche"
+msgid "Upgrading wallabag"
+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"
-msgstr "Импортировать из poche"
+msgid "Import from wallabag"
+msgstr "Импортировать из wallabag"
 
-msgid "Export your poche data"
-msgstr "Эк�портировать данные poche"
+msgid "Export your wallabag data"
+msgstr "Эк�портировать данные wallabag"
 
 msgid "Click here"
 msgstr "Кликните зде�ь"
@@ -281,17 +171,14 @@ msgstr "Кликните зде�ь"
 msgid "to download your database."
 msgstr "чтобы �качать вашу базу данных"
 
-msgid "to export your poche data."
-msgstr "чтобы �к�портировать �вои запи�и из poche."
+msgid "to export your wallabag data."
+msgstr "чтобы �к�портировать �вои запи�и из wallabag."
 
-msgid "Tag"
-msgstr "Тег"
-
-msgid "No link available here!"
-msgstr "Зде�ь нет ��ылки!"
+msgid "Cache"
+msgstr "К�ш"
 
-msgid "toggle mark as read"
-msgstr "изменить отметку 'прочитано'"
+msgid "to delete cache."
+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"
-msgstr "добро пожаловать в ваш poche"
+msgid "welcome to your wallabag"
+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"
-#~ msgstr "Ваша вер�и�"
+#~ 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 "back to home"
-#~ msgstr "домой"
+#~ 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 "Зареги�трировать��"
diff --git a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po b/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po
index 6eac8e01..8ad2eded 100644
--- a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po
+++ b/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"
-"PO-Revision-Date: 2014-02-21 15:09+0100\n"
-"Last-Translator: Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com>\n"
-"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/"
-"wallabag/language/sl_SI/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 15:12+0300\n"
+"PO-Revision-Date: 2014-02-25 15:12+0300\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\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"
-msgstr "Shrani povezavo"
+msgid "Saving articles"
+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!"
-msgstr "shrani!"
+msgid "bag it!"
+msgstr ""
 
-msgid "Updating poche"
-msgstr "Posodabljam Poche"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
 
-msgid "your version"
-msgstr "vaša razli�ica"
+msgid "Upgrading wallabag"
+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."
-msgstr ""
-"Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej "
-"�asa."
+#, fuzzy
+msgid "Please execute the import script locally as 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:"
+#, 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"
-msgstr "Nazaj domov"
-
-msgid "installation"
-msgstr "Namestitev"
+#, fuzzy
+msgid "to export your wallabag data."
+msgstr "za izvoz vsebine aplikacije Poche."
 
-msgid "install your poche"
-msgstr "Namestitev aplikacije Poche"
+msgid "Cache"
+msgstr ""
 
-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>."
+msgid "to delete cache."
 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"
-msgstr "Prijava"
+msgid "You can enter multiple tags, separated by commas."
+msgstr ""
 
-msgid "Repeat your password"
-msgstr "Ponovite geslo"
+msgid "return to article"
+msgstr ""
 
-msgid "Install"
-msgstr "Namesti"
+msgid "plop"
+msgstr "Å¡trbunk"
 
-msgid "back to top"
-msgstr "nazaj na vrh"
+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!"
-msgstr "Povezava ni na voljo!"
+msgid "Tag"
+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,13 +258,95 @@ 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 "Namestitev"
+
+#, fuzzy
+msgid "install your wallabag"
+msgstr "Namestitev aplikacije 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 š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"
+msgstr "Prijava"
+
+msgid "Repeat your password"
+msgstr "Ponovite geslo"
+
+msgid "Install"
+msgstr "Namesti"
+
+#, fuzzy
+msgid "login to your wallabag"
+msgstr "prijavite se v svoj Poche"
+
+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 ""
+
+msgid "Stay signed in"
+msgstr "Ostani prijavljen"
+
+msgid "(Do not check on public computers)"
+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"
 
-msgid "email"
+#, fuzzy
+msgid "Email"
 msgstr "pošlji po e-pošti"
 
 msgid "shaarli"
@@ -184,26 +355,24 @@ msgstr "shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
+#, fuzzy
+msgid "Does this article appear wrong?"
 msgstr "napaka?"
 
-msgid "create an issue"
-msgstr "prijavi napako"
-
-msgid "or"
-msgstr "ali"
+msgid "tags:"
+msgstr ""
 
-msgid "contact us by mail"
-msgstr "pošlji e-pošto razvijalcem"
+msgid "Edit tags"
+msgstr ""
 
-msgid "plop"
-msgstr "Å¡trbunk"
+msgid "save link!"
+msgstr ""
 
 msgid "home"
 msgstr "domov"
 
-msgid "favorites"
-msgstr "priljubljeni"
+msgid "tags"
+msgstr ""
 
 msgid "logout"
 msgstr "odjava"
@@ -212,28 +381,188 @@ 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."
+msgstr "vklopljen je na�in odpravljanja napak, zato je predpomnilnik izklju�en."
 
-msgid "your poche version:"
-msgstr "vaša verzija Poche:"
+#, fuzzy
+msgid "your wallabag version:"
+msgstr "vaša razli�ica"
 
 msgid "storage:"
 msgstr "pomnilnik:"
 
-msgid "login to your poche"
-msgstr "prijavite se v svoj Poche"
+msgid "save a link"
+msgstr ""
 
-msgid "you are in demo mode, some features may be disabled."
+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 ""
-"uporabljate vzor�no razli�ico programa, zato so lahko nekatere funkcije "
-"izklopljene."
 
-msgid "Stay signed in"
-msgstr "Ostani prijavljen"
+msgid "your version"
+msgstr "vaša razli�ica"
 
-msgid "(Do not check on public computers)"
-msgstr "(Ne ozna�i na javnih napravah)"
+msgid "latest stable version"
+msgstr "zadnja stabilna razli�ica"
 
-msgid "Sign in"
-msgstr "Prijava"
+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:"
diff --git a/locale/tools/fillCache.php b/locale/tools/fillCache.php
new file mode 100755
index 00000000..bdd9cc58
--- /dev/null
+++ b/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));
+                                        }
+                                }
+
+                        }
+
+                }
+
diff --git a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
index 80972b65..4884abf5 100755
--- a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
+++ b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
diff --git a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po
index 6092cbab..08797705 100755
--- a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po
+++ b/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"
-"PO-Revision-Date: 2014-02-06 19:24+0300\n"
+"POT-Creation-Date: 2014-02-25 15:06+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"
-msgstr "poche, �ерві� відкладеного читанн� з відкритим кодом"
+msgid "wallabag, a read it later open source system"
+msgstr "wallabag, �ерві� відкладеного читанн� з відкритим кодом"
 
 msgid "login failed: user doesn't exist"
 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 "home"
-msgstr "головна"
-
-msgid "favorites"
-msgstr "вибране"
-
-msgid "archive"
-msgstr "архів"
-
-msgid "tags"
-msgstr "теги"
+msgid "return home"
+msgstr "повернути�� на головну"
 
 msgid "config"
 msgstr "налаштуванн�"
 
-msgid "logout"
-msgstr "вихід"
-
-msgid "return home"
-msgstr "повернути�� на головну"
-
-msgid "Poching links"
+msgid "Saving articles"
 msgstr "Зберіганн� по�илань"
 
-msgid "There are several ways to poche a link:"
-msgstr "Є кілька �по�обів зберегти по�иланн�:"
+msgid "There are several ways to save an article:"
+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"
-msgstr "Оновленн� poche"
+msgid "Upgrading wallabag"
+msgstr "Оновленн� wallabag"
 
 msgid "Installed version"
 msgstr "В�тановлено ​​вер�ію"
@@ -104,14 +77,11 @@ msgstr "Є новіша �табільна вер�і�."
 msgid "You are up to date."
 msgstr "У ва� о�танн� вер�і�."
 
-msgid "latest dev version"
-msgstr "о�танн� вер�і� в розробці"
-
-msgid "a more recent development version is available."
-msgstr "до�тупна новіша вер�і� в розробці."
+msgid "Latest dev version"
+msgstr "О�танн� вер�і� в розробці"
 
-msgid "you are up to date."
-msgstr "у ва� о�танн� вер�і�."
+msgid "A more recent development version is available."
+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:"
-msgstr "Більш детальна інформаці� в офіційній документації:"
+msgid "More info in the official documentation:"
+msgstr "Більше інформації в офіційній документації:"
 
 msgid "Import from Pocket"
 msgstr "Імпорт з Pocket-а"
@@ -186,11 +156,11 @@ msgstr "Імпорт з Readability"
 msgid "Import from Instapaper"
 msgstr "Імпорт з Instapaper"
 
-msgid "Import from poche"
-msgstr "Імпорт з poche"
+msgid "Import from wallabag"
+msgstr "Імпорт з wallabag"
 
-msgid "Export your poche data"
-msgstr "Ек�портувати ваші дані з poche"
+msgid "Export your wallabag data"
+msgstr "Ек�портувати ваші дані з wallabag"
 
 msgid "Click here"
 msgstr "Клікніть тут"
@@ -198,32 +168,14 @@ msgstr "Клікніть тут"
 msgid "to download your database."
 msgstr "щоб завантажити вашу базу даних."
 
-msgid "to export your poche data."
-msgstr "щоб ек�портувати ваші дані poche."
+msgid "to export your wallabag data."
+msgstr "щоб ек�портувати ваші дані wallabag."
 
-msgid "Tag"
-msgstr "Тег"
+msgid "Cache"
+msgstr "Кеш"
 
-msgid "No link available here!"
-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 "to delete cache."
+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"
-msgstr "попередн�"
+msgid "save link!"
+msgstr "зберегти лінк!"
 
-msgid "next"
-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"
+
+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"
-msgstr "ла�каво про�имо до вашого poche"
+msgid "welcome to your wallabag"
+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 "бувайте, ще побачимо�ь!"
diff --git a/themes/baggy/_display-mode.twig b/themes/baggy/_display-mode.twig
new file mode 100755
index 00000000..31f76581
--- /dev/null
+++ b/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>
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 206d5aae..144bcaa6 100644..100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -8,5 +8,7 @@
         <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">
         <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.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/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig
index e9cd9d4a..5226728b 100644
--- a/themes/baggy/_menu.twig
+++ b/themes/baggy/_menu.twig
@@ -4,9 +4,10 @@
                 <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><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' %}
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
new file mode 100755
index 00000000..505ec368
--- /dev/null
+++ b/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>
diff --git a/themes/baggy/_top.twig b/themes/baggy/_top.twig
index 4f476a37..d3e35aa3 100644
--- a/themes/baggy/_top.twig
+++ b/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>
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index b37ac115..a13af0c8 100644
--- a/themes/baggy/config.twig
+++ b/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>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>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>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>
-                {% 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 %}
+                <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 %} ({% 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,37 @@
             {% endif %}
 
             <h2>{% trans "Import" %}</h2>
-            <p>{% trans "Please execute the import script locally as it can take a very long time." %}</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 "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." %}</p>
+            <p>1. {% trans "First, select the export file on your computer and upload it." %}</p>
+            <form method="post" action="?uploadfile" name="uploadfile" enctype="multipart/form-data">
+                <fieldset class="w500p">
+                    <div class="row">
+                        <label class="col w150p" for="file">{% trans "File:" %}</label>
+                        <input class="col" type="file" id="file" name="file" tabindex="4">
+                    </div>
+                    <div class="row mts txtcenter">
+                        <button class="bouton" type="submit" tabindex="4">{% trans "Upload" %}</button>
+                    </div>
+                </fieldset>
+                <input type="hidden" name="MAX_FILE_SIZE" value="1048576">
+                <input type="hidden" name="returnurl" value="{{ referer }}">
+            </form>
+            <p>2. {% trans "Then, click on the right link below." %}</p>
             <ul>
-                <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>
-                <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>
-                <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>
-                <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>
+                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCKET_FILE')) }}</li>
+                <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('READABILITY_FILE')) }}</li>
+                <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
+                <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCHE_FILE')) }}</li>
             </ul>
 
+            {% if token == '' %}
+                <p>{% trans "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>." %}</p>
+            {% else %}
+            <p>3. {% trans "Finally, you have to fetch content for imported items." %} <a href="cron.php?limit=10&amp;user-id={{ user_id }}&amp;token={{token}}" target="_blank">{% trans "Click here" %}</a> {% trans "to fetch content for 10 articles" %}.</p>
+            <p>{% trans "If you have console access to your server, you can also create a cron task:" %}</p>
+            <pre><code>0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1</code></pre>
+            {% endif %}
+
             <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 %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 3e128b08..61e0b47e 100755
--- a/themes/baggy/css/main.css
+++ b/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;
@@ -425,7 +490,7 @@ footer a {
   }
 
 .entrie:nth-child(3n+1) {
-  margin-left: 0;
+  margin-left: 0!important;
 }
 
 .results {
@@ -442,6 +507,7 @@ footer a {
 
 .pagination {
   text-align: right;
+  margin-bottom:50px;
 }
 
 .nb-results {
@@ -469,6 +535,84 @@ footer a {
 }
 
 /* ==========================================================================
+  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;
+}
+
+/* ==========================================================================
    3 = Pictos
    ========================================================================== */
    
@@ -602,6 +746,7 @@ footer a {
 #article {
   width: 70%;
   margin-bottom: 3em;
+  text-align: justify;
 }
 
 #article .tags {
@@ -731,6 +876,9 @@ blockquote {
     width: 100%;
     margin-left: 0;
   }
+  #display-mode {
+    display: none;
+  }
 }
 
 @media screen and (max-width: 500px) {
@@ -820,4 +968,12 @@ blockquote {
   #article_toolbar a {
     padding: 0.3em 0.4em 0.2em;
   }
+  
+  #display-mode {
+    display: none;
+  }
+
+  #bagit-form {
+    left: 0;
+  }
 }
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index 9e9012ee..65ac996a 100644..100755
--- a/themes/baggy/edit-tags.twig
+++ b/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 %}
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 4f9db063..e34897fa 100644..100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -18,6 +18,10 @@
             {% 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">
@@ -26,9 +30,9 @@
                 </div>
                     {% 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>
diff --git a/themes/baggy/img/baggy/blank.png b/themes/baggy/img/baggy/blank.png
new file mode 100755
index 00000000..63e09844
--- /dev/null
+++ b/themes/baggy/img/baggy/blank.png
diff --git a/themes/baggy/img/baggy/down.png b/themes/baggy/img/baggy/down.png
new file mode 100644
index 00000000..b9d536a7
--- /dev/null
+++ b/themes/baggy/img/baggy/down.png
diff --git a/themes/baggy/img/baggy/list.png b/themes/baggy/img/baggy/list.png
new file mode 100755
index 00000000..bd5aff5a
--- /dev/null
+++ b/themes/baggy/img/baggy/list.png
diff --git a/themes/baggy/img/baggy/table.png b/themes/baggy/img/baggy/table.png
new file mode 100755
index 00000000..859c4cd8
--- /dev/null
+++ b/themes/baggy/img/baggy/table.png
diff --git a/themes/baggy/img/baggy/top.png b/themes/baggy/img/baggy/top.png
new file mode 100644
index 00000000..954a8c0a
--- /dev/null
+++ b/themes/baggy/img/baggy/top.png
diff --git a/themes/baggy/img/logo-other_themes.png b/themes/baggy/img/logo-other_themes.png
new file mode 100755
index 00000000..32543a44
--- /dev/null
+++ b/themes/baggy/img/logo-other_themes.png
diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js
index c1d3c0ec..da644fbe 100755
--- a/themes/baggy/js/init.js
+++ b/themes/baggy/js/init.js
@@ -1,12 +1,126 @@
-document.addEventListener('DOMContentLoaded', function() {
-  var menu = document.getElementById('menu');
+$.fn.ready(function() {
 
-  menu.addEventListener('click', function(){
-    if(this.nextElementSibling.style.display === "block") {
-      this.nextElementSibling.style.display = "none";
-    }else {
-      this.nextElementSibling.style.display = "block";  
+  var $listmode = $('#listmode'),
+      $listentries = $("#list-entries"),
+      $bagit = $('#bagit'),
+      $bagitForm = $('#bagit-form');
+      $bagitFormForm = $('#bagit-form-form');
+
+  /* ==========================================================================
+     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");
+  }
+
+  /* ==========================================================================
+    bag it link and close button
+    ========================================================================== */
+
+  function toggleSaveLinkForm(url) {
+    $bagit.toggleClass("active-current");
+    $bagitForm.toggle();
+    $('#content').toggleClass("opacity03");
+    if (url !== 'undefined' && url) {
+      $('#plainurl').val(url);
+    }
+    $('#plainurl').focus();
+  }
+
+  $bagit.click(function(){
+    toggleSaveLinkForm();
+  });
+
+  $("#bagit-form-close").click(function(){
+    toggleSaveLinkForm();
+  });
+
+
+  //send "bag it link" form request via ajax
+  $bagitFormForm.submit( function(event) {
+    $bagitFormForm.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('');
+          $bagitFormForm.css("cursor", "auto");
+          //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay
+        },
+        error: function(data) {
+          $('#add-link-result').html("Failed!");
+          $bagitFormForm.css("cursor", "auto");
+        }
+    });
+
+    event.preventDefault();
+  });
+
+  /* ==========================================================================
+    Keyboard gestion
+    ========================================================================== */
+
+  $(window).keydown(function(e){
+    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || e.keyCode == 27 ) {
+      toggleSaveLinkForm();
+      return false;
     }
-    
   });
-});
\ No newline at end of file
+
+  /* ==========================================================================
+  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.preventDefault();
+  });
+
+
+
+
+});
diff --git a/themes/baggy/js/jquery.cookie.js b/themes/baggy/js/jquery.cookie.js
new file mode 100755
index 00000000..92719000
--- /dev/null
+++ b/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;
+        };
+
+}));
diff --git a/themes/baggy/tags.twig b/themes/baggy/tags.twig
index 9df44bb7..9bb93a45 100644..100755
--- a/themes/baggy/tags.twig
+++ b/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>
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 4751c4cb..092be04e 100644
--- a/themes/baggy/view.twig
+++ b/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 %}
diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig
index 792687c0..2a2de211 100755
--- a/themes/courgette/_top.twig
+++ b/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/{{ constant('DEFAULT_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>
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index 26da7289..5c0aa4b1 100755
--- a/themes/courgette/config.twig
+++ b/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>
-            <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
+            <h2>{% trans "Export your wallabag data" %}</h2>
+            <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
         </div>
 {% endblock %}
\ No newline at end of file
diff --git a/themes/default/_bookmarklet.twig b/themes/default/_bookmarklet.twig
index 2e3071ad..61996353 100644
--- a/themes/default/_bookmarklet.twig
+++ b/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>
\ No newline at end of file
diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig
new file mode 100755
index 00000000..4f2fceb0
--- /dev/null
+++ b/themes/default/_sorting.twig
@@ -0,0 +1,6 @@
+{% 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=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 %}
diff --git a/themes/default/_top.twig b/themes/default/_top.twig
index 083be152..c6e41b2f 100644
--- a/themes/default/_top.twig
+++ b/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>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index cd4d074d..5d20e0ea 100644
--- a/themes/default/config.twig
+++ b/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>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>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>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,15 +104,37 @@
             {% endif %}
 
             <h2>{% trans "Import" %}</h2>
-            <p>{% trans "Please execute the import script locally as it can take a very long time." %}</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 "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." %}</p>
+            <p>1. {% trans "First, select the export file on your computer and upload it." %}</p>
+            <form method="post" action="?uploadfile" name="uploadfile" enctype="multipart/form-data">
+                <fieldset class="w500p">
+                    <div class="row">
+                        <label class="col w150p" for="file">{% trans "File:" %}</label>
+                        <input class="col" type="file" id="file" name="file" tabindex="4">
+                    </div>
+                    <div class="row mts txtcenter">
+                        <button class="bouton" type="submit" tabindex="4">{% trans "Upload" %}</button>
+                    </div>
+                </fieldset>
+                <input type="hidden" name="MAX_FILE_SIZE" value="1048576">
+                <input type="hidden" name="returnurl" value="{{ referer }}">
+            </form>
+            <p>2. {% trans "Then, click on the right link below." %}</p>
             <ul>
-                <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>
-                <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>
-                <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>
-                <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>
+                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCKET_FILE')) }}</li>
+                <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('READABILITY_FILE')) }}</li>
+                <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
+                <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCHE_FILE')) }}</li>
             </ul>
 
+            {% if token == '' %}
+                <p>{% trans "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>." %}</p>
+            {% else %}
+            <p>3. {% trans "Finally, you have to fetch content for imported items." %} <a href="cron.php?limit=10&amp;user-id={{ user_id }}&amp;token={{token}}" target="_blank">{% trans "Click here" %}</a> {% trans "to fetch content for 10 articles" %}.</p>
+            <p>{% trans "If you have console access to your server, you can also create a cron task:" %}</p>
+            <pre><code>0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1</code></pre>
+            {% endif %}
+
             <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 %}
diff --git a/themes/default/css/images/animated-overlay.gif b/themes/default/css/images/animated-overlay.gif
new file mode 100644
index 00000000..d441f75e
--- /dev/null
+++ b/themes/default/css/images/animated-overlay.gif
diff --git a/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 00000000..9f10cb65
--- /dev/null
+++ b/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png b/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644
index 00000000..b89b914b
--- /dev/null
+++ b/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 00000000..780d3ffd
--- /dev/null
+++ b/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png b/themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 00000000..da53255b
--- /dev/null
+++ b/themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png b/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 00000000..f6306608
--- /dev/null
+++ b/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 00000000..7d347065
--- /dev/null
+++ b/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 00000000..533c4900
--- /dev/null
+++ b/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 00000000..bf3a9481
--- /dev/null
+++ b/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/themes/default/css/images/ui-icons_222222_256x240.png b/themes/default/css/images/ui-icons_222222_256x240.png
new file mode 100644
index 00000000..c1cb1170
--- /dev/null
+++ b/themes/default/css/images/ui-icons_222222_256x240.png
diff --git a/themes/default/css/images/ui-icons_2e83ff_256x240.png b/themes/default/css/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 00000000..84b601bf
--- /dev/null
+++ b/themes/default/css/images/ui-icons_2e83ff_256x240.png
diff --git a/themes/default/css/images/ui-icons_454545_256x240.png b/themes/default/css/images/ui-icons_454545_256x240.png
new file mode 100644
index 00000000..b6db1acd
--- /dev/null
+++ b/themes/default/css/images/ui-icons_454545_256x240.png
diff --git a/themes/default/css/images/ui-icons_888888_256x240.png b/themes/default/css/images/ui-icons_888888_256x240.png
new file mode 100644
index 00000000..feea0e20
--- /dev/null
+++ b/themes/default/css/images/ui-icons_888888_256x240.png
diff --git a/themes/default/css/images/ui-icons_cd0a0a_256x240.png b/themes/default/css/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 00000000..ed5b6b09
--- /dev/null
+++ b/themes/default/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/themes/default/css/jquery-ui-1.10.4.custom.css b/themes/default/css/jquery-ui-1.10.4.custom.css
new file mode 100644
index 00000000..5690172f
--- /dev/null
+++ b/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;
+}
diff --git a/themes/default/css/jquery-ui-1.10.4.custom.min.css b/themes/default/css/jquery-ui-1.10.4.custom.min.css
new file mode 100644
index 00000000..4dba92a8
--- /dev/null
+++ b/themes/default/css/jquery-ui-1.10.4.custom.min.css
@@ -0,0 +1,7 @@
+/*! 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 */
+
+.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}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.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%;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;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}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.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 #aaa;background:#fff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.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:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;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 #999;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 #aaa;background:#fff 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}.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)}.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)}.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{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}.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}.ui-widget-overlay{background:#aaa 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:#aaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 28675907..b3d300ed 100644..100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -347,3 +347,11 @@ a.reading-time span {
     margin-left: -30px;
 }
 
+.two-column {
+  display: block;
+  width: 50%;
+  paddig-right: 20px;
+  float: left;
+  vertical-align: top;
+}
+
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 83f04aa0..cd6bc66f 100644..100755
--- a/themes/default/edit-tags.twig
+++ b/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 %}
diff --git a/themes/default/home.twig b/themes/default/home.twig
index 165fecc6..bd5fc2d6 100644..100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -12,12 +12,7 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% 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=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 %}
+            {% include '_sorting.twig' %}
 {% endblock %}
 {% block content %}
             {% if tag %}
diff --git a/themes/default/js/autoCompleteTags.js b/themes/default/js/autoCompleteTags.js
new file mode 100755
index 00000000..90bc982c
--- /dev/null
+++ b/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;
+    }
+  });
+
+
+});
diff --git a/themes/default/js/jquery-ui-1.10.4.custom.js b/themes/default/js/jquery-ui-1.10.4.custom.js
new file mode 100644
index 00000000..6f599fca
--- /dev/null
+++ b/themes/default/js/jquery-ui-1.10.4.custom.js
@@ -0,0 +1,2519 @@
+/*! jQuery UI - v1.10.4 - 2014-03-08
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.position.js, jquery.ui.autocomplete.js, jquery.ui.menu.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function( $, undefined ) {
+
+var uuid = 0,
+        runiqueId = /^ui-id-\d+$/;
+
+// $.ui might exist from components with no dependencies, e.g., $.ui.position
+$.ui = $.ui || {};
+
+$.extend( $.ui, {
+        version: "1.10.4",
+
+        keyCode: {
+                BACKSPACE: 8,
+                COMMA: 188,
+                DELETE: 46,
+                DOWN: 40,
+                END: 35,
+                ENTER: 13,
+                ESCAPE: 27,
+                HOME: 36,
+                LEFT: 37,
+                NUMPAD_ADD: 107,
+                NUMPAD_DECIMAL: 110,
+                NUMPAD_DIVIDE: 111,
+                NUMPAD_ENTER: 108,
+                NUMPAD_MULTIPLY: 106,
+                NUMPAD_SUBTRACT: 109,
+                PAGE_DOWN: 34,
+                PAGE_UP: 33,
+                PERIOD: 190,
+                RIGHT: 39,
+                SPACE: 32,
+                TAB: 9,
+                UP: 38
+        }
+});
+
+// plugins
+$.fn.extend({
+        focus: (function( orig ) {
+                return function( delay, fn ) {
+                        return typeof delay === "number" ?
+                                this.each(function() {
+                                        var elem = this;
+                                        setTimeout(function() {
+                                                $( elem ).focus();
+                                                if ( fn ) {
+                                                        fn.call( elem );
+                                                }
+                                        }, delay );
+                                }) :
+                                orig.apply( this, arguments );
+                };
+        })( $.fn.focus ),
+
+        scrollParent: function() {
+                var scrollParent;
+                if (($.ui.ie && (/(static|relative)/).test(this.css("position"))) || (/absolute/).test(this.css("position"))) {
+                        scrollParent = this.parents().filter(function() {
+                                return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
+                        }).eq(0);
+                } else {
+                        scrollParent = this.parents().filter(function() {
+                                return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
+                        }).eq(0);
+                }
+
+                return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent;
+        },
+
+        zIndex: function( zIndex ) {
+                if ( zIndex !== undefined ) {
+                        return this.css( "zIndex", zIndex );
+                }
+
+                if ( this.length ) {
+                        var elem = $( this[ 0 ] ), position, value;
+                        while ( elem.length && elem[ 0 ] !== document ) {
+                                // Ignore z-index if position is set to a value where z-index is ignored by the browser
+                                // This makes behavior of this function consistent across browsers
+                                // WebKit always returns auto if the element is positioned
+                                position = elem.css( "position" );
+                                if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+                                        // IE returns 0 when zIndex is not specified
+                                        // other browsers return a string
+                                        // we ignore the case of nested elements with an explicit value of 0
+                                        // <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+                                        value = parseInt( elem.css( "zIndex" ), 10 );
+                                        if ( !isNaN( value ) && value !== 0 ) {
+                                                return value;
+                                        }
+                                }
+                                elem = elem.parent();
+                        }
+                }
+
+                return 0;
+        },
+
+        uniqueId: function() {
+                return this.each(function() {
+                        if ( !this.id ) {
+                                this.id = "ui-id-" + (++uuid);
+                        }
+                });
+        },
+
+        removeUniqueId: function() {
+                return this.each(function() {
+                        if ( runiqueId.test( this.id ) ) {
+                                $( this ).removeAttr( "id" );
+                        }
+                });
+        }
+});
+
+// selectors
+function focusable( element, isTabIndexNotNaN ) {
+        var map, mapName, img,
+                nodeName = element.nodeName.toLowerCase();
+        if ( "area" === nodeName ) {
+                map = element.parentNode;
+                mapName = map.name;
+                if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+                        return false;
+                }
+                img = $( "img[usemap=#" + mapName + "]" )[0];
+                return !!img && visible( img );
+        }
+        return ( /input|select|textarea|button|object/.test( nodeName ) ?
+                !element.disabled :
+                "a" === nodeName ?
+                        element.href || isTabIndexNotNaN :
+                        isTabIndexNotNaN) &&
+                // the element and all of its ancestors must be visible
+                visible( element );
+}
+
+function visible( element ) {
+        return $.expr.filters.visible( element ) &&
+                !$( element ).parents().addBack().filter(function() {
+                        return $.css( this, "visibility" ) === "hidden";
+                }).length;
+}
+
+$.extend( $.expr[ ":" ], {
+        data: $.expr.createPseudo ?
+                $.expr.createPseudo(function( dataName ) {
+                        return function( elem ) {
+                                return !!$.data( elem, dataName );
+                        };
+                }) :
+                // support: jQuery <1.8
+                function( elem, i, match ) {
+                        return !!$.data( elem, match[ 3 ] );
+                },
+
+        focusable: function( element ) {
+                return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
+        },
+
+        tabbable: function( element ) {
+                var tabIndex = $.attr( element, "tabindex" ),
+                        isTabIndexNaN = isNaN( tabIndex );
+                return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
+        }
+});
+
+// support: jQuery <1.8
+if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
+        $.each( [ "Width", "Height" ], function( i, name ) {
+                var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+                        type = name.toLowerCase(),
+                        orig = {
+                                innerWidth: $.fn.innerWidth,
+                                innerHeight: $.fn.innerHeight,
+                                outerWidth: $.fn.outerWidth,
+                                outerHeight: $.fn.outerHeight
+                        };
+
+                function reduce( elem, size, border, margin ) {
+                        $.each( side, function() {
+                                size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
+                                if ( border ) {
+                                        size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
+                                }
+                                if ( margin ) {
+                                        size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
+                                }
+                        });
+                        return size;
+                }
+
+                $.fn[ "inner" + name ] = function( size ) {
+                        if ( size === undefined ) {
+                                return orig[ "inner" + name ].call( this );
+                        }
+
+                        return this.each(function() {
+                                $( this ).css( type, reduce( this, size ) + "px" );
+                        });
+                };
+
+                $.fn[ "outer" + name] = function( size, margin ) {
+                        if ( typeof size !== "number" ) {
+                                return orig[ "outer" + name ].call( this, size );
+                        }
+
+                        return this.each(function() {
+                                $( this).css( type, reduce( this, size, true, margin ) + "px" );
+                        });
+                };
+        });
+}
+
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+        $.fn.addBack = function( selector ) {
+                return this.add( selector == null ?
+                        this.prevObject : this.prevObject.filter( selector )
+                );
+        };
+}
+
+// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
+if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
+        $.fn.removeData = (function( removeData ) {
+                return function( key ) {
+                        if ( arguments.length ) {
+                                return removeData.call( this, $.camelCase( key ) );
+                        } else {
+                                return removeData.call( this );
+                        }
+                };
+        })( $.fn.removeData );
+}
+
+
+
+
+
+// deprecated
+$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+$.support.selectstart = "onselectstart" in document.createElement( "div" );
+$.fn.extend({
+        disableSelection: function() {
+                return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+                        ".ui-disableSelection", function( event ) {
+                                event.preventDefault();
+                        });
+        },
+
+        enableSelection: function() {
+                return this.unbind( ".ui-disableSelection" );
+        }
+});
+
+$.extend( $.ui, {
+        // $.ui.plugin is deprecated. Use $.widget() extensions instead.
+        plugin: {
+                add: function( module, option, set ) {
+                        var i,
+                                proto = $.ui[ module ].prototype;
+                        for ( i in set ) {
+                                proto.plugins[ i ] = proto.plugins[ i ] || [];
+                                proto.plugins[ i ].push( [ option, set[ i ] ] );
+                        }
+                },
+                call: function( instance, name, args ) {
+                        var i,
+                                set = instance.plugins[ name ];
+                        if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
+                                return;
+                        }
+
+                        for ( i = 0; i < set.length; i++ ) {
+                                if ( instance.options[ set[ i ][ 0 ] ] ) {
+                                        set[ i ][ 1 ].apply( instance.element, args );
+                                }
+                        }
+                }
+        },
+
+        // only used by resizable
+        hasScroll: function( el, a ) {
+
+                //If overflow is hidden, the element might have extra content, but the user wants to hide it
+                if ( $( el ).css( "overflow" ) === "hidden") {
+                        return false;
+                }
+
+                var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+                        has = false;
+
+                if ( el[ scroll ] > 0 ) {
+                        return true;
+                }
+
+                // TODO: determine which cases actually cause this to happen
+                // if the element doesn't have the scroll set, see if it's possible to
+                // set the scroll
+                el[ scroll ] = 1;
+                has = ( el[ scroll ] > 0 );
+                el[ scroll ] = 0;
+                return has;
+        }
+});
+
+})( jQuery );
+(function( $, undefined ) {
+
+var uuid = 0,
+        slice = Array.prototype.slice,
+        _cleanData = $.cleanData;
+$.cleanData = function( elems ) {
+        for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+                try {
+                        $( elem ).triggerHandler( "remove" );
+                // http://bugs.jquery.com/ticket/8235
+                } catch( e ) {}
+        }
+        _cleanData( elems );
+};
+
+$.widget = function( name, base, prototype ) {
+        var fullName, existingConstructor, constructor, basePrototype,
+                // proxiedPrototype allows the provided prototype to remain unmodified
+                // so that it can be used as a mixin for multiple widgets (#8876)
+                proxiedPrototype = {},
+                namespace = name.split( "." )[ 0 ];
+
+        name = name.split( "." )[ 1 ];
+        fullName = namespace + "-" + name;
+
+        if ( !prototype ) {
+                prototype = base;
+                base = $.Widget;
+        }
+
+        // create selector for plugin
+        $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+                return !!$.data( elem, fullName );
+        };
+
+        $[ namespace ] = $[ namespace ] || {};
+        existingConstructor = $[ namespace ][ name ];
+        constructor = $[ namespace ][ name ] = function( options, element ) {
+                // allow instantiation without "new" keyword
+                if ( !this._createWidget ) {
+                        return new constructor( options, element );
+                }
+
+                // allow instantiation without initializing for simple inheritance
+                // must use "new" keyword (the code above always passes args)
+                if ( arguments.length ) {
+                        this._createWidget( options, element );
+                }
+        };
+        // extend with the existing constructor to carry over any static properties
+        $.extend( constructor, existingConstructor, {
+                version: prototype.version,
+                // copy the object used to create the prototype in case we need to
+                // redefine the widget later
+                _proto: $.extend( {}, prototype ),
+                // track widgets that inherit from this widget in case this widget is
+                // redefined after a widget inherits from it
+                _childConstructors: []
+        });
+
+        basePrototype = new base();
+        // we need to make the options hash a property directly on the new instance
+        // otherwise we'll modify the options hash on the prototype that we're
+        // inheriting from
+        basePrototype.options = $.widget.extend( {}, basePrototype.options );
+        $.each( prototype, function( prop, value ) {
+                if ( !$.isFunction( value ) ) {
+                        proxiedPrototype[ prop ] = value;
+                        return;
+                }
+                proxiedPrototype[ prop ] = (function() {
+                        var _super = function() {
+                                        return base.prototype[ prop ].apply( this, arguments );
+                                },
+                                _superApply = function( args ) {
+                                        return base.prototype[ prop ].apply( this, args );
+                                };
+                        return function() {
+                                var __super = this._super,
+                                        __superApply = this._superApply,
+                                        returnValue;
+
+                                this._super = _super;
+                                this._superApply = _superApply;
+
+                                returnValue = value.apply( this, arguments );
+
+                                this._super = __super;
+                                this._superApply = __superApply;
+
+                                return returnValue;
+                        };
+                })();
+        });
+        constructor.prototype = $.widget.extend( basePrototype, {
+                // TODO: remove support for widgetEventPrefix
+                // always use the name + a colon as the prefix, e.g., draggable:start
+                // don't prefix for widgets that aren't DOM-based
+                widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
+        }, proxiedPrototype, {
+                constructor: constructor,
+                namespace: namespace,
+                widgetName: name,
+                widgetFullName: fullName
+        });
+
+        // If this widget is being redefined then we need to find all widgets that
+        // are inheriting from it and redefine all of them so that they inherit from
+        // the new version of this widget. We're essentially trying to replace one
+        // level in the prototype chain.
+        if ( existingConstructor ) {
+                $.each( existingConstructor._childConstructors, function( i, child ) {
+                        var childPrototype = child.prototype;
+
+                        // redefine the child widget using the same prototype that was
+                        // originally used, but inherit from the new version of the base
+                        $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
+                });
+                // remove the list of existing child constructors from the old constructor
+                // so the old child constructors can be garbage collected
+                delete existingConstructor._childConstructors;
+        } else {
+                base._childConstructors.push( constructor );
+        }
+
+        $.widget.bridge( name, constructor );
+};
+
+$.widget.extend = function( target ) {
+        var input = slice.call( arguments, 1 ),
+                inputIndex = 0,
+                inputLength = input.length,
+                key,
+                value;
+        for ( ; inputIndex < inputLength; inputIndex++ ) {
+                for ( key in input[ inputIndex ] ) {
+                        value = input[ inputIndex ][ key ];
+                        if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+                                // Clone objects
+                                if ( $.isPlainObject( value ) ) {
+                                        target[ key ] = $.isPlainObject( target[ key ] ) ?
+                                                $.widget.extend( {}, target[ key ], value ) :
+                                                // Don't extend strings, arrays, etc. with objects
+                                                $.widget.extend( {}, value );
+                                // Copy everything else by reference
+                                } else {
+                                        target[ key ] = value;
+                                }
+                        }
+                }
+        }
+        return target;
+};
+
+$.widget.bridge = function( name, object ) {
+        var fullName = object.prototype.widgetFullName || name;
+        $.fn[ name ] = function( options ) {
+                var isMethodCall = typeof options === "string",
+                        args = slice.call( arguments, 1 ),
+                        returnValue = this;
+
+                // allow multiple hashes to be passed on init
+                options = !isMethodCall && args.length ?
+                        $.widget.extend.apply( null, [ options ].concat(args) ) :
+                        options;
+
+                if ( isMethodCall ) {
+                        this.each(function() {
+                                var methodValue,
+                                        instance = $.data( this, fullName );
+                                if ( !instance ) {
+                                        return $.error( "cannot call methods on " + name + " prior to initialization; " +
+                                                "attempted to call method '" + options + "'" );
+                                }
+                                if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
+                                        return $.error( "no such method '" + options + "' for " + name + " widget instance" );
+                                }
+                                methodValue = instance[ options ].apply( instance, args );
+                                if ( methodValue !== instance && methodValue !== undefined ) {
+                                        returnValue = methodValue && methodValue.jquery ?
+                                                returnValue.pushStack( methodValue.get() ) :
+                                                methodValue;
+                                        return false;
+                                }
+                        });
+                } else {
+                        this.each(function() {
+                                var instance = $.data( this, fullName );
+                                if ( instance ) {
+                                        instance.option( options || {} )._init();
+                                } else {
+                                        $.data( this, fullName, new object( options, this ) );
+                                }
+                        });
+                }
+
+                return returnValue;
+        };
+};
+
+$.Widget = function( /* options, element */ ) {};
+$.Widget._childConstructors = [];
+
+$.Widget.prototype = {
+        widgetName: "widget",
+        widgetEventPrefix: "",
+        defaultElement: "<div>",
+        options: {
+                disabled: false,
+
+                // callbacks
+                create: null
+        },
+        _createWidget: function( options, element ) {
+                element = $( element || this.defaultElement || this )[ 0 ];
+                this.element = $( element );
+                this.uuid = uuid++;
+                this.eventNamespace = "." + this.widgetName + this.uuid;
+                this.options = $.widget.extend( {},
+                        this.options,
+                        this._getCreateOptions(),
+                        options );
+
+                this.bindings = $();
+                this.hoverable = $();
+                this.focusable = $();
+
+                if ( element !== this ) {
+                        $.data( element, this.widgetFullName, this );
+                        this._on( true, this.element, {
+                                remove: function( event ) {
+                                        if ( event.target === element ) {
+                                                this.destroy();
+                                        }
+                                }
+                        });
+                        this.document = $( element.style ?
+                                // element within the document
+                                element.ownerDocument :
+                                // element is window or document
+                                element.document || element );
+                        this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+                }
+
+                this._create();
+                this._trigger( "create", null, this._getCreateEventData() );
+                this._init();
+        },
+        _getCreateOptions: $.noop,
+        _getCreateEventData: $.noop,
+        _create: $.noop,
+        _init: $.noop,
+
+        destroy: function() {
+                this._destroy();
+                // we can probably remove the unbind calls in 2.0
+                // all event bindings should go through this._on()
+                this.element
+                        .unbind( this.eventNamespace )
+                        // 1.9 BC for #7810
+                        // TODO remove dual storage
+                        .removeData( this.widgetName )
+                        .removeData( this.widgetFullName )
+                        // support: jquery <1.6.3
+                        // http://bugs.jquery.com/ticket/9413
+                        .removeData( $.camelCase( this.widgetFullName ) );
+                this.widget()
+                        .unbind( this.eventNamespace )
+                        .removeAttr( "aria-disabled" )
+                        .removeClass(
+                                this.widgetFullName + "-disabled " +
+                                "ui-state-disabled" );
+
+                // clean up events and states
+                this.bindings.unbind( this.eventNamespace );
+                this.hoverable.removeClass( "ui-state-hover" );
+                this.focusable.removeClass( "ui-state-focus" );
+        },
+        _destroy: $.noop,
+
+        widget: function() {
+                return this.element;
+        },
+
+        option: function( key, value ) {
+                var options = key,
+                        parts,
+                        curOption,
+                        i;
+
+                if ( arguments.length === 0 ) {
+                        // don't return a reference to the internal hash
+                        return $.widget.extend( {}, this.options );
+                }
+
+                if ( typeof key === "string" ) {
+                        // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+                        options = {};
+                        parts = key.split( "." );
+                        key = parts.shift();
+                        if ( parts.length ) {
+                                curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+                                for ( i = 0; i < parts.length - 1; i++ ) {
+                                        curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+                                        curOption = curOption[ parts[ i ] ];
+                                }
+                                key = parts.pop();
+                                if ( arguments.length === 1 ) {
+                                        return curOption[ key ] === undefined ? null : curOption[ key ];
+                                }
+                                curOption[ key ] = value;
+                        } else {
+                                if ( arguments.length === 1 ) {
+                                        return this.options[ key ] === undefined ? null : this.options[ key ];
+                                }
+                                options[ key ] = value;
+                        }
+                }
+
+                this._setOptions( options );
+
+                return this;
+        },
+        _setOptions: function( options ) {
+                var key;
+
+                for ( key in options ) {
+                        this._setOption( key, options[ key ] );
+                }
+
+                return this;
+        },
+        _setOption: function( key, value ) {
+                this.options[ key ] = value;
+
+                if ( key === "disabled" ) {
+                        this.widget()
+                                .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
+                                .attr( "aria-disabled", value );
+                        this.hoverable.removeClass( "ui-state-hover" );
+                        this.focusable.removeClass( "ui-state-focus" );
+                }
+
+                return this;
+        },
+
+        enable: function() {
+                return this._setOption( "disabled", false );
+        },
+        disable: function() {
+                return this._setOption( "disabled", true );
+        },
+
+        _on: function( suppressDisabledCheck, element, handlers ) {
+                var delegateElement,
+                        instance = this;
+
+                // no suppressDisabledCheck flag, shuffle arguments
+                if ( typeof suppressDisabledCheck !== "boolean" ) {
+                        handlers = element;
+                        element = suppressDisabledCheck;
+                        suppressDisabledCheck = false;
+                }
+
+                // no element argument, shuffle and use this.element
+                if ( !handlers ) {
+                        handlers = element;
+                        element = this.element;
+                        delegateElement = this.widget();
+                } else {
+                        // accept selectors, DOM elements
+                        element = delegateElement = $( element );
+                        this.bindings = this.bindings.add( element );
+                }
+
+                $.each( handlers, function( event, handler ) {
+                        function handlerProxy() {
+                                // allow widgets to customize the disabled handling
+                                // - disabled as an array instead of boolean
+                                // - disabled class as method for disabling individual parts
+                                if ( !suppressDisabledCheck &&
+                                                ( instance.options.disabled === true ||
+                                                        $( this ).hasClass( "ui-state-disabled" ) ) ) {
+                                        return;
+                                }
+                                return ( typeof handler === "string" ? instance[ handler ] : handler )
+                                        .apply( instance, arguments );
+                        }
+
+                        // copy the guid so direct unbinding works
+                        if ( typeof handler !== "string" ) {
+                                handlerProxy.guid = handler.guid =
+                                        handler.guid || handlerProxy.guid || $.guid++;
+                        }
+
+                        var match = event.match( /^(\w+)\s*(.*)$/ ),
+                                eventName = match[1] + instance.eventNamespace,
+                                selector = match[2];
+                        if ( selector ) {
+                                delegateElement.delegate( selector, eventName, handlerProxy );
+                        } else {
+                                element.bind( eventName, handlerProxy );
+                        }
+                });
+        },
+
+        _off: function( element, eventName ) {
+                eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+                element.unbind( eventName ).undelegate( eventName );
+        },
+
+        _delay: function( handler, delay ) {
+                function handlerProxy() {
+                        return ( typeof handler === "string" ? instance[ handler ] : handler )
+                                .apply( instance, arguments );
+                }
+                var instance = this;
+                return setTimeout( handlerProxy, delay || 0 );
+        },
+
+        _hoverable: function( element ) {
+                this.hoverable = this.hoverable.add( element );
+                this._on( element, {
+                        mouseenter: function( event ) {
+                                $( event.currentTarget ).addClass( "ui-state-hover" );
+                        },
+                        mouseleave: function( event ) {
+                                $( event.currentTarget ).removeClass( "ui-state-hover" );
+                        }
+                });
+        },
+
+        _focusable: function( element ) {
+                this.focusable = this.focusable.add( element );
+                this._on( element, {
+                        focusin: function( event ) {
+                                $( event.currentTarget ).addClass( "ui-state-focus" );
+                        },
+                        focusout: function( event ) {
+                                $( event.currentTarget ).removeClass( "ui-state-focus" );
+                        }
+                });
+        },
+
+        _trigger: function( type, event, data ) {
+                var prop, orig,
+                        callback = this.options[ type ];
+
+                data = data || {};
+                event = $.Event( event );
+                event.type = ( type === this.widgetEventPrefix ?
+                        type :
+                        this.widgetEventPrefix + type ).toLowerCase();
+                // the original event may come from any element
+                // so we need to reset the target on the new event
+                event.target = this.element[ 0 ];
+
+                // copy original event properties over to the new event
+                orig = event.originalEvent;
+                if ( orig ) {
+                        for ( prop in orig ) {
+                                if ( !( prop in event ) ) {
+                                        event[ prop ] = orig[ prop ];
+                                }
+                        }
+                }
+
+                this.element.trigger( event, data );
+                return !( $.isFunction( callback ) &&
+                        callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
+                        event.isDefaultPrevented() );
+        }
+};
+
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+        $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+                if ( typeof options === "string" ) {
+                        options = { effect: options };
+                }
+                var hasOptions,
+                        effectName = !options ?
+                                method :
+                                options === true || typeof options === "number" ?
+                                        defaultEffect :
+                                        options.effect || defaultEffect;
+                options = options || {};
+                if ( typeof options === "number" ) {
+                        options = { duration: options };
+                }
+                hasOptions = !$.isEmptyObject( options );
+                options.complete = callback;
+                if ( options.delay ) {
+                        element.delay( options.delay );
+                }
+                if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+                        element[ method ]( options );
+                } else if ( effectName !== method && element[ effectName ] ) {
+                        element[ effectName ]( options.duration, options.easing, callback );
+                } else {
+                        element.queue(function( next ) {
+                                $( this )[ method ]();
+                                if ( callback ) {
+                                        callback.call( element[ 0 ] );
+                                }
+                                next();
+                        });
+                }
+        };
+});
+
+})( jQuery );
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var cachedScrollbarWidth,
+        max = Math.max,
+        abs = Math.abs,
+        round = Math.round,
+        rhorizontal = /left|center|right/,
+        rvertical = /top|center|bottom/,
+        roffset = /[\+\-]\d+(\.[\d]+)?%?/,
+        rposition = /^\w+/,
+        rpercent = /%$/,
+        _position = $.fn.position;
+
+function getOffsets( offsets, width, height ) {
+        return [
+                parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
+                parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
+        ];
+}
+
+function parseCss( element, property ) {
+        return parseInt( $.css( element, property ), 10 ) || 0;
+}
+
+function getDimensions( elem ) {
+        var raw = elem[0];
+        if ( raw.nodeType === 9 ) {
+                return {
+                        width: elem.width(),
+                        height: elem.height(),
+                        offset: { top: 0, left: 0 }
+                };
+        }
+        if ( $.isWindow( raw ) ) {
+                return {
+                        width: elem.width(),
+                        height: elem.height(),
+                        offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
+                };
+        }
+        if ( raw.preventDefault ) {
+                return {
+                        width: 0,
+                        height: 0,
+                        offset: { top: raw.pageY, left: raw.pageX }
+                };
+        }
+        return {
+                width: elem.outerWidth(),
+                height: elem.outerHeight(),
+                offset: elem.offset()
+        };
+}
+
+$.position = {
+        scrollbarWidth: function() {
+                if ( cachedScrollbarWidth !== undefined ) {
+                        return cachedScrollbarWidth;
+                }
+                var w1, w2,
+                        div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
+                        innerDiv = div.children()[0];
+
+                $( "body" ).append( div );
+                w1 = innerDiv.offsetWidth;
+                div.css( "overflow", "scroll" );
+
+                w2 = innerDiv.offsetWidth;
+
+                if ( w1 === w2 ) {
+                        w2 = div[0].clientWidth;
+                }
+
+                div.remove();
+
+                return (cachedScrollbarWidth = w1 - w2);
+        },
+        getScrollInfo: function( within ) {
+                var overflowX = within.isWindow || within.isDocument ? "" :
+                                within.element.css( "overflow-x" ),
+                        overflowY = within.isWindow || within.isDocument ? "" :
+                                within.element.css( "overflow-y" ),
+                        hasOverflowX = overflowX === "scroll" ||
+                                ( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
+                        hasOverflowY = overflowY === "scroll" ||
+                                ( overflowY === "auto" && within.height < within.element[0].scrollHeight );
+                return {
+                        width: hasOverflowY ? $.position.scrollbarWidth() : 0,
+                        height: hasOverflowX ? $.position.scrollbarWidth() : 0
+                };
+        },
+        getWithinInfo: function( element ) {
+                var withinElement = $( element || window ),
+                        isWindow = $.isWindow( withinElement[0] ),
+                        isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
+                return {
+                        element: withinElement,
+                        isWindow: isWindow,
+                        isDocument: isDocument,
+                        offset: withinElement.offset() || { left: 0, top: 0 },
+                        scrollLeft: withinElement.scrollLeft(),
+                        scrollTop: withinElement.scrollTop(),
+                        width: isWindow ? withinElement.width() : withinElement.outerWidth(),
+                        height: isWindow ? withinElement.height() : withinElement.outerHeight()
+                };
+        }
+};
+
+$.fn.position = function( options ) {
+        if ( !options || !options.of ) {
+                return _position.apply( this, arguments );
+        }
+
+        // make a copy, we don't want to modify arguments
+        options = $.extend( {}, options );
+
+        var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
+                target = $( options.of ),
+                within = $.position.getWithinInfo( options.within ),
+                scrollInfo = $.position.getScrollInfo( within ),
+                collision = ( options.collision || "flip" ).split( " " ),
+                offsets = {};
+
+        dimensions = getDimensions( target );
+        if ( target[0].preventDefault ) {
+                // force left top to allow flipping
+                options.at = "left top";
+        }
+        targetWidth = dimensions.width;
+        targetHeight = dimensions.height;
+        targetOffset = dimensions.offset;
+        // clone to reuse original targetOffset later
+        basePosition = $.extend( {}, targetOffset );
+
+        // force my and at to have valid horizontal and vertical positions
+        // if a value is missing or invalid, it will be converted to center
+        $.each( [ "my", "at" ], function() {
+                var pos = ( options[ this ] || "" ).split( " " ),
+                        horizontalOffset,
+                        verticalOffset;
+
+                if ( pos.length === 1) {
+                        pos = rhorizontal.test( pos[ 0 ] ) ?
+                                pos.concat( [ "center" ] ) :
+                                rvertical.test( pos[ 0 ] ) ?
+                                        [ "center" ].concat( pos ) :
+                                        [ "center", "center" ];
+                }
+                pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+                pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+
+                // calculate offsets
+                horizontalOffset = roffset.exec( pos[ 0 ] );
+                verticalOffset = roffset.exec( pos[ 1 ] );
+                offsets[ this ] = [
+                        horizontalOffset ? horizontalOffset[ 0 ] : 0,
+                        verticalOffset ? verticalOffset[ 0 ] : 0
+                ];
+
+                // reduce to just the positions without the offsets
+                options[ this ] = [
+                        rposition.exec( pos[ 0 ] )[ 0 ],
+                        rposition.exec( pos[ 1 ] )[ 0 ]
+                ];
+        });
+
+        // normalize collision option
+        if ( collision.length === 1 ) {
+                collision[ 1 ] = collision[ 0 ];
+        }
+
+        if ( options.at[ 0 ] === "right" ) {
+                basePosition.left += targetWidth;
+        } else if ( options.at[ 0 ] === "center" ) {
+                basePosition.left += targetWidth / 2;
+        }
+
+        if ( options.at[ 1 ] === "bottom" ) {
+                basePosition.top += targetHeight;
+        } else if ( options.at[ 1 ] === "center" ) {
+                basePosition.top += targetHeight / 2;
+        }
+
+        atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
+        basePosition.left += atOffset[ 0 ];
+        basePosition.top += atOffset[ 1 ];
+
+        return this.each(function() {
+                var collisionPosition, using,
+                        elem = $( this ),
+                        elemWidth = elem.outerWidth(),
+                        elemHeight = elem.outerHeight(),
+                        marginLeft = parseCss( this, "marginLeft" ),
+                        marginTop = parseCss( this, "marginTop" ),
+                        collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
+                        collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
+                        position = $.extend( {}, basePosition ),
+                        myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
+
+                if ( options.my[ 0 ] === "right" ) {
+                        position.left -= elemWidth;
+                } else if ( options.my[ 0 ] === "center" ) {
+                        position.left -= elemWidth / 2;
+                }
+
+                if ( options.my[ 1 ] === "bottom" ) {
+                        position.top -= elemHeight;
+                } else if ( options.my[ 1 ] === "center" ) {
+                        position.top -= elemHeight / 2;
+                }
+
+                position.left += myOffset[ 0 ];
+                position.top += myOffset[ 1 ];
+
+                // if the browser doesn't support fractions, then round for consistent results
+                if ( !$.support.offsetFractions ) {
+                        position.left = round( position.left );
+                        position.top = round( position.top );
+                }
+
+                collisionPosition = {
+                        marginLeft: marginLeft,
+                        marginTop: marginTop
+                };
+
+                $.each( [ "left", "top" ], function( i, dir ) {
+                        if ( $.ui.position[ collision[ i ] ] ) {
+                                $.ui.position[ collision[ i ] ][ dir ]( position, {
+                                        targetWidth: targetWidth,
+                                        targetHeight: targetHeight,
+                                        elemWidth: elemWidth,
+                                        elemHeight: elemHeight,
+                                        collisionPosition: collisionPosition,
+                                        collisionWidth: collisionWidth,
+                                        collisionHeight: collisionHeight,
+                                        offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
+                                        my: options.my,
+                                        at: options.at,
+                                        within: within,
+                                        elem : elem
+                                });
+                        }
+                });
+
+                if ( options.using ) {
+                        // adds feedback as second argument to using callback, if present
+                        using = function( props ) {
+                                var left = targetOffset.left - position.left,
+                                        right = left + targetWidth - elemWidth,
+                                        top = targetOffset.top - position.top,
+                                        bottom = top + targetHeight - elemHeight,
+                                        feedback = {
+                                                target: {
+                                                        element: target,
+                                                        left: targetOffset.left,
+                                                        top: targetOffset.top,
+                                                        width: targetWidth,
+                                                        height: targetHeight
+                                                },
+                                                element: {
+                                                        element: elem,
+                                                        left: position.left,
+                                                        top: position.top,
+                                                        width: elemWidth,
+                                                        height: elemHeight
+                                                },
+                                                horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
+                                                vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
+                                        };
+                                if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
+                                        feedback.horizontal = "center";
+                                }
+                                if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
+                                        feedback.vertical = "middle";
+                                }
+                                if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
+                                        feedback.important = "horizontal";
+                                } else {
+                                        feedback.important = "vertical";
+                                }
+                                options.using.call( this, props, feedback );
+                        };
+                }
+
+                elem.offset( $.extend( position, { using: using } ) );
+        });
+};
+
+$.ui.position = {
+        fit: {
+                left: function( position, data ) {
+                        var within = data.within,
+                                withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
+                                outerWidth = within.width,
+                                collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+                                overLeft = withinOffset - collisionPosLeft,
+                                overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
+                                newOverRight;
+
+                        // element is wider than within
+                        if ( data.collisionWidth > outerWidth ) {
+                                // element is initially over the left side of within
+                                if ( overLeft > 0 && overRight <= 0 ) {
+                                        newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
+                                        position.left += overLeft - newOverRight;
+                                // element is initially over right side of within
+                                } else if ( overRight > 0 && overLeft <= 0 ) {
+                                        position.left = withinOffset;
+                                // element is initially over both left and right sides of within
+                                } else {
+                                        if ( overLeft > overRight ) {
+                                                position.left = withinOffset + outerWidth - data.collisionWidth;
+                                        } else {
+                                                position.left = withinOffset;
+                                        }
+                                }
+                        // too far left -> align with left edge
+                        } else if ( overLeft > 0 ) {
+                                position.left += overLeft;
+                        // too far right -> align with right edge
+                        } else if ( overRight > 0 ) {
+                                position.left -= overRight;
+                        // adjust based on position and margin
+                        } else {
+                                position.left = max( position.left - collisionPosLeft, position.left );
+                        }
+                },
+                top: function( position, data ) {
+                        var within = data.within,
+                                withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
+                                outerHeight = data.within.height,
+                                collisionPosTop = position.top - data.collisionPosition.marginTop,
+                                overTop = withinOffset - collisionPosTop,
+                                overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
+                                newOverBottom;
+
+                        // element is taller than within
+                        if ( data.collisionHeight > outerHeight ) {
+                                // element is initially over the top of within
+                                if ( overTop > 0 && overBottom <= 0 ) {
+                                        newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
+                                        position.top += overTop - newOverBottom;
+                                // element is initially over bottom of within
+                                } else if ( overBottom > 0 && overTop <= 0 ) {
+                                        position.top = withinOffset;
+                                // element is initially over both top and bottom of within
+                                } else {
+                                        if ( overTop > overBottom ) {
+                                                position.top = withinOffset + outerHeight - data.collisionHeight;
+                                        } else {
+                                                position.top = withinOffset;
+                                        }
+                                }
+                        // too far up -> align with top
+                        } else if ( overTop > 0 ) {
+                                position.top += overTop;
+                        // too far down -> align with bottom edge
+                        } else if ( overBottom > 0 ) {
+                                position.top -= overBottom;
+                        // adjust based on position and margin
+                        } else {
+                                position.top = max( position.top - collisionPosTop, position.top );
+                        }
+                }
+        },
+        flip: {
+                left: function( position, data ) {
+                        var within = data.within,
+                                withinOffset = within.offset.left + within.scrollLeft,
+                                outerWidth = within.width,
+                                offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
+                                collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+                                overLeft = collisionPosLeft - offsetLeft,
+                                overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
+                                myOffset = data.my[ 0 ] === "left" ?
+                                        -data.elemWidth :
+                                        data.my[ 0 ] === "right" ?
+                                                data.elemWidth :
+                                                0,
+                                atOffset = data.at[ 0 ] === "left" ?
+                                        data.targetWidth :
+                                        data.at[ 0 ] === "right" ?
+                                                -data.targetWidth :
+                                                0,
+                                offset = -2 * data.offset[ 0 ],
+                                newOverRight,
+                                newOverLeft;
+
+                        if ( overLeft < 0 ) {
+                                newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
+                                if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
+                                        position.left += myOffset + atOffset + offset;
+                                }
+                        }
+                        else if ( overRight > 0 ) {
+                                newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
+                                if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
+                                        position.left += myOffset + atOffset + offset;
+                                }
+                        }
+                },
+                top: function( position, data ) {
+                        var within = data.within,
+                                withinOffset = within.offset.top + within.scrollTop,
+                                outerHeight = within.height,
+                                offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
+                                collisionPosTop = position.top - data.collisionPosition.marginTop,
+                                overTop = collisionPosTop - offsetTop,
+                                overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
+                                top = data.my[ 1 ] === "top",
+                                myOffset = top ?
+                                        -data.elemHeight :
+                                        data.my[ 1 ] === "bottom" ?
+                                                data.elemHeight :
+                                                0,
+                                atOffset = data.at[ 1 ] === "top" ?
+                                        data.targetHeight :
+                                        data.at[ 1 ] === "bottom" ?
+                                                -data.targetHeight :
+                                                0,
+                                offset = -2 * data.offset[ 1 ],
+                                newOverTop,
+                                newOverBottom;
+                        if ( overTop < 0 ) {
+                                newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
+                                if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
+                                        position.top += myOffset + atOffset + offset;
+                                }
+                        }
+                        else if ( overBottom > 0 ) {
+                                newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+                                if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
+                                        position.top += myOffset + atOffset + offset;
+                                }
+                        }
+                }
+        },
+        flipfit: {
+                left: function() {
+                        $.ui.position.flip.left.apply( this, arguments );
+                        $.ui.position.fit.left.apply( this, arguments );
+                },
+                top: function() {
+                        $.ui.position.flip.top.apply( this, arguments );
+                        $.ui.position.fit.top.apply( this, arguments );
+                }
+        }
+};
+
+// fraction support test
+(function () {
+        var testElement, testElementParent, testElementStyle, offsetLeft, i,
+                body = document.getElementsByTagName( "body" )[ 0 ],
+                div = document.createElement( "div" );
+
+        //Create a "fake body" for testing based on method used in jQuery.support
+        testElement = document.createElement( body ? "div" : "body" );
+        testElementStyle = {
+                visibility: "hidden",
+                width: 0,
+                height: 0,
+                border: 0,
+                margin: 0,
+                background: "none"
+        };
+        if ( body ) {
+                $.extend( testElementStyle, {
+                        position: "absolute",
+                        left: "-1000px",
+                        top: "-1000px"
+                });
+        }
+        for ( i in testElementStyle ) {
+                testElement.style[ i ] = testElementStyle[ i ];
+        }
+        testElement.appendChild( div );
+        testElementParent = body || document.documentElement;
+        testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+        div.style.cssText = "position: absolute; left: 10.7432222px;";
+
+        offsetLeft = $( div ).offset().left;
+        $.support.offsetFractions = offsetLeft > 10 && offsetLeft < 11;
+
+        testElement.innerHTML = "";
+        testElementParent.removeChild( testElement );
+})();
+
+}( jQuery ) );
+(function( $, undefined ) {
+
+$.widget( "ui.autocomplete", {
+        version: "1.10.4",
+        defaultElement: "<input>",
+        options: {
+                appendTo: null,
+                autoFocus: false,
+                delay: 300,
+                minLength: 1,
+                position: {
+                        my: "left top",
+                        at: "left bottom",
+                        collision: "none"
+                },
+                source: null,
+
+                // callbacks
+                change: null,
+                close: null,
+                focus: null,
+                open: null,
+                response: null,
+                search: null,
+                select: null
+        },
+
+        requestIndex: 0,
+        pending: 0,
+
+        _create: function() {
+                // Some browsers only repeat keydown events, not keypress events,
+                // so we use the suppressKeyPress flag to determine if we've already
+                // handled the keydown event. #7269
+                // Unfortunately the code for & in keypress is the same as the up arrow,
+                // so we use the suppressKeyPressRepeat flag to avoid handling keypress
+                // events when we know the keydown event was used to modify the
+                // search term. #7799
+                var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
+                        nodeName = this.element[0].nodeName.toLowerCase(),
+                        isTextarea = nodeName === "textarea",
+                        isInput = nodeName === "input";
+
+                this.isMultiLine =
+                        // Textareas are always multi-line
+                        isTextarea ? true :
+                        // Inputs are always single-line, even if inside a contentEditable element
+                        // IE also treats inputs as contentEditable
+                        isInput ? false :
+                        // All other element types are determined by whether or not they're contentEditable
+                        this.element.prop( "isContentEditable" );
+
+                this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
+                this.isNewMenu = true;
+
+                this.element
+                        .addClass( "ui-autocomplete-input" )
+                        .attr( "autocomplete", "off" );
+
+                this._on( this.element, {
+                        keydown: function( event ) {
+                                if ( this.element.prop( "readOnly" ) ) {
+                                        suppressKeyPress = true;
+                                        suppressInput = true;
+                                        suppressKeyPressRepeat = true;
+                                        return;
+                                }
+
+                                suppressKeyPress = false;
+                                suppressInput = false;
+                                suppressKeyPressRepeat = false;
+                                var keyCode = $.ui.keyCode;
+                                switch( event.keyCode ) {
+                                case keyCode.PAGE_UP:
+                                        suppressKeyPress = true;
+                                        this._move( "previousPage", event );
+                                        break;
+                                case keyCode.PAGE_DOWN:
+                                        suppressKeyPress = true;
+                                        this._move( "nextPage", event );
+                                        break;
+                                case keyCode.UP:
+                                        suppressKeyPress = true;
+                                        this._keyEvent( "previous", event );
+                                        break;
+                                case keyCode.DOWN:
+                                        suppressKeyPress = true;
+                                        this._keyEvent( "next", event );
+                                        break;
+                                case keyCode.ENTER:
+                                case keyCode.NUMPAD_ENTER:
+                                        // when menu is open and has focus
+                                        if ( this.menu.active ) {
+                                                // #6055 - Opera still allows the keypress to occur
+                                                // which causes forms to submit
+                                                suppressKeyPress = true;
+                                                event.preventDefault();
+                                                this.menu.select( event );
+                                        }
+                                        break;
+                                case keyCode.TAB:
+                                        if ( this.menu.active ) {
+                                                this.menu.select( event );
+                                        }
+                                        break;
+                                case keyCode.ESCAPE:
+                                        if ( this.menu.element.is( ":visible" ) ) {
+                                                this._value( this.term );
+                                                this.close( event );
+                                                // Different browsers have different default behavior for escape
+                                                // Single press can mean undo or clear
+                                                // Double press in IE means clear the whole form
+                                                event.preventDefault();
+                                        }
+                                        break;
+                                default:
+                                        suppressKeyPressRepeat = true;
+                                        // search timeout should be triggered before the input value is changed
+                                        this._searchTimeout( event );
+                                        break;
+                                }
+                        },
+                        keypress: function( event ) {
+                                if ( suppressKeyPress ) {
+                                        suppressKeyPress = false;
+                                        if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+                                                event.preventDefault();
+                                        }
+                                        return;
+                                }
+                                if ( suppressKeyPressRepeat ) {
+                                        return;
+                                }
+
+                                // replicate some key handlers to allow them to repeat in Firefox and Opera
+                                var keyCode = $.ui.keyCode;
+                                switch( event.keyCode ) {
+                                case keyCode.PAGE_UP:
+                                        this._move( "previousPage", event );
+                                        break;
+                                case keyCode.PAGE_DOWN:
+                                        this._move( "nextPage", event );
+                                        break;
+                                case keyCode.UP:
+                                        this._keyEvent( "previous", event );
+                                        break;
+                                case keyCode.DOWN:
+                                        this._keyEvent( "next", event );
+                                        break;
+                                }
+                        },
+                        input: function( event ) {
+                                if ( suppressInput ) {
+                                        suppressInput = false;
+                                        event.preventDefault();
+                                        return;
+                                }
+                                this._searchTimeout( event );
+                        },
+                        focus: function() {
+                                this.selectedItem = null;
+                                this.previous = this._value();
+                        },
+                        blur: function( event ) {
+                                if ( this.cancelBlur ) {
+                                        delete this.cancelBlur;
+                                        return;
+                                }
+
+                                clearTimeout( this.searching );
+                                this.close( event );
+                                this._change( event );
+                        }
+                });
+
+                this._initSource();
+                this.menu = $( "<ul>" )
+                        .addClass( "ui-autocomplete ui-front" )
+                        .appendTo( this._appendTo() )
+                        .menu({
+                                // disable ARIA support, the live region takes care of that
+                                role: null
+                        })
+                        .hide()
+                        .data( "ui-menu" );
+
+                this._on( this.menu.element, {
+                        mousedown: function( event ) {
+                                // prevent moving focus out of the text field
+                                event.preventDefault();
+
+                                // IE doesn't prevent moving focus even with event.preventDefault()
+                                // so we set a flag to know when we should ignore the blur event
+                                this.cancelBlur = true;
+                                this._delay(function() {
+                                        delete this.cancelBlur;
+                                });
+
+                                // clicking on the scrollbar causes focus to shift to the body
+                                // but we can't detect a mouseup or a click immediately afterward
+                                // so we have to track the next mousedown and close the menu if
+                                // the user clicks somewhere outside of the autocomplete
+                                var menuElement = this.menu.element[ 0 ];
+                                if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+                                        this._delay(function() {
+                                                var that = this;
+                                                this.document.one( "mousedown", function( event ) {
+                                                        if ( event.target !== that.element[ 0 ] &&
+                                                                        event.target !== menuElement &&
+                                                                        !$.contains( menuElement, event.target ) ) {
+                                                                that.close();
+                                                        }
+                                                });
+                                        });
+                                }
+                        },
+                        menufocus: function( event, ui ) {
+                                // support: Firefox
+                                // Prevent accidental activation of menu items in Firefox (#7024 #9118)
+                                if ( this.isNewMenu ) {
+                                        this.isNewMenu = false;
+                                        if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
+                                                this.menu.blur();
+
+                                                this.document.one( "mousemove", function() {
+                                                        $( event.target ).trigger( event.originalEvent );
+                                                });
+
+                                                return;
+                                        }
+                                }
+
+                                var item = ui.item.data( "ui-autocomplete-item" );
+                                if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+                                        // use value to match what will end up in the input, if it was a key event
+                                        if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
+                                                this._value( item.value );
+                                        }
+                                } else {
+                                        // Normally the input is populated with the item's value as the
+                                        // menu is navigated, causing screen readers to notice a change and
+                                        // announce the item. Since the focus event was canceled, this doesn't
+                                        // happen, so we update the live region so that screen readers can
+                                        // still notice the change and announce it.
+                                        this.liveRegion.text( item.value );
+                                }
+                        },
+                        menuselect: function( event, ui ) {
+                                var item = ui.item.data( "ui-autocomplete-item" ),
+                                        previous = this.previous;
+
+                                // only trigger when focus was lost (click on menu)
+                                if ( this.element[0] !== this.document[0].activeElement ) {
+                                        this.element.focus();
+                                        this.previous = previous;
+                                        // #6109 - IE triggers two focus events and the second
+                                        // is asynchronous, so we need to reset the previous
+                                        // term synchronously and asynchronously :-(
+                                        this._delay(function() {
+                                                this.previous = previous;
+                                                this.selectedItem = item;
+                                        });
+                                }
+
+                                if ( false !== this._trigger( "select", event, { item: item } ) ) {
+                                        this._value( item.value );
+                                }
+                                // reset the term after the select event
+                                // this allows custom select handling to work properly
+                                this.term = this._value();
+
+                                this.close( event );
+                                this.selectedItem = item;
+                        }
+                });
+
+                this.liveRegion = $( "<span>", {
+                                role: "status",
+                                "aria-live": "polite"
+                        })
+                        .addClass( "ui-helper-hidden-accessible" )
+                        .insertBefore( this.element );
+
+                // turning off autocomplete prevents the browser from remembering the
+                // value when navigating through history, so we re-enable autocomplete
+                // if the page is unloaded before the widget is destroyed. #7790
+                this._on( this.window, {
+                        beforeunload: function() {
+                                this.element.removeAttr( "autocomplete" );
+                        }
+                });
+        },
+
+        _destroy: function() {
+                clearTimeout( this.searching );
+                this.element
+                        .removeClass( "ui-autocomplete-input" )
+                        .removeAttr( "autocomplete" );
+                this.menu.element.remove();
+                this.liveRegion.remove();
+        },
+
+        _setOption: function( key, value ) {
+                this._super( key, value );
+                if ( key === "source" ) {
+                        this._initSource();
+                }
+                if ( key === "appendTo" ) {
+                        this.menu.element.appendTo( this._appendTo() );
+                }
+                if ( key === "disabled" && value && this.xhr ) {
+                        this.xhr.abort();
+                }
+        },
+
+        _appendTo: function() {
+                var element = this.options.appendTo;
+
+                if ( element ) {
+                        element = element.jquery || element.nodeType ?
+                                $( element ) :
+                                this.document.find( element ).eq( 0 );
+                }
+
+                if ( !element ) {
+                        element = this.element.closest( ".ui-front" );
+                }
+
+                if ( !element.length ) {
+                        element = this.document[0].body;
+                }
+
+                return element;
+        },
+
+        _initSource: function() {
+                var array, url,
+                        that = this;
+                if ( $.isArray(this.options.source) ) {
+                        array = this.options.source;
+                        this.source = function( request, response ) {
+                                response( $.ui.autocomplete.filter( array, request.term ) );
+                        };
+                } else if ( typeof this.options.source === "string" ) {
+                        url = this.options.source;
+                        this.source = function( request, response ) {
+                                if ( that.xhr ) {
+                                        that.xhr.abort();
+                                }
+                                that.xhr = $.ajax({
+                                        url: url,
+                                        data: request,
+                                        dataType: "json",
+                                        success: function( data ) {
+                                                response( data );
+                                        },
+                                        error: function() {
+                                                response( [] );
+                                        }
+                                });
+                        };
+                } else {
+                        this.source = this.options.source;
+                }
+        },
+
+        _searchTimeout: function( event ) {
+                clearTimeout( this.searching );
+                this.searching = this._delay(function() {
+                        // only search if the value has changed
+                        if ( this.term !== this._value() ) {
+                                this.selectedItem = null;
+                                this.search( null, event );
+                        }
+                }, this.options.delay );
+        },
+
+        search: function( value, event ) {
+                value = value != null ? value : this._value();
+
+                // always save the actual value, not the one passed as an argument
+                this.term = this._value();
+
+                if ( value.length < this.options.minLength ) {
+                        return this.close( event );
+                }
+
+                if ( this._trigger( "search", event ) === false ) {
+                        return;
+                }
+
+                return this._search( value );
+        },
+
+        _search: function( value ) {
+                this.pending++;
+                this.element.addClass( "ui-autocomplete-loading" );
+                this.cancelSearch = false;
+
+                this.source( { term: value }, this._response() );
+        },
+
+        _response: function() {
+                var index = ++this.requestIndex;
+
+                return $.proxy(function( content ) {
+                        if ( index === this.requestIndex ) {
+                                this.__response( content );
+                        }
+
+                        this.pending--;
+                        if ( !this.pending ) {
+                                this.element.removeClass( "ui-autocomplete-loading" );
+                        }
+                }, this );
+        },
+
+        __response: function( content ) {
+                if ( content ) {
+                        content = this._normalize( content );
+                }
+                this._trigger( "response", null, { content: content } );
+                if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
+                        this._suggest( content );
+                        this._trigger( "open" );
+                } else {
+                        // use ._close() instead of .close() so we don't cancel future searches
+                        this._close();
+                }
+        },
+
+        close: function( event ) {
+                this.cancelSearch = true;
+                this._close( event );
+        },
+
+        _close: function( event ) {
+                if ( this.menu.element.is( ":visible" ) ) {
+                        this.menu.element.hide();
+                        this.menu.blur();
+                        this.isNewMenu = true;
+                        this._trigger( "close", event );
+                }
+        },
+
+        _change: function( event ) {
+                if ( this.previous !== this._value() ) {
+                        this._trigger( "change", event, { item: this.selectedItem } );
+                }
+        },
+
+        _normalize: function( items ) {
+                // assume all items have the right format when the first item is complete
+                if ( items.length && items[0].label && items[0].value ) {
+                        return items;
+                }
+                return $.map( items, function( item ) {
+                        if ( typeof item === "string" ) {
+                                return {
+                                        label: item,
+                                        value: item
+                                };
+                        }
+                        return $.extend({
+                                label: item.label || item.value,
+                                value: item.value || item.label
+                        }, item );
+                });
+        },
+
+        _suggest: function( items ) {
+                var ul = this.menu.element.empty();
+                this._renderMenu( ul, items );
+                this.isNewMenu = true;
+                this.menu.refresh();
+
+                // size and position menu
+                ul.show();
+                this._resizeMenu();
+                ul.position( $.extend({
+                        of: this.element
+                }, this.options.position ));
+
+                if ( this.options.autoFocus ) {
+                        this.menu.next();
+                }
+        },
+
+        _resizeMenu: function() {
+                var ul = this.menu.element;
+                ul.outerWidth( Math.max(
+                        // Firefox wraps long text (possibly a rounding bug)
+                        // so we add 1px to avoid the wrapping (#7513)
+                        ul.width( "" ).outerWidth() + 1,
+                        this.element.outerWidth()
+                ) );
+        },
+
+        _renderMenu: function( ul, items ) {
+                var that = this;
+                $.each( items, function( index, item ) {
+                        that._renderItemData( ul, item );
+                });
+        },
+
+        _renderItemData: function( ul, item ) {
+                return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
+        },
+
+        _renderItem: function( ul, item ) {
+                return $( "<li>" )
+                        .append( $( "<a>" ).text( item.label ) )
+                        .appendTo( ul );
+        },
+
+        _move: function( direction, event ) {
+                if ( !this.menu.element.is( ":visible" ) ) {
+                        this.search( null, event );
+                        return;
+                }
+                if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
+                                this.menu.isLastItem() && /^next/.test( direction ) ) {
+                        this._value( this.term );
+                        this.menu.blur();
+                        return;
+                }
+                this.menu[ direction ]( event );
+        },
+
+        widget: function() {
+                return this.menu.element;
+        },
+
+        _value: function() {
+                return this.valueMethod.apply( this.element, arguments );
+        },
+
+        _keyEvent: function( keyEvent, event ) {
+                if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+                        this._move( keyEvent, event );
+
+                        // prevents moving cursor to beginning/end of the text field in some browsers
+                        event.preventDefault();
+                }
+        }
+});
+
+$.extend( $.ui.autocomplete, {
+        escapeRegex: function( value ) {
+                return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
+        },
+        filter: function(array, term) {
+                var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+                return $.grep( array, function(value) {
+                        return matcher.test( value.label || value.value || value );
+                });
+        }
+});
+
+
+// live region extension, adding a `messages` option
+// NOTE: This is an experimental API. We are still investigating
+// a full solution for string manipulation and internationalization.
+$.widget( "ui.autocomplete", $.ui.autocomplete, {
+        options: {
+                messages: {
+                        noResults: "No search results.",
+                        results: function( amount ) {
+                                return amount + ( amount > 1 ? " results are" : " result is" ) +
+                                        " available, use up and down arrow keys to navigate.";
+                        }
+                }
+        },
+
+        __response: function( content ) {
+                var message;
+                this._superApply( arguments );
+                if ( this.options.disabled || this.cancelSearch ) {
+                        return;
+                }
+                if ( content && content.length ) {
+                        message = this.options.messages.results( content.length );
+                } else {
+                        message = this.options.messages.noResults;
+                }
+                this.liveRegion.text( message );
+        }
+});
+
+}( jQuery ));
+(function( $, undefined ) {
+
+$.widget( "ui.menu", {
+        version: "1.10.4",
+        defaultElement: "<ul>",
+        delay: 300,
+        options: {
+                icons: {
+                        submenu: "ui-icon-carat-1-e"
+                },
+                menus: "ul",
+                position: {
+                        my: "left top",
+                        at: "right top"
+                },
+                role: "menu",
+
+                // callbacks
+                blur: null,
+                focus: null,
+                select: null
+        },
+
+        _create: function() {
+                this.activeMenu = this.element;
+                // flag used to prevent firing of the click handler
+                // as the event bubbles up through nested menus
+                this.mouseHandled = false;
+                this.element
+                        .uniqueId()
+                        .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+                        .toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
+                        .attr({
+                                role: this.options.role,
+                                tabIndex: 0
+                        })
+                        // need to catch all clicks on disabled menu
+                        // not possible through _on
+                        .bind( "click" + this.eventNamespace, $.proxy(function( event ) {
+                                if ( this.options.disabled ) {
+                                        event.preventDefault();
+                                }
+                        }, this ));
+
+                if ( this.options.disabled ) {
+                        this.element
+                                .addClass( "ui-state-disabled" )
+                                .attr( "aria-disabled", "true" );
+                }
+
+                this._on({
+                        // Prevent focus from sticking to links inside menu after clicking
+                        // them (focus should always stay on UL during navigation).
+                        "mousedown .ui-menu-item > a": function( event ) {
+                                event.preventDefault();
+                        },
+                        "click .ui-state-disabled > a": function( event ) {
+                                event.preventDefault();
+                        },
+                        "click .ui-menu-item:has(a)": function( event ) {
+                                var target = $( event.target ).closest( ".ui-menu-item" );
+                                if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
+                                        this.select( event );
+
+                                        // Only set the mouseHandled flag if the event will bubble, see #9469.
+                                        if ( !event.isPropagationStopped() ) {
+                                                this.mouseHandled = true;
+                                        }
+
+                                        // Open submenu on click
+                                        if ( target.has( ".ui-menu" ).length ) {
+                                                this.expand( event );
+                                        } else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
+
+                                                // Redirect focus to the menu
+                                                this.element.trigger( "focus", [ true ] );
+
+                                                // If the active item is on the top level, let it stay active.
+                                                // Otherwise, blur the active item since it is no longer visible.
+                                                if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
+                                                        clearTimeout( this.timer );
+                                                }
+                                        }
+                                }
+                        },
+                        "mouseenter .ui-menu-item": function( event ) {
+                                var target = $( event.currentTarget );
+                                // Remove ui-state-active class from siblings of the newly focused menu item
+                                // to avoid a jump caused by adjacent elements both having a class with a border
+                                target.siblings().children( ".ui-state-active" ).removeClass( "ui-state-active" );
+                                this.focus( event, target );
+                        },
+                        mouseleave: "collapseAll",
+                        "mouseleave .ui-menu": "collapseAll",
+                        focus: function( event, keepActiveItem ) {
+                                // If there's already an active item, keep it active
+                                // If not, activate the first item
+                                var item = this.active || this.element.children( ".ui-menu-item" ).eq( 0 );
+
+                                if ( !keepActiveItem ) {
+                                        this.focus( event, item );
+                                }
+                        },
+                        blur: function( event ) {
+                                this._delay(function() {
+                                        if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
+                                                this.collapseAll( event );
+                                        }
+                                });
+                        },
+                        keydown: "_keydown"
+                });
+
+                this.refresh();
+
+                // Clicks outside of a menu collapse any open menus
+                this._on( this.document, {
+                        click: function( event ) {
+                                if ( !$( event.target ).closest( ".ui-menu" ).length ) {
+                                        this.collapseAll( event );
+                                }
+
+                                // Reset the mouseHandled flag
+                                this.mouseHandled = false;
+                        }
+                });
+        },
+
+        _destroy: function() {
+                // Destroy (sub)menus
+                this.element
+                        .removeAttr( "aria-activedescendant" )
+                        .find( ".ui-menu" ).addBack()
+                                .removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons" )
+                                .removeAttr( "role" )
+                                .removeAttr( "tabIndex" )
+                                .removeAttr( "aria-labelledby" )
+                                .removeAttr( "aria-expanded" )
+                                .removeAttr( "aria-hidden" )
+                                .removeAttr( "aria-disabled" )
+                                .removeUniqueId()
+                                .show();
+
+                // Destroy menu items
+                this.element.find( ".ui-menu-item" )
+                        .removeClass( "ui-menu-item" )
+                        .removeAttr( "role" )
+                        .removeAttr( "aria-disabled" )
+                        .children( "a" )
+                                .removeUniqueId()
+                                .removeClass( "ui-corner-all ui-state-hover" )
+                                .removeAttr( "tabIndex" )
+                                .removeAttr( "role" )
+                                .removeAttr( "aria-haspopup" )
+                                .children().each( function() {
+                                        var elem = $( this );
+                                        if ( elem.data( "ui-menu-submenu-carat" ) ) {
+                                                elem.remove();
+                                        }
+                                });
+
+                // Destroy menu dividers
+                this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
+        },
+
+        _keydown: function( event ) {
+                var match, prev, character, skip, regex,
+                        preventDefault = true;
+
+                function escape( value ) {
+                        return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+                }
+
+                switch ( event.keyCode ) {
+                case $.ui.keyCode.PAGE_UP:
+                        this.previousPage( event );
+                        break;
+                case $.ui.keyCode.PAGE_DOWN:
+                        this.nextPage( event );
+                        break;
+                case $.ui.keyCode.HOME:
+                        this._move( "first", "first", event );
+                        break;
+                case $.ui.keyCode.END:
+                        this._move( "last", "last", event );
+                        break;
+                case $.ui.keyCode.UP:
+                        this.previous( event );
+                        break;
+                case $.ui.keyCode.DOWN:
+                        this.next( event );
+                        break;
+                case $.ui.keyCode.LEFT:
+                        this.collapse( event );
+                        break;
+                case $.ui.keyCode.RIGHT:
+                        if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+                                this.expand( event );
+                        }
+                        break;
+                case $.ui.keyCode.ENTER:
+                case $.ui.keyCode.SPACE:
+                        this._activate( event );
+                        break;
+                case $.ui.keyCode.ESCAPE:
+                        this.collapse( event );
+                        break;
+                default:
+                        preventDefault = false;
+                        prev = this.previousFilter || "";
+                        character = String.fromCharCode( event.keyCode );
+                        skip = false;
+
+                        clearTimeout( this.filterTimer );
+
+                        if ( character === prev ) {
+                                skip = true;
+                        } else {
+                                character = prev + character;
+                        }
+
+                        regex = new RegExp( "^" + escape( character ), "i" );
+                        match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
+                                return regex.test( $( this ).children( "a" ).text() );
+                        });
+                        match = skip && match.index( this.active.next() ) !== -1 ?
+                                this.active.nextAll( ".ui-menu-item" ) :
+                                match;
+
+                        // If no matches on the current filter, reset to the last character pressed
+                        // to move down the menu to the first item that starts with that character
+                        if ( !match.length ) {
+                                character = String.fromCharCode( event.keyCode );
+                                regex = new RegExp( "^" + escape( character ), "i" );
+                                match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
+                                        return regex.test( $( this ).children( "a" ).text() );
+                                });
+                        }
+
+                        if ( match.length ) {
+                                this.focus( event, match );
+                                if ( match.length > 1 ) {
+                                        this.previousFilter = character;
+                                        this.filterTimer = this._delay(function() {
+                                                delete this.previousFilter;
+                                        }, 1000 );
+                                } else {
+                                        delete this.previousFilter;
+                                }
+                        } else {
+                                delete this.previousFilter;
+                        }
+                }
+
+                if ( preventDefault ) {
+                        event.preventDefault();
+                }
+        },
+
+        _activate: function( event ) {
+                if ( !this.active.is( ".ui-state-disabled" ) ) {
+                        if ( this.active.children( "a[aria-haspopup='true']" ).length ) {
+                                this.expand( event );
+                        } else {
+                                this.select( event );
+                        }
+                }
+        },
+
+        refresh: function() {
+                var menus,
+                        icon = this.options.icons.submenu,
+                        submenus = this.element.find( this.options.menus );
+
+                this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );
+
+                // Initialize nested menus
+                submenus.filter( ":not(.ui-menu)" )
+                        .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+                        .hide()
+                        .attr({
+                                role: this.options.role,
+                                "aria-hidden": "true",
+                                "aria-expanded": "false"
+                        })
+                        .each(function() {
+                                var menu = $( this ),
+                                        item = menu.prev( "a" ),
+                                        submenuCarat = $( "<span>" )
+                                                .addClass( "ui-menu-icon ui-icon " + icon )
+                                                .data( "ui-menu-submenu-carat", true );
+
+                                item
+                                        .attr( "aria-haspopup", "true" )
+                                        .prepend( submenuCarat );
+                                menu.attr( "aria-labelledby", item.attr( "id" ) );
+                        });
+
+                menus = submenus.add( this.element );
+
+                // Don't refresh list items that are already adapted
+                menus.children( ":not(.ui-menu-item):has(a)" )
+                        .addClass( "ui-menu-item" )
+                        .attr( "role", "presentation" )
+                        .children( "a" )
+                                .uniqueId()
+                                .addClass( "ui-corner-all" )
+                                .attr({
+                                        tabIndex: -1,
+                                        role: this._itemRole()
+                                });
+
+                // Initialize unlinked menu-items containing spaces and/or dashes only as dividers
+                menus.children( ":not(.ui-menu-item)" ).each(function() {
+                        var item = $( this );
+                        // hyphen, em dash, en dash
+                        if ( !/[^\-\u2014\u2013\s]/.test( item.text() ) ) {
+                                item.addClass( "ui-widget-content ui-menu-divider" );
+                        }
+                });
+
+                // Add aria-disabled attribute to any disabled menu item
+                menus.children( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
+
+                // If the active item has been removed, blur the menu
+                if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+                        this.blur();
+                }
+        },
+
+        _itemRole: function() {
+                return {
+                        menu: "menuitem",
+                        listbox: "option"
+                }[ this.options.role ];
+        },
+
+        _setOption: function( key, value ) {
+                if ( key === "icons" ) {
+                        this.element.find( ".ui-menu-icon" )
+                                .removeClass( this.options.icons.submenu )
+                                .addClass( value.submenu );
+                }
+                this._super( key, value );
+        },
+
+        focus: function( event, item ) {
+                var nested, focused;
+                this.blur( event, event && event.type === "focus" );
+
+                this._scrollIntoView( item );
+
+                this.active = item.first();
+                focused = this.active.children( "a" ).addClass( "ui-state-focus" );
+                // Only update aria-activedescendant if there's a role
+                // otherwise we assume focus is managed elsewhere
+                if ( this.options.role ) {
+                        this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
+                }
+
+                // Highlight active parent menu item, if any
+                this.active
+                        .parent()
+                        .closest( ".ui-menu-item" )
+                        .children( "a:first" )
+                        .addClass( "ui-state-active" );
+
+                if ( event && event.type === "keydown" ) {
+                        this._close();
+                } else {
+                        this.timer = this._delay(function() {
+                                this._close();
+                        }, this.delay );
+                }
+
+                nested = item.children( ".ui-menu" );
+                if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
+                        this._startOpening(nested);
+                }
+                this.activeMenu = item.parent();
+
+                this._trigger( "focus", event, { item: item } );
+        },
+
+        _scrollIntoView: function( item ) {
+                var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+                if ( this._hasScroll() ) {
+                        borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
+                        paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
+                        offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+                        scroll = this.activeMenu.scrollTop();
+                        elementHeight = this.activeMenu.height();
+                        itemHeight = item.height();
+
+                        if ( offset < 0 ) {
+                                this.activeMenu.scrollTop( scroll + offset );
+                        } else if ( offset + itemHeight > elementHeight ) {
+                                this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+                        }
+                }
+        },
+
+        blur: function( event, fromFocus ) {
+                if ( !fromFocus ) {
+                        clearTimeout( this.timer );
+                }
+
+                if ( !this.active ) {
+                        return;
+                }
+
+                this.active.children( "a" ).removeClass( "ui-state-focus" );
+                this.active = null;
+
+                this._trigger( "blur", event, { item: this.active } );
+        },
+
+        _startOpening: function( submenu ) {
+                clearTimeout( this.timer );
+
+                // Don't open if already open fixes a Firefox bug that caused a .5 pixel
+                // shift in the submenu position when mousing over the carat icon
+                if ( submenu.attr( "aria-hidden" ) !== "true" ) {
+                        return;
+                }
+
+                this.timer = this._delay(function() {
+                        this._close();
+                        this._open( submenu );
+                }, this.delay );
+        },
+
+        _open: function( submenu ) {
+                var position = $.extend({
+                        of: this.active
+                }, this.options.position );
+
+                clearTimeout( this.timer );
+                this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
+                        .hide()
+                        .attr( "aria-hidden", "true" );
+
+                submenu
+                        .show()
+                        .removeAttr( "aria-hidden" )
+                        .attr( "aria-expanded", "true" )
+                        .position( position );
+        },
+
+        collapseAll: function( event, all ) {
+                clearTimeout( this.timer );
+                this.timer = this._delay(function() {
+                        // If we were passed an event, look for the submenu that contains the event
+                        var currentMenu = all ? this.element :
+                                $( event && event.target ).closest( this.element.find( ".ui-menu" ) );
+
+                        // If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
+                        if ( !currentMenu.length ) {
+                                currentMenu = this.element;
+                        }
+
+                        this._close( currentMenu );
+
+                        this.blur( event );
+                        this.activeMenu = currentMenu;
+                }, this.delay );
+        },
+
+        // With no arguments, closes the currently active menu - if nothing is active
+        // it closes all menus.  If passed an argument, it will search for menus BELOW
+        _close: function( startMenu ) {
+                if ( !startMenu ) {
+                        startMenu = this.active ? this.active.parent() : this.element;
+                }
+
+                startMenu
+                        .find( ".ui-menu" )
+                                .hide()
+                                .attr( "aria-hidden", "true" )
+                                .attr( "aria-expanded", "false" )
+                        .end()
+                        .find( "a.ui-state-active" )
+                                .removeClass( "ui-state-active" );
+        },
+
+        collapse: function( event ) {
+                var newItem = this.active &&
+                        this.active.parent().closest( ".ui-menu-item", this.element );
+                if ( newItem && newItem.length ) {
+                        this._close();
+                        this.focus( event, newItem );
+                }
+        },
+
+        expand: function( event ) {
+                var newItem = this.active &&
+                        this.active
+                                .children( ".ui-menu " )
+                                .children( ".ui-menu-item" )
+                                .first();
+
+                if ( newItem && newItem.length ) {
+                        this._open( newItem.parent() );
+
+                        // Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+                        this._delay(function() {
+                                this.focus( event, newItem );
+                        });
+                }
+        },
+
+        next: function( event ) {
+                this._move( "next", "first", event );
+        },
+
+        previous: function( event ) {
+                this._move( "prev", "last", event );
+        },
+
+        isFirstItem: function() {
+                return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
+        },
+
+        isLastItem: function() {
+                return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+        },
+
+        _move: function( direction, filter, event ) {
+                var next;
+                if ( this.active ) {
+                        if ( direction === "first" || direction === "last" ) {
+                                next = this.active
+                                        [ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
+                                        .eq( -1 );
+                        } else {
+                                next = this.active
+                                        [ direction + "All" ]( ".ui-menu-item" )
+                                        .eq( 0 );
+                        }
+                }
+                if ( !next || !next.length || !this.active ) {
+                        next = this.activeMenu.children( ".ui-menu-item" )[ filter ]();
+                }
+
+                this.focus( event, next );
+        },
+
+        nextPage: function( event ) {
+                var item, base, height;
+
+                if ( !this.active ) {
+                        this.next( event );
+                        return;
+                }
+                if ( this.isLastItem() ) {
+                        return;
+                }
+                if ( this._hasScroll() ) {
+                        base = this.active.offset().top;
+                        height = this.element.height();
+                        this.active.nextAll( ".ui-menu-item" ).each(function() {
+                                item = $( this );
+                                return item.offset().top - base - height < 0;
+                        });
+
+                        this.focus( event, item );
+                } else {
+                        this.focus( event, this.activeMenu.children( ".ui-menu-item" )
+                                [ !this.active ? "first" : "last" ]() );
+                }
+        },
+
+        previousPage: function( event ) {
+                var item, base, height;
+                if ( !this.active ) {
+                        this.next( event );
+                        return;
+                }
+                if ( this.isFirstItem() ) {
+                        return;
+                }
+                if ( this._hasScroll() ) {
+                        base = this.active.offset().top;
+                        height = this.element.height();
+                        this.active.prevAll( ".ui-menu-item" ).each(function() {
+                                item = $( this );
+                                return item.offset().top - base + height > 0;
+                        });
+
+                        this.focus( event, item );
+                } else {
+                        this.focus( event, this.activeMenu.children( ".ui-menu-item" ).first() );
+                }
+        },
+
+        _hasScroll: function() {
+                return this.element.outerHeight() < this.element.prop( "scrollHeight" );
+        },
+
+        select: function( event ) {
+                // TODO: It should never be possible to not have an active item at this
+                // point, but the tests don't trigger mouseenter before click.
+                this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+                var ui = { item: this.active };
+                if ( !this.active.has( ".ui-menu" ).length ) {
+                        this.collapseAll( event, true );
+                }
+                this._trigger( "select", event, ui );
+        }
+});
+
+}( jQuery ));
diff --git a/themes/default/js/jquery-ui-1.10.4.custom.min.js b/themes/default/js/jquery-ui-1.10.4.custom.min.js
new file mode 100644
index 00000000..31635026
--- /dev/null
+++ b/themes/default/js/jquery-ui-1.10.4.custom.min.js
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.10.4 - 2014-03-08
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.position.js, jquery.ui.autocomplete.js, jquery.ui.menu.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function(e,t){function i(t,i){var s,a,o,r=t.nodeName.toLowerCase();return"area"===r?(s=t.parentNode,a=s.name,t.href&&a&&"map"===s.nodeName.toLowerCase()?(o=e("img[usemap=#"+a+"]")[0],!!o&&n(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:"a"===r?t.href||i:i)&&n(t)}function n(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}var s=0,a=/^ui-id-\d+$/;e.ui=e.ui||{},e.extend(e.ui,{version:"1.10.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({focus:function(t){return function(i,n){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),n&&n.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),scrollParent:function(){var t;return t=e.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,"position"))&&/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!t.length?e(document):t},zIndex:function(i){if(i!==t)return this.css("zIndex",i);if(this.length)for(var n,s,a=e(this[0]);a.length&&a[0]!==document;){if(n=a.css("position"),("absolute"===n||"relative"===n||"fixed"===n)&&(s=parseInt(a.css("zIndex"),10),!isNaN(s)&&0!==s))return s;a=a.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++s)})},removeUniqueId:function(){return this.each(function(){a.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,n){return!!e.data(t,n[3])},focusable:function(t){return i(t,!isNaN(e.attr(t,"tabindex")))},tabbable:function(t){var n=e.attr(t,"tabindex"),s=isNaN(n);return(s||n>=0)&&i(t,!s)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(i,n){function s(t,i,n,s){return e.each(a,function(){i-=parseFloat(e.css(t,"padding"+this))||0,n&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),s&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var a="Width"===n?["Left","Right"]:["Top","Bottom"],o=n.toLowerCase(),r={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+n]=function(i){return i===t?r["inner"+n].call(this):this.each(function(){e(this).css(o,s(this,i)+"px")})},e.fn["outer"+n]=function(t,i){return"number"!=typeof t?r["outer"+n].call(this,t):this.each(function(){e(this).css(o,s(this,t,!0,i)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.support.selectstart="onselectstart"in document.createElement("div"),e.fn.extend({disableSelection:function(){return this.bind((e.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),e.extend(e.ui,{plugin:{add:function(t,i,n){var s,a=e.ui[t].prototype;for(s in n)a.plugins[s]=a.plugins[s]||[],a.plugins[s].push([i,n[s]])},call:function(e,t,i){var n,s=e.plugins[t];if(s&&e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType)for(n=0;s.length>n;n++)e.options[s[n][0]]&&s[n][1].apply(e.element,i)}},hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var n=i&&"left"===i?"scrollLeft":"scrollTop",s=!1;return t[n]>0?!0:(t[n]=1,s=t[n]>0,t[n]=0,s)}})})(jQuery);(function(t,e){var i=0,s=Array.prototype.slice,n=t.cleanData;t.cleanData=function(e){for(var i,s=0;null!=(i=e[s]);s++)try{t(i).triggerHandler("remove")}catch(o){}n(e)},t.widget=function(i,s,n){var o,a,r,h,l={},c=i.split(".")[0];i=i.split(".")[1],o=c+"-"+i,n||(n=s,s=t.Widget),t.expr[":"][o.toLowerCase()]=function(e){return!!t.data(e,o)},t[c]=t[c]||{},a=t[c][i],r=t[c][i]=function(t,i){return this._createWidget?(arguments.length&&this._createWidget(t,i),e):new r(t,i)},t.extend(r,a,{version:n.version,_proto:t.extend({},n),_childConstructors:[]}),h=new s,h.options=t.widget.extend({},h.options),t.each(n,function(i,n){return t.isFunction(n)?(l[i]=function(){var t=function(){return s.prototype[i].apply(this,arguments)},e=function(t){return s.prototype[i].apply(this,t)};return function(){var i,s=this._super,o=this._superApply;return this._super=t,this._superApply=e,i=n.apply(this,arguments),this._super=s,this._superApply=o,i}}(),e):(l[i]=n,e)}),r.prototype=t.widget.extend(h,{widgetEventPrefix:a?h.widgetEventPrefix||i:i},l,{constructor:r,namespace:c,widgetName:i,widgetFullName:o}),a?(t.each(a._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,r,i._proto)}),delete a._childConstructors):s._childConstructors.push(r),t.widget.bridge(i,r)},t.widget.extend=function(i){for(var n,o,a=s.call(arguments,1),r=0,h=a.length;h>r;r++)for(n in a[r])o=a[r][n],a[r].hasOwnProperty(n)&&o!==e&&(i[n]=t.isPlainObject(o)?t.isPlainObject(i[n])?t.widget.extend({},i[n],o):t.widget.extend({},o):o);return i},t.widget.bridge=function(i,n){var o=n.prototype.widgetFullName||i;t.fn[i]=function(a){var r="string"==typeof a,h=s.call(arguments,1),l=this;return a=!r&&h.length?t.widget.extend.apply(null,[a].concat(h)):a,r?this.each(function(){var s,n=t.data(this,o);return n?t.isFunction(n[a])&&"_"!==a.charAt(0)?(s=n[a].apply(n,h),s!==n&&s!==e?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):e):t.error("no such method '"+a+"' for "+i+" widget instance"):t.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+a+"'")}):this.each(function(){var e=t.data(this,o);e?e.option(a||{})._init():t.data(this,o,new n(a,this))}),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this.bindings=t(),this.hoverable=t(),this.focusable=t(),s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(i,s){var n,o,a,r=i;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof i)if(r={},n=i.split("."),i=n.shift(),n.length){for(o=r[i]=t.widget.extend({},this.options[i]),a=0;n.length-1>a;a++)o[n[a]]=o[n[a]]||{},o=o[n[a]];if(i=n.pop(),1===arguments.length)return o[i]===e?null:o[i];o[i]=s}else{if(1===arguments.length)return this.options[i]===e?null:this.options[i];r[i]=s}return this._setOptions(r),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!e).attr("aria-disabled",e),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var o,a=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=o=t(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,o=this.widget()),t.each(n,function(n,r){function h(){return i||a.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof r?a[r]:r).apply(a,arguments):e}"string"!=typeof r&&(h.guid=r.guid=r.guid||h.guid||t.guid++);var l=n.match(/^(\w+)\s*(.*)$/),c=l[1]+a.eventNamespace,u=l[2];u?o.delegate(u,c,h):s.bind(c,h)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(e).undelegate(e)},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}})})(jQuery);(function(t,e){function i(t,e,i){return[parseFloat(t[0])*(p.test(t[0])?e/100:1),parseFloat(t[1])*(p.test(t[1])?i/100:1)]}function s(e,i){return parseInt(t.css(e,i),10)||0}function n(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}t.ui=t.ui||{};var a,o=Math.max,r=Math.abs,l=Math.round,h=/left|center|right/,c=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,d=/^\w+/,p=/%$/,f=t.fn.position;t.position={scrollbarWidth:function(){if(a!==e)return a;var i,s,n=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=n.children()[0];return t("body").append(n),i=o.offsetWidth,n.css("overflow","scroll"),s=o.offsetWidth,i===s&&(s=n[0].clientWidth),n.remove(),a=i-s},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,a="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:a?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s?i.width():i.outerWidth(),height:s?i.height():i.outerHeight()}}},t.fn.position=function(e){if(!e||!e.of)return f.apply(this,arguments);e=t.extend({},e);var a,p,g,m,v,_,b=t(e.of),y=t.position.getWithinInfo(e.within),k=t.position.getScrollInfo(y),w=(e.collision||"flip").split(" "),D={};return _=n(b),b[0].preventDefault&&(e.at="left top"),p=_.width,g=_.height,m=_.offset,v=t.extend({},m),t.each(["my","at"],function(){var t,i,s=(e[this]||"").split(" ");1===s.length&&(s=h.test(s[0])?s.concat(["center"]):c.test(s[0])?["center"].concat(s):["center","center"]),s[0]=h.test(s[0])?s[0]:"center",s[1]=c.test(s[1])?s[1]:"center",t=u.exec(s[0]),i=u.exec(s[1]),D[this]=[t?t[0]:0,i?i[0]:0],e[this]=[d.exec(s[0])[0],d.exec(s[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===e.at[0]?v.left+=p:"center"===e.at[0]&&(v.left+=p/2),"bottom"===e.at[1]?v.top+=g:"center"===e.at[1]&&(v.top+=g/2),a=i(D.at,p,g),v.left+=a[0],v.top+=a[1],this.each(function(){var n,h,c=t(this),u=c.outerWidth(),d=c.outerHeight(),f=s(this,"marginLeft"),_=s(this,"marginTop"),x=u+f+s(this,"marginRight")+k.width,C=d+_+s(this,"marginBottom")+k.height,M=t.extend({},v),T=i(D.my,c.outerWidth(),c.outerHeight());"right"===e.my[0]?M.left-=u:"center"===e.my[0]&&(M.left-=u/2),"bottom"===e.my[1]?M.top-=d:"center"===e.my[1]&&(M.top-=d/2),M.left+=T[0],M.top+=T[1],t.support.offsetFractions||(M.left=l(M.left),M.top=l(M.top)),n={marginLeft:f,marginTop:_},t.each(["left","top"],function(i,s){t.ui.position[w[i]]&&t.ui.position[w[i]][s](M,{targetWidth:p,targetHeight:g,elemWidth:u,elemHeight:d,collisionPosition:n,collisionWidth:x,collisionHeight:C,offset:[a[0]+T[0],a[1]+T[1]],my:e.my,at:e.at,within:y,elem:c})}),e.using&&(h=function(t){var i=m.left-M.left,s=i+p-u,n=m.top-M.top,a=n+g-d,l={target:{element:b,left:m.left,top:m.top,width:p,height:g},element:{element:c,left:M.left,top:M.top,width:u,height:d},horizontal:0>s?"left":i>0?"right":"center",vertical:0>a?"top":n>0?"bottom":"middle"};u>p&&p>r(i+s)&&(l.horizontal="center"),d>g&&g>r(n+a)&&(l.vertical="middle"),l.important=o(r(i),r(s))>o(r(n),r(a))?"horizontal":"vertical",e.using.call(this,t,l)}),c.offset(t.extend(M,{using:h}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,l=n-r,h=r+e.collisionWidth-a-n;e.collisionWidth>a?l>0&&0>=h?(i=t.left+l+e.collisionWidth-a-n,t.left+=l-i):t.left=h>0&&0>=l?n:l>h?n+a-e.collisionWidth:n:l>0?t.left+=l:h>0?t.left-=h:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,l=n-r,h=r+e.collisionHeight-a-n;e.collisionHeight>a?l>0&&0>=h?(i=t.top+l+e.collisionHeight-a-n,t.top+=l-i):t.top=h>0&&0>=l?n:l>h?n+a-e.collisionHeight:n:l>0?t.top+=l:h>0?t.top-=h:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,a=n.offset.left+n.scrollLeft,o=n.width,l=n.isWindow?n.scrollLeft:n.offset.left,h=t.left-e.collisionPosition.marginLeft,c=h-l,u=h+e.collisionWidth-o-l,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-o-a,(0>i||r(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-l,(s>0||u>r(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,a=n.offset.top+n.scrollTop,o=n.height,l=n.isWindow?n.scrollTop:n.offset.top,h=t.top-e.collisionPosition.marginTop,c=h-l,u=h+e.collisionHeight-o-l,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-o-a,t.top+p+f+g>c&&(0>s||r(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-l,t.top+p+f+g>u&&(i>0||u>r(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}},function(){var e,i,s,n,a,o=document.getElementsByTagName("body")[0],r=document.createElement("div");e=document.createElement(o?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},o&&t.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(a in s)e.style[a]=s[a];e.appendChild(r),i=o||document.documentElement,i.insertBefore(e,i.firstChild),r.style.cssText="position: absolute; left: 10.7432222px;",n=t(r).offset().left,t.support.offsetFractions=n>10&&11>n,e.innerHTML="",i.removeChild(e)}()})(jQuery);(function(e){e.widget("ui.autocomplete",{version:"1.10.4",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,undefined;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:case a.NUMPAD_ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),undefined;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),undefined):(this._searchTimeout(e),undefined)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,undefined):(clearTimeout(this.searching),this.close(e),this._change(e),undefined)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().data("ui-menu"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),undefined;var s=i.item.data("ui-autocomplete-item");!1!==this._trigger("focus",t,{item:s})?t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value):this.liveRegion.text(s.value)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertBefore(this.element),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):undefined},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({label:t.label||t.value,value:t.value||t.label},t)})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").append(e("<a>").text(i.label)).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this._value(this.term),this.menu.blur(),undefined):(this.menu[e](t),undefined):(this.search(null,t),undefined)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var t;this._superApply(arguments),this.options.disabled||this.cancelSearch||(t=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.text(t))}})})(jQuery);(function(t){t.widget("ui.menu",{version:"1.10.4",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,t.proxy(function(t){this.options.disabled&&t.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(t){t.preventDefault()},"click .ui-state-disabled > a":function(t){t.preventDefault()},"click .ui-menu-item:has(a)":function(e){var i=t(e.target).closest(".ui-menu-item");!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&t(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){var i=t(e.currentTarget);i.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(e,i)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.children(".ui-menu-item").eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){t.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){t(e.target).closest(".ui-menu").length||this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var e=t(this);e.data("ui-menu-submenu-carat")&&e.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(e){function i(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var s,n,a,o,r,l=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:l=!1,n=this.previousFilter||"",a=String.fromCharCode(e.keyCode),o=!1,clearTimeout(this.filterTimer),a===n?o=!0:a=n+a,r=RegExp("^"+i(a),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())}),s=o&&-1!==s.index(this.active.next())?this.active.nextAll(".ui-menu-item"):s,s.length||(a=String.fromCharCode(e.keyCode),r=RegExp("^"+i(a),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())})),s.length?(this.focus(e,s),s.length>1?(this.previousFilter=a,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}l&&e.preventDefault()},_activate:function(t){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i=this.options.icons.submenu,s=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),s.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),s=e.prev("a"),n=t("<span>").addClass("ui-menu-icon ui-icon "+i).data("ui-menu-submenu-carat",!0);s.attr("aria-haspopup","true").prepend(n),e.attr("aria-labelledby",s.attr("id"))}),e=s.add(this.element),e.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),e.children(":not(.ui-menu-item)").each(function(){var e=t(this);/[^\-\u2014\u2013\s]/.test(e.text())||e.addClass("ui-widget-content ui-menu-divider")}),e.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){"icons"===t&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(e.submenu),this._super(t,e)},focus:function(t,e){var i,s;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=e.height(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",t,{item:this.active}))},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.children(".ui-menu-item")[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())),undefined):(this.next(e),undefined)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item").first())),undefined):(this.next(e),undefined)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)}})})(jQuery);
\ No newline at end of file
diff --git a/themes/default/tags.twig b/themes/default/tags.twig
index cff6b1d7..cc196010 100644..100755
--- a/themes/default/tags.twig
+++ b/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 %}
\ No newline at end of file