From aa758ad00c57e4dcd1ebe8e9920d19457761404f Mon Sep 17 00:00:00 2001
From: src386 <utman002@src386.org>
Date: Tue, 12 Apr 2016 10:29:33 +0200
Subject: [PATCH] update to movim upstream

---
 CHANGELOG                                     |   3 +
 README.md                                     |   2 +-
 .../app/models/conference/ConferenceDAO.php   |  97 +++------
 sources/app/models/postn/Postn.php            |  48 +++--
 sources/app/models/postn/PostnDAO.php         |  52 +++--
 sources/app/models/sessionx/SessionxDAO.php   | 142 ++++---------
 sources/app/views/room.tpl                    |   1 +
 sources/app/widgets/About/about.tpl           |   1 +
 .../app/widgets/AccountNext/AccountNext.php   |   5 +-
 .../AccountNext/_accountnext_registered.tpl   |   2 +-
 sources/app/widgets/AdHoc/AdHoc.php           |   8 +-
 sources/app/widgets/AdminTest/AdminTest.php   |  13 +-
 sources/app/widgets/Chat/Chat.php             |  25 +--
 sources/app/widgets/Chat/chat.js              |  16 +-
 sources/app/widgets/Group/Group.php           |   5 -
 sources/app/widgets/Infos/Infos.php           |  10 +-
 sources/app/widgets/Login/Login.php           |  22 +-
 sources/app/widgets/Login/login.tpl           |   5 +-
 sources/app/widgets/Menu/_menu_list.tpl       |   2 +-
 sources/app/widgets/Post/Post.php             |  21 --
 sources/app/widgets/Post/_post.tpl            |  57 ++---
 sources/app/widgets/Post/_post_comments.tpl   |   2 +-
 sources/app/widgets/Post/locales.ini          |   4 +-
 sources/app/widgets/Presence/Presence.php     |  39 ++--
 sources/app/widgets/Presence/presence.js      |   1 +
 sources/app/widgets/Presence/presence.tpl     |   8 +-
 sources/app/widgets/Publish/Publish.php       |   6 +-
 .../app/widgets/Publish/_publish_create.tpl   |  50 ++++-
 sources/app/widgets/Publish/publish.css       |   4 +
 sources/app/widgets/Rooms/Rooms.php           |  56 ++---
 sources/app/widgets/Rooms/rooms.js            |   3 +-
 sources/app/widgets/Rooms/rooms.tpl           |   2 +-
 sources/app/widgets/Statistics/Statistics.php |  80 +++----
 sources/app/widgets/Statistics/chart.min.js   |  11 +
 sources/app/widgets/Statistics/statistics.js  |  46 ++++
 sources/app/widgets/Statistics/statistics.tpl |  14 +-
 sources/app/widgets/Stickers/Stickers.php     |   8 +-
 sources/app/widgets/Subscribe/subscribe.tpl   |   6 +-
 sources/app/widgets/Tabs/tabs.js              |   5 +
 sources/composer.json                         |   1 -
 sources/composer.lock                         | 185 ++++++++--------
 sources/linker.php                            |  28 ++-
 sources/locales/ach.po                        |  12 +-
 sources/locales/ady.po                        |  12 +-
 sources/locales/af.po                         |  12 +-
 sources/locales/ar.po                         |  12 +-
 sources/locales/be.po                         |  12 +-
 sources/locales/bg.po                         |  12 +-
 sources/locales/bn.po                         |  12 +-
 sources/locales/br.po                         |  12 +-
 sources/locales/ca.po                         |  12 +-
 sources/locales/da.po                         |  17 +-
 sources/locales/de.po                         |  17 +-
 sources/locales/el.po                         |  12 +-
 sources/locales/en.po                         |  17 +-
 sources/locales/eo.po                         |  12 +-
 sources/locales/es.po                         |  16 +-
 sources/locales/fa.po                         |  12 +-
 sources/locales/fi.po                         |  12 +-
 sources/locales/fr.po                         | 201 ++----------------
 sources/locales/ga.po                         |  12 +-
 sources/locales/gl.po                         |  12 +-
 sources/locales/he.po                         |  13 +-
 sources/locales/hr.po                         |  12 +-
 sources/locales/hu.po                         |  16 +-
 sources/locales/id.po                         |  12 +-
 sources/locales/io.po                         |  12 +-
 sources/locales/is.po                         |  12 +-
 sources/locales/it.po                         |  16 +-
 sources/locales/ja.po                         |  12 +-
 sources/locales/jbo.po                        |  12 +-
 sources/locales/kk.po                         |  12 +-
 sources/locales/la.po                         |  12 +-
 sources/locales/lb.po                         |  12 +-
 sources/locales/lv.po                         |  12 +-
 sources/locales/lzh.po                        |  12 +-
 sources/locales/messages.pot                  |  14 +-
 sources/locales/ne.po                         |  12 +-
 sources/locales/nl.po                         |  16 +-
 sources/locales/no.po                         |  12 +-
 sources/locales/oc.po                         |  12 +-
 sources/locales/pl.po                         |  16 +-
 sources/locales/pt.po                         |  12 +-
 sources/locales/ro.po                         |  12 +-
 sources/locales/ru.po                         |  13 +-
 sources/locales/sv.po                         |  12 +-
 sources/locales/tr.po                         |  12 +-
 sources/locales/uk.po                         |  12 +-
 sources/locales/zh.po                         |  13 +-
 sources/src/Movim/Daemon/Api.php              |  29 +++
 sources/src/Movim/Daemon/Core.php             |   4 +-
 sources/src/Movim/Daemon/Session.php          |   3 +
 sources/src/Movim/i18n/Locale.php             |  15 +-
 93 files changed, 807 insertions(+), 1133 deletions(-)
 create mode 100644 sources/app/widgets/Statistics/chart.min.js
 create mode 100644 sources/app/widgets/Statistics/statistics.js

diff --git a/CHANGELOG b/CHANGELOG
index 6ff9a87..04655c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 **Changelog**
 
+1.8 2016?
+- Update to movim 0.9 git2016-04-12
+
 1.7.1 2016-30-30
 - Update to movim 0.9 git2016-03-30
 
diff --git a/README.md b/README.md
index cf182e8..bddedee 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t
 
 It is recommended to use a "valid" certificate to use Movim, auto-signed is sometimes problematic. You might want to take a look a StartSSL or Let's Encrypt.
 
-Provided Movim version : 0.9 git2016-03-30
+Provided Movim version : 0.9 git2016-04-12
 
 Please read CHANGELOG.
 
diff --git a/sources/app/models/conference/ConferenceDAO.php b/sources/app/models/conference/ConferenceDAO.php
index ecb4a1f..22d529b 100644
--- a/sources/app/models/conference/ConferenceDAO.php
+++ b/sources/app/models/conference/ConferenceDAO.php
@@ -12,10 +12,10 @@ class ConferenceDAO extends SQL {
                 status      = :status
             where jid       = :jid
               and conference= :conference';
-        
+
         $this->prepare(
-            'Conference', 
-            array(                
+            'Conference',
+            array(
                 'jid'           => $c->jid,
                 'conference'    => $c->conference,
                 'name'          => $c->name,
@@ -24,17 +24,17 @@ class ConferenceDAO extends SQL {
                 'status'        => $c->status
             )
         );
-        
+
         $this->run('Conference');
-        
+
         if(!$this->_effective) {
             $this->_sql = '
                 insert into conference
                 (jid, conference, name, nick, autojoin, status)
                 values (:jid, :conference, :name, :nick, :autojoin, :status)';
-            
+
             $this->prepare(
-                'Conference', 
+                'Conference',
                 array(
                     'jid'           => $c->jid,
                     'conference'    => $c->conference,
@@ -44,7 +44,7 @@ class ConferenceDAO extends SQL {
                     'status'        => $c->status
                 )
             );
-            
+
             $this->run('Conference');
         }
     }
@@ -54,110 +54,63 @@ class ConferenceDAO extends SQL {
             select * from conference
             where jid       = :jid
               and conference= :conference';
-        
+
         $this->prepare(
-            'Conference', 
+            'Conference',
             array(
                 'jid' => $this->_user,
                 'conference' => $conference,
             )
         );
-        
-        return $this->run('Conference', 'item');        
+
+        return $this->run('Conference', 'item');
     }
-    
+
     function getAll() {
         $this->_sql = '
             select * from conference
             where jid = :jid
             order by conference';
-        
+
         $this->prepare(
-            'Conference', 
+            'Conference',
             array(
                 'jid' => $this->_user
             )
         );
-        
-        return $this->run('Conference');        
+
+        return $this->run('Conference');
     }
-    
-    function getConnected() {
-        $this->_sql = '
-            select * from conference
-            where jid   = :jid
-              and status= 1';
-        
-        $this->prepare(
-            'Conference', 
-            array(
-                'jid' => $this->_user
-            )
-        );
-        
-        return $this->run('Conference');        
-    }
-    /*
-    function getSubscribed() {
-        $this->_sql = '
-            select 
-                subscription.jid, 
-                subscription.server, 
-                subscription.node, 
-                subscription, 
-                name
-            from subscription
-            left outer join item 
-                on item.server = subscription.server 
-                and item.node = subscription.node
-            where subscription.jid = :jid
-            group by 
-                subscription.server, 
-                subscription.node, 
-                subscription.jid, 
-                subscription, item.name
-            order by 
-                subscription.server';
-        
-        $this->prepare(
-            'Subscription', 
-            array(
-                'jid' => $this->_user
-            )
-        );
-        
-        return $this->run('Subscription');
-    }
-    */
+
     function delete() {
         $this->_sql = '
             delete from conference
             where jid = :jid';
-        
+
         $this->prepare(
-            'Subscription', 
+            'Subscription',
             array(
                 'jid' => $this->_user
             )
         );
-        
+
         return $this->run('conference');
     }
-    
+
     function deleteNode($conference) {
         $this->_sql = '
             delete from conference
             where jid       = :jid
               and conference= :conference';
-        
+
         $this->prepare(
-            'Conference', 
+            'Conference',
             array(
                 'jid' => $this->_user,
                 'conference' => $conference
             )
         );
-        
+
         return $this->run('Conference');
     }
 }
diff --git a/sources/app/models/postn/Postn.php b/sources/app/models/postn/Postn.php
index 11978e6..c2797a2 100644
--- a/sources/app/models/postn/Postn.php
+++ b/sources/app/models/postn/Postn.php
@@ -20,6 +20,8 @@ class Postn extends Model {
 
     public $commentplace;
 
+    public $open;
+
     public $published;      //
     public $updated;        //
     public $delay;          //
@@ -31,11 +33,10 @@ class Postn extends Model {
 
     public $links;
 
-    public $privacy;
-
     public $hash;
 
     private $youtube;
+    private $openlink;
 
     public function __construct() {
         $this->hash = md5(openssl_random_pseudo_bytes(5));
@@ -65,6 +66,9 @@ class Postn extends Model {
             "commentplace" :
                 {"type":"string", "size":128 },
 
+            "open" :
+                {"type":"bool"},
+
             "published" :
                 {"type":"date" },
             "updated" :
@@ -256,8 +260,10 @@ class Postn extends Model {
         return in_array($type, array('picture', 'image/jpeg', 'image/png', 'image/jpg', 'image/gif'));
     }
 
-    private function typeIsLink($type) {
-        return $type == 'text/html';
+    private function typeIsLink($link) {
+        return (isset($link['type'])
+        && $link['type'] == 'text/html'
+        && Validator::url()->validate($link['href']));
     }
 
     private function setAttachements($links, $extra = false) {
@@ -274,6 +280,9 @@ class Postn extends Model {
                 $this->picture = true;
             }
 
+            if($enc['rel'] == 'alternate'
+            && Validator::url()->validate($enc['href'])) $this->open = true;
+
             if((string)$attachment->attributes()->title == 'comments') {
                 $substr = explode('?',substr((string)$attachment->attributes()->href, 5));
                 $this->commentplace = reset($substr);
@@ -292,27 +301,38 @@ class Postn extends Model {
     {
         $attachements = null;
         $this->picture = null;
+        $this->openlink = null;
 
         if(isset($this->links)) {
-            $attachements = array('pictures' => array(), 'files' => array(), 'links' => array());
+            $attachements = array(
+                'pictures' => array(),
+                'files' => array(),
+                'links' => array()
+            );
 
             $links = unserialize($this->links);
+
             foreach($links as $l) {
                 if(isset($l['type']) && $this->typeIsPicture($l['type'])) {
                     if($this->picture == null) {
                         $this->picture = $l['href'];
                     }
+
                     array_push($attachements['pictures'], $l);
-                } elseif((isset($l['type']) && $this->typeIsLink($l['type'])
-                || in_array($l['rel'], array('related', 'alternate')))
-                && Validator::url()->validate($l['href'])) {
+                } elseif($this->typeIsLink($l)) {
                     if($this->youtube == null
                     && preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $l['href'], $match)) {
                         $this->youtube = $match[1];
                     }
 
-                    array_push($attachements['links'], array('href' => $l['href'], 'url' => parse_url($l['href'])));
-                } elseif(isset($l['rel']) && $l['rel'] == 'enclosure') {
+                    if($l['rel'] == 'alternate') {
+                        $this->openlink = $l['href'];
+                        if(!$this->isMicroblog()) {
+                            array_push($attachements['links'], array('href' => $l['href'], 'url' => parse_url($l['href'])));
+                        }
+                    }
+                } elseif(isset($l['rel'])
+                && $l['rel'] == 'enclosure') {
                     array_push($attachements['files'], $l);
                 }
             }
@@ -389,11 +409,7 @@ class Postn extends Model {
 
     public function getPublicUrl()
     {
-        if($this->isMicroblog()) {
-            return \Route::urlize('blog', array($this->origin, $this->nodeid));
-        } else {
-            return \Route::urlize('node', array($this->origin, $this->node, $this->nodeid));
-        }
+        return $this->openlink;
     }
 
     public function getTags()
@@ -414,7 +430,7 @@ class Postn extends Model {
     }
 
     public function isPublic() {
-        return (isset($this->privacy) && $this->privacy);
+        return ($this->open);
     }
 }
 
diff --git a/sources/app/models/postn/PostnDAO.php b/sources/app/models/postn/PostnDAO.php
index 603a14c..ed1b37d 100644
--- a/sources/app/models/postn/PostnDAO.php
+++ b/sources/app/models/postn/PostnDAO.php
@@ -17,6 +17,8 @@ class PostnDAO extends SQL {
 
                     commentplace    = :commentplace,
 
+                    open            = :open,
+
                     published       = :published,
                     updated         = :updated,
                     delay           = :delay,
@@ -47,6 +49,8 @@ class PostnDAO extends SQL {
 
                 'commentplace'      => $post->commentplace,
 
+                'open'              => $post->open,
+
                 'published'         => $post->published,
                 'updated'           => $post->updated,
                 'delay'             => $post->delay,
@@ -86,6 +90,8 @@ class PostnDAO extends SQL {
 
                 commentplace,
 
+                open,
+
                 published,
                 updated,
                 delay,
@@ -113,6 +119,8 @@ class PostnDAO extends SQL {
 
                     :commentplace,
 
+                    :open,
+
                     :published,
                     :updated,
                     :delay,
@@ -140,6 +148,8 @@ class PostnDAO extends SQL {
 
                     'commentplace'      => $post->commentplace,
 
+                    'open'              => $post->open,
+
                     'published'         => $post->published,
                     'updated'           => $post->updated,
                     'delay'             => $post->delay,
@@ -196,9 +206,8 @@ class PostnDAO extends SQL {
 
     function getNode($from, $node, $limitf = false, $limitr = false) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where ((postn.origin, node) in (select server, node from subscription where jid = :aid))
                 and postn.origin = :origin
                 and postn.node = :node
@@ -222,11 +231,10 @@ class PostnDAO extends SQL {
 
     function getPublicTag($tag, $limitf = false, $limitr = false) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where nodeid in (select nodeid from tag where tag = :title)
-                and privacy.value = 1
+                and postn.open = true
             order by postn.published desc';
 
         if($limitr !== false)
@@ -244,9 +252,8 @@ class PostnDAO extends SQL {
 
     function getNodeUnfiltered($from, $node, $limitf = false, $limitr = false) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where postn.origin = :origin
                 and postn.node = :node
             order by postn.published desc';
@@ -267,9 +274,8 @@ class PostnDAO extends SQL {
 
     function getGallery($from, $limitf = false, $limitr = false) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where postn.aid = :aid
                 and postn.picture = 1
             order by postn.published desc';
@@ -310,9 +316,8 @@ class PostnDAO extends SQL {
 
     function getItem($id) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where postn.nodeid = :nodeid';
 
         $this->prepare(
@@ -327,9 +332,8 @@ class PostnDAO extends SQL {
 
     function getAllPosts($jid = false, $limitf = false, $limitr = false) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where (
                 (postn.origin in (select jid from rosterlink where session = :origin and rostersubscription in (\'both\', \'to\')) and node = \'urn:xmpp:microblog:0\')
                 or (postn.origin = :origin and node = \'urn:xmpp:microblog:0\')
@@ -358,9 +362,8 @@ class PostnDAO extends SQL {
 
     function getFeed($limitf = false, $limitr = false) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where ((postn.origin in (select jid from rosterlink where session = :origin and rostersubscription in (\'both\', \'to\')) and node = \'urn:xmpp:microblog:0\')
                 or (postn.origin = :origin and node = \'urn:xmpp:microblog:0\'))
                 and postn.node not like \'urn:xmpp:microblog:0:comments/%\'
@@ -383,9 +386,8 @@ class PostnDAO extends SQL {
 
     function getNews($limitf = false, $limitr = false) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where ((postn.origin, node) in (select server, node from subscription where jid = :origin))
             order by postn.published desc
             ';
@@ -407,9 +409,8 @@ class PostnDAO extends SQL {
     function getMe($limitf = false, $limitr = false)
     {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where postn.origin = :origin and postn.node = \'urn:xmpp:microblog:0\'
             order by postn.published desc
             ';
@@ -430,12 +431,11 @@ class PostnDAO extends SQL {
     function getPublic($origin, $node, $limitf = false, $limitr = false)
     {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where postn.origin = :origin
                 and postn.node = :node
-                and privacy.value = 1
+                and postn.open = true
             order by postn.published desc';
 
         if($limitr !== false)
@@ -454,12 +454,11 @@ class PostnDAO extends SQL {
 
     function getPublicItem($origin, $node, $nodeid) {
         $this->_sql = '
-            select *, postn.aid, privacy.value as privacy from postn
+            select *, postn.aid from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where postn.origin = :origin
                 and postn.node = :node
-                and privacy.value = 1
+                and postn.open = true
                 and postn.nodeid = :nodeid
             order by postn.published desc';
 
@@ -606,11 +605,10 @@ class PostnDAO extends SQL {
         $this->_sql = '
             select * from postn
             left outer join contact on postn.aid = contact.jid
-            left outer join privacy on postn.nodeid = privacy.pkey
             where
                 node = \'urn:xmpp:microblog:0\'
                 and postn.origin not in (select jid from rosterlink where session = :origin)
-                and privacy.value = 1
+                and postn.open = true
             order by published desc
             ';
 
diff --git a/sources/app/models/sessionx/SessionxDAO.php b/sources/app/models/sessionx/SessionxDAO.php
index e6bee5e..e3f5769 100644
--- a/sources/app/models/sessionx/SessionxDAO.php
+++ b/sources/app/models/sessionx/SessionxDAO.php
@@ -3,11 +3,10 @@
 namespace modl;
 
 class SessionxDAO extends SQL {
-    function init(Sessionx $s) {        
+    function init(Sessionx $s) {
         $this->_sql = '
             update sessionx
             set username    = :username,
-                password    = :password,
                 hash        = :hash,
                 resource    = :resource,
                 rid         = :rid,
@@ -22,13 +21,12 @@ class SessionxDAO extends SQL {
                 timestamp   = :timestamp,
                 mechanism   = :mechanism
             where session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session'   => $s->session,
                 'username'  => $s->username,
-                'password'  => $s->password,
                 'hash'      => $s->hash,
                 'resource'  => $s->resource,
                 'rid'       => $s->rid,
@@ -44,15 +42,14 @@ class SessionxDAO extends SQL {
                 'mechanism' => $s->mechanism
                 )
         );
-        
+
         $this->run('Sessionx');
-        
+
         if(!$this->_effective) {
             $this->_sql = '
                 insert into sessionx
                 (session,
                  username,
-                 password,
                  hash,
                  resource,
                  rid,
@@ -69,7 +66,6 @@ class SessionxDAO extends SQL {
                 values
                 (:session,
                  :username,
-                 :password,
                  :hash,
                  :resource,
                  :rid,
@@ -83,13 +79,12 @@ class SessionxDAO extends SQL {
                  :start,
                  :timestamp,
                  :mechanism)';
-            
+
             $this->prepare(
-                'Sessionx', 
+                'Sessionx',
                 array(
                     'session'   => $s->session,
                     'username'  => $s->username,
-                    'password'  => $s->password,
                     'hash'      => $s->hash,
                     'resource'  => $s->resource,
                     'rid'       => $s->rid,
@@ -105,7 +100,7 @@ class SessionxDAO extends SQL {
                     'mechanism' => $s->mechanism
                 )
             );
-            
+
             $this->run('Sessionx');
         }
     }
@@ -116,11 +111,11 @@ class SessionxDAO extends SQL {
             set
                 '.$key.'  = :'.$key.',
                 timestamp = :timestamp
-            where 
+            where
                 session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session'   => $session,
                 $key        => $value,
@@ -134,11 +129,11 @@ class SessionxDAO extends SQL {
     function get($session) {
         $this->_sql = '
             select * from sessionx
-            where 
+            where
                 session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session' => $session
             )
@@ -150,11 +145,11 @@ class SessionxDAO extends SQL {
     function getHash($hash) {
         $this->_sql = '
             select * from sessionx
-            where 
+            where
                 hash = :hash';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'hash' => $hash
             )
@@ -166,16 +161,16 @@ class SessionxDAO extends SQL {
     function getId($session) {
         $this->_sql = '
             select id from sessionx
-            where 
+            where
                 session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session' => $session
             )
         );
-        
+
         $value = $this->run(null, 'array');
         $value = $value[0]['id'];
 
@@ -184,11 +179,11 @@ class SessionxDAO extends SQL {
             set
                 id          = :id,
                 timestamp   = :timestamp
-            where 
+            where
                 session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session'   => $session,
                 'id'        => $value+1,
@@ -197,23 +192,23 @@ class SessionxDAO extends SQL {
         );
 
         $this->run();
-        
+
         return $value;
     }
 
     function getRid($session) {
         $this->_sql = '
             select rid from sessionx
-            where 
+            where
                 session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session' => $session
             )
         );
-        
+
         $value = $this->run(null, 'array');
         $value = $value[0]['rid'];
 
@@ -222,11 +217,11 @@ class SessionxDAO extends SQL {
             set
                 rid         = :rid,
                 timestamp   = :timestamp
-            where 
+            where
                 session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session' => $session,
                 'rid' => $value+1,
@@ -235,23 +230,23 @@ class SessionxDAO extends SQL {
         );
 
         $this->run();
-        
+
         return $value;
     }
 
     function delete($session) {
         $this->_sql = '
             delete from sessionx
-            where 
+            where
                 session = :session';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
                 'session' => $session
             )
         );
-        
+
         return $this->run('Sessionx');
     }
 
@@ -269,26 +264,12 @@ class SessionxDAO extends SQL {
         return $this->run('Sessionx');
     }
 
-    /*function clean() {
-        $this->_sql = '
-            delete from sessionx
-            where timestamp < :timestamp';
-        
-        $this->prepare(
-            'Sessionx', 
-            array(
-                'timestamp' => date(DATE_ISO8601, time() - 3600)
-            )
-        );
-
-        $this->run('Sessionx');
-    }*/
     function clear() {
         $this->_sql = '
             truncate table sessionx';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array(
             )
         );
@@ -299,51 +280,12 @@ class SessionxDAO extends SQL {
     function getAll() {
         $this->_sql = '
             select * from sessionx';
-        
+
         $this->prepare(
-            'Sessionx', 
+            'Sessionx',
             array()
         );
 
-        return $this->run('Sessionx');        
-    }
-
-    function getConnected() {
-        $this->_sql = '
-            select count(*) from sessionx';
-
-        $this->prepare(
-            'Sessionx', 
-            array(
-                
-            )
-        );
-
-        $results = $this->run(null, 'array');
-        $results = array_values($results[0]);
-        
-        return (int)$results[0]; 
-    }
-
-    function checkConnected($username, $host)
-    {
-        $this->_sql = '
-            select count(*) from sessionx
-            where
-                username = :username
-                and host = :host';
-        
-        $this->prepare(
-            'Sessionx', 
-            array(
-                'username' => $username,
-                'host' => $host
-            )
-        );
-
-        $results = $this->run(null, 'array');
-        $results = array_values($results[0]);
-        
-        return (int)$results[0]; 
+        return $this->run('Sessionx');
     }
 }
diff --git a/sources/app/views/room.tpl b/sources/app/views/room.tpl
index 23151f5..a5c35da 100644
--- a/sources/app/views/room.tpl
+++ b/sources/app/views/room.tpl
@@ -1,3 +1,4 @@
+<?php $this->widget('Stickers');?>
 <?php $this->widget('Presence'); ?>
 <?php $this->widget('LoginAnonymous'); ?>
 <main>
diff --git a/sources/app/widgets/About/about.tpl b/sources/app/widgets/About/about.tpl
index b009161..5d5211c 100644
--- a/sources/app/widgets/About/about.tpl
+++ b/sources/app/widgets/About/about.tpl
@@ -37,6 +37,7 @@
                Moxl - Movim XMPP Library - <a href="https://github.com/edhelas/moxl">GitHub Moxl</a> under AGPLv3<br/>
 
                Map Library - Leaflet <a href="http://leafletjs.com/">leafletjs.com</a> under BSD<br/>
+               Chart.js - Nick Downie <a href="http://www.chartjs.org/">chart.js</a> under MIT<br/>
                Favico.js - Miroslav Magda <a href="http://lab.ejci.net/favico.js/">lab.ejci.net/favico.js</a> under GPL and MIT<br/>
                Markdown - Michel Fortin <a href="http://michelf.ca/projects/php-markdown/">michelf.ca</a> ©Michel Fortin<br/>
                Template Engine - RainTPL - Federico Ulfo <a href="http://www.raintpl.com/">www.raintpl.com</a> under MIT<br/>
diff --git a/sources/app/widgets/AccountNext/AccountNext.php b/sources/app/widgets/AccountNext/AccountNext.php
index 5570b4f..d86c0e2 100644
--- a/sources/app/widgets/AccountNext/AccountNext.php
+++ b/sources/app/widgets/AccountNext/AccountNext.php
@@ -102,8 +102,9 @@ class AccountNext extends \Movim\Widget\Base {
         $domain = \Moxl\Utils::getDomain($host);
 
         // We create a new session or clear the old one
-        $s = Sessionx::start();
-        $s->init(null, null, $host, $domain);
+        $s = Session::start();
+        $s->set('host', $host);
+        $s->set('domain', $domain);
 
         \Moxl\Stanza\Stream::init($host);
     }
diff --git a/sources/app/widgets/AccountNext/_accountnext_registered.tpl b/sources/app/widgets/AccountNext/_accountnext_registered.tpl
index b63ab4a..3c71fd3 100644
--- a/sources/app/widgets/AccountNext/_accountnext_registered.tpl
+++ b/sources/app/widgets/AccountNext/_accountnext_registered.tpl
@@ -3,7 +3,7 @@
 
     <h2 id="username">username@server.com</h2>
 
-    <a class="button color" onclick="remoteUnregister(); MovimWebsocket.attach(function() {movim_redirect('{$c->route('login')}')});" href="#">
+    <a class="button color" onclick="remoteUnregister(); MovimWebsocket.attach(function() {movim_redirect('{$c->route('disconnect')}')});" href="#">
         {$c->__('page.login')}
     </a>
 </div>
diff --git a/sources/app/widgets/AdHoc/AdHoc.php b/sources/app/widgets/AdHoc/AdHoc.php
index 2b6819f..3db6ccc 100644
--- a/sources/app/widgets/AdHoc/AdHoc.php
+++ b/sources/app/widgets/AdHoc/AdHoc.php
@@ -60,10 +60,10 @@ class AdHoc extends \Movim\Widget\Base
 
     function ajaxGet()
     {
-        $session = \Sessionx::start();
+        $session = \Session::start();
 
         $g = new Get;
-        $g->setTo($session->host)
+        $g->setTo($session->get('host'))
           ->request();
     }
 
@@ -77,10 +77,10 @@ class AdHoc extends \Movim\Widget\Base
 
     function ajaxSubmit($data, $node, $sessionid)
     {
-        $session = \Sessionx::start();
+        $session = \Session::start();
 
         $s = new Submit;
-        $s->setTo($session->host)
+        $s->setTo($session->get('host'))
           ->setNode($node)
           ->setData($data)
           ->setSessionid($sessionid)
diff --git a/sources/app/widgets/AdminTest/AdminTest.php b/sources/app/widgets/AdminTest/AdminTest.php
index 8035528..68be0ac 100644
--- a/sources/app/widgets/AdminTest/AdminTest.php
+++ b/sources/app/widgets/AdminTest/AdminTest.php
@@ -14,7 +14,7 @@
  *
  * See COPYING for licensing information.
  */
- 
+
 class AdminTest extends \Movim\Widget\Base
 {
     function load() {
@@ -24,14 +24,14 @@ class AdminTest extends \Movim\Widget\Base
 
     public function version()
     {
-        return (version_compare(PHP_VERSION, '5.3.0') >= 0);
+        return (version_compare(PHP_VERSION, '5.4.0') >= 0);
     }
 
     public function testDir($dir)
     {
         return (file_exists($dir) && is_dir($dir) && is_writable($dir));
     }
-    
+
     public function testFile($file)
     {
         return (file_exists($file) && is_writable($file));
@@ -39,15 +39,10 @@ class AdminTest extends \Movim\Widget\Base
 
     function display()
     {
-        $md = \modl\Modl::getInstance();
+        $md = \Modl\Modl::getInstance();
         $supported = $md->getSupportedDatabases();
 
-        $cd = new \Modl\ConfigDAO();
-        $config = $cd->get();
-
         $this->view->assign('dbconnected', $md->_connected);
-        $this->view->assign('dbtype', $supported[$config->type]);
         $this->view->assign('dbinfos', sizeof($md->check()));
-        $this->view->assign('websocketurl', $config->websocketurl);
     }
 }
diff --git a/sources/app/widgets/Chat/Chat.php b/sources/app/widgets/Chat/Chat.php
index 969716b..d8daff5 100644
--- a/sources/app/widgets/Chat/Chat.php
+++ b/sources/app/widgets/Chat/Chat.php
@@ -224,7 +224,9 @@ class Chat extends \Movim\Widget\Base
      * @return void
      */
     function ajaxSendMessage($to, $message, $muc = false, $resource = false, $replace = false) {
-        if($message == '')
+        $body = trim(rawurldecode($message));
+
+        if($body == '' || $body == '/me')
             return;
 
         $m = new \Modl\Message();
@@ -243,25 +245,18 @@ class Chat extends \Movim\Widget\Base
             $m->published = gmdate('Y-m-d H:i:s');
         }
 
-        $session    = \Sessionx::start();
+        $session    = \Session::start();
 
         $m->type    = 'chat';
-        $m->resource = $session->resource;
+        $m->resource = $session->get('resource');
 
         if($muc) {
             $m->type        = 'groupchat';
-
-            $s = Session::start();
-            $m->resource = $s->get('username');
-
-            if($m->resource == null) {
-                $m->resource = $session->user;
-            }
-
+            $m->resource = $session->get('username');
             $m->jidfrom     = $to;
         }
 
-        $m->body      = trim(rawurldecode($message));
+        $m->body      = $body;
         //$m->html      = prepareString($m->body, false, true);
 
         if($resource != false) {
@@ -290,7 +285,7 @@ class Chat extends \Movim\Widget\Base
         /* Is it really clean ? */
         if(!$p->getMuc()) {
             if(!preg_match('#^\?OTR#', $m->body)) {
-                $md = new \Modl\MessageDAO();
+                $md = new \Modl\MessageDAO;
                 $md->set($m);
             }
 
@@ -368,7 +363,7 @@ class Chat extends \Movim\Widget\Base
     {
         if(!$this->validateJid($jid)) return;
 
-        $md = new \Modl\MessageDAO();
+        $md = new \Modl\MessageDAO;
         $messages = $md->getHistory(echapJid($jid), date(DATE_ISO8601, strtotime($date)), $this->_pagination);
 
         if(count($messages) > 0) {
@@ -524,7 +519,7 @@ class Chat extends \Movim\Widget\Base
     {
         if(!$this->validateJid($jid)) return;
 
-        $md = new \Modl\MessageDAO();
+        $md = new \Modl\MessageDAO;
         $messages = $md->getContact(echapJid($jid), 0, $this->_pagination);
 
         if(is_array($messages)) {
diff --git a/sources/app/widgets/Chat/chat.js b/sources/app/widgets/Chat/chat.js
index d7e4169..25fb4d2 100644
--- a/sources/app/widgets/Chat/chat.js
+++ b/sources/app/widgets/Chat/chat.js
@@ -131,7 +131,7 @@ var Chat = {
                     bubble.id = message.newid;
             }
 
-            if(message.body.match(/^\/me/)) {
+            if(message.body.match(/^\/me\s/)) {
                 bubble.querySelector('div.bubble').className = 'bubble quote';
                 message.body = message.body.substr(4);
             }
@@ -235,12 +235,14 @@ MovimWebsocket.attach(function() {
     }
 });
 
-Upload.attach(function() {
-    var textarea = document.querySelector('#chat_textarea');
-    textarea.value = Upload.get + ' ' + textarea.value;
-    textarea.focus();
-    movim_textarea_autoheight(textarea);
-});
+if(typeof Upload != 'undefined') {
+    Upload.attach(function() {
+        var textarea = document.querySelector('#chat_textarea');
+        textarea.value = Upload.get + ' ' + textarea.value;
+        textarea.focus();
+        movim_textarea_autoheight(textarea);
+    });
+}
 
 document.addEventListener('focus', function() {
     var textarea = document.querySelector('#chat_textarea');
diff --git a/sources/app/widgets/Group/Group.php b/sources/app/widgets/Group/Group.php
index 914c5f1..5f59de4 100644
--- a/sources/app/widgets/Group/Group.php
+++ b/sources/app/widgets/Group/Group.php
@@ -368,11 +368,6 @@ class Group extends \Movim\Widget\Base
         RPC::call('movim_fill', 'group_widget', $html);
     }
 
-    function ajaxTogglePrivacy($id) {
-        $p = new Post;
-        $p->ajaxTogglePrivacy($id);
-    }
-
     function prepareEmpty()
     {
         $id = new \modl\ItemDAO();
diff --git a/sources/app/widgets/Infos/Infos.php b/sources/app/widgets/Infos/Infos.php
index b0038b6..0bb24ea 100644
--- a/sources/app/widgets/Infos/Infos.php
+++ b/sources/app/widgets/Infos/Infos.php
@@ -14,7 +14,7 @@
  *
  * See COPYING for licensing information.
  */
- 
+
 class Infos extends \Movim\Widget\Base
 {
     function load() {
@@ -34,7 +34,7 @@ class Infos extends \Movim\Widget\Base
         $cd = new \Modl\ConfigDAO();
         $config = $cd->get();
 
-        $sd = new \Modl\SessionxDAO();
+        $connected = (int)requestURL('http://localhost:1560/started/', 2);
 
         $infos = array(
                 'url'           => BASE_URI,
@@ -46,9 +46,11 @@ class Infos extends \Movim\Widget\Base
                 'php_version'   => phpversion(),
                 'version'       => APP_VERSION,
                 'population'    => $pop,
-                'connected'     => $sd->getConnected()
+                'linked'        => (int)requestURL('http://localhost:1560/linked/', 2),
+                'started'       => $connected,
+                'connected'     => $connected
             );
-        
+
         $this->view->assign('json', json_encode($infos));
     }
 }
diff --git a/sources/app/widgets/Login/Login.php b/sources/app/widgets/Login/Login.php
index cbb158d..8cd5b4f 100644
--- a/sources/app/widgets/Login/Login.php
+++ b/sources/app/widgets/Login/Login.php
@@ -38,10 +38,9 @@ class Login extends \Movim\Widget\Base
         $pd = new \Modl\PresenceDAO();
         $pd->clearPresence();
 
-        $session = \Sessionx::start();
-        $session->load();
+        $session = \Session::start();
 
-        if($session->mechanism != 'ANONYMOUS') {
+        if($session->get('mechanism') != 'ANONYMOUS') {
             // http://xmpp.org/extensions/xep-0280.html
             \Moxl\Stanza\Carbons::enable();
 
@@ -84,12 +83,7 @@ class Login extends \Movim\Widget\Base
                 $pop++;
 
         $this->view->assign('pop', $pop-2);
-
-        $sd = new \Modl\SessionxDAO();
-        $connected = $sd->getConnected();
-
-        $this->view->assign('connected', $connected);
-
+        $this->view->assign('connected', (int)requestURL('http://localhost:1560/started/', 2));
         $this->view->assign('error', $this->prepareError());
 
         if(isset($_SERVER['PHP_AUTH_USER'])
@@ -202,12 +196,15 @@ class Login extends \Movim\Widget\Base
         $here = $sd->getHash(sha1($username.$password.$host));
 
         if($here) {
+        //if($s->get('hash') == sha1($username.$password.$host)) {
             RPC::call('Login.setCookie', $here->session);
             RPC::call('movim_redirect', Route::urlize('main'));
             $this->showErrorBlock('conflict');
             return;
         }
 
+        $s = Session::start();
+
         // We try to get the domain
         $domain = \Moxl\Utils::getDomain($host);
 
@@ -215,6 +212,13 @@ class Login extends \Movim\Widget\Base
         RPC::call('register', $host);
 
         // We create a new session or clear the old one
+        $s->set('password', $password);
+        $s->set('username', $username);
+        $s->set('host', $host);
+        $s->set('domain', $domain);
+        $s->set('jid', $login);
+        $s->set('hash', sha1($username.$password.$host));
+
         $s = Sessionx::start();
         $s->init($username, $password, $host, $domain);
 
diff --git a/sources/app/widgets/Login/login.tpl b/sources/app/widgets/Login/login.tpl
index e1dbc8f..3b59128 100644
--- a/sources/app/widgets/Login/login.tpl
+++ b/sources/app/widgets/Login/login.tpl
@@ -21,9 +21,9 @@
                 data-action="{$submit}"
                 name="login">
                 <div>
+                    <input type="text" id="complete" tabindex="-1"/>
                     <input type="email" name="login" id="login" autofocus required disabled
                         placeholder="username@server.com"/>
-                    <input type="text" id="complete" tabindex="-1"/>
                     <label for="login">{$c->__('form.username')}</label>
                 </div>
                 <div>
@@ -53,7 +53,8 @@
             {if="isset($info) && $info != ''"}
             <ul class="list thin card">
                 <li class="info">
-                    <p class="normal">{$info}</p>
+                    <p></p>
+                    <p class="center normal">{$info}</p>
                 </li>
             </ul>
             {/if}
diff --git a/sources/app/widgets/Menu/_menu_list.tpl b/sources/app/widgets/Menu/_menu_list.tpl
index f390e0e..fd814ca 100644
--- a/sources/app/widgets/Menu/_menu_list.tpl
+++ b/sources/app/widgets/Menu/_menu_list.tpl
@@ -61,7 +61,7 @@
                 <span class="primary icon thumb color {$value->node|stringToColor}">{$value->node|firstLetterCapitalize}</span>
             {/if}
 
-            {if="$value->privacy"}
+            {if="$value->isPublic()"}
                 <span class="control icon gray" title="{$c->__('menu.public')}">
                     <i class="zmdi zmdi-portable-wifi"></i>
                 </span>
diff --git a/sources/app/widgets/Post/Post.php b/sources/app/widgets/Post/Post.php
index ed0534c..fe5c1b3 100644
--- a/sources/app/widgets/Post/Post.php
+++ b/sources/app/widgets/Post/Post.php
@@ -214,27 +214,6 @@ class Post extends \Movim\Widget\Base
         }
     }
 
-    function ajaxTogglePrivacy($id) {
-        $validate = Validator::stringType()->length(6, 128);
-
-        if(!$validate->validate($id))
-            return;
-
-        $pd = new \Modl\PostnDAO;
-        $po  = $pd->getItem($id);
-
-        if($po->isMine()) {
-            if($po->privacy == 1) {
-                Notification::append(false, $this->__('post.public_no'));
-                \Modl\Privacy::set($id, 0);
-            }
-            if($po->privacy == 0) {
-                Notification::append(false, $this->__('post.public_yes'));
-                \Modl\Privacy::set($id, 1);
-            }
-        }
-    }
-
     function getComments($post)
     {
         $pd = new \Modl\PostnDAO();
diff --git a/sources/app/widgets/Post/_post.tpl b/sources/app/widgets/Post/_post.tpl
index e52a2bc..3606424 100644
--- a/sources/app/widgets/Post/_post.tpl
+++ b/sources/app/widgets/Post/_post.tpl
@@ -139,7 +139,8 @@
                         </a>
                         {/if}
                     {/loop}
-                {elseif="$post->getYoutube()"}
+                {/if}
+                {if="$post->getYoutube()"}
                     <div class="video_embed">
                         <iframe src="https://www.youtube.com/embed/{$post->getYoutube()}" frameborder="0" allowfullscreen></iframe>
                     </div>
@@ -165,18 +166,16 @@
             <ul class="list middle divided spaced">
                 {if="isset($attachements.links)"}
                     {loop="$attachements.links"}
-                        {if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
-                            <li>
-                                <span class="primary icon">
-                                    <img src="https://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>
-                                </span>
-                                <p class="normal line">
-                                    <a href="{$value.href}" class="alternate" target="_blank">
-                                        {$value.href|urldecode}
-                                    </a>
-                                </p>
-                            </li>
-                        {/if}
+                        <li>
+                            <span class="primary icon">
+                                <img src="https://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>
+                            </span>
+                            <p class="normal line">
+                                <a href="{$value.href}" class="alternate" target="_blank">
+                                    {$value.href|urldecode}
+                                </a>
+                            </p>
+                        </li>
                     {/loop}
                 {/if}
                 {if="isset($attachements.files)"}
@@ -189,7 +188,9 @@
                                 <a
                                     href="{$value.href}"
                                     class="enclosure"
-                                    type="{$value.type}"
+                                    {if="isset($value.type)"}
+                                        type="{$value.type}"
+                                    {/if}
                                     target="_blank">
                                 {$value.href|urldecode}
                                 </a>
@@ -214,36 +215,14 @@
                 {/loop}
                 </ul>
             {/if}
-            {if="$post->isMine() && !$public"}
-                <ul class="list middle">
+            {if="$post->isPublic() && !$public"}
+                <ul class="list thick">
                     <li>
                         <span class="primary icon gray">
                             <i class="zmdi zmdi-portable-wifi"></i>
                         </span>
-                        <span class="control">
-                            <form>
-                                <div class="action">
-                                    <div class="checkbox">
-                                        <input
-                                            type="checkbox"
-                                            id="privacy_{$post->nodeid}"
-                                            name="privacy_{$post->nodeid}"
-                                            {if="$post->privacy"}
-                                                checked
-                                            {/if}
-                                            {if="$external"}
-                                                onclick="Group_ajaxTogglePrivacy('{$post->nodeid}')"
-                                            {else}
-                                                onclick="Post_ajaxTogglePrivacy('{$post->nodeid}')"
-                                            {/if}
-                                        >
-                                        <label for="privacy_{$post->nodeid}"></label>
-                                    </div>
-                                </div>
-                            </form>
-                        </span>
                         <p class="line normal">
-                            {$c->__('post.public')}
+                            {$c->__('post.public_yes')}
                         </p>
                         <p>
                             <a target="_blank" href="{$post->getPublicUrl()}">
diff --git a/sources/app/widgets/Post/_post_comments.tpl b/sources/app/widgets/Post/_post_comments.tpl
index 424712f..7c2f0b5 100644
--- a/sources/app/widgets/Post/_post_comments.tpl
+++ b/sources/app/widgets/Post/_post_comments.tpl
@@ -43,7 +43,7 @@
         <span class="primary icon gray">
             <i class="zmdi zmdi-comment"></i>
         </span>
-        <span class="control icon gray" onclick="Post_ajaxPublishComment(movim_form_to_json('comment'),'{$server}', '{$node}', '{$id}')">
+        <span class="control icon gray active" onclick="Post_ajaxPublishComment(movim_form_to_json('comment'),'{$server}', '{$node}', '{$id}')">
             <i class="zmdi zmdi-mail-send"></i>
         </span>
         <form name="comment">
diff --git a/sources/app/widgets/Post/locales.ini b/sources/app/widgets/Post/locales.ini
index 3df8908..b1e050b 100644
--- a/sources/app/widgets/Post/locales.ini
+++ b/sources/app/widgets/Post/locales.ini
@@ -12,8 +12,8 @@ repost_profile = See %s profile
 blog_last      = Public posts from users
 
 public         = Publish this post publicly?
-public_yes     = This post is now public
-public_no      = This post is now private
+public_yes     = This post is public
+public_no      = This post is private
 public_url     = Public URL of this post
 
 delete_title   = Delete this post
diff --git a/sources/app/widgets/Presence/Presence.php b/sources/app/widgets/Presence/Presence.php
index b15e285..bb65146 100644
--- a/sources/app/widgets/Presence/Presence.php
+++ b/sources/app/widgets/Presence/Presence.php
@@ -113,16 +113,22 @@ class Presence extends \Movim\Widget\Base
         $pd = new \Modl\PresenceDAO();
         $pd->clearPresence();
 
-        $session = \Sessionx::start();
+        $session = \Session::start();
         $p = new Unavailable;
         $p->setType('terminate')
-          ->setResource($session->resource)
-          ->setTo($this->user->getLogin())
+          ->setResource($session->get('resource'))
+          ->setTo($session->get('jid'))
           ->request();
 
         Stream::end();
     }
 
+    function ajaxGetPresence()
+    {
+        $html = $this->preparePresence();
+        RPC::call('movim_fill', 'presence_widget', $html);
+    }
+
     function ajaxConfigGet() {
         $s = new Get;
         $s->setXmlns('movim:prefs')
@@ -132,27 +138,27 @@ class Presence extends \Movim\Widget\Base
     // We get the server capabilities
     function ajaxServerCapsGet()
     {
-        $session = \Sessionx::start();
+        $session = \Session::start();
         $c = new \Moxl\Xec\Action\Disco\Request;
-        $c->setTo($session->host)
+        $c->setTo($session->get('host'))
           ->request();
     }
 
     // We discover the server services
     function ajaxServerDisco()
     {
-        $session = \Sessionx::start();
+        $session = \Session::start();
         $c = new \Moxl\Xec\Action\Disco\Items;
-        $c->setTo($session->host)
+        $c->setTo($session->get('host'))
           ->request();
     }
 
     // We refresh the bookmarks
     function ajaxBookmarksGet()
     {
-        $session = \Sessionx::start();
+        $session = \Session::start();
         $b = new \Moxl\Xec\Action\Bookmark\Get;
-        $b->setTo($session->user.'@'.$session->host)
+        $b->setTo($session->get('jid'))
           ->request();
     }
 
@@ -182,11 +188,11 @@ class Presence extends \Movim\Widget\Base
 
     function preparePresence()
     {
-        $cd = new \Modl\ContactDAO();
-        $pd = new \Modl\PresenceDAO();
+        $cd = new \Modl\ContactDAO;
+        $pd = new \Modl\PresenceDAO;
 
-        $session = \Sessionx::start();
-        $presence = $pd->getPresence($this->user->getLogin(), $session->resource);
+        $session = \Session::start();
+        $presence = $pd->getPresence($session->get('jid'), $session->get('resource'));
 
         $presencetpl = $this->tpl();
 
@@ -214,13 +220,13 @@ class Presence extends \Movim\Widget\Base
         $txt = getPresences();
         $txts = getPresencesTxt();
 
-        $session = \Sessionx::start();
+        $session = \Session::start();
 
         $pd = new \Modl\PresenceDAO();
-        $p = $pd->getPresence($this->user->getLogin(), $session->resource);
+        $p = $pd->getPresence($session->get('jid'), $session->get('resource'));
 
         $cd = new \Modl\ContactDAO();
-        $contact = $cd->get($this->user->getLogin());
+        $contact = $cd->get($session->get('jid'));
         if($contact == null) {
             $contact = new \Modl\Contact;
         }
@@ -239,7 +245,6 @@ class Presence extends \Movim\Widget\Base
 
     function display()
     {
-        $this->view->assign('presence', $this->preparePresence());
     }
 }
 
diff --git a/sources/app/widgets/Presence/presence.js b/sources/app/widgets/Presence/presence.js
index 9bb23da..d56a7d2 100644
--- a/sources/app/widgets/Presence/presence.js
+++ b/sources/app/widgets/Presence/presence.js
@@ -44,4 +44,5 @@ MovimWebsocket.attach(function()
 {
     Presence.refresh();
     Presence.postStart();
+    Presence_ajaxGetPresence();
 });
diff --git a/sources/app/widgets/Presence/presence.tpl b/sources/app/widgets/Presence/presence.tpl
index 26de019..f1fe5c6 100644
--- a/sources/app/widgets/Presence/presence.tpl
+++ b/sources/app/widgets/Presence/presence.tpl
@@ -1,3 +1,9 @@
 <ul id="presence_widget" class="list active thick">
-    {$presence}
+    <li>
+        <span class="primary icon bubble color status">
+            <i class="zmdi zmdi-account"></i>
+        </span>
+        <p class="line bold">{$c->__('status.status')}</p>
+        <p class="line">{$c->__('status.status')}</p>
+    </li>
 </ul>
diff --git a/sources/app/widgets/Publish/Publish.php b/sources/app/widgets/Publish/Publish.php
index c527bd7..01d76d1 100644
--- a/sources/app/widgets/Publish/Publish.php
+++ b/sources/app/widgets/Publish/Publish.php
@@ -205,7 +205,7 @@ class Publish extends \Movim\Widget\Base
                 ));
             }
 
-            if($form->embed->value != '' && filter_var($form->embed->value, FILTER_VALIDATE_URL)) {
+            if(Validator::notEmpty()->url()->validate($form->embed->value)) {
                 try {
                     $embed = Embed\Embed::create($form->embed->value);
                     $p->setLink($form->embed->value);
@@ -222,6 +222,10 @@ class Publish extends \Movim\Widget\Base
                 }
             }
 
+            if($form->open->value === true) {
+                $p->isOpen();
+            }
+
             if($content != '') {
                 $p->setContent(htmlspecialchars($content));
             }
diff --git a/sources/app/widgets/Publish/_publish_create.tpl b/sources/app/widgets/Publish/_publish_create.tpl
index ba7d7fb..dc829b6 100644
--- a/sources/app/widgets/Publish/_publish_create.tpl
+++ b/sources/app/widgets/Publish/_publish_create.tpl
@@ -76,17 +76,6 @@
         <label for="content">{$c->__('post.content_label')}</label>
     </div>
 
-    <ul class="list middle flex active">
-        {if="$c->supported('upload')"}
-        <li class="block large" onclick="Upload_ajaxRequest()">
-            <span class="primary icon">
-                <i class="zmdi zmdi-attachment-alt"></i>
-            </span>
-            <p class="normal line">{$c->__('publish.attach')}</p>
-        </li>
-        {/if}
-    </ul>
-
     <div>
         {if="$item != false"}
             {$tags = $item->getTagsImploded()}
@@ -100,4 +89,43 @@
             {/if}>
         <label for="title">{$c->__('post.tags')}</label>
     </div>
+
+    <ul class="list middle active">
+        {if="$c->supported('upload')"}
+        <li class="block large" onclick="Upload_ajaxRequest()">
+            <span class="primary icon gray">
+                <i class="zmdi zmdi-attachment-alt"></i>
+            </span>
+            <p class="normal line">{$c->__('publish.attach')}</p>
+        </li>
+        {/if}
+    </ul>
+
+    <div>
+        <ul class="list thin">
+            <li>
+                <span class="primary icon gray">
+                    <i class="zmdi zmdi-portable-wifi"></i>
+                </span>
+                <span class="control">
+                    <div class="action">
+                        <div class="checkbox">
+                            <input
+                                type="checkbox"
+                                id="open"
+                                name="open"
+                                {if="$item != false && $item->open"}
+                                    checked
+                                {/if}
+                            >
+                            <label for="open"></label>
+                        </div>
+                    </div>
+                </span>
+                <p class="line normal">
+                    {$c->__('post.public')}
+                </p>
+            </li>
+        </ul>
+    </div>
 </form>
diff --git a/sources/app/widgets/Publish/publish.css b/sources/app/widgets/Publish/publish.css
index 5fb365e..1b692f7 100644
--- a/sources/app/widgets/Publish/publish.css
+++ b/sources/app/widgets/Publish/publish.css
@@ -11,3 +11,7 @@ form[name=post] #enable_content:hover > * {
 form[name=post] #content_field {
     display: none;
 }
+
+form[name=post] article section {
+    padding-top: 0;
+}
diff --git a/sources/app/widgets/Rooms/Rooms.php b/sources/app/widgets/Rooms/Rooms.php
index ebf651e..358d94a 100644
--- a/sources/app/widgets/Rooms/Rooms.php
+++ b/sources/app/widgets/Rooms/Rooms.php
@@ -51,6 +51,14 @@ class Rooms extends \Movim\Widget\Base
         RPC::call('Rooms.refresh');
     }
 
+    /**
+     * @brief Get the Rooms
+     */
+    public function ajaxDisplay()
+    {
+        $this->refreshRooms();
+    }
+
     /**
      * @brief Display the add room form
      */
@@ -99,7 +107,7 @@ class Rooms extends \Movim\Widget\Base
     {
         if(!$this->validateRoom($room)) return;
 
-        $cd = new \modl\ConferenceDAO();
+        $cd = new \Modl\ConferenceDAO;
         $cd->deleteNode($room);
 
         $this->setBookmark();
@@ -120,11 +128,6 @@ class Rooms extends \Movim\Widget\Base
             $nickname = $s->get('username');
         }
 
-        if($nickname == false || $nickname == null) {
-            $session = \Sessionx::start();
-            $nickname = $session->username;
-        }
-
         $p->setNickname($nickname);
 
         $p->request();
@@ -142,11 +145,6 @@ class Rooms extends \Movim\Widget\Base
         $s = Session::start();
         $resource = $s->get('username');
 
-        if($resource == null) {
-            $session = \Sessionx::start();
-            $resource = $session->username;
-        }
-
         $pu = new Unavailable;
         $pu->setTo($room)
            ->setResource($resource)
@@ -178,14 +176,15 @@ class Rooms extends \Movim\Widget\Base
 
     public function setBookmark($item = false)
     {
-        $arr = array();
+        $arr = [];
 
         if($item) {
             array_push($arr, $item);
         }
 
-        $sd = new \modl\SubscriptionDAO();
-        $cd = new \modl\ConferenceDAO();
+        $sd = new \Modl\SubscriptionDAO;
+        $cd = new \Modl\ConferenceDAO;
+        $session = Session::start();
 
         if($sd->getSubscribed()) {
             foreach($sd->getSubscribed() as $s) {
@@ -213,7 +212,7 @@ class Rooms extends \Movim\Widget\Base
 
         $b = new Set;
         $b->setArr($arr)
-          ->setTo($this->user->getLogin())
+          ->setTo($session->get('jid'))
           ->request();
     }
 
@@ -225,11 +224,11 @@ class Rooms extends \Movim\Widget\Base
             return;
         }
 
-        $pd = new \modl\PresenceDAO();
+        $pd = new \Modl\PresenceDAO;
 
         if($resource == false) {
-            $session = \Sessionx::start();
-            $resource = $session->user;
+            $session = \Session::start();
+            $resource = $session->get('username');
         }
 
         $presence = $pd->getPresence($room, $resource);
@@ -248,19 +247,21 @@ class Rooms extends \Movim\Widget\Base
 
         $list = $cod->getAll();
 
-        $connected = array();
+        $connected = [];
 
-        foreach($list as $key => $room) {
-            if($this->checkConnected($room->conference, $room->nick)) {
-                $room->connected = true;
-                array_push($connected, $room);
-                unset($list[$key]);
+        if(is_array($list)) {
+            foreach($list as $key => $room) {
+                if($this->checkConnected($room->conference, $room->nick)) {
+                    $room->connected = true;
+                    array_push($connected, $room);
+                    unset($list[$key]);
+                }
             }
+
+            $connected = array_merge($connected, $list);
         }
 
-        $list = array_merge($connected, $list);
-
-        $view->assign('conferences', $list);
+        $view->assign('conferences', $connected);
         $view->assign('room', $this->get('r'));
 
         return $view->draw('_rooms', true);
@@ -292,6 +293,5 @@ class Rooms extends \Movim\Widget\Base
 
     function display()
     {
-        $this->view->assign('list', $this->prepareRooms());
     }
 }
diff --git a/sources/app/widgets/Rooms/rooms.js b/sources/app/widgets/Rooms/rooms.js
index 8c17124..9623bde 100644
--- a/sources/app/widgets/Rooms/rooms.js
+++ b/sources/app/widgets/Rooms/rooms.js
@@ -18,7 +18,7 @@ var Rooms = {
                             Rooms_ajaxJoin(this.dataset.jid);
                         }
                     }
-                    
+
                     Chat_ajaxGetRoom(this.dataset.jid);
                     Chats.reset(items);
                     movim_add_class(this, 'active');
@@ -69,4 +69,5 @@ var Rooms = {
 MovimWebsocket.attach(function() {
     Rooms.refresh();
     Rooms.anonymousInit();
+    Rooms_ajaxDisplay();
 });
diff --git a/sources/app/widgets/Rooms/rooms.tpl b/sources/app/widgets/Rooms/rooms.tpl
index b486395..60cb8c1 100644
--- a/sources/app/widgets/Rooms/rooms.tpl
+++ b/sources/app/widgets/Rooms/rooms.tpl
@@ -1 +1 @@
-<div id="rooms_widget">{$list}</div>
+<div id="rooms_widget"></div>
diff --git a/sources/app/widgets/Statistics/Statistics.php b/sources/app/widgets/Statistics/Statistics.php
index f66268d..4f5cfb8 100644
--- a/sources/app/widgets/Statistics/Statistics.php
+++ b/sources/app/widgets/Statistics/Statistics.php
@@ -1,39 +1,18 @@
 <?php
 
-/**
- * @package Widgets
- *
- * @file Statistics.php
- * This file is part of MOVIM.
- *
- * @brief The administration widget.
- *
- * @author Timothée Jaussoin <edhelas@gmail.com>
- * *
- * Copyright (C)2014 MOVIM project
- *
- * See COPYING for licensing information.
- */
-
 use Modl\SessionxDAO;
 
 class Statistics extends \Movim\Widget\Base
 {
     function load()
     {
+        $this->addjs('chart.min.js');
+        $this->addjs('statistics.js');
     }
 
-    function display()
+    function ajaxDisplay()
     {
-        $sd = new SessionxDAO;
-        $this->view->assign('sessions',      $sd->getAll());
-
-        $cd = new \Modl\ConfigDAO();
-        $config = $cd->get();
-
-        $this->view->assign('hash',          $config->password);
-
-        $tmp = array();
+        $tmp = [];
 
         foreach(scandir(USERS_PATH) as $f) {
             if(is_dir(USERS_PATH.'/'.$f)) {
@@ -45,9 +24,9 @@ class Statistics extends \Movim\Widget\Base
         }
 
         sort($tmp);
-        $days = array();
+        $days = [];
 
-        $pattern = "Y-m";
+        $pattern = "M Y";
 
         foreach($tmp as $k => $time) {
             $key = date($pattern, $time);
@@ -59,15 +38,34 @@ class Statistics extends \Movim\Widget\Base
             }
         }
 
-        $this->renderTimeLineChart($days, $this->__('statistics.monthly_sub'), "monthly.png");
+        $data = new stdClass;
+        $data->labels = [];
+        $data->datasets = [];
 
-        $sum = 0;
+        $first = new StdClass;
+        $first->label = "Monthly Subscriptions";
+        $first->fillColor = "rgba(255,152,0,0.5)";
+        $first->strokeColor = "rgba(255,152,0,0.8)";
+        $first->highlightFill = "rgba(220,220,220,0.75)";
+        $first->highlightStroke = "rgba(220,220,220,1)";
+
+        $values = [];
         foreach($days as $key => $value) {
-            $sum = $sum + $value;
-            $days[$key] = $sum;
+            array_push($data->labels, $key);
+            array_push($values, $value);
         }
 
-        $this->renderTimeLineChart($days, $this->__('statistics.monthly_sub_cum'), "monthly_cumulated.png");
+        $first->data = $values;
+
+        array_push($data->datasets, $first);
+
+        RPC::call('Statistics.drawGraphs', $data);
+    }
+
+    function display()
+    {
+        $sd = new SessionxDAO;
+        $this->view->assign('sessions',      $sd->getAll());
     }
 
     public function getContact($username, $host)
@@ -77,24 +75,6 @@ class Statistics extends \Movim\Widget\Base
         return $cd->get($jid);
     }
 
-    private function renderTimeLineChart($data, $title, $filename)
-    {
-        $chart = new Libchart\View\Chart\LineChart(750, 450);
-
-        $dataSet = new Libchart\Model\XYDataSet();
-
-        foreach($data as $key => $value) {
-            $dataSet->addPoint(new Libchart\Model\Point($key, $value));
-        }
-
-        $chart->setDataSet($dataSet);
-
-        $chart->setTitle($title);
-        $chart->render(CACHE_PATH.$filename);
-
-        $this->view->assign('cache_path',      BASE_URI.'cache/');
-    }
-
     function getTime($date)
     {
         return prepareDate(strtotime($date));
diff --git a/sources/app/widgets/Statistics/chart.min.js b/sources/app/widgets/Statistics/chart.min.js
new file mode 100644
index 0000000..c4c4ef0
--- /dev/null
+++ b/sources/app/widgets/Statistics/chart.min.js
@@ -0,0 +1,11 @@
+/*!
+ * Chart.js
+ * http://chartjs.org/
+ * Version: 1.0.1
+ *
+ * Copyright 2015 Nick Downie
+ * Released under the MIT license
+ * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md
+ */
+(function(){"use strict";var t=this,i=t.Chart,e=function(t){this.canvas=t.canvas,this.ctx=t;var i=function(t,i){return t["offset"+i]?t["offset"+i]:document.defaultView.getComputedStyle(t).getPropertyValue(i)},e=this.width=i(t.canvas,"Width"),n=this.height=i(t.canvas,"Height");t.canvas.width=e,t.canvas.height=n;var e=this.width=t.canvas.width,n=this.height=t.canvas.height;return this.aspectRatio=this.width/this.height,s.retinaScale(this),this};e.defaults={global:{animation:!0,animationSteps:60,animationEasing:"easeOutQuart",showScale:!0,scaleOverride:!1,scaleSteps:null,scaleStepWidth:null,scaleStartValue:null,scaleLineColor:"rgba(0,0,0,.1)",scaleLineWidth:1,scaleShowLabels:!0,scaleLabel:"<%=value%>",scaleIntegersOnly:!0,scaleBeginAtZero:!1,scaleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",scaleFontSize:12,scaleFontStyle:"normal",scaleFontColor:"#666",responsive:!1,maintainAspectRatio:!0,showTooltips:!0,customTooltips:!1,tooltipEvents:["mousemove","touchstart","touchmove","mouseout"],tooltipFillColor:"rgba(0,0,0,0.8)",tooltipFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipFontSize:14,tooltipFontStyle:"normal",tooltipFontColor:"#fff",tooltipTitleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipTitleFontSize:14,tooltipTitleFontStyle:"bold",tooltipTitleFontColor:"#fff",tooltipYPadding:6,tooltipXPadding:6,tooltipCaretSize:8,tooltipCornerRadius:6,tooltipXOffset:10,tooltipTemplate:"<%if (label){%><%=label%>: <%}%><%= value %>",multiTooltipTemplate:"<%= value %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},e.types={};var s=e.helpers={},n=s.each=function(t,i,e){var s=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var n;for(n=0;n<t.length;n++)i.apply(e,[t[n],n].concat(s))}else for(var o in t)i.apply(e,[t[o],o].concat(s))},o=s.clone=function(t){var i={};return n(t,function(e,s){t.hasOwnProperty(s)&&(i[s]=e)}),i},a=s.extend=function(t){return n(Array.prototype.slice.call(arguments,1),function(i){n(i,function(e,s){i.hasOwnProperty(s)&&(t[s]=e)})}),t},h=s.merge=function(){var t=Array.prototype.slice.call(arguments,0);return t.unshift({}),a.apply(null,t)},l=s.indexOf=function(t,i){if(Array.prototype.indexOf)return t.indexOf(i);for(var e=0;e<t.length;e++)if(t[e]===i)return e;return-1},r=(s.where=function(t,i){var e=[];return s.each(t,function(t){i(t)&&e.push(t)}),e},s.findNextWhere=function(t,i,e){e||(e=-1);for(var s=e+1;s<t.length;s++){var n=t[s];if(i(n))return n}},s.findPreviousWhere=function(t,i,e){e||(e=t.length);for(var s=e-1;s>=0;s--){var n=t[s];if(i(n))return n}},s.inherits=function(t){var i=this,e=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return i.apply(this,arguments)},s=function(){this.constructor=e};return s.prototype=i.prototype,e.prototype=new s,e.extend=r,t&&a(e.prototype,t),e.__super__=i.prototype,e}),c=s.noop=function(){},u=s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),d=s.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},p=s.amd="function"==typeof define&&define.amd,f=s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=s.max=function(t){return Math.max.apply(Math,t)},m=s.min=function(t){return Math.min.apply(Math,t)},v=(s.cap=function(t,i,e){if(f(i)){if(t>i)return i}else if(f(e)&&e>t)return e;return t},s.getDecimalPlaces=function(t){return t%1!==0&&f(t)?t.toString().split(".")[1].length:0}),S=s.radians=function(t){return t*(Math.PI/180)},x=(s.getAngleFromPoint=function(t,i){var e=i.x-t.x,s=i.y-t.y,n=Math.sqrt(e*e+s*s),o=2*Math.PI+Math.atan2(s,e);return 0>e&&0>s&&(o+=2*Math.PI),{angle:o,distance:n}},s.aliasPixel=function(t){return t%2===0?0:.5}),y=(s.splineCurve=function(t,i,e,s){var n=Math.sqrt(Math.pow(i.x-t.x,2)+Math.pow(i.y-t.y,2)),o=Math.sqrt(Math.pow(e.x-i.x,2)+Math.pow(e.y-i.y,2)),a=s*n/(n+o),h=s*o/(n+o);return{inner:{x:i.x-a*(e.x-t.x),y:i.y-a*(e.y-t.y)},outer:{x:i.x+h*(e.x-t.x),y:i.y+h*(e.y-t.y)}}},s.calculateOrderOfMagnitude=function(t){return Math.floor(Math.log(t)/Math.LN10)}),C=(s.calculateScaleRange=function(t,i,e,s,n){var o=2,a=Math.floor(i/(1.5*e)),h=o>=a,l=g(t),r=m(t);l===r&&(l+=.5,r>=.5&&!s?r-=.5:l+=.5);for(var c=Math.abs(l-r),u=y(c),d=Math.ceil(l/(1*Math.pow(10,u)))*Math.pow(10,u),p=s?0:Math.floor(r/(1*Math.pow(10,u)))*Math.pow(10,u),f=d-p,v=Math.pow(10,u),S=Math.round(f/v);(S>a||a>2*S)&&!h;)if(S>a)v*=2,S=Math.round(f/v),S%1!==0&&(h=!0);else if(n&&u>=0){if(v/2%1!==0)break;v/=2,S=Math.round(f/v)}else v/=2,S=Math.round(f/v);return h&&(S=o,v=f/S),{steps:S,stepValue:v,min:p,max:p+S*v}},s.template=function(t,i){function e(t,i){var e=/\W/.test(t)?new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+t.replace(/[\r\t\n]/g," ").split("<%").join("	").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("	").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');"):s[t]=s[t];return i?e(i):e}if(t instanceof Function)return t(i);var s={};return e(t,i)}),w=(s.generateLabels=function(t,i,e,s){var o=new Array(i);return labelTemplateString&&n(o,function(i,n){o[n]=C(t,{value:e+s*(n+1)})}),o},s.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),-(s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)))},easeOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),s*Math.pow(2,-10*t)*Math.sin(2*(1*t-i)*Math.PI/e)+1)},easeInOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:2==(t/=.5)?1:(e||(e=.3*1.5),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),1>t?-.5*s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e):s*Math.pow(2,-10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)*.5+1)},easeInBack:function(t){var i=1.70158;return 1*(t/=1)*t*((i+1)*t-i)},easeOutBack:function(t){var i=1.70158;return 1*((t=t/1-1)*t*((i+1)*t+i)+1)},easeInOutBack:function(t){var i=1.70158;return(t/=.5)<1?.5*t*t*(((i*=1.525)+1)*t-i):.5*((t-=2)*t*(((i*=1.525)+1)*t+i)+2)},easeInBounce:function(t){return 1-w.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?7.5625*t*t:2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*w.easeInBounce(2*t):.5*w.easeOutBounce(2*t-1)+.5}}),b=s.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),P=s.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),L=(s.animationLoop=function(t,i,e,s,n,o){var a=0,h=w[e]||w.linear,l=function(){a++;var e=a/i,r=h(e);t.call(o,r,e,a),s.call(o,r,e),i>a?o.animationFrame=b(l):n.apply(o)};b(l)},s.getRelativePosition=function(t){var i,e,s=t.originalEvent||t,n=t.currentTarget||t.srcElement,o=n.getBoundingClientRect();return s.touches?(i=s.touches[0].clientX-o.left,e=s.touches[0].clientY-o.top):(i=s.clientX-o.left,e=s.clientY-o.top),{x:i,y:e}},s.addEvent=function(t,i,e){t.addEventListener?t.addEventListener(i,e):t.attachEvent?t.attachEvent("on"+i,e):t["on"+i]=e}),k=s.removeEvent=function(t,i,e){t.removeEventListener?t.removeEventListener(i,e,!1):t.detachEvent?t.detachEvent("on"+i,e):t["on"+i]=c},F=(s.bindEvents=function(t,i,e){t.events||(t.events={}),n(i,function(i){t.events[i]=function(){e.apply(t,arguments)},L(t.chart.canvas,i,t.events[i])})},s.unbindEvents=function(t,i){n(i,function(i,e){k(t.chart.canvas,e,i)})}),R=s.getMaximumWidth=function(t){var i=t.parentNode;return i.clientWidth},T=s.getMaximumHeight=function(t){var i=t.parentNode;return i.clientHeight},A=(s.getMaximumSize=s.getMaximumWidth,s.retinaScale=function(t){var i=t.ctx,e=t.canvas.width,s=t.canvas.height;window.devicePixelRatio&&(i.canvas.style.width=e+"px",i.canvas.style.height=s+"px",i.canvas.height=s*window.devicePixelRatio,i.canvas.width=e*window.devicePixelRatio,i.scale(window.devicePixelRatio,window.devicePixelRatio))}),M=s.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},W=s.fontString=function(t,i,e){return i+" "+t+"px "+e},z=s.longestText=function(t,i,e){t.font=i;var s=0;return n(e,function(i){var e=t.measureText(i).width;s=e>s?e:s}),s},B=s.drawRoundedRectangle=function(t,i,e,s,n,o){t.beginPath(),t.moveTo(i+o,e),t.lineTo(i+s-o,e),t.quadraticCurveTo(i+s,e,i+s,e+o),t.lineTo(i+s,e+n-o),t.quadraticCurveTo(i+s,e+n,i+s-o,e+n),t.lineTo(i+o,e+n),t.quadraticCurveTo(i,e+n,i,e+n-o),t.lineTo(i,e+o),t.quadraticCurveTo(i,e,i+o,e),t.closePath()};e.instances={},e.Type=function(t,i,s){this.options=i,this.chart=s,this.id=u(),e.instances[this.id]=this,i.responsive&&this.resize(),this.initialize.call(this,t)},a(e.Type.prototype,{initialize:function(){return this},clear:function(){return M(this.chart),this},stop:function(){return P(this.animationFrame),this},resize:function(t){this.stop();var i=this.chart.canvas,e=R(this.chart.canvas),s=this.options.maintainAspectRatio?e/this.chart.aspectRatio:T(this.chart.canvas);return i.width=this.chart.width=e,i.height=this.chart.height=s,A(this.chart),"function"==typeof t&&t.apply(this,Array.prototype.slice.call(arguments,1)),this},reflow:c,render:function(t){return t&&this.reflow(),this.options.animation&&!t?s.animationLoop(this.draw,this.options.animationSteps,this.options.animationEasing,this.options.onAnimationProgress,this.options.onAnimationComplete,this):(this.draw(),this.options.onAnimationComplete.call(this)),this},generateLegend:function(){return C(this.options.legendTemplate,this)},destroy:function(){this.clear(),F(this,this.events);var t=this.chart.canvas;t.width=this.chart.width,t.height=this.chart.height,t.style.removeProperty?(t.style.removeProperty("width"),t.style.removeProperty("height")):(t.style.removeAttribute("width"),t.style.removeAttribute("height")),delete e.instances[this.id]},showTooltip:function(t,i){"undefined"==typeof this.activeElements&&(this.activeElements=[]);var o=function(t){var i=!1;return t.length!==this.activeElements.length?i=!0:(n(t,function(t,e){t!==this.activeElements[e]&&(i=!0)},this),i)}.call(this,t);if(o||i){if(this.activeElements=t,this.draw(),this.options.customTooltips&&this.options.customTooltips(!1),t.length>0)if(this.datasets&&this.datasets.length>1){for(var a,h,r=this.datasets.length-1;r>=0&&(a=this.datasets[r].points||this.datasets[r].bars||this.datasets[r].segments,h=l(a,t[0]),-1===h);r--);var c=[],u=[],d=function(){var t,i,e,n,o,a=[],l=[],r=[];return s.each(this.datasets,function(i){t=i.points||i.bars||i.segments,t[h]&&t[h].hasValue()&&a.push(t[h])}),s.each(a,function(t){l.push(t.x),r.push(t.y),c.push(s.template(this.options.multiTooltipTemplate,t)),u.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),o=m(r),e=g(r),n=m(l),i=g(l),{x:n>this.chart.width/2?n:i,y:(o+e)/2}}.call(this,h);new e.MultiTooltip({x:d.x,y:d.y,xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,xOffset:this.options.tooltipXOffset,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,titleTextColor:this.options.tooltipTitleFontColor,titleFontFamily:this.options.tooltipTitleFontFamily,titleFontStyle:this.options.tooltipTitleFontStyle,titleFontSize:this.options.tooltipTitleFontSize,cornerRadius:this.options.tooltipCornerRadius,labels:c,legendColors:u,legendColorBackground:this.options.multiTooltipKeyBackground,title:t[0].label,chart:this.chart,ctx:this.chart.ctx,custom:this.options.customTooltips}).draw()}else n(t,function(t){var i=t.tooltipPosition();new e.Tooltip({x:Math.round(i.x),y:Math.round(i.y),xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,caretHeight:this.options.tooltipCaretSize,cornerRadius:this.options.tooltipCornerRadius,text:C(this.options.tooltipTemplate,t),chart:this.chart,custom:this.options.customTooltips}).draw()},this);return this}},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)}}),e.Type.extend=function(t){var i=this,s=function(){return i.apply(this,arguments)};if(s.prototype=o(i.prototype),a(s.prototype,t),s.extend=e.Type.extend,t.name||i.prototype.name){var n=t.name||i.prototype.name,l=e.defaults[i.prototype.name]?o(e.defaults[i.prototype.name]):{};e.defaults[n]=a(l,t.defaults),e.types[n]=s,e.prototype[n]=function(t,i){var o=h(e.defaults.global,e.defaults[n],i||{});return new s(t,o,this)}}else d("Name not provided for this chart, so it hasn't been registered");return i},e.Element=function(t){a(this,t),this.initialize.apply(this,arguments),this.save()},a(e.Element.prototype,{initialize:function(){},restore:function(t){return t?n(t,function(t){this[t]=this._saved[t]},this):a(this,this._saved),this},save:function(){return this._saved=o(this),delete this._saved._saved,this},update:function(t){return n(t,function(t,i){this._saved[i]=this[i],this[i]=t},this),this},transition:function(t,i){return n(t,function(t,e){this[e]=(t-this._saved[e])*i+this._saved[e]},this),this},tooltipPosition:function(){return{x:this.x,y:this.y}},hasValue:function(){return f(this.value)}}),e.Element.extend=r,e.Point=e.Element.extend({display:!0,inRange:function(t,i){var e=this.hitDetectionRadius+this.radius;return Math.pow(t-this.x,2)+Math.pow(i-this.y,2)<Math.pow(e,2)},draw:function(){if(this.display){var t=this.ctx;t.beginPath(),t.arc(this.x,this.y,this.radius,0,2*Math.PI),t.closePath(),t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.fillStyle=this.fillColor,t.fill(),t.stroke()}}}),e.Arc=e.Element.extend({inRange:function(t,i){var e=s.getAngleFromPoint(this,{x:t,y:i}),n=e.angle>=this.startAngle&&e.angle<=this.endAngle,o=e.distance>=this.innerRadius&&e.distance<=this.outerRadius;return n&&o},tooltipPosition:function(){var t=this.startAngle+(this.endAngle-this.startAngle)/2,i=(this.outerRadius-this.innerRadius)/2+this.innerRadius;return{x:this.x+Math.cos(t)*i,y:this.y+Math.sin(t)*i}},draw:function(t){var i=this.ctx;i.beginPath(),i.arc(this.x,this.y,this.outerRadius,this.startAngle,this.endAngle),i.arc(this.x,this.y,this.innerRadius,this.endAngle,this.startAngle,!0),i.closePath(),i.strokeStyle=this.strokeColor,i.lineWidth=this.strokeWidth,i.fillStyle=this.fillColor,i.fill(),i.lineJoin="bevel",this.showStroke&&i.stroke()}}),e.Rectangle=e.Element.extend({draw:function(){var t=this.ctx,i=this.width/2,e=this.x-i,s=this.x+i,n=this.base-(this.base-this.y),o=this.strokeWidth/2;this.showStroke&&(e+=o,s-=o,n+=o),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(e,this.base),t.lineTo(e,n),t.lineTo(s,n),t.lineTo(s,this.base),t.fill(),this.showStroke&&t.stroke()},height:function(){return this.base-this.y},inRange:function(t,i){return t>=this.x-this.width/2&&t<=this.x+this.width/2&&i>=this.y&&i<=this.base}}),e.Tooltip=e.Element.extend({draw:function(){var t=this.chart.ctx;t.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.xAlign="center",this.yAlign="above";var i=this.caretPadding=2,e=t.measureText(this.text).width+2*this.xPadding,s=this.fontSize+2*this.yPadding,n=s+this.caretHeight+i;this.x+e/2>this.chart.width?this.xAlign="left":this.x-e/2<0&&(this.xAlign="right"),this.y-n<0&&(this.yAlign="below");var o=this.x-e/2,a=this.y-n;if(t.fillStyle=this.fillColor,this.custom)this.custom(this);else{switch(this.yAlign){case"above":t.beginPath(),t.moveTo(this.x,this.y-i),t.lineTo(this.x+this.caretHeight,this.y-(i+this.caretHeight)),t.lineTo(this.x-this.caretHeight,this.y-(i+this.caretHeight)),t.closePath(),t.fill();break;case"below":a=this.y+i+this.caretHeight,t.beginPath(),t.moveTo(this.x,this.y+i),t.lineTo(this.x+this.caretHeight,this.y+i+this.caretHeight),t.lineTo(this.x-this.caretHeight,this.y+i+this.caretHeight),t.closePath(),t.fill()}switch(this.xAlign){case"left":o=this.x-e+(this.cornerRadius+this.caretHeight);break;case"right":o=this.x-(this.cornerRadius+this.caretHeight)}B(t,o,a,e,s,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,o+e/2,a+s/2)}}}),e.MultiTooltip=e.Element.extend({initialize:function(){this.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=W(this.titleFontSize,this.titleFontStyle,this.titleFontFamily),this.height=this.labels.length*this.fontSize+(this.labels.length-1)*(this.fontSize/2)+2*this.yPadding+1.5*this.titleFontSize,this.ctx.font=this.titleFont;var t=this.ctx.measureText(this.title).width,i=z(this.ctx,this.font,this.labels)+this.fontSize+3,e=g([i,t]);this.width=e+2*this.xPadding;var s=this.height/2;this.y-s<0?this.y=s:this.y+s>this.chart.height&&(this.y=this.chart.height-s),this.x>this.chart.width/2?this.x-=this.xOffset+this.width:this.x+=this.xOffset},getLineHeight:function(t){var i=this.y-this.height/2+this.yPadding,e=t-1;return 0===t?i+this.titleFontSize/2:i+(1.5*this.fontSize*e+this.fontSize/2)+1.5*this.titleFontSize},draw:function(){if(this.custom)this.custom(this);else{B(this.ctx,this.x,this.y-this.height/2,this.width,this.height,this.cornerRadius);var t=this.ctx;t.fillStyle=this.fillColor,t.fill(),t.closePath(),t.textAlign="left",t.textBaseline="middle",t.fillStyle=this.titleTextColor,t.font=this.titleFont,t.fillText(this.title,this.x+this.xPadding,this.getLineHeight(0)),t.font=this.font,s.each(this.labels,function(i,e){t.fillStyle=this.textColor,t.fillText(i,this.x+this.xPadding+this.fontSize+3,this.getLineHeight(e+1)),t.fillStyle=this.legendColorBackground,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize),t.fillStyle=this.legendColors[e].fill,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize)},this)}}}),e.Scale=e.Element.extend({initialize:function(){this.fit()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}));this.yLabelWidth=this.display&&this.showLabels?z(this.ctx,this.font,this.yLabels):0},addXLabel:function(t){this.xLabels.push(t),this.valuesCount++,this.fit()},removeXLabel:function(){this.xLabels.shift(),this.valuesCount--,this.fit()},fit:function(){this.startPoint=this.display?this.fontSize:0,this.endPoint=this.display?this.height-1.5*this.fontSize-5:this.height,this.startPoint+=this.padding,this.endPoint-=this.padding;var t,i=this.endPoint-this.startPoint;for(this.calculateYRange(i),this.buildYLabels(),this.calculateXLabelRotation();i>this.endPoint-this.startPoint;)i=this.endPoint-this.startPoint,t=this.yLabelWidth,this.calculateYRange(i),this.buildYLabels(),t<this.yLabelWidth&&this.calculateXLabelRotation()},calculateXLabelRotation:function(){this.ctx.font=this.font;var t,i,e=this.ctx.measureText(this.xLabels[0]).width,s=this.ctx.measureText(this.xLabels[this.xLabels.length-1]).width;if(this.xScalePaddingRight=s/2+3,this.xScalePaddingLeft=e/2>this.yLabelWidth+10?e/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var n,o=z(this.ctx,this.font,this.xLabels);this.xLabelWidth=o;for(var a=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>a&&0===this.xLabelRotation||this.xLabelWidth>a&&this.xLabelRotation<=90&&this.xLabelRotation>0;)n=Math.cos(S(this.xLabelRotation)),t=n*e,i=n*s,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=n*o;this.xLabelRotation>0&&(this.endPoint-=Math.sin(S(this.xLabelRotation))*o+3)}else this.xLabelWidth=0,this.xScalePaddingRight=this.padding,this.xScalePaddingLeft=this.padding},calculateYRange:c,drawingArea:function(){return this.startPoint-this.endPoint},calculateY:function(t){var i=this.drawingArea()/(this.min-this.max);return this.endPoint-i*(t-this.min)},calculateX:function(t){var i=(this.xLabelRotation>0,this.width-(this.xScalePaddingLeft+this.xScalePaddingRight)),e=i/Math.max(this.valuesCount-(this.offsetGridLines?0:1),1),s=e*t+this.xScalePaddingLeft;return this.offsetGridLines&&(s+=e/2),Math.round(s)},update:function(t){s.extend(this,t),this.fit()},draw:function(){var t=this.ctx,i=(this.endPoint-this.startPoint)/this.steps,e=Math.round(this.xScalePaddingLeft);this.display&&(t.fillStyle=this.textColor,t.font=this.font,n(this.yLabels,function(n,o){var a=this.endPoint-i*o,h=Math.round(a),l=this.showHorizontalLines;t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(n,e-10,a),0!==o||l||(l=!0),l&&t.beginPath(),o>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),h+=s.aliasPixel(t.lineWidth),l&&(t.moveTo(e,h),t.lineTo(this.width,h),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(e-5,h),t.lineTo(e,h),t.stroke(),t.closePath()},this),n(this.xLabels,function(i,e){var s=this.calculateX(e)+x(this.lineWidth),n=this.calculateX(e-(this.offsetGridLines?.5:0))+x(this.lineWidth),o=this.xLabelRotation>0,a=this.showVerticalLines;0!==e||a||(a=!0),a&&t.beginPath(),e>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),a&&(t.moveTo(n,this.endPoint),t.lineTo(n,this.startPoint-3),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(n,this.endPoint),t.lineTo(n,this.endPoint+5),t.stroke(),t.closePath(),t.save(),t.translate(s,o?this.endPoint+12:this.endPoint+8),t.rotate(-1*S(this.xLabelRotation)),t.font=this.font,t.textAlign=o?"right":"center",t.textBaseline=o?"middle":"top",t.fillText(i,0,0),t.restore()},this))}}),e.RadialScale=e.Element.extend({initialize:function(){this.size=m([this.height,this.width]),this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2},calculateCenterOffset:function(t){var i=this.drawingArea/(this.max-this.min);return(t-this.min)*i},update:function(){this.lineArc?this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2:this.setScaleSize(),this.buildYLabels()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,i,e,s,n,o,a,h,l,r,c,u,d=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),p=this.width,g=0;for(this.ctx.font=W(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),i=0;i<this.valuesCount;i++)t=this.getPointPosition(i,d),e=this.ctx.measureText(C(this.templateString,{value:this.labels[i]})).width+5,0===i||i===this.valuesCount/2?(s=e/2,t.x+s>p&&(p=t.x+s,n=i),t.x-s<g&&(g=t.x-s,a=i)):i<this.valuesCount/2?t.x+e>p&&(p=t.x+e,n=i):i>this.valuesCount/2&&t.x-e<g&&(g=t.x-e,a=i);l=g,r=Math.ceil(p-this.width),o=this.getIndexAngle(n),h=this.getIndexAngle(a),c=r/Math.sin(o+Math.PI/2),u=l/Math.sin(h+Math.PI/2),c=f(c)?c:0,u=f(u)?u:0,this.drawingArea=d-(u+c)/2,this.setCenterPoint(u,c)},setCenterPoint:function(t,i){var e=this.width-i-this.drawingArea,s=t+this.drawingArea;this.xCenter=(s+e)/2,this.yCenter=this.height/2},getIndexAngle:function(t){var i=2*Math.PI/this.valuesCount;return t*i-Math.PI/2},getPointPosition:function(t,i){var e=this.getIndexAngle(t);return{x:Math.cos(e)*i+this.xCenter,y:Math.sin(e)*i+this.yCenter}},draw:function(){if(this.display){var t=this.ctx;if(n(this.yLabels,function(i,e){if(e>0){var s,n=e*(this.drawingArea/this.steps),o=this.yCenter-n;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,n,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var a=0;a<this.valuesCount;a++)s=this.getPointPosition(a,this.calculateCenterOffset(this.min+e*this.stepValue)),0===a?t.moveTo(s.x,s.y):t.lineTo(s.x,s.y);t.closePath(),t.stroke()}if(this.showLabels){if(t.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.showLabelBackdrop){var h=t.measureText(i).width;t.fillStyle=this.backdropColor,t.fillRect(this.xCenter-h/2-this.backdropPaddingX,o-this.fontSize/2-this.backdropPaddingY,h+2*this.backdropPaddingX,this.fontSize+2*this.backdropPaddingY)}t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.fontColor,t.fillText(i,this.xCenter,o)}}},this),!this.lineArc){t.lineWidth=this.angleLineWidth,t.strokeStyle=this.angleLineColor;for(var i=this.valuesCount-1;i>=0;i--){if(this.angleLineWidth>0){var e=this.getPointPosition(i,this.calculateCenterOffset(this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(e.x,e.y),t.stroke(),t.closePath()}var s=this.getPointPosition(i,this.calculateCenterOffset(this.max)+5);t.font=W(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var o=this.labels.length,a=this.labels.length/2,h=a/2,l=h>i||i>o-h,r=i===h||i===o-h;t.textAlign=0===i?"center":i===a?"center":a>i?"left":"right",t.textBaseline=r?"middle":l?"bottom":"top",t.fillText(this.labels[i],s.x,s.y)}}}}}),s.addEvent(window,"resize",function(){var t;return function(){clearTimeout(t),t=setTimeout(function(){n(e.instances,function(t){t.options.responsive&&t.resize(t.render,!0)})},50)}}()),p?define(function(){return e}):"object"==typeof module&&module.exports&&(module.exports=e),t.Chart=e,e.noConflict=function(){return t.Chart=i,e}}).call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleBeginAtZero:!0,scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,barShowStroke:!0,barStrokeWidth:2,barValueSpacing:5,barDatasetSpacing:1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].fillColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Bar",defaults:s,initialize:function(t){var s=this.options;this.ScaleClass=i.Scale.extend({offsetGridLines:!0,calculateBarX:function(t,i,e){var n=this.calculateBaseWidth(),o=this.calculateX(e)-n/2,a=this.calculateBarWidth(t);return o+a*i+i*s.barDatasetSpacing+a/2},calculateBaseWidth:function(){return this.calculateX(1)-this.calculateX(0)-2*s.barValueSpacing},calculateBarWidth:function(t){var i=this.calculateBaseWidth()-(t-1)*s.barDatasetSpacing;return i/t}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getBarsAtEvent(t):[];this.eachBars(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),this.BarClass=i.Rectangle.extend({strokeWidth:this.options.barStrokeWidth,showStroke:this.options.barShowStroke,ctx:this.chart.ctx}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,bars:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.bars.push(new this.BarClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.strokeColor,fillColor:i.fillColor,highlightFill:i.highlightFill||i.fillColor,highlightStroke:i.highlightStroke||i.strokeColor}))},this)},this),this.buildScale(t.labels),this.BarClass.prototype.base=this.scale.endPoint,this.eachBars(function(t,i,s){e.extend(t,{width:this.scale.calculateBarWidth(this.datasets.length),x:this.scale.calculateBarX(this.datasets.length,s,i),y:this.scale.endPoint}),t.save()},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachBars(function(t){t.save()}),this.render()},eachBars:function(t){e.each(this.datasets,function(i,s){e.each(i.bars,t,this,s)},this)},getBarsAtEvent:function(t){for(var i,s=[],n=e.getRelativePosition(t),o=function(t){s.push(t.bars[i])},a=0;a<this.datasets.length;a++)for(i=0;i<this.datasets[a].bars.length;i++)if(this.datasets[a].bars[i].inRange(n.x,n.y))return e.each(this.datasets,o),s;return s},buildScale:function(t){var i=this,s=function(){var t=[];return i.eachBars(function(i){t.push(i.value)}),t},n={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(s(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.barShowStroke?this.options.barStrokeWidth:0,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(n,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new this.ScaleClass(n)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].bars.push(new this.BarClass({value:t,label:i,x:this.scale.calculateBarX(this.datasets.length,e,this.scale.valuesCount+1),y:this.scale.endPoint,width:this.scale.calculateBarWidth(this.datasets.length),base:this.scale.endPoint,strokeColor:this.datasets[e].strokeColor,fillColor:this.datasets[e].fillColor}))
+},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.bars.shift()},this),this.update()},reflow:function(){e.extend(this.BarClass.prototype,{y:this.scale.endPoint,base:this.scale.endPoint});var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();this.chart.ctx;this.scale.draw(i),e.each(this.datasets,function(t,s){e.each(t.bars,function(t,e){t.hasValue()&&(t.base=this.scale.endPoint,t.transition({x:this.scale.calculateBarX(this.datasets.length,s,e),y:this.scale.calculateY(t.value),width:this.scale.calculateBarWidth(this.datasets.length)},i).draw())},this)},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,percentageInnerCutout:50,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Doughnut",defaults:s,initialize:function(t){this.segments=[],this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,this.SegmentArc=i.Arc.extend({ctx:this.chart.ctx,x:this.chart.width/2,y:this.chart.height/2}),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.calculateTotal(t),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({value:t.value,outerRadius:this.options.animateScale?0:this.outerRadius,innerRadius:this.options.animateScale?0:this.outerRadius/100*this.options.percentageInnerCutout,fillColor:t.color,highlightColor:t.highlight||t.color,showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,startAngle:1.5*Math.PI,circumference:this.options.animateRotate?0:this.calculateCircumference(t.value),label:t.label})),e||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(Math.abs(t)/this.total)},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=Math.abs(t.value)},this)},update:function(){this.calculateTotal(this.segments),e.each(this.activeElements,function(t){t.restore(["fillColor"])}),e.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,e.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},draw:function(t){var i=t?t:1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.calculateCircumference(t.value),outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout},i),t.endAngle=t.startAngle+t.circumference,t.draw(),0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle)},this)}}),i.types.Doughnut.extend({name:"Pie",defaults:e.merge(s,{percentageInnerCutout:0})})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,bezierCurve:!0,bezierCurveTension:.4,pointDot:!0,pointDotRadius:4,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Line",defaults:s,initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)<Math.pow(this.radius+this.hitDetectionRadius,2)}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this),this.buildScale(t.labels),this.eachPoints(function(t,i){e.extend(t,{x:this.scale.calculateX(i),y:this.scale.endPoint}),t.save()},this)},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachPoints(function(t){t.save()}),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.datasets,function(t){e.each(t.points,function(t){t.inRange(s.x,s.y)&&i.push(t)})},this),i},buildScale:function(t){var s=this,n=function(){var t=[];return s.eachPoints(function(i){t.push(i.value)}),t},o={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(n(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.pointDotRadius+this.options.pointDotStrokeWidth,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(o,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new i.Scale(o)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:this.scale.calculateX(this.scale.valuesCount+1),y:this.scale.endPoint,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.points.shift()},this),this.update()},reflow:function(){var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();var s=this.chart.ctx,n=function(t){return null!==t.value},o=function(t,i,s){return e.findNextWhere(i,n,s)||t},a=function(t,i,s){return e.findPreviousWhere(i,n,s)||t};this.scale.draw(i),e.each(this.datasets,function(t){var h=e.where(t.points,n);e.each(t.points,function(t,e){t.hasValue()&&t.transition({y:this.scale.calculateY(t.value),x:this.scale.calculateX(e)},i)},this),this.options.bezierCurve&&e.each(h,function(t,i){var s=i>0&&i<h.length-1?this.options.bezierCurveTension:0;t.controlPoints=e.splineCurve(a(t,h,i),t,o(t,h,i),s),t.controlPoints.outer.y>this.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.y<this.scale.startPoint&&(t.controlPoints.outer.y=this.scale.startPoint),t.controlPoints.inner.y>this.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y<this.scale.startPoint&&(t.controlPoints.inner.y=this.scale.startPoint)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(h,function(t,i){if(0===i)s.moveTo(t.x,t.y);else if(this.options.bezierCurve){var e=a(t,h,i);s.bezierCurveTo(e.controlPoints.outer.x,e.controlPoints.outer.y,t.controlPoints.inner.x,t.controlPoints.inner.y,t.x,t.y)}else s.lineTo(t.x,t.y)},this),s.stroke(),this.options.datasetFill&&h.length>0&&(s.lineTo(h[h.length-1].x,this.scale.endPoint),s.lineTo(h[0].x,this.scale.endPoint),s.fillStyle=t.fillColor,s.closePath(),s.fill()),e.each(h,function(t){t.draw()})},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowLabelBackdrop:!0,scaleBackdropColor:"rgba(255,255,255,0.75)",scaleBeginAtZero:!0,scaleBackdropPaddingY:2,scaleBackdropPaddingX:2,scaleShowLine:!0,segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"PolarArea",defaults:s,initialize:function(t){this.segments=[],this.SegmentArc=i.Arc.extend({showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,ctx:this.chart.ctx,innerRadius:0,x:this.chart.width/2,y:this.chart.height/2}),this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,lineArc:!0,width:this.chart.width,height:this.chart.height,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,valuesCount:t.length}),this.updateScaleRange(t),this.scale.update(),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({fillColor:t.color,highlightColor:t.highlight||t.color,label:t.label,value:t.value,outerRadius:this.options.animateScale?0:this.scale.calculateCenterOffset(t.value),circumference:this.options.animateRotate?0:this.scale.getCircumference(),startAngle:1.5*Math.PI})),e||(this.reflow(),this.update())},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this),this.scale.valuesCount=this.segments.length},updateScaleRange:function(t){var i=[];e.each(t,function(t){i.push(t.value)});var s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s,{size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2})},update:function(){this.calculateTotal(this.segments),e.each(this.segments,function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.updateScaleRange(this.segments),this.scale.update(),e.extend(this.scale,{xCenter:this.chart.width/2,yCenter:this.chart.height/2}),e.each(this.segments,function(t){t.update({outerRadius:this.scale.calculateCenterOffset(t.value)})},this)},draw:function(t){var i=t||1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.scale.getCircumference(),outerRadius:this.scale.calculateCenterOffset(t.value)},i),t.endAngle=t.startAngle+t.circumference,0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle),t.draw()},this),this.scale.draw()}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers;i.Type.extend({name:"Radar",defaults:{scaleShowLine:!0,angleShowLineOut:!0,scaleShowLabels:!1,scaleBeginAtZero:!0,angleLineColor:"rgba(0,0,0,.1)",angleLineWidth:1,pointLabelFontFamily:"'Arial'",pointLabelFontStyle:"normal",pointLabelFontSize:10,pointLabelFontColor:"#666",pointDot:!0,pointDotRadius:3,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'},initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx}),this.datasets=[],this.buildScale(t),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){var o;this.scale.animation||(o=this.scale.getPointPosition(n,this.scale.calculateCenterOffset(e))),s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,x:this.options.animation?this.scale.xCenter:o.x,y:this.options.animation?this.scale.yCenter:o.y,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this)},this),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=e.getRelativePosition(t),s=e.getAngleFromPoint({x:this.scale.xCenter,y:this.scale.yCenter},i),n=2*Math.PI/this.scale.valuesCount,o=Math.round((s.angle-1.5*Math.PI)/n),a=[];return(o>=this.scale.valuesCount||0>o)&&(o=0),s.distance<=this.scale.drawingArea&&e.each(this.datasets,function(t){a.push(t.points[o])}),a},buildScale:function(t){this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,angleLineColor:this.options.angleLineColor,angleLineWidth:this.options.angleShowLineOut?this.options.angleLineWidth:0,pointLabelFontColor:this.options.pointLabelFontColor,pointLabelFontSize:this.options.pointLabelFontSize,pointLabelFontFamily:this.options.pointLabelFontFamily,pointLabelFontStyle:this.options.pointLabelFontStyle,height:this.chart.height,width:this.chart.width,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,labels:t.labels,valuesCount:t.datasets[0].data.length}),this.scale.setScaleSize(),this.updateScaleRange(t.datasets),this.scale.buildYLabels()},updateScaleRange:function(t){var i=function(){var i=[];return e.each(t,function(t){t.data?i=i.concat(t.data):e.each(t.points,function(t){i.push(t.value)})}),i}(),s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s)},addData:function(t,i){this.scale.valuesCount++,e.each(t,function(t,e){var s=this.scale.getPointPosition(this.scale.valuesCount,this.scale.calculateCenterOffset(t));this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:s.x,y:s.y,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.labels.push(i),this.reflow(),this.update()},removeData:function(){this.scale.valuesCount--,this.scale.labels.shift(),e.each(this.datasets,function(t){t.points.shift()},this),this.reflow(),this.update()},update:function(){this.eachPoints(function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.scale,{width:this.chart.width,height:this.chart.height,size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2}),this.updateScaleRange(this.datasets),this.scale.setScaleSize(),this.scale.buildYLabels()},draw:function(t){var i=t||1,s=this.chart.ctx;this.clear(),this.scale.draw(),e.each(this.datasets,function(t){e.each(t.points,function(t,e){t.hasValue()&&t.transition(this.scale.getPointPosition(e,this.scale.calculateCenterOffset(t.value)),i)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(t.points,function(t,i){0===i?s.moveTo(t.x,t.y):s.lineTo(t.x,t.y)},this),s.closePath(),s.stroke(),s.fillStyle=t.fillColor,s.fill(),e.each(t.points,function(t){t.hasValue()&&t.draw()})},this)}})}.call(this);
\ No newline at end of file
diff --git a/sources/app/widgets/Statistics/statistics.js b/sources/app/widgets/Statistics/statistics.js
new file mode 100644
index 0000000..92f9c80
--- /dev/null
+++ b/sources/app/widgets/Statistics/statistics.js
@@ -0,0 +1,46 @@
+var Statistics = {
+    drawGraphs: function(data)
+    {
+        var options = {
+            //Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
+            scaleBeginAtZero : true,
+
+            //Boolean - Whether grid lines are shown across the chart
+            scaleShowGridLines : true,
+
+            //String - Colour of the grid lines
+            scaleGridLineColor : "rgba(0,0,0,.05)",
+
+            //Number - Width of the grid lines
+            scaleGridLineWidth : 1,
+
+            responsive : true,
+
+            //Boolean - Whether to show horizontal lines (except X axis)
+            scaleShowHorizontalLines: true,
+
+            //Boolean - Whether to show vertical lines (except Y axis)
+            scaleShowVerticalLines: true,
+
+            //Boolean - If there is a stroke on each bar
+            barShowStroke : true,
+
+            //Number - Pixel width of the bar stroke
+            barStrokeWidth : 2,
+
+            //Number - Spacing between each of the X value sets
+            barValueSpacing : 5,
+
+            //Number - Spacing between data sets within X values
+            barDatasetSpacing : 1,
+
+            //String - A legend template
+            legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].fillColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
+
+        };
+
+        var ctx = document.getElementById("monthly").getContext("2d");
+        var chart = new Chart(ctx).Line(data, options);
+    }
+}
+
diff --git a/sources/app/widgets/Statistics/statistics.tpl b/sources/app/widgets/Statistics/statistics.tpl
index b3591d6..8a66391 100644
--- a/sources/app/widgets/Statistics/statistics.tpl
+++ b/sources/app/widgets/Statistics/statistics.tpl
@@ -27,15 +27,7 @@
     </ul>
 
     <h3 class="padded_top_bottom">{$c->__('statistics.subscriptions')}</h3>
-    <div class="card">
-        <img src="{$cache_path}monthly.png">
-    </div>
-    <div class="card">
-        <img src="{$cache_path}monthly_cumulated.png">
-    </div>
-    <script type="text/javascript">
-        MovimWebsocket.attach(function() {
-            MovimWebsocket.connection.admin("{$hash}");
-        });
-    </script>
+
+    <br />
+    <canvas id="monthly" width="800" height="400"></canvas>
 </div>
diff --git a/sources/app/widgets/Stickers/Stickers.php b/sources/app/widgets/Stickers/Stickers.php
index c644b23..8fd7fef 100644
--- a/sources/app/widgets/Stickers/Stickers.php
+++ b/sources/app/widgets/Stickers/Stickers.php
@@ -57,7 +57,7 @@ class Stickers extends \Movim\Widget\Base
         $p->set($key, 'png');
 
         // Creating a message
-        $m = new \Modl\Message();
+        $m = new \Modl\Message;
         $m->session = $this->user->getLogin();
         $m->jidto   = echapJid($to);
         $m->jidfrom = $this->user->getLogin();
@@ -66,11 +66,11 @@ class Stickers extends \Movim\Widget\Base
 
         $m->published = gmdate('Y-m-d H:i:s');
 
-        $session    = \Sessionx::start();
+        $session    = \Session::start();
 
         $m->id      = Uuid::uuid4();
         $m->type    = 'chat';
-        $m->resource = $session->resource;
+        $m->resource = $session->get('resource');
 
         // Sending the sticker
         $html = "<p><img alt='Sticker' src='cid:sha1+".$key."@bob.xmpp.org'/></p>";
@@ -82,7 +82,7 @@ class Stickers extends \Movim\Widget\Base
           ->setId($m->id)
           ->request();
 
-        $md = new \Modl\MessageDAO();
+        $md = new \Modl\MessageDAO;
         $md->set($m);
 
         // Sending it to Chat
diff --git a/sources/app/widgets/Subscribe/subscribe.tpl b/sources/app/widgets/Subscribe/subscribe.tpl
index 489ac50..ea67a5b 100644
--- a/sources/app/widgets/Subscribe/subscribe.tpl
+++ b/sources/app/widgets/Subscribe/subscribe.tpl
@@ -6,7 +6,7 @@
         </li>
     </ul>
 
-    <ul class="list thick active flex card">
+    <ul class="list card shadow active flex">
         {loop="$servers"}
         <li
             class="block"
@@ -30,9 +30,9 @@
             </p>
             <p>
                 {$value->description}<br />
-                <a target="_blank" href="{$value->url}">
+                <!--<a target="_blank" href="{$value->url}">
                     {$value->url}
-                </a>
+                </a>-->
             </p>
         </li>
         {/loop}
diff --git a/sources/app/widgets/Tabs/tabs.js b/sources/app/widgets/Tabs/tabs.js
index 7887102..1bbc973 100644
--- a/sources/app/widgets/Tabs/tabs.js
+++ b/sources/app/widgets/Tabs/tabs.js
@@ -59,6 +59,11 @@ var Tabs = {
         var baseUrl = window.location.href.split('#')[0];
         window.location.replace(baseUrl + '#' + n);
 
+        // We try to call ajaxDisplay
+        if(typeof window[tabOn.title + '_ajaxDisplay'] == 'function') {
+            window[tabOn.title + '_ajaxDisplay'].apply();
+        }
+
         // We reset the scroll
         document.querySelector('#navtabs').parentNode.scrollTop = 0;
     }
diff --git a/sources/composer.json b/sources/composer.json
index 019267f..d1b5330 100644
--- a/sources/composer.json
+++ b/sources/composer.json
@@ -12,7 +12,6 @@
         "ext-imagick": "*",
 
         "monolog/monolog": "1.8.*",
-        "libchart/libchart": "dev-master",
         "rain/raintpl": "dev-master",
         "michelf/php-markdown": "1.4.*@dev",
         "movim/modl": "dev-master",
diff --git a/sources/composer.lock b/sources/composer.lock
index 4a5bb7c..8eedbbd 100644
--- a/sources/composer.lock
+++ b/sources/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "b54958b944f29089f98f8ba4280c604b",
-    "content-hash": "a8f2cba127179fc763654ce07480f16c",
+    "hash": "959957c08a6e0a7b09d5b3bccf6f6979",
+    "content-hash": "958b7ab7a85b3465f8038d6848504ff1",
     "packages": [
         {
             "name": "cboden/ratchet",
@@ -536,52 +536,6 @@
             ],
             "time": "2015-06-06 08:55:07"
         },
-        {
-            "name": "libchart/libchart",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/astehlik/libchart.git",
-                "reference": "408d6729f59c3d1641af4c5fee39bb3bcb7fd575"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/astehlik/libchart/zipball/408d6729f59c3d1641af4c5fee39bb3bcb7fd575",
-                "reference": "408d6729f59c3d1641af4c5fee39bb3bcb7fd575",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Libchart\\": "libchart/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Jean-Marc Trémeaux",
-                    "homepage": "http://naku.dohcrew.com/",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Alexander Stehlik",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Simple PHP chart drawing library",
-            "homepage": "http://naku.dohcrew.com/libchart/pages/introduction/",
-            "keywords": [
-                "bar charts",
-                "chart",
-                "charts",
-                "line charts",
-                "pie charts"
-            ],
-            "time": "2013-10-19 22:30:10"
-        },
         {
             "name": "michelf/php-markdown",
             "version": "dev-lib",
@@ -751,12 +705,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/movim/moxl.git",
-                "reference": "bc73793d532eb9c2e9af1ffd5a42d31341347dd0"
+                "reference": "497a2111872660f3ebbeb1ad71ec8425c0be9d43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/movim/moxl/zipball/bc73793d532eb9c2e9af1ffd5a42d31341347dd0",
-                "reference": "bc73793d532eb9c2e9af1ffd5a42d31341347dd0",
+                "url": "https://api.github.com/repos/movim/moxl/zipball/497a2111872660f3ebbeb1ad71ec8425c0be9d43",
+                "reference": "497a2111872660f3ebbeb1ad71ec8425c0be9d43",
                 "shasum": ""
             },
             "require": {
@@ -791,7 +745,7 @@
                 "php",
                 "xmpp"
             ],
-            "time": "2016-03-26 20:56:59"
+            "time": "2016-04-10 08:19:13"
         },
         {
             "name": "movim/sasl2",
@@ -846,16 +800,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.1",
+            "version": "v2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "76e90f747b769b347fe584e8015a014549107d35"
+                "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/76e90f747b769b347fe584e8015a014549107d35",
-                "reference": "76e90f747b769b347fe584e8015a014549107d35",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
+                "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
                 "shasum": ""
             },
             "require": {
@@ -890,7 +844,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2016-03-18 20:36:13"
+            "time": "2016-04-03 06:00:07"
         },
         {
             "name": "pear/net_dns2",
@@ -1351,16 +1305,16 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.3.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "8ffacee1171e33a1c129f424bf1ec36e062eba82"
+                "reference": "f942da7b505d1a294284ab343d05df42d02ad6d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/8ffacee1171e33a1c129f424bf1ec36e062eba82",
-                "reference": "8ffacee1171e33a1c129f424bf1ec36e062eba82",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f942da7b505d1a294284ab343d05df42d02ad6d9",
+                "reference": "f942da7b505d1a294284ab343d05df42d02ad6d9",
                 "shasum": ""
             },
             "require": {
@@ -1391,7 +1345,7 @@
                 }
             ],
             "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-            "time": "2016-03-24 21:20:22"
+            "time": "2016-03-31 13:10:33"
         },
         {
             "name": "react/promise-timer",
@@ -1574,16 +1528,16 @@
         },
         {
             "name": "respect/validation",
-            "version": "1.0.4",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Respect/Validation.git",
-                "reference": "4b2f15920627b93a0a4302e1e6e7db1bab1946e2"
+                "reference": "294368294f9cd207f81474bab27d99875a19ac55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Respect/Validation/zipball/4b2f15920627b93a0a4302e1e6e7db1bab1946e2",
-                "reference": "4b2f15920627b93a0a4302e1e6e7db1bab1946e2",
+                "url": "https://api.github.com/repos/Respect/Validation/zipball/294368294f9cd207f81474bab27d99875a19ac55",
+                "reference": "294368294f9cd207f81474bab27d99875a19ac55",
                 "shasum": ""
             },
             "require": {
@@ -1634,7 +1588,7 @@
                 "validation",
                 "validator"
             ],
-            "time": "2016-02-26 15:21:26"
+            "time": "2016-03-31 17:39:15"
         },
         {
             "name": "stojg/crop",
@@ -1684,16 +1638,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.0.3",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa"
+                "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa",
-                "reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9002dcf018d884d294b1ef20a6f968efc1128f39",
+                "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39",
                 "shasum": ""
             },
             "require": {
@@ -1740,24 +1694,25 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-27 05:14:46"
+            "time": "2016-03-10 10:34:12"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.0.3",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "52065702c71743c05d415a8facfcad6d4257e8d7"
+                "reference": "99f38445a874e7becb8afc4b4a79ee181cf6ec3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/52065702c71743c05d415a8facfcad6d4257e8d7",
-                "reference": "52065702c71743c05d415a8facfcad6d4257e8d7",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/99f38445a874e7becb8afc4b4a79ee181cf6ec3f",
+                "reference": "99f38445a874e7becb8afc4b4a79ee181cf6ec3f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
                 "symfony/expression-language": "~2.8|~3.0"
@@ -1792,20 +1747,79 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-28 16:24:34"
+            "time": "2016-03-27 14:50:32"
         },
         {
-            "name": "symfony/routing",
-            "version": "v3.0.3",
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/routing.git",
-                "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6"
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "1289d16209491b584839022f29257ad859b8532d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/fa1e9a8173cf0077dd995205da453eacd758fdf6",
-                "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
+                "reference": "1289d16209491b584839022f29257ad859b8532d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-01-20 09:13:37"
+        },
+        {
+            "name": "symfony/routing",
+            "version": "v3.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/routing.git",
+                "reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/d061b609f2d0769494c381ec92f5c5cc5e4a20aa",
+                "reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa",
                 "shasum": ""
             },
             "require": {
@@ -1867,14 +1881,13 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-02-04 13:53:13"
+            "time": "2016-03-23 13:23:25"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "libchart/libchart": 20,
         "rain/raintpl": 20,
         "michelf/php-markdown": 20,
         "movim/modl": 20,
diff --git a/sources/linker.php b/sources/linker.php
index 492cb7e..625b0c9 100644
--- a/sources/linker.php
+++ b/sources/linker.php
@@ -38,11 +38,23 @@ function handleSSLErrors($errno, $errstr) {
 
 // Temporary linker killer
 $loop->addPeriodicTimer(5, function() use(&$conn, &$timestamp) {
-    if($timestamp < time() - 3600*2) {
+    if($timestamp < time() - 3600*6) {
         $conn->close();
     }
 });
 
+// One connected ping each 5 mins
+/*$loop->addPeriodicTimer(5*60, function() use (&$conn) {
+    if(isset($conn)
+    && is_resource($conn->stream)) {
+        $ping = new \Moxl\Xec\Action\Ping\Server;
+        $ping->request();
+
+        $conn->write(trim(\Moxl\API::commit()));
+        \Moxl\API::clear();
+    }
+});*/
+
 $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &$xmpp_behaviour, &$parser, &$timestamp) {
     if(substr($data, -1) == "") {
         $messages = explode("", $buffer . substr($data, 0, -1));
@@ -91,7 +103,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
             \RPC::clear();
 
             if(!empty($msg)) {
-                //echo json_encode($msg)."";
                 echo base64_encode(gzcompress(json_encode($msg), 9))."";
                 //fwrite(STDERR, colorize(json_encode($msg), 'yellow')." : ".colorize('sent to the browser', 'green')."\n");
             }
@@ -100,7 +111,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
             \Moxl\API::clear();
 
             if(!empty($xml) && $conn) {
-                //$timestamp = time();
                 $conn->write(trim($xml));
                 #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
             }
@@ -119,7 +129,7 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
     $stdin->on('data', $stdin_behaviour);
 
     // We define a huge buffer to prevent issues with SSL streams, see https://bugs.php.net/bug.php?id=65137
-    //$conn->bufferSize = 1024*32;
+    $conn->bufferSize = 1024*32;
     $conn->on('data', function($message) use (&$conn, $loop, $parser, &$timestamp) {
         if(!empty($message)) {
             $restart = false;
@@ -131,10 +141,10 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
                 $loop->stop();
             } elseif($message == "<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>"
                   || $message == '<proceed xmlns="urn:ietf:params:xml:ns:xmpp-tls"/>') {
-                $session = \Sessionx::start();
+                $session = \Session::start();
                 stream_set_blocking($conn->stream, 1);
                 stream_context_set_option($conn->stream, 'ssl', 'SNI_enabled', false);
-                stream_context_set_option($conn->stream, 'ssl', 'peer_name', $session->host);
+                stream_context_set_option($conn->stream, 'ssl', 'peer_name', $session->get('host'));
                 stream_context_set_option($conn->stream, 'ssl', 'allow_self_signed', true);
                 #stream_context_set_option($conn->stream, 'ssl', 'verify_peer_name', false);
                 #stream_context_set_option($conn->stream, 'ssl', 'verify_peer', false);
@@ -164,8 +174,8 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
             }
 
             if($restart) {
-                $session = \Sessionx::start();
-                \Moxl\Stanza\Stream::init($session->host);
+                $session = \Session::start();
+                \Moxl\Stanza\Stream::init($session->get('host'));
                 stream_set_blocking($conn->stream, 0);
                 $restart = false;
             }
@@ -173,7 +183,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
             $msg = \RPC::commit();
 
             if(!empty($msg)) {
-                //echo json_encode($msg)."";
                 echo base64_encode(gzcompress(json_encode($msg), 9))."";
                 //fwrite(STDERR, colorize(json_encode($msg).' '.strlen($msg), 'yellow')." : ".colorize('sent to browser', 'green')."\n");
             }
@@ -183,7 +192,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
             $xml = \Moxl\API::commit();
 
             if(!empty($xml)) {
-                //$timestamp = time();
                 $conn->write(trim($xml));
                 #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
             }
diff --git a/sources/locales/ach.po b/sources/locales/ach.po
index 58ef202..1b7bda8 100644
--- a/sources/locales/ach.po
+++ b/sources/locales/ach.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Acoli (http://www.transifex.com/movim/movim/language/ach/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/ady.po b/sources/locales/ady.po
index dff1a9d..49ddf2a 100644
--- a/sources/locales/ady.po
+++ b/sources/locales/ady.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Adyghe (http://www.transifex.com/movim/movim/language/ady/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/af.po b/sources/locales/af.po
index db841af..4243c88 100644
--- a/sources/locales/af.po
+++ b/sources/locales/af.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/movim/movim/language/af/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/ar.po b/sources/locales/ar.po
index dc82fcd..198d9f8 100644
--- a/sources/locales/ar.po
+++ b/sources/locales/ar.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/movim/movim/language/ar/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/be.po b/sources/locales/be.po
index e952336..1f23dce 100644
--- a/sources/locales/be.po
+++ b/sources/locales/be.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/movim/movim/language/be/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/bg.po b/sources/locales/bg.po
index 44f49a1..b8341ec 100644
--- a/sources/locales/bg.po
+++ b/sources/locales/bg.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/movim/movim/language/bg/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/bn.po b/sources/locales/bn.po
index 72ddf4c..802ccde 100644
--- a/sources/locales/bn.po
+++ b/sources/locales/bn.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Bengali (http://www.transifex.com/movim/movim/language/bn/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/br.po b/sources/locales/br.po
index 244b5ff..c58110f 100644
--- a/sources/locales/br.po
+++ b/sources/locales/br.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Breton (http://www.transifex.com/movim/movim/language/br/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/ca.po b/sources/locales/ca.po
index 2677426..cc462a2 100644
--- a/sources/locales/ca.po
+++ b/sources/locales/ca.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/movim/movim/language/ca/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/da.po b/sources/locales/da.po
index afeba38..defcbb7 100644
--- a/sources/locales/da.po
+++ b/sources/locales/da.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/movim/movim/language/da/)\n"
@@ -416,7 +416,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Her kan du registrere din pod på den officielle %sMovim API%s og blive listet på %spod siden%s."
 
 #: [api]register
@@ -1204,7 +1205,7 @@ msgstr "Velkommen til din nyhedsstrøm, her vil du se alle de indlæg der public
 msgid "Refresh all the streams"
 msgstr "Genopfrisk alle strømmene"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Dette indlæg er offentligt"
 
@@ -1280,12 +1281,9 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr "Publicer dette indlæg offentligt?"
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr "Dette indlæg er nu offentligt"
-
 #: [post]public_no
-msgid "This post is now private"
+#, fuzzy
+msgid "This post is private"
 msgstr "Dette indlæg er nu privat"
 
 #: [post]public_url
@@ -2537,3 +2535,6 @@ msgstr "API'et kan ikke nåes, prøv igen senere"
 #: [field]type_here
 msgid "Type here"
 msgstr "Skriv her"
+
+#~ msgid "This post is now public"
+#~ msgstr "Dette indlæg er nu offentligt"
diff --git a/sources/locales/de.po b/sources/locales/de.po
index 641d0ee..273e5b6 100644
--- a/sources/locales/de.po
+++ b/sources/locales/de.po
@@ -83,7 +83,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: German (http://www.transifex.com/movim/movim/language/de/)\n"
@@ -422,7 +422,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Hier können Sie Ihren eigenen Pod bei der offiziellen %sMovim-API%s registrieren und auf der %sPod-Seite%s gelistet werden."
 
 #: [api]register
@@ -1210,7 +1211,7 @@ msgstr "Willkommen zu Ihren Neuigkeiten, hier können Sie alle Beiträge sehen,
 msgid "Refresh all the streams"
 msgstr "Alle Daten auffrischen"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Dieser Beitrag ist öffentlich"
 
@@ -1286,12 +1287,9 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr "Diesen Beitrag öffentlich zeigen?"
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr "Dieser Beitrag ist jetzt öffentlich"
-
 #: [post]public_no
-msgid "This post is now private"
+#, fuzzy
+msgid "This post is private"
 msgstr "Dieser Beitrag ist jetzt privat"
 
 #: [post]public_url
@@ -2543,3 +2541,6 @@ msgstr "Die API ist nicht erreichbar, bitte später erneut versuchen"
 #: [field]type_here
 msgid "Type here"
 msgstr "Hier tippen"
+
+#~ msgid "This post is now public"
+#~ msgstr "Dieser Beitrag ist jetzt öffentlich"
diff --git a/sources/locales/el.po b/sources/locales/el.po
index d2dfb3e..78b7256 100644
--- a/sources/locales/el.po
+++ b/sources/locales/el.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/movim/movim/language/el/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/en.po b/sources/locales/en.po
index 79bbf2f..ce32753 100644
--- a/sources/locales/en.po
+++ b/sources/locales/en.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: English (http://www.transifex.com/movim/movim/language/en/)\n"
@@ -415,7 +415,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
 
 #: [api]register
@@ -1203,7 +1204,7 @@ msgstr "Welcome on your news feed, here you will see all the posts published by
 msgid "Refresh all the streams"
 msgstr "Refresh all the streams"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "This post is public"
 
@@ -1279,12 +1280,9 @@ msgstr "Public posts from users"
 msgid "Publish this post publicly?"
 msgstr "Publish this post publicly?"
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr "This post is now public"
-
 #: [post]public_no
-msgid "This post is now private"
+#, fuzzy
+msgid "This post is private"
 msgstr "This post is now private"
 
 #: [post]public_url
@@ -2536,3 +2534,6 @@ msgstr "The API is not reachable, try again later"
 #: [field]type_here
 msgid "Type here"
 msgstr "Type here"
+
+#~ msgid "This post is now public"
+#~ msgstr "This post is now public"
diff --git a/sources/locales/eo.po b/sources/locales/eo.po
index 5c4f982..8545c45 100644
--- a/sources/locales/eo.po
+++ b/sources/locales/eo.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/movim/movim/language/eo/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/es.po b/sources/locales/es.po
index 71267e9..948eb10 100644
--- a/sources/locales/es.po
+++ b/sources/locales/es.po
@@ -79,7 +79,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/movim/movim/language/es/)\n"
@@ -418,7 +418,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Aquí puedes registrar tu pod en la %sAPI de Movim%s oficial y puede ser escuchado en %la página pod%s"
 
 #: [api]register
@@ -1206,7 +1207,7 @@ msgstr "Bienvenido al contenido de tus noticias, aquí verás todos las publicac
 msgid "Refresh all the streams"
 msgstr "Refrescar todas las retransmisiones"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Esta publicación es pública"
 
@@ -1282,13 +1283,10 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
-msgstr ""
+#, fuzzy
+msgid "This post is private"
+msgstr "Esta publicación es pública"
 
 #: [post]public_url
 msgid "Public URL of this post"
diff --git a/sources/locales/fa.po b/sources/locales/fa.po
index e0db09c..ee367e6 100644
--- a/sources/locales/fa.po
+++ b/sources/locales/fa.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/movim/movim/language/fa/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/fi.po b/sources/locales/fi.po
index fa8cd4c..897aa9b 100644
--- a/sources/locales/fi.po
+++ b/sources/locales/fi.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/movim/movim/language/fi/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/fr.po b/sources/locales/fr.po
index c50ef71..4bb2a4c 100644
--- a/sources/locales/fr.po
+++ b/sources/locales/fr.po
@@ -2,7 +2,7 @@
 # Translators:
 # Cypouz, 2015
 # Éfrit, 2015
-# Jaussoin Timothée <edhelas@movim.eu>, 2015
+# Jaussoin Timothée <edhelas@movim.eu>, 2015-2016
 # Maxime Buquet <tidusx62@gmail.com>, 2015
 # Thirty Thirds <thirtythirds@gmail.com>, 2015
 # Tom <caporaldead@gmail.com>, 2015
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
-"PO-Revision-Date: 2015-12-29 12:51+0000\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
+"PO-Revision-Date: 2016-04-08 06:34+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: French (France) (http://www.transifex.com/movim/movim/language/fr_FR/)\n"
 "Language: fr_FR\n"
@@ -421,8 +421,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
-msgstr "Vous pouvez enregistrer ici votre pod sur %sl’API officielle%s et être listé sur %sla page des pods%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
+msgstr "Vous pouvez enregistrer ici votre pod sur %sl’API officielle%s"
 
 #: [api]register
 msgid "Your pod is not registered on the API"
@@ -649,7 +649,7 @@ msgstr "Afficher plus de contacts"
 
 #: [button]new
 msgid "New conversation"
-msgstr ""
+msgstr "Nouvelle conversation"
 
 #: [config]general
 msgid "General"
@@ -1209,7 +1209,7 @@ msgstr "Bienvenue sur votre flux d’actualité, ici vous verrez toutes les publ
 msgid "Refresh all the streams"
 msgstr "Rafraîchir tous les flux"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Ce billet est public"
 
@@ -1218,18 +1218,16 @@ msgid "All"
 msgstr "Tous"
 
 #: [menu]mine
-#, fuzzy
 msgid "My publications"
-msgstr "Mes Souscriptions"
+msgstr "Mes publications"
 
 #: [menu]contacts [page]contacts
 msgid "Contacts"
 msgstr "Contacts"
 
 #: [menu]add_post
-#, fuzzy
 msgid "Add a post"
-msgstr "Commenter"
+msgstr ""
 
 #: [notifs]title
 msgid "Pending Invitations"
@@ -1280,26 +1278,20 @@ msgid "See %s profile"
 msgstr "Voir le profil de %s"
 
 #: [post]blog_last
-#, fuzzy
 msgid "Public posts from users"
-msgstr "Groupes publics"
+msgstr "Billets publics d'utilisateurs"
 
 #: [post]public
 msgid "Publish this post publicly?"
 msgstr "Publier ce billet publiquement?"
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr "Ce billet est désormais publique"
-
 #: [post]public_no
-msgid "This post is now private"
-msgstr "Ce billet est désormais privé"
+msgid "This post is private"
+msgstr "Ce billet est privé"
 
 #: [post]public_url
-#, fuzzy
 msgid "Public URL of this post"
-msgstr "Publier ce billet publiquement?"
+msgstr "URL publique pour ce billet"
 
 #: [post]delete_title [post]delete
 msgid "Delete this post"
@@ -1574,9 +1566,8 @@ msgid "Search in your contacts"
 msgstr "Chercher dans vos contacts "
 
 #: [roster]search_pod
-#, fuzzy
 msgid "Search a contact"
-msgstr "Chercher dans vos contacts "
+msgstr "Chercher un contact"
 
 #: [share]error
 msgid "This is not a valid url"
@@ -1608,7 +1599,7 @@ msgstr "Souscriptions par mois cumulés"
 
 #: [sticker]sent
 msgid "A sticker has been sent using Movim"
-msgstr ""
+msgstr "Un autocollant a été envoyé via Movim"
 
 #: [subscribe]info
 msgid "Movim is a decentralized social network, before creating a new account you need to choose a server to register."
@@ -1683,7 +1674,6 @@ msgid "Is this profile public ?"
 msgstr "Ce profil est-il public ?"
 
 #: [privacy]privacy_info
-#, fuzzy
 msgid "Please pay attention ! By making your profile public, all the information listed bellow will be available for all the Movim users and on the whole Internet."
 msgstr "Faites attention ! En rendant votre profil public, toutes les informations listées ci-dessus seront visibles par les utilisateurs de Movim mais également par tous les internautes."
 
@@ -2548,164 +2538,3 @@ msgstr "L’API est indisponible pour le moment, réessayez plus tard."
 #: [field]type_here
 msgid "Type here"
 msgstr "Rédigez votre message ici"
-
-#~ msgid "Go on the Chat page"
-#~ msgstr "Aller sur la page Discussions"
-
-#~ msgid "Read all theses articles on the News page"
-#~ msgstr "Lire tous ces articles sur la page Actualité"
-
-#~ msgid "Discover"
-#~ msgstr "Découvrir"
-
-#~ msgid "Server"
-#~ msgstr "Serveur"
-
-#~ msgid "Viewer"
-#~ msgstr "Visionneuse"
-
-#~ msgid "Media"
-#~ msgstr "Médias"
-
-#~ msgid "Route error, please set all the parameters for the page %s"
-#~ msgstr "Erreur de chemin, veuillez configurer tous les paramètres de la page %s"
-
-#~ msgid "It seem that you don't have any pictures here?"
-#~ msgstr "Il semblerait que vous n’avez aucune image ici ?"
-
-#~ msgid "You can try to upload a couple by going to the Media page"
-#~ msgstr "Vous pouvez essayer d’en envoyer via la page Médias"
-
-#~ msgid "%s - About"
-#~ msgstr "%s – À propos"
-
-#~ msgid "%s - Account"
-#~ msgstr "%s – Compte"
-
-#~ msgid "%s - Administration Panel"
-#~ msgstr "%s – Panneau d’administration"
-
-#~ msgid "%s - Blog"
-#~ msgstr "%s – Blog"
-
-#~ msgid "%s - Configuration"
-#~ msgstr "%s – Configuration"
-
-#~ msgid "%s - Discover"
-#~ msgstr "%s – Découvrir"
-
-#~ msgid "%s - Explore"
-#~ msgstr "%s – Explorer"
-
-#~ msgid "%s - Help Page"
-#~ msgstr "%s – Page d’aide"
-
-#~ msgid "%s - Login to Movim"
-#~ msgstr "%s – Connexion à Movim"
-
-#~ msgid "%s - Welcome to Movim"
-#~ msgstr "%s – Bienvenue sur Movim"
-
-#~ msgid "%s - Media"
-#~ msgstr "%s – Médias"
-
-#~ msgid "%s - News"
-#~ msgstr "%s – Actualités"
-
-#~ msgid "%s - Group Configuration"
-#~ msgstr "%s – Configuration du groupe"
-
-#~ msgid "%s - Group"
-#~ msgstr "%s – Groupe"
-
-#~ msgid "%s - 404"
-#~ msgstr "%s – 404"
-
-#~ msgid "%s - Profile"
-#~ msgstr "%s – Profil"
-
-#~ msgid "%s - Server"
-#~ msgstr "%s – Serveur"
-
-#~ msgid "Step %s"
-#~ msgstr "Étape %s"
-
-#~ msgid "Data"
-#~ msgstr "Données"
-
-#~ msgid "Cache"
-#~ msgstr "Cache"
-
-#~ msgid "Messages"
-#~ msgstr "Messages"
-
-#~ msgid "Location"
-#~ msgstr "Position"
-
-#~ msgid "Wrong position"
-#~ msgstr "Mauvaise position"
-
-#~ msgid "Location updated"
-#~ msgstr "Position géographique mise à jour"
-
-#~ msgid "Update my position"
-#~ msgstr "Mettre à jour ma position"
-
-#~ msgid "Manage your members"
-#~ msgstr "Gérer vos membres"
-
-#~ msgid "Get the members"
-#~ msgstr "Récupérer les membres"
-
-#~ msgid "Affiliations saved"
-#~ msgstr "Affiliations sauvegardées"
-
-#~ msgid "Manage your subscriptions"
-#~ msgstr "Gérer vos abonnements"
-
-#~ msgid "Manage the subscriptions"
-#~ msgstr "Gérer les abonnements"
-
-#~ msgid "Get the subscriptions"
-#~ msgstr "Récupérer les abonnements"
-
-#~ msgid "Subscriptions saved"
-#~ msgstr "Abonnements sauvegardés"
-
-#~ msgid "Shared"
-#~ msgstr "Partagé"
-
-#~ msgid "%s has been added to your public groups"
-#~ msgstr "%s a été ajouté à vos groupes publics"
-
-#~ msgid "Search"
-#~ msgstr "Rechercher"
-
-#~ msgctxt "[general]nickname"
-#~ msgid "Nickname"
-#~ msgstr "Surnom"
-
-#~ msgctxt "[accounts]accounts_nickname"
-#~ msgid "Nickname"
-#~ msgstr "Surnom"
-
-#~ msgid "Hung up"
-#~ msgstr "Fin d'appel"
-
-#~ msgid "Your contact is busy"
-#~ msgstr "Votre contact est occupé"
-
-#~ msgid "Declined"
-#~ msgstr "Rejeté"
-
-#~ msgid "Is calling you"
-#~ msgstr "Vous appelle"
-
-#~ msgid "Call"
-#~ msgstr "Appeler"
-
-#~ msgid "Hang up"
-#~ msgstr "Raccrocher"
-
-#~ msgid "Connection"
-#~ msgstr "Connexion"
diff --git a/sources/locales/ga.po b/sources/locales/ga.po
index 79a6190..772712a 100644
--- a/sources/locales/ga.po
+++ b/sources/locales/ga.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Irish (http://www.transifex.com/movim/movim/language/ga/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/gl.po b/sources/locales/gl.po
index ffd4352..1e02ae1 100644
--- a/sources/locales/gl.po
+++ b/sources/locales/gl.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/movim/movim/language/gl/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/he.po b/sources/locales/he.po
index 11e8842..e6ce77b 100644
--- a/sources/locales/he.po
+++ b/sources/locales/he.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/movim/movim/language/he/)\n"
@@ -416,7 +416,8 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "באפשרותך לרשום כאן את השרת שלך בתוך %sMovim API%s הרשמי בו יהיה מנוי בתוך %sעמוד השרתים%s."
 
 #: [api]register
@@ -1204,7 +1205,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr "רענון של כל הזרמים"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1281,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/hr.po b/sources/locales/hr.po
index ac50c87..b72761e 100644
--- a/sources/locales/hr.po
+++ b/sources/locales/hr.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/movim/movim/language/hr/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/hu.po b/sources/locales/hu.po
index 6f13b7c..49d9ab6 100644
--- a/sources/locales/hu.po
+++ b/sources/locales/hu.po
@@ -79,7 +79,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/movim/movim/language/hu/)\n"
@@ -418,7 +418,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Itt tudod regisztrálni a podod a hivatalos %sMovim API%kon és listázhatod a %sthe pods page%n."
 
 #: [api]register
@@ -1206,7 +1207,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr "Adatfolyamok frissítése"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Ez a megosztás nyílvános"
 
@@ -1282,13 +1283,10 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
-msgstr ""
+#, fuzzy
+msgid "This post is private"
+msgstr "Ez a megosztás nyílvános"
 
 #: [post]public_url
 msgid "Public URL of this post"
diff --git a/sources/locales/id.po b/sources/locales/id.po
index e2b18c6..0c5086b 100644
--- a/sources/locales/id.po
+++ b/sources/locales/id.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/movim/movim/language/id/)\n"
@@ -417,7 +417,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1205,7 +1205,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1281,12 +1281,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/io.po b/sources/locales/io.po
index 53bc0ba..3f426f7 100644
--- a/sources/locales/io.po
+++ b/sources/locales/io.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Ido (http://www.transifex.com/movim/movim/language/io/)\n"
@@ -417,7 +417,7 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1205,7 +1205,7 @@ msgstr "Bonvenez a vua niuzo-adporto, hike vu spektebla omna di la postigi publi
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1281,12 +1281,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/is.po b/sources/locales/is.po
index 32880c2..c31f941 100644
--- a/sources/locales/is.po
+++ b/sources/locales/is.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/movim/movim/language/is/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/it.po b/sources/locales/it.po
index 21c740b..95a8a15 100644
--- a/sources/locales/it.po
+++ b/sources/locales/it.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/movim/movim/language/it/)\n"
@@ -417,7 +417,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Qui puoi registrare il tuo pod su %sMovim API% ufficiale ed essere elencato su %sthe pods page%s."
 
 #: [api]register
@@ -1205,7 +1206,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr "Aggiorna tutti gli stream"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Questo articolo è pubblico"
 
@@ -1281,13 +1282,10 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
-msgstr ""
+#, fuzzy
+msgid "This post is private"
+msgstr "Questo articolo è pubblico"
 
 #: [post]public_url
 msgid "Public URL of this post"
diff --git a/sources/locales/ja.po b/sources/locales/ja.po
index 20d72a2..c675d76 100644
--- a/sources/locales/ja.po
+++ b/sources/locales/ja.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Japanese (http://www.transifex.com/movim/movim/language/ja/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/jbo.po b/sources/locales/jbo.po
index 395f9af..280eb57 100644
--- a/sources/locales/jbo.po
+++ b/sources/locales/jbo.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Lojban (http://www.transifex.com/movim/movim/language/jbo/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/kk.po b/sources/locales/kk.po
index 41e4fa9..0f18c2d 100644
--- a/sources/locales/kk.po
+++ b/sources/locales/kk.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Kazakh (http://www.transifex.com/movim/movim/language/kk/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/la.po b/sources/locales/la.po
index a8f6e6a..247143c 100644
--- a/sources/locales/la.po
+++ b/sources/locales/la.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Latin (http://www.transifex.com/movim/movim/language/la/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/lb.po b/sources/locales/lb.po
index 603a54e..ac00364 100644
--- a/sources/locales/lb.po
+++ b/sources/locales/lb.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/movim/movim/language/lb/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/lv.po b/sources/locales/lv.po
index 0b8ad93..6182975 100644
--- a/sources/locales/lv.po
+++ b/sources/locales/lv.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/movim/movim/language/lv/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/lzh.po b/sources/locales/lzh.po
index 49f3ead..8d2eaca 100644
--- a/sources/locales/lzh.po
+++ b/sources/locales/lzh.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Chinese (Literary) (http://www.transifex.com/movim/movim/language/lzh/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/messages.pot b/sources/locales/messages.pot
index 3cb2b68..8eb3ab3 100644
--- a/sources/locales/messages.pot
+++ b/sources/locales/messages.pot
@@ -75,7 +75,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -427,9 +427,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid ""
-"Here you can register your pod on the official %sMovim API%s and be listed "
-"on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1240,7 +1238,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1316,12 +1314,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/ne.po b/sources/locales/ne.po
index abd70f2..066472b 100644
--- a/sources/locales/ne.po
+++ b/sources/locales/ne.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/movim/movim/language/ne/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/nl.po b/sources/locales/nl.po
index 78d3eb0..fedae5d 100644
--- a/sources/locales/nl.po
+++ b/sources/locales/nl.po
@@ -79,7 +79,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/movim/movim/language/nl/)\n"
@@ -418,7 +418,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Hier kun je je pod registreren op de officiele %sMovim API%s waarna  de pod op %sde pods pagina%s getoond wordt."
 
 #: [api]register
@@ -1206,7 +1207,7 @@ msgstr "Welkom op je nieuws feed. Hier zie je alle berichten die door je contact
 msgid "Refresh all the streams"
 msgstr "Vernieuw alle streams"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Dit bericht is openbaar"
 
@@ -1282,13 +1283,10 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr "Post dit bericht openbaar?"
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
-msgstr ""
+#, fuzzy
+msgid "This post is private"
+msgstr "Dit bericht is openbaar"
 
 #: [post]public_url
 msgid "Public URL of this post"
diff --git a/sources/locales/no.po b/sources/locales/no.po
index 5b79a2c..cb6f2a0 100644
--- a/sources/locales/no.po
+++ b/sources/locales/no.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Norwegian (http://www.transifex.com/movim/movim/language/no/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/oc.po b/sources/locales/oc.po
index c99aaf7..de51827 100644
--- a/sources/locales/oc.po
+++ b/sources/locales/oc.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/movim/movim/language/oc/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/pl.po b/sources/locales/pl.po
index ad040f2..eab0b10 100644
--- a/sources/locales/pl.po
+++ b/sources/locales/pl.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/movim/movim/language/pl/)\n"
@@ -416,7 +416,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Tutaj możesz zarejestrować swojego poda na oficjalnym %sMovim API%s i mieć go oznaczonego na %sthe pods page%s."
 
 #: [api]register
@@ -1204,7 +1205,7 @@ msgstr "Witaj w zakładce nowinek. Tutaj znajdziesz wszystkie posty opublikowany
 msgid "Refresh all the streams"
 msgstr "Odśwież wszystkie strumienie"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr "Wpis jest publiczny"
 
@@ -1280,13 +1281,10 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr "Opublikować wpis publicznie?"
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
-msgstr ""
+#, fuzzy
+msgid "This post is private"
+msgstr "Wpis jest publiczny"
 
 #: [post]public_url
 msgid "Public URL of this post"
diff --git a/sources/locales/pt.po b/sources/locales/pt.po
index d252181..bc098cd 100644
--- a/sources/locales/pt.po
+++ b/sources/locales/pt.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Portuguese (http://www.transifex.com/movim/movim/language/pt/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/ro.po b/sources/locales/ro.po
index 543ce50..1abdde9 100644
--- a/sources/locales/ro.po
+++ b/sources/locales/ro.po
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/movim/movim/language/ro/)\n"
@@ -415,7 +415,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1203,7 +1203,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1279,12 +1279,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/ru.po b/sources/locales/ru.po
index 8c270c2..83e7ac1 100644
--- a/sources/locales/ru.po
+++ b/sources/locales/ru.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/movim/movim/language/ru/)\n"
@@ -417,7 +417,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "Здесь Вы можете зарегистрировать свою установку Movim в %sMovim API%s с упомянанием на %sстранице установок%s."
 
 #: [api]register
@@ -1205,7 +1206,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr "Обновить все потоки"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1281,12 +1282,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/sv.po b/sources/locales/sv.po
index f668ca9..3ce4565 100644
--- a/sources/locales/sv.po
+++ b/sources/locales/sv.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/movim/movim/language/sv/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/tr.po b/sources/locales/tr.po
index 78c5224..3f2a9e8 100644
--- a/sources/locales/tr.po
+++ b/sources/locales/tr.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/movim/movim/language/tr/)\n"
@@ -417,7 +417,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1205,7 +1205,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1281,12 +1281,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/uk.po b/sources/locales/uk.po
index 30881c2..3181304 100644
--- a/sources/locales/uk.po
+++ b/sources/locales/uk.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2016-03-23 22:27+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/movim/movim/language/uk/)\n"
@@ -416,7 +416,7 @@ msgid "XMPP"
 msgstr ""
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr ""
 
 #: [api]register
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1280,12 +1280,8 @@ msgstr ""
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/locales/zh.po b/sources/locales/zh.po
index 75c4975..de49e35 100644
--- a/sources/locales/zh.po
+++ b/sources/locales/zh.po
@@ -79,7 +79,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 23:26+0200\n"
+"POT-Creation-Date: 2016-04-08 08:29+0200\n"
 "PO-Revision-Date: 2015-12-29 12:43+0000\n"
 "Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/movim/movim/language/zh_CN/)\n"
@@ -418,7 +418,8 @@ msgid "XMPP"
 msgstr "XMPP"
 
 #: [api]info
-msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
+#, fuzzy
+msgid "Here you can register your pod on the official %sMovim API%s"
 msgstr "在这里你可以注册你的容器在官方的 %sMovim API%s , 同时他会显示在 %sthe pods page%s."
 
 #: [api]register
@@ -1206,7 +1207,7 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr "刷新所有流"
 
-#: [menu]public
+#: [menu]public [post]public_yes
 msgid "This post is public"
 msgstr ""
 
@@ -1285,12 +1286,8 @@ msgstr "公共分组"
 msgid "Publish this post publicly?"
 msgstr ""
 
-#: [post]public_yes
-msgid "This post is now public"
-msgstr ""
-
 #: [post]public_no
-msgid "This post is now private"
+msgid "This post is private"
 msgstr ""
 
 #: [post]public_url
diff --git a/sources/src/Movim/Daemon/Api.php b/sources/src/Movim/Daemon/Api.php
index 579e0f8..1cd6188 100644
--- a/sources/src/Movim/Daemon/Api.php
+++ b/sources/src/Movim/Daemon/Api.php
@@ -25,8 +25,15 @@ class Api {
                 case 'exists':
                     $response->write($api->sessionExists($request->getPost()));
                     break;
+                case 'linked':
+                    $response->write($api->sessionsLinked());
+                    break;
+                case 'started':
+                    $response->write($api->sessionsStarted());
+                    break;
                 case 'unregister':
                     $response->write($api->sessionUnregister($request->getPost()));
+                    break;
                 case 'disconnect';
                     $response->write($api->sessionDisconnect($request->getPost()));
                     break;
@@ -36,6 +43,9 @@ class Api {
                 case 'emojis':
                     $response->write($api->addEmojis($request->getPost()));
                     break;
+                case 'session':
+                    $response->write($api->getSession($request->getPost()));
+                    break;
             }
 
             $response->end();
@@ -51,6 +61,25 @@ class Api {
         && $sessions[$sid] == true);
     }
 
+    public function sessionsLinked()
+    {
+        return count($this->_core->getSessions());
+    }
+
+    public function getSession()
+    {
+        return count($this->_core->getSessions());
+    }
+
+    public function sessionsStarted()
+    {
+        $started = 0;
+        foreach($this->_core->getSessions() as $s) {
+            if($s == true) $started++;
+        }
+        return $started;
+    }
+
     public function sessionUnregister($post)
     {
         $sid = $post['sid'];
diff --git a/sources/src/Movim/Daemon/Core.php b/sources/src/Movim/Daemon/Core.php
index 03109e7..2370d8e 100644
--- a/sources/src/Movim/Daemon/Core.php
+++ b/sources/src/Movim/Daemon/Core.php
@@ -148,8 +148,8 @@ class Core implements MessageComponentInterface {
     public function getSessions()
     {
         return array_map(
-            function($session) { return $session->registered; },
-             $this->sessions);
+            function($session) { return $session->started; },
+            $this->sessions);
     }
 
     public function getSession($sid)
diff --git a/sources/src/Movim/Daemon/Session.php b/sources/src/Movim/Daemon/Session.php
index c84ac94..5f67035 100644
--- a/sources/src/Movim/Daemon/Session.php
+++ b/sources/src/Movim/Daemon/Session.php
@@ -12,6 +12,7 @@ class Session {
     public      $process;
 
     public      $registered;
+    public      $started;
 
     protected   $buffer;
     private     $state;
@@ -102,6 +103,8 @@ class Session {
         $this->process->stderr->on('data', function($output) use ($me, $self) {
             if(strpos($output, 'registered') !== false) {
                 $self->registered = true;
+            } elseif(strpos($output, 'started') !== false) {
+                $self->started = true;
             } else {
                 echo $output;
             }
diff --git a/sources/src/Movim/i18n/Locale.php b/sources/src/Movim/i18n/Locale.php
index c70e007..81e023f 100644
--- a/sources/src/Movim/i18n/Locale.php
+++ b/sources/src/Movim/i18n/Locale.php
@@ -5,7 +5,7 @@ class Locale {
     private static $_instance;
     public $translations;
     public $language;
-    public $hash = array();
+    public $hash = [];
 
     private function __construct()
     {
@@ -57,14 +57,15 @@ class Locale {
 
         $lang_list = get_lang_list();
         $dir = scandir(LOCALES_PATH);
-        $po = array();
+        $po = [];
         foreach($dir as $files) {
             $explode = explode('.', $files);
-            if(end($explode) == 'po') {
+            if(end($explode) == 'po'
+            && array_key_exists($explode[0], $lang_list)) {
                 $po[$explode[0]] = $lang_list[$explode[0]];
             }
         }
-        
+
         $po['en'] = 'English';
 
         return $po;
@@ -121,7 +122,7 @@ class Locale {
      */
     public function detect()
     {
-        $langs = array();
+        $langs = [];
 
         preg_match_all(
             '/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
@@ -178,7 +179,7 @@ class Locale {
         // Parsing the file.
         $handle = fopen($pofile, 'r');
 
-        $this->translations = array();
+        $this->translations = [];
 
         $msgid = "";
         $msgstr = "";
@@ -214,7 +215,7 @@ class Locale {
 
     private function getQuotedString($string)
     {
-        $matches = array();
+        $matches = [];
         preg_match('#"(.+)"#', $string, $matches);
 
         if(isset($matches[1]))