update to movim 0.9 git-2015-11-13 and add proxy parameter

README.md

@@ -5,10 +5,14 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t
 
 You need a "valid" (example: StartSSL) certificate to use Movim, auto-signed is not allowed.
 
-Current Movim version : 0.9 git2015-09-22
+Current Movim version : 0.9 git2015-11-13
 
 **Changelog**
 
+1.1 ?
+- Update to Movim 0.9 git2015-11-13 to fix a bug (impossible to login)
+- conf/nginx.conf : proxy_read_timeout and proxy_send_timeout set to 14400s (4h) to avoid disconnect
+
 1.0 2015-10-21
 - Stable release
 

sources/app/assets/js/movim_tpl.js

@@ -90,7 +90,7 @@ var MovimTpl = {
         var selector = document.querySelector('main section > div:first-child:nth-last-child(2) ~ div div');
 
         if(selector != null) {
-            return (selector.scrollHeight - selector.scrollTop === selector.clientHeight);
+            return (selector.scrollHeight - Math.floor(selector.scrollTop) === selector.clientHeight);
         }
     },
     scrollPanel : function() {

sources/app/assets/js/movim_utils.js

@@ -116,9 +116,20 @@ function movim_form_to_json(formname) {
  * @param DOMElement textbox
  */
 function movim_textarea_autoheight(textbox) {
-    if(textbox != null ) {
+    if(textbox != null) {
-        textbox.style.height = 0;
+        var val = textbox.value;
-        textbox.style.height = textbox.scrollHeight +"px";
+        val = val.replace(/\n/g, '<br>');
+        var hidden = document.querySelector('#hiddendiv');
+        hidden.innerHTML = val + '<br/>';
+
+        textboxStyle = window.getComputedStyle(textbox);
+
+        hidden.style.paddingTop = textboxStyle.paddingTop;
+        hidden.style.paddingBottom = textboxStyle.paddingBottom;
+        hidden.style.width = textboxStyle.width;
+        hidden.style.fontSize = textboxStyle.fontSize;
+
+        textbox.style.height = hidden.scrollHeight+"px";
     }
 }
 

sources/app/helpers/StringHelper.php

@@ -50,7 +50,7 @@ class MovimEmoji
 function addUrls($string, $preview = false) {
     // Add missing links
     return preg_replace_callback(
-        "/([\w\"'>]+\:\/\/[\w-?&;#+%:~=\.\/\@]+[\w\/])/", function ($match) use($preview) {
+        "/([\w\"'>]+\:\/\/[\w-?'&;#+,%:~=\.\/\@]+)/u", function ($match) use($preview) {
             if(!in_array(substr($match[0], 0, 1), array('>', '"', '\''))) {
                 $content = $match[0];
 
@@ -258,7 +258,7 @@ function sizeToCleanSize($size)
 {
     $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
     $power = $size > 0 ? floor(log($size, 1024)) : 0;
-    return number_format($size / pow(1024, $power), 2, '.', ',') . ' ' . $units[$power];
+    return number_format($size / pow(1024, $power), 7, '.', ',') . ' ' . $units[$power];
 }
 
 /**
@@ -308,6 +308,50 @@ function stringToColor($string) {
     }
 }
 
+/**
+ * Strip tags and add a whitespace
+ * @param string
+ * @return string
+ */
+function stripTags($string)
+{
+    return strip_tags(preg_replace('/(<\/[^>]+?>)(<[^>\/][^>]*?>)/', '$1 $2', $string));
+}
+
+/**
+ * Purify a string
+ * @param string
+ * @return string
+ */
+function purifyHTML($string)
+{
+    $config = \HTMLPurifier_Config::createDefault();
+    $config->set('HTML.Doctype', 'HTML 4.01 Transitional');
+    $config->set('Cache.SerializerPath', '/tmp');
+    $config->set('HTML.DefinitionID', 'html5-definitions'); 
+    $config->set('HTML.DefinitionRev', 1);
+    if ($def = $config->maybeGetRawHTMLDefinition()) {
+        $def->addElement('video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', array(
+          'src' => 'URI',
+          'type' => 'Text',
+          'width' => 'Length',
+          'height' => 'Length',
+          'poster' => 'URI',
+          'preload' => 'Enum#auto,metadata,none',
+          'controls' => 'Bool',
+        ));
+        $def->addElement('audio', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', array(
+          'src' => 'URI',
+          'preload' => 'Enum#auto,metadata,none',
+          'muted' => 'Bool',
+          'controls' => 'Bool',
+        ));
+    }
+
+    $purifier = new \HTMLPurifier($config);
+    return $purifier->purify($string);
+}
+
 /**
  * Return the first two letters of a string
  * @param string

sources/app/models/config/Config.php

@@ -14,7 +14,6 @@ class Config extends Model {
     public $unregister;
     public $username;
     public $password;
-    public $rewrite;
     public $sizelimit;
 
     public function __construct() {
@@ -42,8 +41,6 @@ class Config extends Model {
                 {"type":"string", "size":32, "mandatory":true },
             "password" :
                 {"type":"string", "size":64, "mandatory":true  },
-            "rewrite" :
-                {"type":"int", "size":1 },
             "sizelimit" :
                 {"type":"int", "size":16 }
         }';
@@ -61,7 +58,6 @@ class Config extends Model {
         $this->unregister       = false;
         $this->username         = 'admin';
         $this->password         = sha1('password');
-        $this->rewrite          = false;
         $this->sizelimit        = 20240001;
     }
 }

sources/app/models/config/ConfigDAO.php

@@ -17,7 +17,6 @@ class ConfigDAO extends SQL {
                 unregister    = :unregister,
                 username      = :username,
                 password      = :password,
-                rewrite       = :rewrite,
                 sizelimit     = :sizelimit';
 
         $this->prepare(
@@ -34,7 +33,6 @@ class ConfigDAO extends SQL {
                 'unregister'   => $c->unregister,
                 'username'     => $c->username,
                 'password'     => $c->password,
-                'rewrite'      => $c->rewrite,
                 'sizelimit'    => $c->sizelimit
             )
         );
@@ -67,7 +65,6 @@ class ConfigDAO extends SQL {
                     unregister,
                     username,
                     password,
-                    rewrite,
                     sizelimit
                 )
                 values
@@ -83,7 +80,6 @@ class ConfigDAO extends SQL {
                     :unregister,
                     :username,
                     :password,
-                    :rewrite,
                     :sizelimit
                 )
                 ';
@@ -102,7 +98,6 @@ class ConfigDAO extends SQL {
                     'unregister'   => $c->unregister,
                     'username'     => $c->username,
                     'password'     => $c->password,
-                    'rewrite'      => $c->rewrite,
                     'sizelimit'    => $c->sizelimit
                 )
             );

sources/app/models/contact/Contact.php

@@ -436,11 +436,11 @@ class Contact extends Model {
 
     function isOld() {
         if(strtotime($this->updated) < mktime( // We update the 1 day old vcards
-                                        0,
+                                        gmdate("H"),
-                                        0,
+                                        gmdate("i")-10,
-                                        0,
+                                        gmdate("s"),
                                         gmdate("m"),
-                                        gmdate("d")-1,
+                                        gmdate("d"),
                                         gmdate("Y")
                                     )
             ) {

sources/app/models/postn/Postn.php

@@ -2,6 +2,8 @@
 
 namespace Modl;
 
+use Respect\Validation\Validator;
+
 class Postn extends Model {
     public $origin;         // Where the post is comming from (jid or server)
     public $node;           // microblog or pubsub
@@ -13,6 +15,7 @@ class Postn extends Model {
 
     public $title;          //
     public $content;        // The content
+    public $contentraw;     // The raw content
     public $contentcleaned; // The cleanned content
 
     public $commentplace;
@@ -54,6 +57,8 @@ class Postn extends Model {
                 {"type":"text" },
             "content" :
                 {"type":"text" },
+            "contentraw" :
+                {"type":"text" },
             "contentcleaned" :
                 {"type":"text" },
             "commentplace" :
@@ -100,6 +105,10 @@ class Postn extends Model {
                     return (string)$dom->saveHTML();
                     break;
                 case 'text':
+                    if(trim($c) != '') {
+                        $this->__set('contentraw', trim($c));
+                    }
+                    break;
                 default :
                     $content = (string)$c;
                     break;
@@ -197,9 +206,8 @@ class Postn extends Model {
             $this->__set('commentplace', $this->origin);
 
         $this->__set('content', trim($content));
-        //$this->__set('contentcleaned', prepareString(html_entity_decode($this->content)));
+
-        $purifier = new \HTMLPurifier();
+        $this->contentcleaned = purifyHTML(html_entity_decode($this->content));
-        $this->contentcleaned = $purifier->purify(html_entity_decode($this->content));
 
         if($entry->entry->geoloc) {
             if($entry->entry->geoloc->lat != 0)
@@ -258,6 +266,7 @@ class Postn extends Model {
                             array_push($attachements['files'], $l);
                         }
                         break;
+                    case 'related' :
                     case 'alternate' :
                         array_push($attachements['links'], array('href' => $l['href'], 'url' => parse_url($l['href'])));
                         break;
@@ -272,6 +281,26 @@ class Postn extends Model {
         return $attachements;
     }
 
+    public function getAttachement()
+    {
+        $attachements = $this->getAttachements();
+        if(isset($attachements['pictures'])) {
+            return $attachements['pictures'][0];
+        }
+        if(isset($attachements['files'])) {
+            return $attachements['files'][0];
+        }
+        if(isset($attachements['links'])) {
+            foreach($attachements['links'] as $link) {
+                if(Validator::url()->validate($link['href'])) {
+                    return $link;
+                }
+            }
+            return false;
+        }
+        return false;
+    }
+
     public function getPicture()
     {
         $attachements = $this->getAttachements();
@@ -281,7 +310,8 @@ class Postn extends Model {
         }
     }
 
-    public function getPlace() {
+    public function getPlace()
+    {
         if(isset($this->lat, $this->lon) && $this->lat != '' && $this->lon != '') {
             return true;
         }
@@ -289,7 +319,8 @@ class Postn extends Model {
             return false;
     }
 
-    public function isMine() {
+    public function isMine()
+    {
         $user = new \User();
 
         if($this->aid == $user->getLogin()
@@ -299,7 +330,8 @@ class Postn extends Model {
             return false;
     }
 
-    public function getUUID() {
+    public function getUUID()
+    {
         if(substr($this->nodeid, 10) == 'urn:uuid:') {
             return $this->nodeid;
         } else {
@@ -307,10 +339,38 @@ class Postn extends Model {
         }
     }
 
-    public function isMicroblog() {
+    public function isMicroblog()
-        if($this->node == "urn:xmpp:microblog:0")
+    {
+        if($this->node == "urn:xmpp:microblog:0") {
             return true;
-        else
+        } else {
+            return false;
+        }
+    }
+
+    public function isEditable()
+    {
+        return ($this->contentraw != null);
+    }
+
+    public function isShort()
+    {
+        return (strlen($this->contentcleaned) < 500);
+    }
+
+    public function getPublicUrl()
+    {
+        if($this->isMicroblog()) {
+            return \Route::urlize('blog', array($this->origin));
+        } else {
+            return \Route::urlize('grouppublic', array($this->origin, $this->node));
+        }
+    }
+
+    public function isPublic() {
+        if(isset($this->privacy) && $this->privacy) {
+            return true;
+        }
         return false;
     }
 }

sources/app/models/postn/PostnDAO.php

@@ -12,6 +12,7 @@ class PostnDAO extends SQL {
 
                     title           = :title,
                     content         = :content,
+                    contentraw      = :contentraw,
                     contentcleaned  = :contentcleaned,
 
                     commentplace    = :commentplace,
@@ -42,6 +43,7 @@ class PostnDAO extends SQL {
 
                 'title'             => $post->title,
                 'content'           => $post->content,
+                'contentraw'        => $post->contentraw,
                 'contentcleaned'    => $post->contentcleaned,
 
                 'commentplace'      => $post->commentplace,
@@ -81,6 +83,7 @@ class PostnDAO extends SQL {
 
                 title,
                 content,
+                contentraw,
                 contentcleaned,
 
                 commentplace,
@@ -108,6 +111,7 @@ class PostnDAO extends SQL {
 
                     :title,
                     :content,
+                    :contentraw,
                     :contentcleaned,
 
                     :commentplace,
@@ -135,6 +139,7 @@ class PostnDAO extends SQL {
 
                     'title'             => $post->title,
                     'content'           => $post->content,
+                    'contentraw'        => $post->contentraw,
                     'contentcleaned'    => $post->contentcleaned,
 
                     'commentplace'      => $post->commentplace,
@@ -229,8 +234,8 @@ class PostnDAO extends SQL {
                 and postn.node = :node
             order by postn.published desc';
 
-        if($limitr)
+        if($limitr !== false)
-            $this->_sql = $this->_sql.' limit '.$limitr.' offset '.$limitf;
+            $this->_sql = $this->_sql.' limit '.(int)$limitr.' offset '.(int)$limitf;
 
         $this->prepare(
             'Postn',
@@ -391,8 +396,8 @@ class PostnDAO extends SQL {
                 and privacy.value = 1
             order by postn.published desc';
 
-        if($limitr)
+        if($limitr !== false)
-            $this->_sql = $this->_sql.' limit '.$limitr.' offset '.$limitf;
+            $this->_sql = $this->_sql.' limit '.(int)$limitr.' offset '.(int)$limitf;
 
         $this->prepare(
             'Postn',

sources/app/views/page.tpl

@@ -50,6 +50,7 @@
             <?php echo __('global.no_js'); ?>
             </div>
         </noscript>
+        <div id="hiddendiv"></div>
         <div id="snackbar" class="snackbar"></div>
         <?php $this->widget('Dialog');?>
         <?php $this->widget('Notification');?>

sources/app/widgets/AccountNext/AccountNext.php

@@ -87,6 +87,7 @@ class AccountNext extends WidgetBase {
     {
         Notification::append(null, $this->__('error.service_unavailable'));
         RPC::call('remoteUnregister');
+        RPC::call('movim_redirect', $this->route('account'));
     }
 
     function ajaxGetForm($host)

sources/app/widgets/AccountNext/accountnext.js

@@ -11,3 +11,7 @@ var AccountNext = {
 function setUsername(user) {
     AccountNext.setUsername(user);
 }
+
+MovimWebsocket.attach(function() {
+    Notification.current('accountnext');
+});

sources/app/widgets/AdminDB/locales.ini

@@ -9,4 +9,4 @@ username         = Username
 password         = Password
 host             = Host
 port             = Port
-name             = Database sName
+name             = Database Name

sources/app/widgets/AdminMain/AdminMain.php

@@ -35,12 +35,6 @@ class AdminMain extends WidgetBase
 
             unset($form['repassword']);
 
-            if(isset($form['rewrite']) && $form['rewrite'] == 'on') {
-                $form['rewrite'] = 1;
-            } else {
-                $form['rewrite'] = 0;
-            }
-
             foreach($form as $key => $value) {
                 $config->$key = $value;
             }
@@ -92,11 +86,6 @@ class AdminMain extends WidgetBase
             $this->view->assign('websockets', $json);
         }
 
-        $this->view->assign('server_rewrite', false);
-        if(isset($_SERVER['HTTP_MOD_REWRITE']) && $_SERVER['HTTP_MOD_REWRITE']) {
-            $this->view->assign('server_rewrite', true);
-        }
-
         $this->view->assign('timezones', getTimezoneList());
         $this->view->assign('langs', $l->getList());
     }

sources/app/widgets/AdminMain/adminmain.tpl

@@ -102,32 +102,6 @@
         </li>
     </ul>
 
-    {if="$server_rewrite"}
-        <br />
-        <h3>{$c->__('rewrite.title')}</h3>
-
-
-        <div>
-            <ul class="thick simple">
-                <li class="action">
-                    <div class="control action">
-                        <div class="checkbox">
-                            <input
-                                type="checkbox"
-                                id="rewrite"
-                                name="rewrite"
-                                {if="$conf->rewrite"}
-                                    checked
-                                {/if}>
-                            <label for="rewrite"></label>
-                        </div>
-                    </div>
-                    <span>{$c->__('rewrite.info')}</span>
-                </li>
-            </ul>
-        </div>
-    {/if}
-
     <br />
     <h3>{$c->__('credentials.title')}</h3>
 

sources/app/widgets/AdminMain/locales.ini

@@ -39,7 +39,3 @@ label       = Information Message
 empty               = Empty
 syslog              = Syslog
 syslog_files        = Syslog and files
-
-[rewrite]
-title           = URL Rewriting
-info            = The URL Rewriting can be enabled

sources/app/widgets/AdminTest/admintest.tpl

@@ -109,14 +109,5 @@
             </li>
             <script type="text/javascript">AdminTest.disableMovim()</script>
         {/if}
-
-        {if="!$_SERVER['HTTP_MOD_REWRITE']"}
-            <li>
-                <span class="icon bubble color orange">
-                    <i class="zmdi zmdi-edit"></i>
-                </span>
-                <span>{$c->__('compatibility.rewrite')}</span>
-            </li>
-        {/if}
     </ul>
 </div>

sources/app/widgets/AdminTest/locales.ini

@@ -9,7 +9,6 @@ curl              = Install the php5-curl library
 imagick           = Install the php5-imagick library
 gd                = Install the php5-gd library
 rights            = "Read and write rights for the webserver in Movims root directory"
-rewrite           = The URL Rewriting support is currently disabled
 db                = The database need to be updated, go to the database panel to fix this
 websocket	        = WebSocket connection error, check if the Movim Daemon is running and is reachable
 xmpp_websocket    = XMPP Websocket connection error, please check the validity of the URL given in the General Configuration

sources/app/widgets/Api/Api.php

@@ -54,22 +54,15 @@ class Api extends WidgetBase {
 
     function ajaxRegister()
     {
-        $rewrite = false;
-
         $cd = new \Modl\ConfigDAO();
         $config = $cd->get();
 
-        if($config->rewrite/*isset($_SERVER['HTTP_MOD_REWRITE'])
-            && $_SERVER['HTTP_MOD_REWRITE']*/) {
-            $rewrite = true;
-        }
-
         $json = requestURL(
             MOVIM_API.'register',
             1,
             array(
                 'uri' => BASE_URI,
-                'rewrite' => $rewrite));
+                'rewrite' => false));
 
         $json = json_decode($json);
 

sources/app/widgets/Blog/Blog.php

@@ -1,6 +1,10 @@
 <?php
 
+use Respect\Validation\Validator;
+
 class Blog extends WidgetBase {
+    public $_paging = 10;
+
     function load()
     {
 
@@ -11,6 +15,9 @@ class Blog extends WidgetBase {
         if($this->_view == 'grouppublic') {
             $from = $this->get('s');
             $node = $this->get('n');
+
+            if(!$this->validateServerNode($from, $node)) return;
+
             $this->view->assign('mode', 'group');
             $this->view->assign('server', $from);
             $this->view->assign('node', $node);
@@ -32,15 +39,38 @@ class Blog extends WidgetBase {
         }
 
         $pd = new \modl\PostnDAO();        
+
         if($id = $this->get('i')) {
-            $messages = $pd->getPublicItem($from, $node, $id, 10, 0);
+            if(Validator::int()->between(0, 100)->validate($id)) {
+                $messages = $pd->getNodeUnfiltered($from, $node, $id * $this->_paging, $this->_paging + 1);
+                $page = $id + 1;
+            } elseif(Validator::string()->length(5, 100)->validate($id)) {
+                $messages = $pd->getPublicItem($from, $node, $id);
+            }
         } else {
-            $messages = $pd->getPublic($from, $node, 10, 0);
+            $page = 1;
+            $messages = $pd->getNodeUnfiltered($from, $node, 0, $this->_paging + 1);
+        }
+
+        if(count($messages) == $this->_paging + 1) {
+            array_pop($messages);
+            $this->view->assign('more', $page);
         }
 
         $this->view->assign('posts', $messages);
     }
 
+    private function validateServerNode($server, $node)
+    {
+        $validate_server = Validator::string()->noWhitespace()->length(6, 40);
+        $validate_node = Validator::string()->length(3, 100);
+
+        if(!$validate_server->validate($server)
+        || !$validate_node->validate($node)
+        ) return false;
+        else return true;
+    }
+
     function getComments($post)
     {
         $pd = new \Modl\PostnDAO();

sources/app/widgets/Blog/blog.tpl

@@ -1,13 +1,14 @@
 <div class="card shadow" title="{$c->__('page.feed')}" id="blog" >
     <ul class="thick">
         {if="$mode == 'blog'"}
-        <li class="action">
+        <li class="action {if="isset($contact->description)"}condensed{/if}">
             <div class="action">
                 <a
                     href="{$c->route('feed', array($contact->jid))}"
                     target="_blank"
+                    title="Atom"
                 >
-                    <i class="zmdi zmdi-portable-wifi"></i> Atom
+                    <i class="zmdi zmdi-portable-wifi"></i>
                 </a>
             </div>
             <span class="icon gray">
@@ -26,6 +27,9 @@
                 </a>
             </h2>
             {/if}
+            {if="isset($contact->description)"}
+                <p>{$contact->description}</p>
+            {/if}
         </li>
         {else}
         <li class="condensed action">
@@ -93,7 +97,7 @@
                             </a>
                         </h2>
                         <p>
-                            {if="$value->getContact()->getTrueName() != ''"}
+                            {if="$value->getContact()->getTrueName() != '' && $value->privacy"}
                                 <i class="zmdi zmdi-account"></i> {$value->getContact()->getTrueName()} –
                             {/if}
                             {$value->published|strtotime|prepareDate}
@@ -101,6 +105,17 @@
                     </li>
                 </ul>
             </header>
+            {if="!$value->isPublic()"}
+                <ul class="thick">
+                    <li>
+                        <span class="icon color gray bubble">
+                            <i class="zmdi zmdi-lock"></i>
+                        </span>
+                        <p class="center"> {$c->__('blog.private')} - <a href="{$c->route('main')}">{$c->__('page.login')}</a></p>
+                    </li>
+                </ul>
+                <br />
+            {else}
                 {$attachements = $value->getAttachements()}
                 <section>
                     <content>
@@ -186,16 +201,32 @@
                                     {$value->getContact()->getTrueName()}
                                 </span>
                                 <p class="all">
-                                {$value->content}
+                                    {$value->contentraw}
                                 </p>
                             </li>
                         {/loop}
                     </ul>
                 {/if}
                 <br />
+            {/if}
         </article>
-
     {/loop}
+    {if="isset($more)"}
+        <article>
+            <ul class="active">
+                {if="$mode == 'blog'"}
+                <a href="{$c->route('blog', array($contact->jid, $more))}">
+                {else}
+                <a href="{$c->route('group', array($server, $node, $more))}">
+                {/if}
+                    <li id="history" class="block large">
+                        <span class="icon"><i class="zmdi zmdi-time-restore"></i></span>
+                        <span>{$c->__('post.older')}</span>
+                    </li>
+                </a>
+            </ul>
+        </article>
+    {/if}
     {if="$posts == null"}
         <ul class="simple thick">
             <li>

sources/app/widgets/Blog/locales.ini

@@ -1,3 +1,4 @@
 [blog]
 title      = "%s's feed"
 empty      = This user has not posted anything right now
+private    = This content is private, please login to see it

sources/app/widgets/Chat/Chat.php

@@ -156,7 +156,6 @@ class Chat extends WidgetBase
         $html = $view->draw('_chat_state', true);
 
         RPC::call('movim_fill', $jid.'_state', $html);
-        //RPC::call('MovimTpl.scrollPanel');
     }
 
     /**
@@ -194,8 +193,8 @@ class Chat extends WidgetBase
 
             Header::fill($header);
             RPC::call('movim_fill', 'chat_widget', $html);
-            RPC::call('MovimTpl.scrollPanel');
             RPC::call('MovimTpl.showPanel');
+            RPC::call('Chat.focus');
 
             $this->prepareMessages($jid);
         }
@@ -215,8 +214,8 @@ class Chat extends WidgetBase
 
         Header::fill($header);
         RPC::call('movim_fill', 'chat_widget', $html);
-        RPC::call('MovimTpl.scrollPanel');
         RPC::call('MovimTpl.showPanel');
+        RPC::call('Chat.focus');
 
         $this->prepareMessages($room, true);
     }
@@ -484,6 +483,7 @@ class Chat extends WidgetBase
 
         RPC::call('Chat.setBubbles', $left, $right, $room);
         RPC::call('Chat.appendMessages', $messages);
+        RPC::call('MovimTpl.scrollPanel');
     }
 
     function prepareMessage(&$message)
@@ -528,6 +528,11 @@ class Chat extends WidgetBase
         else return true;
     }
 
+    function getSmileyPath($id)
+    {
+        return getSmileyPath($id);
+    }
+
     function display()
     {
         $this->view->assign('jid', false);

sources/app/widgets/Chat/_chat.tpl

@@ -34,7 +34,6 @@
                             }
                             "
                         onkeyup="
-                            movim_textarea_autoheight(this);
                             {if="!$muc"}
                             setTimeout(function()
                             {
@@ -45,6 +44,7 @@
                             },5000);
                             {/if}
                             "
+                        oninput="movim_textarea_autoheight(this);"
                         placeholder="{$c->__('chat.placeholder')}"
                     ></textarea>
                 </div>

sources/app/widgets/Chat/_chat_header.tpl

@@ -26,7 +26,13 @@
             </span>
         </li>
     </ul>
-    <div id="chat_header" class="return active {if="$c->supported('upload')"}r2{else}r1{/if} condensed" onclick="MovimTpl.hidePanel(); Chat_ajaxGet();">
+    <div
+        id="chat_header"
+        class="return active {if="$c->supported('upload')"}r2{else}r1{/if} condensed"
+        onclick="
+            MovimTpl.hidePanel();
+            Notification.current('chat');
+            Chat_ajaxGet();">
         <span id="back" class="icon"><i class="zmdi zmdi-arrow-back"></i></span>
         <h2>
             {if="$contact != null"}

sources/app/widgets/Chat/_chat_smiley.tpl

@@ -2,76 +2,76 @@
     <table class="emojis">
         <tbody>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="😂"><img alt=":joy:" class="emoji" src="themes/material/img/emojis/large/1f602.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😂"><img alt=":joy:" class="emoji" src="{$c->getSmileyPath('1f602')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😃"><img alt=":smiley:" class="emoji" src="themes/material/img/emojis/large/1f603.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😃"><img alt=":smiley:" class="emoji" src="{$c->getSmileyPath('1f603')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😄"><img alt=":smile:" class="emoji" src="themes/material/img/emojis/large/1f604.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😄"><img alt=":smile:" class="emoji" src="{$c->getSmileyPath('1f604')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😆"><img alt=":laughing:" class="emoji" src="themes/material/img/emojis/large/1f606.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😆"><img alt=":laughing:" class="emoji" src="{$c->getSmileyPath('1f606')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😍"><img alt=":heart_eyes:" class="emoji" src="themes/material/img/emojis/large/1f60d.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😍"><img alt=":heart_eyes:" class="emoji" src="{$c->getSmileyPath('1f60d')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😉"><img alt=":wink:" class="emoji" src="themes/material/img/emojis/large/1f609.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😉"><img alt=":wink:" class="emoji" src="{$c->getSmileyPath('1f609')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="😠"><img alt=":angry:" class="emoji" src="themes/material/img/emojis/large/1f620.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😠"><img alt=":angry:" class="emoji" src="{$c->getSmileyPath('1f620')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😜"><img alt=":stuck_out_tongue_winking_eye:" class="emoji" src="themes/material/img/emojis/large/1f61c.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😜"><img alt=":stuck_out_tongue_winking_eye:" class="emoji" src="{$c->getSmileyPath('1f61c')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😝"><img alt=":stuck_out_tongue_closed_eyes:" class="emoji" src="themes/material/img/emojis/large/1f61d.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😝"><img alt=":stuck_out_tongue_closed_eyes:" class="emoji" src="{$c->getSmileyPath('1f61d')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😒"><img alt=":unamused:" class="emoji" src="themes/material/img/emojis/large/1f612.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😒"><img alt=":unamused:" class="emoji" src="{$c->getSmileyPath('1f612')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😓"><img alt=":sweat:" class="emoji" src="themes/material/img/emojis/large/1f613.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😓"><img alt=":sweat:" class="emoji" src="{$c->getSmileyPath('1f613')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😖"><img alt=":confounded:" class="emoji" src="themes/material/img/emojis/large/1f616.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😖"><img alt=":confounded:" class="emoji" src="{$c->getSmileyPath('1f616')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="😢"><img alt=":cry:" class="emoji" src="themes/material/img/emojis/large/1f622.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😢"><img alt=":cry:" class="emoji" src="{$c->getSmileyPath('1f622')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😤"><img alt=":triumph:" class="emoji" src="themes/material/img/emojis/large/1f624.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😤"><img alt=":triumph:" class="emoji" src="{$c->getSmileyPath('1f624')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😥"><img alt=":disappointed_relieved:" class="emoji" src="themes/material/img/emojis/large/1f625.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😥"><img alt=":disappointed_relieved:" class="emoji" src="{$c->getSmileyPath('1f625')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😪"><img alt=":sleepy:" class="emoji" src="themes/material/img/emojis/large/1f62a.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😪"><img alt=":sleepy:" class="emoji" src="{$c->getSmileyPath('1f62a')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😭"><img alt=":sob:" class="emoji" src="themes/material/img/emojis/large/1f62d.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😭"><img alt=":sob:" class="emoji" src="{$c->getSmileyPath('1f62d')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="😱"><img alt=":scream:" class="emoji" src="themes/material/img/emojis/large/1f631.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="😱"><img alt=":scream:" class="emoji" src="{$c->getSmileyPath('1f631')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍌"><img alt=":banana:" class="emoji" src="themes/material/img/emojis/large/1f34c.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍌"><img alt=":banana:" class="emoji" src="{$c->getSmileyPath('1f34c')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍎"><img alt=":apple:" class="emoji" src="themes/material/img/emojis/large/1f34e.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍎"><img alt=":apple:" class="emoji" src="{$c->getSmileyPath('1f34e')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🌼"><img alt=":blossom:" class="emoji" src="themes/material/img/emojis/large/1f33c.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🌼"><img alt=":blossom:" class="emoji" src="{$c->getSmileyPath('1f33c')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🌵"><img alt=":cactus:" class="emoji" src="themes/material/img/emojis/large/1f335.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🌵"><img alt=":cactus:" class="emoji" src="{$c->getSmileyPath('1f335')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🌹"><img alt=":rose:" class="emoji" src="themes/material/img/emojis/large/1f339.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🌹"><img alt=":rose:" class="emoji" src="{$c->getSmileyPath('1f339')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍄"><img alt=":mushroom:" class="emoji" src="themes/material/img/emojis/large/1f344.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍄"><img alt=":mushroom:" class="emoji" src="{$c->getSmileyPath('1f344')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍔"><img alt=":hamburger:" class="emoji" src="themes/material/img/emojis/large/1f354.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍔"><img alt=":hamburger:" class="emoji" src="{$c->getSmileyPath('1f354')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍕"><img alt=":pizza:" class="emoji" src="themes/material/img/emojis/large/1f355.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍕"><img alt=":pizza:" class="emoji" src="{$c->getSmileyPath('1f355')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍗"><img alt=":poultry_leg:" class="emoji" src="themes/material/img/emojis/large/1f357.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍗"><img alt=":poultry_leg:" class="emoji" src="{$c->getSmileyPath('1f357')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍚"><img alt=":rice:" class="emoji" src="themes/material/img/emojis/large/1f35a.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍚"><img alt=":rice:" class="emoji" src="{$c->getSmileyPath('1f35a')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍜"><img alt=":ramen:" class="emoji" src="themes/material/img/emojis/large/1f35c.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍜"><img alt=":ramen:" class="emoji" src="{$c->getSmileyPath('1f35c')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🍣"><img alt=":sushi:" class="emoji" src="themes/material/img/emojis/large/1f363.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🍣"><img alt=":sushi:" class="emoji" src="{$c->getSmileyPath('1f363')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="🛀"><img alt=":bath:" class="emoji" src="themes/material/img/emojis/large/1f6c0.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🛀"><img alt=":bath:" class="emoji" src="{$c->getSmileyPath('1f6c0')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🎧"><img alt=":headphones:" class="emoji" src="themes/material/img/emojis/large/1f3a7.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🎧"><img alt=":headphones:" class="emoji" src="{$c->getSmileyPath('1f3a7')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🎮"><img alt=":video_game:" class="emoji" src="themes/material/img/emojis/large/1f3ae.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🎮"><img alt=":video_game:" class="emoji" src="{$c->getSmileyPath('1f3ae')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🎫"><img alt=":ticket:" class="emoji" src="themes/material/img/emojis/large/1f3ab.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🎫"><img alt=":ticket:" class="emoji" src="{$c->getSmileyPath('1f3ab')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="💼"><img alt=":briefcase:" class="emoji" src="themes/material/img/emojis/large/1f4bc.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="💼"><img alt=":briefcase:" class="emoji" src="{$c->getSmileyPath('1f4bc')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🎒"><img alt=":school_satchel:" class="emoji" src="themes/material/img/emojis/large/1f392.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🎒"><img alt=":school_satchel:" class="emoji" src="{$c->getSmileyPath('1f392')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="💡"><img alt=":bulb:" class="emoji" src="themes/material/img/emojis/large/1f4a1.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="💡"><img alt=":bulb:" class="emoji" src="{$c->getSmileyPath('1f4a1')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="📞"><img alt=":telephone_receiver:" class="emoji" src="themes/material/img/emojis/large/1f4de.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="📞"><img alt=":telephone_receiver:" class="emoji" src="{$c->getSmileyPath('1f4de')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🔥"><img alt=":fire:" class="emoji" src="themes/material/img/emojis/large/1f525.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🔥"><img alt=":fire:" class="emoji" src="{$c->getSmileyPath('1f525')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🕐"><img alt=":clock1:" class="emoji" src="themes/material/img/emojis/large/1f550.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🕐"><img alt=":clock1:" class="emoji" src="{$c->getSmileyPath('1f550')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="✉"><img alt=":email:" class="emoji" src="themes/material/img/emojis/large/2709.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="✉"><img alt=":email:" class="emoji" src="{$c->getSmileyPath('2709')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="✏"><img alt=":pencil2:" class="emoji" src="themes/material/img/emojis/large/270f.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="✏"><img alt=":pencil2:" class="emoji" src="{$c->getSmileyPath('270f')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="💋"><img alt=":kiss:" class="emoji" src="themes/material/img/emojis/large/1f48b.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="💋"><img alt=":kiss:" class="emoji" src="{$c->getSmileyPath('1f48b')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="♥"><img alt=":hearts:" class="emoji" src="themes/material/img/emojis/large/2665.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="♥"><img alt=":hearts:" class="emoji" src="{$c->getSmileyPath('2665')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="💊"><img alt=":pill:" class="emoji" src="themes/material/img/emojis/large/1f48a.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="💊"><img alt=":pill:" class="emoji" src="{$c->getSmileyPath('1f48a')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="💩"><img alt=":hankey:" class="emoji" src="themes/material/img/emojis/large/1f4a9.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="💩"><img alt=":hankey:" class="emoji" src="{$c->getSmileyPath('1f4a9')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="☕"><img alt=":coffee:" class="emoji" src="themes/material/img/emojis/large/2615.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="☕"><img alt=":coffee:" class="emoji" src="{$c->getSmileyPath('2615')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="⏰"><img alt=":alarm_clock:" class="emoji" src="themes/material/img/emojis/large/23f0.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="⏰"><img alt=":alarm_clock:" class="emoji" src="{$c->getSmileyPath('23f0')}"></td>
             </tr>
             <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="🐷"><img alt=":pig:" class="emoji" src="themes/material/img/emojis/large/1f437.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🐷"><img alt=":pig:" class="emoji" src="{$c->getSmileyPath('1f437')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🐵"><img alt=":monkey_face:" class="emoji" src="themes/material/img/emojis/large/1f435.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🐵"><img alt=":monkey_face:" class="emoji" src="{$c->getSmileyPath('1f435')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🐶"><img alt=":dog:" class="emoji" src="themes/material/img/emojis/large/1f436.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🐶"><img alt=":dog:" class="emoji" src="{$c->getSmileyPath('1f436')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🐸"><img alt=":frog:" class="emoji" src="themes/material/img/emojis/large/1f438.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🐸"><img alt=":frog:" class="emoji" src="{$c->getSmileyPath('1f438')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🐹"><img alt=":hamster:" class="emoji" src="themes/material/img/emojis/large/1f439.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🐹"><img alt=":hamster:" class="emoji" src="{$c->getSmileyPath('1f439')}"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="🐻"><img alt=":bear:" class="emoji" src="themes/material/img/emojis/large/1f43b.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🐻"><img alt=":bear:" class="emoji" src="{$c->getSmileyPath('1f43b')}"></td>
             </tr>
         </tbody>
     </table>

sources/app/widgets/Chat/chat.js

@@ -15,8 +15,15 @@ var Chat = {
         var text = n.value;
         n.value = "";
         n.focus();
+        movim_textarea_autoheight(n);
         Chat_ajaxSendMessage(jid, encodeURIComponent(text), muc);
     },
+    focus: function()
+    {
+        if(document.documentElement.clientWidth > 1024) {
+            document.querySelector('#chat_textarea').focus();
+        }
+    },
     appendTextarea: function(value)
     {
     },
@@ -35,11 +42,11 @@ var Chat = {
         var div = document.createElement('div');
 
         div.innerHTML = left;
-        Chat.left = div.firstChild;
+        Chat.left = div.firstChild.cloneNode(true);
         div.innerHTML = right;
-        Chat.right = div.firstChild;
+        Chat.right = div.firstChild.cloneNode(true);
         div.innerHTML = room;
-        Chat.room = div.firstChild;
+        Chat.room = div.firstChild.cloneNode(true);
     },
     appendMessages : function(messages) {
         if(messages) {
@@ -114,6 +121,8 @@ var Chat = {
 
                 movim_append(id, bubble.outerHTML);
                 bubble.querySelector('div.bubble').className = 'bubble';
+
+                if(bubble.className.indexOf('oppose') > -1) MovimTpl.scrollPanel();
             }
         }
 
@@ -126,6 +135,7 @@ MovimWebsocket.attach(function() {
     if(jid) {
         MovimTpl.showPanel();
         Chat_ajaxGet(jid);
+        Notification.current('chat|' + jid);
     }
 });
 

sources/app/widgets/Chats/_chats_item.tpl

@@ -4,7 +4,7 @@
     class="
         {if="isset($message)"}condensed{/if}
         {if="$contact->last > 60"} inactive{/if}
-        {if="$caps && in_array($caps->type, array('handheld', 'phone'))"}
+        {if="$caps && in_array($caps->type, array('handheld', 'phone', 'web'))"}
             action
         {/if}
         "
@@ -14,6 +14,11 @@
             <i class="zmdi zmdi-smartphone"></i>
         </div>
     {/if}
+    {if="$caps && $caps->type == 'web'"}
+        <div class="action">
+            <i class="zmdi zmdi-globe-alt"></i>
+        </div>
+    {/if}
     <span data-key="chat|{$contact->jid}" class="counter bottom"></span>
     {$url = $contact->getPhoto('s')}
     {if="$url"}
@@ -34,7 +39,7 @@
             {if="preg_match('#^\?OTR#', $message->body)"}
                 <p><i class="zmdi zmdi-lock"></i> {$c->__('message.encrypted')}</p>
             {else}
-                <p>{$message->body|prepareString|strip_tags}</p>
+                <p>{$message->body|prepareString|stripTags}</p>
             {/if}
         {/if}
     {/if}

sources/app/widgets/Chats/chats.js

@@ -17,8 +17,6 @@ var Chats = {
                     Notification_ajaxClear('chat|' + this.dataset.jid);
                     Notification.current('chat|' + this.dataset.jid);
                     movim_add_class(this, 'active');
-
-                    MovimTpl.scrollPanel();
                 }
 
                 items[i].onmousedown = function(e) {

sources/app/widgets/Chats/chats.tpl

@@ -2,7 +2,7 @@
 
 <div class="placeholder icon">
     <h1>{$c->__('chats.empty_title')}</h1>
-    <h4>{$c->__('chats.empty')}</h4>
+    <h4>{$c->___('chats.empty', '<i class="zmdi zmdi-plus"></i>', '<a href="'.$c->route('contact').'"><i class="zmdi zmdi-accounts"></i>', '</a>')}</h4>
 </div>
 <a class="button action color" onclick="MovimTpl.toggleActionButton()">
     <i class="zmdi zmdi-plus"></i>

sources/app/widgets/Chats/locales.ini

@@ -1,6 +1,6 @@
 [chats]
 empty_title       = No chats yet...
-empty             = Open a new conversation by clicking on the plus button bellow or visit the Contacts page.
+empty             = Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page.
 add               = Chat with a contact
 frequent          = Frequent contacts
 more              = Load more contacts

sources/app/widgets/Contact/Contact.php

@@ -72,6 +72,9 @@ class Contact extends WidgetBase
         $a = new Moxl\Xec\Action\Avatar\Get;
         $a->setTo(echapJid($jid))->request();
 
+        $v = new Moxl\Xec\Action\Vcard\Get;
+        $v->setTo(echapJid($jid))->request();
+
         $r = new Get;
         $r->setTo(echapJid($jid))->request();
     }
@@ -204,10 +207,12 @@ class Contact extends WidgetBase
 
         if($c == null
         || $c->created == null
-        || $c->isEmpty()
+        //|| $c->isEmpty()
         || $c->isOld()) {
+            if($c == null) {
                 $c = new \Modl\Contact;
                 $c->jid = $jid;
+            }
             $this->ajaxRefreshVcard($jid);
         }
 
@@ -217,7 +222,9 @@ class Contact extends WidgetBase
 
         $pd = new \Modl\PostnDAO;
         $gallery = $pd->getGallery($jid);
-        $blog    = $pd->getPublic($jid, 'urn:xmpp:microblog:0', 1, 0);
+        $blog    = $pd->getPublic($jid, 'urn:xmpp:microblog:0', 0, 4);
+
+        $presencestxt = getPresencesTxt();
 
         if(isset($c)) {
             $view->assign('mood', getMood());
@@ -234,6 +241,10 @@ class Contact extends WidgetBase
                 $cad = new \Modl\CapsDAO();
                 $caps = $cad->get($node);
 
+                if($cr->value != null) {
+                    $view->assign('presence', $presencestxt[$cr->value]);
+                }
+
                 if(
                     isset($caps)
                     && $caps->name != ''

sources/app/widgets/Contact/_contact.tpl

@@ -11,11 +11,11 @@
         <ul class="thick">
             <li class="condensed">
                 {if="$url"}
-                    <span class="icon bubble">
+                    <span class="icon bubble color {if="isset($presence)"}status {$presence}{/if}">
                         <img src="{$url}">
                     </span>
                 {else}
-                    <span class="icon bubble color {$contact->jid|stringToColor}">
+                    <span class="icon bubble color {$contact->jid|stringToColor} {if="isset($presence)"}status {$presence}{/if}">
                         <i class="zmdi zmdi-account"></i>
                     </span>
                 {/if}
@@ -154,19 +154,37 @@
     <br />
 
     {if="$blog != null"}
-        <ul class="active">
+        <ul class="active block flex">
-            <li class="subheader">{$c->__('blog.last')}</li>
+            <li class="block large subheader">{$c->__('blog.last')}</li>
-            <a href="{$c->route('blog', array($contact->jid))}" target="_blank">
+            {loop="$blog"}
-                <li class="block large condensed action">
+                <li class="block condensed" onclick="movim_reload('{$c->route('news', $value->nodeid)}')">
+                    {$url = $value->getContact()->getPhoto('l')}
+                    {if="$url"}
+                        <span class="icon bubble" style="background-image: url({$url});">
+                        </span>
+                    {else}
+                        <span class="icon thumb color {$value->getContact()->jid|stringToColor}">
+                            <i class="zmdi zmdi-account"></i>
+                        </span>
+                    {/if}
+                    {if="$value->title != null"}
+                        <span>{$value->title}</span>
+                    {else}
+                        <span>{$c->__('hello.contact_post')}</span>
+                    {/if}
+                    <p>{$value->contentcleaned|strip_tags}</p>
+                    <span class="info">{$value->published|strtotime|prepareDate}</span>
+                </li>
+            {/loop}
+            <a href="{$c->route('blog', array($jid))}" target="_blank" class="block large">
+                <li class="action">
                     <div class="action">
                         <i class="zmdi zmdi-chevron-right"></i>
                     </div>
                     <span class="icon">
                         <i class="zmdi zmdi-portable-wifi"></i>
                     </span>
-                    <span class="info">{$blog[0]->published|strtotime|prepareDate}</span>
+                    <span>{$c->__('blog.visit')}</span>
-                    <span>{$blog[0]->title}</span>
-                    <p class="more">{$blog[0]->contentcleaned|strip_tags:'<img><img/>'}</p>
                 </li>
             </a>
         </ul>
@@ -244,7 +262,9 @@
 
         {if="$contact->twitter != null"}
         <li class="condensed block">
-            <span class="icon gray">T</span>
+            <span class="icon gray">
+                <i class="zmdi zmdi-twitter"></i>
+            </span>
             <span>Twitter</span>
             <p>
                 <a

sources/app/widgets/Contact/locales.ini

@@ -48,6 +48,7 @@ years               = %s years
 
 [blog]
 last                = Last public post
+visit               = Visit the blog to see all the public posts
 
 [subscription]
 to                  = You can see this contact status

sources/app/widgets/Group/Group.php

@@ -365,6 +365,11 @@ class Group extends WidgetBase
         RPC::call('movim_fill', 'group_widget', $html);
     }
 
+    function ajaxTogglePrivacy($id) {
+        $p = new Post;
+        $p->ajaxTogglePrivacy($id);
+    }
+
     function prepareEmpty()
     {
         $id = new \modl\ItemDAO();

sources/app/widgets/Group/_group_empty.tpl

@@ -13,7 +13,7 @@
             {$c->___('group.help_info2', '<i class="zmdi zmdi-bookmark"></i>', '<i class="zmdi zmdi-plus"></i> ')}<br />
             {$c->___('group.help_info3', '<i class="zmdi zmdi-edit"></i>')}<br />
             <br />
-            {$c->___('group.help_info4', '<a href="'.$c->route('news').'">','</a>')}
+            {$c->___('group.help_info4', '<a href="'.$c->route('news').'"><i class="zmdi zmdi-receipt"></i> ','</a>')}
         </p>
     </li>
 </ul>

sources/app/widgets/Group/_group_posts.tpl

@@ -42,6 +42,13 @@
         </header>
         <section>
             <content>
+                {if="$value->isShort() && isset($attachements.pictures)"}
+                    {loop="$attachements.pictures"}
+                        <a href="{$value.href}" class="alternate" target="_blank">
+                            <img class="big_picture" type="{$value.type}" src="{$value.href|urldecode}"/>
+                        </a>
+                    {/loop}
+                {/if}
                 {$value->contentcleaned}
             </content>
         </section>
@@ -51,7 +58,7 @@
                     {loop="$attachements.links"}
                         {if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
                         <li>
-                            <span class="icon small"><img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/></span>
+                            <span class="icon small"><img src="https://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/></span>
                             <a href="{$value.href}" class="alternate" target="_blank">
                                 <span>{$value.href|urldecode}</span>
                             </a>
@@ -76,7 +83,7 @@
                     {/loop}
                 {/if}
             </ul>
-            {if="isset($attachements.pictures)"}
+            {if="!$value->isShort() && isset($attachements.pictures)"}
                 <ul class="flex middle">
                 {loop="$attachements.pictures"}
                     <li class="block pic">
@@ -90,6 +97,35 @@
                 {/loop}
                 </ul>
             {/if}
+            {if="$value->isMine()"}
+                <ul class="middle">
+                    <li class="action">
+                        <form>
+                            <div class="action">
+                                <div class="checkbox">
+                                    <input
+                                        type="checkbox"
+                                        id="privacy_{$value->nodeid}"
+                                        name="privacy_{$value->nodeid}"
+                                        {if="$value->isPublic()"}
+                                            checked
+                                        {/if}
+                                        onclick="Group_ajaxTogglePrivacy('{$value->nodeid}')">
+                                    <label for="privacy_{$value->nodeid}"></label>
+                                </div>
+                            </div>
+                        </form>
+                        <span class="icon gray">
+                            <i class="zmdi zmdi-portable-wifi"></i>
+                        </span>
+                        <span>
+                            <a target="_blank" href="{$value->getPublicUrl()}">
+                                {$c->__('post.public')}
+                            </a>
+                        </span>
+                    </li>
+                </ul>
+            {/if}
         </footer>
         {$comments = $c->getComments($value)}
         {if="$comments"}
@@ -117,7 +153,7 @@
                             </a>
                         </span>
                         <p class="all">
-                            {$value->content}
+                            {$value->contentraw}
                         </p>
                     </li>
                 {/loop}

sources/app/widgets/Groups/_groups_server.tpl

@@ -3,7 +3,7 @@
         <li
             class="
                 {if="$value->subscription == 'subscribed'"}action{/if}
-                condensed
+                {if="$value->sub > 0 || $value->num > 0"}condensed{/if}
                 "
             data-server="{$value->server}"
             data-node="{$value->node}"
@@ -30,9 +30,14 @@
             </span>
             <p class="wrap">
                 {if="$value->sub > 0"}
-                    {$c->__('groups.sub', $value->sub)} -
+                    {$c->__('groups.sub', $value->sub)}
                 {/if}
+                {if="$value->sub > 0 && $value->num > 0"}
+                  - 
+                {/if}
+                {if="$value->num > 0"}
                      {$c->__('groups.num', $value->num)}
+                {/if}
             </p>
         </li>
     {/loop}

sources/app/widgets/Groups/_groups_subscriptions.tpl

@@ -1,11 +1,9 @@
 {if="$subscriptions == null"}
     <ul class="thick">
-        <li class="condensed">
+        <div class="placeholder icon pages">
-            <span class="icon bubble color green">
+            <h1>{$c->__('groups.empty_title')}</h1>
-                <i class="zmdi zmdi-bookmark"></i>
+            <h4>{$c->__('groups.empty_text1')}</h4>
-            </span>
+            <h4>{$c->__('groups.empty_text2')}</h4>
-            <span>{$c->__('groups.empty_title')}</span>
-            <p>{$c->__('groups.empty_text1')} {$c->__('groups.empty_text2')}</p>
         </li>
     </ul>
 {else}

sources/app/widgets/Groups/locales.ini

@@ -1,8 +1,8 @@
 [groups]
 empty_title    = Hello
 contact_post   = Contact post
-empty_text1    = "You don't have any subscriptions yet, select a group server above to start exploring."
+empty_text1    = "You don't have any group subscriptions yet."
-empty_text2    = "Subscribe to your favorite feeds by bookmarking them."
+empty_text2    = "Here you will be able to manage all your subscriptions."
 subscriptions  = My Subscriptions
 add            = Create a new Group
 name           = Group name

sources/app/widgets/Hello/hello.tpl

@@ -1,6 +1,33 @@
 <div id="hello_widget" class="divided">
+    {if="!isset($top) || !isset($news)"}
+        <ul class="simple thick">
+            {$a = '1f600'}
+            <li>
+                <h2>{$c->__('hello.enter_title')}</h2>
+                <p>{$c->__('hello.enter_paragraph')} <img alt=":smiley:" class="emoji" src="{$a|getSmileyPath:false}"></p>
+            </li>
+        </ul>
+        <ul class="middle">
+            <li class="condensed">
+                <span class="icon gray">
+                    <i class="zmdi zmdi-menu on_mobile"></i>
+                    <i class="zmdi zmdi-cloud-outline on_desktop"></i>
+                </span>
+                <span>{$c->__('hello.menu_title')}</span>
+                <p>{$c->__('hello.menu_paragraph')}</p>
+            </li>
+        </ul>
+    {/if}
     <ul class="flex active middle">
-        <li class="subheader block large">{$c->__('hello.active_contacts')}</li>
+        <li class="subheader block large">{$c->__('chat.frequent')}</li>
+        {if="empty($top)"}
+            <li>
+                <span class="icon gray">
+                    <i class="zmdi zmdi-info-outline"></i>
+                </span>
+                <span>{$c->__('chats.empty_title')}</span>
+            </li>
+        {/if}
         {loop="$top"}
             <li tabindex="{$key+1}" class="block action {if="$value->status"}condensed{/if}"
                 onclick="Hello_ajaxChat('{$value->jid}')">
@@ -41,6 +68,14 @@
     </ul>
     {if="$c->supported('pubsub')"}
         <ul id="news" class="card shadow flex active">
+            {if="empty($news)"}
+                <li>
+                    <span class="icon gray">
+                        <i class="zmdi zmdi-info-outline"></i>
+                    </span>
+                    <span>{$c->__('menu.empty_title')}</span>
+                </li>
+            {/if}
             {loop="$news"}
                 <li class="block condensed"
                     data-id="{$value->nodeid}"
@@ -137,7 +172,7 @@
                 <p>{$c->__('hello.share_text')}</p>
             </li>
             <li class="block">
-                <a class="button" href="javascript:(function(){location.href='{$c->route('share')}&url='+encodeURIComponent(location.href);})();">
+                <a class="button" href="javascript:(function(){location.href='{$c->route('share', '\'+escape(encodeURIComponent(location.href));')}})();">
                     <i class="zmdi zmdi-share"></i> {$c->__('hello.share_button')}
                 </a>
             </li>

sources/app/widgets/Hello/locales.ini

@@ -1,5 +1,4 @@
 [hello]
-active_contacts   = Active contacts
 chat              = Go on the Chat page
 news              = News
 news_page         = Read all theses articles on the News page
@@ -9,3 +8,7 @@ contact_post      = Contact post
 share_title       = Universal share button
 share_text        = Bookmark or drag and drop the following button in your toolbar and use it on all the pages you want to share on Movim
 share_button      = Share on Movim
+enter_title       = Oh! Hello!
+enter_paragraph   = It seems that you're new there! Welcome on Movim!
+menu_title        = Check the Menu
+menu_paragraph    = All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!

sources/app/widgets/Infos/Infos.php

@@ -36,12 +36,6 @@ class Infos extends WidgetBase
 
         $sd = new \Modl\SessionxDAO();
 
-        // We see if we have the url rewriting
-        $rewrite = false;
-        if(isset($_SERVER['HTTP_MOD_REWRITE']) && $_SERVER['HTTP_MOD_REWRITE']) {
-            $rewrite = true;
-        } 
-
         $infos = array(
                 'url'           => BASE_URI,
                 'language'      => $config->locale,
@@ -50,7 +44,6 @@ class Infos extends WidgetBase
                 'description'   => $config->description,
                 'unregister'    => $config->unregister,
                 'php_version'   => phpversion(),
-                'rewrite'       => $rewrite,
                 'version'       => APP_VERSION,
                 'population'    => $pop,
                 'connected'     => $sd->getConnected()

sources/app/widgets/Login/Login.php

@@ -87,6 +87,15 @@ class Login extends WidgetBase
         $this->view->assign('connected', $connected);
 
         $this->view->assign('error', $this->prepareError());
+
+        if(isset($_SERVER['PHP_AUTH_USER'])
+        && isset($_SERVER['PHP_AUTH_PW'])
+        && Validator::email()->length(6, 40)->validate($_SERVER['HTTP_EMAIL'])) {
+            list($username, $host) = explode('@', $_SERVER['HTTP_EMAIL']);
+            $this->view->assign('httpAuthHost', $host);
+            $this->view->assign('httpAuthUser', $_SERVER['HTTP_EMAIL']);
+            $this->view->assign('httpAuthPassword', $_SERVER['PHP_AUTH_PW']);
+        }
     }
 
     function showErrorBlock($error)
@@ -138,6 +147,19 @@ class Login extends WidgetBase
     }
 
     function ajaxLogin($form)
+    {
+        $login    = $form->login->value;
+        $password = $form->pass->value;
+
+        $this->doLogin($login, $password);
+    }
+
+    function ajaxHTTPLogin($login, $password)
+    {
+        $this->doLogin($login, $password);        
+    }
+
+    private function doLogin($login, $password)
     {
         // We get the Server Configuration
         $cd = new \Modl\ConfigDAO;
@@ -147,9 +169,6 @@ class Login extends WidgetBase
         $validate_login   = Validator::email()->length(6, 40);
         $validate_password = Validator::string()->length(4, 40);
 
-        $login    = $form->login->value;
-        $password = $form->pass->value;
-
         if(!$validate_login->validate($login)) {
             $this->showErrorBlock('login_format');
             return;

sources/app/widgets/Login/locales.ini

@@ -10,7 +10,6 @@ session           = Session error
 account_created   = Account successfully created
 xmpp_unauthorized = Your XMPP server is unauthorized
 mec_error         = The server takes too much time to respond
-too_old           = Your web browser is too old to use with Movim.
 websocket         = Movim cannot talk with the server, please try again later (Websocket connection error)
 impossible        = Impossible login
 

sources/app/widgets/Login/login.css

@@ -42,7 +42,7 @@ body main > header {
 #login_widget.choose > div#sessions,
 #login_widget.error  > div#error,
 #login_widget:not(.error):not(.choose) > div#form {
-    display: initial;
+    display: block;
 }
 
 #login_widget span.info {

sources/app/widgets/Login/login.tpl

@@ -1,11 +1,17 @@
-{if="!BROWSER_COMP"}
-    <div class="message warning">
-        {$c->__('error.too_old')}
-    </div>
-{else}
 <div id="login_widget">
     <div id="sessions" class="dialog actions"></div>
 
+    {if="isset($httpAuthUser)"}
+        <script type="text/javascript">
+        MovimWebsocket.attach(function() {
+            MovimWebsocket.connection.register('{$httpAuthHost}');
+        });
+        MovimWebsocket.register(function() {
+            Login_ajaxHTTPLogin('{$httpAuthUser}', '{$httpAuthPassword}');
+        });
+        </script>
+    {/if}
+
     <div id="form" class="dialog">
         <section>
             <span class="info">{$c->__('form.connected')} {$connected} / {$pop}</span>
@@ -78,5 +84,3 @@
 <div id="error_websocket" class="snackbar">
     {$c->__('error.websocket')}
 </div>
-
-{/if}

sources/app/widgets/Menu/Menu.php

@@ -32,10 +32,12 @@ class Menu extends WidgetBase
     function onPost($packet)
     {
         $pd = new \Modl\PostnDAO;
-        $count = $pd->getCountSince(Cache::c('since'));
+        $since = Cache::c('since');
-
+        $count = $pd->getCountSince($since);
-        if($count > 0) {
         $post = $packet->content;
+
+        if($count > 0
+        && (strtotime($post->published) > strtotime($since))) {
             if($post->isMicroblog()) {
                 $cd = new \Modl\ContactDAO;
                 $contact = $cd->get($post->origin);

sources/app/widgets/Menu/_menu_list.tpl

@@ -62,7 +62,7 @@
                     <i class="zmdi zmdi-portable-wifi"></i>
                 </span>
             {/if}
-            <p>{$value->contentcleaned|strip_tags}</p>
+            <p>{$value->contentcleaned|stripTags}</p>
         </li>
     {/loop}
     {if="count($items) == $paging"}

sources/app/widgets/Notification/Notification.php

@@ -38,9 +38,10 @@ class Notification extends WidgetBase
         $explode = explode('|', $key);
         $first = reset($explode);
 
-        if($notifs_key != null && $first == $notifs_key) return;
+        // What we receive is not what it's on the screen on Android
-
+        if($key != null && $key != $notifs_key) {
             RPC::call('Notification.android', $title, $body, $picture, $action);
+        }
 
         if(array_key_exists($first, $notifs)) {
             $notifs[$first]++;
@@ -48,6 +49,8 @@ class Notification extends WidgetBase
             $notifs[$first] = 1;
         }
 
+        if($notifs_key != null && $key == $notifs_key) return;
+
         RPC::call('Notification.counter', $first, $notifs[$first]);
 
         if($first != $key) {

sources/app/widgets/Notification/notification.js

@@ -10,6 +10,7 @@ var Notification = {
     document_title : document.title,
     notifs_key : '',
     favicon : null,
+    electron : null,
 
     inhibit : function(sec) {
         Notification.inhibed = true;
@@ -64,10 +65,20 @@ var Notification = {
     displayTab : function() {
         if(Notification.tab_counter1 == 0 && Notification.tab_counter2 == 0) {
             document.title = Notification.document_title;
+
+            if(Notification.favicon != null)
                 Notification.favicon.badge(0);
+
+            if(Notification.electron != null)
+                Notification.electron.notification(false);
         } else {
-            Notification.favicon.badge(Notification.tab_counter1 + Notification.tab_counter2);
             document.title = '(' + Notification.tab_counter1 + '/' + Notification.tab_counter2 + ') ' + Notification.document_title;
+
+            if(Notification.favicon != null)
+                Notification.favicon.badge(Notification.tab_counter1 + Notification.tab_counter2);
+            
+            if(Notification.electron != null)
+                Notification.electron.notification(Notification.tab_counter1 + Notification.tab_counter2);
         }
     },
     current : function(key) {
@@ -114,8 +125,6 @@ var Notification = {
         || Notification.focused
         || typeof DesktopNotification === 'undefined') return;
 
-        console.log(Notification.focused);
-
         var notification = new DesktopNotification(title, { icon: picture, body: body });
 
         if(action !== null) {
@@ -133,11 +142,19 @@ var Notification = {
 }
 
 MovimWebsocket.attach(function() {
+    if(typeof Favico != 'undefined') {
         Notification.favicon = new Favico({
             animation: 'none',
             fontStyle: 'normal',
             bgColor: '#FF5722'
         });
+    }
+
+    if(typeof require !== 'undefined') {
+        var remote = require('remote');
+        Notification.electron = remote.getCurrentWindow();
+    }
+
     Notification.document_title = document.title;
     Notification_ajaxGet();
     Notification.current(Notification.notifs_key);

sources/app/widgets/Post/Post.php

@@ -222,11 +222,11 @@ class Post extends WidgetBase
 
         if($po->isMine()) {
             if($po->privacy == 1) {
-                Notification::append(false, $this->__('post.blog_remove'));
+                Notification::append(false, $this->__('post.public_no'));
                 \Modl\Privacy::set($id, 0);
             }
             if($po->privacy == 0) {
-                Notification::append(false, $this->__('post.blog_add'));
+                Notification::append(false, $this->__('post.public_yes'));
                 \Modl\Privacy::set($id, 1);
             }
         }

sources/app/widgets/Post/_post.tpl

@@ -60,6 +60,13 @@
 
     <section>
         <content>
+            {if="$post->isShort() && isset($attachements.pictures)"}
+                {loop="$attachements.pictures"}
+                    <a href="{$value.href}" class="alternate" target="_blank">
+                        <img class="big_picture" type="{$value.type}" src="{$value.href|urldecode}"/>
+                    </a>
+                {/loop}
+            {/if}
             {$post->contentcleaned}
         </content>
     </section>
@@ -71,7 +78,7 @@
                     {if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
                         <li>
                             <span class="icon">
-                                <img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>
+                                <img src="https://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>
                             </span>
                             <a href="{$value.href}" class="alternate" target="_blank">
                                 <span>{$value.href|urldecode}</span>
@@ -97,7 +104,7 @@
                 {/loop}
             {/if}
         </ul>
-        {if="isset($attachements.pictures)"}
+        {if="!$post->isShort() && isset($attachements.pictures)"}
             <ul class="flex middle">
             {loop="$attachements.pictures"}
                 <li class="block pic">
@@ -133,13 +140,7 @@
                         <i class="zmdi zmdi-portable-wifi"></i>
                     </span>
                     <span>
-                        <a target="_blank" href="
+                        <a target="_blank" href="{$post->getPublicUrl()}">
-                            {if="$post->isMicroblog()"}
-                                {$c->route('blog', array($post->origin))}
-                            {else}
-                                {$c->route('grouppublic', array($post->origin, $post->node))}
-                            {/if}
-                            ">
                             {$c->__('post.public')}
                         </a>
                     </span>

sources/app/widgets/Post/_post_comments.tpl

@@ -4,7 +4,12 @@
         <span class="info">{$comments|count}</span>
     </li>
     {loop="$comments"}
-        <li class="condensed">
+        <li class="condensed {if="$value->isMine()"}action{/if}">
+            {if="$value->isMine()"}
+                <div class="action" onclick="Post_ajaxDelete('{$value->origin}', '{$value->node}', '{$value->nodeid}')">
+                    <i class="zmdi zmdi-delete"></i>
+                </div>
+            {/if}
             <a href="{$c->route('contact', $value->getContact()->jid)}">
                 {$url = $value->getContact()->getPhoto('s')}
                 {if="$url"}
@@ -24,7 +29,7 @@
                 </a>
             </span>
             <p class="all">
-                {$value->content}
+                {$value->contentraw}
             </p>
         </li>
     {/loop}
@@ -38,7 +43,7 @@
         <form name="comment">
             <div>
                 <textarea
-                    onkeyup="movim_textarea_autoheight(this);"
+                    oninput="movim_textarea_autoheight(this);"
                     name="comment"
                     placeholder="{$c->__('field.type_here')}"
                 ></textarea>

sources/app/widgets/Post/_post_header.tpl

@@ -10,14 +10,21 @@
 <div>
     {if="$post->isMine()"}
         <ul class="active">
-            <li onclick="Post_ajaxDelete('{$post->origin}', '{$post->node}', '{$post->nodeid}')">
+            {if="$post->isEditable()"}
+                <li onclick="Publish_ajaxCreate('{$post->origin}', '{$post->node}', '{$post->nodeid}')" title="{$c->__('button.edit')}">
+                    <span class="icon">
+                        <i class="zmdi zmdi-edit"></i>
+                    </span>
+                </li>
+            {/if}
+            <li onclick="Post_ajaxDelete('{$post->origin}', '{$post->node}', '{$post->nodeid}')" title="{$c->__('button.delete')}">
                 <span class="icon">
                     <i class="zmdi zmdi-delete"></i>
                 </span>
             </li>
         </ul>
     {/if}
-    <div class="return active {if="$post->isMine()"}r1{/if}" onclick="MovimTpl.hidePanel(); Post_ajaxClear();">
+    <div class="return active {if="$post->isMine()"}{if="$post->isEditable()"}r2{else}r1{/if}{/if}" onclick="MovimTpl.hidePanel(); Post_ajaxClear();">
         <span id="back" class="icon"><i class="zmdi zmdi-arrow-back"></i></span>
         <h2>
             {if="$post != null"}

sources/app/widgets/Post/locales.ini

@@ -11,8 +11,8 @@ repost         = This is a re-post from %s
 repost_profile = See %s profile
 
 public         = Publish this post publicly?
-blog_add       = Post published on your blog
+public_yes     = This post is now public
-blog_remove    = Post removed from your blog
+public_no      = This post is now private
 
 delete_title   = Delete this post
 delete_text    = You are going to delete this post, please confirm your action

sources/app/widgets/Presence/presence.js

@@ -22,7 +22,7 @@ var Presence = {
         if(textarea != null) {
             movim_textarea_autoheight(textarea);
 
-            textarea.onkeydown = function(event) {
+            textarea.oninput = function(event) {
                 movim_textarea_autoheight(this);
             };
         }

sources/app/widgets/Publish/Publish.php

@@ -63,24 +63,41 @@ class Publish extends WidgetBase
         $this->ajaxCreate($this->user->getLogin(), 'urn:xmpp:microblog:0');
     }
 
-    function ajaxCreate($server, $node)
+    function ajaxCreate($server, $node, $id = false)
     {
         if(!$this->validateServerNode($server, $node)) return;
 
+        $item = false;
+
+        if($id) {
+            $pd = new \modl\PostnDAO();
+            $p = $pd->getItem($id);
+            if($p->isEditable()) {
+                $item = $p;
+            }
+        }
+
         $view = $this->tpl();
         $view->assign('to', $server);
         $view->assign('node', $node);
+        $view->assign('item', $item);
+
         RPC::call('MovimTpl.fill', 'main section > div:nth-child(2)', $view->draw('_publish_create', true));
 
         $pd = new \Modl\ItemDAO;
         $item = $pd->getItem($server, $node);
 
         $view = $this->tpl();
-        $view->assign('item', $item);
         $view->assign('server', $server);
         $view->assign('node', $node);
+        $view->assign('item', $item);
+
         Header::fill($view->draw('_publish_header', true));
 
+        if($id) {
+            RPC::call('Publish.initEdit');
+        }
+
         RPC::call('Publish.setEmbed');
     }
 
@@ -160,6 +177,10 @@ class Publish extends WidgetBase
                 $content_xhtml = Markdown::defaultTransform($content);
             }
 
+            if($form->id->value != '') {
+                $p->setId($form->id->value);
+            }
+
             if($form->embed->value != '' && filter_var($form->embed->value, FILTER_VALIDATE_URL)) {
                 try {
                     $embed = Embed\Embed::create($form->embed->value);

sources/app/widgets/Publish/_publish_create.tpl

@@ -1,17 +1,23 @@
 <form name="post" class="block">
     <input type="hidden" name="to" value="{$to}">
     <input type="hidden" name="node" value="{$node}">
+    <input type="hidden" name="id" value="{if="$item != false"}{$item->nodeid}{/if}">
+
     <div>
-        <input type="text" name="title" placeholder="{$c->__('post.title')}">
+        <input type="text" name="title" placeholder="{$c->__('post.title')}" {if="$item != false"}value="{$item->title}"{/if}>
         <label for="title">{$c->__('post.title')}</label>
     </div>
 
-    <div>
+    <div id="content_link">
+        {if="$item != false"}
+            {$attachement = $item->getAttachement()}
+        {/if}
         <input
             type="url"
             name="embed"
             placeholder="http://myawesomewebsite.com/ or http://mynicepictureurl.com/"
-            onPaste="var e=this; setTimeout(function(){Publish_ajaxEmbedTest(e.value);}, 4);"
+            onpaste="var e=this; setTimeout(function(){Publish_ajaxEmbedTest(e.value);}, 4);"
+            {if="$attachement != false"}value="{$attachement.href}"{/if}
         >
         <label for="embed">{$c->__('post.link')}</label>
 
@@ -28,7 +34,7 @@
         <label>{$c->__('publish.add_text_label')}</label>
     </div>
     <div id="content_field">
-        <textarea name="content" placeholder="{$c->__('post.content_text')}" onkeyup="movim_textarea_autoheight(this);"></textarea>
+        <textarea name="content" placeholder="{$c->__('post.content_text')}" oninput="movim_textarea_autoheight(this);">{if="$item != false"}{$item->contentraw}{/if}</textarea>
         <label for="content">{$c->__('post.content_label')}</label>
     </div>
 
@@ -41,28 +47,5 @@
             <span>{$c->__('publish.attach')}</span>
         </li>
         {/if}
-        <li class="subheader">{$c->__('post.embed_tip')}</li>
-        <a class="block" target="_blank" href="http://imgur.com/">
-            <li class="block action">
-                <div class="action">
-                    <i class="zmdi zmdi-chevron-right"></i>
-                </div>
-                <span class="bubble icon">
-                    <img src="https://userecho.com/s/logos/2015/2015.png">
-                </span>
-                Imgur
-            </li>
-        </a>
-        <a class="block" target="_blank" href="https://www.flickr.com/">
-            <li class="action">
-                <div class="action">
-                    <i class="zmdi zmdi-chevron-right"></i>
-                </div>
-                <span class="bubble icon">
-                    <img src="https://www.flickr.com/apple-touch-icon.png">
-                </span>
-                Flickr
-            </li>
-        </a>
     </ul>
 </form>

sources/app/widgets/Publish/_publish_header.tpl

@@ -6,7 +6,11 @@
     <div class="return active r3 condensed"
         onclick="Publish.headerBack('{$server}', '{$node}', false)">
         <span id="back" class="icon" ><i class="zmdi zmdi-arrow-back"></i></span>
+        {if="$item != false"}
+            <h2>{$c->__('publish.edit')}</h2>
+        {else}
             <h2>{$c->__('publish.new')}</h2>
+        {/if}
         <h4>
             {if="$item != null && $item->node != 'urn:xmpp:microblog:0'"}
                 {if="$item->name"}

sources/app/widgets/Publish/locales.ini

@@ -12,13 +12,13 @@ tags           = Tags
 published      = Post published
 deleted        = Post deleted
 gallery        = This picture will be added to your gallery
-embed_tip      = You can also use services like Imgur or Flickr to host your picture and paste the link here.
 
 [publish]
 valid_url       = Please enter a valid url
 no_content_preview = No content to preview
 no_title        = Please provide a title
 new             = New post
+edit            = Edit post
 title           = Publish
 attach          = Add a file or a picture to your post
 no_publication  = You cannot publish a post on this Group

sources/app/widgets/Publish/publish.js

@@ -31,7 +31,7 @@ var Publish = {
     headerBack: function(server, node, ok) {
         // We check if the form is filled
         if(Publish.checkFilled() && ok == false) {
-            Publish_ajaxFormFilled('{$server}', '{$node}');
+            Publish_ajaxFormFilled(server, node);
             return;
         }
 
@@ -42,6 +42,7 @@ var Publish = {
             MovimTpl.hidePanel();
         } else {
             Group_ajaxGetItems(server, node);
+            Group_ajaxGetAffiliations(server, node);
         }
     },
 
@@ -59,6 +60,12 @@ var Publish = {
         }
 
         return false;
+    },
+
+    initEdit: function() {
+        Publish.enableContent();
+        Publish_ajaxEmbedTest(document.querySelector('#content_link input').value);
+        movim_textarea_autoheight(document.querySelector('#content_field textarea'));
     }
 }
 

sources/app/widgets/Rooms/Rooms.php

@@ -161,7 +161,8 @@ class Rooms extends WidgetBase
     function ajaxChatroomAdd($form)
     {
         if(!filter_var($form['jid'], FILTER_VALIDATE_EMAIL)) {
-            Notification::append(null, $this->__('chatrooms.bad_nickname'));
+            Notification::append(null, $this->__('chatrooms.bad_id'));
+            //Notification::append(null, $this->__('chatrooms.bad_nickname'));
         } elseif(trim($form['name']) == '') {
             Notification::append(null, $this->__('chatrooms.empty_name'));
         } else {

sources/app/widgets/Roster/roster.css

@@ -17,14 +17,14 @@
 }
 
 #roster ul#rosterlist > div li:first-child:before {
-    font-family: "Material Design Iconic Font";
+    font-family: "Material-Design-Iconic-Font";
-    content: "\f2c2";
+    content: "\f2fb";
     display: inline-block;
 }
 
 #roster ul#rosterlist > div.groupshown li:first-child:before {
-    font-family: "Material Design Iconic Font";
+    font-family: "Material-Design-Iconic-Font";
-    content: "\f2c0";
+    content: "\f2f9";
     display: inline-block;
 }
 

sources/app/widgets/Roster/roster.js

@@ -254,10 +254,6 @@ var Roster = {
         var roster      = document.querySelector('#roster');
         var rosterlist  = document.querySelector('#rosterlist');
 
-        roster.onblur  = function() {
-            roster.className = roster_classback;
-            rosterlist.className = rosterlist_classback;
-        };
         search.oninput = function(event) {
             if(search.value.length > 0) {
                 movim_add_class(roster, 'search');
@@ -308,8 +304,10 @@ var Roster = {
 
     clearSearch: function() {
         var search = document.querySelector('#rostersearch');
+        if(search) {
             search.value = '';
             search.oninput();
+        }
     },
 
     setFound : function(jid) {

sources/app/widgets/Share/Share.php

@@ -11,7 +11,7 @@ class Share extends WidgetBase
     function display()
     {
         $validate_url = Validator::url();
-        $url = $this->get('url');
+        $url = rawurldecode(urldecode($this->get('url')));
         if($validate_url->validate($url)) {
             $this->view->assign('url', $url);
         }

sources/app/widgets/Share/share.tpl

@@ -19,7 +19,7 @@
         {else}
             <li class="condensed">
                 <span class="icon bubble orange color">
-                    <i class="zmdi zmdi-error"></i>
+                    <i class="zmdi zmdi-alert-triangle"></i>
                 </span>
                 <span>{$c->__('page.share')}</span>
                 <p>{$c->__('share.error')}</p>

sources/app/widgets/Syndication/Syndication.php

@@ -31,7 +31,7 @@ class Syndication extends WidgetBase
             $item = $id->getItem($from, $node);
         }
 
-        $messages = $pd->getPublic($from, $node, 10, 0);
+        $messages = $pd->getPublic($from, $node, 0, 20);
         header("Content-Type: application/atom+xml; charset=UTF-8");
 
         $dom = new \DOMDocument('1.0', 'UTF-8');

sources/app/widgets/Upload/upload.js

@@ -39,7 +39,8 @@ var Upload = {
         }, false);
 
         Upload.xhr.onreadystatechange = function() {
-            if(Upload.xhr.readyState == 4 ) {
+            if(Upload.xhr.readyState == 4
+            && Upload.xhr.status == 200) {
                 Dialog.clear();
                 Upload.launchAttached();
             }

sources/app/widgets/Vcard4/Vcard4.php

@@ -18,6 +18,8 @@
 use Moxl\Xec\Action\Vcard4\Get;
 use Moxl\Xec\Action\Vcard4\Set;
 
+use Respect\Validation\Validator;
+
 class Vcard4 extends WidgetBase
 {
     function load()
@@ -142,22 +144,30 @@ class Vcard4 extends WidgetBase
             $c->date = $vcard->date->value;
         } 
 
+        if(Validator::string()->length(0, 40)->validate($vcard->name->value))
             $c->name    = $vcard->name->value;
+        if(Validator::string()->length(0, 40)->validate($vcard->fn->value))
             $c->fn      = $vcard->fn->value;
+
+        if(Validator::url()->validate($vcard->url->value))
             $c->url     = $vcard->url->value;
 
+        if(Validator::in(array_keys(getGender()))->validate($vcard->gender->value))
             $c->gender  = $vcard->gender->value;
+        if(Validator::in(array_keys(getMarital()))->validate($vcard->marital->value))
             $c->marital = $vcard->marital->value;
 
         $c->adrlocality     = $vcard->locality->value;
         $c->adrcountry      = $vcard->country->value;
 
+        if(Validator::email()->validate($vcard->email->value))
             $c->email   = $vcard->email->value;
 
         $c->twitter = $vcard->twitter->value;
         $c->skype   = $vcard->skype->value;
         $c->yahoo   = $vcard->yahoo->value;
 
+        if(Validator::string()->validate($vcard->desc->value))
             $c->description     = trim($vcard->desc->value);
             
         $cd = new \Modl\ContactDAO();

sources/app/widgets/Vcard4/_vcard4_form.tpl

@@ -21,7 +21,7 @@
         </span>
 
         <span>{$c->__('privacy.privacy_question')}</span>
-        <p>{$c->__('privacy.privacy_info')}</p>
+        <p class="all">{$c->__('privacy.privacy_info')}</p>
     </li>
 </ul>
 

sources/bootstrap.php

@@ -56,8 +56,6 @@ class Bootstrap {
         //Check if vital system need is OK
         $this->checkSystem();
 
-        if(!$light) $this->setBrowserSupport();
-
         $this->loadSystem();
         $this->loadCommonLibraries();
         $this->loadDispatcher();
@@ -176,6 +174,11 @@ class Bootstrap {
 
     private function getBaseUri() {
         $dirname = dirname($_SERVER['PHP_SELF']);
+
+        if(strstr($dirname, 'index.php')) {
+            $dirname = substr($dirname, 0, strrpos($dirname, 'index.php'));
+        }
+
         $path = (($dirname == DIRECTORY_SEPARATOR) ? '' : $dirname).'/';
 
         // Determining the protocol to use.
@@ -256,18 +259,14 @@ class Bootstrap {
 
         if($user->isLogged()) {
             $lang = $user->getConfig('language');
+        }
+
         if(isset($lang)) {
             $l->load($lang);
-            } else {
+        } elseif(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-                // Load default language.
-                $l->load($config->locale);
-            }
-        }
-        elseif(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
             $l->detect();
             $l->loadPo();
-        }
+        } else {
-        else {
             $l->load($config->locale);
         }
     }
@@ -330,58 +329,6 @@ class Bootstrap {
         return true;
     }
 
-    private function setBrowserSupport() {
-        if(isset( $_SERVER['HTTP_USER_AGENT'])) {
-            $useragent = $_SERVER['HTTP_USER_AGENT'];
-
-            if (preg_match('|MSIE ([0-9].[0-9]{1,2})|',$useragent,$matched)) {
-                $browser_version=$matched[1];
-                $browser = 'IE';
-            } elseif (preg_match('/Opera[\/ ]([0-9]{1}\.[0-9]{1}([0-9])?)/',$useragent,$matched)) {
-                $browser_version=$matched[1];
-                $browser = 'Opera';
-            } elseif(preg_match('|Firefox/([0-9\.]+)|',$useragent,$matched)) {
-                $browser_version=$matched[1];
-                $browser = 'Firefox';
-            } elseif(preg_match('|Safari/([0-9\.]+)|',$useragent,$matched)) {
-                $browser_version=$matched[1];
-                $browser = 'Safari';
-            } else {
-                $browser_version = 0;
-                $browser = 'other';
-            }
-        } else {
-            $browser_version = 0;
-            $browser= 'other';
-        }
-
-        define('BROWSER_VERSION', $browser_version);
-        define('BROWSER', $browser);
-
-        $compatible = false;
-
-        switch($browser) {
-            case 'Firefox':
-                if($browser_version > 30.0)
-                    $compatible = true;
-            break;
-            case 'IE':
-                if($browser_version > 10.0)
-                    $compatible = true;
-            break;
-            case 'Safari': // Also Chrome-Chromium
-                if($browser_version > 522.0)
-                    $compatible = true;
-            break;
-            case 'Opera':
-                if($browser_version > 12.1)
-                    $compatible = true;
-            break;
-        }
-
-        define('BROWSER_COMP', $compatible);
-    }
-
     private function startingSession() {
         $s = \Sessionx::start();
         $s->load();

sources/composer.json

@@ -19,7 +19,7 @@
 
         "cboden/ratchet": "0.3.*",
         "react/child-process": "0.5.*@dev",
-        "react/socket-client": "0.4.*@dev",
+        "react/socket-client": "0.4.3",
 
         "forxer/Gravatar": "~1.2",
         "respect/validation": "0.8.*",

sources/lib/XMPPtoForm.php

@@ -6,14 +6,14 @@ class XMPPtoForm{
 
     public function __construct(){
         $this->fieldset = 0;
-        $this->html = '';
+        $this->html = new \DOMDocument('1.0', 'UTF-8');
         $this->xmpp = '';
     }
 
     public function getHTML($xmpp){
         $this->setXMPP($xmpp);
         $this->create();
-        return $this->html;
+        return $this->html->saveXML();
     }
 
     public function setXMPP($xmpp){
@@ -25,7 +25,6 @@ class XMPPtoForm{
         $x = new SimpleXMLElement($this->xmpp);
 
         foreach($x->children() as $element){
-
             switch($element->getName()){
                 case "title":
                     $this->outTitle($element);
@@ -34,15 +33,15 @@ class XMPPtoForm{
                     $this->outP($element);
                     break;
                 case "field":
-                    if($element['type'] != 'hidden' && $element['type'] != 'fixed')
+                    //if($element['type'] != 'hidden' && $element['type'] != 'fixed')
-                        $this->html .='<div>';
+                    //    $this->html .='<div>';
                     switch($element['type']){
                         case "boolean":
                             $this->outCheckbox($element);
                             break;
-                        case "fixed":
+                        //case "fixed":
-                            $this->outBold($element);
+                        //    $this->outBold($element);
-                            break;
+                        //    break;
                         case "text-single":
                             $this->outInput($element, "", "");
                             break;
@@ -68,10 +67,10 @@ class XMPPtoForm{
                             $this->outInput($element, "email", "");
                             break;
                         default:
-                            $this->html .= "";
+                            //$this->html .= "";
                     }
-                    if($element['type'] != 'hidden')
+                    //if($element['type'] != 'hidden')
-                        $this->html .='</div>';
+                    //    $this->html .='</div>';
                     break;
                 case 'url':
 
@@ -80,50 +79,64 @@ class XMPPtoForm{
                 case 'username':
                 case 'email':
                 case 'password':
-                    $this->html .='<div class="element">';
+                    //$this->html .='<div class="element">';
                         $this->outGeneric($element->getName());
-                    $this->html .='</div>';
+                    //$this->html .='</div>';
                     break;
                 default:
-                    $this->html .= "";
+                    //$this->html .= "";
             }
         }
-        if($this->fieldset>0){
+        /*if($this->fieldset>0){
             $this->html .= '</fieldset>';
-        }
+        }*/
     }
 
     private function outGeneric($s){
-        $this->html .= '
+        $div = $this->html->createElement('div');
-            <input id="'.$s.'" name="generic_'.$s.'" type="'.$s.'" required/>
+        $div->setAttribute('class', 'element');
-            <label for="'.$s.'">'.
+        $this->html->appendChild($div);
-                $s.'
+
-            </label>
+        $input = $this->html->createElement('input');
-            ';
+        $input->setAttribute('type', $s);
+        $input->setAttribute('id', $s);
+        $input->setAttribute('name', 'generic_'.$s);
+        $input->setAttribute('required', 'required');
+        
+        $div->appendChild($input);
+
+        $label = $this->html->createElement('label', $s);
+        $label->setAttribute('for', $s);
+        $div->appendChild($label);
     }
     private function outTitle($s){
-        $this->html .= '
+        $ul = $this->html->createElement('ul');
-            <ul class="thin simple">
+        $ul->setAttribute('class', 'thin simple');
-                <li>
+        $this->html->appendChild($ul);
-                    <span>'.$s.'</span>
+
-                </li>
+        $li = $this->html->createElement('li');
-            </ul>';
+        $li->appendChild($this->html->createElement('span', $s));
+
+        $ul->appendChild($li);
     }
 
     private function outP($s){
-        $this->html .= '
+        $ul = $this->html->createElement('ul');
-            <ul class="thin simple">
+        $ul->setAttribute('class', 'thin simple');
-                <li>
+        $this->html->appendChild($ul);
-                    <p>'.$s.'</p>
+
-                </li>
+        $li = $this->html->createElement('li');
-            </ul>';
+        $ul->appendChild($li);
+
+        $li->appendChild($this->html->createElement('p', $s));
     }
 
     private function outUrl($s) {
-        $this->html .= '
+        $a = $this->html->createElement('a', $s->getName());
-            <a href="'.$s->getName().'">'.$s->getName().'</a>';
+        $a->setAttribute('href', $s->getName());
+        $this->html->appendChild($a);
     }
-
+    /*
     private function outBold($s){
         if($this->fieldset > 0){
             $this->html .= '</fieldset>';
@@ -131,206 +144,228 @@ class XMPPtoForm{
         $this->html .= '<fieldset><legend>'.$s->value.'</legend><br />';
         $this->fieldset ++;
     }
-
+    */
     private function outCheckbox($s){
-        $this->html .= '
+        $container = $this->html->createElement('div');
-            <div class="select">
+        $this->html->appendChild($container);
-                <select
-                    type="'.$s['type'].'"
-                    label="'.$s['label'].'"
-                    id="'.$s["var"].'"
-                    name="'.$s['var'].'" '.$multiple.' '.$s->required.'>';
 
-        $this->html .= '
+        $div = $this->html->createElement('div');
-            <option value="true"';
+        $div->setAttribute('class', 'select');
+        $container->appendChild($div);
+
+        $select = $this->html->createElement('select');
+        $select->setAttribute('type', $s['type']);
+        $select->setAttribute('label', $s['label']);
+        $select->setAttribute('id', $s['var']);
+        $select->setAttribute('name', $s['var']);
+
+        if($s->required)
+            $select->setAttribute('required', 'required');
+        
+        $div->appendChild($select);
+
+        $option = $this->html->createElement('option', __('button.bool_yes'));
+        $option->setAttribute('value', 'true');
         if(isset($s->value) || $s->value == "true" || $s->value == "1")
-                $this->html .= ' selected="selected"';
+            $option->setAttribute('selected', 'selected');
-        $this->html .= '>'.__('button.bool_yes').'</option>';
+        $select->appendChild($option);
 
-        $this->html .= '
+        $option = $this->html->createElement('option', __('button.bool_no'));
-            <option value="false"';
+        $option->setAttribute('value', 'false');
         if(!isset($s->value) || $s->value == "false" || $s->value == "0")
-                $this->html .= ' selected="selected"';
+            $option->setAttribute('selected', 'selected');
-        $this->html .= '>'.__('button.bool_no').'</option>';
+        $select->appendChild($option);
 
-        $this->html .= '
+        $label = $this->html->createElement('label', $s['label']);
-                </select>
+        $label->setAttribute('for', $s['var']);
-            </div>
+        $container->appendChild($label);
-            <label for="'.$s["var"].'">'.$s["label"].'</label>';
     }
 
     private function outTextarea($s){
-        $this->html .= '
+        $container = $this->html->createElement('div');
-            <textarea
+        $this->html->appendChild($container);
-                id="'.$s["var"].'"
+
-                name="'.$s["var"].'"
+        $textarea = $this->html->createElement('textarea');
-                type="'.$s['type'].'"
+        $textarea->setAttribute('type', $s['type']);
-                label="'.$s['label'].'"
+        $textarea->setAttribute('label', $s['label']);
-                required="'.$s->required.'">';
+        $textarea->setAttribute('id', $s['var']);
+        $textarea->setAttribute('name', $s['var']);
+
+        if($s->required)
+            $textarea->setAttribute('required', 'required');
 
         foreach($s->children() as $value){
             if($value->getName() == "value"){
-                $this->html .= $value. "\n";
+                $textarea->nodeValue .= $value . "\n";
             }
         }
-        $this->html .= '</textarea>';
 
-        $this->html .= '
+        if(empty($textarea->nodeValue)) {
-            <label for="'.$s["var"].'">'.$s["label"].'</label>';
+            $textarea->nodeValue = ' ';
+        }
+        
+        $container->appendChild($textarea);
+
+        $label = $this->html->createElement('label', $s['label']);
+        $label->setAttribute('for', $s['var']);
+        $container->appendChild($label);
     }
 
     private function outInput($s, $type, $multiple){
+        $container = $this->html->createElement('div');
+        $this->html->appendChild($container);
+        
+        $input = $this->html->createElement('input');
+        $input->setAttribute('id', $s['var']);
+        $input->setAttribute('name', $s['var']);
+        $input->setAttribute('type', $type);
+        $input->setAttribute('title', $s->desc);
+        $input->setAttribute('type', $s['type']);
+        $input->setAttribute('label', $s['label']);
+
         if($s->required)
-            $req = 'required';
+            $input->setAttribute('required', 'required');
-        $this->html .= '
-            <input id="'.$s["var"].'" name="'.$s["var"].'" value="';
 
         foreach($s->children() as $value){
             if($value->getName() == "value"){
-                    $this->html .= $value;
+                $input->setAttribute('value', $value);
             }
         }
 
-        $this->html .= '"';
-
         if($s['var'] == 'username')
-            $this->html .= ' pattern="[a-z0-9_-]*" ';
+            $input->setAttribute('pattern', '[a-z0-9_-]*');
         
-        $this->html .= '
+        $container->appendChild($input);
-            type="'.$type.'"
+
-            title="'.$s->desc.'"
+        $label = $this->html->createElement('label', $s['label']);
-            type="'.$s['type'].'"
+        $label->setAttribute('for', $s['var']);
-            label="'.$s['label'].'"
+        $container->appendChild($label);
-            '.$multiple.' '.$req.'/>
-            <label for="'.$s["var"].'">'.$s["label"].'</label>';
     }
 
     private function outHiddeninput($s){
-        $this->html .= '
+        $input = $this->html->createElement('input');
-            <input type="hidden" name="'.$s["var"].'" value="'.$s->value.'" />';
+        $input->setAttribute('name', $s['var']);
+        $input->setAttribute('type', 'hidden');
+        $input->setAttribute('value', $s->value);
+
+        $this->html->appendChild($input);
     }
 
     private function outList($s, $multiple){
-        $this->html .= '
+        $container = $this->html->createElement('div');
-            <div class="select">
+        $this->html->appendChild($container);
-                <select
+
-                    type="'.$s['type'].'"
+        $div = $this->html->createElement('div');
-                    label="'.$s['label'].'"
+        $div->setAttribute('class', 'select');
-                    id="'.$s["var"].'"
+        $container->appendChild($div);
-                    name="'.$s['var'].'" '.$multiple.' '.$s->required.'>';
+
+        $select = $this->html->createElement('select');
+        $select->setAttribute('type', $s['type']);
+        $select->setAttribute('label', $s['label']);
+        $select->setAttribute('id', $s['var']);
+        $select->setAttribute('name', $s['var']);
+
+        if($s->required)
+            $select->setAttribute('required', 'required');
+        
+        $div->appendChild($select);
 
         if(count($s->xpath('option')) > 0){
             foreach($s->option as $option){
-                $this->html .= '
+                if(isset($option->attributes()->label)) {
-                    <option value="'.$option->value.'"';
+                    $opt = $this->html->createElement('option', $option->attributes()->label);
-                    if(in_array((string)$option->value, $s->xpath('value')))
+                } else {
-                        $this->html .= ' selected';
+                    $opt = $this->html->createElement('option', $option->value);
-                $this->html .= '>'.
+                }
-                        $option->value.'
+
-                    </option>';
+                $opt->setAttribute('value', $option->value);
+                if(
+                    in_array(
+                        (string)$opt->nodeValue,
+                        array_map(
+                            function($sxml) {
+                                return (string)$sxml;
+                            },
+                            $s->xpath('value')
+                        )
+                    )
+                ) {
+                    $opt->setAttribute('selected', 'selected');
+                }
+                $select->appendChild($opt);
             }
         }
         else{
             foreach($s->value as $option){
-                $this->html .= '
+                $option = $this->html->createElement('option', $option);
-                    <option value="'.$option['label'].'" selected>'.
+                $option->setAttribute('value', $option['label']);
-                        $option.'
+                $option->setAttribute('selected', 'selected');
-                    </option>';
+                $select->appendChild($option);
             }
         }
 
-        $this->html .= '
+        $label = $this->html->createElement('label', $s['label']);
-                </select>
+        $label->setAttribute('for', $s['var']);
-            </div>
+        $container->appendChild($label);
-            <label for="'.$s["var"].'">'.$s["label"].'</label>';
     }
 }
 
-class FormtoXMPP{
+class FormtoXMPP
-    private $stream;
+{
-    private $inputs;
+    private $_form;
-    private $dataform;
+    private $_inputs;
 
-    public function __construct(){
+    public function __construct(array $inputs)
-        $this->stream = '';
+    {
-        $this->inputs = array();
+        $this->_form = new \DOMDocument('1.0', 'UTF-8');
-        $this->dataform = true;
+        $this->_inputs = $inputs;
     }
 
-    public function getXMPP($stream, $inputs){
+    public function appendToX(\DomDocument $dom)
-        $this->setXMPP($stream);
+    {
-        $this->setInputs($inputs);
+        $fields = $this->_form->getElementsByTagName('field');
-        $this->create();
+        $list = $dom->getElementsByTagName('x');
-        return $this->stream;
+            
+        foreach($fields as $field) {
+            $field = $dom->importNode($field, true);
+            $list[0]->appendChild($field);
+        }
     }
 
-    public function setXMPP($stream){
+    public function create()
-        $this->stream = new SimpleXMLElement($stream);
+    {
-    }
+        foreach($this->_inputs as $key => $value) {
-    public function setInputs($inputs){
+            $container = $this->_form->createElement('container');
-        $this->inputs = $inputs;
+            $this->_form->appendChild($container);
+           
+            $field = $this->_form->createElement('field');
+            $container->appendChild($field);
+
+            $val = $this->_form->createElement('value');
+            $field->appendChild($val);
+
+            if($value === 'true') {
+                $val->nodeValue = '1';
             }
             
-    public function setDataformOff() {
+            if($value === 'false') {
-        $this->dataform = false;
+                $val->nodeValue = '0';
             }
 
-    public function create(){
-        switch($this->stream->getName()){
-            case "stream":
-                $node = $this->stream->iq->query->x;
-                break;
-            case "pubsub":
-                $node = $this->stream->configure->x;
-                break;
-            case "command":
-                $node = $this->stream->x;
-                break;
-            default:
-                $node = $this->stream->x;
-                break;
-        }
-        foreach($this->inputs as $key => $value) {
-            if($value === '' && $this->stream->getName() == "stream") {
-                RPC::call('movim_reload', Route::urlize('account','datamissing'));
-                RPC::commit();
-                 exit;
-            } elseif(substr($key, 0, 8) == 'generic_') {
-                $key = str_replace('generic_', '', $key);
-                if (!is_string($value)) {
-                    $value = $value->value;
-                }
-                $node->addChild($key, $value);
-            } elseif($value->attributes) {
-                $field = $node->addChild('field');
-                if($value == 'true' || $value === 1)
-                    $value = '1';
-                if($value == 'false' || $value === 0)
-                    $value = '0';
-
-                $field->addChild('value', trim($value->value));
-                if(isset($value->attributes->required))
-                    $field->addChild('required', '');
-                $field->addAttribute('var', $value->attributes->name);
-                $field->addAttribute('type', $value->attributes->xmpptype);
-                $field->addAttribute('label', $value->attributes->xmpplabel);
-
-            } else{
-                $field = $node->addChild('field');
-
-                if($value == 'true')
-                    $value = '1';
-                if($value == 'false')
-                    $value = '0';
-
             if(is_bool($value)) {
-                    $value = ($value) ? '1' : '0';
+                $val->nodeValue = ($value) ? '1' : '0';
             }
 
-                $field->addChild('value', trim($value));
+            if(empty($val->nodeValue)
-                $field->addAttribute('var', trim($key));
+            && $value !== 'false' // WTF PHP !!!
+            ) {
+                $val->nodeValue = trim($value);
             }
+            
+            $field->setAttribute('var', trim($key));
         }
+
+        return $this->_form->saveXML();
     }
 }
 ?>

sources/linker.php

@@ -80,8 +80,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
             $xml = \Moxl\API::commit();
             \Moxl\API::clear();
 
-            //$loop->tick();
-
             if(!empty($xml) && $conn) {
                 $conn->write(trim($xml));
                 #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
@@ -90,8 +88,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
     } else {
         $buffer .= $data;
     }
-
-    //$loop->tick();
 };
 
 $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$stdin, $stdin_behaviour, $parser) {
@@ -103,7 +99,6 @@ $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->on('data', function($message) use (&$conn, $loop, $parser) {
         if(!empty($message)) {
             $restart = false;
@@ -113,10 +108,14 @@ $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();
                 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', '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);
+
                 set_error_handler('handleSSLErrors');
                 $out = stream_socket_enable_crypto($conn->stream, 1, STREAM_CRYPTO_METHOD_TLS_CLIENT);
                 restore_error_handler();
@@ -137,10 +136,14 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
             \Moxl\API::clear();
             \RPC::clear();
 
+            fwrite(STDERR, colorize(getenv('sid'), 'yellow')." before : ".\sizeToCleanSize(memory_get_usage())."\n");
+
             if(!$parser->parse($message)) {
                 fwrite(STDERR, colorize(getenv('sid'), 'yellow')." ".$parser->getError()."\n");
             }
 
+            fwrite(STDERR, colorize(getenv('sid'), 'yellow')." after : ".\sizeToCleanSize(memory_get_usage())."\n");
+
             if($restart) {
                 $session = \Sessionx::start();
                 \Moxl\Stanza\Stream::init($session->host);
@@ -149,7 +152,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
             }
 
             $msg = \RPC::commit();
-            \RPC::clear();
 
             if(!empty($msg)) {
                 //echo json_encode($msg)."";
@@ -157,18 +159,19 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
                 //fwrite(STDERR, colorize(json_encode($msg).' '.strlen($msg), 'yellow')." : ".colorize('sent to browser', 'green')."\n");
             }
 
+            \RPC::clear();
+
             $xml = \Moxl\API::commit();
-            \Moxl\API::clear();
 
             if(!empty($xml)) {
                 $conn->write(trim($xml));
                 #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
             }
-        }
 
-        // Two ticks to be sure that we get everything from the socket, sic…
+            \Moxl\API::clear();
-        $loop->tick();
+
-        //$loop->tick();
+            gc_collect_cycles();
+        }
     });
 
     $conn->on('error', function($msg) use ($conn, $loop) {
@@ -185,7 +188,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
     $obj = new \StdClass;
     $obj->func = 'registered';
 
-    //echo json_encode($obj)."";
     //fwrite(STDERR, colorize(json_encode($obj).' '.strlen($obj), 'yellow')." : ".colorize('obj sent to browser', 'green')."\n");
 
     echo base64_encode(gzcompress(json_encode($obj), 9))."";

sources/locales/ar.po

@@ -1,6 +1,5 @@
-# Arabic translations for Movim  package.
+#
-# This file is distributed under the same license as the Movim  package.
+# Translators:
-# This file was translated from CodingTeam at <http://codingteam.net/>.
 #. #-#-#-#-#  locales.po (PACKAGE VERSION)  #-#-#-#-#
 #. extracted from ../app/widgets/About/locales.ini
 #. #-#-#-#-#  locales.po (PACKAGE VERSION)  #-#-#-#-#
@@ -91,18 +90,18 @@
 #. extracted from ../locales/locales.ini
 msgid ""
 msgstr ""
-"Project-Id-Version: Movim\n"
+"Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
-"PO-Revision-Date: 2015-06-09 12:20+0000\n"
+"PO-Revision-Date: 2015-10-06 21:34+0000\n"
-"Last-Translator: Mohamed-Touhami MAHDI <dragnucs@legtux.org>\n"
+"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Arabic (http://www.transifex.com/movim/movim/language/ar/)\n"
-"Language: \n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-06-18 21:08+0000\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Launchpad (build 17570)\n"
+"X-Generator: Translate Toolkit 1.13.0\n"
 
 #: [about]thanks
 msgid "Thanks"
@@ -116,6 +115,10 @@ msgstr "المطوّرون"
 msgid "Translators"
 msgstr "المترجمون"
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr "البرنامج"
@@ -137,9 +140,8 @@ msgid "Account"
 msgstr ""
 
 #: [account]password_change_title
-#, fuzzy
 msgid "Change my password"
-msgstr "كلمة السر غير صحيحة"
+msgstr ""
 
 #: [account]password [db]password [credentials]password [form]password
 #: [input]password
@@ -147,9 +149,8 @@ msgid "Password"
 msgstr "كلمة السّر"
 
 #: [account]password_confirmation
-#, fuzzy
 msgid "Password confirmation"
-msgstr "%s - تكوين"
+msgstr ""
 
 #: [account]password_changed
 msgid "The password has been updated"
@@ -168,9 +169,8 @@ msgid "Delete my account"
 msgstr ""
 
 #: [account]delete
-#, fuzzy
 msgid "Delete your account"
-msgstr "أنشئ حسابًا جديدًا"
+msgstr ""
 
 #: [account]delete_text
 msgid "You will delete your XMPP account and all the relative information linked to it (profile, contacts and publications)."
@@ -190,11 +190,11 @@ msgstr "أنشئ حسابًا جديدًا"
 
 #: [create]notfound
 msgid "No account creation form found on the server"
-msgstr "لم يم العثور على أي إستمارة لﻹنشاء حساب على الخادم."
+msgstr ""
 
 #: [create]server_on
 msgid "on"
-msgstr "في"
+msgstr ""
 
 #: [create]successfull
 msgid "Your acccount has been successfully registered"
@@ -202,7 +202,7 @@ msgstr ""
 
 #: [create]loading
 msgid "Loading"
-msgstr "جارٍ التحميل"
+msgstr ""
 
 #: [error]not_acceptable
 msgid "Not Acceptable"
@@ -257,9 +257,8 @@ msgid "Port"
 msgstr "المَنفذ"
 
 #: [db]name
-#, fuzzy
 msgid "Database sName"
-msgstr "نوع قاعدة البيانات"
+msgstr ""
 
 #: [admin]general
 msgid "General Settings"
@@ -334,10 +333,9 @@ msgid "List of whitelisted XMPP servers"
 msgstr ""
 
 #: [information]title
-#, fuzzy
 msgctxt "[information]title"
 msgid "Information Message"
-msgstr "رسالة معلومات"
+msgstr ""
 
 #: [information]description
 msgid "Description"
@@ -348,15 +346,13 @@ msgid "This message will be displayed on the login page"
 msgstr ""
 
 #: [information]info2
-#, fuzzy
 msgid "Leave this field blank if you dont want to show any message."
-msgstr "إترك هذا الحقل فارغا للسماح النفود لجميع حسابات XMPP."
+msgstr ""
 
 #: [information]label
-#, fuzzy
 msgctxt "[information]label"
 msgid "Information Message"
-msgstr "رسالة معلومات"
+msgstr ""
 
 #: [log]empty
 msgid "Empty"
@@ -407,9 +403,8 @@ msgid "Install the php5-gd library"
 msgstr ""
 
 #: [compatibility]rights
-#, fuzzy
 msgid "Read and write rights for the webserver in Movims root directory"
-msgstr "فعّل صلاحيات القراءة و الكتابة على دليل Movim الجذر"
+msgstr ""
 
 #: [compatibility]rewrite
 msgid "The URL Rewriting support is currently disabled"
@@ -524,10 +519,9 @@ msgid "Chat Room ID"
 msgstr ""
 
 #: [chatroom]name
-#, fuzzy
 msgctxt "[chatroom]name"
 msgid "Name"
-msgstr "الاسم"
+msgstr ""
 
 #: [chatroom]nickname [general]nickname [chatrooms]nickname
 msgid "Nickname"
@@ -566,10 +560,9 @@ msgid "URL"
 msgstr ""
 
 #: [url]name
-#, fuzzy
 msgctxt "[url]name"
 msgid "Name"
-msgstr "الاسم"
+msgstr ""
 
 #: [message]published
 msgid "Message Published"
@@ -648,7 +641,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -828,9 +821,8 @@ msgid "Last public post"
 msgstr ""
 
 #: [subscription]to
-#, fuzzy
 msgid "You can see this contact status"
-msgstr "أزّل هذه المعرفة"
+msgstr ""
 
 #: [subscription]to_button
 msgid "Share my status"
@@ -853,9 +845,8 @@ msgid "But this contact can still see if you are online"
 msgstr ""
 
 #: [subscription]nil
-#, fuzzy
 msgid "No subscriptions"
-msgstr "الوصف"
+msgstr ""
 
 #: [subscription]nil_button
 msgid "Invite"
@@ -930,9 +921,8 @@ msgid "Subscriptions"
 msgstr ""
 
 #: [group]servers
-#, fuzzy
 msgid "Groups servers"
-msgstr "المجموعات"
+msgstr ""
 
 #: [group]search_server
 msgid "Search for a new server"
@@ -963,11 +953,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,9 +1001,8 @@ msgid "%s posts"
 msgstr ""
 
 #: [groups]disco_error
-#, fuzzy
 msgid "This server doesn't exists"
-msgstr "يستضيف هذا الخادوم %s حسابات"
+msgstr ""
 
 #: [menu]all
 msgid "All"
@@ -1023,15 +1012,13 @@ msgstr "الكل"
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-#, fuzzy
+msgid "My publications"
-msgid "Search in your contacts"
+msgstr ""
-msgstr "اتصالاتكم"
 
-#: [hello]active_contacts
+#: [roster]search
-#, fuzzy
+msgid "Search in your contacts"
-msgid "Active contacts"
+msgstr ""
-msgstr "اتصالاتكم"
 
 #: [hello]chat
 msgid "Go on the Chat page"
@@ -1065,6 +1052,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1259,10 +1262,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr "تعذّر استيثاق XMPP"
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "عنوان بريدي"
@@ -1355,50 +1354,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "مساعدة"
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr "العنوان"
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1407,10 +1366,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1423,10 +1378,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1487,6 +1438,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "مساعدة"
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1503,6 +1502,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1520,7 +1527,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1539,6 +1546,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1588,14 +1599,12 @@ msgid "Please enter a valid Jabber ID"
 msgstr ""
 
 #: [roster]no_contacts_title
-#, fuzzy
 msgid "No contacts ?"
-msgstr "اتصالاتكم"
+msgstr ""
 
 #: [roster]no_contacts_text
-#, fuzzy
 msgid "You can add one using the + button bellow"
-msgstr "أي اتصالات؟ يمكنك إضافة واحد باستخدام زر + أدناه أو الذهاب إلى صفحة الاستكشاف"
+msgstr ""
 
 #: [roster]show_hide
 msgid "Show/Hide"
@@ -1706,10 +1715,13 @@ msgid "Your profile is now restricted"
 msgstr ""
 
 #: [general]nickname
-#, fuzzy
 msgctxt "[general]nickname"
 msgid "Nickname"
-msgstr "الكنية"
+msgstr ""
+
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
 
 #: [accounts]twitter
 msgid "Twitter"
@@ -1720,17 +1732,12 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
-#, fuzzy
 msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
-msgstr "الكنية"
-
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
 msgstr ""
 
 #: [privacy]privacy_title
@@ -2035,11 +2042,11 @@ msgstr ""
 
 #: [button]bool_yes
 msgid "Yes"
-msgstr "نعم"
+msgstr ""
 
 #: [button]bool_no
 msgid "No"
-msgstr "لا"
+msgstr ""
 
 #: [button]return
 msgid "Return"
@@ -2098,10 +2105,9 @@ msgid "Sunday"
 msgstr ""
 
 #: [gender]nil
-#, fuzzy
 msgctxt "[gender]nil"
 msgid "None"
-msgstr "لا شيء"
+msgstr ""
 
 #: [gender]male
 msgid "Male"
@@ -2136,10 +2142,9 @@ msgid "Registered"
 msgstr ""
 
 #: [marital]nil
-#, fuzzy
 msgctxt "[marital]nil"
 msgid "None"
-msgstr "لا شيء"
+msgstr ""
 
 #: [marital]single
 msgid "Single"
@@ -2614,14 +2619,17 @@ msgid "Yesterday"
 msgstr "أمس"
 
 #: [date]ago
-#, fuzzy
 msgid "%d days ago"
-msgstr " %d يوما مضت"
+msgstr ""
 
 #: [date]day
 msgid "day"
 msgstr "يوم"
 
+#: [post]title
+msgid "Title"
+msgstr "العنوان"
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr "ما الجديد؟"
@@ -2642,6 +2650,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""
@@ -2671,9 +2683,8 @@ msgid "Show the older comments"
 msgstr ""
 
 #: [post]comments_loading
-#, fuzzy
 msgid "Loading comments..."
-msgstr "يجري تنزيل تلقيمتك..."
+msgstr ""
 
 #: [post]comments_get
 msgid "Get the comments"
@@ -2718,264 +2729,3 @@ msgstr ""
 #: [field]type_here
 msgid "Type here"
 msgstr ""
-
-#~ msgid "Environment"
-#~ msgstr "البيئة"
-
-#~ msgid "%s - Account Creation"
-#~ msgstr "%s - إنشاء حساب"
-
-#~ msgid "or"
-#~ msgstr "أو"
-
-#~ msgid "Install the %s package"
-#~ msgstr "نضّب الحزمة %s"
-
-#~ msgid "Movim requires the %s extension."
-#~ msgstr "يتطلّب Movim الملحقة %s"
-
-#~ msgid "Actual version : "
-#~ msgstr "الإصدارة الفعلية: "
-
-#~ msgid "Install %s and %s packages"
-#~ msgstr "نصّب الحزمتين %s و %s"
-
-#~ msgid "Update your PHP version or contact your server administrator"
-#~ msgstr "رقِّ إصدارة PHP أو اتصل بمدير الخادوم"
-
-#~ msgid "PHP version mismatch. Movim requires PHP 5.3 minimum."
-#~ msgstr "إصدارة PHP غير مطابقة. يتطلّب Movim الإصدارة 5.3 أو ما تزيد عليها."
-
-#~ msgid "Movim's folder must be writable."
-#~ msgstr "يجب أن يكون دليل Movim قابلا للكتابة فيه"
-
-#~ msgid "Bosh connection failed with error '%s'"
-#~ msgstr "تعذّر الاتصال BOSH. العطل هو '%s'"
-
-#~ msgid "Database connection failed with error '%s'"
-#~ msgstr "تعذّر الاتصال بقاعدة البيانات. العطل هو '%s'"
-
-#~ msgid "XMPP connection through Bosh failed with error '%s'"
-#~ msgstr "تعذّر الاتصال XMPP عبر BOSH. العطل هو '%s'"
-
-#~ msgid "Keep in mind that Movim is still under development and will handle many personal details. Its use can potentially endanger your data. Always pay attention to information that you submit."
-#~ msgstr "لاحظ أن Movim لاتزال قيد التطوير و أنها ستعالج قدرا كبيرا من البيانات الشخصية، مما قد يعرّض بياناتك للانكشاف، لذا دقّق في البيانات التي تضعها فيها."
-
-#~ msgid "Before you enjoy your social network, a few adjustements are required."
-#~ msgstr "قبل أن تستخدم شبكتك الاجتماعية تجب بعض التضبيطات."
-
-#~ msgid "Thank you for downloading Movim!"
-#~ msgstr "شكرا لتنزيلك Movim."
-
-#~ msgid "Couldn't create configuration file '%s'."
-#~ msgstr "تعذّر إنشاء ملف التضبيطات '%s'."
-
-#~ msgid "Compatibility Test"
-#~ msgstr "اختبار التوافقية"
-
-#~ msgid "Couldn't create directory '%s'."
-#~ msgstr "تعذّر إنشاء الدليل '%s'."
-
-#~ msgid "Movim Installer"
-#~ msgstr "مُنصِّب Movim"
-
-#~ msgid "The following requirements were not met. Please make sure they are all satisfied in order to install Movim."
-#~ msgstr "المتطلبات التالية غير متوفرة. اعمل على توفيرها قبل تنصيب Movim."
-
-#~ msgid "Proxy Preferences"
-#~ msgstr "خيارات الوسيط"
-
-#~ msgid "ultimate"
-#~ msgstr "القصوى"
-
-#~ msgid "talkative"
-#~ msgstr "مُتكلّم"
-
-#~ msgid "normal"
-#~ msgstr "عادي"
-
-#~ msgid "terse"
-#~ msgstr "كثيف"
-
-#~ msgid "empty"
-#~ msgstr "خالٍ"
-
-#~ msgid "Some errors were detected. Please correct them for the installation to proceed."
-#~ msgstr "التُمست بعض الأعطال. تداركها لمواصلة التنصيب."
-
-#~ msgid "Success !"
-#~ msgstr "تمت بنجاح."
-
-#~ msgid "BOSH Connection Preferences"
-#~ msgstr "خيارات الاتصال BOSH"
-
-#~ msgid "XMPP Connection Preferences"
-#~ msgstr "خيارات الاتصال XMPP"
-
-#~ msgid "JID not provided."
-#~ msgstr "لم يعيّن JID"
-
-#~ msgid "User not logged in."
-#~ msgstr "المستخدم غير والجٍ"
-
-#~ msgid "Cannot load element value '%s'"
-#~ msgstr "تعذّر تحميل قيمة العنصر '%s'"
-
-#~ msgid "Please remove the %s folder in order to complete the installation"
-#~ msgstr "أزل الدليل %s لإتمام التنصيب"
-
-#~ msgid "Database Movim schema installed"
-#~ msgstr "تم توليد هيكل قاعدة البيانات لأجل Movim"
-
-#~ msgid "Database Detected"
-#~ msgstr "تمّ التماس قاعدة البيانات"
-
-#~ msgid "Valid Bosh"
-#~ msgstr "Bosh صحيح"
-
-#~ msgid "jid '%s' is incorrect"
-#~ msgstr "معرِّف JID '%s' غير صحيح"
-
-#~ msgid "Cannot open log file '%s'"
-#~ msgstr "تعذّر فتح ملف السجل '%s'"
-
-#~ msgid "Logout"
-#~ msgstr "اخرج"
-
-#~ msgid "Could not communicate with the XMPP server"
-#~ msgstr "تعذّر التواصل مع خادوم XMPP"
-
-#~ msgid "Invalid name"
-#~ msgstr "اسم غير صالح"
-
-#~ msgid "You entered different passwords"
-#~ msgstr "أدخلت كلمة سرّ غير متطابقة"
-
-#~ msgid "Could not connect to the XMPP server"
-#~ msgstr "تعذّر الاتصال بخادوم XMPP"
-
-#~ msgid "Username already taken"
-#~ msgstr "اسم المستخدم محجوز"
-
-#~ msgid "Wrong ID"
-#~ msgstr "معرّف غير صحيح"
-
-#~ msgid "%s - Add An Account"
-#~ msgstr "%s - إضافة حساب"
-
-#~ msgid "Only alphanumerics elements are authorized"
-#~ msgstr "المحارف الرقمية و الأحرف وحدها المسموح بها"
-
-#~ msgid "Make sure your password is safe :"
-#~ msgstr "تيقّن من قوة كلمة السرّ:"
-
-#~ msgid "Example :"
-#~ msgstr "مثال:"
-
-#~ msgid "A capital letter, a digit and a special character are recommended"
-#~ msgstr "يستحسن التنويع في الأحرف ما بين كبير و صغير و أرقام و محارف خاصة"
-
-#~ msgid "8 characters"
-#~ msgstr "ثمانية محارف"
-
-#~ msgid "Firstly fill in this blank with a brand new account ID, this address will follow you on all the Movim network !"
-#~ msgstr "بداية، أدخل في هذا الحقل معرّفًا جديدًا للحساب. هذا العنوان سيكون لصيقا بك في شبكة Movim كلّها."
-
-#~ msgid "Add your login informations"
-#~ msgstr "أدخل بيانات الولوج"
-
-#~ msgid "Retype"
-#~ msgstr "أعِد الإدخال"
-
-#~ msgid "Create"
-#~ msgstr "أنشئ"
-
-#~ msgid "Same here !"
-#~ msgstr "و هنا كذلك"
-
-#~ msgid "Client Name"
-#~ msgstr "اسم العميل"
-
-#~ msgid "Address"
-#~ msgstr "العنوان"
-
-#~ msgid "Your server doesn't support post publication, you can only read contact's feeds"
-#~ msgstr "خادومك لا يدعم نشر المداخلات، يمكنك و حسبُ مطالعة تلقيمات معارفك"
-
-#~ msgid "Invite this user"
-#~ msgstr "ادعُ هذا الشخص"
-
-#~ msgid "Client Type"
-#~ msgstr "نوع العميل"
-
-#~ msgid "My Posts"
-#~ msgstr "مداخلاتي"
-
-#~ msgid "What is Movim?"
-#~ msgstr "ما Movim؟"
-
-#~ msgid "Some features are missing/I can't do everything I used to do on other social networks"
-#~ msgstr "بعض الوظائف غير موجودة\\لا يمكنني فعل كل ما اعتدت فعله في شبكات اجتماعية أخرى!"
-
-#~ msgid "Visit the page %s What is Movim ? %s to know more about the project, its aims and understand how it works."
-#~ msgstr "زر صفحة %s ما Movim؟ %s لتعلم المزيد عن المشروع و أهدافه و كيف يعمل."
-
-#~ msgid "The current BOSH URL in invalid"
-#~ msgstr "مسار BOSH الحالي غير صحيح"
-
-#~ msgid "Go to the %s to the Frequently Asked Questions %s or come ask your question on the official chatroom %s or via our mailing-list (%s see the dedicated page %s)."
-#~ msgstr "طالع %s إجابات الأسئة الشائعة %s أو ضع سؤالك في غرفة المحادثة الرسمية للمشروع %s أو في قائمة المراسلات (%s طالع صفحتها %s)."
-
-#~ msgid "Although Movim is evolving fast, many (many) features are missing. Be patient ;). You can have a look %s at next versions's roadmaps %s to know if the one you want is on its way."
-#~ msgstr "برغم من أن Movim يتطوّر بسرعة فإن الكثير الكثير من الوظائف لا تزال ناقصة. صبرا ;) تمكنك مطالعة %s خريطة الإصدارات القادمة %s لمعرفة إن كان ما تريده في الطريق."
-
-#~ msgid "Don't forget that Movim is an open source project, a helping hand is always welcome (see %s Can I participate %s)"
-#~ msgstr "لا تنسَ أن Movim مشروع مفتوح المصدر، و أن المساعدة مرحّب بها دوما (طالع %s أتمكنني المساهمة؟ %s)"
-
-#~ msgid "I can't find the answer to my question here"
-#~ msgstr "لا أجد إجابة سؤالي هنا!"
-
-#~ msgid "wants to talk with you"
-#~ msgstr "يريد التحدّث معك"
-
-#~ msgid "Connecting..."
-#~ msgstr "يجري الاتصال..."
-
-#~ msgid "Link my current account"
-#~ msgstr "اربط بحسابي الحالي"
-
-#~ msgid "Decline"
-#~ msgstr "ارفض"
-
-#~ msgid "Contacts (%s)"
-#~ msgstr "المعارف (%s)"
-
-#~ msgid "Send request"
-#~ msgstr "أرسل طلبًا"
-
-#~ msgid "No profile yet ?"
-#~ msgstr "لا ملف شخصي إلى الآن؟"
-
-#~ msgid "Create my vCard"
-#~ msgstr "ولّد لي vCard"
-
-#~ msgid "Edit my Profile"
-#~ msgstr "حرر ملفي الشخصي"
-
-#~ msgid "Loading the contact feed ..."
-#~ msgstr "يجري تنزيل تلقيمة المعرفة..."
-
-#~ msgid "Show All"
-#~ msgstr "أظهر الكُل"
-
-#~ msgid "Follow"
-#~ msgstr "تتبّع"
-
-#~ msgid "Debug console"
-#~ msgstr "مرقاب التبقيق"
-
-#~ msgid "You can now access your shiny Movim instance %sJump In !%s"
-#~ msgstr "يمكنك الآن استخدام تنصيبة Movim الجديدة. %sهيّا%s"
-
-#~ msgid "Pseudo"
-#~ msgstr "شبيه"

sources/locales/be.po

@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2011-10-26 21:31+0000\n"
 "Last-Translator: edhelas <edhelas@movim.eu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -640,7 +644,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -952,11 +956,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,12 +1015,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1051,6 +1055,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1245,10 +1265,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Мой адрас"
@@ -1341,50 +1357,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1393,10 +1369,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1409,10 +1381,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1473,6 +1441,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1489,6 +1505,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1506,7 +1530,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1525,6 +1549,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1694,6 +1722,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1703,7 +1735,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1711,10 +1743,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2601,6 +2629,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2621,6 +2653,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/bn.po

@@ -95,7 +95,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2014-05-23 12:58+0000\n"
 "Last-Translator: Guruvai Oronno Bangalee <guruvai.morpheus@yandex.com>\n"
 "Language-Team: Bengali <bn@li.org>\n"
@@ -118,6 +118,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -640,7 +644,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -952,11 +956,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,12 +1015,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1051,6 +1055,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1245,10 +1265,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr ""
@@ -1341,50 +1357,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1393,10 +1369,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1409,10 +1381,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1473,6 +1441,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1489,6 +1505,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1506,7 +1530,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1525,6 +1549,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1694,6 +1722,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1703,7 +1735,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1711,10 +1743,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2604,6 +2632,10 @@ msgstr " %d দিন আগে"
 msgid "day"
 msgstr "দিন"
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2624,6 +2656,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/br.po

@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2013-07-27 17:06+0000\n"
 "Last-Translator: Gwenn M <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -645,7 +649,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -958,11 +962,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1017,15 +1021,14 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
+#: [menu]me
+msgid "My publications"
+msgstr ""
+
 #: [roster]search
 msgid "Search in your contacts"
 msgstr ""
 
-#: [hello]active_contacts
-#, fuzzy
-msgid "Active contacts"
-msgstr "Oberennoù"
-
 #: [hello]chat
 msgid "Go on the Chat page"
 msgstr ""
@@ -1058,6 +1061,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1252,10 +1271,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr "Ar c'hennaskañ XMPP a zo c'hwitet"
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Ho chomlec'h"
@@ -1348,50 +1363,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "Sikour"
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1400,10 +1375,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1416,10 +1387,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1480,6 +1447,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "Sikour"
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1496,6 +1511,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1513,7 +1536,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1532,6 +1555,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr "Kemeret eo bet an anv implijer dija"
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1702,6 +1729,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr "Lezanv"
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1711,7 +1742,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1720,10 +1751,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr "Lezanv"
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2613,6 +2640,10 @@ msgstr " %d devezh 'zo"
 msgid "day"
 msgstr "devezh"
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2633,6 +2664,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""
@@ -2709,6 +2744,10 @@ msgstr ""
 msgid "Type here"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Active contacts"
+#~ msgstr "Oberennoù"
+
 #~ msgid "Cannot load element value '%s'"
 #~ msgstr "N'eus ket tu kargañ talvoud an elfenn '%s'"
 
@@ -2763,9 +2802,6 @@ msgstr ""
 #~ msgid "Invalid name"
 #~ msgstr "Anv direizh"
 
-#~ msgid "Username already taken"
-#~ msgstr "Kemeret eo bet an anv implijer dija"
-
 #~ msgid "Could not connect to the XMPP server"
 #~ msgstr "N'eus ket bet tu kenaskañ ouzh ar servijer XMPP"
 

sources/locales/da.po

@@ -1,6 +1,5 @@
-# Danish translations for Movim  package.
+#
-# This file is distributed under the same license as the Movim  package.
+# Translators:
-# This file was translated from CodingTeam at <http://codingteam.net/>.
 #. #-#-#-#-#  locales.po (PACKAGE VERSION)  #-#-#-#-#
 #. extracted from ../app/widgets/About/locales.ini
 #. #-#-#-#-#  locales.po (PACKAGE VERSION)  #-#-#-#-#
@@ -91,18 +90,18 @@
 #. extracted from ../locales/locales.ini
 msgid ""
 msgstr ""
-"Project-Id-Version: Movim\n"
+"Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
-"PO-Revision-Date: 2015-05-18 08:45+0000\n"
+"PO-Revision-Date: 2015-10-06 21:34+0000\n"
-"Last-Translator: Filip Kemuel Dam Bartholdy <filip@kemuel.dk>\n"
+"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Danish (http://www.transifex.com/movim/movim/language/da/)\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-06-18 21:08+0000\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Launchpad (build 17570)\n"
+"X-Generator: Translate Toolkit 1.13.0\n"
 
 #: [about]thanks
 msgid "Thanks"
@@ -116,6 +115,10 @@ msgstr "Udviklere"
 msgid "Translators"
 msgstr "Oversættere"
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr "Software"
@@ -137,9 +140,8 @@ msgid "Account"
 msgstr "Konto"
 
 #: [account]password_change_title
-#, fuzzy
 msgid "Change my password"
-msgstr "Forkert adgangskode"
+msgstr ""
 
 #: [account]password [db]password [credentials]password [form]password
 #: [input]password
@@ -147,9 +149,8 @@ msgid "Password"
 msgstr "Kodeord"
 
 #: [account]password_confirmation
-#, fuzzy
 msgid "Password confirmation"
-msgstr "%s - Konfiguration"
+msgstr ""
 
 #: [account]password_changed
 msgid "The password has been updated"
@@ -168,9 +169,8 @@ msgid "Delete my account"
 msgstr "Slet min konto"
 
 #: [account]delete
-#, fuzzy
 msgid "Delete your account"
-msgstr "Slet min konto"
+msgstr ""
 
 #: [account]delete_text
 msgid "You will delete your XMPP account and all the relative information linked to it (profile, contacts and publications)."
@@ -178,7 +178,7 @@ msgstr "Du sletter hermed din XMPP konto og alle de relative informationer knytt
 
 #: [account]delete_text_confirm
 msgid "Are you sure that you want to delete it ?"
-msgstr "Er du sikker på at du vil slette den ?"
+msgstr ""
 
 #: [account]gateway_title
 msgid "Gateway"
@@ -190,31 +190,31 @@ msgstr "Opret en ny konto"
 
 #: [create]notfound
 msgid "No account creation form found on the server"
-msgstr "Ingen konto-oprettelses-formular fundet på serveren"
+msgstr ""
 
 #: [create]server_on
 msgid "on"
-msgstr "på"
+msgstr ""
 
 #: [create]successfull
 msgid "Your acccount has been successfully registered"
-msgstr "Success! Din konto er registreret"
+msgstr ""
 
 #: [create]loading
 msgid "Loading"
-msgstr "Indlæser"
+msgstr ""
 
 #: [error]not_acceptable
 msgid "Not Acceptable"
-msgstr "Ikke accepteret"
+msgstr ""
 
 #: [error]service_unavailable
 msgid "The registration system of this server is currently unavailable"
-msgstr "Registreringssystemet på denne server er i øjeblikket utilgængeligt"
+msgstr ""
 
 #: [oob]about
 msgid "This server use an external system for the registration, please click on the following URL."
-msgstr "Denne server bruger et eksternt system til registrering, klik venligst på følgende link."
+msgstr ""
 
 #: [adhoc]title
 msgid "Actions"
@@ -257,9 +257,8 @@ msgid "Port"
 msgstr "Port"
 
 #: [db]name
-#, fuzzy
 msgid "Database sName"
-msgstr "Databasenavn"
+msgstr ""
 
 #: [admin]general
 msgid "General Settings"
@@ -334,10 +333,9 @@ msgid "List of whitelisted XMPP servers"
 msgstr "Liste over hvidlistede XMPP servere"
 
 #: [information]title
-#, fuzzy
 msgctxt "[information]title"
 msgid "Information Message"
-msgstr "Informationsbesked"
+msgstr ""
 
 #: [information]description
 msgid "Description"
@@ -348,15 +346,13 @@ msgid "This message will be displayed on the login page"
 msgstr "Denne meddelselse vil blive vist på logind siden"
 
 #: [information]info2
-#, fuzzy
 msgid "Leave this field blank if you dont want to show any message."
-msgstr "Efterlad feltet tomt hvis du ikke vil vise nogen beskedl"
+msgstr ""
 
 #: [information]label
-#, fuzzy
 msgctxt "[information]label"
 msgid "Information Message"
-msgstr "Informationsbesked"
+msgstr ""
 
 #: [log]empty
 msgid "Empty"
@@ -407,9 +403,8 @@ msgid "Install the php5-gd library"
 msgstr ""
 
 #: [compatibility]rights
-#, fuzzy
 msgid "Read and write rights for the webserver in Movims root directory"
-msgstr "Læse og skrive rettigheder på webserveren i Movim's rodmappe"
+msgstr ""
 
 #: [compatibility]rewrite
 msgid "The URL Rewriting support is currently disabled"
@@ -524,10 +519,9 @@ msgid "Chat Room ID"
 msgstr "Chat Room ID"
 
 #: [chatroom]name
-#, fuzzy
 msgctxt "[chatroom]name"
 msgid "Name"
-msgstr "Navn"
+msgstr ""
 
 #: [chatroom]nickname [general]nickname [chatrooms]nickname
 msgid "Nickname"
@@ -550,9 +544,8 @@ msgid "Bookmarks updated"
 msgstr "Bogmærker opdateret"
 
 #: [bookmarks]error
-#, fuzzy
 msgid "An error occured :"
-msgstr "En fejl er sket: "
+msgstr ""
 
 #: [bookmarks]configure
 msgid "Configure"
@@ -567,10 +560,9 @@ msgid "URL"
 msgstr "URL"
 
 #: [url]name
-#, fuzzy
 msgctxt "[url]name"
 msgid "Name"
-msgstr "Navn"
+msgstr ""
 
 #: [message]published
 msgid "Message Published"
@@ -645,14 +637,12 @@ msgid "Subject changed"
 msgstr "Emnet er ændret"
 
 #: [chats]empty_title
-#, fuzzy
 msgid "No chats yet..."
-msgstr "Ingen kommentarer endnu"
+msgstr ""
 
 #: [chats]empty
-#, fuzzy
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgstr ""
-msgstr "Åbn en ny samtale ved at klikke på plus knappen herunder"
 
 #: [chats]add
 msgid "Chat with a contact"
@@ -707,9 +697,8 @@ msgid "Appearence"
 msgstr "Udseende"
 
 #: [config]info
-#, fuzzy
 msgid "This configuration is shared wherever you are connected"
-msgstr "Denne opsætning er delt hver gang du er forbundet !"
+msgstr ""
 
 #: [notifications]message
 msgid "Notify on incoming message"
@@ -832,9 +821,8 @@ msgid "Last public post"
 msgstr "Sidste offentige indlæg"
 
 #: [subscription]to
-#, fuzzy
 msgid "You can see this contact status"
-msgstr "Intet offentligt feed for kontakt"
+msgstr ""
 
 #: [subscription]to_button
 msgid "Share my status"
@@ -845,23 +833,20 @@ msgid "But this contact cannot see yours"
 msgstr ""
 
 #: [subscription]from
-#, fuzzy
 msgid "You are not subscribed to this contact"
-msgstr "Du er ved at afmelde dig fra denne gruppe"
+msgstr ""
 
 #: [subscription]from_button
-#, fuzzy
 msgid "Ask to subscribe"
-msgstr "%s tilmeldte"
+msgstr ""
 
 #: [subscription]from_text
 msgid "But this contact can still see if you are online"
 msgstr ""
 
 #: [subscription]nil
-#, fuzzy
 msgid "No subscriptions"
-msgstr "Tilmeldinger"
+msgstr ""
 
 #: [subscription]nil_button
 msgid "Invite"
@@ -936,9 +921,8 @@ msgid "Subscriptions"
 msgstr "Tilmeldinger"
 
 #: [group]servers
-#, fuzzy
 msgid "Groups servers"
-msgstr "Grupper"
+msgstr ""
 
 #: [group]search_server
 msgid "Search for a new server"
@@ -969,12 +953,12 @@ msgid "Contact post"
 msgstr "Kontakt indlæg"
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
-msgstr "Du har ingen abonnementer endnu, vælg en gruppe server herover for at begynde at gå på opdagelse."
+msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
-msgstr "Tilmled dig til dine favorit feeds ved at bogmærke dem."
+msgstr ""
 
 #: [groups]subscriptions
 msgid "My Subscriptions"
@@ -1028,15 +1012,13 @@ msgstr "Alle"
 msgid "Refresh all the streams"
 msgstr "Genopfrisk alle strømmene"
 
-#: [roster]search
+#: [menu]me
-#, fuzzy
+msgid "My publications"
-msgid "Search in your contacts"
+msgstr ""
-msgstr "Snak med dine kontakter"
 
-#: [hello]active_contacts
+#: [roster]search
-#, fuzzy
+msgid "Search in your contacts"
-msgid "Active contacts"
+msgstr ""
-msgstr "Dine kontakter"
 
 #: [hello]chat
 msgid "Go on the Chat page"
@@ -1070,6 +1052,22 @@ msgstr "Bogmærk eller træk og slip følgende knap ind på din værktøjslinje
 msgid "Share on Movim"
 msgstr "Del på Movim"
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr "Ofte stillede spørgsmål"
@@ -1207,10 +1205,9 @@ msgid "Account successfully created"
 msgstr "Konto er oprettet"
 
 #: [error]xmpp_unauthorized
-#, fuzzy
 msgctxt "[error]xmpp_unauthorized"
 msgid "Your XMPP server is unauthorized"
-msgstr "Din XMPP server er ikke tilladt"
+msgstr ""
 
 #: [error]mec_error
 msgid "The server takes too much time to respond"
@@ -1245,10 +1242,9 @@ msgid "Invalid password format"
 msgstr "Ugyldigt kodeord"
 
 #: [error]unauthorized
-#, fuzzy
 msgctxt "[error]unauthorized"
 msgid "Your XMPP server is unauthorized"
-msgstr "Din XMPP server er ikke tilladt"
+msgstr ""
 
 #: [error]conflict
 msgid "A Movim session is already open on an other device"
@@ -1266,10 +1262,6 @@ msgstr "Autentificerings mekanismen er ikke understøttet af Movim"
 msgid "The XMPP authentification failed"
 msgstr "XMMP autetifikationen fejlede"
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr "Konti"
-
 #: [form]username
 msgid "My address"
 msgstr "Min adresse"
@@ -1299,14 +1291,12 @@ msgid "Population"
 msgstr "Befolkning"
 
 #: [menu]empty_title
-#, fuzzy
 msgid "No news yet..."
-msgstr "Ingen kommentarer endnu"
+msgstr ""
 
 #: [menu]empty
-#, fuzzy
 msgid "Welcome on your news feed, here you will see all the posts published by your contacts and in the groups you have subscribed."
-msgstr "Velkommen til din egen nyhedsfeed, her kan du se alle de indlæg der er publiceret i de grupper du er tilmeldt."
+msgstr ""
 
 #: [menu]refresh
 msgid "Refreshing all the streams"
@@ -1364,50 +1354,10 @@ msgstr "Nyhedsfeed"
 msgid "Discover and register to the groups you are interested in"
 msgstr "Opdag og tilmeld gig til de grupper du er interreseret i"
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr "Forhåndsvisning"
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "Hjælp"
-
-#: [post]help_more
-msgid "More help"
-msgstr "Mere hjælp"
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr "Markdown syntaks manual"
-
-#: [post]title
-msgid "Title"
-msgstr "Titel"
-
-#: [post]content
 msgid "Content"
 msgstr "Indhold"
 
-#: [post]link
-msgid "Link"
-msgstr "Link"
-
-#: [post]tags
-msgid "Tags"
-msgstr "Tags"
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr "Skriv venligst en gyldig url"
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr "Intet indhold at forhåndsvise"
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr "Intet indhold"
-
 #: [post]published
 msgid "Post published"
 msgstr "Indlæg udgivet"
@@ -1416,10 +1366,6 @@ msgstr "Indlæg udgivet"
 msgid "Post deleted"
 msgstr "Indlæg slettet"
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr "Dette billede vil blive tilføjet til dit galleri"
-
 #: [post]hot
 msgid "What's Hot"
 msgstr "Hvad er hot"
@@ -1432,10 +1378,6 @@ msgstr ""
 msgid "New post"
 msgstr "Nyt indlæg"
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr "Du kan også bruge tjenester som Imgur eller Flickr til at hoste dit billede og så indsætte et link her."
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1445,9 +1387,8 @@ msgid "See %s profile"
 msgstr ""
 
 #: [post]public
-#, fuzzy
 msgid "Publish this post publicly?"
-msgstr "Udgiv dette indlæg i dit offentlige feed?"
+msgstr ""
 
 #: [post]blog_add
 msgid "Post published on your blog"
@@ -1497,6 +1438,54 @@ msgstr "Tilstedeværelse"
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr "Forhåndsvisning"
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "Hjælp"
+
+#: [post]help_more
+msgid "More help"
+msgstr "Mere hjælp"
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr "Markdown syntaks manual"
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr "Link"
+
+#: [post]tags
+msgid "Tags"
+msgstr "Tags"
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr "Dette billede vil blive tilføjet til dit galleri"
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr "Du kan også bruge tjenester som Imgur eller Flickr til at hoste dit billede og så indsætte et link her."
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr "Skriv venligst en gyldig url"
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr "Intet indhold at forhåndsvise"
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1513,6 +1502,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr "Delt"
@@ -1530,8 +1527,8 @@ msgid "You don't have any chatroom yet."
 msgstr "Du har ikke nogen chatrum endnu."
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
-msgstr "Tilføj et ved at klikke på tilføj knappen i headeren."
+msgstr ""
 
 #: [chatrooms]title
 msgid "Chatrooms"
@@ -1549,6 +1546,10 @@ msgstr "Brugere i rummet"
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1598,14 +1599,12 @@ msgid "Please enter a valid Jabber ID"
 msgstr "Skriv venligst et gyldigt Jabber ID"
 
 #: [roster]no_contacts_title
-#, fuzzy
 msgid "No contacts ?"
-msgstr "Dine kontakter"
+msgstr ""
 
 #: [roster]no_contacts_text
-#, fuzzy
 msgid "You can add one using the + button bellow"
-msgstr "Inken kontakter ? Du kan tilføje nogen med + knappen herunder eller via Opdag siden"
+msgstr ""
 
 #: [roster]show_hide
 msgid "Show/Hide"
@@ -1688,9 +1687,8 @@ msgid "No contact specified"
 msgstr "Ingen kontakt specificeret"
 
 #: [upload]title
-#, fuzzy
 msgid "Upload a file"
-msgstr "Upload"
+msgstr ""
 
 #: [upload]choose
 msgid "Choose a file to upload"
@@ -1717,10 +1715,13 @@ msgid "Your profile is now restricted"
 msgstr "Din profil er nu begrænset"
 
 #: [general]nickname
-#, fuzzy
 msgctxt "[general]nickname"
 msgid "Nickname"
-msgstr "Kaldenavn"
+msgstr ""
+
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr "Konti"
 
 #: [accounts]twitter
 msgid "Twitter"
@@ -1731,19 +1732,13 @@ msgid "Skype"
 msgstr "Skype"
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
-msgstr "Yahoo"
+msgstr ""
 
 #: [accounts]accounts_nickname
-#, fuzzy
 msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
-msgstr "Kaldenavn"
+msgstr ""
-
-#: [accounts]accounts_yahoo
-#, fuzzy
-msgid "Yahoo Account"
-msgstr "Konto"
 
 #: [privacy]privacy_title
 msgid "Privacy Level"
@@ -2047,11 +2042,11 @@ msgstr "Forbinder"
 
 #: [button]bool_yes
 msgid "Yes"
-msgstr "Ja"
+msgstr ""
 
 #: [button]bool_no
 msgid "No"
-msgstr "Nej"
+msgstr ""
 
 #: [button]return
 msgid "Return"
@@ -2110,10 +2105,9 @@ msgid "Sunday"
 msgstr "Søndag"
 
 #: [gender]nil
-#, fuzzy
 msgctxt "[gender]nil"
 msgid "None"
-msgstr "Ingen"
+msgstr ""
 
 #: [gender]male
 msgid "Male"
@@ -2148,10 +2142,9 @@ msgid "Registered"
 msgstr "Registreret"
 
 #: [marital]nil
-#, fuzzy
 msgctxt "[marital]nil"
 msgid "None"
-msgstr "Ingen"
+msgstr ""
 
 #: [marital]single
 msgid "Single"
@@ -2626,14 +2619,17 @@ msgid "Yesterday"
 msgstr "I går"
 
 #: [date]ago
-#, fuzzy
 msgid "%d days ago"
-msgstr " for %d dage siden"
+msgstr ""
 
 #: [date]day
 msgid "day"
 msgstr "dag"
 
+#: [post]title
+msgid "Title"
+msgstr "Titel"
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr "Hvad er nyt ?"
@@ -2654,13 +2650,17 @@ msgstr "Geolokalisering"
 msgid "email"
 msgstr "e-mail"
 
+#: [post]empty
+msgid "No content"
+msgstr "Intet indhold"
+
 #: [post]no_comments
 msgid "No comments yet"
-msgstr "Ingen kommentarer endnu"
+msgstr ""
 
 #: [post]no_comments_stream
 msgid "No comments stream"
-msgstr "Innegn kommentarstrøm"
+msgstr ""
 
 #: [post]no_load
 msgid "Your feed cannot be loaded."
@@ -2683,9 +2683,8 @@ msgid "Show the older comments"
 msgstr "Vis de ældre kommentarer"
 
 #: [post]comments_loading
-#, fuzzy
 msgid "Loading comments..."
-msgstr "Indlæser kommentarer ..."
+msgstr ""
 
 #: [post]comments_get
 msgid "Get the comments"
@@ -2730,141 +2729,3 @@ msgstr "API'en kan ikke nåes, prøv igen senere"
 #: [field]type_here
 msgid "Type here"
 msgstr "Skriv her"
-
-#~ msgid "Environment"
-#~ msgstr "Miljø"
-
-#~ msgid "You can login with Facebook (chat only) using %syour.id@chat.facebook.com%s and your password"
-#~ msgstr "Du kan logge ind med Facebook (kun chat) med %sdin.id@chat.facebook.com%s og dit kodeord"
-
-#~ msgid "%sGmail accounts are also compatible%s but are not fully supported"
-#~ msgstr "%sGmail konti er også kompatible%s men ikke fuldt understøttede"
-
-#~ msgid "You can login using your favorite Jabber account"
-#~ msgstr "Du kan logge ind med din favorit Jabber konto"
-
-#~ msgid "or with our demonstration account"
-#~ msgstr "eller med vores demonstrations konto"
-
-#~ msgid "%s has been removed from your public groups"
-#~ msgstr "%s er blevet fjernet fra dine offentlige grupper"
-
-#~ msgid "Remove a chatroom"
-#~ msgstr "Fjern et chatrum"
-
-#~ msgid "You are going to remove the following chatroom. Please confirm your action."
-#~ msgstr "Du er ved at fjerne følgende chatrum. Bekræft venligst din handling."
-
-#~ msgid "Remote application incompatible"
-#~ msgstr "Programmet i den anden ende er ikke kompatibel"
-
-#~ msgid "Remove"
-#~ msgstr "Fjern"
-
-#~ msgid "remorseful"
-#~ msgstr "angrende"
-
-#~ msgid "PHP version mismatch. Movim requires PHP 5.3 minimum."
-#~ msgstr "PHP version passer ikke. Movim kræver PHP 5.3 eller højere."
-
-#~ msgid "Movim requires the %s extension."
-#~ msgstr "Movim kræver %s udvidelsen."
-
-#~ msgid "Movim's folder must be writable."
-#~ msgstr "Movim's mapper skal være skrivbare."
-
-#~ msgid "Movim Installer"
-#~ msgstr "Movim installeringspakke"
-
-#~ msgid "Couldn't create directory '%s'."
-#~ msgstr "Kunne ikke oprette bibliotek '%s'."
-
-#~ msgid "Couldn't create configuration file '%s'."
-#~ msgstr "Kunne ikke oprette konfigurationfil '%s'."
-
-#~ msgid "Compatibility Test"
-#~ msgstr "Kompabilitetstest"
-
-#~ msgid "The following requirements were not met. Please make sure they are all satisfied in order to install Movim."
-#~ msgstr "De følgende krav blev ikke opfyldt. Sikre dig venligst de alle er dækket for at kunne installere Movim."
-
-#~ msgid "User not logged in."
-#~ msgstr "Bruger er ikke logget ind."
-
-#~ msgid "JID not provided."
-#~ msgstr "JID ikke givet."
-
-#~ msgid "jid '%s' is incorrect"
-#~ msgstr "jid '%s' er ikke korrekt"
-
-#~ msgid "Cannot open log file '%s'"
-#~ msgstr "Kan ikke åbne log fil '%s'"
-
-#~ msgid "%s - Account Creation"
-#~ msgstr "%s - Konto oprettelse"
-
-#~ msgid "Remove this contact"
-#~ msgstr "Fjern denne kontakt"
-
-#~ msgid "Debug console"
-#~ msgstr "Fejlsøgningskonsol"
-
-#~ msgid "Logout"
-#~ msgstr "Log ud"
-
-#~ msgid "wants to talk with you"
-#~ msgstr "ønsker at snakke med dig"
-
-#~ msgid "Decline"
-#~ msgstr "Afvis"
-
-#~ msgid "Loading the contact feed ..."
-#~ msgstr "Indlæse kontakt kilde..."
-
-#~ msgid "or"
-#~ msgstr "eller"
-
-#~ msgid "XMPP Connection Preferences"
-#~ msgstr "XMPP forbindelse indstillinger"
-
-#~ msgid "ultimate"
-#~ msgstr "ultimativ"
-
-#~ msgid "talkative"
-#~ msgstr "snakkesalig"
-
-#~ msgid "normal"
-#~ msgstr "normal"
-
-#~ msgid "terse"
-#~ msgstr "kort"
-
-#~ msgid "empty"
-#~ msgstr "tom"
-
-#~ msgid "Connecting..."
-#~ msgstr "Forbinder..."
-
-#~ msgid "Success !"
-#~ msgstr "Fuldført!"
-
-#~ msgid "Cannot load element value '%s'"
-#~ msgstr "Kan ikke indlæse elementværdi '%s'"
-
-#~ msgid "Invalid name"
-#~ msgstr "Ugyldigt navn"
-
-#~ msgid "You entered different passwords"
-#~ msgstr "Du skrev forskellige koderord"
-
-#~ msgid "Username already taken"
-#~ msgstr "Brugernavnet er allerede taget"
-
-#~ msgid "Wrong ID"
-#~ msgstr "Forkert ID"
-
-#~ msgid "Could not communicate with the XMPP server"
-#~ msgstr "Kunne ikke kommunikere med XMPP server"
-
-#~ msgid "Could not connect to the XMPP server"
-#~ msgstr "Kunne ikke forbinde til XMPP server"

sources/locales/el.po

@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2013-12-07 17:27+0000\n"
 "Last-Translator: aitolos <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -646,7 +650,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -959,11 +963,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1018,12 +1022,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1058,6 +1062,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1252,10 +1272,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Η διεύθυνσή μου"
@@ -1348,50 +1364,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1400,10 +1376,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1416,10 +1388,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1480,6 +1448,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1496,6 +1512,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1513,7 +1537,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1532,6 +1556,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη"
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1702,6 +1730,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1711,7 +1743,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1720,10 +1752,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2613,6 +2641,10 @@ msgstr " %d ημέρες πριν"
 msgid "day"
 msgstr "ημέρα"
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2633,6 +2665,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""
@@ -2770,9 +2806,6 @@ msgstr ""
 #~ msgid "You entered different passwords"
 #~ msgstr "Εισάγατε διαφορετικούς κωδικούς"
 
-#~ msgid "Username already taken"
-#~ msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη"
-
 #~ msgid "Wrong ID"
 #~ msgstr "Λάθος ID"
 

sources/locales/eo.po

@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2013-05-11 17:33+0000\n"
 "Last-Translator: Baptiste Darthenay <baptiste+launchpad@darthenay.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -646,7 +650,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -959,11 +963,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1018,12 +1022,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1058,6 +1062,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1252,10 +1272,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Mia adreso"
@@ -1348,50 +1364,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "Helpo"
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1400,10 +1376,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1416,10 +1388,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1480,6 +1448,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "Helpo"
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1496,6 +1512,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1513,7 +1537,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1532,6 +1556,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr "Uzantnomo jam uzata"
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1702,6 +1730,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr "Kromnomo"
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1711,7 +1743,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1720,10 +1752,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr "Kromnomo"
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2613,6 +2641,10 @@ msgstr " Antaŭ %d tagoj"
 msgid "day"
 msgstr "tago"
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2633,6 +2665,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""
@@ -2806,9 +2842,6 @@ msgstr ""
 #~ msgid "You entered different passwords"
 #~ msgstr "Vi tajpis malsamajn pasvortojn"
 
-#~ msgid "Username already taken"
-#~ msgstr "Uzantnomo jam uzata"
-
 #~ msgid "empty"
 #~ msgstr "malplena"
 

sources/locales/fa.po

@@ -95,7 +95,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2014-06-01 23:08+0000\n"
 "Last-Translator: reza <reza_khn@yahoo.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
@@ -118,6 +118,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -640,7 +644,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -952,11 +956,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,12 +1015,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1051,6 +1055,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1245,10 +1265,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr ""
@@ -1341,50 +1357,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1393,10 +1369,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1409,10 +1381,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1473,6 +1441,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1489,6 +1505,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1506,7 +1530,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1525,6 +1549,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1694,6 +1722,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1703,7 +1735,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1711,10 +1743,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2601,6 +2629,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2621,6 +2653,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/fi.po

@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2012-07-19 13:34+0000\n"
 "Last-Translator: Sampo Harjula <sahtor@sahtor.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -647,7 +651,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -960,11 +964,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1020,15 +1024,14 @@ msgstr "Kaikki"
 msgid "Refresh all the streams"
 msgstr ""
 
+#: [menu]me
+msgid "My publications"
+msgstr ""
+
 #: [roster]search
 msgid "Search in your contacts"
 msgstr ""
 
-#: [hello]active_contacts
-#, fuzzy
-msgid "Active contacts"
-msgstr "Toimenpiteet"
-
 #: [hello]chat
 msgid "Go on the Chat page"
 msgstr ""
@@ -1061,6 +1064,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1255,10 +1274,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr "XMPP autentikointi epäonnistui"
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Oma osoite"
@@ -1351,50 +1366,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "Ohje"
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1403,10 +1378,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1419,10 +1390,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1483,6 +1450,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "Ohje"
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1499,6 +1514,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1516,7 +1539,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1535,6 +1558,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr "Käyttäjänimi on jo käytössä"
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1706,6 +1733,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr "Lempinimi"
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1715,7 +1746,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1724,10 +1755,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr "Lempinimi"
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2617,6 +2644,10 @@ msgstr " %d päivää sitten"
 msgid "day"
 msgstr "päivä"
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2637,6 +2668,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""
@@ -2714,6 +2749,10 @@ msgstr ""
 msgid "Type here"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Active contacts"
+#~ msgstr "Toimenpiteet"
+
 #~ msgid "PHP version mismatch. Movim requires PHP 5.3 minimum."
 #~ msgstr "PHP versio ei yhteensopiva. Movim vaatii vähintään PHP 5.3:n"
 
@@ -2846,9 +2885,6 @@ msgstr ""
 #~ msgid "Could not connect to the XMPP server"
 #~ msgstr "Ei voitu luoda yhteyttä XMPP serveriin"
 
-#~ msgid "Username already taken"
-#~ msgstr "Käyttäjänimi on jo käytössä"
-
 #~ msgid "Firstly fill in this blank with a brand new account ID, this address will follow you on all the Movim network !"
 #~ msgstr "Ensiksi anna uusi tilin ID-tunniste, tämä tunniste on sinun käytössä koko Movim verkossa."
 

sources/locales/fr.po

@@ -3,6 +3,7 @@
 # Éfrit, 2015
 # Jaussoin Timothée <edhelas@movim.eu>, 2015
 # Maxime Buquet <tidusx62@gmail.com>, 2015
+# Thirty Thirds <thirtythirds@gmail.com>, 2015
 # Tom <caporaldead@gmail.com>, 2015
 #. #-#-#-#-#  locales.po (PACKAGE VERSION)  #-#-#-#-#
 #. extracted from ../app/widgets/About/locales.ini
@@ -96,8 +97,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
-"PO-Revision-Date: 2015-08-21 09:30+0000\n"
+"PO-Revision-Date: 2015-10-08 06:51+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"
@@ -105,7 +106,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Translate Toolkit 1.12.0\n"
+"X-Generator: Translate Toolkit 1.13.0\n"
 
 #: [about]thanks
 msgid "Thanks"
@@ -119,6 +120,10 @@ msgstr "Développeurs"
 msgid "Translators"
 msgstr "Traducteurs"
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr "Merci à tous les traducteurs"
+
 #: [about]software
 msgid "Software"
 msgstr "Logiciels"
@@ -182,7 +187,7 @@ msgstr "Êtes-vous sûr de vouloir le supprimer ?"
 
 #: [account]gateway_title
 msgid "Gateway"
-msgstr ""
+msgstr "Passerelle"
 
 #: [create]title [subscribe]title
 msgid "Create a new account"
@@ -641,8 +646,8 @@ msgid "No chats yet..."
 msgstr "Pas de discussions pour le moment"
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
-msgstr "Commencez une nouvelle conversation en cliquant sur le bouton plus ci-dessous ou visitez la page Contacts."
+msgstr "Commencez une nouvelle conversation en cliquant sur le bouton plus ci-dessous ou visitez la page %s Contacts%s."
 
 #: [chats]add
 msgid "Chat with a contact"
@@ -846,7 +851,7 @@ msgstr "Mais ce contact peut tout de même voir votre présence en ligne"
 
 #: [subscription]nil
 msgid "No subscriptions"
-msgstr ""
+msgstr "Pas de Souscriptions"
 
 #: [subscription]nil_button
 msgid "Invite"
@@ -922,27 +927,27 @@ msgstr "Abonnements"
 
 #: [group]servers
 msgid "Groups servers"
-msgstr ""
+msgstr "Serveurs de Groupes"
 
 #: [group]search_server
 msgid "Search for a new server"
-msgstr ""
+msgstr "Rechercher un nouveau serveur"
 
 #: [group]help_info1
 msgid "Groups are the perfect way to share posts about topics that you like with all the other Movim's users."
-msgstr ""
+msgstr "Les Groupes sont le meilleur moyen pour échanger des messages concernant des sujets que vous aimez avec tous les autres utilisateurs de Movim."
 
 #: [group]help_info2
 msgid "Choose a server and a Group and subscribe to it using the %s button in the header. You can also create a new one using the %s button."
-msgstr ""
+msgstr "Choisissez un serveur et un Groupe et souscrivez-y en utilisant le bouton %s dans l'en-tête. Vous pouvez aussi en créer un nouveau en utilisant le bouton %s."
 
 #: [group]help_info3
 msgid "Done? You can now publish a new post in the Group by using the %s button."
-msgstr ""
+msgstr "C'est fait? Vous pouvez maintenant publier un nouveau billet dans le Groupe en utilisant le bouton %s."
 
 #: [group]help_info4
 msgid "You will find a list of all your subscribed Groups in My Subscriptions and receive instantly all the new incoming posts in the %sNews%s page."
-msgstr ""
+msgstr "Vous trouverez la liste des Groupes auxquels vous avez souscrit dans Mes Souscriptions et recevrez immédiatement tous les nouveaux messages arrivés sur la page %sActualité%s."
 
 #: [groups]empty_title
 msgid "Hello"
@@ -953,12 +958,12 @@ msgid "Contact post"
 msgstr "Billet d’un contact"
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
-msgstr "Vous n'avez souscrit à aucun groupe pour le moment, choisissez un serveur de groupes ci-dessous et commencer à explorer."
+msgstr "Vous n'avez encore aucune souscription pour le moment"
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
-msgstr "Souscrivez à vos groupes favorits en les mettant en favoris."
+msgstr "Vous allez pouvoir gérer vos souscriptions à cet endroit."
 
 #: [groups]subscriptions
 msgid "My Subscriptions"
@@ -1002,7 +1007,7 @@ msgstr "%s billets"
 
 #: [groups]disco_error
 msgid "This server doesn't exists"
-msgstr ""
+msgstr "Ce serveur n'existe pas"
 
 #: [menu]all
 msgid "All"
@@ -1012,14 +1017,14 @@ msgstr "Tous"
 msgid "Refresh all the streams"
 msgstr "Rafraîchir tous les flux"
 
+#: [menu]me
+msgid "My publications"
+msgstr "Mes publications"
+
 #: [roster]search
 msgid "Search in your contacts"
 msgstr "Chercher dans vos contacts "
 
-#: [hello]active_contacts
-msgid "Active contacts"
-msgstr "Contacts actifs"
-
 #: [hello]chat
 msgid "Go on the Chat page"
 msgstr "Aller sur la page Discussions"
@@ -1052,6 +1057,22 @@ msgstr "Cliquez-déposez ou mettez en favoris dans votre navigateur le bouton su
 msgid "Share on Movim"
 msgstr "Partager sur Movim"
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr "Bonjour !"
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr "Vous êtes nouveau ici ! Bienvenu sur Movim !"
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr "Jetez un œil au menu"
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr "Toutes les principales fonctionnalités de Movim sont disponibles à cet endroit. N'hésitez pas à naviger entre les différentes pages pour en savoir plus !"
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr "Foire aux questions"
@@ -1246,10 +1267,6 @@ msgstr "Le mécanisme d’authentification n’est pas supporté par Movim"
 msgid "The XMPP authentification failed"
 msgstr "L’authentification au serveur XMPP a échoué"
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr "Comptes"
-
 #: [form]username
 msgid "My address"
 msgstr "Mon adresse"
@@ -1280,11 +1297,11 @@ msgstr "Population"
 
 #: [menu]empty_title
 msgid "No news yet..."
-msgstr "Pas de commentaires pour le moment"
+msgstr "Aucune actualité… pour le moment"
 
 #: [menu]empty
 msgid "Welcome on your news feed, here you will see all the posts published by your contacts and in the groups you have subscribed."
-msgstr "Bienvenue sur flux d’actualité, ici vous verrez tous les billets publiés dans les groupes auxquels vous vous êtes abonnés."
+msgstr "Bienvenue sur votre flux d’actualité, ici vous verrez toutes les publications des groupes auxquels vous vous êtes abonnés ainsi que celles de vos contacts."
 
 #: [menu]refresh
 msgid "Refreshing all the streams"
@@ -1342,50 +1359,10 @@ msgstr "Fil d’actualité"
 msgid "Discover and register to the groups you are interested in"
 msgstr "Découvrez et rejoignez les groupes qui vous intéressent"
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr "Aperçu"
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "Aide"
-
-#: [post]help_more
-msgid "More help"
-msgstr "Aide supplémentaire"
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr "Manuel d'utilisation de la syntaxe Markdown"
-
-#: [post]title
-msgid "Title"
-msgstr "Titre"
-
-#: [post]content
 msgid "Content"
 msgstr "Contenu"
 
-#: [post]link
-msgid "Link"
-msgstr "Lien"
-
-#: [post]tags
-msgid "Tags"
-msgstr "Étiquettes"
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr "Veuillez entrer une URL valide"
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr "Pas de contenu à afficher"
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr "Aucun contenu"
-
 #: [post]published
 msgid "Post published"
 msgstr "Bilet publié"
@@ -1394,26 +1371,18 @@ msgstr "Bilet publié"
 msgid "Post deleted"
 msgstr "Billet effacé"
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr "Cette image va être ajoutée à votre galerie"
-
 #: [post]hot
 msgid "What's Hot"
 msgstr "Quoi de neuf"
 
 #: [post]hot_text
 msgid "Posts recently published in Groups that you are not subscribed (yet)"
-msgstr ""
+msgstr "Billets récemment publiés dans les Groupes auxquels vous n'êtes pas (encore) inscrit"
 
 #: [post]new [publish]new
 msgid "New post"
 msgstr "Nouveau billet"
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr "Vous pouvez également utiliser des services comme Imgur ou Flickr pour héberger vos images et coller le lien résultant ici."
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr "Ceci est une republication de %s"
@@ -1424,7 +1393,7 @@ msgstr "Voir le profil de %s"
 
 #: [post]public
 msgid "Publish this post publicly?"
-msgstr ""
+msgstr "Publier ce billet publiquement?"
 
 #: [post]blog_add
 msgid "Post published on your blog"
@@ -1448,7 +1417,7 @@ msgstr "Commentaires désactivés."
 
 #: [post]comment_published
 msgid "Comment published"
-msgstr "Commentaire publié."
+msgstr "Commentaire publié"
 
 #: [status]disconnect
 msgid "Disconnect"
@@ -1474,13 +1443,61 @@ msgstr "Présence"
 msgid "Online with Movim"
 msgstr "En ligne avec Movim"
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr "Aperçu"
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "Aide"
+
+#: [post]help_more
+msgid "More help"
+msgstr "Aide supplémentaire"
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr "Manuel d'utilisation de la syntaxe Markdown"
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr "Vous pouvez enrichir le contenu en utilisant Markdown"
+
+#: [post]link
+msgid "Link"
+msgstr "Lien"
+
+#: [post]tags
+msgid "Tags"
+msgstr "Étiquettes"
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr "Cette image va être ajoutée à votre galerie"
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr "Vous pouvez également utiliser des services comme Imgur ou Flickr pour héberger vos images et coller le lien résultant ici."
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr "Veuillez entrer une URL valide"
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr "Pas de contenu à afficher"
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr "Veuillez mettre un titre à votre publication"
+
 #: [publish]title
 msgid "Publish"
 msgstr "Publier"
 
 #: [publish]attach
 msgid "Add a file or a picture to your post"
-msgstr ""
+msgstr "Ajouter un fichier ou une image à vôtre billet"
 
 #: [publish]no_publication
 msgid "You cannot publish a post on this Group"
@@ -1490,6 +1507,14 @@ msgstr "Vous ne pouvez pas publier de billet sur ce groupe"
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr "Certains champs ont été remplis. Êtes-vous sûr de vouloir revenir en arrière et de perdre le contenu déjà saisi ?"
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr "Cliquez ici pour ajouter un contenu textuel à votre publication"
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr "Ajouter du texte"
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr "Partagé"
@@ -1507,8 +1532,8 @@ msgid "You don't have any chatroom yet."
 msgstr "Vous n'avez pas encore de salon de discussions."
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
-msgstr "Ajoutez en un en cliquant sur le bouton plus dans l'entête."
+msgstr ""
 
 #: [chatrooms]title
 msgid "Chatrooms"
@@ -1526,6 +1551,10 @@ msgstr "Utilisateurs du salon"
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr "Merci d'entrer un surnom valide (entre 2 et 40 caractères)"
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr "Nom d'utilisateur déjà utilisé"
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr "Salon public"
@@ -1576,11 +1605,11 @@ msgstr "Veuillez entrer un identifiant Jabber valide"
 
 #: [roster]no_contacts_title
 msgid "No contacts ?"
-msgstr ""
+msgstr "Aucun contacts?"
 
 #: [roster]no_contacts_text
 msgid "You can add one using the + button bellow"
-msgstr ""
+msgstr "Vous pouvez en ajouter un en cliquant sur le bouton + ci-dessous"
 
 #: [roster]show_hide
 msgid "Show/Hide"
@@ -1664,11 +1693,11 @@ msgstr "Aucun contact indiqué"
 
 #: [upload]title
 msgid "Upload a file"
-msgstr ""
+msgstr "Téléverser un fichier"
 
 #: [upload]choose
 msgid "Choose a file to upload"
-msgstr ""
+msgstr "Choisir un fichier à téléverser"
 
 #: [vcard]title [page]profile
 msgid "Profile"
@@ -1695,6 +1724,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr "Surnom"
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr "Comptes"
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr "Twitter"
@@ -1704,18 +1737,14 @@ msgid "Skype"
 msgstr "Skype"
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
-msgstr "Yahoo"
+msgstr "Compte Yahoo"
 
 #: [accounts]accounts_nickname
 msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr "Surnom"
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr "Compte Yahoo"
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr "Niveau de confidentialité"
@@ -2018,11 +2047,11 @@ msgstr "Connexion"
 
 #: [button]bool_yes
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
 #: [button]bool_no
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: [button]return
 msgid "Return"
@@ -2083,7 +2112,7 @@ msgstr "Dimanche"
 #: [gender]nil
 msgctxt "[gender]nil"
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #: [gender]male
 msgid "Male"
@@ -2120,7 +2149,7 @@ msgstr "Inscrit"
 #: [marital]nil
 msgctxt "[marital]nil"
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #: [marital]single
 msgid "Single"
@@ -2602,6 +2631,10 @@ msgstr " Il y a %d jours"
 msgid "day"
 msgstr "jour"
 
+#: [post]title
+msgid "Title"
+msgstr "Titre"
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr "Quoi de neuf ?"
@@ -2622,13 +2655,17 @@ msgstr "Géolocalisation"
 msgid "email"
 msgstr "courriel"
 
+#: [post]empty
+msgid "No content"
+msgstr "Aucun contenu"
+
 #: [post]no_comments
 msgid "No comments yet"
-msgstr ""
+msgstr "Pas de commentaires pour le moment"
 
 #: [post]no_comments_stream
 msgid "No comments stream"
-msgstr ""
+msgstr "Pas de flux de commentaires"
 
 #: [post]no_load
 msgid "Your feed cannot be loaded."
@@ -2652,7 +2689,7 @@ msgstr "Afficher les commentaires plus anciens"
 
 #: [post]comments_loading
 msgid "Loading comments..."
-msgstr ""
+msgstr "Chargement des commentaires…"
 
 #: [post]comments_get
 msgid "Get the comments"

sources/locales/gl.po

@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2014-06-01 23:06+0000\n"
 "Last-Translator: Daniel-san <inad9300@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -640,7 +644,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -952,11 +956,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,12 +1015,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1051,6 +1055,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1245,10 +1265,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Meu Enderezo"
@@ -1341,50 +1357,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1393,10 +1369,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1409,10 +1381,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1473,6 +1441,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1489,6 +1505,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1506,7 +1530,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1525,6 +1549,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1694,6 +1722,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1703,7 +1735,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1711,10 +1743,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2601,6 +2629,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2621,6 +2653,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/hr.po

@@ -95,7 +95,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2014-06-22 14:34+0000\n"
 "Last-Translator: Martina <martina.simicic@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -118,6 +118,10 @@ msgstr "Programeri"
 msgid "Translators"
 msgstr "Prevoditelji"
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr "Softver"
@@ -640,7 +644,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -952,11 +956,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,12 +1015,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1051,6 +1055,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1245,10 +1265,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr ""
@@ -1341,50 +1357,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1393,10 +1369,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1409,10 +1381,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1473,6 +1441,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1489,6 +1505,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1506,7 +1530,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1525,6 +1549,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1694,6 +1722,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1703,7 +1735,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1711,10 +1743,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2601,6 +2629,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2621,6 +2653,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/id.po

@@ -95,7 +95,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2015-06-09 12:21+0000\n"
 "Last-Translator: edhelas <edhelas@movim.eu>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -118,6 +118,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -646,7 +650,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -961,12 +965,14 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+#, fuzzy
-msgstr ""
+msgid "You don't have any group subscriptions yet."
+msgstr "Atur langganan mu"
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+#, fuzzy
-msgstr ""
+msgid "Here you will be able to manage all your subscriptions."
+msgstr "Atur langganan mu"
 
 #: [groups]subscriptions
 msgid "My Subscriptions"
@@ -1020,16 +1026,16 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
+#: [menu]me
+#, fuzzy
+msgid "My publications"
+msgstr "Kesalahan publikasikan komentar"
+
 #: [roster]search
 #, fuzzy
 msgid "Search in your contacts"
 msgstr "Dibagikan ke satu kontak"
 
-#: [hello]active_contacts
-#, fuzzy
-msgid "Active contacts"
-msgstr "Tindakan"
-
 #: [hello]chat
 msgid "Go on the Chat page"
 msgstr ""
@@ -1062,6 +1068,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1256,10 +1278,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Alamat saya"
@@ -1352,50 +1370,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "Bantuan"
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr "Pranala"
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1404,10 +1382,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1420,10 +1394,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1485,6 +1455,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "Bantuan"
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr "Pranala"
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1501,6 +1519,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1518,7 +1544,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1537,6 +1563,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1708,6 +1738,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr "Panggilan"
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1717,7 +1751,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1726,10 +1760,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr "Panggilan"
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr "Tingkat Privasi"
@@ -2619,6 +2649,10 @@ msgstr " %d hari lalu"
 msgid "day"
 msgstr "hari"
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2639,6 +2673,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""
@@ -2715,6 +2753,10 @@ msgstr ""
 msgid "Type here"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Active contacts"
+#~ msgstr "Tindakan"
+
 #~ msgid "remorseful"
 #~ msgstr "menyesal"
 

sources/locales/io.po

@@ -95,7 +95,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2014-06-01 23:07+0000\n"
 "Last-Translator: edhelas <edhelas@movim.eu>\n"
 "Language-Team: Ido <io@li.org>\n"
@@ -118,6 +118,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -640,7 +644,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -952,11 +956,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,12 +1015,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1051,6 +1055,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1245,10 +1265,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr ""
@@ -1341,50 +1357,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1393,10 +1369,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1409,10 +1381,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1473,6 +1441,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1489,6 +1505,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1506,7 +1530,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1525,6 +1549,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1694,6 +1722,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1703,7 +1735,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1711,10 +1743,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2604,6 +2632,10 @@ msgstr " %d dii ante"
 msgid "day"
 msgstr "dio"
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2624,6 +2656,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/ja.po

@@ -1,6 +1,6 @@
-# Japanese translations for Movim  package.
+#
-# This file is distributed under the same license as the Movim  package.
+# Translators:
-# This file was translated from CodingTeam at <http://codingteam.net/>.
+# Maxime Buquet <tidusx62@gmail.com>, 2015
 #. #-#-#-#-#  locales.po (PACKAGE VERSION)  #-#-#-#-#
 #. extracted from ../app/widgets/About/locales.ini
 #. #-#-#-#-#  locales.po (PACKAGE VERSION)  #-#-#-#-#
@@ -91,18 +91,18 @@
 #. extracted from ../locales/locales.ini
 msgid ""
 msgstr ""
-"Project-Id-Version: Movim\n"
+"Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
-"PO-Revision-Date: 2015-06-09 12:20+0000\n"
+"PO-Revision-Date: 2015-10-06 21:34+0000\n"
-"Last-Translator: edhelas <edhelas@movim.eu>\n"
+"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Japanese (http://www.transifex.com/movim/movim/language/ja/)\n"
-"Language: \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-06-18 21:08+0000\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Launchpad (build 17570)\n"
+"X-Generator: Translate Toolkit 1.13.0\n"
 
 #: [about]thanks
 msgid "Thanks"
@@ -116,6 +116,10 @@ msgstr "開発者"
 msgid "Translators"
 msgstr "翻訳者"
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr "ソフトウェア"
@@ -137,9 +141,8 @@ msgid "Account"
 msgstr "アカウント"
 
 #: [account]password_change_title
-#, fuzzy
 msgid "Change my password"
-msgstr "パスワードが違います"
+msgstr "パスワードを変更する"
 
 #: [account]password [db]password [credentials]password [form]password
 #: [input]password
@@ -147,9 +150,8 @@ msgid "Password"
 msgstr "パスワード"
 
 #: [account]password_confirmation
-#, fuzzy
 msgid "Password confirmation"
-msgstr "%s - 設定"
+msgstr "パスワードを再入力してください"
 
 #: [account]password_changed
 msgid "The password has been updated"
@@ -168,7 +170,6 @@ msgid "Delete my account"
 msgstr "アカウントを削除する"
 
 #: [account]delete
-#, fuzzy
 msgid "Delete your account"
 msgstr "アカウントを削除する"
 
@@ -206,7 +207,7 @@ msgstr "読み込み中"
 
 #: [error]not_acceptable
 msgid "Not Acceptable"
-msgstr ""
+msgstr "不正"
 
 #: [error]service_unavailable
 msgid "The registration system of this server is currently unavailable"
@@ -257,9 +258,8 @@ msgid "Port"
 msgstr "ポート"
 
 #: [db]name
-#, fuzzy
 msgid "Database sName"
-msgstr "データベース名"
+msgstr ""
 
 #: [admin]general
 msgid "General Settings"
@@ -334,10 +334,9 @@ msgid "List of whitelisted XMPP servers"
 msgstr "信頼するXMPPサーバー"
 
 #: [information]title
-#, fuzzy
 msgctxt "[information]title"
 msgid "Information Message"
-msgstr "クライアントインフォメーション"
+msgstr ""
 
 #: [information]description
 msgid "Description"
@@ -348,15 +347,13 @@ msgid "This message will be displayed on the login page"
 msgstr "このメッセージはログインページに表示されます"
 
 #: [information]info2
-#, fuzzy
 msgid "Leave this field blank if you dont want to show any message."
-msgstr "メッセージを表示したくない場合、空にしてください。"
+msgstr ""
 
 #: [information]label
-#, fuzzy
 msgctxt "[information]label"
 msgid "Information Message"
-msgstr "クライアントインフォメーション"
+msgstr ""
 
 #: [log]empty
 msgid "Empty"
@@ -407,9 +404,8 @@ msgid "Install the php5-gd library"
 msgstr ""
 
 #: [compatibility]rights
-#, fuzzy
 msgid "Read and write rights for the webserver in Movims root directory"
-msgstr "Movimルートの読み取り・書き込み権限"
+msgstr ""
 
 #: [compatibility]rewrite
 msgid "The URL Rewriting support is currently disabled"
@@ -429,19 +425,19 @@ msgstr ""
 
 #: [schema]browser
 msgid "Browser"
-msgstr ""
+msgstr "ブラウザ"
 
 #: [schema]movim
 msgid "Movim Core"
-msgstr ""
+msgstr "Movim コア"
 
 #: [schema]daemon
 msgid "Movim Daemon"
-msgstr ""
+msgstr "Movim デーモン"
 
 #: [schema]xmpp
 msgid "XMPP"
-msgstr ""
+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."
@@ -524,7 +520,6 @@ msgid "Chat Room ID"
 msgstr ""
 
 #: [chatroom]name
-#, fuzzy
 msgctxt "[chatroom]name"
 msgid "Name"
 msgstr "名前"
@@ -550,9 +545,8 @@ msgid "Bookmarks updated"
 msgstr "ブックマークを更新しました"
 
 #: [bookmarks]error
-#, fuzzy
 msgid "An error occured :"
-msgstr "エラーが発生しました： "
+msgstr ""
 
 #: [bookmarks]configure
 msgid "Configure"
@@ -567,10 +561,9 @@ msgid "URL"
 msgstr "URL"
 
 #: [url]name
-#, fuzzy
 msgctxt "[url]name"
 msgid "Name"
-msgstr "名前"
+msgstr ""
 
 #: [message]published
 msgid "Message Published"
@@ -645,12 +638,11 @@ msgid "Subject changed"
 msgstr "トピックが更新されました"
 
 #: [chats]empty_title
-#, fuzzy
 msgid "No chats yet..."
-msgstr "コメントがまだありません"
+msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -703,7 +695,7 @@ msgstr "オフラインのコンタクトを非表示"
 
 #: [config]appearence
 msgid "Appearence"
-msgstr ""
+msgstr "表示"
 
 #: [config]info
 msgid "This configuration is shared wherever you are connected"
@@ -830,9 +822,8 @@ msgid "Last public post"
 msgstr ""
 
 #: [subscription]to
-#, fuzzy
 msgid "You can see this contact status"
-msgstr "このコンタクトを削除する"
+msgstr ""
 
 #: [subscription]to_button
 msgid "Share my status"
@@ -847,18 +838,16 @@ msgid "You are not subscribed to this contact"
 msgstr ""
 
 #: [subscription]from_button
-#, fuzzy
 msgid "Ask to subscribe"
-msgstr "参加申請取消"
+msgstr ""
 
 #: [subscription]from_text
 msgid "But this contact can still see if you are online"
 msgstr ""
 
 #: [subscription]nil
-#, fuzzy
 msgid "No subscriptions"
-msgstr "サブスクリプションを習得する"
+msgstr ""
 
 #: [subscription]nil_button
 msgid "Invite"
@@ -933,9 +922,8 @@ msgid "Subscriptions"
 msgstr ""
 
 #: [group]servers
-#, fuzzy
 msgid "Groups servers"
-msgstr "グループ"
+msgstr ""
 
 #: [group]search_server
 msgid "Search for a new server"
@@ -966,11 +954,11 @@ msgid "Contact post"
 msgstr "コンタクトの投稿"
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1025,15 +1013,13 @@ msgstr "全て"
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-#, fuzzy
+msgid "My publications"
-msgid "Search in your contacts"
+msgstr ""
-msgstr "一人のコンタクトと共有"
 
-#: [hello]active_contacts
+#: [roster]search
-#, fuzzy
+msgid "Search in your contacts"
-msgid "Active contacts"
+msgstr ""
-msgstr "アクション"
 
 #: [hello]chat
 msgid "Go on the Chat page"
@@ -1067,6 +1053,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr "Movimで共有する"
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr "よくある質問"
@@ -1204,10 +1206,9 @@ msgid "Account successfully created"
 msgstr "アカウントが正常に作成されました"
 
 #: [error]xmpp_unauthorized
-#, fuzzy
 msgctxt "[error]xmpp_unauthorized"
 msgid "Your XMPP server is unauthorized"
-msgstr "あなとが使用しているXMPPサーバーは許可がありません"
+msgstr ""
 
 #: [error]mec_error
 msgid "The server takes too much time to respond"
@@ -1242,10 +1243,9 @@ msgid "Invalid password format"
 msgstr ""
 
 #: [error]unauthorized
-#, fuzzy
 msgctxt "[error]unauthorized"
 msgid "Your XMPP server is unauthorized"
-msgstr "あなとが使用しているXMPPサーバーは許可がありません"
+msgstr ""
 
 #: [error]conflict
 msgid "A Movim session is already open on an other device"
@@ -1263,10 +1263,6 @@ msgstr "認識方法が対応されていません"
 msgid "The XMPP authentification failed"
 msgstr "XMPP認証に失敗しました"
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr "アカウント"
-
 #: [form]username
 msgid "My address"
 msgstr "マイアドレス"
@@ -1296,9 +1292,8 @@ msgid "Population"
 msgstr "人口"
 
 #: [menu]empty_title
-#, fuzzy
 msgid "No news yet..."
-msgstr "コメントがまだありません"
+msgstr ""
 
 #: [menu]empty
 msgid "Welcome on your news feed, here you will see all the posts published by your contacts and in the groups you have subscribed."
@@ -1360,50 +1355,10 @@ msgstr "新着情報"
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr "プレビュー"
-
-#: [post]help [page]help
-msgid "Help"
-msgstr "ヘルプ"
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr "件名"
-
-#: [post]content
 msgid "Content"
 msgstr "コンテンツ"
 
-#: [post]link
-msgid "Link"
-msgstr "リンク"
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1412,10 +1367,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1428,10 +1379,6 @@ msgstr ""
 msgid "New post"
 msgstr "新しい投稿"
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1492,6 +1439,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr "プレビュー"
+
+#: [post]help [page]help
+msgid "Help"
+msgstr "ヘルプ"
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr "リンク"
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1508,6 +1503,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1525,8 +1528,8 @@ msgid "You don't have any chatroom yet."
 msgstr "チャットルームはまだありません"
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
-msgstr "追加するにはボタンを押してください"
+msgstr ""
 
 #: [chatrooms]title
 msgid "Chatrooms"
@@ -1544,6 +1547,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1593,9 +1600,8 @@ msgid "Please enter a valid Jabber ID"
 msgstr "正しいジャバーIDを入力してください"
 
 #: [roster]no_contacts_title
-#, fuzzy
 msgid "No contacts ?"
-msgstr "コンタクト"
+msgstr ""
 
 #: [roster]no_contacts_text
 msgid "You can add one using the + button bellow"
@@ -1682,9 +1688,8 @@ msgid "No contact specified"
 msgstr ""
 
 #: [upload]title
-#, fuzzy
 msgid "Upload a file"
-msgstr "アップロード"
+msgstr ""
 
 #: [upload]choose
 msgid "Choose a file to upload"
@@ -1711,10 +1716,13 @@ msgid "Your profile is now restricted"
 msgstr "あなたのプロファイルは非公開されました"
 
 #: [general]nickname
-#, fuzzy
 msgctxt "[general]nickname"
 msgid "Nickname"
-msgstr "ニックネーム"
+msgstr ""
+
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr "アカウント"
 
 #: [accounts]twitter
 msgid "Twitter"
@@ -1725,19 +1733,13 @@ msgid "Skype"
 msgstr "Skype"
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
-msgstr "Yahoo"
+msgstr ""
 
 #: [accounts]accounts_nickname
-#, fuzzy
 msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
-msgstr "ニックネーム"
+msgstr ""
-
-#: [accounts]accounts_yahoo
-#, fuzzy
-msgid "Yahoo Account"
-msgstr "アカウント"
 
 #: [privacy]privacy_title
 msgid "Privacy Level"
@@ -2041,11 +2043,11 @@ msgstr ""
 
 #: [button]bool_yes
 msgid "Yes"
-msgstr "はい"
+msgstr ""
 
 #: [button]bool_no
 msgid "No"
-msgstr "いいえ"
+msgstr ""
 
 #: [button]return
 msgid "Return"
@@ -2104,10 +2106,9 @@ msgid "Sunday"
 msgstr ""
 
 #: [gender]nil
-#, fuzzy
 msgctxt "[gender]nil"
 msgid "None"
-msgstr "なし"
+msgstr ""
 
 #: [gender]male
 msgid "Male"
@@ -2142,10 +2143,9 @@ msgid "Registered"
 msgstr "登録済み"
 
 #: [marital]nil
-#, fuzzy
 msgctxt "[marital]nil"
 msgid "None"
-msgstr "なし"
+msgstr ""
 
 #: [marital]single
 msgid "Single"
@@ -2620,14 +2620,17 @@ msgid "Yesterday"
 msgstr "昨日"
 
 #: [date]ago
-#, fuzzy
 msgid "%d days ago"
-msgstr " %d日間前に"
+msgstr ""
 
 #: [date]day
 msgid "day"
 msgstr "日"
 
+#: [post]title
+msgid "Title"
+msgstr "件名"
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2648,9 +2651,13 @@ msgstr ""
 msgid "email"
 msgstr "メール"
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
-msgstr "コメントがまだありません"
+msgstr ""
 
 #: [post]no_comments_stream
 msgid "No comments stream"
@@ -2677,9 +2684,8 @@ msgid "Show the older comments"
 msgstr "前のコメントを見る"
 
 #: [post]comments_loading
-#, fuzzy
 msgid "Loading comments..."
-msgstr "コメント読み込み"
+msgstr ""
 
 #: [post]comments_get
 msgid "Get the comments"
@@ -2724,231 +2730,3 @@ msgstr ""
 #: [field]type_here
 msgid "Type here"
 msgstr "ここに入力を"
-
-#~ msgid "Environment"
-#~ msgstr "環境"
-
-#~ msgid "Remove a chatroom"
-#~ msgstr "ルームを削除する"
-
-#~ msgid "Logout"
-#~ msgstr "ログアウト"
-
-#~ msgid "%s - Account Creation"
-#~ msgstr "%s - アカウントの作成"
-
-#~ msgid "Debug console"
-#~ msgstr "デバッグコンソール"
-
-#~ msgid "PHP version mismatch. Movim requires PHP 5.3 minimum."
-#~ msgstr "PHPバージョンが不一致です。MovimにはPHP5.3以上が必要です。"
-
-#~ msgid "Movim's folder must be writable."
-#~ msgstr "Movimのフォルダーに書き込むことが許すはずです。"
-
-#~ msgid "Movim Installer"
-#~ msgstr "Movimインストーラー"
-
-#~ msgid "Couldn't create configuration file '%s'."
-#~ msgstr "「%s」の設定ファイルをクリエートできませんでした。"
-
-#~ msgid "Compatibility Test"
-#~ msgstr "両立テスト"
-
-#~ msgid "The following requirements were not met. Please make sure they are all satisfied in order to install Movim."
-#~ msgstr "次の条件は認めませんでした。Movimをインストールするためには、全部認めるようにしてください。"
-
-#~ msgid "wants to talk with you"
-#~ msgstr "はあなたとチャットしたいそうです。"
-
-#~ msgid "Decline"
-#~ msgstr "断る"
-
-#~ msgid "Loading the contact feed ..."
-#~ msgstr "コンタクトのフィードをロードしています。"
-
-#~ msgid "Install the %s package"
-#~ msgstr "%sというパッケージをインストールしてください。"
-
-#~ msgid "or"
-#~ msgstr "または"
-
-#~ msgid "Actual version : "
-#~ msgstr "現在のバージョン "
-
-#~ msgid "Update your PHP version or contact your server administrator"
-#~ msgstr "PHPバージョンをアップデートしてください。それとも、アドミンサーバーを連絡してください。"
-
-#~ msgid "Install %s and %s packages"
-#~ msgstr "%sと%sというパッケージをインストールしてください。"
-
-#~ msgid "Enable read and write rights on Movim's root folder"
-#~ msgstr "Movimルートフォルドに読取り書込み権利を許可してください。"
-
-#~ msgid "Bosh connection failed with error '%s'"
-#~ msgstr "「%s」というエラーでBoshコネクションが失敗しました。"
-
-#~ msgid "Database connection failed with error '%s'"
-#~ msgstr "「%s」というエラーでデータベースコネクションが失敗しました。"
-
-#~ msgid "XMPP connection through Bosh failed with error '%s'"
-#~ msgstr "Boshを通じてXMPPコネクションは「%s」というエラーで失波しました。"
-
-#~ msgid "Keep in mind that Movim is still under development and will handle many personal details. Its use can potentially endanger your data. Always pay attention to information that you submit."
-#~ msgstr "Movimは未だ開発中で、多くのパーソナルインフォメーションを扱うことを注目して下さい。これの使用はデータを危ぶむ可能性があります。送るインフォメーションにいつもご注意下さい。"
-
-#~ msgid "Before you enjoy your social network, a few adjustements are required."
-#~ msgstr "あなたのソーシャルネットワークをお楽しみする前に、いくつかの修整が必要です。"
-
-#~ msgid "Thank you for downloading Movim!"
-#~ msgstr "Movimをダウンロードして頂き、誠にありがとうございます。"
-
-#~ msgid "Couldn't create directory '%s'."
-#~ msgstr "「%s」というフォルダをクリエートできませんでした。"
-
-#~ msgid "Proxy Preferences"
-#~ msgstr "プロクシ設定"
-
-#~ msgid "XMPP Connection Preferences"
-#~ msgstr "XMPPコネクション設定"
-
-#~ msgid "ultimate"
-#~ msgstr "絶対的に信頼"
-
-#~ msgid "talkative"
-#~ msgstr "軽口"
-
-#~ msgid "normal"
-#~ msgstr "通常"
-
-#~ msgid "empty"
-#~ msgstr "空"
-
-#~ msgid "Some errors were detected. Please correct them for the installation to proceed."
-#~ msgstr "エラーが発生されました。インストールを完成するには、それらを直してください。"
-
-#~ msgid "BOSH Connection Preferences"
-#~ msgstr "BOSHコネクション設定"
-
-#~ msgid "Success !"
-#~ msgstr "成功！"
-
-#~ msgid "Please remove the %s folder in order to complete the installation"
-#~ msgstr "インストールを完成するには、「%s」というフォルダを抜いてください。"
-
-#~ msgid "JID not provided."
-#~ msgstr "JIDは備われていません。"
-
-#~ msgid "Cannot load element value '%s'"
-#~ msgstr "「%s」というエレメントバリューをロードできません。"
-
-#~ msgid "User not logged in."
-#~ msgstr "ユーザーはログインしていません。"
-
-#~ msgid "You can now access your shiny Movim instance %sJump In !%s"
-#~ msgstr "これから、「%sJump」というMovimインスタンスを「!%s」にアクセスすることができます。"
-
-#~ msgid "Database Movim schema installed"
-#~ msgstr "Movimデータベースのスキームがインストールされました。"
-
-#~ msgid "Database Detected"
-#~ msgstr "データベースが発見されました。"
-
-#~ msgid "Valid Bosh"
-#~ msgstr "妥当なBosh"
-
-#~ msgid "jid '%s' is incorrect"
-#~ msgstr "「%s」というJIDは正しくありません。"
-
-#~ msgid "Cannot open log file '%s'"
-#~ msgstr "「%s」というログファイルをオープンできません。"
-
-#~ msgid "Movim requires the %s extension."
-#~ msgstr "Movimには「%s」という拡張子が必要です。"
-
-#~ msgid "terse"
-#~ msgstr "約やかな"
-
-#~ msgid "Wrong ID"
-#~ msgstr "不可のID"
-
-#~ msgid "%s - Add An Account"
-#~ msgstr "%s - アカウントを追加"
-
-#~ msgid "Only alphanumerics elements are authorized"
-#~ msgstr "英数文字のみが認められています。"
-
-#~ msgid "Make sure your password is safe :"
-#~ msgstr "パスワードが充分にセキュアだと改めて見届けてください。"
-
-#~ msgid "A capital letter, a digit and a special character are recommended"
-#~ msgstr "セキュアなパスワードの中で、親文字と数と特殊文字がお勧めです。"
-
-#~ msgid "Invalid name"
-#~ msgstr "名前が無効です"
-
-#~ msgid "Firstly fill in this blank with a brand new account ID, this address will follow you on all the Movim network !"
-#~ msgstr "はじめには、このブランクを真新しいIDで入力してください。このアドレスはすべてのMovimネットワークで使われるのです。"
-
-#~ msgid "Add your login informations"
-#~ msgstr "ログインインフォメーションを追加してください。"
-
-#~ msgid "Retype"
-#~ msgstr "再入力"
-
-#~ msgid "Example :"
-#~ msgstr "例えば："
-
-#~ msgid "Same here !"
-#~ msgstr "こちらは同じです。"
-
-#~ msgid "Pseudo"
-#~ msgstr "ニックネーム"
-
-#~ msgid "Create"
-#~ msgstr "作成"
-
-#~ msgid "8 characters"
-#~ msgstr "８字"
-
-#~ msgid "Address"
-#~ msgstr "住所"
-
-#~ msgid "Your server doesn't support post publication, you can only read contact's feeds"
-#~ msgstr "サーバーではポスト掲載を取り締まることができません。それで、自分のコンタクトの掲載しか読めません。"
-
-#~ msgid "Invite this user"
-#~ msgstr "このユーザーを招待する"
-
-#~ msgid "Loading your feed ..."
-#~ msgstr "フィードをローディング中・・・"
-
-#~ msgid "Client Name"
-#~ msgstr "クライアント名"
-
-#~ msgid "Client Type"
-#~ msgstr "クライアントタイプ"
-
-#~ msgid "My Posts"
-#~ msgstr "マイポスト"
-
-#~ msgid "Create my vCard"
-#~ msgstr "vCardを作成"
-
-#~ msgid "What is Movim?"
-#~ msgstr "Movimとは？"
-
-#~ msgid "Could not communicate with the XMPP server"
-#~ msgstr "XMPPサーバーと通信ができませんでした。"
-
-#~ msgid "Connecting..."
-#~ msgstr "接続中..."
-
-#~ msgid "Edit my Profile"
-#~ msgstr "プロフィールの変更"
-
-#~ msgid "You entered different passwords"
-#~ msgstr "記入されたパスワードが異なっています"
-
-#~ msgid "Could not connect to the XMPP server"
-#~ msgstr "XMPP サーバーに接続できませんでした"

sources/locales/kk.po

@@ -95,7 +95,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2014-04-04 12:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
@@ -118,6 +118,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -640,7 +644,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -952,11 +956,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1011,12 +1015,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1051,6 +1055,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1245,10 +1265,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr ""
@@ -1341,50 +1357,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1393,10 +1369,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1409,10 +1381,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1473,6 +1441,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1489,6 +1505,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1506,7 +1530,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1525,6 +1549,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1694,6 +1722,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1703,7 +1735,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1711,10 +1743,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2601,6 +2629,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2621,6 +2653,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/lv.po

@@ -95,7 +95,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2015-06-09 12:19+0000\n"
 "Last-Translator: Jānis Marks Gailis <jm-gailis@fai-vianet.fr>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -118,6 +118,10 @@ msgstr "Izstrādātāji"
 msgid "Translators"
 msgstr "Tulkotāji"
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr "Programmatūra"
@@ -648,7 +652,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -963,11 +967,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1022,16 +1026,15 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
+#: [menu]me
+msgid "My publications"
+msgstr ""
+
 #: [roster]search
 #, fuzzy
 msgid "Search in your contacts"
 msgstr "Jūsu kontakti"
 
-#: [hello]active_contacts
-#, fuzzy
-msgid "Active contacts"
-msgstr "Jūsu kontakti"
-
 #: [hello]chat
 msgid "Go on the Chat page"
 msgstr ""
@@ -1064,6 +1067,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1260,10 +1279,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr "XMPP autentifikācija neizdevās"
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr "Konti"
-
 #: [form]username
 msgid "My address"
 msgstr ""
@@ -1356,50 +1371,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr "Saite"
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1408,10 +1383,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1424,10 +1395,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1488,6 +1455,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr "Saite"
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1504,6 +1519,15 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+#, fuzzy
+msgid "Add some text"
+msgstr "Pievienot komentāru"
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr "Koplietots"
@@ -1521,7 +1545,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1540,6 +1564,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr "Lietotājvārds jau aizņemts"
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1711,6 +1739,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr "Segvārds"
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr "Konti"
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr "Twitter"
@@ -1720,8 +1752,9 @@ msgid "Skype"
 msgstr "Skype"
 
 #: [accounts]yahoo
-msgid "Yahoo"
+#, fuzzy
-msgstr "Yahoo"
+msgid "Yahoo Account"
+msgstr "Konti"
 
 #: [accounts]accounts_nickname
 #, fuzzy
@@ -1729,11 +1762,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr "Segvārds"
 
-#: [accounts]accounts_yahoo
-#, fuzzy
-msgid "Yahoo Account"
-msgstr "Konti"
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr "Privātuma līmenis"
@@ -2620,6 +2648,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2640,6 +2672,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""
@@ -2716,6 +2752,13 @@ msgstr ""
 msgid "Type here"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Active contacts"
+#~ msgstr "Jūsu kontakti"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
 #~ msgid "Environment"
 #~ msgstr "Vide"
 
@@ -2728,9 +2771,6 @@ msgstr ""
 #~ msgid "Could not connect to the XMPP server"
 #~ msgstr "Nevar pieslēgt uz XMPP serveri"
 
-#~ msgid "Username already taken"
-#~ msgstr "Lietotājvārds jau aizņemts"
-
 #~ msgid "Could not communicate with the XMPP server"
 #~ msgstr "Nevar sazināties ar XMPP serveri"
 

sources/locales/messages.pot

@@ -91,14 +91,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.12.0\n"
+"X-Generator: Translate Toolkit 1.13.0\n"
 
 #: [about]thanks
 msgid "Thanks"
@@ -112,6 +112,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -654,8 +658,8 @@ msgstr ""
 
 #: [chats]empty
 msgid ""
-"Open a new conversation by clicking on the plus button bellow or visit the "
+"Open a new conversation by clicking on the %s button bellow or visit the %s "
-"Contacts page."
+"Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -980,13 +984,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid ""
+msgid "You don't have any group subscriptions yet."
-"You don't have any subscriptions yet, select a group server above to start "
-"exploring."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1041,12 +1043,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1083,6 +1085,24 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid ""
+"All the main Movim features are accessible there. Don't hesitate to navigate "
+"through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1281,10 +1301,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr ""
@@ -1379,50 +1395,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1431,10 +1407,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1447,12 +1419,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid ""
-"You can also use services like Imgur or Flickr to host your picture and "
-"paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1513,6 +1479,56 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid ""
+"You can also use services like Imgur or Flickr to host your picture and "
+"paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1531,6 +1547,14 @@ msgid ""
 "their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1548,7 +1572,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1567,6 +1591,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1740,6 +1768,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1749,7 +1781,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1757,10 +1789,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2652,6 +2680,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2672,6 +2704,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""

sources/locales/no.po

@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Movim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 15:17+0200\n"
+"POT-Creation-Date: 2015-10-06 23:33+0200\n"
 "PO-Revision-Date: 2012-07-19 11:30+0000\n"
 "Last-Translator: Vincent <vincent@influence-pc.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: [about]translators_text
+msgid "Thanks to all the translators"
+msgstr ""
+
 #: [about]software
 msgid "Software"
 msgstr ""
@@ -643,7 +647,7 @@ msgid "No chats yet..."
 msgstr ""
 
 #: [chats]empty
-msgid "Open a new conversation by clicking on the plus button bellow or visit the Contacts page."
+msgid "Open a new conversation by clicking on the %s button bellow or visit the %s Contacts%s page."
 msgstr ""
 
 #: [chats]add
@@ -956,11 +960,11 @@ msgid "Contact post"
 msgstr ""
 
 #: [groups]empty_text1
-msgid "You don't have any subscriptions yet, select a group server above to start exploring."
+msgid "You don't have any group subscriptions yet."
 msgstr ""
 
 #: [groups]empty_text2
-msgid "Subscribe to your favorite feeds by bookmarking them."
+msgid "Here you will be able to manage all your subscriptions."
 msgstr ""
 
 #: [groups]subscriptions
@@ -1015,12 +1019,12 @@ msgstr ""
 msgid "Refresh all the streams"
 msgstr ""
 
-#: [roster]search
+#: [menu]me
-msgid "Search in your contacts"
+msgid "My publications"
 msgstr ""
 
-#: [hello]active_contacts
+#: [roster]search
-msgid "Active contacts"
+msgid "Search in your contacts"
 msgstr ""
 
 #: [hello]chat
@@ -1055,6 +1059,22 @@ msgstr ""
 msgid "Share on Movim"
 msgstr ""
 
+#: [hello]enter_title
+msgid "Oh! Hello!"
+msgstr ""
+
+#: [hello]enter_paragraph
+msgid "It seems that you're new there! Welcome on Movim!"
+msgstr ""
+
+#: [hello]menu_title
+msgid "Check the Menu"
+msgstr ""
+
+#: [hello]menu_paragraph
+msgid "All the main Movim features are accessible there. Don't hesitate to navigate through the pages to discover more!"
+msgstr ""
+
 #: [help]faq
 msgid "Frequently Asked Questions"
 msgstr ""
@@ -1249,10 +1269,6 @@ msgstr ""
 msgid "The XMPP authentification failed"
 msgstr ""
 
-#: [account]title [accounts]accounts_title
-msgid "Accounts"
-msgstr ""
-
 #: [form]username
 msgid "My address"
 msgstr "Min adresse"
@@ -1345,50 +1361,10 @@ msgstr ""
 msgid "Discover and register to the groups you are interested in"
 msgstr ""
 
-#: [post]preview [page]preview
+#: [post]content [post]content_label
-msgid "Preview"
-msgstr ""
-
-#: [post]help [page]help
-msgid "Help"
-msgstr ""
-
-#: [post]help_more
-msgid "More help"
-msgstr ""
-
-#: [post]help_manual
-msgid "Markdown syntax manual"
-msgstr ""
-
-#: [post]title
-msgid "Title"
-msgstr ""
-
-#: [post]content
 msgid "Content"
 msgstr ""
 
-#: [post]link
-msgid "Link"
-msgstr ""
-
-#: [post]tags
-msgid "Tags"
-msgstr ""
-
-#: [post]valid_url [publish]valid_url
-msgid "Please enter a valid url"
-msgstr ""
-
-#: [post]no_content_preview [publish]no_content_preview
-msgid "No content to preview"
-msgstr ""
-
-#: [post]no_content [publish]no_content [post]empty
-msgid "No content"
-msgstr ""
-
 #: [post]published
 msgid "Post published"
 msgstr ""
@@ -1397,10 +1373,6 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: [post]gallery
-msgid "This picture will be added to your gallery"
-msgstr ""
-
 #: [post]hot
 msgid "What's Hot"
 msgstr ""
@@ -1413,10 +1385,6 @@ msgstr ""
 msgid "New post"
 msgstr ""
 
-#: [post]embed_tip
-msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
-msgstr ""
-
 #: [post]repost
 msgid "This is a re-post from %s"
 msgstr ""
@@ -1477,6 +1445,54 @@ msgstr ""
 msgid "Online with Movim"
 msgstr ""
 
+#: [post]preview [page]preview
+msgid "Preview"
+msgstr ""
+
+#: [post]help [page]help
+msgid "Help"
+msgstr ""
+
+#: [post]help_more
+msgid "More help"
+msgstr ""
+
+#: [post]help_manual
+msgid "Markdown syntax manual"
+msgstr ""
+
+#: [post]content_text
+msgid "You can format your content using Markdown"
+msgstr ""
+
+#: [post]link
+msgid "Link"
+msgstr ""
+
+#: [post]tags
+msgid "Tags"
+msgstr ""
+
+#: [post]gallery
+msgid "This picture will be added to your gallery"
+msgstr ""
+
+#: [post]embed_tip
+msgid "You can also use services like Imgur or Flickr to host your picture and paste the link here."
+msgstr ""
+
+#: [publish]valid_url
+msgid "Please enter a valid url"
+msgstr ""
+
+#: [publish]no_content_preview
+msgid "No content to preview"
+msgstr ""
+
+#: [publish]no_title
+msgid "Please provide a title"
+msgstr ""
+
 #: [publish]title
 msgid "Publish"
 msgstr ""
@@ -1493,6 +1509,14 @@ msgstr ""
 msgid "Some fields have been filled in. Do you still want to go back and loose their content?"
 msgstr ""
 
+#: [publish]add_text
+msgid "Click here to add some text to your publication"
+msgstr ""
+
+#: [publish]add_text_label
+msgid "Add some text"
+msgstr ""
+
 #: [public_groups]shared
 msgid "Shared"
 msgstr ""
@@ -1510,7 +1534,7 @@ msgid "You don't have any chatroom yet."
 msgstr ""
 
 #: [rooms]empty_text2
-msgid "Add one by clicking on the add button in the header."
+msgid "Add one by clicking on the add button."
 msgstr ""
 
 #: [chatrooms]title
@@ -1529,6 +1553,10 @@ msgstr ""
 msgid "Please enter a correct nickname (2 to 40 characters)"
 msgstr ""
 
+#: [chatrooms]conflict
+msgid "Username already taken"
+msgstr ""
+
 #: [room]anonymous_title
 msgid "Public chatroom"
 msgstr ""
@@ -1698,6 +1726,10 @@ msgctxt "[general]nickname"
 msgid "Nickname"
 msgstr ""
 
+#: [accounts]accounts_title
+msgid "Accounts"
+msgstr ""
+
 #: [accounts]twitter
 msgid "Twitter"
 msgstr ""
@@ -1707,7 +1739,7 @@ msgid "Skype"
 msgstr ""
 
 #: [accounts]yahoo
-msgid "Yahoo"
+msgid "Yahoo Account"
 msgstr ""
 
 #: [accounts]accounts_nickname
@@ -1715,10 +1747,6 @@ msgctxt "[accounts]accounts_nickname"
 msgid "Nickname"
 msgstr ""
 
-#: [accounts]accounts_yahoo
-msgid "Yahoo Account"
-msgstr ""
-
 #: [privacy]privacy_title
 msgid "Privacy Level"
 msgstr ""
@@ -2605,6 +2633,10 @@ msgstr ""
 msgid "day"
 msgstr ""
 
+#: [post]title
+msgid "Title"
+msgstr ""
+
 #: [post]whats_new
 msgid "What's new ?"
 msgstr ""
@@ -2625,6 +2657,10 @@ msgstr ""
 msgid "email"
 msgstr ""
 
+#: [post]empty
+msgid "No content"
+msgstr ""
+
 #: [post]no_comments
 msgid "No comments yet"
 msgstr ""