diff --git a/i18n/fr.po b/i18n/fr.po
index 391eef42c..48ccd3b03 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -1,224 +1,214 @@
-# French translations for Movim package.
-# This file is distributed under the same license as the Movim package.
-# This file was translated from CodingTeam at <http://dev.movim.eu/>.
+# French translations for Movim  package.
+# This file is distributed under the same license as the Movim  package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
 msgid ""
 msgstr ""
-"Project-Id-Version: Movim\n"
-"PO-Revision-Date: 2010-12-24 14:47:09\n"
+"Project-Id-Version: Movim \n"
+"PO-Revision-Date: 2011-02-27 15:16:36\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../init.php:16
+#: ../init.php:15
 msgid "MOVIM - Test Client"
 msgstr "MOVIM - Client de test"
 
-#: ../lib/Dispatcher.php:38
+#: ../lib/Dispatcher.php:40
 msgid "%s - Welcome to Movim"
 msgstr "%s - Bienvenue sur Movim"
 
-#: ../lib/Dispatcher.php:3
+#: ../lib/Dispatcher.php:4
 #: ../lib/Dispatcher.php:5
-#: ../lib/Dispatcher.php:72
+#: ../lib/Dispatcher.php:74
 msgid "Home"
 msgstr "Accueil"
 
 #: ../lib/Dispatcher.php:4
-#: ../lib/Dispatcher.php:58
+#: ../lib/Dispatcher.php:60
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../lib/Dispatcher.php:4
-#: ../lib/Dispatcher.php:59
+#: ../lib/widgets/Logout/Logout.php:46
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: ../lib/Dispatcher.php:56
+#: ../lib/Dispatcher.php:58
 msgid "%s - Configuration"
 msgstr "%s - Configuration"
 
-#: ../lib/Dispatcher.php:71
+#: ../lib/Dispatcher.php:73
 msgid "%s - Account Creation"
 msgstr "%s - Création de compte"
 
-#: ../lib/Dispatcher.php:88
+#: ../lib/Dispatcher.php:90
 msgid "%s - Login to Movim"
 msgstr "%s - Connexion à Movim"
 
-#: ../lib/Dispatcher.php:91
+#: ../lib/Dispatcher.php:93
 msgid "Account Creation"
 msgstr "Création de compte"
 
-#: ../lib/Dispatcher.php:95
+#: ../lib/Dispatcher.php:103
 msgid "My address"
 msgstr "Mon adresse"
 
-#: ../lib/Dispatcher.php:9
-#: ../lib/widgets/Account.php:35
+#: ../lib/Dispatcher.php:10
+#: ../lib/widgets/Account/Account.php:35
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../lib/Dispatcher.php:97
+#: ../lib/Dispatcher.php:105
 msgid "Come in!"
 msgstr "Entrez!"
 
-#: ../lib/GetConf.php:42
-#| msgid "Error: Cannot load file `%s'"
-#| msgstr "Erreur: Fichier << %s >> introuvable"
+#: ../lib/GetConf.php:2
+#: ../lib/GetConf.php:45
+msgid "Error: Cannot load element value'%s'"
+msgstr "Erreur: Ne peut charger l'élément de valeur '%s'"
 
-#: ../lib/PageBuilder.php:283
+#: ../lib/GetConf.php:139
+msgid "Error: Cannot load file '%s'"
+msgstr "Erreur: Ne peut charger le fichier '%s'"
+
+#: ../lib/WidgetWrapper.php:98
 msgid "Error: Requested widget '%s' doesn't exist."
 msgstr "Erreur: Le widget << %s >> n'existe pas."
 
-#: ../lib/User.php:63
+#: ../lib/User.php:65
 msgid "Wrong password"
 msgstr "Mot de passe incorrect"
 
 #: ../lib/Widget.php:69
-msgid "This is a sample widget."
-msgstr "Ceci est un widget de test"
+#~ msgid "This is a sample widget."
+#~ msgstr "Ceci est un widget de test"
 
 #: ../lib/XMPPConnect.php:147
-msgid "Error: jid `%s' is incorrect"
-msgstr "L'addresse Jabber << %s >> est incorrecte"
+#~ msgid "Error: jid `%s' is incorrect"
+#~ msgstr "L'addresse Jabber << %s >> est incorrecte"
 
-#: ../lib/widgets/Account.php:3
-#: ../lib/widgets/Account.php:34
+#: ../lib/widgets/Account/Account.php:3
+#: ../lib/widgets/Account/Account.php:34
 msgid "Jabber Account"
 msgstr "Compte Jabber"
 
-#: ../lib/widgets/Chat.php:40
-msgid "Send"
-msgstr "Envoyer"
-
-#: ../lib/widgets/Config.php:45
-msgid "Full Name"
-msgstr "Nom complet"
-
-#: ../lib/widgets/Config.php:33
-#| msgid "Gender"
-#| msgstr "Sexe"
-
-#: ../lib/widgets/Config.php:35
-#| msgid "Male"
-#| msgstr "Homme"
-
-#: ../lib/widgets/Config.php:36
-#| msgid "Female"
-#| msgstr "Femme"
+#: ../lib/widgets/Account/Account.php:4
+#: ../lib/widgets/Config/Config.php:70
+msgid "Submit"
+msgstr "Soumettre"
 
-#: ../lib/widgets/Config.php:39
-#| msgid "Interests"
-#| msgstr "Centres d'intérêt"
+#: ../lib/widgets/Account/Account.php:4
+#: ../lib/widgets/Config/Config.php:72
+msgid "Reset"
+msgstr "Réinitialiser"
 
-#: ../lib/widgets/Config.php:40
-#| msgid "Movies"
-#| msgstr "Films"
+#: ../lib/widgets/Chat/Chat.php:90
+msgid "Send"
+msgstr "Envoyer"
 
-#: ../lib/widgets/Config.php:41
-#| msgid "Reading"
-#| msgstr "Lecture"
+#: ../lib/widgets/Config/Config.php:45
+msgid "Language"
+msgstr "Langue"
 
-#: ../lib/widgets/Config.php:42
-#| msgid "Sports"
-#| msgstr "Sports"
+#: ../lib/widgets/Config.php:45
+#~ msgid "Full Name"
+#~ msgstr "Nom complet"
 
-#: ../lib/widgets/Config.php:44
-#| msgid "Upload Your Picture"
-#| msgstr "Envoyez votre photo"
+#: ../lib/widgets/Config/Config.php:57
+msgid "BOSH Connection Prefrences"
+msgstr "Paramètres relatifs à BOSH"
 
-#: ../lib/widgets/Config.php:45
-#| msgid "About You"
-#| msgstr "À propos de vous"
+#: ../lib/Dispatcher.php:9
+#: ../lib/widgets/Config/Config.php:59
+msgid "Changing these data can be dangerous and may compromise the connection to the XMPP server"
+msgstr "La modification de ces paramètres peut compromettre la connexion au serveur XMPP"
 
-#: ../lib/widgets/Config.php:46
-#| msgid "Your Age"
-#| msgstr "Votre âge"
+#: ../lib/widgets/Config/Config.php:61
+msgid "Bosh Host"
+msgstr "Hôte BOSH"
 
-#: ../lib/widgets/Config.php:47
-#| msgid "baby"
-#| msgstr "bébé"
+#: ../lib/widgets/Config/Config.php:63
+msgid "Bosh Suffix"
+msgstr "Suffixe BOSH"
 
-#: ../lib/widgets/Config.php:48
-#| msgid "toddler"
-#| msgstr "nourrisson"
+#: ../lib/widgets/Config/Config.php:65
+msgid "Bosh Port"
+msgstr "Port BOSH"
 
-#: ../lib/widgets/Config.php:49
-#| msgid "child"
-#| msgstr "enfant"
+#: ../lib/widgets/Config/Config.php:76
+msgid "error: "
+msgstr "Erreur: "
 
-#: ../lib/widgets/Config.php:50
-#| msgid "teen"
-#| msgstr "adolescent"
+#: ../lib/widgets/Friends/Friends.php:112
+msgid "Contacts"
+msgstr "Contacts"
 
-#: ../lib/widgets/Config.php:51
-#| msgid "adult"
-#| msgstr "adulte"
+#: ../lib/GetConf.php:8
+#: ../lib/GetConf.php:12
+#: ../lib/GetConf.php:129
+msgid "Couldn't create file %s"
+msgstr "Création du fichier impossible %s"
 
-#: ../lib/widgets/Config.php:52
-#| msgid "middleage"
-#| msgstr "mature"
+#: ../lib/GetConf.php:131
+msgid "Couldn't create configuration files."
+msgstr "Création des fichiers de configuration impossibles"
 
-#: ../lib/widgets/Config.php:53
-#| msgid "retiree"
-#| msgstr "retraité"
+#: ../lib/XMPPConnect.php:98
+msgid "Error: User not logged in."
+msgstr "Erreur: utilisateur non connecté"
 
-#: ../lib/widgets/Config.php:54
-#| msgid "old"
-#| msgstr "vieux"
+#: ../lib/XMPPConnect.php:102
+msgid "Error: JID not provided."
+msgstr "Error: JID non renseigné"
 
-#: ../lib/widgets/Config.php:55
-#| msgid "stillalive"
-#| msgstr "survivant"
+#: ../lib/XMPPConnect.php:117
+msgid "Error: jid '%s' is incorrect"
+msgstr "Erreur: jid '%s' incorrect"
 
-#: ../lib/widgets/Config.php:90
-msgid "error: "
-msgstr "Erreur: "
+#: ../lib/widgets/Chat/Chat.php:84
+msgid "Chat"
+msgstr "Chat"
 
-#: ../lib/widgets/Friends.php:65
-msgid "Contacts"
-msgstr "Contacts"
+#: ../lib/widgets/Chat/Chat.php:88
+msgid "Message"
+msgstr "Message"
 
-#: ../lib/GetConf.php:2
-#: ../lib/GetConf.php:41
-msgid "Error: Cannot load element value'%s'"
-msgstr "Erreur: Ne peut charger l'élément de valeur '%s'"
+#: ../lib/widgets/Chat/Chat.php:89
+msgid "To"
+msgstr "À"
 
-#: ../lib/GetConf.php:59
-msgid "Error: Cannot load file '%s'"
-msgstr "Erreur: Ne peut charger le fichier '%s'"
+#: ../lib/widgets/Friends/Friends.php:36
+msgid "Your avatar"
+msgstr "Votre avatar"
 
-#: ../lib/widgets/Config.php:39
-msgid "Language"
-msgstr "Langue"
+#: ../lib/widgets/Friends/Friends.php:111
+msgid "Refresh vCard"
+msgstr "Rafraichir la vCard"
 
-#: ../lib/widgets/Config.php:47
-msgid "BOSH Connection Prefrences"
-msgstr "Paramètres relatifs à BOSH"
+#: ../lib/widgets/Friends/Friends.php:116
+msgid "Online"
+msgstr "En ligne"
 
-#: ../lib/widgets/Config.php:49
-msgid "Changing these data can be dangerous and may compromise the connection to the XMPP server"
-msgstr "La modification de ces paramètres peut compromettre la connexion au serveur XMPP"
+#: ../lib/widgets/Friends/Friends.php:117
+msgid "Offline"
+msgstr "Hors ligne"
 
-#: ../lib/widgets/Config.php:51
-msgid "Bosh Host"
-msgstr "Hôte BOSH"
+#: ../lib/widgets/Friends/Friends.php:118
+msgid "Hidden"
+msgstr "Invisible"
 
-#: ../lib/widgets/Config.php:53
-msgid "Bosh Suffix"
-msgstr "Suffixe BOSH"
+#: ../lib/widgets/Friends/Friends.php:119
+msgid "Away"
+msgstr "Absent"
 
-#: ../lib/widgets/Config.php:55
-msgid "Bosh Port"
-msgstr "Port BOSH"
+#: ../lib/widgets/Friends/Friends.php:120
+msgid "Do Not Disturb"
+msgstr "Occupé"
 
-#: ../lib/widgets/Account.php:4
-#: ../lib/widgets/Config.php:84
-msgid "Submit"
-msgstr "Soumettre"
+#: ../lib/widgets/Friends/Friends.php:124
+msgid "Refresh Roster"
+msgstr "Rafraichir le Roster"
 
-#: ../lib/widgets/Account.php:4
-#: ../lib/widgets/Config.php:86
-msgid "Reset"
-msgstr "Réinitialiser"
+#: ../lib/widgets/Log/Log.php:34
+msgid "Debug console"
+msgstr "Console de débogage"
 
diff --git a/i18n/messages.pot b/i18n/messages.pot
index 3cde58658..fb1b447b9 100644
--- a/i18n/messages.pot
+++ b/i18n/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-24 15:46+0100\n"
+"POT-Creation-Date: 2011-02-27 15:08+0100\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"
@@ -17,136 +17,193 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../init.php:16
+#: ../init.php:15
 msgid "MOVIM - Test Client"
 msgstr ""
 
-#: ../lib/Dispatcher.php:38
+#: ../lib/Dispatcher.php:40
 #, php-format
 msgid "%s - Welcome to Movim"
 msgstr ""
 
-#: ../lib/Dispatcher.php:39 ../lib/Dispatcher.php:57 ../lib/Dispatcher.php:72
+#: ../lib/Dispatcher.php:41 ../lib/Dispatcher.php:59 ../lib/Dispatcher.php:74
 msgid "Home"
 msgstr ""
 
-#: ../lib/Dispatcher.php:40 ../lib/Dispatcher.php:58
+#: ../lib/Dispatcher.php:42 ../lib/Dispatcher.php:60
 msgid "Configuration"
 msgstr ""
 
-#: ../lib/Dispatcher.php:41 ../lib/Dispatcher.php:59
-msgid "Logout"
-msgstr ""
-
-#: ../lib/Dispatcher.php:56
+#: ../lib/Dispatcher.php:58
 #, php-format
 msgid "%s - Configuration"
 msgstr ""
 
-#: ../lib/Dispatcher.php:71
+#: ../lib/Dispatcher.php:73
 #, php-format
 msgid "%s - Account Creation"
 msgstr ""
 
-#: ../lib/Dispatcher.php:88
+#: ../lib/Dispatcher.php:90
 #, php-format
 msgid "%s - Login to Movim"
 msgstr ""
 
-#: ../lib/Dispatcher.php:91
+#: ../lib/Dispatcher.php:93
 msgid "Account Creation"
 msgstr ""
 
-#: ../lib/Dispatcher.php:95
+#: ../lib/Dispatcher.php:97 ../lib/widgets/Config/Config.php:59
+msgid ""
+"Changing these data can be dangerous and may compromise the connection to "
+"the XMPP server"
+msgstr ""
+
+#: ../lib/Dispatcher.php:103
 msgid "My address"
 msgstr ""
 
-#: ../lib/Dispatcher.php:96 ../lib/widgets/Account.php:35
+#: ../lib/Dispatcher.php:104 ../lib/widgets/Account/Account.php:35
 msgid "Password"
 msgstr ""
 
-#: ../lib/Dispatcher.php:97
+#: ../lib/Dispatcher.php:105
 msgid "Come in!"
 msgstr ""
 
-#: ../lib/GetConf.php:21 ../lib/GetConf.php:41
+#: ../lib/GetConf.php:21 ../lib/GetConf.php:45
 #, php-format
 msgid "Error: Cannot load element value'%s'"
 msgstr ""
 
-#: ../lib/GetConf.php:59
+#: ../lib/GetConf.php:83 ../lib/GetConf.php:127 ../lib/GetConf.php:129
+#, php-format
+msgid "Couldn't create file %s"
+msgstr ""
+
+#: ../lib/GetConf.php:131
+msgid "Couldn't create configuration files."
+msgstr ""
+
+#: ../lib/GetConf.php:139
 #, php-format
 msgid "Error: Cannot load file '%s'"
 msgstr ""
 
-#: ../lib/PageBuilder.php:283
+#: ../lib/User.php:65
+msgid "Wrong password"
+msgstr ""
+
+#: ../lib/WidgetWrapper.php:98
 #, php-format
 msgid "Error: Requested widget '%s' doesn't exist."
 msgstr ""
 
-#: ../lib/User.php:63
-msgid "Wrong password"
+#: ../lib/XMPPConnect.php:98
+msgid "Error: User not logged in."
 msgstr ""
 
-#: ../lib/Widget.php:69
-msgid "This is a sample widget."
+#: ../lib/XMPPConnect.php:102
+msgid "Error: JID not provided."
 msgstr ""
 
-#: ../lib/XMPPConnect.php:147
+#: ../lib/XMPPConnect.php:117
 #, php-format
-msgid "Error: jid `%s' is incorrect"
+msgid "Error: jid '%s' is incorrect"
 msgstr ""
 
-#: ../lib/widgets/Account.php:32 ../lib/widgets/Account.php:34
+#: ../lib/widgets/Account/Account.php:32 ../lib/widgets/Account/Account.php:34
 msgid "Jabber Account"
 msgstr ""
 
-#: ../lib/widgets/Account.php:40 ../lib/widgets/Config.php:84
+#: ../lib/widgets/Account/Account.php:40 ../lib/widgets/Config/Config.php:70
 msgid "Submit"
 msgstr ""
 
-#: ../lib/widgets/Account.php:42 ../lib/widgets/Config.php:86
+#: ../lib/widgets/Account/Account.php:42 ../lib/widgets/Config/Config.php:72
 msgid "Reset"
 msgstr ""
 
-#: ../lib/widgets/Chat.php:40
-msgid "Send"
+#: ../lib/widgets/Chat/Chat.php:84
+msgid "Chat"
 msgstr ""
 
-#: ../lib/widgets/Config.php:39
-msgid "Language"
+#: ../lib/widgets/Chat/Chat.php:88
+msgid "Message"
 msgstr ""
 
-#: ../lib/widgets/Config.php:45
-msgid "Full Name"
+#: ../lib/widgets/Chat/Chat.php:89
+msgid "To"
 msgstr ""
 
-#: ../lib/widgets/Config.php:47
-msgid "BOSH Connection Prefrences"
+#: ../lib/widgets/Chat/Chat.php:90
+msgid "Send"
 msgstr ""
 
-#: ../lib/widgets/Config.php:49
-msgid ""
-"Changing these data can be dangerous and may compromise the connection to "
-"the XMPP server"
+#: ../lib/widgets/Config/Config.php:45
+msgid "Language"
 msgstr ""
 
-#: ../lib/widgets/Config.php:51
+#: ../lib/widgets/Config/Config.php:57
+msgid "BOSH Connection Prefrences"
+msgstr ""
+
+#: ../lib/widgets/Config/Config.php:61
 msgid "Bosh Host"
 msgstr ""
 
-#: ../lib/widgets/Config.php:53
+#: ../lib/widgets/Config/Config.php:63
 msgid "Bosh Suffix"
 msgstr ""
 
-#: ../lib/widgets/Config.php:55
+#: ../lib/widgets/Config/Config.php:65
 msgid "Bosh Port"
 msgstr ""
 
-#: ../lib/widgets/Config.php:90
+#: ../lib/widgets/Config/Config.php:76
 msgid "error: "
 msgstr ""
 
-#: ../lib/widgets/Friends.php:65
+#: ../lib/widgets/Friends/Friends.php:36
+msgid "Your avatar"
+msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:111
+msgid "Refresh vCard"
+msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:112
 msgid "Contacts"
 msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:116
+msgid "Online"
+msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:117
+msgid "Offline"
+msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:118
+msgid "Hidden"
+msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:119
+msgid "Away"
+msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:120
+msgid "Do Not Disturb"
+msgstr ""
+
+#: ../lib/widgets/Friends/Friends.php:124
+msgid "Refresh Roster"
+msgstr ""
+
+#: ../lib/widgets/Log/Log.php:34
+msgid "Debug console"
+msgstr ""
+
+#: ../lib/widgets/Logout/Logout.php:46
+msgid "Logout"
+msgstr ""
diff --git a/i18n/update_po.sh b/i18n/update_po.sh
old mode 100644
new mode 100755
diff --git a/i18n/update_trans.sh b/i18n/update_trans.sh
old mode 100644
new mode 100755
index 69b9814c1..d2a22d52b
--- a/i18n/update_trans.sh
+++ b/i18n/update_trans.sh
@@ -2,6 +2,6 @@
 
 ls ../*.php > files.list
 ls ../lib/*.php >> files.list
-ls ../lib/widgets/*.php >> files.list
+ls ../lib/widgets/*/*.php >> files.list
 
 xgettext -kt -o messages.pot -L PHP -f files.list
diff --git a/lib/widgets/Chat/Chat.php b/lib/widgets/Chat/Chat.php
index 50e42652e..c34e17de5 100644
--- a/lib/widgets/Chat/Chat.php
+++ b/lib/widgets/Chat/Chat.php
@@ -81,12 +81,12 @@ class Chat extends Widget
           
           </div>
             <div id="chatState">
-               <h3>Chat</h3>
+               <h3><?php echo t('Chat'); ?></h3>
             </div>
             <div id="chatMessages">
             </div>
-            <input type="text" id="chatInput" value="Message" onfocus="myFocus(this);" onblur="myBlur(this);" onkeypress="if(event.keyCode == 13) {<?php $this->callAjax('ajaxSendMessage', "getDest()", "getMessageText()");?>}"/>
-            <input type="text" id="chatTo" value="To" onfocus="myFocus(this);" onblur="myBlur(this);" />
+            <input type="text" id="chatInput" value="<?php echo t('Message'); ?>" onfocus="myFocus(this);" onblur="myBlur(this);" onkeypress="if(event.keyCode == 13) {<?php $this->callAjax('ajaxSendMessage', "getDest()", "getMessageText()");?>}"/>
+            <input type="text" id="chatTo" value="<?php echo t('To'); ?>" onfocus="myFocus(this);" onblur="myBlur(this);" />
             <input type="button" id="chatSend" onclick="<?php $this->callAjax('ajaxSendMessage', "getDest()", "getMessageText()");?>" value="<?php echo t('Send');?>"/>
 		</div>
 		<?php
diff --git a/lib/widgets/Friends/Friends.php b/lib/widgets/Friends/Friends.php
index 213fdf74c..d6c64796b 100644
--- a/lib/widgets/Friends/Friends.php
+++ b/lib/widgets/Friends/Friends.php
@@ -108,20 +108,20 @@ class Friends extends Widget
           <div id="avatar"></div>
 		  <input type="button"
                  onclick="<?php $this->callAjax('ajaxRefreshVcard');?>"
-                 value="Refresh vcard" />
+                 value="<?php echo t('Refresh vCard'); ?>" />
           <h3><?php echo t('Contacts');?></h3>
 
           <div id="tinylist">
 			<ul>
-				<li class="online">Online</li>
-				<li class="offline">Offline</li>
-				<li class="hidden">Hidden</li>
-				<li class="away">Away</li>
-				<li class="dnd">Do Not Disturb</li>
+				<li class="online"><?php echo t('Online');?></li>
+				<li class="offline"><?php echo t('Offline');?></li>
+				<li class="hidden"><?php echo t('Hidden');?></li>
+				<li class="away"><?php echo t('Away');?></li>
+				<li class="dnd"><?php echo t('Do Not Disturb');?></li>
 			</ul>
           </div>
   		  <input type="button" onclick="<?php $this->callAjax('ajaxRefreshRoster');?>"
-         value="Refresh Roster" />
+         value="<?php echo t('Refresh Roster'); ?>" />
 		 <div id="testzone"></div>
         </div>
         <?php
diff --git a/lib/widgets/Log/Log.php b/lib/widgets/Log/Log.php
index 0c31540f7..cff51f75e 100644
--- a/lib/widgets/Log/Log.php
+++ b/lib/widgets/Log/Log.php
@@ -31,7 +31,7 @@ class Log extends Widget
 	      <div class="config_button">
           
           </div>
-		  <h3>Debug console </h3>
+		  <h3><?php echo t('Debug console'); ?></h3>
 
           <div id="log_content">
           </div>
diff --git a/lib/widgets/Poller/poller.js b/lib/widgets/Poller/poller.js
index bf78c5936..f3a496620 100644
--- a/lib/widgets/Poller/poller.js
+++ b/lib/widgets/Poller/poller.js
@@ -34,7 +34,7 @@ function movim_poll()
 
 			if(poller.status > 0) {
                 var time = new Date().getTime();
-                if(time - last_poll < 1000) {
+                if(time - last_poll < 300) {
                     failed_poll_count++;
                     if(failed_poll_count > poll_flood_detect) {
                         window.location = "index.php?q=disconnect";
@@ -59,4 +59,4 @@ function halt_poll()
 }
 
 // Adding the polling to onload event.
-movim_add_onload(movim_poll);
\ No newline at end of file
+movim_add_onload(movim_poll);
diff --git a/user/movim@movim.eu/conf.xml b/user/movim@movim.eu/conf.xml
index b56513654..e58f672ad 100644
--- a/user/movim@movim.eu/conf.xml
+++ b/user/movim@movim.eu/conf.xml
@@ -7,4 +7,4 @@
 	<boshSuffix>http-bind</boshSuffix>
 	<boshPort>80</boshPort>
 	<language>en</language>
-</data>
\ No newline at end of file
+</data>